diff --git a/app/AppCache.php b/app/AppCache.php
index bf8246246c8..ddb51db0583 100644
--- a/app/AppCache.php
+++ b/app/AppCache.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/AppKernel.php';
+require_once __DIR__.'/AppKernel.php';
 
 use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
 
diff --git a/app/AppKernel.php b/app/AppKernel.php
index a27ec9135b2..2894e5dde55 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -1,49 +1,48 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\Config\EnvParametersResource;
 use Symfony\Component\HttpKernel\DependencyInjection;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
- * Mautic Application Kernel
+ * Mautic Application Kernel.
  */
 class AppKernel extends Kernel
 {
-
     /**
-     * Major version number
+     * Major version number.
      *
      * @const integer
      */
     const MAJOR_VERSION = 2;
 
     /**
-     * Minor version number
+     * Minor version number.
      *
      * @const integer
      */
     const MINOR_VERSION = 1;
 
     /**
-     * Patch version number
+     * Patch version number.
      *
      * @const integer
      */
     const PATCH_VERSION = 2;
 
     /**
-     * Extra version identifier
+     * Extra version identifier.
      *
      * This constant is used to define additional version segments such as development
      * or beta status.
@@ -81,7 +80,6 @@ public function __construct($environment, $debug)
      */
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
-
         if (strpos($request->getRequestUri(), 'installer') !== false || !$this->isInstalled()) {
             define('MAUTIC_INSTALLER', 1);
         }
@@ -91,7 +89,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
             if (strpos($uri, 'installer') === false) {
                 $base = $request->getBaseUrl();
                 //check to see if the .htaccess file exists or if not running under apache
-                if ((strpos(strtolower($_SERVER["SERVER_SOFTWARE"]), 'apache') === false
+                if ((strpos(strtolower($_SERVER['SERVER_SOFTWARE']), 'apache') === false
                     || !file_exists(__DIR__.'../.htaccess')
                     && strpos(
                         $base,
@@ -106,7 +104,6 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
         }
 
         if (false === $this->booted) {
-
             $this->boot();
         }
 
@@ -121,7 +118,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
                     $this->getContainer()->get('translator')->trans(
                         'mautic.core.db.connection.error',
                         [
-                            '%code%' => $e->getCode()
+                            '%code%' => $e->getCode(),
                         ]
                     )
                 );
@@ -176,7 +173,7 @@ public function registerBundles()
             new Mautic\SmsBundle\MauticSmsBundle(),
             new Mautic\StageBundle\MauticStageBundle(),
             new Mautic\UserBundle\MauticUserBundle(),
-            new Mautic\WebhookBundle\MauticWebhookBundle()
+            new Mautic\WebhookBundle\MauticWebhookBundle(),
         ];
 
         //dynamically register Mautic Plugin Bundles
@@ -229,14 +226,13 @@ public function registerBundles()
     public function boot()
     {
         if (true === $this->booted) {
-
             return;
         }
 
         if (!defined('MAUTIC_TABLE_PREFIX')) {
             //set the table prefix before boot
             $localParams = $this->getLocalParams();
-            $prefix = isset($localParams['db_table_prefix']) ? $localParams['db_table_prefix'] : '';
+            $prefix      = isset($localParams['db_table_prefix']) ? $localParams['db_table_prefix'] : '';
             define('MAUTIC_TABLE_PREFIX', $prefix);
         }
 
@@ -270,7 +266,7 @@ public function boot()
     }
 
     /**
-     * Returns a list of addon bundles that are enabled
+     * Returns a list of addon bundles that are enabled.
      *
      * @return array
      */
@@ -288,7 +284,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     }
 
     /**
-     * Retrieves the application's version number
+     * Retrieves the application's version number.
      *
      * @return string
      */
@@ -298,7 +294,7 @@ public function getVersion()
     }
 
     /**
-     * Checks if the application has been installed
+     * Checks if the application has been installed.
      *
      * @return bool
      */
@@ -318,6 +314,7 @@ private function isInstalled()
      * @param array $params
      *
      * @return \Doctrine\DBAL\Connection
+     *
      * @throws Exception
      * @throws \Doctrine\DBAL\DBALException
      */
@@ -382,7 +379,7 @@ public function getLogDir()
     }
 
     /**
-     * Get Mautic's local configuration file
+     * Get Mautic's local configuration file.
      *
      * @return array
      */
@@ -421,7 +418,7 @@ public function getLocalParams()
     }
 
     /**
-     * Get local config file
+     * Get local config file.
      *
      * @param bool $checkExists If true, then return false if the file doesn't exist
      *
@@ -444,7 +441,7 @@ public function getLocalConfigFile($checkExists = true)
     }
 
     /**
-     * Get the container file name or path
+     * Get the container file name or path.
      *
      * @param bool|true $fullPath
      *
diff --git a/app/autoload.php b/app/autoload.php
index 3f0e4810e2e..db8e161ea18 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -6,14 +6,14 @@
     require_once __DIR__.'/bootstrap.php.cache';
 }
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /**
- * @var ClassLoader $loader
+ * @var ClassLoader
  */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/app/bundles/ApiBundle/ApiEvents.php b/app/bundles/ApiBundle/ApiEvents.php
index 0eb40ff276f..756a595fef7 100644
--- a/app/bundles/ApiBundle/ApiEvents.php
+++ b/app/bundles/ApiBundle/ApiEvents.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle;
 
 /**
- * Class ApiEvents
+ * Class ApiEvents.
  */
 final class ApiEvents
 {
@@ -42,7 +43,7 @@ final class ApiEvents
     const CLIENT_POST_DELETE = 'mautic.client_post_delete';
 
     /**
-     * The mautic.build_api_route event is thrown to build Mautic API routes
+     * The mautic.build_api_route event is thrown to build Mautic API routes.
      *
      * The event listener receives a Mautic\CoreBundle\Event\RouteEvent instance.
      *
diff --git a/app/bundles/ApiBundle/Config/config.php b/app/bundles/ApiBundle/Config/config.php
index 2be5eec92dd..9e3ab095899 100644
--- a/app/bundles/ApiBundle/Config/config.php
+++ b/app/bundles/ApiBundle/Config/config.php
@@ -1,157 +1,158 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes'     => array(
-        'public' => array(
+return [
+    'routes' => [
+        'public' => [
             // OAuth1.0a
-            'bazinga_oauth_server_requesttoken'     => array(
+            'bazinga_oauth_server_requesttoken' => [
                 'path'       => '/oauth/v1/request_token',
                 'controller' => 'bazinga.oauth.controller.server:requestTokenAction',
-                'method'     => 'GET|POST'
-            ),
-            'bazinga_oauth_login_allow'             => array(
+                'method'     => 'GET|POST',
+            ],
+            'bazinga_oauth_login_allow' => [
                 'path'       => '/oauth/v1/authorize',
                 'controller' => 'MauticApiBundle:oAuth1/Authorize:allow',
-                'method'     => 'GET'
-            ),
-            'bazinga_oauth_server_authorize'        => array(
+                'method'     => 'GET',
+            ],
+            'bazinga_oauth_server_authorize' => [
                 'path'       => '/oauth/v1/authorize',
                 'controller' => 'bazinga.oauth.controller.server:authorizeAction',
-                'method'     => 'POST'
-            ),
-            'mautic_oauth1_server_auth_login'       => array(
+                'method'     => 'POST',
+            ],
+            'mautic_oauth1_server_auth_login' => [
                 'path'       => '/oauth/v1/authorize_login',
                 'controller' => 'MauticApiBundle:oAuth1/Security:login',
-                'method'     => 'GET|POST'
-            ),
-            'mautic_oauth1_server_auth_login_check' => array(
+                'method'     => 'GET|POST',
+            ],
+            'mautic_oauth1_server_auth_login_check' => [
                 'path'       => '/oauth/v1/authorize_login_check',
                 'controller' => 'MauticApiBundle:oAuth1/Security:loginCheck',
-                'method'     => 'GET|POST'
-            ),
-            'bazinga_oauth_server_accesstoken'      => array(
+                'method'     => 'GET|POST',
+            ],
+            'bazinga_oauth_server_accesstoken' => [
                 'path'       => '/oauth/v1/access_token',
                 'controller' => 'bazinga.oauth.controller.server:accessTokenAction',
-                'method'     => 'GET|POST'
-            ),
+                'method'     => 'GET|POST',
+            ],
 
             // OAuth2
-            'fos_oauth_server_token'                => array(
+            'fos_oauth_server_token' => [
                 'path'       => '/oauth/v2/token',
                 'controller' => 'fos_oauth_server.controller.token:tokenAction',
-                'method'     => 'GET|POST'
-            ),
-            'fos_oauth_server_authorize'            => array(
+                'method'     => 'GET|POST',
+            ],
+            'fos_oauth_server_authorize' => [
                 'path'       => '/oauth/v2/authorize',
                 'controller' => 'MauticApiBundle:oAuth2/Authorize:authorize',
-                'method'     => 'GET|POST'
-            ),
-            'mautic_oauth2_server_auth_login'       => array(
+                'method'     => 'GET|POST',
+            ],
+            'mautic_oauth2_server_auth_login' => [
                 'path'       => '/oauth/v2/authorize_login',
                 'controller' => 'MauticApiBundle:oAuth2/Security:login',
-                'method'     => 'GET|POST'
-            ),
-            'mautic_oauth2_server_auth_login_check' => array(
+                'method'     => 'GET|POST',
+            ],
+            'mautic_oauth2_server_auth_login_check' => [
                 'path'       => '/oauth/v2/authorize_login_check',
                 'controller' => 'MauticApiBundle:oAuth2/Security:loginCheck',
-                'method'     => 'GET|POST'
-            ),
-        ),
-        'main' => array(
+                'method'     => 'GET|POST',
+            ],
+        ],
+        'main' => [
             // Clients
-            'mautic_client_index'                   => array(
+            'mautic_client_index' => [
                 'path'       => '/credentials/{page}',
-                'controller' => 'MauticApiBundle:Client:index'
-            ),
-            'mautic_client_action'                  => array(
+                'controller' => 'MauticApiBundle:Client:index',
+            ],
+            'mautic_client_action' => [
                 'path'       => '/credentials/{objectAction}/{objectId}',
-                'controller' => 'MauticApiBundle:Client:execute'
-            )
-        )
-    ),
+                'controller' => 'MauticApiBundle:Client:execute',
+            ],
+        ],
+    ],
 
-    'menu'       => array(
-        'admin' => array(
-            'items' => array(
-                'mautic.api.client.menu.index' => array(
+    'menu' => [
+        'admin' => [
+            'items' => [
+                'mautic.api.client.menu.index' => [
                     'route'     => 'mautic_client_index',
                     'iconClass' => 'fa-puzzle-piece',
                     'access'    => 'api:clients:view',
-                    'checks'    => array(
-                        'parameters' => array(
-                            'api_enabled' => true
-                        )
-                    )
-                )
-            )
-        )
-    ),
+                    'checks'    => [
+                        'parameters' => [
+                            'api_enabled' => true,
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ],
 
-    'services'   => array(
-        'events' => array(
-            'mautic.api.subscriber'              => array(
-                'class' => 'Mautic\ApiBundle\EventListener\ApiSubscriber',
+    'services' => [
+        'events' => [
+            'mautic.api.subscriber' => [
+                'class'     => 'Mautic\ApiBundle\EventListener\ApiSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.helper.core_parameters',
-                    'mautic.core.model.auditlog'
-                ]
-            ),
-            'mautic.api.configbundle.subscriber' => array(
-                'class' => 'Mautic\ApiBundle\EventListener\ConfigSubscriber'
-            ),
-            'mautic.api.search.subscriber'       => array(
-                'class' => 'Mautic\ApiBundle\EventListener\SearchSubscriber',
+                    'mautic.core.model.auditlog',
+                ],
+            ],
+            'mautic.api.configbundle.subscriber' => [
+                'class' => 'Mautic\ApiBundle\EventListener\ConfigSubscriber',
+            ],
+            'mautic.api.search.subscriber' => [
+                'class'     => 'Mautic\ApiBundle\EventListener\SearchSubscriber',
                 'arguments' => [
-                    'mautic.api.model.client'
-                ]
-            )
-        ),
-        'forms'  => array(
-            'mautic.form.type.apiclients' => array(
+                    'mautic.api.model.client',
+                ],
+            ],
+        ],
+        'forms' => [
+            'mautic.form.type.apiclients' => [
                 'class'     => 'Mautic\ApiBundle\Form\Type\ClientType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'client'
-            ),
-            'mautic.form.type.apiconfig'  => array(
+                'alias'     => 'client',
+            ],
+            'mautic.form.type.apiconfig' => [
                 'class' => 'Mautic\ApiBundle\Form\Type\ConfigType',
-                'alias' => 'apiconfig'
-            )
-        ),
-        'other'  => array(
-            'mautic.api.oauth.event_listener'                         => array(
-                'class'        => 'Mautic\ApiBundle\EventListener\OAuthEventListener',
-                'arguments'    => [
+                'alias' => 'apiconfig',
+            ],
+        ],
+        'other' => [
+            'mautic.api.oauth.event_listener' => [
+                'class'     => 'Mautic\ApiBundle\EventListener\OAuthEventListener',
+                'arguments' => [
                     'doctrine.orm.entity_manager',
                     'mautic.security',
-                    'translator'
+                    'translator',
                 ],
-                'tags'         => array(
+                'tags' => [
+                    'kernel.event_listener',
                     'kernel.event_listener',
-                    'kernel.event_listener'
-                ),
-                'tagArguments' => array(
-                    array(
+                ],
+                'tagArguments' => [
+                    [
                         'event'  => 'fos_oauth_server.pre_authorization_process',
-                        'method' => 'onPreAuthorizationProcess'
-                    ),
-                    array(
+                        'method' => 'onPreAuthorizationProcess',
+                    ],
+                    [
                         'event'  => 'fos_oauth_server.post_authorization_process',
-                        'method' => 'onPostAuthorizationProcess'
-                    )
-                )
-            ),
-            'mautic.api.oauth1.nonce_provider'                        => array(
+                        'method' => 'onPostAuthorizationProcess',
+                    ],
+                ],
+            ],
+            'mautic.api.oauth1.nonce_provider' => [
                 'class'     => 'Mautic\ApiBundle\Provider\NonceProvider',
-                'arguments' => 'doctrine.orm.entity_manager'
-            ),
+                'arguments' => 'doctrine.orm.entity_manager',
+            ],
             'bazinga.oauth.security.authentication.provider.class'    => 'Mautic\ApiBundle\Security\OAuth1\Authentication\Provider\OAuthProvider',
             'bazinga.oauth.security.authentication.listener.class'    => 'Mautic\ApiBundle\Security\OAuth1\Firewall\OAuthListener',
             'bazinga.oauth.event_listener.request.class'              => 'Mautic\ApiBundle\EventListener\OAuth1\OAuthRequestListener',
@@ -159,25 +160,25 @@
             'jms_serializer.metadata.annotation_driver.class'         => 'Mautic\ApiBundle\Serializer\Driver\AnnotationDriver',
             'jms_serializer.metadata.php_driver.class'                => 'Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver',
 
-            'mautic.validator.oauthcallback' => array(
-                'class'     => 'Mautic\ApiBundle\Form\Validator\Constraints\OAuthCallbackValidator',
-                'tag'       => 'validator.constraint_validator',
-                'alias'     => 'oauth_callback'
-            )
-        ),
-        'models' =>  array(
-            'mautic.api.model.client' => array(
-                'class' => 'Mautic\ApiBundle\Model\ClientModel',
-                'arguments' => array(
-                    'request_stack'
-                )
-            )
-        )
-    ),
+            'mautic.validator.oauthcallback' => [
+                'class' => 'Mautic\ApiBundle\Form\Validator\Constraints\OAuthCallbackValidator',
+                'tag'   => 'validator.constraint_validator',
+                'alias' => 'oauth_callback',
+            ],
+        ],
+        'models' => [
+            'mautic.api.model.client' => [
+                'class'     => 'Mautic\ApiBundle\Model\ClientModel',
+                'arguments' => [
+                    'request_stack',
+                ],
+            ],
+        ],
+    ],
 
-    'parameters' => array(
-        "api_enabled"                       => false,
-        "api_oauth2_access_token_lifetime"  => 60,
-        "api_oauth2_refresh_token_lifetime" => 14
-    )
-);
\ No newline at end of file
+    'parameters' => [
+        'api_enabled'                       => false,
+        'api_oauth2_access_token_lifetime'  => 60,
+        'api_oauth2_refresh_token_lifetime' => 14,
+    ],
+];
diff --git a/app/bundles/ApiBundle/Controller/ClientController.php b/app/bundles/ApiBundle/Controller/ClientController.php
index b726c983d92..e3a7aadec05 100644
--- a/app/bundles/ApiBundle/Controller/ClientController.php
+++ b/app/bundles/ApiBundle/Controller/ClientController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,13 +13,12 @@
 use Mautic\CoreBundle\Controller\FormController;
 
 /**
- * Class ClientController
+ * Class ClientController.
  */
 class ClientController extends FormController
 {
-
     /**
-     * Generate's default client list
+     * Generate's default client list.
      *
      * @param int $page
      *
@@ -51,7 +51,7 @@ public function indexAction($page = 1)
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
+                'orderByDir' => $orderByDir,
             ]
         );
 
@@ -69,8 +69,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticApiBundle:Client:index',
                     'passthroughVars' => [
                         'activeLink'    => 'mautic_client_index',
-                        'mauticContent' => 'client'
-                    ]
+                        'mauticContent' => 'client',
+                    ],
                 ]
             );
         }
@@ -94,7 +94,7 @@ public function indexAction($page = 1)
         $apiOptions['oauth2'] = 'OAuth 2';
         $filters['api_mode']  = [
             'values'  => [$apiMode],
-            'options' => $apiOptions
+            'options' => $apiOptions,
         ];
 
         $parameters = [
@@ -104,7 +104,7 @@ public function indexAction($page = 1)
             'permissions' => $permissions,
             'tmpl'        => $tmpl,
             'searchValue' => $filter,
-            'filters'     => $filters
+            'filters'     => $filters,
         ];
 
         return $this->delegateView(
@@ -113,8 +113,8 @@ public function indexAction($page = 1)
                 'contentTemplate' => 'MauticApiBundle:Client:list.html.php',
                 'passthroughVars' => [
                     'route'         => $this->generateUrl('mautic_client_index', ['page' => $page]),
-                    'mauticContent' => 'client'
-                ]
+                    'mauticContent' => 'client',
+                ],
             ]
         );
     }
@@ -150,7 +150,7 @@ public function revokeAction($clientId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.api.client.error.notfound',
-                    'msgVars' => ['%id%' => $clientId]
+                    'msgVars' => ['%id%' => $clientId],
                 ];
             } else {
                 $name = $client->getName();
@@ -161,8 +161,8 @@ public function revokeAction($clientId)
                     'type'    => 'notice',
                     'msg'     => 'mautic.api.client.notice.revoked',
                     'msgVars' => [
-                        '%name%' => $name
-                    ]
+                        '%name%' => $name,
+                    ],
                 ];
             }
         }
@@ -172,9 +172,9 @@ public function revokeAction($clientId)
                 'returnUrl'       => $this->generateUrl('mautic_user_account'),
                 'contentTemplate' => 'MauticUserBundle:Profile:index',
                 'passthroughVars' => [
-                    'success' => $success
+                    'success' => $success,
                 ],
-                'flashes'         => $flashes
+                'flashes' => $flashes,
             ]
         );
     }
@@ -231,9 +231,9 @@ public function newAction($objectId = 0)
                                 'mautic_client_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $client->getId()
+                                    'objectId'     => $client->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
                 }
@@ -246,8 +246,8 @@ public function newAction($objectId = 0)
                         'contentTemplate' => 'MauticApiBundle:Client:index',
                         'passthroughVars' => [
                             'activeLink'    => '#mautic_client_index',
-                            'mauticContent' => 'client'
-                        ]
+                            'mauticContent' => 'client',
+                        ],
                     ]
                 );
             } elseif ($valid && !$cancelled) {
@@ -257,22 +257,22 @@ public function newAction($objectId = 0)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form' => $form->createView(),
-                    'tmpl' => $this->request->get('tmpl', 'form')
+                    'tmpl' => $this->request->get('tmpl', 'form'),
                 ],
                 'contentTemplate' => 'MauticApiBundle:Client:form.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_client_new',
                     'route'         => $action,
-                    'mauticContent' => 'client'
-                ]
+                    'mauticContent' => 'client',
+                ],
             ]
         );
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -282,7 +282,6 @@ public function newAction($objectId = 0)
     public function editAction($objectId, $ignorePost = false)
     {
         if (!$this->get('mautic.security')->isGranted('api:clients:editother')) {
-
             return $this->accessDenied();
         }
 
@@ -296,8 +295,8 @@ public function editAction($objectId, $ignorePost = false)
             'contentTemplate' => 'MauticApiBundle:Client:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_client_index',
-                'mauticContent' => 'client'
-            ]
+                'mauticContent' => 'client',
+            ],
         ];
 
         //client not found
@@ -310,9 +309,9 @@ public function editAction($objectId, $ignorePost = false)
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.api.client.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -342,9 +341,9 @@ public function editAction($objectId, $ignorePost = false)
                                 'mautic_client_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $client->getId()
+                                    'objectId'     => $client->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
 
@@ -365,22 +364,22 @@ public function editAction($objectId, $ignorePost = false)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form' => $form->createView(),
-                    'tmpl' => $this->request->get('tmpl', 'form')
+                    'tmpl' => $this->request->get('tmpl', 'form'),
                 ],
                 'contentTemplate' => 'MauticApiBundle:Client:form.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_client_index',
                     'route'         => $action,
-                    'mauticContent' => 'client'
-                ]
+                    'mauticContent' => 'client',
+                ],
             ]
         );
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -402,8 +401,8 @@ public function deleteAction($objectId)
             'passthroughVars' => [
                 'activeLink'    => '#mautic_client_index',
                 'success'       => $success,
-                'mauticContent' => 'client'
-            ]
+                'mauticContent' => 'client',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -414,7 +413,7 @@ public function deleteAction($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.api.client.error.notfound',
-                    'msgVars' => ['%id%' => $objectId]
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif ($model->isLocked($entity)) {
                 //deny access if the entity is locked
@@ -427,8 +426,8 @@ public function deleteAction($objectId)
                     'msg'     => 'mautic.core.notice.deleted',
                     'msgVars' => [
                         '%name%' => $name,
-                        '%id%'   => $objectId
-                    ]
+                        '%id%'   => $objectId,
+                    ],
                 ];
             }
         }
@@ -437,7 +436,7 @@ public function deleteAction($objectId)
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
diff --git a/app/bundles/ApiBundle/Controller/CommonApiController.php b/app/bundles/ApiBundle/Controller/CommonApiController.php
index cf91d3f0221..bb830907303 100644
--- a/app/bundles/ApiBundle/Controller/CommonApiController.php
+++ b/app/bundles/ApiBundle/Controller/CommonApiController.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
+ * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Controller;
@@ -26,18 +26,17 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class CommonApiController
+ * Class CommonApiController.
  */
 class CommonApiController extends FOSRestController implements MauticController
 {
-
     /**
      * @var Request
      */
     protected $request;
 
     /**
-     * @var MauticFactory $factory
+     * @var MauticFactory
      */
     protected $factory;
 
@@ -62,63 +61,61 @@ class CommonApiController extends FOSRestController implements MauticController
     protected $translator;
 
     /**
-     * @var \Mautic\CoreBundle\Security\Permissions\CorePermissions $security
+     * @var \Mautic\CoreBundle\Security\Permissions\CorePermissions
      */
     protected $security;
 
     /**
-     * Model object for processing the entity
+     * Model object for processing the entity.
      *
      * @var \Mautic\CoreBundle\Model\AbstractCommonModel
      */
     protected $model;
 
     /**
-     * Key to return for a single entity
+     * Key to return for a single entity.
      *
      * @var string
      */
     protected $entityNameOne;
 
     /**
-     * Key to return for entity lists
+     * Key to return for entity lists.
      *
      * @var string
      */
     protected $entityNameMulti;
 
     /**
-     * Class for the entity
+     * Class for the entity.
      *
      * @var string
      */
     protected $entityClass;
 
     /**
-     * Permission base for the entity such as page:pages
+     * Permission base for the entity such as page:pages.
      *
      * @var string
      */
     protected $permissionBase;
 
     /**
-     * Used to set default filters for entity lists such as restricting to owning user
+     * Used to set default filters for entity lists such as restricting to owning user.
      *
      * @var array
      */
-    protected $listFilters = array();
+    protected $listFilters = [];
 
     /**
      * @var array
      */
-    protected $serializerGroups = array();
+    protected $serializerGroups = [];
 
     /**
-     * Initialize some variables
+     * Initialize some variables.
      *
      * @param FilterControllerEvent $event
-     *
-     * @return void
      */
     public function initialize(FilterControllerEvent $event)
     {
@@ -174,7 +171,7 @@ public function setFactory(MauticFactory $factory)
     }
 
     /**
-     * Obtains a list of entities as defined by the API URL
+     * Obtains a list of entities as defined by the API URL.
      *
      * @return Response
      */
@@ -185,33 +182,33 @@ public function getEntitiesAction()
 
         $publishedOnly = $this->request->get('published', 0);
         if ($publishedOnly) {
-            $this->listFilters[] = array(
+            $this->listFilters[] = [
                 'column' => $tableAlias.'.isPublished',
                 'expr'   => 'eq',
-                'value'  => true
-            );
+                'value'  => true,
+            ];
         }
 
-        $args    = array(
-            'start'          => $this->request->query->get('start', 0),
-            'limit'          => $this->request->query->get('limit', $this->coreParametersHelper->getParameter('default_pagelimit')),
-            'filter'         => array(
+        $args = [
+            'start'  => $this->request->query->get('start', 0),
+            'limit'  => $this->request->query->get('limit', $this->coreParametersHelper->getParameter('default_pagelimit')),
+            'filter' => [
                 'string' => $this->request->query->get('search', ''),
-                'force'  => $this->listFilters
-            ),
+                'force'  => $this->listFilters,
+            ],
             'orderBy'        => $this->request->query->get('orderBy', ''),
             'orderByDir'     => $this->request->query->get('orderByDir', 'ASC'),
-            'withTotalCount' => true //for repositories that break free of Paginator
-        );
+            'withTotalCount' => true, //for repositories that break free of Paginator
+        ];
         $results = $this->model->getEntities($args);
 
         list($entities, $totalCount) = $this->prepareEntitiesForView($results);
 
         $view = $this->view(
-            array(
+            [
                 'total'                => $totalCount,
-                $this->entityNameMulti => $entities
-            ),
+                $this->entityNameMulti => $entities,
+            ],
             Codes::HTTP_OK
         );
         $this->setSerializationContext($view);
@@ -220,7 +217,7 @@ public function getEntitiesAction()
     }
 
     /**
-     * Obtains a specific entity as defined by the API URL
+     * Obtains a specific entity as defined by the API URL.
      *
      * @param int $id Entity ID
      *
@@ -238,14 +235,14 @@ public function getEntityAction($id)
         }
 
         $this->preSerializeEntity($entity);
-        $view = $this->view(array($this->entityNameOne => $entity), Codes::HTTP_OK);
+        $view = $this->view([$this->entityNameOne => $entity], Codes::HTTP_OK);
         $this->setSerializationContext($view);
 
         return $this->handleView($view);
     }
 
     /**
-     * Creates a new entity
+     * Creates a new entity.
      *
      * @return Response
      */
@@ -262,9 +259,8 @@ public function newEntityAction()
         return $this->processForm($entity, $parameters, 'POST');
     }
 
-
     /**
-     * Edits an existing entity or creates one on PUT if it doesn't exist
+     * Edits an existing entity or creates one on PUT if it doesn't exist.
      *
      * @param int $id Entity ID
      *
@@ -297,7 +293,7 @@ public function editEntityAction($id)
     }
 
     /**
-     * Deletes an entity
+     * Deletes an entity.
      *
      * @param int $id Entity ID
      *
@@ -314,7 +310,7 @@ public function deleteEntityAction($id)
             $this->model->deleteEntity($entity);
 
             $this->preSerializeEntity($entity);
-            $view = $this->view(array($this->entityNameOne => $entity), Codes::HTTP_OK);
+            $view = $this->view([$this->entityNameOne => $entity], Codes::HTTP_OK);
             $this->setSerializationContext($view);
 
             return $this->handleView($view);
@@ -324,7 +320,7 @@ public function deleteEntityAction($id)
     }
 
     /**
-     * Processes API Form
+     * Processes API Form.
      *
      * @param        $entity
      * @param null   $parameters
@@ -359,22 +355,23 @@ protected function processForm($entity, $parameters = null, $method = 'PUT')
         if ($form->isValid()) {
             $this->preSaveEntity($entity, $form, $parameters, $action);
             $this->model->saveEntity($entity);
-            $headers = array();
+            $headers = [];
             //return the newly created entities location if applicable
             if (Codes::HTTP_CREATED === $statusCode) {
                 $headers['Location'] = $this->generateUrl(
                     'mautic_api_get'.$this->entityNameOne,
-                    array('id' => $entity->getId()),
+                    ['id' => $entity->getId()],
                     true
                 );
             }
             $this->preSerializeEntity($entity, $action);
 
-            $view = $this->view(array($this->entityNameOne => $entity), $statusCode, $headers);
+            $view = $this->view([$this->entityNameOne => $entity], $statusCode, $headers);
             $this->setSerializationContext($view);
         } else {
             $formErrors = $this->getFormErrorMessages($form);
-            $msg = $this->getFormErrorMessage($formErrors);
+            $msg        = $this->getFormErrorMessage($formErrors);
+
             return $this->returnError($msg, Codes::HTTP_BAD_REQUEST, $formErrors);
         }
 
@@ -432,7 +429,7 @@ public function getFormErrorMessages(\Symfony\Component\Form\Form $form)
     }
 
     /**
-     * Checks if user has permission to access retrieved entity
+     * Checks if user has permission to access retrieved entity.
      *
      * @param mixed  $entity
      * @param string $action view|create|edit|publish|delete
@@ -452,7 +449,7 @@ protected function checkEntityAccess($entity, $action = 'view')
     }
 
     /**
-     * Creates the form instance
+     * Creates the form instance.
      *
      * @param $entity
      *
@@ -464,11 +461,9 @@ protected function createEntityForm($entity)
     }
 
     /**
-     * Set serialization groups and exclusion strategies
+     * Set serialization groups and exclusion strategies.
      *
      * @param \FOS\RestBundle\View\View $view
-     *
-     * @return void
      */
     protected function setSerializationContext(&$view)
     {
@@ -489,7 +484,7 @@ protected function setSerializationContext(&$view)
     }
 
     /**
-     * Convert posted parameters into what the form needs in order to successfully bind
+     * Convert posted parameters into what the form needs in order to successfully bind.
      *
      * @param $parameters
      * @param $entity
@@ -503,7 +498,7 @@ protected function prepareParametersForBinding($parameters, $entity, $action)
     }
 
     /**
-     * Give the controller an opportunity to process the entity before persisting
+     * Give the controller an opportunity to process the entity before persisting.
      *
      * @param $entity
      * @param $form
@@ -517,7 +512,7 @@ protected function preSaveEntity(&$entity, $form, $parameters, $action = 'edit')
     }
 
     /**
-     * Gives child controllers opportunity to analyze and do whatever to an entity before going through serializer
+     * Gives child controllers opportunity to analyze and do whatever to an entity before going through serializer.
      *
      * @param        $entity
      * @param string $action
@@ -529,7 +524,7 @@ protected function preSerializeEntity(&$entity, $action = 'view')
     }
 
     /**
-     * Gives child controllers opportunity to analyze and do whatever to an entity before populating the form
+     * Gives child controllers opportunity to analyze and do whatever to an entity before populating the form.
      *
      * @param        $entity
      * @param        $parameters
@@ -542,11 +537,11 @@ protected function prePopulateForm(&$entity, $parameters, $action = 'edit')
     }
 
     /**
-     * Returns an error
+     * Returns an error.
      *
-     * @param string  $msg
-     * @param integer $code
-     * @param array   $details
+     * @param string $msg
+     * @param int    $code
+     * @param array  $details
      *
      * @return Response
      */
@@ -556,9 +551,9 @@ protected function returnError($msg, $code, $details = [])
             [
                 'error' => [
                     'code'    => $code,
-                    'message' => $this->get('translator')->trans($msg, array(), 'flashes'),
-                    'details' => $details
-                ]
+                    'message' => $this->get('translator')->trans($msg, [], 'flashes'),
+                    'details' => $details,
+                ],
             ],
             $code
         );
@@ -567,7 +562,7 @@ protected function returnError($msg, $code, $details = [])
     }
 
     /**
-     * Returns a 403 Access Denied
+     * Returns a 403 Access Denied.
      *
      * @param string $msg
      *
@@ -579,7 +574,7 @@ protected function accessDenied($msg = 'mautic.core.error.accessdenied')
     }
 
     /**
-     * Returns a 404 Not Found
+     * Returns a 404 Not Found.
      *
      * @param string $msg
      *
@@ -591,7 +586,7 @@ protected function notFound($msg = 'mautic.core.error.notfound')
     }
 
     /**
-     * Returns a 400 Bad Request
+     * Returns a 400 Bad Request.
      *
      * @param string $msg
      *
@@ -609,9 +604,8 @@ protected function badRequest($msg = 'mautic.core.error.badrequest')
      * @param null  $statusCode
      * @param array $headers
      */
-    protected function view($data = null, $statusCode = null, array $headers = array())
+    protected function view($data = null, $statusCode = null, array $headers = [])
     {
-
         if ($data instanceof Paginator) {
             // Get iterator out of Paginator class so that the entities are properly serialized by the serializer
             $data = $data->getIterator()->getArrayCopy();
@@ -621,7 +615,7 @@ protected function view($data = null, $statusCode = null, array $headers = array
     }
 
     /**
-     * Prepares entities returned from repository getEntities()
+     * Prepares entities returned from repository getEntities().
      *
      * @param $results
      *
@@ -629,7 +623,6 @@ protected function view($data = null, $statusCode = null, array $headers = array
      */
     protected function prepareEntitiesForView($results)
     {
-
         if ($results instanceof Paginator) {
             $totalCount = count($results);
         } elseif (isset($results['count'])) {
@@ -641,7 +634,7 @@ protected function prepareEntitiesForView($results)
 
         //we have to convert them from paginated proxy functions to entities in order for them to be
         //returned by the serializer/rest bundle
-        $entities = array();
+        $entities = [];
         foreach ($results as $r) {
             if (is_array($r) && isset($r[0])) {
                 //entity has some extra something something tacked onto the entities
@@ -669,11 +662,11 @@ protected function prepareEntitiesForView($results)
             }
         }
 
-        return array($entities, $totalCount);
+        return [$entities, $totalCount];
     }
 
     /**
-     * Get a model instance from the service container
+     * Get a model instance from the service container.
      *
      * @param $modelNameKey
      *
@@ -689,17 +682,17 @@ protected function getModel($modelNameKey)
         $parts = explode('.', $modelNameKey);
 
         if (count($parts) !== 2) {
-            throw new \InvalidArgumentException($modelNameKey . " is not a valid model key.");
+            throw new \InvalidArgumentException($modelNameKey.' is not a valid model key.');
         }
 
         list($bundle, $name) = $parts;
 
-        $containerKey = str_replace(array('%bundle%', '%name%'), array($bundle, $name), 'mautic.%bundle%.model.%name%');
+        $containerKey = str_replace(['%bundle%', '%name%'], [$bundle, $name], 'mautic.%bundle%.model.%name%');
 
         if ($this->container->has($containerKey)) {
             return $this->container->get($containerKey);
         }
 
-        throw new \InvalidArgumentException($containerKey . ' is not a registered container key.');
+        throw new \InvalidArgumentException($containerKey.' is not a registered container key.');
     }
 }
diff --git a/app/bundles/ApiBundle/Controller/oAuth1/AuthorizeController.php b/app/bundles/ApiBundle/Controller/oAuth1/AuthorizeController.php
index c058639dbd2..5b789dc4090 100644
--- a/app/bundles/ApiBundle/Controller/oAuth1/AuthorizeController.php
+++ b/app/bundles/ApiBundle/Controller/oAuth1/AuthorizeController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,15 +19,15 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * Class AuthorizeController
+ * Class AuthorizeController.
  */
 class AuthorizeController extends Controller
 {
-
     /**
      * @param Request $request
      *
      * @return Response
+     *
      * @throws AccessDeniedException
      * @throws HttpException
      */
@@ -55,14 +56,13 @@ public function allowAction(Request $request)
         if ($token instanceof RequestTokenInterface) {
             $tokenProvider->setUserForRequestToken($token, $securityContext->getToken()->getUser());
 
-            return new Response($this->container->get('templating')->render('MauticApiBundle:Authorize:oAuth1/authorize.html.php', array(
+            return new Response($this->container->get('templating')->render('MauticApiBundle:Authorize:oAuth1/authorize.html.php', [
                 'consumer'       => $token->getConsumer(),
                 'oauth_token'    => $oauth_token,
-                'oauth_callback' => $oauth_callback
-            )));
+                'oauth_callback' => $oauth_callback,
+            ]));
         }
 
-
         throw new HttpException(404);
     }
 }
diff --git a/app/bundles/ApiBundle/Controller/oAuth1/SecurityController.php b/app/bundles/ApiBundle/Controller/oAuth1/SecurityController.php
index 0b61a712077..11dd3234dbc 100644
--- a/app/bundles/ApiBundle/Controller/oAuth1/SecurityController.php
+++ b/app/bundles/ApiBundle/Controller/oAuth1/SecurityController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,12 +13,11 @@
 use Mautic\CoreBundle\Controller\CommonController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\Security\Core\Exception as Exception;
+use Symfony\Component\Security\Core\SecurityContext;
 
 class SecurityController extends CommonController
 {
-
     /**
      * @param Request $request
      *
@@ -36,20 +36,20 @@ public function loginAction(Request $request)
         }
         if (!empty($error)) {
             if (($error instanceof Exception\BadCredentialsException)) {
-                $msg = "mautic.user.auth.error.invalidlogin";
+                $msg = 'mautic.user.auth.error.invalidlogin';
             } else {
                 $msg = $error->getMessage();
             }
 
-            $this->addFlash($msg, array(), 'error', null, false);
+            $this->addFlash($msg, [], 'error', null, false);
         }
 
         return $this->render(
             'MauticApiBundle:Security:login.html.php',
-            array(
+            [
                 'last_username' => $session->get(SecurityContext::LAST_USERNAME),
-                'route'         => 'mautic_oauth1_server_auth_login_check'
-            )
+                'route'         => 'mautic_oauth1_server_auth_login_check',
+            ]
         );
     }
 
@@ -60,4 +60,4 @@ public function loginCheckAction()
     {
         return new Response('', 400);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/Controller/oAuth2/AuthorizeController.php b/app/bundles/ApiBundle/Controller/oAuth2/AuthorizeController.php
index bf87ebfb9bb..5c5ad1f1495 100644
--- a/app/bundles/ApiBundle/Controller/oAuth2/AuthorizeController.php
+++ b/app/bundles/ApiBundle/Controller/oAuth2/AuthorizeController.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,17 +17,17 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * Class AuthorizeController
+ * Class AuthorizeController.
  */
 class AuthorizeController extends \FOS\OAuthServerBundle\Controller\AuthorizeController
 {
-
     /**
-     * Authorize
+     * Authorize.
      *
      * @param Request $request
      *
      * @return \FOS\OAuthServerBundle\Controller\Response|\Symfony\Component\HttpFoundation\Response
+     *
      * @throws \OAuth2\OAuth2RedirectException
      * @throws AccessDeniedException
      *
@@ -45,7 +46,7 @@ public function authorizeAction(Request $request)
             $this->container->get('session')->set('_fos_oauth_server.ensure_logout', true);
         }
 
-        $form = $this->container->get('fos_oauth_server.authorize.form');
+        $form        = $this->container->get('fos_oauth_server.authorize.form');
         $formHandler = $this->container->get('fos_oauth_server.authorize.form.handler');
 
         $event = $this->container->get('event_dispatcher')->dispatch(
@@ -67,10 +68,10 @@ public function authorizeAction(Request $request)
 
         return $this->container->get('templating')->renderResponse(
             'MauticApiBundle:Authorize:oAuth2/authorize.html.php',
-            array(
-                'form'      => $form->createView(),
-                'client'    => $this->getClient(),
-            )
+            [
+                'form'   => $form->createView(),
+                'client' => $this->getClient(),
+            ]
         );
     }
 }
diff --git a/app/bundles/ApiBundle/Controller/oAuth2/SecurityController.php b/app/bundles/ApiBundle/Controller/oAuth2/SecurityController.php
index e1a7c551253..fed39885b6d 100644
--- a/app/bundles/ApiBundle/Controller/oAuth2/SecurityController.php
+++ b/app/bundles/ApiBundle/Controller/oAuth2/SecurityController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,15 +13,14 @@
 use Mautic\CoreBundle\Controller\CommonController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\Security\Core\Exception as Exception;
+use Symfony\Component\Security\Core\SecurityContext;
 
 /**
- * Class SecurityController
+ * Class SecurityController.
  */
 class SecurityController extends CommonController
 {
-
     /**
      * @param Request $request
      *
@@ -39,11 +39,11 @@ public function loginAction(Request $request)
         }
         if (!empty($error)) {
             if (($error instanceof Exception\BadCredentialsException)) {
-                $msg = "mautic.user.auth.error.invalidlogin";
+                $msg = 'mautic.user.auth.error.invalidlogin';
             } else {
                 $msg = $error->getMessage();
             }
-            $this->addFlash($msg, array(), 'error', null, false);
+            $this->addFlash($msg, [], 'error', null, false);
         }
 
         if ($session->has('_security.target_path')) {
@@ -54,10 +54,10 @@ public function loginAction(Request $request)
 
         return $this->render(
             'MauticApiBundle:Security:login.html.php',
-            array(
+            [
                 'last_username' => $session->get(SecurityContext::LAST_USERNAME),
-                'route'         => 'mautic_oauth2_server_auth_login_check'
-            )
+                'route'         => 'mautic_oauth2_server_auth_login_check',
+            ]
         );
     }
 
diff --git a/app/bundles/ApiBundle/DependencyInjection/Compiler/OAuthPass.php b/app/bundles/ApiBundle/DependencyInjection/Compiler/OAuthPass.php
index f7f28df3620..b91988a078a 100644
--- a/app/bundles/ApiBundle/DependencyInjection/Compiler/OAuthPass.php
+++ b/app/bundles/ApiBundle/DependencyInjection/Compiler/OAuthPass.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Class OAuthPass
+ * Class OAuthPass.
  */
 class OAuthPass implements CompilerPassInterface
 {
@@ -26,21 +27,21 @@ public function process(ContainerBuilder $container)
         if ($container->hasDefinition('bazinga.oauth.security.authentication.provider')) {
             //Add a addMethodCall to set factory
             $container->getDefinition('bazinga.oauth.security.authentication.provider')->addMethodCall(
-                'setFactory', array(new Reference('mautic.factory'))
+                'setFactory', [new Reference('mautic.factory')]
             );
         }
 
         if ($container->hasDefinition('bazinga.oauth.security.authentication.listener')) {
             //Add a addMethodCall to set factory
             $container->getDefinition('bazinga.oauth.security.authentication.listener')->addMethodCall(
-                'setFactory', array(new Reference('mautic.factory'))
+                'setFactory', [new Reference('mautic.factory')]
             );
         }
 
         if ($container->hasDefinition('fos_oauth_server.security.authentication.listener')) {
             //Add a addMethodCall to set factory
             $container->getDefinition('fos_oauth_server.security.authentication.listener')->addMethodCall(
-                'setFactory', array(new Reference('mautic.factory'))
+                'setFactory', [new Reference('mautic.factory')]
             );
         }
     }
diff --git a/app/bundles/ApiBundle/DependencyInjection/Factory/ApiFactory.php b/app/bundles/ApiBundle/DependencyInjection/Factory/ApiFactory.php
index ca3bdc59228..19bf175a841 100644
--- a/app/bundles/ApiBundle/DependencyInjection/Factory/ApiFactory.php
+++ b/app/bundles/ApiBundle/DependencyInjection/Factory/ApiFactory.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\DependencyInjection\Factory;
 
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Class ApiFactory
+ * Class ApiFactory.
  */
 class ApiFactory implements SecurityFactoryInterface
 {
@@ -34,7 +35,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listenerId = 'security.authentication.listener.mautic_api.'.$id;
         $container->setDefinition($listenerId, new DefinitionDecorator('mautic_api.security.authentication.listener'));
 
-        return array($providerId, $listenerId, $defaultEntryPoint);
+        return [$providerId, $listenerId, $defaultEntryPoint];
     }
 
     /**
diff --git a/app/bundles/ApiBundle/Entity/oAuth1/AccessToken.php b/app/bundles/ApiBundle/Entity/oAuth1/AccessToken.php
index 5b43c340de9..ec24a2850ae 100644
--- a/app/bundles/ApiBundle/Entity/oAuth1/AccessToken.php
+++ b/app/bundles/ApiBundle/Entity/oAuth1/AccessToken.php
@@ -1,28 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Entity\oAuth1;
 
-use Bazinga\OAuthServerBundle\Model\ConsumerInterface;
 use Bazinga\OAuthServerBundle\Model\AccessTokenInterface;
+use Bazinga\OAuthServerBundle\Model\ConsumerInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * Class AccessToken
- *
- * @package Mautic\ApiBundle\Entity\oAuth1
+ * Class AccessToken.
  */
 class AccessToken implements AccessTokenInterface
 {
-
     /**
      * @var int
      */
@@ -56,12 +54,12 @@ class AccessToken implements AccessTokenInterface
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('oauth1_access_tokens')
-            ->addIndex(array('token'), 'oauth1_access_token_search');
+            ->addIndex(['token'], 'oauth1_access_token_search');
 
         $builder->createField('id', 'integer')
             ->isPrimaryKey()
@@ -88,25 +86,25 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getToken ()
+    public function getToken()
     {
         return $this->token;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setToken ($token)
+    public function setToken($token)
     {
         $this->token = $token;
 
@@ -114,17 +112,17 @@ public function setToken ($token)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getSecret ()
+    public function getSecret()
     {
         return $this->secret;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setSecret ($secret)
+    public function setSecret($secret)
     {
         $this->secret = $secret;
 
@@ -132,17 +130,17 @@ public function setSecret ($secret)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getExpiresAt ()
+    public function getExpiresAt()
     {
         return $this->expiresAt;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setExpiresAt ($expiresAt)
+    public function setExpiresAt($expiresAt)
     {
         $this->expiresAt = $expiresAt;
 
@@ -150,9 +148,9 @@ public function setExpiresAt ($expiresAt)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getExpiresIn ()
+    public function getExpiresIn()
     {
         if ($this->expiresAt) {
             return $this->expiresAt - time();
@@ -162,9 +160,9 @@ public function getExpiresIn ()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function hasExpired ()
+    public function hasExpired()
     {
         if ($this->expiresAt) {
             return time() > $this->expiresAt;
@@ -174,17 +172,17 @@ public function hasExpired ()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getUser ()
+    public function getUser()
     {
         return $this->user;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setUser (UserInterface $user)
+    public function setUser(UserInterface $user)
     {
         $this->user = $user;
 
@@ -192,9 +190,9 @@ public function setUser (UserInterface $user)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setConsumer (ConsumerInterface $consumer)
+    public function setConsumer(ConsumerInterface $consumer)
     {
         $this->consumer = $consumer;
 
@@ -202,9 +200,9 @@ public function setConsumer (ConsumerInterface $consumer)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getConsumer ()
+    public function getConsumer()
     {
         return $this->consumer;
     }
diff --git a/app/bundles/ApiBundle/Entity/oAuth1/Consumer.php b/app/bundles/ApiBundle/Entity/oAuth1/Consumer.php
index 33b1c4bcf28..089ad226541 100644
--- a/app/bundles/ApiBundle/Entity/oAuth1/Consumer.php
+++ b/app/bundles/ApiBundle/Entity/oAuth1/Consumer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,13 +19,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Consumer
- *
- * @package Mautic\ApiBundle\Entity\oAuth1
+ * Class Consumer.
  */
 class Consumer implements ConsumerInterface
 {
-
     /**
      * @var int
      */
@@ -56,9 +54,9 @@ class Consumer implements ConsumerInterface
     protected $accessTokens;
 
     /**
-     * Construct
+     * Construct.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->accessTokens = new ArrayCollection();
     }
@@ -66,14 +64,14 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('oauth1_consumers')
             ->setCustomRepositoryClass('Mautic\ApiBundle\Entity\oAuth1\ConsumerRepository')
             ->addLifecycleEvent('createConsumerKeys', 'prePersist')
-            ->addIndex(array('consumer_key'), 'consumer_search');
+            ->addIndex(['consumer_key'], 'consumer_search');
 
         $builder->addIdColumns('name', false);
 
@@ -97,47 +95,47 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('name', new Assert\NotBlank(
-            array('message' => 'mautic.core.name.required')
+            ['message' => 'mautic.core.name.required']
         ));
     }
 
     /**
-     * Proxy to get consumer key
+     * Proxy to get consumer key.
      *
      * @return mixed
      */
-    public function getRandomId ()
+    public function getRandomId()
     {
         return $this->consumerKey;
     }
 
     /**
-     * Proxy to consumer key
+     * Proxy to consumer key.
      *
      * @return mixed
      */
-    public function getPublicId ()
+    public function getPublicId()
     {
         return $this->consumerKey;
     }
 
     /**
-     * Proxy to consumer secret
+     * Proxy to consumer secret.
      *
      * @return mixed
      */
-    public function getSecret ()
+    public function getSecret()
     {
         return $this->consumerSecret;
     }
 
     /**
-     * Create consumer keys
+     * Create consumer keys.
      */
-    public function createConsumerKeys ()
+    public function createConsumerKeys()
     {
         if (empty($this->consumerKey)) {
             $this->consumerKey    = Random::generateToken();
@@ -146,35 +144,35 @@ public function createConsumerKeys ()
     }
 
     /**
-     * Proxy to callback
+     * Proxy to callback.
      *
      * @return array
      */
-    public function getRedirectUris ()
+    public function getRedirectUris()
     {
-        return array($this->callback);
+        return [$this->callback];
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->name = $name;
 
@@ -182,17 +180,17 @@ public function setName ($name)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getConsumerKey ()
+    public function getConsumerKey()
     {
         return $this->consumerKey;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setConsumerKey ($consumerKey)
+    public function setConsumerKey($consumerKey)
     {
         $this->consumerKey = $consumerKey;
 
@@ -200,17 +198,17 @@ public function setConsumerKey ($consumerKey)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getConsumerSecret ()
+    public function getConsumerSecret()
     {
         return $this->consumerSecret;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setConsumerSecret ($consumerSecret)
+    public function setConsumerSecret($consumerSecret)
     {
         $this->consumerSecret = $consumerSecret;
 
@@ -218,17 +216,17 @@ public function setConsumerSecret ($consumerSecret)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getCallback ()
+    public function getCallback()
     {
         return $this->callback;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setCallback ($callback)
+    public function setCallback($callback)
     {
         $this->callback = $callback;
 
diff --git a/app/bundles/ApiBundle/Entity/oAuth1/ConsumerRepository.php b/app/bundles/ApiBundle/Entity/oAuth1/ConsumerRepository.php
index fd51cc3f278..c0dc47a9d98 100644
--- a/app/bundles/ApiBundle/Entity/oAuth1/ConsumerRepository.php
+++ b/app/bundles/ApiBundle/Entity/oAuth1/ConsumerRepository.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Entity\oAuth1;
 
-use Mautic\CoreBundle\Entity\CommonRepository;
 use Doctrine\ORM\Tools\Pagination\Paginator;
+use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\UserBundle\Entity\User;
 
 /**
- * ConsumerRepository
+ * ConsumerRepository.
  */
 class ConsumerRepository extends CommonRepository
 {
-
     /**
      * @param User $user
      *
@@ -41,8 +41,6 @@ public function getUserClients(User $user)
     /**
      * @param Consumer $consumer
      * @param User     $user
-     *
-     * @return void
      */
     public function deleteAccessTokens(Consumer $consumer, User $user)
     {
@@ -55,10 +53,10 @@ public function deleteAccessTokens(Consumer $consumer, User $user)
                     $qb->expr()->eq('a.user', ':user')
                 )
             )
-            ->setParameters(array(
+            ->setParameters([
                 'consumer' => $consumer,
-                'user'     => $user
-            ));
+                'user'     => $user,
+            ]);
 
         $qb->getQuery()->execute();
     }
@@ -66,12 +64,13 @@ public function deleteAccessTokens(Consumer $consumer, User $user)
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('c');
 
         $query = $q->getQuery();
+
         return new Paginator($query);
     }
 
@@ -80,8 +79,8 @@ public function getEntities($args = array())
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('c.name',  ':'.$unique),
@@ -92,10 +91,10 @@ protected function addCatchAllWhereClause(&$q, $filter)
             $expr = $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -103,9 +102,9 @@ protected function addCatchAllWhereClause(&$q, $filter)
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('c.name', 'ASC')
-        );
+        return [
+            ['c.name', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/ApiBundle/Entity/oAuth1/Nonce.php b/app/bundles/ApiBundle/Entity/oAuth1/Nonce.php
index 23d39f5ac17..231f0972b14 100644
--- a/app/bundles/ApiBundle/Entity/oAuth1/Nonce.php
+++ b/app/bundles/ApiBundle/Entity/oAuth1/Nonce.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,26 +14,23 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class Nonce
- *
- * @package Mautic\ApiBundle\Entity\oAuth1
+ * Class Nonce.
  */
 class Nonce
 {
-
     /**
      * @var string
      */
     private $nonce;
 
-    /** @var  string */
+    /** @var string */
     private $timestamp;
 
     /**
      * @param $nonce
      * @param $timestamp
      */
-    public function __construct ($nonce, $timestamp)
+    public function __construct($nonce, $timestamp)
     {
         $this->nonce     = $nonce;
         $this->timestamp = $timestamp;
@@ -41,7 +39,7 @@ public function __construct ($nonce, $timestamp)
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -58,7 +56,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return mixed
      */
-    public function getNonce ()
+    public function getNonce()
     {
         return $this->nonce;
     }
@@ -66,7 +64,7 @@ public function getNonce ()
     /**
      * @return mixed
      */
-    public function getTimestamp ()
+    public function getTimestamp()
     {
         return $this->timestamp;
     }
diff --git a/app/bundles/ApiBundle/Entity/oAuth1/NonceRepository.php b/app/bundles/ApiBundle/Entity/oAuth1/NonceRepository.php
index ffb5ba80f3f..fa80733f8f5 100644
--- a/app/bundles/ApiBundle/Entity/oAuth1/NonceRepository.php
+++ b/app/bundles/ApiBundle/Entity/oAuth1/NonceRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,17 +13,14 @@
 use Doctrine\ORM\EntityRepository;
 
 /**
- * NonceRepository
+ * NonceRepository.
  */
 class NonceRepository extends EntityRepository
 {
-
     /**
-     * Delete nonces that are older than $timestamp
+     * Delete nonces that are older than $timestamp.
      *
      * @param string $timestamp
-     *
-     * @return void
      */
     public function removeOutdatedNonces($timestamp)
     {
diff --git a/app/bundles/ApiBundle/Entity/oAuth1/RequestToken.php b/app/bundles/ApiBundle/Entity/oAuth1/RequestToken.php
index abea07647ae..16287c6a3ce 100644
--- a/app/bundles/ApiBundle/Entity/oAuth1/RequestToken.php
+++ b/app/bundles/ApiBundle/Entity/oAuth1/RequestToken.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,13 +17,10 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * Class RequestToken
- *
- * @package Mautic\ApiBundle\Entity\oAuth1
+ * Class RequestToken.
  */
 class RequestToken implements RequestTokenInterface
 {
-
     /**
      * @var int
      */
@@ -49,7 +47,7 @@ class RequestToken implements RequestTokenInterface
     protected $secret;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $expiresAt;
 
@@ -61,12 +59,12 @@ class RequestToken implements RequestTokenInterface
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('oauth1_request_tokens')
-            ->addIndex(array('token'), 'oauth1_request_token_search');
+            ->addIndex(['token'], 'oauth1_request_token_search');
 
         $builder->createField('id', 'integer')
             ->isPrimaryKey()
@@ -93,25 +91,25 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getToken ()
+    public function getToken()
     {
         return $this->token;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setToken ($token)
+    public function setToken($token)
     {
         $this->token = $token;
 
@@ -119,17 +117,17 @@ public function setToken ($token)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getSecret ()
+    public function getSecret()
     {
         return $this->secret;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setSecret ($secret)
+    public function setSecret($secret)
     {
         $this->secret = $secret;
 
@@ -137,17 +135,17 @@ public function setSecret ($secret)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getExpiresAt ()
+    public function getExpiresAt()
     {
         return $this->expiresAt;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setExpiresAt ($expiresAt)
+    public function setExpiresAt($expiresAt)
     {
         $this->expiresAt = $expiresAt;
 
@@ -155,9 +153,9 @@ public function setExpiresAt ($expiresAt)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getExpiresIn ()
+    public function getExpiresIn()
     {
         if ($this->expiresAt) {
             return $this->expiresAt - time();
@@ -167,9 +165,9 @@ public function getExpiresIn ()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function hasExpired ()
+    public function hasExpired()
     {
         if ($this->expiresAt) {
             return time() > $this->expiresAt;
@@ -179,17 +177,17 @@ public function hasExpired ()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getUser ()
+    public function getUser()
     {
         return $this->user;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setUser (UserInterface $user)
+    public function setUser(UserInterface $user)
     {
         $this->user = $user;
 
@@ -197,9 +195,9 @@ public function setUser (UserInterface $user)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setConsumer (ConsumerInterface $consumer)
+    public function setConsumer(ConsumerInterface $consumer)
     {
         $this->consumer = $consumer;
 
@@ -207,25 +205,25 @@ public function setConsumer (ConsumerInterface $consumer)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getConsumer ()
+    public function getConsumer()
     {
         return $this->consumer;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function getVerifier ()
+    public function getVerifier()
     {
         return $this->verifier;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setVerifier ($verifier)
+    public function setVerifier($verifier)
     {
         $this->verifier = $verifier;
     }
diff --git a/app/bundles/ApiBundle/Entity/oAuth2/AccessToken.php b/app/bundles/ApiBundle/Entity/oAuth2/AccessToken.php
index 03452ebdfab..adb817f1dcf 100644
--- a/app/bundles/ApiBundle/Entity/oAuth2/AccessToken.php
+++ b/app/bundles/ApiBundle/Entity/oAuth2/AccessToken.php
@@ -1,28 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Entity\oAuth2;
 
-use FOS\OAuthServerBundle\Model\AccessToken as BaseAccessToken;
 use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Model\AccessToken as BaseAccessToken;
+use FOS\OAuthServerBundle\Model\ClientInterface;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Symfony\Component\Security\Core\User\UserInterface;
-use FOS\OAuthServerBundle\Model\ClientInterface;
 
 /**
- * Class AccessToken
- *
- * @package Mautic\ApiBundle\Entity\oAuth2
+ * Class AccessToken.
  */
 class AccessToken extends BaseAccessToken
 {
-
     /**
      * @var int
      */
@@ -56,12 +54,12 @@ class AccessToken extends BaseAccessToken
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('oauth2_accesstokens')
-            ->addIndex(array('token'), 'oauth2_access_token_search');
+            ->addIndex(['token'], 'oauth2_access_token_search');
 
         $builder->createField('id', 'integer')
             ->isPrimaryKey()
@@ -91,23 +89,23 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set client
+     * Set client.
      *
      * @param ClientInterface $client
      *
      * @return AccessToken
      */
-    public function setClient (ClientInterface $client)
+    public function setClient(ClientInterface $client)
     {
         $this->client = $client;
 
@@ -115,23 +113,23 @@ public function setClient (ClientInterface $client)
     }
 
     /**
-     * Get client
+     * Get client.
      *
      * @return ClientInterface
      */
-    public function getClient ()
+    public function getClient()
     {
         return $this->client;
     }
 
     /**
-     * Set user
+     * Set user.
      *
      * @param UserInterface $user
      *
      * @return AccessToken
      */
-    public function setUser (UserInterface $user = null)
+    public function setUser(UserInterface $user = null)
     {
         $this->user = $user;
 
@@ -139,11 +137,11 @@ public function setUser (UserInterface $user = null)
     }
 
     /**
-     * Get user
+     * Get user.
      *
      * @return UserInterface
      */
-    public function getUser ()
+    public function getUser()
     {
         return $this->user;
     }
diff --git a/app/bundles/ApiBundle/Entity/oAuth2/AuthCode.php b/app/bundles/ApiBundle/Entity/oAuth2/AuthCode.php
index df6921c7984..fd3748c26f6 100644
--- a/app/bundles/ApiBundle/Entity/oAuth2/AuthCode.php
+++ b/app/bundles/ApiBundle/Entity/oAuth2/AuthCode.php
@@ -1,28 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Entity\oAuth2;
 
-use FOS\OAuthServerBundle\Model\AuthCode as BaseAuthCode;
 use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Model\AuthCode as BaseAuthCode;
+use FOS\OAuthServerBundle\Model\ClientInterface;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Symfony\Component\Security\Core\User\UserInterface;
-use FOS\OAuthServerBundle\Model\ClientInterface;
 
 /**
- * Class AuthCode
- *
- * @package Mautic\ApiBundle\Entity\oAuth2
+ * Class AuthCode.
  */
 class AuthCode extends BaseAuthCode
 {
-
     /**
      * @var int
      */
@@ -61,7 +59,7 @@ class AuthCode extends BaseAuthCode
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -99,23 +97,23 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set client
+     * Set client.
      *
      * @param ClientInterface $client
      *
      * @return RefreshToken
      */
-    public function setClient (ClientInterface $client)
+    public function setClient(ClientInterface $client)
     {
         $this->client = $client;
 
@@ -123,23 +121,23 @@ public function setClient (ClientInterface $client)
     }
 
     /**
-     * Get client
+     * Get client.
      *
      * @return ClientInterface
      */
-    public function getClient ()
+    public function getClient()
     {
         return $this->client;
     }
 
     /**
-     * Set user
+     * Set user.
      *
      * @param UserInterface $user
      *
      * @return RefreshToken
      */
-    public function setUser (UserInterface $user = null)
+    public function setUser(UserInterface $user = null)
     {
         $this->user = $user;
 
@@ -147,11 +145,11 @@ public function setUser (UserInterface $user = null)
     }
 
     /**
-     * Get user
+     * Get user.
      *
      * @return UserInterface
      */
-    public function getUser ()
+    public function getUser()
     {
         return $this->user;
     }
diff --git a/app/bundles/ApiBundle/Entity/oAuth2/Client.php b/app/bundles/ApiBundle/Entity/oAuth2/Client.php
index f32eae761ab..e66aa6b593c 100644
--- a/app/bundles/ApiBundle/Entity/oAuth2/Client.php
+++ b/app/bundles/ApiBundle/Entity/oAuth2/Client.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Entity\oAuth2;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use FOS\OAuthServerBundle\Model\Client as BaseClient;
 use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Model\Client as BaseClient;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\UserBundle\Entity\User;
 use OAuth2\OAuth2;
@@ -19,13 +20,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Client
- *
- * @package Mautic\ApiBundle\Entity\oAuth2
+ * Class Client.
  */
 class Client extends BaseClient
 {
-
     /**
      * @var int
      */
@@ -54,7 +52,7 @@ class Client extends BaseClient
     /**
      * @var array
      */
-    protected $redirectUris = array();
+    protected $redirectUris = [];
 
     /**
      * @var array
@@ -62,16 +60,16 @@ class Client extends BaseClient
     protected $allowedGrantTypes;
 
     /**
-     *  Construct
+     *  Construct.
      */
-    public function __construct ()
+    public function __construct()
     {
         parent::__construct();
 
-        $this->allowedGrantTypes = array(
+        $this->allowedGrantTypes = [
             OAuth2::GRANT_TYPE_AUTH_CODE,
             OAuth2::GRANT_TYPE_REFRESH_TOKEN,
-        );
+        ];
 
         $this->users = new ArrayCollection();
     }
@@ -79,13 +77,13 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('oauth2_clients')
             ->setCustomRepositoryClass('Mautic\ApiBundle\Entity\oAuth2\ClientRepository')
-            ->addIndex(array('random_id'), 'client_id_search');
+            ->addIndex(['random_id'], 'client_id_search');
 
         $builder->addIdColumns('name', false);
 
@@ -114,14 +112,14 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('name', new Assert\NotBlank(
-            array('message' => 'mautic.core.name.required')
+            ['message' => 'mautic.core.name.required']
         ));
 
         $metadata->addPropertyConstraint('redirectUris', new Assert\NotBlank(
-            array('message' => 'mautic.api.client.redirecturis.notblank')
+            ['message' => 'mautic.api.client.redirecturis.notblank']
         ));
     }
 
@@ -133,44 +131,42 @@ public static function loadValidatorMetadata (ClassMetadata $metadata)
     /**
      * @param $prop
      * @param $val
-     *
-     * @return void
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($current != $val) {
-            $this->changes[$prop] = array($current, $val);
+            $this->changes[$prop] = [$current, $val];
         }
     }
 
     /**
      * @return array
      */
-    public function getChanges ()
+    public function getChanges()
     {
         return $this->changes;
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Client
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
 
@@ -180,11 +176,11 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
@@ -192,7 +188,7 @@ public function getName ()
     /**
      * {@inheritdoc}
      */
-    public function setRedirectUris (array $redirectUris)
+    public function setRedirectUris(array $redirectUris)
     {
         $this->isChanged('redirectUris', $redirectUris);
 
@@ -200,13 +196,13 @@ public function setRedirectUris (array $redirectUris)
     }
 
     /**
-     * Add authCodes
+     * Add authCodes.
      *
      * @param AuthCode $authCodes
      *
      * @return Client
      */
-    public function addAuthCode (AuthCode $authCodes)
+    public function addAuthCode(AuthCode $authCodes)
     {
         $this->authCodes[] = $authCodes;
 
@@ -214,33 +210,33 @@ public function addAuthCode (AuthCode $authCodes)
     }
 
     /**
-     * Remove authCodes
+     * Remove authCodes.
      *
      * @param AuthCode $authCodes
      */
-    public function removeAuthCode (AuthCode $authCodes)
+    public function removeAuthCode(AuthCode $authCodes)
     {
         $this->authCodes->removeElement($authCodes);
     }
 
     /**
-     * Get authCodes
+     * Get authCodes.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getAuthCodes ()
+    public function getAuthCodes()
     {
         return $this->authCodes;
     }
 
     /**
-     * Determines if a client attempting API access is already authorized by the user
+     * Determines if a client attempting API access is already authorized by the user.
      *
      * @param User $user
      *
      * @return bool
      */
-    public function isAuthorizedClient (User $user)
+    public function isAuthorizedClient(User $user)
     {
         $users = $this->getUsers();
 
@@ -248,13 +244,13 @@ public function isAuthorizedClient (User $user)
     }
 
     /**
-     * Add users
+     * Add users.
      *
      * @param \Mautic\UserBundle\Entity\User $users
      *
      * @return Client
      */
-    public function addUser (\Mautic\UserBundle\Entity\User $users)
+    public function addUser(\Mautic\UserBundle\Entity\User $users)
     {
         $this->users[] = $users;
 
@@ -262,21 +258,21 @@ public function addUser (\Mautic\UserBundle\Entity\User $users)
     }
 
     /**
-     * Remove users
+     * Remove users.
      *
      * @param \Mautic\UserBundle\Entity\User $users
      */
-    public function removeUser (\Mautic\UserBundle\Entity\User $users)
+    public function removeUser(\Mautic\UserBundle\Entity\User $users)
     {
         $this->users->removeElement($users);
     }
 
     /**
-     * Get users
+     * Get users.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getUsers ()
+    public function getUsers()
     {
         return $this->users;
     }
diff --git a/app/bundles/ApiBundle/Entity/oAuth2/ClientRepository.php b/app/bundles/ApiBundle/Entity/oAuth2/ClientRepository.php
index 9c82eadf1ab..882a1295eaf 100644
--- a/app/bundles/ApiBundle/Entity/oAuth2/ClientRepository.php
+++ b/app/bundles/ApiBundle/Entity/oAuth2/ClientRepository.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Entity\oAuth2;
 
-use Mautic\CoreBundle\Entity\CommonRepository;
 use Doctrine\ORM\Tools\Pagination\Paginator;
+use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\UserBundle\Entity\User;
 
 /**
- * ClientRepository
+ * ClientRepository.
  */
 class ClientRepository extends CommonRepository
 {
-
     /**
      * @param User $user
      *
@@ -38,12 +38,13 @@ public function getUserClients(User $user)
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('c');
 
         $query = $q->getQuery();
+
         return new Paginator($query);
     }
 
@@ -52,8 +53,8 @@ public function getEntities($args = array())
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('c.name',  ':'.$unique),
@@ -64,10 +65,10 @@ protected function addCatchAllWhereClause(&$q, $filter)
             $expr = $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -75,9 +76,9 @@ protected function addCatchAllWhereClause(&$q, $filter)
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('c.name', 'ASC')
-        );
+        return [
+            ['c.name', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/ApiBundle/Entity/oAuth2/RefreshToken.php b/app/bundles/ApiBundle/Entity/oAuth2/RefreshToken.php
index 8254f85358e..f3a857bae54 100644
--- a/app/bundles/ApiBundle/Entity/oAuth2/RefreshToken.php
+++ b/app/bundles/ApiBundle/Entity/oAuth2/RefreshToken.php
@@ -1,28 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Entity\oAuth2;
 
-use FOS\OAuthServerBundle\Model\RefreshToken as BaseRefreshToken;
 use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Model\ClientInterface;
+use FOS\OAuthServerBundle\Model\RefreshToken as BaseRefreshToken;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Symfony\Component\Security\Core\User\UserInterface;
-use FOS\OAuthServerBundle\Model\ClientInterface;
 
 /**
- * Class RefreshToken
- *
- * @package Mautic\ApiBundle\Entity\oAuth2
+ * Class RefreshToken.
  */
 class RefreshToken extends BaseRefreshToken
 {
-
     /**
      * @var int
      */
@@ -56,12 +54,12 @@ class RefreshToken extends BaseRefreshToken
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('oauth2_refreshtokens')
-            ->addIndex(array('token'), 'oauth2_refresh_token_search');
+            ->addIndex(['token'], 'oauth2_refresh_token_search');
 
         $builder->createField('id', 'integer')
             ->isPrimaryKey()
@@ -91,23 +89,23 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set client
+     * Set client.
      *
      * @param ClientInterface $client
      *
      * @return RefreshToken
      */
-    public function setClient (ClientInterface $client)
+    public function setClient(ClientInterface $client)
     {
         $this->client = $client;
 
@@ -115,23 +113,23 @@ public function setClient (ClientInterface $client)
     }
 
     /**
-     * Get client
+     * Get client.
      *
      * @return ClientInterface
      */
-    public function getClient ()
+    public function getClient()
     {
         return $this->client;
     }
 
     /**
-     * Set user
+     * Set user.
      *
      * @param UserInterface $user
      *
      * @return RefreshToken
      */
-    public function setUser (UserInterface $user = null)
+    public function setUser(UserInterface $user = null)
     {
         $this->user = $user;
 
@@ -139,12 +137,12 @@ public function setUser (UserInterface $user = null)
     }
 
     /**
-     * Get user
+     * Get user.
      *
      * @return UserInterface
      */
-    public function getUser ()
+    public function getUser()
     {
         return $this->user;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/Event/ClientEvent.php b/app/bundles/ApiBundle/Event/ClientEvent.php
index 53bd69d3c01..69482cbe335 100644
--- a/app/bundles/ApiBundle/Event/ClientEvent.php
+++ b/app/bundles/ApiBundle/Event/ClientEvent.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Event;
 
 use Mautic\ApiBundle\Entity\oAuth1\Consumer;
-use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\ApiBundle\Entity\oAuth2\Client;
+use Mautic\CoreBundle\Event\CommonEvent;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class ClientEvent
+ * Class ClientEvent.
  */
 class ClientEvent extends CommonEvent
 {
-
     /**
      * @var string
      */
@@ -32,7 +32,7 @@ class ClientEvent extends CommonEvent
     public function __construct($client, $isNew = false)
     {
         if (!$client instanceof Client && !$client instanceof Consumer) {
-            throw new MethodNotAllowedHttpException(array('Client', 'Consumer'));
+            throw new MethodNotAllowedHttpException(['Client', 'Consumer']);
         }
 
         $this->apiMode = ($client instanceof Client) ? 'oauth2' : 'oauth1';
@@ -42,7 +42,7 @@ public function __construct($client, $isNew = false)
     }
 
     /**
-     * Returns the Client entity
+     * Returns the Client entity.
      *
      * @return Client
      */
@@ -52,7 +52,7 @@ public function getClient()
     }
 
     /**
-     * Returns the api mode
+     * Returns the api mode.
      *
      * @return string
      */
diff --git a/app/bundles/ApiBundle/EventListener/ApiSubscriber.php b/app/bundles/ApiBundle/EventListener/ApiSubscriber.php
index 333c4b543d4..d7b5ceecdd0 100644
--- a/app/bundles/ApiBundle/EventListener/ApiSubscriber.php
+++ b/app/bundles/ApiBundle/EventListener/ApiSubscriber.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\EventListener;
 
 use Mautic\ApiBundle\ApiEvents;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Mautic\ApiBundle\Event as Events;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
@@ -21,7 +21,7 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * Class ApiSubscriber
+ * Class ApiSubscriber.
  */
 class ApiSubscriber extends CommonSubscriber
 {
@@ -49,9 +49,9 @@ class ApiSubscriber extends CommonSubscriber
      */
     public function __construct(IpLookupHelper $ipLookupHelper, CoreParametersHelper $coreParametersHelper, AuditLogModel $auditLogModel)
     {
-        $this->ipLookupHelper = $ipLookupHelper;
+        $this->ipLookupHelper       = $ipLookupHelper;
         $this->coreParametersHelper = $coreParametersHelper;
-        $this->auditLogModel = $auditLogModel;
+        $this->auditLogModel        = $auditLogModel;
     }
 
     /**
@@ -59,15 +59,15 @@ public function __construct(IpLookupHelper $ipLookupHelper, CoreParametersHelper
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST         => array('onKernelRequest', 255),
-            ApiEvents::CLIENT_POST_SAVE   => array('onClientPostSave', 0),
-            ApiEvents::CLIENT_POST_DELETE => array('onClientDelete', 0)
-        );
+        return [
+            KernelEvents::REQUEST         => ['onKernelRequest', 255],
+            ApiEvents::CLIENT_POST_SAVE   => ['onClientPostSave', 0],
+            ApiEvents::CLIENT_POST_DELETE => ['onClientDelete', 0],
+        ];
     }
 
     /**
-     * Check for API requests and throw denied access if API is disabled
+     * Check for API requests and throw denied access if API is disabled.
      *
      * @param GetResponseEvent $event
      */
@@ -86,20 +86,19 @@ public function onKernelRequest(GetResponseEvent $event)
         defined('MAUTIC_API_REQUEST') or define('MAUTIC_API_REQUEST', $isApiRequest);
 
         if ($isApiRequest && !$apiEnabled) {
-
             throw new AccessDeniedHttpException(
                 $this->translator->trans(
                     'mautic.core.url.error.401',
-                    array(
-                        '%url%' => $request->getRequestUri()
-                    )
+                    [
+                        '%url%' => $request->getRequestUri(),
+                    ]
                 )
             );
         }
     }
 
     /**
-     * Add a client change entry to the audit log
+     * Add a client change entry to the audit log.
      *
      * @param Events\ClientEvent $event
      */
@@ -107,34 +106,34 @@ public function onClientPostSave(Events\ClientEvent $event)
     {
         $client = $event->getClient();
         if ($details = $event->getChanges()) {
-            $log        = array(
+            $log = [
                 'bundle'    => 'api',
                 'object'    => 'client',
                 'objectId'  => $client->getId(),
                 'action'    => ($event->isNew()) ? 'create' : 'update',
                 'details'   => $details,
-                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a role delete entry to the audit log
+     * Add a role delete entry to the audit log.
      *
      * @param Events\ClientEvent $event
      */
     public function onClientDelete(Events\ClientEvent $event)
     {
         $client = $event->getClient();
-        $log = array(
-            'bundle'     => 'api',
-            'object'     => 'client',
-            'objectId'   => $client->deletedId,
-            'action'     => 'delete',
-            'details'    => array('name' => $client->getName()),
-            'ipAddress'  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log    = [
+            'bundle'    => 'api',
+            'object'    => 'client',
+            'objectId'  => $client->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $client->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 }
diff --git a/app/bundles/ApiBundle/EventListener/ConfigSubscriber.php b/app/bundles/ApiBundle/EventListener/ConfigSubscriber.php
index 8fb6844224d..0f9b7d2888f 100644
--- a/app/bundles/ApiBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/ApiBundle/EventListener/ConfigSubscriber.php
@@ -1,42 +1,41 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class ConfigSubscriber
- *
- * @package Mautic\ApiBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE => array('onConfigGenerate', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+        ];
     }
 
-    public function onConfigGenerate (ConfigBuilderEvent $event)
+    public function onConfigGenerate(ConfigBuilderEvent $event)
     {
-        $event->addForm(array(
+        $event->addForm([
             'bundle'     => 'ApiBundle',
             'formAlias'  => 'apiconfig',
             'formTheme'  => 'MauticApiBundle:FormTheme\Config',
-            'parameters' => $event->getParametersFromConfig('MauticApiBundle')
-        ));
+            'parameters' => $event->getParametersFromConfig('MauticApiBundle'),
+        ]);
     }
 }
diff --git a/app/bundles/ApiBundle/EventListener/OAuth1/OAuthRequestListener.php b/app/bundles/ApiBundle/EventListener/OAuth1/OAuthRequestListener.php
index 40c4a2938b9..9c31326d6ba 100644
--- a/app/bundles/ApiBundle/EventListener/OAuth1/OAuthRequestListener.php
+++ b/app/bundles/ApiBundle/EventListener/OAuth1/OAuthRequestListener.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,14 +13,15 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class OAuthRequestListener
+ * Class OAuthRequestListener.
  */
-class OAuthRequestListener extends \Bazinga\OAuthServerBundle\EventListener\OAuthRequestListener {
-
+class OAuthRequestListener extends \Bazinga\OAuthServerBundle\EventListener\OAuthRequestListener
+{
     /**
      * {@inheritdoc}
      *
-     * @param  Request $request The request.
+     * @param Request $request The request
+     *
      * @return array
      */
     protected function parseAuthorizationHeader(Request $request)
@@ -43,4 +45,4 @@ protected function parseAuthorizationHeader(Request $request)
 
         return parent::parseAuthorizationHeader($request);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/EventListener/OAuthEventListener.php b/app/bundles/ApiBundle/EventListener/OAuthEventListener.php
index e43dd9ed579..3ec203558b5 100644
--- a/app/bundles/ApiBundle/EventListener/OAuthEventListener.php
+++ b/app/bundles/ApiBundle/EventListener/OAuthEventListener.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -49,15 +50,14 @@ public function __construct(EntityManager $entityManager, CorePermissions $coreP
     /**
      * @param OAuthEvent $event
      *
-     * @return void
      * @throws AccessDeniedException
      */
     public function onPreAuthorizationProcess(OAuthEvent $event)
     {
         if ($user = $this->getUser($event)) {
             //check to see if user has api access
-            if (!$this->mauticSecurity->isGranted("api:access:full")) {
-                throw new AccessDeniedException($this->translator->trans('mautic.core.error.accessdenied', array(), 'flashes'));
+            if (!$this->mauticSecurity->isGranted('api:access:full')) {
+                throw new AccessDeniedException($this->translator->trans('mautic.core.error.accessdenied', [], 'flashes'));
             }
             $client = $event->getClient();
             $event->setAuthorizedClient(
@@ -68,8 +68,6 @@ public function onPreAuthorizationProcess(OAuthEvent $event)
 
     /**
      * @param OAuthEvent $event
-     *
-     * @return void
      */
     public function onPostAuthorizationProcess(OAuthEvent $event)
     {
diff --git a/app/bundles/ApiBundle/EventListener/SearchSubscriber.php b/app/bundles/ApiBundle/EventListener/SearchSubscriber.php
index afe01ea3f86..b8eb62e37c4 100644
--- a/app/bundles/ApiBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/ApiBundle/EventListener/SearchSubscriber.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\EventListener;
 
 use Mautic\ApiBundle\Model\ClientModel;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\ApiBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -39,12 +38,12 @@ public function __construct(ClientModel $apiClientModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
@@ -59,31 +58,31 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
             }
 
             $clients = $this->apiClientModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $str
-                ));
+                    'filter' => $str,
+                ]);
 
             if (count($clients) > 0) {
-                $clientResults = array();
-                $canEdit     = $this->security->isGranted('api:clients:edit');
+                $clientResults = [];
+                $canEdit       = $this->security->isGranted('api:clients:edit');
                 foreach ($clients as $client) {
                     $clientResults[] = $this->templating->renderResponse(
                         'MauticApiBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'client'  => $client,
-                            'canEdit' => $canEdit
-                        )
+                            'canEdit' => $canEdit,
+                        ]
                     )->getContent();
                 }
                 if (count($clients) > 5) {
                     $clientResults[] = $this->templating->renderResponse(
                         'MauticApiBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($clients) - 5)
-                        )
+                            'remaining'    => (count($clients) - 5),
+                        ]
                     )->getContent();
                 }
                 $clientResults['count'] = count($clients);
@@ -97,7 +96,7 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
      */
     public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        $security   = $this->security;
+        $security = $this->security;
         if ($security->isGranted('api:clients:view')) {
             $event->addCommands(
                 'mautic.api.client.header.index',
@@ -105,4 +104,4 @@ public function onBuildCommandList(MauticEvents\CommandListEvent $event)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/Form/Type/ClientType.php b/app/bundles/ApiBundle/Form/Type/ClientType.php
index 4a10e0b92d6..17e46d7efda 100644
--- a/app/bundles/ApiBundle/Form/Type/ClientType.php
+++ b/app/bundles/ApiBundle/Form/Type/ClientType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,23 +12,21 @@
 
 use Mautic\ApiBundle\Form\Validator\Constraints\OAuthCallback;
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Form\DataTransformer as Transformers;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormError;
-use Mautic\CoreBundle\Form\DataTransformer as Transformers;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ClientType
+ * Class ClientType.
  */
 class ClientType extends AbstractType
 {
-
     /**
      * @var \Symfony\Bundle\FrameworkBundle\Translation\Translator
      */
@@ -71,33 +70,33 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 'api_mode',
                 'choice',
-                array(
-                    'mapped'      => false,
-                    'label'       => 'mautic.api.client.form.auth_protocol',
-                    'label_attr'  => array('class' => 'control-label'),
-                    'attr'        => array(
+                [
+                    'mapped'     => false,
+                    'label'      => 'mautic.api.client.form.auth_protocol',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'    => 'form-control',
-                        'onchange' => 'Mautic.refreshApiClientForm(\'' . $this->router->generate('mautic_client_action', array('objectAction' => 'new')) . '\', this)'
-                    ),
-                    'choices'     => array(
+                        'onchange' => 'Mautic.refreshApiClientForm(\''.$this->router->generate('mautic_client_action', ['objectAction' => 'new']).'\', this)',
+                    ],
+                    'choices' => [
                         'oauth1a' => 'OAuth 1.0a',
-                        'oauth2'  => 'OAuth 2'
-                    ),
+                        'oauth2'  => 'OAuth 2',
+                    ],
                     'required'    => false,
                     'empty_value' => false,
-                    'data'        => $this->apiMode
-                )
+                    'data'        => $this->apiMode,
+                ]
             );
         }
 
         $builder->add(
             'name',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.name',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control')
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
 
         if ($this->apiMode == 'oauth2') {
@@ -106,14 +105,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $builder->create(
                     'redirectUris',
                     'text',
-                    array(
+                    [
                         'label'      => 'mautic.api.client.redirecturis',
-                        'label_attr' => array('class' => 'control-label'),
-                        'attr'       => array(
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
                             'class'   => 'form-control',
                             'tooltip' => 'mautic.api.client.form.help.requesturis',
-                        )
-                    )
+                        ],
+                    ]
                 )
                     ->addViewTransformer($arrayStringTransformer)
             );
@@ -121,27 +120,27 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 'publicId',
                 'text',
-                array(
+                [
                     'label'      => 'mautic.api.client.form.clientid',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array('class' => 'form-control'),
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => ['class' => 'form-control'],
                     'disabled'   => true,
                     'required'   => false,
                     'mapped'     => false,
-                    'data'       => $options['data']->getPublicId()
-                )
+                    'data'       => $options['data']->getPublicId(),
+                ]
             );
 
             $builder->add(
                 'secret',
                 'text',
-                array(
+                [
                     'label'      => 'mautic.api.client.form.clientsecret',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array('class' => 'form-control'),
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => ['class' => 'form-control'],
                     'disabled'   => true,
-                    'required'   => false
-                )
+                    'required'   => false,
+                ]
             );
 
             $translator = $this->translator;
@@ -155,10 +154,10 @@ function (FormEvent $event) use ($translator, $validator) {
 
                     if ($form->has('redirectUris')) {
                         foreach ($data->getRedirectUris() as $uri) {
-                            $urlConstraint          = new OAuthCallback();
+                            $urlConstraint = new OAuthCallback();
                             $urlConstraint->message = $translator->trans(
                                 'mautic.api.client.redirecturl.invalid',
-                                array('%url%' => $uri),
+                                ['%url%' => $uri],
                                 'validators'
                             );
 
@@ -181,48 +180,48 @@ function (FormEvent $event) use ($translator, $validator) {
                 $builder->create(
                     'callback',
                     'text',
-                    array(
+                    [
                         'label'      => 'mautic.api.client.form.callback',
-                        'label_attr' => array('class' => 'control-label'),
-                        'attr'       => array(
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
                             'class'   => 'form-control',
                             'tooltip' => 'mautic.api.client.form.help.callback',
-                        ),
-                        'required'   => false
-                    )
+                        ],
+                        'required' => false,
+                    ]
                 )->addModelTransformer(new Transformers\NullToEmptyTransformer())
             );
 
             $builder->add(
                 'consumerKey',
                 'text',
-                array(
+                [
                     'label'      => 'mautic.api.client.form.consumerkey',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'   => 'form-control',
-                        'onclick' => 'this.setSelectionRange(0, this.value.length);'
-                    ),
-                    'read_only'  => true,
-                    'required'   => false,
-                    'mapped'     => false,
-                    'data'       => $options['data']->getConsumerKey()
-                )
+                        'onclick' => 'this.setSelectionRange(0, this.value.length);',
+                    ],
+                    'read_only' => true,
+                    'required'  => false,
+                    'mapped'    => false,
+                    'data'      => $options['data']->getConsumerKey(),
+                ]
             );
 
             $builder->add(
                 'consumerSecret',
                 'text',
-                array(
+                [
                     'label'      => 'mautic.api.client.form.consumersecret',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'   => 'form-control',
-                        'onclick' => 'this.setSelectionRange(0, this.value.length);'
-                    ),
-                    'read_only'  => true,
-                    'required'   => false
-                )
+                        'onclick' => 'this.setSelectionRange(0, this.value.length);',
+                    ],
+                    'read_only' => true,
+                    'required'  => false,
+                ]
             );
 
             $translator = $this->translator;
@@ -235,9 +234,9 @@ function (FormEvent $event) use ($translator, $validator) {
                     $data = $event->getData();
 
                     if ($form->has('callback')) {
-                        $uri                    = $data->getCallback();
-                        $urlConstraint          = new OAuthCallback();
-                        $urlConstraint->message = $translator->trans('mautic.api.client.redirecturl.invalid', array('%url%' => $uri), 'validators');
+                        $uri = $data->getCallback();
+                        $urlConstraint = new OAuthCallback();
+                        $urlConstraint->message = $translator->trans('mautic.api.client.redirecturl.invalid', ['%url%' => $uri], 'validators');
 
                         $errors = $validator->validateValue(
                             $uri,
@@ -256,8 +255,8 @@ function (FormEvent $event) use ($translator, $validator) {
 
         $builder->add('buttons', 'form_buttons');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -268,9 +267,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $dataClass = ($this->apiMode == 'oauth2') ? 'Mautic\ApiBundle\Entity\oAuth2\Client' : 'Mautic\ApiBundle\Entity\oAuth1\Consumer';
         $resolver->setDefaults(
-            array(
-                'data_class' => $dataClass
-            )
+            [
+                'data_class' => $dataClass,
+            ]
         );
     }
 
@@ -279,6 +278,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "client";
+        return 'client';
     }
 }
diff --git a/app/bundles/ApiBundle/Form/Type/ConfigType.php b/app/bundles/ApiBundle/Form/Type/ConfigType.php
index 8a01f75b62a..aa8e61e6925 100644
--- a/app/bundles/ApiBundle/Form/Type/ConfigType.php
+++ b/app/bundles/ApiBundle/Form/Type/ConfigType.php
@@ -1,23 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class ConfigType
- *
- * @package Mautic\ApiBundle\Form\Type
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
@@ -25,58 +23,58 @@ class ConfigType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add(
             'api_enabled',
             'yesno_button_group',
-            array(
+            [
                 'label' => 'mautic.api.config.form.api.enabled',
                 'data'  => (bool) $options['data']['api_enabled'],
-                'attr'  => array(
-                    'tooltip' => 'mautic.api.config.form.api.enabled.tooltip'
-                )
-            )
+                'attr'  => [
+                    'tooltip' => 'mautic.api.config.form.api.enabled.tooltip',
+                ],
+            ]
         );
 
         $builder->add(
             'api_oauth2_access_token_lifetime',
             'number',
-            array(
-                'label'       => 'mautic.api.config.form.api.oauth2_access_token_lifetime',
-                'attr'        => array(
+            [
+                'label' => 'mautic.api.config.form.api.oauth2_access_token_lifetime',
+                'attr'  => [
                     'tooltip'      => 'mautic.api.config.form.api.oauth2_access_token_lifetime.tooltip',
                     'class'        => 'form-control',
                     'data-show-on' => '{"config_apiconfig_api_enabled_1":"checked"}',
-                ),
-                'constraints' => array(
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'api_oauth2_refresh_token_lifetime',
             'number',
-            array(
-                'label'       => 'mautic.api.config.form.api.oauth2_refresh_token_lifetime',
-                'attr'        => array(
+            [
+                'label' => 'mautic.api.config.form.api.oauth2_refresh_token_lifetime',
+                'attr'  => [
                     'tooltip'      => 'mautic.api.config.form.api.oauth2_refresh_token_lifetime.tooltip',
                     'class'        => 'form-control',
                     'data-show-on' => '{"config_apiconfig_api_enabled_1":"checked"}',
-                ),
-                'constraints' => array(
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
     }
 
@@ -87,4 +85,4 @@ public function getName()
     {
         return 'apiconfig';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallback.php b/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallback.php
index ae36a55a1e3..44b50b21e3d 100644
--- a/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallback.php
+++ b/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallback.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,4 +23,4 @@ public function validatedBy()
     {
         return 'oauth_callback';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallbackValidator.php b/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallbackValidator.php
index 4a1472d7b83..896104c672c 100644
--- a/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallbackValidator.php
+++ b/app/bundles/ApiBundle/Form/Validator/Constraints/OAuthCallbackValidator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Modified from \Symfony\Component\Validator\Constraints\UrlValidator
+ * Modified from \Symfony\Component\Validator\Constraints\UrlValidator.
  *
  * This file is part of the Symfony package.
  *
@@ -10,10 +10,11 @@
  * file that was distributed with this source code.
  *
  *
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -52,4 +53,4 @@ public function validate($value, Constraint $constraint)
                 ->addViolation();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/MauticApiBundle.php b/app/bundles/ApiBundle/MauticApiBundle.php
index 0fd96c5163b..9a9600b4504 100644
--- a/app/bundles/ApiBundle/MauticApiBundle.php
+++ b/app/bundles/ApiBundle/MauticApiBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticApiBundle
+ * Class MauticApiBundle.
  */
 class MauticApiBundle extends Bundle
 {
diff --git a/app/bundles/ApiBundle/Model/ClientModel.php b/app/bundles/ApiBundle/Model/ClientModel.php
index c21223b069e..3775be15c5f 100644
--- a/app/bundles/ApiBundle/Model/ClientModel.php
+++ b/app/bundles/ApiBundle/Model/ClientModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,9 +12,9 @@
 
 use Mautic\ApiBundle\ApiEvents;
 use Mautic\ApiBundle\Entity\oAuth1\Consumer;
+use Mautic\ApiBundle\Entity\oAuth2\Client;
 use Mautic\ApiBundle\Event\ClientEvent;
 use Mautic\CoreBundle\Model\FormModel;
-use Mautic\ApiBundle\Entity\oAuth2\Client;
 use Mautic\UserBundle\Entity\User;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -21,11 +22,10 @@
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class ClientModel
+ * Class ClientModel.
  */
 class ClientModel extends FormModel
 {
-
     /**
      * @var string
      */
@@ -93,13 +93,14 @@ public function getPermissionBase()
      *
      * @throws MethodNotAllowedHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Client && !$entity instanceof Consumer) {
-            throw new MethodNotAllowedHttpException(array('Client', 'Consumer'));
+            throw new MethodNotAllowedHttpException(['Client', 'Consumer']);
         }
 
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
+
         return $formFactory->create('client', $entity, $params);
     }
 
@@ -117,7 +118,6 @@ public function getEntity($id = null)
         return parent::getEntity($id);
     }
 
-
     /**
      * {@inheritdoc}
      *
@@ -126,14 +126,14 @@ public function getEntity($id = null)
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Client && !$entity instanceof Consumer) {
-            throw new MethodNotAllowedHttpException(array('Client', 'Consumer'));
+            throw new MethodNotAllowedHttpException(['Client', 'Consumer']);
         }
 
         switch ($action) {
-            case "post_save":
+            case 'post_save':
                 $name = ApiEvents::CLIENT_POST_SAVE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = ApiEvents::CLIENT_POST_DELETE;
                 break;
             default:
@@ -146,6 +146,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
                 $event->setEntityManager($this->em);
             }
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         }
 
@@ -164,13 +165,11 @@ public function getUserClients(User $user)
 
     /**
      * @param $entity
-     *
-     * @return void
      */
     public function revokeAccess($entity)
     {
         if (!$entity instanceof Client && !$entity instanceof Consumer) {
-            throw new MethodNotAllowedHttpException(array('Client', 'Consumer'));
+            throw new MethodNotAllowedHttpException(['Client', 'Consumer']);
         }
 
         //remove the user from the client
diff --git a/app/bundles/ApiBundle/Provider/NonceProvider.php b/app/bundles/ApiBundle/Provider/NonceProvider.php
index e5032adc877..ab816fc8a06 100644
--- a/app/bundles/ApiBundle/Provider/NonceProvider.php
+++ b/app/bundles/ApiBundle/Provider/NonceProvider.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,12 @@
 use Mautic\ApiBundle\Entity\oAuth1\Nonce;
 
 /**
- * Class NonceProvider
+ * Class NonceProvider.
  */
 class NonceProvider implements NonceProviderInterface
 {
-
     /**
-     * @var \Mautic\ApiBundle\Entity\oAuth1\NonceRepository $repo
+     * @var \Mautic\ApiBundle\Entity\oAuth1\NonceRepository
      */
     protected $repo;
 
@@ -40,13 +40,13 @@ public function __construct(EntityManager $em)
     }
 
     /**
-     * Ensure a unique nonce and appropriate timestamp
+     * Ensure a unique nonce and appropriate timestamp.
      *
-     * @param                                                     $nonce
-     * @param                                                     $timestamp
-     * @param  \Bazinga\OAuthServerBundle\Model\ConsumerInterface $consumer
+     * @param                                                    $nonce
+     * @param                                                    $timestamp
+     * @param \Bazinga\OAuthServerBundle\Model\ConsumerInterface $consumer
      *
-     * @return boolean
+     * @return bool
      */
     public function checkNonceAndTimestampUnicity($nonce, $timestamp, ConsumerInterface $consumer)
     {
@@ -62,7 +62,7 @@ public function checkNonceAndTimestampUnicity($nonce, $timestamp, ConsumerInterf
             $lastFifteen = strtotime('-15 minutes');
             if ($timestamp >= $lastFifteen) {
                 //make sure nonce has not been used before
-                $usedNonces = $this->repo->findBy(array('nonce' => $nonce));
+                $usedNonces = $this->repo->findBy(['nonce' => $nonce]);
 
                 if (count($usedNonces) === 0) {
                     $notUsed = true;
@@ -82,11 +82,11 @@ public function checkNonceAndTimestampUnicity($nonce, $timestamp, ConsumerInterf
     }
 
     /**
-     * @param                                                     $nonce
-     * @param                                                     $timestamp
-     * @param  \Bazinga\OAuthServerBundle\Model\ConsumerInterface $consumer
+     * @param                                                    $nonce
+     * @param                                                    $timestamp
+     * @param \Bazinga\OAuthServerBundle\Model\ConsumerInterface $consumer
      *
-     * @return boolean
+     * @return bool
      */
     public function registerNonceAndTimestamp($nonce, $timestamp, ConsumerInterface $consumer)
     {
diff --git a/app/bundles/ApiBundle/Security/OAuth1/Authentication/Provider/OAuthProvider.php b/app/bundles/ApiBundle/Security/OAuth1/Authentication/Provider/OAuthProvider.php
index 27d817da42b..44e2abb1e85 100644
--- a/app/bundles/ApiBundle/Security/OAuth1/Authentication/Provider/OAuthProvider.php
+++ b/app/bundles/ApiBundle/Security/OAuth1/Authentication/Provider/OAuthProvider.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,20 +16,17 @@
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
 /**
- * Class OAuthProvider
+ * Class OAuthProvider.
  */
 class OAuthProvider extends \Bazinga\OAuthServerBundle\Security\Authentification\Provider\OAuthProvider
 {
-
     /**
-     * @var MauticFactory $factory
+     * @var MauticFactory
      */
     private $factory;
 
     /**
      * @param MauticFactory $factory
-     *
-     * @return void
      */
     public function setFactory(MauticFactory $factory)
     {
@@ -74,6 +72,6 @@ public function authenticate(TokenInterface $token)
      */
     public function supports(TokenInterface $token)
     {
-        return ($token instanceof OAuthToken);
+        return $token instanceof OAuthToken;
     }
 }
diff --git a/app/bundles/ApiBundle/Security/OAuth1/Firewall/OAuthListener.php b/app/bundles/ApiBundle/Security/OAuth1/Firewall/OAuthListener.php
index bd16f3898c7..b45382cbd55 100644
--- a/app/bundles/ApiBundle/Security/OAuth1/Firewall/OAuthListener.php
+++ b/app/bundles/ApiBundle/Security/OAuth1/Firewall/OAuthListener.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,27 +12,24 @@
 
 use Bazinga\OAuthServerBundle\Security\Authentification\Token\OAuthToken;
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
 /**
- * Class OAuthListener
+ * Class OAuthListener.
  */
 class OAuthListener extends \Bazinga\OAuthServerBundle\Security\Firewall\OAuthListener
 {
-
     /**
-     * @var MauticFactory $factory
+     * @var MauticFactory
      */
     private $factory;
 
     /**
      * @param MauticFactory $factory
-     *
-     * @return void
      */
     public function setFactory(MauticFactory $factory)
     {
@@ -43,7 +41,6 @@ public function setFactory(MauticFactory $factory)
      *
      * @param GetResponseEvent $event
      *
-     * @return void
      * @throws AuthenticationException
      * @throws HttpException
      */
diff --git a/app/bundles/ApiBundle/Security/OAuth2/Firewall/OAuthListener.php b/app/bundles/ApiBundle/Security/OAuth2/Firewall/OAuthListener.php
index 94772b8c6b3..e52063ed700 100644
--- a/app/bundles/ApiBundle/Security/OAuth2/Firewall/OAuthListener.php
+++ b/app/bundles/ApiBundle/Security/OAuth2/Firewall/OAuthListener.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,19 +14,17 @@
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 /**
- * Class OAuthListener
+ * Class OAuthListener.
  */
 class OAuthListener extends \FOS\OAuthServerBundle\Security\Firewall\OAuthListener
 {
     /**
-     * @var MauticFactory $factory
+     * @var MauticFactory
      */
     private $factory;
 
     /**
      * @param MauticFactory $factory
-     *
-     * @return void
      */
     public function setFactory(MauticFactory $factory)
     {
diff --git a/app/bundles/ApiBundle/Security/Permissions/ApiPermissions.php b/app/bundles/ApiBundle/Security/Permissions/ApiPermissions.php
index 40046f6a02e..9065e5bbe95 100644
--- a/app/bundles/ApiBundle/Security/Permissions/ApiPermissions.php
+++ b/app/bundles/ApiBundle/Security/Permissions/ApiPermissions.php
@@ -1,36 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class ApiPermissions
+ * Class ApiPermissions.
  */
 class ApiPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
     public function __construct($params)
     {
-
         parent::__construct($params);
 
-        $this->permissions = array(
-            'access' => array(
-                'full'     => 1024
-            )
-        );
+        $this->permissions = [
+            'access' => [
+                'full' => 1024,
+            ],
+        ];
         $this->addStandardPermissions('clients', false);
     }
 
@@ -47,15 +46,15 @@ public function getName()
      */
     public function buildForm(FormBuilderInterface &$builder, array $options, array $data)
     {
-        $builder->add('api:access', 'permissionlist', array(
-            'choices'  => array(
-                'full'     => 'mautic.api.permissions.granted',
-            ),
-            'label'    => 'mautic.api.permissions.apiaccess',
-            'data'     => (!empty($data['access']) ? $data['access'] : array()),
-            'bundle'   => 'api',
-            'level'    => 'access'
-        ));
+        $builder->add('api:access', 'permissionlist', [
+            'choices' => [
+                'full' => 'mautic.api.permissions.granted',
+            ],
+            'label'  => 'mautic.api.permissions.apiaccess',
+            'data'   => (!empty($data['access']) ? $data['access'] : []),
+            'bundle' => 'api',
+            'level'  => 'access',
+        ]);
 
         $this->addStandardFormFields('api', 'clients', $builder, $data, false);
     }
@@ -87,7 +86,7 @@ public function isEnabled()
     protected function getSynonym($name, $level)
     {
         if ($name == 'access' && $level == 'granted') {
-            return array($name, 'full');
+            return [$name, 'full'];
         }
 
         return parent::getSynonym($name, $level);
diff --git a/app/bundles/ApiBundle/Serializer/Driver/AnnotationDriver.php b/app/bundles/ApiBundle/Serializer/Driver/AnnotationDriver.php
index a8616945960..db8e22012cf 100644
--- a/app/bundles/ApiBundle/Serializer/Driver/AnnotationDriver.php
+++ b/app/bundles/ApiBundle/Serializer/Driver/AnnotationDriver.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,9 +13,7 @@
 use JMS\Serializer\Metadata\ClassMetadata;
 
 /**
- * Class AnnotationDriver
- *
- * @package Mautic\ApiBundle\Serializer\Driver
+ * Class AnnotationDriver.
  */
 class AnnotationDriver extends \JMS\Serializer\Metadata\Driver\AnnotationDriver
 {
@@ -25,4 +24,4 @@ public function loadMetadataForClass(\ReflectionClass $class)
 
         return $classMetadata;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/Serializer/Driver/ApiMetadataDriver.php b/app/bundles/ApiBundle/Serializer/Driver/ApiMetadataDriver.php
index be330325fc2..71c16502b07 100644
--- a/app/bundles/ApiBundle/Serializer/Driver/ApiMetadataDriver.php
+++ b/app/bundles/ApiBundle/Serializer/Driver/ApiMetadataDriver.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Serializer\Driver;
 
+use JMS\Serializer\Metadata\ClassMetadata;
 use JMS\Serializer\Metadata\Driver\PhpDriver;
 use JMS\Serializer\Metadata\PropertyMetadata;
-use JMS\Serializer\Metadata\ClassMetadata;
 
 class ApiMetadataDriver extends PhpDriver
 {
@@ -23,7 +24,7 @@ class ApiMetadataDriver extends PhpDriver
     /**
      * @var array
      */
-    private $properties = array();
+    private $properties = [];
 
     /**
      * @var string
@@ -49,9 +50,9 @@ class ApiMetadataDriver extends PhpDriver
     protected function loadMetadataFromFile(\ReflectionClass $class, $file)
     {
         if ($class->hasMethod('loadApiMetadata')) {
-            $this->metadata       = new ClassMetadata($class->getName());
+            $this->metadata = new ClassMetadata($class->getName());
 
-            $this->properties     = array();
+            $this->properties     = [];
             $this->defaultVersion = '1.0';
             $this->groupPrefix    = '';
 
@@ -66,7 +67,7 @@ protected function loadMetadataFromFile(\ReflectionClass $class, $file)
     }
 
     /**
-     * Set the root (base key)
+     * Set the root (base key).
      *
      * @param $root
      *
@@ -80,7 +81,7 @@ public function setRoot($root)
     }
 
     /**
-     * Set prefix for the List and Details groups
+     * Set prefix for the List and Details groups.
      *
      * @param $name
      *
@@ -94,7 +95,7 @@ public function setGroupPrefix($name)
     }
 
     /**
-     * Set the default version for the properties if different than 1.0
+     * Set the default version for the properties if different than 1.0.
      *
      * @param $version
      *
@@ -108,7 +109,7 @@ public function setDefaultVersion($version)
     }
 
     /**
-     * Create a new property
+     * Create a new property.
      *
      * @param $name
      *
@@ -123,7 +124,7 @@ public function createProperty($name)
     }
 
     /**
-     * Add property and set default version and Details group
+     * Add property and set default version and Details group.
      *
      * @param $name
      *
@@ -140,14 +141,14 @@ public function addProperty($name)
 
         if ($this->groupPrefix !== null) {
             // Auto add to the Details group
-            $this->addGroup($this->groupPrefix . 'Details');
+            $this->addGroup($this->groupPrefix.'Details');
         }
 
         return $this;
     }
 
     /**
-     * Create properties
+     * Create properties.
      *
      * @param array      $properties
      * @param bool|false $addToListGroup
@@ -168,7 +169,7 @@ public function addProperties(array $properties, $addToListGroup = false)
     }
 
     /**
-     * Create properties and add to the List group
+     * Create properties and add to the List group.
      *
      * @param array $properties
      *
@@ -233,17 +234,17 @@ public function setSerializedName($name, $property = null)
     }
 
     /**
-     * Set the groups a property belongs to
+     * Set the groups a property belongs to.
      *
-     * @param           $groups
-     * @param           $property
+     * @param   $groups
+     * @param   $property
      *
      * @return $this
      */
     public function setGroups($groups, $property = null)
     {
         if (!is_array($groups)) {
-            $groups = array($groups);
+            $groups = [$groups];
         }
 
         if ($property === null) {
@@ -256,7 +257,7 @@ public function setGroups($groups, $property = null)
     }
 
     /**
-     * Add a group the property belongs to
+     * Add a group the property belongs to.
      *
      * @param      $group
      * @param null $property
@@ -275,7 +276,7 @@ public function addGroup($group, $property = null)
     }
 
     /**
-     * Add property to the List group
+     * Add property to the List group.
      *
      * @return $this
      */
@@ -288,7 +289,7 @@ public function inListGroup()
     }
 
     /**
-     * Set max depth for the property if an association
+     * Set max depth for the property if an association.
      *
      * @param      $depth
      * @param null $property
@@ -307,7 +308,7 @@ public function setMaxDepth($depth, $property = null)
     }
 
     /**
-     * Push the properties into ClassMetadata
+     * Push the properties into ClassMetadata.
      */
     public function build()
     {
@@ -316,6 +317,6 @@ public function build()
         }
 
         $this->currentPropertyName = null;
-        $this->properties          = array();
+        $this->properties          = [];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ApiBundle/Serializer/Exclusion/PublishDetailsExclusionStrategy.php b/app/bundles/ApiBundle/Serializer/Exclusion/PublishDetailsExclusionStrategy.php
index 4ec4a0f9b28..9bbc4151df1 100644
--- a/app/bundles/ApiBundle/Serializer/Exclusion/PublishDetailsExclusionStrategy.php
+++ b/app/bundles/ApiBundle/Serializer/Exclusion/PublishDetailsExclusionStrategy.php
@@ -1,47 +1,47 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ApiBundle\Serializer\Exclusion;
 
+use JMS\Serializer\Context;
 use JMS\Serializer\Exclusion\ExclusionStrategyInterface;
 use JMS\Serializer\Metadata\ClassMetadata;
 use JMS\Serializer\Metadata\PropertyMetadata;
-use JMS\Serializer\Context;
 
 /**
- * Class PublishDetailsExclusionStrategy
+ * Class PublishDetailsExclusionStrategy.
  *
  * Only include FormEntity properties for the top level entity and not the associated entities
  */
 class PublishDetailsExclusionStrategy implements ExclusionStrategyInterface
 {
-
     /**
      * @var array
      */
-    private $fields = array();
+    private $fields = [];
 
     public function __construct()
     {
-        $this->fields = array(
+        $this->fields = [
             'isPublished',
             'dateAdded',
             'createdBy',
             'dateModified',
             'modifiedBy',
             'checkedOut',
-            'checkedOutBy'
-        );
+            'checkedOutBy',
+        ];
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function shouldSkipClass(ClassMetadata $metadata, Context $navigatorContext)
     {
@@ -49,7 +49,7 @@ public function shouldSkipClass(ClassMetadata $metadata, Context $navigatorConte
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function shouldSkipProperty(PropertyMetadata $property, Context $navigatorContext)
     {
diff --git a/app/bundles/ApiBundle/Views/Authorize/oAuth1/authorize.html.php b/app/bundles/ApiBundle/Views/Authorize/oAuth1/authorize.html.php
index 51e4196edb4..c1ff0fbb64d 100644
--- a/app/bundles/ApiBundle/Views/Authorize/oAuth1/authorize.html.php
+++ b/app/bundles/ApiBundle/Views/Authorize/oAuth1/authorize.html.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticUserBundle:Security:base.html.php');
 $view['slots']->set('header', $view['translator']->trans('mautic.api.oauth.header'));
 $name = $consumer->getName();
-$msg  = (!empty($name)) ? $view['translator']->trans('mautic.api.oauth.clientwithname', array('%name%' => $name)) :
+$msg  = (!empty($name)) ? $view['translator']->trans('mautic.api.oauth.clientwithname', ['%name%' => $name]) :
     $view['translator']->trans('mautic.api.oauth.clientnoname');
 ?>
 <h4 class="mb-lg"><?php echo $msg; ?></h4>
diff --git a/app/bundles/ApiBundle/Views/Authorize/oAuth2/authorize.html.php b/app/bundles/ApiBundle/Views/Authorize/oAuth2/authorize.html.php
index 62dce422659..a810edf46d2 100644
--- a/app/bundles/ApiBundle/Views/Authorize/oAuth2/authorize.html.php
+++ b/app/bundles/ApiBundle/Views/Authorize/oAuth2/authorize.html.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticUserBundle:Security:base.html.php');
 $view['slots']->set('header', $view['translator']->trans('mautic.api.oauth.header'));
 $name = $client->getName();
-$msg  = (!empty($name)) ? $view['translator']->trans('mautic.api.oauth.clientwithname', array('%name%' => $name)) :
+$msg  = (!empty($name)) ? $view['translator']->trans('mautic.api.oauth.clientwithname', ['%name%' => $name]) :
     $view['translator']->trans('mautic.api.oauth.clientnoname');
 ?>
 <h4 class="mb-lg"><?php echo $msg; ?></h4>
diff --git a/app/bundles/ApiBundle/Views/Client/authorized.html.php b/app/bundles/ApiBundle/Views/Client/authorized.html.php
index 7a2aa2b838d..f97a858fa30 100644
--- a/app/bundles/ApiBundle/Views/Client/authorized.html.php
+++ b/app/bundles/ApiBundle/Views/Client/authorized.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -19,14 +20,14 @@
         <tr>
             <td>
                 <?php echo $view->render('MauticCoreBundle:Helper:confirm.html.php',
-                    array(
+                    [
                         'btnClass'      => 'btn btn-danger btn-xs',
-                        'message'       => $view["translator"]->trans("mautic.api.client.form.confirmrevoke", array("%name%" => $k->getName())),
-                        'confirmText'   => $view["translator"]->trans("mautic.api.client.form.revoke"),
-                        'confirmAction' => $view['router']->path('mautic_client_action',array("objectAction" => "revoke", "objectId" => $k->getId())),
+                        'message'       => $view['translator']->trans('mautic.api.client.form.confirmrevoke', ['%name%' => $k->getName()]),
+                        'confirmText'   => $view['translator']->trans('mautic.api.client.form.revoke'),
+                        'confirmAction' => $view['router']->path('mautic_client_action', ['objectAction' => 'revoke', 'objectId' => $k->getId()]),
                         'iconClass'     => 'fa fa-trash-o',
-                        'btnText'       => $view["translator"]->trans("mautic.api.client.form.revoke")
-                    )
+                        'btnText'       => $view['translator']->trans('mautic.api.client.form.revoke'),
+                    ]
                 ); ?>
             </td>
             <td><?php echo $k->getName(); ?></td>
diff --git a/app/bundles/ApiBundle/Views/Client/form.html.php b/app/bundles/ApiBundle/Views/Client/form.html.php
index fc6e224185a..3b4c02d900f 100644
--- a/app/bundles/ApiBundle/Views/Client/form.html.php
+++ b/app/bundles/ApiBundle/Views/Client/form.html.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'client');
 $id = $form->vars['data']->getId();
 if (!empty($id)) {
     $name   = $form->vars['data']->getName();
-    $header = $view['translator']->trans('mautic.api.client.header.edit', array("%name%" => $name));
+    $header = $view['translator']->trans('mautic.api.client.header.edit', ['%name%' => $name]);
 } else {
     $header = $view['translator']->trans('mautic.api.client.header.new');
 }
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 ?>
 
 <div class="row">
diff --git a/app/bundles/ApiBundle/Views/Client/index.html.php b/app/bundles/ApiBundle/Views/Client/index.html.php
index f437a6ddc6e..f4c3eec8061 100644
--- a/app/bundles/ApiBundle/Views/Client/index.html.php
+++ b/app/bundles/ApiBundle/Views/Client/index.html.php
@@ -1,34 +1,34 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'client');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.api.client.header.index'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.api.client.header.index'));
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'templateButtons' => array(
-        'new' => $permissions['create']
-    ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'templateButtons' => [
+        'new' => $permissions['create'],
+    ],
     'routeBase' => 'client',
-    'langVar'   => 'api.client'
-)));
+    'langVar'   => 'api.client',
+]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'searchHelp'  => 'mautic.api.client.help.searchcommands',
-        'action'      => $currentRoute,
-        'routeBase'   => 'client',
-        'templateButtons' => array(),
-        'filters' => $filters
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.api.client.help.searchcommands',
+        'action'          => $currentRoute,
+        'routeBase'       => 'client',
+        'templateButtons' => [],
+        'filters'         => $filters,
+    ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
     </div>
diff --git a/app/bundles/ApiBundle/Views/Client/list.html.php b/app/bundles/ApiBundle/Views/Client/list.html.php
index 62f8be5ec3c..a96d465a33e 100644
--- a/app/bundles/ApiBundle/Views/Client/list.html.php
+++ b/app/bundles/ApiBundle/Views/Client/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 //Check to see if the entire page should be displayed or just main content
@@ -17,28 +18,28 @@
         <thead>
         <tr>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'checkall' => 'true',
-                'target'   => '.client-list'
-            ));
+                'target'   => '.client-list',
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'client',
                 'orderBy'    => 'c.name',
                 'text'       => 'mautic.core.name',
                 'default'    => true,
-                'class'      => 'col-client-name'
-            ));
+                'class'      => 'col-client-name',
+            ]);
             ?>
             <th class="visible-md visible-lg col-client-publicid"><?php echo $view['translator']->trans('mautic.api.client.thead.publicid'); ?></th>
             <th class="visible-md visible-lg col-client-secret"><?php echo $view['translator']->trans('mautic.api.client.thead.secret'); ?></th>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'client',
                 'orderBy'    => 'c.id',
                 'text'       => 'mautic.core.id',
-                'class'      => 'visible-md visible-lg col-client-id'
-            ));
+                'class'      => 'visible-md visible-lg col-client-id',
+            ]);
             ?>
         </tr>
         </thead>
@@ -47,16 +48,16 @@
             <tr>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => $permissions['edit'],
-                            'delete'    => $permissions['delete']
-                        ),
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => $permissions['edit'],
+                            'delete' => $permissions['delete'],
+                        ],
                         'routeBase' => 'client',
                         'langVar'   => 'api.client',
-                        'pull'      => 'left'
-                    ));
+                        'pull'      => 'left',
+                    ]);
                     ?>
                 </td>
                 <td>
@@ -74,13 +75,13 @@
         </tbody>
     </table>
     <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems" => count($items),
-        "page"       => $page,
-        "limit"      => $limit,
-        "baseUrl"    =>  $view['router']->path('mautic_client_index'),
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => count($items),
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_client_index'),
         'sessionVar' => 'client',
-        'tmpl'       => $tmpl
-    )); ?>
+        'tmpl'       => $tmpl,
+    ]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/bundles/ApiBundle/Views/FormTheme/Config/_config_apiconfig_widget.html.php b/app/bundles/ApiBundle/Views/FormTheme/Config/_config_apiconfig_widget.html.php
index f607c5c5c6f..a998f1b8439 100644
--- a/app/bundles/ApiBundle/Views/FormTheme/Config/_config_apiconfig_widget.html.php
+++ b/app/bundles/ApiBundle/Views/FormTheme/Config/_config_apiconfig_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/ApiBundle/Views/Security/login.html.php b/app/bundles/ApiBundle/Views/Security/login.html.php
index f0e9ccbdef3..988789b8531 100644
--- a/app/bundles/ApiBundle/Views/Security/login.html.php
+++ b/app/bundles/ApiBundle/Views/Security/login.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticUserBundle:Security:base.html.php');
 $view['slots']->set('header', $view['translator']->trans('mautic.api.oauth.header'));
 ?>
diff --git a/app/bundles/ApiBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/ApiBundle/Views/SubscribedEvents/Search/global.html.php
index 6a2c090ff0e..cfb72d35ef0 100644
--- a/app/bundles/ApiBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/ApiBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_client_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_client_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
 </a>
 <?php else: ?>
 <?php if ($canEdit): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_client_action', array('objectAction' => 'edit', 'objectId' => $client->getId())); ?>" data-toggle="ajax">
-    <?php echo $client->getName();?>
+<a href="<?php echo $this->container->get('router')->generate('mautic_client_action', ['objectAction' => 'edit', 'objectId' => $client->getId()]); ?>" data-toggle="ajax">
+    <?php echo $client->getName(); ?>
 </a>
 <?php else: ?>
 <span><?php echo $client->getName(); ?></span>
diff --git a/app/bundles/AssetBundle/AssetEvents.php b/app/bundles/AssetBundle/AssetEvents.php
index ae399a91adf..017e18666ce 100644
--- a/app/bundles/AssetBundle/AssetEvents.php
+++ b/app/bundles/AssetBundle/AssetEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,9 +12,7 @@
 
 /**
  * Class AssetEvents
- * Events available for AssetBundle
- *
- * @package Mautic\AssetBundle
+ * Events available for AssetBundle.
  */
 final class AssetEvents
 {
@@ -40,7 +39,7 @@ final class AssetEvents
     const ASSET_ON_LOAD = 'mautic.asset_on_load';
 
     /**
-     * The mautic.asset_on_remote_browse event is dispatched when browsing a remote provider
+     * The mautic.asset_on_remote_browse event is dispatched when browsing a remote provider.
      *
      * The event listener receives a
      * Mautic\AssetBundle\Event\RemoteAssetBrowseEvent instance.
@@ -50,7 +49,7 @@ final class AssetEvents
     const ASSET_ON_REMOTE_BROWSE = 'mautic.asset_on_remote_browse';
 
     /**
-     * The mautic.asset_on_upload event is dispatched before uploading a file
+     * The mautic.asset_on_upload event is dispatched before uploading a file.
      *
      * The event listener receives a
      * Mautic\AssetBundle\Event\AssetEvent instance.
diff --git a/app/bundles/AssetBundle/Config/config.php b/app/bundles/AssetBundle/Config/config.php
index a1620f6a7db..ce56fd6fa67 100644
--- a/app/bundles/AssetBundle/Config/config.php
+++ b/app/bundles/AssetBundle/Config/config.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,196 +12,196 @@
     'routes' => [
         'main' => [
             'mautic_asset_buildertoken_index' => [
-                'path' => '/asset/buildertokens/{page}',
-                'controller' => 'MauticAssetBundle:SubscribedEvents\BuilderToken:index'
+                'path'       => '/asset/buildertokens/{page}',
+                'controller' => 'MauticAssetBundle:SubscribedEvents\BuilderToken:index',
             ],
             'mautic_asset_index' => [
-                'path' => '/assets/{page}',
-                'controller' => 'MauticAssetBundle:Asset:index'
+                'path'       => '/assets/{page}',
+                'controller' => 'MauticAssetBundle:Asset:index',
             ],
             'mautic_asset_remote' => [
-                'path' => '/assets/remote',
+                'path'       => '/assets/remote',
                 'controller' => 'MauticAssetBundle:Asset:remote',
             ],
             'mautic_asset_action' => [
-                'path' => '/assets/{objectAction}/{objectId}',
+                'path'       => '/assets/{objectAction}/{objectId}',
                 'controller' => 'MauticAssetBundle:Asset:execute',
-            ]
+            ],
         ],
         'api' => [
             'mautic_api_getassets' => [
-                'path' => '/assets',
-                'controller' => 'MauticAssetBundle:Api\AssetApi:getEntities'
+                'path'       => '/assets',
+                'controller' => 'MauticAssetBundle:Api\AssetApi:getEntities',
             ],
             'mautic_api_getasset' => [
-                'path' => '/assets/{id}',
-                'controller' => 'MauticAssetBundle:Api\AssetApi:getEntity'
-            ]
+                'path'       => '/assets/{id}',
+                'controller' => 'MauticAssetBundle:Api\AssetApi:getEntity',
+            ],
         ],
         'public' => [
             'mautic_asset_download' => [
-                'path' => '/asset/{slug}',
+                'path'       => '/asset/{slug}',
                 'controller' => 'MauticAssetBundle:Public:download',
-                'defaults' => [
-                    "slug"    => ''
-                ]
-            ]
-        ]
+                'defaults'   => [
+                    'slug' => '',
+                ],
+            ],
+        ],
     ],
 
     'menu' => [
         'main' => [
-            'items'    => [
+            'items' => [
                 'mautic.asset.assets' => [
-                    'route'     => 'mautic_asset_index',
-                    'access'    => ['asset:assets:viewown', 'asset:assets:viewother'],
-                    'parent'    => 'mautic.core.components',
-                    'priority'  => 300,
-                ]
-            ]
-        ]
+                    'route'    => 'mautic_asset_index',
+                    'access'   => ['asset:assets:viewown', 'asset:assets:viewother'],
+                    'parent'   => 'mautic.core.components',
+                    'priority' => 300,
+                ],
+            ],
+        ],
     ],
 
     'categories' => [
-        'asset' => null
+        'asset' => null,
     ],
 
     'services' => [
         'events' => [
             'mautic.asset.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\AssetSubscriber',
+                'class'     => 'Mautic\AssetBundle\EventListener\AssetSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
+                    'mautic.core.model.auditlog',
+                ],
             ],
             'mautic.asset.pointbundle.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\PointSubscriber',
+                'class'     => 'Mautic\AssetBundle\EventListener\PointSubscriber',
                 'arguments' => [
-                    'mautic.point.model.point'
-                ]
+                    'mautic.point.model.point',
+                ],
             ],
             'mautic.asset.formbundle.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\FormSubscriber'
+                'class' => 'Mautic\AssetBundle\EventListener\FormSubscriber',
             ],
             'mautic.asset.campaignbundle.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\AssetBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
-                    'mautic.campaign.model.event'
-                ]
+                    'mautic.campaign.model.event',
+                ],
             ],
             'mautic.asset.reportbundle.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\ReportSubscriber'
+                'class' => 'Mautic\AssetBundle\EventListener\ReportSubscriber',
             ],
             'mautic.asset.builder.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\BuilderSubscriber',
+                'class'     => 'Mautic\AssetBundle\EventListener\BuilderSubscriber',
                 'arguments' => [
                     'mautic.asset.helper.token',
-                    'mautic.lead.model.lead'
-                ]
+                    'mautic.lead.model.lead',
+                ],
             ],
             'mautic.asset.leadbundle.subscriber' => [
                 'class'     => 'Mautic\AssetBundle\EventListener\LeadSubscriber',
                 'arguments' => [
-                    'mautic.asset.model.asset'
-                ]
+                    'mautic.asset.model.asset',
+                ],
             ],
             'mautic.asset.pagebundle.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\PageSubscriber'
+                'class' => 'Mautic\AssetBundle\EventListener\PageSubscriber',
             ],
             'mautic.asset.emailbundle.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\EmailSubscriber'
+                'class' => 'Mautic\AssetBundle\EventListener\EmailSubscriber',
             ],
             'mautic.asset.configbundle.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\ConfigSubscriber'
+                'class' => 'Mautic\AssetBundle\EventListener\ConfigSubscriber',
             ],
             'mautic.asset.search.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\SearchSubscriber',
+                'class'     => 'Mautic\AssetBundle\EventListener\SearchSubscriber',
                 'arguments' => [
-                    'mautic.asset.model.asset'
-                ]
+                    'mautic.asset.model.asset',
+                ],
             ],
             'oneup_uploader.pre_upload' => [
-                'class' => 'Mautic\AssetBundle\EventListener\UploadSubscriber',
+                'class'     => 'Mautic\AssetBundle\EventListener\UploadSubscriber',
                 'arguments' => [
                     'translator',
                     'mautic.helper.core_parameters',
-                    'mautic.asset.model.asset'
-                ]
+                    'mautic.asset.model.asset',
+                ],
             ],
             'mautic.asset.dashboard.subscriber' => [
-                'class' => 'Mautic\AssetBundle\EventListener\DashboardSubscriber',
+                'class'     => 'Mautic\AssetBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
-                    'mautic.asset.model.asset'
-                ]
-            ]
+                    'mautic.asset.model.asset',
+                ],
+            ],
         ],
         'forms' => [
             'mautic.form.type.asset' => [
-                'class' => 'Mautic\AssetBundle\Form\Type\AssetType',
+                'class'     => 'Mautic\AssetBundle\Form\Type\AssetType',
                 'arguments' => [
                     'translator',
                     'mautic.helper.theme',
-                    'mautic.asset.model.asset'
+                    'mautic.asset.model.asset',
                 ],
-                'alias' => 'asset'
+                'alias' => 'asset',
             ],
             'mautic.form.type.pointaction_assetdownload' => [
                 'class' => 'Mautic\AssetBundle\Form\Type\PointActionAssetDownloadType',
-                'alias' => 'pointaction_assetdownload'
+                'alias' => 'pointaction_assetdownload',
             ],
             'mautic.form.type.campaignevent_assetdownload' => [
                 'class' => 'Mautic\AssetBundle\Form\Type\CampaignEventAssetDownloadType',
-                'alias' => 'campaignevent_assetdownload'
+                'alias' => 'campaignevent_assetdownload',
             ],
             'mautic.form.type.formsubmit_assetdownload' => [
                 'class' => 'Mautic\AssetBundle\Form\Type\FormSubmitActionDownloadFileType',
-                'alias' => 'asset_submitaction_downloadfile'
+                'alias' => 'asset_submitaction_downloadfile',
             ],
             'mautic.form.type.assetlist' => [
-                'class' => 'Mautic\AssetBundle\Form\Type\AssetListType',
+                'class'     => 'Mautic\AssetBundle\Form\Type\AssetListType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'asset_list'
+                'alias'     => 'asset_list',
             ],
             'mautic.form.type.assetconfig' => [
-                'class' => 'Mautic\AssetBundle\Form\Type\ConfigType',
+                'class'     => 'Mautic\AssetBundle\Form\Type\ConfigType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'assetconfig'
+                'alias'     => 'assetconfig',
             ],
             'mautic.form.type.asset_dashboard_downloads_in_time_widget' => [
-                'class'     => 'Mautic\AssetBundle\Form\Type\DashboardDownloadsInTimeWidgetType',
-                'alias'     => 'asset_dashboard_downloads_in_time_widget'
-            ]
+                'class' => 'Mautic\AssetBundle\Form\Type\DashboardDownloadsInTimeWidgetType',
+                'alias' => 'asset_dashboard_downloads_in_time_widget',
+            ],
         ],
         'others' => [
             'mautic.asset.upload.error.handler' => [
-                'class' => 'Mautic\AssetBundle\ErrorHandler\DropzoneErrorHandler',
-                'arguments' => 'mautic.factory'
+                'class'     => 'Mautic\AssetBundle\ErrorHandler\DropzoneErrorHandler',
+                'arguments' => 'mautic.factory',
             ],
             // Override the DropzoneController
             'oneup_uploader.controller.dropzone.class' => 'Mautic\AssetBundle\Controller\UploadController',
-            'mautic.asset.helper.token' => [
+            'mautic.asset.helper.token'                => [
                 'class'     => 'Mautic\AssetBundle\Helper\TokenHelper',
-                'arguments' => 'mautic.asset.model.asset'
-            ]
+                'arguments' => 'mautic.asset.model.asset',
+            ],
         ],
-        'models' =>  [
+        'models' => [
             'mautic.asset.model.asset' => [
-                'class' => 'Mautic\AssetBundle\Model\AssetModel',
+                'class'     => 'Mautic\AssetBundle\Model\AssetModel',
                 'arguments' => [
                     'mautic.lead.model.lead',
                     'mautic.category.model.category',
                     'request_stack',
                     'mautic.helper.ip_lookup',
-                    'mautic.helper.core_parameters'
-                ]
-            ]
-        ]
+                    'mautic.helper.core_parameters',
+                ],
+            ],
+        ],
     ],
 
     'parameters' => [
-        'upload_dir'            => '%kernel.root_dir%/../media/files',
-        'max_size'              => '6',
-        'allowed_extensions'    => ['csv', 'doc', 'docx', 'epub', 'gif', 'jpg', 'jpeg', 'mpg', 'mpeg', 'mp3', 'odt', 'odp', 'ods', 'pdf', 'png', 'ppt', 'pptx', 'tif', 'tiff', 'txt', 'xls', 'xlsx', 'wav']
-    ]
+        'upload_dir'         => '%kernel.root_dir%/../media/files',
+        'max_size'           => '6',
+        'allowed_extensions' => ['csv', 'doc', 'docx', 'epub', 'gif', 'jpg', 'jpeg', 'mpg', 'mpeg', 'mp3', 'odt', 'odp', 'ods', 'pdf', 'png', 'ppt', 'pptx', 'tif', 'tiff', 'txt', 'xls', 'xlsx', 'wav'],
+    ],
 ];
diff --git a/app/bundles/AssetBundle/Controller/AjaxController.php b/app/bundles/AssetBundle/Controller/AjaxController.php
index cddc894b8d3..17e80b93159 100644
--- a/app/bundles/AssetBundle/Controller/AjaxController.php
+++ b/app/bundles/AssetBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,32 +18,33 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
- *
- * @package Mautic\AssetBundle\Controller
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
     /**
      * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     protected function categoryListAction(Request $request)
     {
         $filter    = InputHelper::clean($request->query->get('filter'));
         $results   = $this->getModel('asset')->getLookupResults('category', $filter, 10);
-        $dataArray = array();
+        $dataArray = [];
         foreach ($results as $r) {
-            $dataArray[] = array(
-                "label" => $r['title'] . " ({$r['id']})",
-                "value" => $r['id']
-            );
+            $dataArray[] = [
+                'label' => $r['title']." ({$r['id']})",
+                'value' => $r['id'],
+            ];
         }
+
         return $this->sendJsonResponse($dataArray);
     }
 
     /**
      * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     protected function fetchRemoteFilesAction(Request $request)
@@ -53,7 +55,7 @@ protected function fetchRemoteFilesAction(Request $request)
         $name       = AssetEvents::ASSET_ON_REMOTE_BROWSE;
 
         if (!$dispatcher->hasListeners($name)) {
-            return $this->sendJsonResponse(array('success' => 0));
+            return $this->sendJsonResponse(['success' => 0]);
         }
 
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
@@ -67,20 +69,20 @@ protected function fetchRemoteFilesAction(Request $request)
         $dispatcher->dispatch($name, $event);
 
         if (!$adapter = $event->getAdapter()) {
-            return $this->sendJsonResponse(array('success' => 0));
+            return $this->sendJsonResponse(['success' => 0]);
         }
 
         $connector = new Filesystem($adapter);
 
         $output = $this->renderView(
             'MauticAssetBundle:Remote:list.html.php',
-            array(
-                'connector' => $connector,
+            [
+                'connector'   => $connector,
                 'integration' => $integration,
-                'items' => $connector->listKeys($path)
-            )
+                'items'       => $connector->listKeys($path),
+            ]
         );
 
-        return $this->sendJsonResponse(array('success' => 1, 'output' => $output));
+        return $this->sendJsonResponse(['success' => 1, 'output' => $output]);
     }
 }
diff --git a/app/bundles/AssetBundle/Controller/Api/AssetApiController.php b/app/bundles/AssetBundle/Controller/Api/AssetApiController.php
index 9425318aced..03da90848c4 100644
--- a/app/bundles/AssetBundle/Controller/Api/AssetApiController.php
+++ b/app/bundles/AssetBundle/Controller/Api/AssetApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,14 +14,11 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class AssetApiController
- *
- * @package Mautic\AssetBundle\Controller\Api
+ * Class AssetApiController.
  */
 class AssetApiController extends CommonApiController
 {
-
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('asset');
@@ -28,29 +26,29 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'asset';
         $this->entityNameMulti  = 'assets';
         $this->permissionBase   = 'asset:assets';
-        $this->serializerGroups = array("assetDetails", "categoryList", "publishDetails");
+        $this->serializerGroups = ['assetDetails', 'categoryList', 'publishDetails'];
     }
 
     /**
-     * Obtains a list of assets
+     * Obtains a list of assets.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function getEntitiesAction ()
+    public function getEntitiesAction()
     {
         if (!$this->security->isGranted('asset:assets:viewother')) {
-            $this->listFilters[] = array(
+            $this->listFilters[] = [
                 'column' => 'a.createdBy',
                 'expr'   => 'eq',
-                'value'  => $this->user->getId()
-            );
+                'value'  => $this->user->getId(),
+            ];
         }
 
         return parent::getEntitiesAction();
     }
 
     /**
-     * Gives child controllers opportunity to analyze and do whatever to an entity before going through serializer
+     * Gives child controllers opportunity to analyze and do whatever to an entity before going through serializer.
      *
      * @param        $entity
      * @param string $action
diff --git a/app/bundles/AssetBundle/Controller/AssetController.php b/app/bundles/AssetBundle/Controller/AssetController.php
index 02c6d4bc091..0e2a968be1e 100644
--- a/app/bundles/AssetBundle/Controller/AssetController.php
+++ b/app/bundles/AssetBundle/Controller/AssetController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,21 +12,19 @@
 
 use Mautic\AssetBundle\Entity\Asset;
 use Mautic\CoreBundle\Controller\FormController;
-use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class AssetController
+ * Class AssetController.
  */
 class AssetController extends FormController
 {
-
     /**
      * @param int $page
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function indexAction ($page = 1)
+    public function indexAction($page = 1)
     {
         $model = $this->getModel('asset');
 
@@ -39,8 +38,8 @@ public function indexAction ($page = 1)
             'asset:assets:deleteown',
             'asset:assets:deleteother',
             'asset:assets:publishown',
-            'asset:assets:publishother'
-        ], "RETURN_ARRAY");
+            'asset:assets:publishother',
+        ], 'RETURN_ARRAY');
 
         if (!$permissions['asset:assets:viewown'] && !$permissions['asset:assets:viewother']) {
             return $this->accessDenied();
@@ -76,7 +75,7 @@ public function indexAction ($page = 1)
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
+                'orderByDir' => $orderByDir,
             ]
         );
 
@@ -97,8 +96,8 @@ public function indexAction ($page = 1)
                 'contentTemplate' => 'MauticAssetBundle:Asset:index',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_asset_index',
-                    'mauticContent' => 'asset'
-                ]
+                    'mauticContent' => 'asset',
+                ],
             ]);
         }
 
@@ -111,7 +110,7 @@ public function indexAction ($page = 1)
         $categories = $this->getModel('asset')->getLookupResults('category', '', 0);
 
         return $this->delegateView([
-            'viewParameters'  => [
+            'viewParameters' => [
                 'searchValue' => $search,
                 'items'       => $assets,
                 'categories'  => $categories,
@@ -120,25 +119,25 @@ public function indexAction ($page = 1)
                 'model'       => $model,
                 'tmpl'        => $tmpl,
                 'page'        => $page,
-                'security'    => $this->get('mautic.security')
+                'security'    => $this->get('mautic.security'),
             ],
             'contentTemplate' => 'MauticAssetBundle:Asset:list.html.php',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_asset_index',
                 'mauticContent' => 'asset',
-                'route'         => $this->generateUrl('mautic_asset_index', ['page' => $page])
-            ]
+                'route'         => $this->generateUrl('mautic_asset_index', ['page' => $page]),
+            ],
         ]);
     }
 
     /**
-     * Loads a specific form into the detailed panel
+     * Loads a specific form into the detailed panel.
      *
      * @param int $objectId
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function viewAction ($objectId)
+    public function viewAction($objectId)
     {
         $model       = $this->getModel('asset');
         $security    = $this->get('mautic.security');
@@ -164,15 +163,15 @@ public function viewAction ($objectId)
                 'contentTemplate' => 'MauticAssetBundle:Asset:index',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_asset_index',
-                    'mauticContent' => 'asset'
+                    'mauticContent' => 'asset',
                 ],
-                'flashes'         => [
+                'flashes' => [
                     [
                         'type'    => 'error',
                         'msg'     => 'mautic.asset.asset.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
-                    ]
-                ]
+                        'msgVars' => ['%id%' => $objectId],
+                    ],
+                ],
             ]);
         } elseif (!$this->get('mautic.security')->hasEntityAccess('asset:assets:viewown', 'asset:assets:viewother', $activeAsset->getCreatedBy())) {
             return $this->accessDenied();
@@ -182,11 +181,11 @@ public function viewAction ($objectId)
         $logs = $this->getModel('core.auditLog')->getLogForObject('asset', $activeAsset->getId(), $activeAsset->getDateAdded());
 
         return $this->delegateView([
-            'returnUrl'       => $action,
-            'viewParameters'  => [
-                'activeAsset'      => $activeAsset,
-                'tmpl'             => $tmpl,
-                'permissions'      => $security->isGranted([
+            'returnUrl'      => $action,
+            'viewParameters' => [
+                'activeAsset' => $activeAsset,
+                'tmpl'        => $tmpl,
+                'permissions' => $security->isGranted([
                     'asset:assets:viewown',
                     'asset:assets:viewother',
                     'asset:assets:create',
@@ -195,9 +194,9 @@ public function viewAction ($objectId)
                     'asset:assets:deleteown',
                     'asset:assets:deleteother',
                     'asset:assets:publishown',
-                    'asset:assets:publishother'
-                ], "RETURN_ARRAY"),
-                'stats'            => [
+                    'asset:assets:publishother',
+                ], 'RETURN_ARRAY'),
+                'stats' => [
                     'downloads' => [
                         'total'     => $activeAsset->getDownloadCount(),
                         'unique'    => $activeAsset->getUniqueDownloadCount(),
@@ -207,30 +206,30 @@ public function viewAction ($objectId)
                             new \DateTime($dateRangeForm->get('date_to')->getData()),
                             null,
                             ['asset_id' => $activeAsset->getId()]
-                        )
-                    ]
+                        ),
+                    ],
                 ],
                 'security'         => $security,
                 'assetDownloadUrl' => $model->generateUrl($activeAsset, true),
                 'logs'             => $logs,
-                'dateRangeForm'    => $dateRangeForm->createView()
+                'dateRangeForm'    => $dateRangeForm->createView(),
             ],
-            'contentTemplate' => 'MauticAssetBundle:Asset:' . $tmpl . '.html.php',
+            'contentTemplate' => 'MauticAssetBundle:Asset:'.$tmpl.'.html.php',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_asset_index',
-                'mauticContent' => 'asset'
-            ]
+                'mauticContent' => 'asset',
+            ],
         ]);
     }
 
     /**
-     * Show a preview of the file
+     * Show a preview of the file.
      *
      * @param $objectId
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function previewAction ($objectId)
+    public function previewAction($objectId)
     {
         /** @var \Mautic\AssetBundle\Model\AssetModel $model */
         $model       = $this->getModel('asset');
@@ -241,23 +240,23 @@ public function previewAction ($objectId)
         }
 
         return $this->delegateView([
-            'viewParameters'  => [
+            'viewParameters' => [
                 'activeAsset'      => $activeAsset,
-                'assetDownloadUrl' => $model->generateUrl($activeAsset)
+                'assetDownloadUrl' => $model->generateUrl($activeAsset),
             ],
             'contentTemplate' => 'MauticAssetBundle:Asset:preview.html.php',
             'passthroughVars' => [
-                'route' => false
-            ]
+                'route' => false,
+            ],
         ]);
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function newAction ($entity = null)
+    public function newAction($entity = null)
     {
         /** @var \Mautic\AssetBundle\Model\AssetModel $model */
         $model = $this->getModel('asset');
@@ -266,7 +265,7 @@ public function newAction ($entity = null)
         if (null == $entity) {
             $entity = $model->getEntity();
         }
-        $entity->setMaxSize(Asset::convertSizeToBytes($this->get('mautic.helper.core_parameters')->getParameter('max_size') . 'M')); // convert from MB to B
+        $entity->setMaxSize(Asset::convertSizeToBytes($this->get('mautic.helper.core_parameters')->getParameter('max_size').'M')); // convert from MB to B
         $method  = $this->request->getMethod();
         $session = $this->get('session');
 
@@ -274,16 +273,16 @@ public function newAction ($entity = null)
             return $this->accessDenied();
         }
 
-        $maxSize    =  $model->getMaxUploadSize();
-        $extensions = '.' . implode(', .', $this->get('mautic.helper.core_parameters')->getParameter('allowed_extensions'));
+        $maxSize    = $model->getMaxUploadSize();
+        $extensions = '.'.implode(', .', $this->get('mautic.helper.core_parameters')->getParameter('allowed_extensions'));
 
         $maxSizeError = $this->get('translator')->trans('mautic.asset.asset.error.file.size', [
             '%fileSize%' => '{{filesize}}',
-            '%maxSize%'  => '{{maxFilesize}}'
+            '%maxSize%'  => '{{maxFilesize}}',
         ], 'validators');
 
         $extensionError = $this->get('translator')->trans('mautic.asset.asset.error.file.extension.js', [
-            '%extensions%' => $extensions
+            '%extensions%' => $extensions,
         ], 'validators');
 
         // Create temporary asset ID
@@ -306,7 +305,6 @@ public function newAction ($entity = null)
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
                 if ($valid = $this->isFormValid($form)) {
-
                     $entity->setUploadDir($this->get('mautic.helper.core_parameters')->getParameter('upload_dir'));
                     $entity->preUpload();
                     $entity->upload();
@@ -322,8 +320,8 @@ public function newAction ($entity = null)
                         '%menu_link%' => 'mautic_asset_index',
                         '%url%'       => $this->generateUrl('mautic_asset_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ])
+                            'objectId'     => $entity->getId(),
+                        ]),
                     ]);
 
                     if (!$form->get('buttons')->get('save')->isClicked()) {
@@ -333,10 +331,10 @@ public function newAction ($entity = null)
 
                     $viewParameters = [
                         'objectAction' => 'view',
-                        'objectId'     => $entity->getId()
+                        'objectId'     => $entity->getId(),
                     ];
-                    $returnUrl      = $this->generateUrl('mautic_asset_action', $viewParameters);
-                    $template       = 'MauticAssetBundle:Asset:view';
+                    $returnUrl = $this->generateUrl('mautic_asset_action', $viewParameters);
+                    $template  = 'MauticAssetBundle:Asset:view';
                 }
             } else {
                 $viewParameters = ['page' => $page];
@@ -351,8 +349,8 @@ public function newAction ($entity = null)
                     'contentTemplate' => $template,
                     'passthroughVars' => [
                         'activeLink'    => 'mautic_asset_index',
-                        'mauticContent' => 'asset'
-                    ]
+                        'mauticContent' => 'asset',
+                    ],
                 ]);
             }
         }
@@ -364,7 +362,7 @@ public function newAction ($entity = null)
         $integrations = $integrationHelper->getIntegrationObjects(null, ['cloud_storage']);
 
         return $this->delegateView([
-            'viewParameters'  => [
+            'viewParameters' => [
                 'form'             => $form->createView(),
                 'activeAsset'      => $entity,
                 'assetDownloadUrl' => $model->generateUrl($entity),
@@ -374,46 +372,46 @@ public function newAction ($entity = null)
                 'maxSize'          => $maxSize,
                 'maxSizeError'     => $maxSizeError,
                 'extensions'       => $extensions,
-                'extensionError'   => $extensionError
+                'extensionError'   => $extensionError,
             ],
             'contentTemplate' => 'MauticAssetBundle:Asset:form.html.php',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_asset_index',
                 'mauticContent' => 'asset',
                 'route'         => $this->generateUrl('mautic_asset_action', [
-                    'objectAction' => 'new'
-                ])
-            ]
+                    'objectAction' => 'new',
+                ]),
+            ],
         ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function editAction ($objectId, $ignorePost = false)
+    public function editAction($objectId, $ignorePost = false)
     {
         /** @var \Mautic\AssetBundle\Model\AssetModel $model */
         $model  = $this->getModel('asset');
         $entity = $model->getEntity($objectId);
-        $entity->setMaxSize(Asset::convertSizeToBytes($this->get('mautic.helper.core_parameters')->getParameter('max_size') . 'M')); // convert from MB to B
+        $entity->setMaxSize(Asset::convertSizeToBytes($this->get('mautic.helper.core_parameters')->getParameter('max_size').'M')); // convert from MB to B
         $session    = $this->get('session');
         $page       = $session->get('mautic.asset.page', 1);
         $method     = $this->request->getMethod();
         $maxSize    = $model->getMaxUploadSize();
-        $extensions = '.' . implode(', .', $this->get('mautic.helper.core_parameters')->getParameter('allowed_extensions'));
+        $extensions = '.'.implode(', .', $this->get('mautic.helper.core_parameters')->getParameter('allowed_extensions'));
 
         $maxSizeError = $this->get('translator')->trans('mautic.asset.asset.error.file.size', [
             '%fileSize%' => '{{filesize}}',
-            '%maxSize%'  => '{{maxFilesize}}'
+            '%maxSize%'  => '{{maxFilesize}}',
         ], 'validators');
 
         $extensionError = $this->get('translator')->trans('mautic.asset.asset.error.file.extension.js', [
-            '%extensions%' => $extensions
+            '%extensions%' => $extensions,
         ], 'validators');
 
         //set the return URL
@@ -429,8 +427,8 @@ public function editAction ($objectId, $ignorePost = false)
             'contentTemplate' => 'MauticAssetBundle:Asset:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_asset_index',
-                'mauticContent' => 'asset'
-            ]
+                'mauticContent' => 'asset',
+            ],
         ];
 
         //not found
@@ -441,9 +439,9 @@ public function editAction ($objectId, $ignorePost = false)
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.asset.asset.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ])
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -484,20 +482,20 @@ public function editAction ($objectId, $ignorePost = false)
                         '%menu_link%' => 'mautic_asset_index',
                         '%url%'       => $this->generateUrl('mautic_asset_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ])
+                            'objectId'     => $entity->getId(),
+                        ]),
                     ]);
 
-                    $returnUrl  = $this->generateUrl('mautic_asset_action', [
+                    $returnUrl = $this->generateUrl('mautic_asset_action', [
                         'objectAction' => 'view',
-                        'objectId'     => $entity->getId()
+                        'objectId'     => $entity->getId(),
                     ]);
                     $viewParams = ['objectId' => $entity->getId()];
                     $template   = 'MauticAssetBundle:Asset:view';
                 }
             } else {
                 //clear any modified content
-                $session->remove('mautic.asestbuilder.' . $objectId . '.content');
+                $session->remove('mautic.asestbuilder.'.$objectId.'.content');
                 //unlock the entity
                 $model->unlockEntity($entity);
 
@@ -511,7 +509,7 @@ public function editAction ($objectId, $ignorePost = false)
                     array_merge($postActionVars, [
                         'returnUrl'       => $returnUrl,
                         'viewParameters'  => $viewParams,
-                        'contentTemplate' => $template
+                        'contentTemplate' => $template,
                     ])
                 );
             }
@@ -527,7 +525,7 @@ public function editAction ($objectId, $ignorePost = false)
         $integrations = $integrationHelper->getIntegrationObjects(null, ['cloud_storage']);
 
         return $this->delegateView([
-            'viewParameters'  => [
+            'viewParameters' => [
                 'form'             => $form->createView(),
                 'activeAsset'      => $entity,
                 'assetDownloadUrl' => $model->generateUrl($entity),
@@ -537,7 +535,7 @@ public function editAction ($objectId, $ignorePost = false)
                 'maxSize'          => $maxSize,
                 'maxSizeError'     => $maxSizeError,
                 'extensions'       => $extensions,
-                'extensionError'   => $extensionError
+                'extensionError'   => $extensionError,
             ],
             'contentTemplate' => 'MauticAssetBundle:Asset:form.html.php',
             'passthroughVars' => [
@@ -545,20 +543,20 @@ public function editAction ($objectId, $ignorePost = false)
                 'mauticContent' => 'asset',
                 'route'         => $this->generateUrl('mautic_asset_action', [
                     'objectAction' => 'edit',
-                    'objectId'     => $entity->getId()
-                ])
-            ]
+                    'objectId'     => $entity->getId(),
+                ]),
+            ],
         ]);
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
-    public function cloneAction ($objectId)
+    public function cloneAction($objectId)
     {
         /** @var \Mautic\AssetBundle\Model\AssetModel $model */
         $model  = $this->getModel('asset');
@@ -584,13 +582,13 @@ public function cloneAction ($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteAction ($objectId)
+    public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.asset.page', 1);
         $returnUrl = $this->generateUrl('mautic_asset_index', ['page' => $page]);
@@ -602,8 +600,8 @@ public function deleteAction ($objectId)
             'contentTemplate' => 'MauticAssetBundle:Asset:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_asset_index',
-                'mauticContent' => 'asset'
-            ]
+                'mauticContent' => 'asset',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -615,7 +613,7 @@ public function deleteAction ($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.asset.asset.error.notfound',
-                    'msgVars' => ['%id%' => $objectId]
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'asset:assets:deleteown',
@@ -636,24 +634,24 @@ public function deleteAction ($objectId)
                 'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $entity->getTitle(),
-                    '%id%'   => $objectId
-                ]
+                    '%id%'   => $objectId,
+                ],
             ];
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge($postActionVars, [
-                'flashes' => $flashes
+                'flashes' => $flashes,
             ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function batchDeleteAction ()
+    public function batchDeleteAction()
     {
         $page      = $this->get('session')->get('mautic.asset.page', 1);
         $returnUrl = $this->generateUrl('mautic_asset_index', ['page' => $page]);
@@ -665,8 +663,8 @@ public function batchDeleteAction ()
             'contentTemplate' => 'MauticAssetBundle:Asset:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_asset_index',
-                'mauticContent' => 'asset'
-            ]
+                'mauticContent' => 'asset',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -683,7 +681,7 @@ public function batchDeleteAction ()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.asset.asset.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     'asset:assets:deleteown', 'asset:assets:deleteother', $entity->getCreatedBy()
@@ -705,25 +703,25 @@ public function batchDeleteAction ()
                     'type'    => 'notice',
                     'msg'     => 'mautic.asset.asset.notice.batch_deleted',
                     'msgVars' => [
-                        '%count%' => count($entities)
-                    ]
+                        '%count%' => count($entities),
+                    ],
                 ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge($postActionVars, [
-                'flashes' => $flashes
+                'flashes' => $flashes,
             ])
         );
     }
 
     /**
-     * Renders the container for the remote file browser
+     * Renders the container for the remote file browser.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function remoteAction ()
+    public function remoteAction()
     {
         // Check for integrations to cloud providers
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
@@ -734,16 +732,16 @@ public function remoteAction ()
         $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
 
         return $this->delegateView([
-            'viewParameters'  => [
+            'viewParameters' => [
                 'integrations' => $integrations,
-                'tmpl'         => $tmpl
+                'tmpl'         => $tmpl,
             ],
             'contentTemplate' => 'MauticAssetBundle:Remote:browse.html.php',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_asset_index',
                 'mauticContent' => 'asset',
-                'route'         => $this->generateUrl('mautic_asset_index', ['page' => $this->get('session')->get('mautic.asset.page', 1)])
-            ]
+                'route'         => $this->generateUrl('mautic_asset_index', ['page' => $this->get('session')->get('mautic.asset.page', 1)]),
+            ],
         ]);
     }
 }
diff --git a/app/bundles/AssetBundle/Controller/PublicController.php b/app/bundles/AssetBundle/Controller/PublicController.php
index a145dd66fd7..9bacd79ef58 100644
--- a/app/bundles/AssetBundle/Controller/PublicController.php
+++ b/app/bundles/AssetBundle/Controller/PublicController.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Controller;
 
+use Mautic\AssetBundle\AssetEvents;
 use Mautic\AssetBundle\Event\AssetEvent;
 use Mautic\CoreBundle\Controller\FormController as CommonFormController;
-use Mautic\AssetBundle\AssetEvents;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class PublicController
+ * Class PublicController.
  */
 class PublicController extends CommonFormController
 {
@@ -28,16 +29,16 @@ class PublicController extends CommonFormController
     public function downloadAction($slug)
     {
         //find the asset
-        $security   = $this->get('mautic.security');
+        $security = $this->get('mautic.security');
 
         /** @var \Mautic\AssetBundle\Model\AssetModel $model */
-        $model      = $this->getModel('asset');
+        $model = $this->getModel('asset');
 
         /** @var \Mautic\AssetBundle\Entity\Asset $entity */
-        $entity     = $model->getEntityBySlugs($slug);
+        $entity = $model->getEntityBySlugs($slug);
 
         if (!empty($entity)) {
-            $published    = $entity->isPublished();
+            $published = $entity->isPublished();
 
             //make sure the asset is published or deny access if not
             if ((!$published) && (!$security->hasEntityAccess('asset:assets:viewown', 'asset:assets:viewother', $entity->getCreatedBy()))) {
@@ -50,7 +51,7 @@ public function downloadAction($slug)
             $url        = $model->generateUrl($entity, false);
             $requestUri = $this->request->getRequestUri();
             //remove query
-            $query      = $this->request->getQueryString();
+            $query = $this->request->getQueryString();
 
             if (!empty($query)) {
                 $requestUri = str_replace("?{$query}", '', $url);
@@ -59,6 +60,7 @@ public function downloadAction($slug)
             //redirect if they don't match
             if ($requestUri != $url) {
                 $model->trackDownload($entity, $this->request, 301);
+
                 return $this->redirect($url, 301);
             }
 
@@ -98,7 +100,6 @@ public function downloadAction($slug)
             }
 
             return $response;
-
         }
 
         $model->trackDownload($entity, $this->request, 404);
diff --git a/app/bundles/AssetBundle/Controller/SubscribedEvents/BuilderTokenController.php b/app/bundles/AssetBundle/Controller/SubscribedEvents/BuilderTokenController.php
index cab7a728ead..c87823ce08e 100644
--- a/app/bundles/AssetBundle/Controller/SubscribedEvents/BuilderTokenController.php
+++ b/app/bundles/AssetBundle/Controller/SubscribedEvents/BuilderTokenController.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Controller\SubscribedEvents;
 
 /**
- * Class BuilderTokenController
+ * Class BuilderTokenController.
  */
 class BuilderTokenController extends \Mautic\CoreBundle\Controller\SubscribedEvents\BuilderTokenController
 {
@@ -23,4 +24,4 @@ protected function getModelName()
     {
         return 'asset';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/Controller/UploadController.php b/app/bundles/AssetBundle/Controller/UploadController.php
index b22d1af736a..c7676568df4 100644
--- a/app/bundles/AssetBundle/Controller/UploadController.php
+++ b/app/bundles/AssetBundle/Controller/UploadController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,12 +19,11 @@ class UploadController extends DropzoneController
     /**
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-
     public function upload()
     {
-        $request = $this->container->get('request');
+        $request  = $this->container->get('request');
         $response = new EmptyResponse();
-        $files = $this->getFiles($request->files);
+        $files    = $this->getFiles($request->files);
 
         if (!empty($files)) {
             foreach ($files as $file) {
@@ -45,4 +45,4 @@ public function upload()
 
         return $this->createSupportedJsonResponse($response->assemble());
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/DataFixtures/ORM/LoadAssetData.php b/app/bundles/AssetBundle/DataFixtures/ORM/LoadAssetData.php
index d9195626756..e0ce3b2282d 100644
--- a/app/bundles/AssetBundle/DataFixtures/ORM/LoadAssetData.php
+++ b/app/bundles/AssetBundle/DataFixtures/ORM/LoadAssetData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,13 +18,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadAssetData
- *
- * @package Mautic\AssetBundle\DataFixtures\ORM
+ * Class LoadAssetData.
  */
 class LoadAssetData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -32,7 +30,6 @@ class LoadAssetData extends AbstractFixture implements OrderedFixtureInterface,
     /**
      * {@inheritdoc}
      */
-
     public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
diff --git a/app/bundles/AssetBundle/Entity/Asset.php b/app/bundles/AssetBundle/Entity/Asset.php
index deb8a6f52c6..3f9c6f41e50 100644
--- a/app/bundles/AssetBundle/Entity/Asset.php
+++ b/app/bundles/AssetBundle/Entity/Asset.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,23 +12,21 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
-use Mautic\ApiBundle\Serializer\Driver\PhpDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Asset
+ * Class Asset.
  */
 class Asset extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -69,12 +68,12 @@ class Asset extends FormEntity
     private $file;
 
     /**
-     * Holds upload directory
+     * Holds upload directory.
      */
     private $uploadDir;
 
     /**
-     * Holds max size of uploaded file
+     * Holds max size of uploaded file.
      */
     private $maxSize;
 
@@ -166,7 +165,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
 
         $builder->setTable('assets')
             ->setCustomRepositoryClass('Mautic\AssetBundle\Entity\AssetRepository')
-            ->addIndex(array('alias'), 'asset_alias_search');
+            ->addIndex(['alias'], 'asset_alias_search');
 
         $builder->addIdColumns('title');
 
@@ -223,7 +222,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -231,16 +230,16 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('asset')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'title',
                     'alias',
                     'category',
-                    'description'
-                )
+                    'description',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'language',
                     'publishUp',
                     'publishDown',
@@ -250,14 +249,14 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'extension',
                     'mime',
                     'size',
-                    'downloadUrl'
-                )
+                    'downloadUrl',
+                ]
             )
             ->build();
     }
 
     /**
-     * Clone magic function
+     * Clone magic function.
      */
     public function __clone()
     {
@@ -267,9 +266,9 @@ public function __clone()
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -313,7 +312,7 @@ public function getFile()
     }
 
     /**
-     * Set title
+     * Set title.
      *
      * @param string $title
      *
@@ -328,7 +327,7 @@ public function setTitle($title)
     }
 
     /**
-     * Get title
+     * Get title.
      *
      * @return string
      */
@@ -370,7 +369,7 @@ public function setMime($mime)
     }
 
     /**
-     * Set originalFileName
+     * Set originalFileName.
      *
      * @param string $originalFileName
      *
@@ -385,7 +384,7 @@ public function setOriginalFileName($originalFileName)
     }
 
     /**
-     * Get originalFileName
+     * Get originalFileName.
      *
      * @return string
      */
@@ -395,7 +394,7 @@ public function getOriginalFileName()
     }
 
     /**
-     * Set storage location
+     * Set storage location.
      *
      * @param string $storageLocation
      *
@@ -410,7 +409,7 @@ public function setStorageLocation($storageLocation)
     }
 
     /**
-     * Get storage location
+     * Get storage location.
      *
      * @return string
      */
@@ -424,7 +423,7 @@ public function getStorageLocation()
     }
 
     /**
-     * Set path
+     * Set path.
      *
      * @param string $path
      *
@@ -439,7 +438,7 @@ public function setPath($path)
     }
 
     /**
-     * Get path
+     * Get path.
      *
      * @return string
      */
@@ -449,7 +448,7 @@ public function getPath()
     }
 
     /**
-     * Set remote path
+     * Set remote path.
      *
      * @param string $remotePath
      *
@@ -464,7 +463,7 @@ public function setRemotePath($remotePath)
     }
 
     /**
-     * Get remote path
+     * Get remote path.
      *
      * @return string
      */
@@ -474,7 +473,7 @@ public function getRemotePath()
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
      *
@@ -489,7 +488,7 @@ public function setAlias($alias)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
@@ -499,7 +498,7 @@ public function getAlias()
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
      *
@@ -514,7 +513,7 @@ public function setPublishUp($publishUp)
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
@@ -524,7 +523,7 @@ public function getPublishUp()
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
      *
@@ -539,7 +538,7 @@ public function setPublishDown($publishDown)
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
@@ -549,9 +548,9 @@ public function getPublishDown()
     }
 
     /**
-     * Set downloadCount
+     * Set downloadCount.
      *
-     * @param integer $downloadCount
+     * @param int $downloadCount
      *
      * @return Asset
      */
@@ -563,9 +562,9 @@ public function setDownloadCount($downloadCount)
     }
 
     /**
-     * Get downloadCount
+     * Get downloadCount.
      *
-     * @return integer
+     * @return int
      */
     public function getDownloadCount()
     {
@@ -573,9 +572,9 @@ public function getDownloadCount()
     }
 
     /**
-     * Set revision
+     * Set revision.
      *
-     * @param integer $revision
+     * @param int $revision
      *
      * @return Asset
      */
@@ -587,9 +586,9 @@ public function setRevision($revision)
     }
 
     /**
-     * Get revision
+     * Get revision.
      *
-     * @return integer
+     * @return int
      */
     public function getRevision()
     {
@@ -597,7 +596,7 @@ public function getRevision()
     }
 
     /**
-     * Set language
+     * Set language.
      *
      * @param string $language
      *
@@ -612,7 +611,7 @@ public function setLanguage($language)
     }
 
     /**
-     * Get language
+     * Get language.
      *
      * @return string
      */
@@ -622,7 +621,7 @@ public function getLanguage()
     }
 
     /**
-     * Set category
+     * Set category.
      *
      * @param \Mautic\CategoryBundle\Entity\Category $category
      *
@@ -637,7 +636,7 @@ public function setCategory(\Mautic\CategoryBundle\Entity\Category $category = n
     }
 
     /**
-     * Get category
+     * Get category.
      *
      * @return \Mautic\CategoryBundle\Entity\Category
      */
@@ -652,23 +651,23 @@ public function getCategory()
      */
     protected function isChanged($prop, $val)
     {
-        $getter  = "get".ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
 
         parent::isChanged($prop, $val);
     }
 
     /**
-     * Constructor
+     * Constructor.
      */
     public function __construct()
     {
     }
 
     /**
-     * Set uniqueDownloadCount
+     * Set uniqueDownloadCount.
      *
-     * @param integer $uniqueDownloadCount
+     * @param int $uniqueDownloadCount
      *
      * @return Asset
      */
@@ -680,9 +679,9 @@ public function setUniqueDownloadCount($uniqueDownloadCount)
     }
 
     /**
-     * Get uniqueDownloadCount
+     * Get uniqueDownloadCount.
      *
-     * @return integer
+     * @return int
      */
     public function getUniqueDownloadCount()
     {
@@ -767,11 +766,9 @@ public function upload()
     }
 
     /**
-     * Remove a file
+     * Remove a file.
      *
-     * @param   boolean $temp >> regular uploaded file or temporary
-     *
-     * @return  void
+     * @param bool $temp >> regular uploaded file or temporary
      */
     public function removeUpload($temp = false)
     {
@@ -837,7 +834,7 @@ protected function getUploadDir()
     }
 
     /**
-     * Set uploadDir
+     * Set uploadDir.
      *
      * @param string $uploadDir
      *
@@ -852,7 +849,7 @@ public function setUploadDir($uploadDir)
 
     /**
      * Returns maximal uploadable size in bytes.
-     * If not set, 6000000 is default
+     * If not set, 6000000 is default.
      *
      * @return string
      */
@@ -866,7 +863,7 @@ protected function getMaxSize()
     }
 
     /**
-     * Set max size
+     * Set max size.
      *
      * @param string $maxSize
      *
@@ -880,14 +877,13 @@ public function setMaxSize($maxSize)
     }
 
     /**
-     * Returns file extension
+     * Returns file extension.
      *
      * @return string
      */
     public function getFileType()
     {
         if (!empty($this->extension) && empty($this->changes['originalFileName'])) {
-
             return $this->extension;
         }
 
@@ -903,13 +899,13 @@ public function getFileType()
     }
 
     /**
-     * Returns some file info
+     * Returns some file info.
      *
      * @return array
      */
     public function getFileInfo()
     {
-        $fileInfo = array();
+        $fileInfo = [];
 
         if ($this->getStorageLocation() == 'remote') {
             $ch = curl_init($this->getRemotePath());
@@ -941,7 +937,7 @@ public function getFileInfo()
     }
 
     /**
-     * Returns file mime type
+     * Returns file mime type.
      *
      * @return string
      */
@@ -997,7 +993,7 @@ public function getIconClass()
     /**
      * Decides if an asset is image displayable by browser.
      *
-     * @return boolean
+     * @return bool
      */
     public function isImage()
     {
@@ -1007,7 +1003,7 @@ public function isImage()
             return false;
         }
 
-        $imageTypes = array('jpg', 'jpeg', 'png', 'gif');
+        $imageTypes = ['jpg', 'jpeg', 'png', 'gif'];
 
         if (in_array($fileType, $imageTypes)) {
             return true;
@@ -1017,56 +1013,56 @@ public function isImage()
     }
 
     /**
-     * Returns array of common extensions
+     * Returns array of common extensions.
      *
      * @return string
      */
     public function getFileExtensions()
     {
-        return array(
-            'excel'      => array(
+        return [
+            'excel' => [
                 'xlsx',
                 'xlsm',
                 'xlsb',
                 'xltx',
                 'xltm',
                 'xls',
-                'xlt'
-            ),
-            'word'       => array(
+                'xlt',
+            ],
+            'word' => [
                 'doc',
                 'docx',
                 'docm',
-                'dotx'
-            ),
-            'pdf'        => array(
-                'pdf'
-            ),
-            'audio'      => array(
-                'mp3'
-            ),
-            'archive'    => array(
+                'dotx',
+            ],
+            'pdf' => [
+                'pdf',
+            ],
+            'audio' => [
+                'mp3',
+            ],
+            'archive' => [
                 'zip',
                 'rar',
                 'iso',
                 'tar',
                 'gz',
-                '7z'
-            ),
-            'image'      => array(
+                '7z',
+            ],
+            'image' => [
                 'jpg',
                 'jpeg',
                 'png',
                 'gif',
                 'ico',
                 'bmp',
-                'psd'
-            ),
-            'text'       => array(
+                'psd',
+            ],
+            'text' => [
                 'txt',
-                'pub'
-            ),
-            'code'       => array(
+                'pub',
+            ],
+            'code' => [
                 'php',
                 'js',
                 'json',
@@ -1074,9 +1070,9 @@ public function getFileExtensions()
                 'xml',
                 'html',
                 'htm',
-                'sql'
-            ),
-            'powerpoint' => array(
+                'sql',
+            ],
+            'powerpoint' => [
                 'ppt',
                 'pptx',
                 'pptm',
@@ -1085,16 +1081,16 @@ public function getFileExtensions()
                 'potx',
                 'pot',
                 'pps',
-                'odp'
-            ),
-            'video'      => array(
+                'odp',
+            ],
+            'video' => [
                 'wmv',
                 'avi',
                 'mp4',
                 'mkv',
-                'mpeg'
-            )
-        );
+                'mpeg',
+            ],
+        ];
     }
 
     /**
@@ -1136,7 +1132,7 @@ public function getFileContents()
     }
 
     /**
-     * Get the path to the file; a URL if remote or full file path if local
+     * Get the path to the file; a URL if remote or full file path if local.
      *
      * @return string
      */
@@ -1167,11 +1163,11 @@ public function setDescription($description)
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         // Add a constraint to manage the file upload data
-        $metadata->addConstraint(new Assert\Callback(array('\\Mautic\\AssetBundle\\Entity\\Asset', 'validateFile')));
+        $metadata->addConstraint(new Assert\Callback(['\\Mautic\\AssetBundle\\Entity\\Asset', 'validateFile']));
     }
 
     /**
-     * Validator to ensure proper data for the file fields
+     * Validator to ensure proper data for the file fields.
      *
      * @param Asset                     $object  Entity object to validate
      * @param ExecutionContextInterface $context Context object
@@ -1213,7 +1209,7 @@ public static function validateFile($object, ExecutionContextInterface $context)
     }
 
     /**
-     * Set temporary ID
+     * Set temporary ID.
      *
      * @param string $tempId
      *
@@ -1227,7 +1223,7 @@ public function setTempId($tempId)
     }
 
     /**
-     * Get temporary ID
+     * Get temporary ID.
      *
      * @return string
      */
@@ -1237,7 +1233,7 @@ public function getTempId()
     }
 
     /**
-     * Set temporary file name
+     * Set temporary file name.
      *
      * @param string $tempName
      *
@@ -1251,7 +1247,7 @@ public function setTempName($tempName)
     }
 
     /**
-     * Get temporary file name
+     * Get temporary file name.
      *
      * @return string
      */
@@ -1306,18 +1302,16 @@ public function setSize($size)
         return $this;
     }
 
-
     /**
-     * Borrowed from Symfony\Component\HttpFoundation\File\UploadedFile::getMaxFilesize
+     * Borrowed from Symfony\Component\HttpFoundation\File\UploadedFile::getMaxFilesize.
      *
      * @param $size
      *
      * @return int|string
      */
-    static public function convertSizeToBytes($size)
+    public static function convertSizeToBytes($size)
     {
         if ('' === $size) {
-
             return PHP_INT_MAX;
         }
 
@@ -1345,19 +1339,18 @@ static public function convertSizeToBytes($size)
     }
 
     /**
-     * Get value from PHP configuration with special handling of -1
+     * Get value from PHP configuration with special handling of -1.
      *
      * @param string    $setting
      * @param bool|true $convertToBytes
      *
      * @return int
      */
-    static public function getIniValue($setting, $convertToBytes = true)
+    public static function getIniValue($setting, $convertToBytes = true)
     {
         $value = ini_get($setting);
 
         if ($value == -1 || $value === 0) {
-
             return PHP_INT_MAX;
         }
 
@@ -1374,7 +1367,7 @@ static public function getIniValue($setting, $convertToBytes = true)
      *
      * @return string
      */
-    static public function convertBytesToHumanReadable($size, $unit = '')
+    public static function convertBytesToHumanReadable($size, $unit = '')
     {
         list($number, $unit) = self::convertBytesToUnit($size, $unit);
 
@@ -1382,7 +1375,7 @@ static public function convertBytesToHumanReadable($size, $unit = '')
         $number = number_format($number, 2);
 
         // Remove trailing .00
-        $number = strpos($number,'.') !== false ? rtrim(rtrim($number,'0'),'.') : $number;
+        $number = strpos($number, '.') !== false ? rtrim(rtrim($number, '0'), '.') : $number;
 
         return $number.' '.$unit;
     }
@@ -1393,25 +1386,22 @@ static public function convertBytesToHumanReadable($size, $unit = '')
      *
      * @return array
      */
-    static public function convertBytesToUnit($size, $unit = '')
+    public static function convertBytesToUnit($size, $unit = '')
     {
         $unit = strtoupper($unit);
 
         if ((!$unit && $size >= 1 << 30) || $unit == 'GB' || $unit == 'G') {
-
-            return array($size / (1 << 30), 'GB');
+            return [$size / (1 << 30), 'GB'];
         }
         if ((!$unit && $size >= 1 << 20) || $unit == 'MB' || $unit == 'M') {
-
-            return array($size / (1 << 20), 'MB');
+            return [$size / (1 << 20), 'MB'];
         }
         if ((!$unit && $size >= 1 << 10) || $unit == 'KB' || $unit == 'K') {
-
-            return array($size / (1 << 10), 'KB');
+            return [$size / (1 << 10), 'KB'];
         }
 
         // Add zero to remove useless .00
-        return array($size, 'bytes');
+        return [$size, 'bytes'];
     }
 
     /**
@@ -1439,7 +1429,7 @@ public function setDownloadUrl($downloadUrl)
      */
     public function isLocal()
     {
-        return ($this->storageLocation != 'remote');
+        return $this->storageLocation != 'remote';
     }
 
     /**
@@ -1447,6 +1437,6 @@ public function isLocal()
      */
     public function isRemote()
     {
-        return ($this->storageLocation == 'remote');
+        return $this->storageLocation == 'remote';
     }
 }
diff --git a/app/bundles/AssetBundle/Entity/AssetRepository.php b/app/bundles/AssetBundle/Entity/AssetRepository.php
index 6447a4ff5e1..a1c4127f0e1 100644
--- a/app/bundles/AssetBundle/Entity/AssetRepository.php
+++ b/app/bundles/AssetBundle/Entity/AssetRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic, Na. All rights reserved.
+ * @copyright   2014 Mautic, Na. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,20 +14,18 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class AssetRepository
- *
- * @package Mautic\AssetBundle\Entity
+ * Class AssetRepository.
  */
 class AssetRepository extends CommonRepository
 {
-
     /**
-     * Get a list of entities
+     * Get a list of entities.
+     *
+     * @param array $args
      *
-     * @param array      $args
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('a')
@@ -69,19 +68,20 @@ public function getAssetList($search = '', $limit = 10, $start = 0, $viewOther =
         }
 
         $results = $q->getQuery()->getArrayResult();
+
         return $results;
     }
 
-
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('a.title',  ":$unique"),
@@ -90,31 +90,33 @@ protected function addCatchAllWhereClause(&$q, $filter)
         if ($filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
     {
-        $command         = $field = $filter->command;
+        $command         = $field         = $filter->command;
         $unique          = $this->generateRandomParameterName();
         $returnParameter = true; //returning a parameter that is not used will lead to a Doctrine error
         $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq("a.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('a.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq("a.isPublished", ":$unique");
-                $forceParameters = array($unique => false);
+                $expr            = $q->expr()->eq('a.isPublished', ":$unique");
+                $forceParameters = [$unique => false];
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
@@ -125,20 +127,20 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->eq("IDENTITY(a.createdBy)", $this->currentUser->getId());
+                $expr            = $q->expr()->eq('IDENTITY(a.createdBy)', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.category'):
-                $expr = $q->expr()->like('c.alias', ":$unique");
+                $expr           = $q->expr()->like('c.alias', ":$unique");
                 $filter->strict = true;
                 break;
             case $this->translator->trans('mautic.asset.asset.searchcommand.lang'):
-                $langUnique       = $this->generateRandomParameterName();
-                $langValue        = $filter->string . "_%";
-                $forceParameters = array(
+                $langUnique      = $this->generateRandomParameterName();
+                $langValue       = $filter->string.'_%';
+                $forceParameters = [
                     $langUnique => $langValue,
-                    $unique     => $filter->string
-                );
+                    $unique     => $filter->string,
+                ];
                 $expr = $q->expr()->orX(
                     $q->expr()->eq('a.language', ":$unique"),
                     $q->expr()->like('a.language', ":$langUnique")
@@ -153,13 +155,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif (!$returnParameter) {
-            $parameters = array();
+            $parameters = [];
         } else {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array( $expr, $parameters );
+        return [$expr, $parameters];
     }
 
     /**
@@ -167,14 +169,14 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isunpublished',
             'mautic.core.searchcommand.isuncategorized',
             'mautic.core.searchcommand.ismine',
             'mautic.core.searchcommand.category',
-            'mautic.asset.asset.searchcommand.lang'
-        );
+            'mautic.asset.asset.searchcommand.lang',
+        ];
     }
 
     /**
@@ -182,9 +184,9 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('a.title', 'ASC')
-        );
+        return [
+            ['a.title', 'ASC'],
+        ];
     }
 
     /**
@@ -198,7 +200,7 @@ public function getTableAlias()
     }
 
     /**
-     * Gets the sum size of assets
+     * Gets the sum size of assets.
      *
      * @param array $assets
      *
@@ -228,11 +230,11 @@ public function upDownloadCount($id, $increaseBy = 1, $unique = false)
         $q = $this->_em->getConnection()->createQueryBuilder();
 
         $q->update(MAUTIC_TABLE_PREFIX.'assets')
-            ->set('download_count', 'download_count + ' . (int) $increaseBy)
-            ->where('id = ' . (int) $id);
+            ->set('download_count', 'download_count + '.(int) $increaseBy)
+            ->where('id = '.(int) $id);
 
         if ($unique) {
-            $q->set('unique_download_count', 'unique_download_count + ' . (int) $increaseBy);
+            $q->set('unique_download_count', 'unique_download_count + '.(int) $increaseBy);
         }
 
         $q->execute();
diff --git a/app/bundles/AssetBundle/Entity/Download.php b/app/bundles/AssetBundle/Entity/Download.php
index f1ed293d506..f6c48043dc9 100644
--- a/app/bundles/AssetBundle/Entity/Download.php
+++ b/app/bundles/AssetBundle/Entity/Download.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,10 @@
 use Mautic\EmailBundle\Entity\Email;
 
 /**
- * Class Download
- *
- * @package Mautic\AssetBundle\Entity
+ * Class Download.
  */
 class Download
 {
-
     /**
      * @var int
      */
@@ -131,9 +129,9 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -141,7 +139,7 @@ public function getId()
     }
 
     /**
-     * Set dateDownload
+     * Set dateDownload.
      *
      * @param \DateTime $dateDownload
      *
@@ -155,7 +153,7 @@ public function setDateDownload($dateDownload)
     }
 
     /**
-     * Get dateDownload
+     * Get dateDownload.
      *
      * @return \DateTime
      */
@@ -165,9 +163,9 @@ public function getDateDownload()
     }
 
     /**
-     * Set code
+     * Set code.
      *
-     * @param integer $code
+     * @param int $code
      *
      * @return Download
      */
@@ -179,9 +177,9 @@ public function setCode($code)
     }
 
     /**
-     * Get code
+     * Get code.
      *
-     * @return integer
+     * @return int
      */
     public function getCode()
     {
@@ -189,7 +187,7 @@ public function getCode()
     }
 
     /**
-     * Set referer
+     * Set referer.
      *
      * @param string $referer
      *
@@ -203,7 +201,7 @@ public function setReferer($referer)
     }
 
     /**
-     * Get referer
+     * Get referer.
      *
      * @return string
      */
@@ -213,7 +211,7 @@ public function getReferer()
     }
 
     /**
-     * Set asset
+     * Set asset.
      *
      * @param Asset $asset
      *
@@ -227,7 +225,7 @@ public function setAsset(Asset $asset = null)
     }
 
     /**
-     * Get asset
+     * Get asset.
      *
      * @return Asset
      */
@@ -237,7 +235,7 @@ public function getAsset()
     }
 
     /**
-     * Set ipAddress
+     * Set ipAddress.
      *
      * @param \Mautic\CoreBundle\Entity\IpAddress $ipAddress
      *
@@ -251,7 +249,7 @@ public function setIpAddress(\Mautic\CoreBundle\Entity\IpAddress $ipAddress)
     }
 
     /**
-     * Get ipAddress
+     * Get ipAddress.
      *
      * @return \Mautic\CoreBundle\Entity\IpAddress
      */
@@ -261,9 +259,9 @@ public function getIpAddress()
     }
 
     /**
-     * Set trackingId
+     * Set trackingId.
      *
-     * @param integer $trackingId
+     * @param int $trackingId
      *
      * @return Download
      */
@@ -275,9 +273,9 @@ public function setTrackingId($trackingId)
     }
 
     /**
-     * Get trackingId
+     * Get trackingId.
      *
-     * @return integer
+     * @return int
      */
     public function getTrackingId()
     {
@@ -317,7 +315,7 @@ public function setSource($source)
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getSourceId()
     {
diff --git a/app/bundles/AssetBundle/Entity/DownloadRepository.php b/app/bundles/AssetBundle/Entity/DownloadRepository.php
index adff73811cc..dc05ea25974 100644
--- a/app/bundles/AssetBundle/Entity/DownloadRepository.php
+++ b/app/bundles/AssetBundle/Entity/DownloadRepository.php
@@ -1,30 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Helper\Chart\PieChart;
+use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\LeadBundle\Entity\TimelineTrait;
 
 /**
- * Class DownloadRepository
- *
- * @package Mautic\AssetBundle\Entity
+ * Class DownloadRepository.
  */
 class DownloadRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Determine if the download is a unique download
+     * Determine if the download is a unique download.
      *
      * @param $assetId
      * @param $trackingId
@@ -55,14 +54,14 @@ public function isUniqueDownload($assetId, $trackingId)
     }
 
     /**
-     * Get a lead's page downloads
+     * Get a lead's page downloads.
      *
      * @param       $leadId
      * @param array $options
      *
      * @return array
      */
-    public function getLeadDownloads($leadId, array $options = array())
+    public function getLeadDownloads($leadId, array $options = [])
     {
         $query = $this->getEntityManager()->getConnection()->createQueryBuilder()
             ->select('a.id as asset_id, d.date_download as dateDownload, a.title')
@@ -78,13 +77,14 @@ public function getLeadDownloads($leadId, array $options = array())
     }
 
     /**
-     * Get list of assets ordered by it's download count
+     * Get list of assets ordered by it's download count.
      *
      * @param QueryBuilder $query
-     * @param integer $limit
-     * @param integer $offset
+     * @param int          $limit
+     * @param int          $offset
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -102,13 +102,14 @@ public function getMostDownloaded($query, $limit = 10, $offset = 0)
     }
 
     /**
-     * Get list of asset referrals ordered by it's count
+     * Get list of asset referrals ordered by it's count.
      *
      * @param QueryBuilder $query
-     * @param integer $limit
-     * @param integer $offset
+     * @param int          $limit
+     * @param int          $offset
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -126,11 +127,12 @@ public function getTopReferrers($query, $limit = 10, $offset = 0)
     }
 
     /**
-     * Get pie graph data for http statuses
+     * Get pie graph data for http statuses.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -143,7 +145,7 @@ public function getHttpStatuses($query)
         $results = $query->execute()->fetchAll();
         $chart   = new PieChart();
 
-        foreach($results as $result) {
+        foreach ($results as $result) {
             $chart->setDataset($result['status'], $result['count']);
         }
 
@@ -166,7 +168,6 @@ public function getDownloadCountsByPage($pageId, \DateTime $fromDate = null)
         if (is_array($pageId)) {
             $q->where($q->expr()->in('p.id', $pageId))
                 ->groupBy('p.id, a.source_id, p.title, p.hits');
-
         } else {
             $q->where($q->expr()->eq('p.id', ':page'))
                 ->setParameter('page', (int) $pageId);
@@ -183,7 +184,7 @@ public function getDownloadCountsByPage($pageId, \DateTime $fromDate = null)
 
         $results = $q->execute()->fetchAll();
 
-        $downloads = array();
+        $downloads = [];
         foreach ($results as $r) {
             $downloads[$r['id']] = $r;
         }
@@ -193,7 +194,7 @@ public function getDownloadCountsByPage($pageId, \DateTime $fromDate = null)
 
     /**
      * Get download count by email by linking emails that have been associated with a page hit that has the
-     * same tracking ID as an asset download tracking ID and thus assumed happened in the same session
+     * same tracking ID as an asset download tracking ID and thus assumed happened in the same session.
      *
      * @param           $emailId
      * @param \DateTime $fromDate
@@ -226,7 +227,7 @@ public function getDownloadCountsByEmail($emailId, \DateTime $fromDate = null)
 
         $results = $q->execute()->fetchAll();
 
-        $downloads = array();
+        $downloads = [];
         foreach ($results as $r) {
             $downloads[$r['id']] = $r;
         }
@@ -242,21 +243,21 @@ public function getDownloadCountsByEmail($emailId, \DateTime $fromDate = null)
     public function updateLeadByTrackingId($leadId, $newTrackingId, $oldTrackingId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'asset_downloads')
+        $q->update(MAUTIC_TABLE_PREFIX.'asset_downloads')
             ->set('lead_id', (int) $leadId)
             ->set('tracking_id', ':newTrackingId')
             ->where(
                 $q->expr()->eq('tracking_id', ':oldTrackingId')
             )
-            ->setParameters(array(
+            ->setParameters([
                 'newTrackingId' => $newTrackingId,
-                'oldTrackingId' => $oldTrackingId
-            ))
+                'oldTrackingId' => $oldTrackingId,
+            ])
             ->execute();
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -264,9 +265,9 @@ public function updateLeadByTrackingId($leadId, $newTrackingId, $oldTrackingId)
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'asset_downloads')
+        $q->update(MAUTIC_TABLE_PREFIX.'asset_downloads')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 }
diff --git a/app/bundles/AssetBundle/ErrorHandler/DropzoneErrorHandler.php b/app/bundles/AssetBundle/ErrorHandler/DropzoneErrorHandler.php
index a73f60b2bd9..e0da59da07a 100644
--- a/app/bundles/AssetBundle/ErrorHandler/DropzoneErrorHandler.php
+++ b/app/bundles/AssetBundle/ErrorHandler/DropzoneErrorHandler.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@ class DropzoneErrorHandler implements ErrorHandlerInterface
 {
     public function addException(AbstractResponse $response, Exception $exception)
     {
-        // HTTP status between 400 and 500 should be set here. 
+        // HTTP status between 400 and 500 should be set here.
         // Dropzone will handle error messages itself then.
         // Unfortunatelly UploaderBundle will have this option in v 3.
         $response['error'] = $exception->getMessage();
diff --git a/app/bundles/AssetBundle/Event/AssetEvent.php b/app/bundles/AssetBundle/Event/AssetEvent.php
index d2c635b0807..f20294e8f36 100644
--- a/app/bundles/AssetBundle/Event/AssetEvent.php
+++ b/app/bundles/AssetBundle/Event/AssetEvent.php
@@ -1,21 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Event;
 
-use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\AssetBundle\Entity\Asset;
+use Mautic\CoreBundle\Event\CommonEvent;
 
 /**
- * Class AssetEvent
- *
- * @package Mautic\AssetBundle\Event
+ * Class AssetEvent.
  */
 class AssetEvent extends CommonEvent
 {
@@ -30,7 +29,7 @@ public function __construct(Asset $asset, $isNew = false)
     }
 
     /**
-     * Returns the Asset entity
+     * Returns the Asset entity.
      *
      * @return Asset
      */
@@ -40,7 +39,7 @@ public function getAsset()
     }
 
     /**
-     * Sets the Asset entity
+     * Sets the Asset entity.
      *
      * @param Asset $asset
      */
diff --git a/app/bundles/AssetBundle/Event/AssetLoadEvent.php b/app/bundles/AssetBundle/Event/AssetLoadEvent.php
index a8a089ff506..86f4d652a22 100644
--- a/app/bundles/AssetBundle/Event/AssetLoadEvent.php
+++ b/app/bundles/AssetBundle/Event/AssetLoadEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\CoreBundle\Event\CommonEvent;
 
 /**
- * Class AssetLoadEvent
- *
- * @package Mautic\AssetBundle\Event
+ * Class AssetLoadEvent.
  */
 class AssetLoadEvent extends CommonEvent
 {
@@ -34,7 +33,7 @@ public function __construct(Download $download, $isUnique)
     }
 
     /**
-     * Returns the Download entity
+     * Returns the Download entity.
      *
      * @return Download
      */
@@ -52,7 +51,7 @@ public function getAsset()
     }
 
     /**
-     * Returns if this is the first download for the session
+     * Returns if this is the first download for the session.
      *
      * @return bool
      */
diff --git a/app/bundles/AssetBundle/Event/RemoteAssetBrowseEvent.php b/app/bundles/AssetBundle/Event/RemoteAssetBrowseEvent.php
index f933d5a2c18..f74ad7e7370 100644
--- a/app/bundles/AssetBundle/Event/RemoteAssetBrowseEvent.php
+++ b/app/bundles/AssetBundle/Event/RemoteAssetBrowseEvent.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Event;
 
 use Gaufrette\Adapter;
-use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Mautic\CoreBundle\Event\CommonEvent;
+use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class RemoteAssetBrowseEvent
+ * Class RemoteAssetBrowseEvent.
  */
 class RemoteAssetBrowseEvent extends CommonEvent
 {
-
     /**
      * @var Adapter
      */
diff --git a/app/bundles/AssetBundle/EventListener/AssetSubscriber.php b/app/bundles/AssetBundle/EventListener/AssetSubscriber.php
index 55658fea392..3754394ad46 100644
--- a/app/bundles/AssetBundle/EventListener/AssetSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/AssetSubscriber.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\AssetBundle\Event as Events;
 use Mautic\AssetBundle\AssetEvents;
-use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\AssetBundle\Event as Events;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 
 /**
- * Class AssetSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class AssetSubscriber.
  */
 class AssetSubscriber extends CommonSubscriber
 {
@@ -42,22 +40,22 @@ class AssetSubscriber extends CommonSubscriber
     public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel)
     {
         $this->ipLookupHelper = $ipLookupHelper;
-        $this->auditLogModel = $auditLogModel;
+        $this->auditLogModel  = $auditLogModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            AssetEvents::ASSET_POST_SAVE   => array('onAssetPostSave', 0),
-            AssetEvents::ASSET_POST_DELETE => array('onAssetDelete', 0)
-        );
+        return [
+            AssetEvents::ASSET_POST_SAVE   => ['onAssetPostSave', 0],
+            AssetEvents::ASSET_POST_DELETE => ['onAssetDelete', 0],
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\AssetEvent $event
      */
@@ -65,34 +63,34 @@ public function onAssetPostSave(Events\AssetEvent $event)
     {
         $asset = $event->getAsset();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "asset",
-                "object"    => "asset",
-                "objectId"  => $asset->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'asset',
+                'object'    => 'asset',
+                'objectId'  => $asset->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\AssetEvent $event
      */
     public function onAssetDelete(Events\AssetEvent $event)
     {
         $asset = $event->getAsset();
-        $log = array(
-            "bundle"     => "asset",
-            "object"     => "asset",
-            "objectId"   => $asset->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $asset->getTitle()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log   = [
+            'bundle'    => 'asset',
+            'object'    => 'asset',
+            'objectId'  => $asset->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $asset->getTitle()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
 
         //In case of batch delete, this method call remove the uploaded file
diff --git a/app/bundles/AssetBundle/EventListener/BuilderSubscriber.php b/app/bundles/AssetBundle/EventListener/BuilderSubscriber.php
index 6a84698d670..3472830d3cf 100644
--- a/app/bundles/AssetBundle/EventListener/BuilderSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/BuilderSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,6 @@
 use Mautic\AssetBundle\Helper\TokenHelper;
 use Mautic\CoreBundle\Event\BuilderEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
 use Mautic\EmailBundle\EmailEvents;
 use Mautic\EmailBundle\Event\EmailSendEvent;
@@ -21,7 +21,7 @@
 use Mautic\PageBundle\PageEvents;
 
 /**
- * Class BuilderSubscriber
+ * Class BuilderSubscriber.
  */
 class BuilderSubscriber extends CommonSubscriber
 {
@@ -55,15 +55,15 @@ public function __construct(TokenHelper $tokenHelper, LeadModel $leadModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_ON_BUILD   => array('onBuilderBuild', 0),
-            EmailEvents::EMAIL_ON_SEND    => array('onEmailGenerate', 0),
-            EmailEvents::EMAIL_ON_DISPLAY => array('onEmailGenerate', 0),
-            PageEvents::PAGE_ON_BUILD     => array('onBuilderBuild', 0),
-            PageEvents::PAGE_ON_DISPLAY   => array('onPageDisplay', 0)
-        );
+        return [
+            EmailEvents::EMAIL_ON_BUILD   => ['onBuilderBuild', 0],
+            EmailEvents::EMAIL_ON_SEND    => ['onEmailGenerate', 0],
+            EmailEvents::EMAIL_ON_DISPLAY => ['onEmailGenerate', 0],
+            PageEvents::PAGE_ON_BUILD     => ['onBuilderBuild', 0],
+            PageEvents::PAGE_ON_DISPLAY   => ['onPageDisplay', 0],
+        ];
     }
 
     /**
@@ -101,7 +101,7 @@ public function onPageDisplay(PageDisplayEvent $event)
     {
         $page   = $event->getPage();
         $leadId = ($this->security->isAnonymous()) ? $this->leadModel->getCurrentLead()->getId() : null;
-        $tokens = $this->generateTokensFromContent($event, $leadId, array('page', $page->getId()));
+        $tokens = $this->generateTokensFromContent($event, $leadId, ['page', $page->getId()]);
 
         $content = $event->getContent();
         if (!empty($tokens)) {
@@ -128,13 +128,13 @@ private function addTokenSections($event)
      *
      * @return array
      */
-    private function generateTokensFromContent($event, $leadId, $source = array(), $emailId = null)
+    private function generateTokensFromContent($event, $leadId, $source = [], $emailId = null)
     {
         $content = $event->getContent();
 
-        $clickthrough = array();
+        $clickthrough = [];
         if ($event instanceof PageDisplayEvent || ($event instanceof EmailSendEvent && $event->shouldAppendClickthrough())) {
-            $clickthrough = array('source' => $source);
+            $clickthrough = ['source' => $source];
 
             if ($leadId !== null) {
                 $clickthrough['lead'] = $leadId;
diff --git a/app/bundles/AssetBundle/EventListener/CampaignSubscriber.php b/app/bundles/AssetBundle/EventListener/CampaignSubscriber.php
index 0161728b73e..882b941d8d2 100644
--- a/app/bundles/AssetBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/CampaignSubscriber.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\AssetBundle\EventListener;
 
 use Mautic\AssetBundle\AssetEvents;
-use Mautic\AssetBundle\Event\AssetEvent;
 use Mautic\AssetBundle\Event\AssetLoadEvent;
 use Mautic\CampaignBundle\CampaignEvents;
 use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
@@ -18,9 +19,7 @@
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class CampaignSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -42,12 +41,12 @@ public function __construct(EventModel $campaignEventModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             CampaignEvents::CAMPAIGN_ON_BUILD         => ['onCampaignBuild', 0],
             AssetEvents::ASSET_ON_LOAD                => ['onAssetDownload', 0],
-            AssetEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0]
+            AssetEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0],
         ];
     }
 
@@ -60,14 +59,14 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'label'       => 'mautic.asset.campaign.event.download',
             'description' => 'mautic.asset.campaign.event.download_descr',
             'eventName'   => AssetEvents::ON_CAMPAIGN_TRIGGER_DECISION,
-            'formType'    => 'campaignevent_assetdownload'
+            'formType'    => 'campaignevent_assetdownload',
         ];
 
         $event->addDecision('asset.download', $trigger);
     }
 
     /**
-     * Trigger point actions for asset download
+     * Trigger point actions for asset download.
      *
      * @param AssetLoadEvent $event
      */
@@ -101,4 +100,4 @@ public function onCampaignTriggerDecision(CampaignExecutionEvent $event)
 
         $event->setResult(true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/EventListener/ConfigSubscriber.php b/app/bundles/AssetBundle/EventListener/ConfigSubscriber.php
index 3322defc41c..9d7ba284c1f 100644
--- a/app/bundles/AssetBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/ConfigSubscriber.php
@@ -1,42 +1,41 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class ConfigSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE => array('onConfigGenerate', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+        ];
     }
 
-    public function onConfigGenerate (ConfigBuilderEvent $event)
+    public function onConfigGenerate(ConfigBuilderEvent $event)
     {
-        $event->addForm(array(
+        $event->addForm([
             'bundle'     => 'AssetBundle',
             'formAlias'  => 'assetconfig',
             'formTheme'  => 'MauticAssetBundle:FormTheme\Config',
-            'parameters' => $event->getParametersFromConfig('MauticAssetBundle')
-        ));
+            'parameters' => $event->getParametersFromConfig('MauticAssetBundle'),
+        ]);
     }
 }
diff --git a/app/bundles/AssetBundle/EventListener/DashboardSubscriber.php b/app/bundles/AssetBundle/EventListener/DashboardSubscriber.php
index 1070a74646d..43c24d88cfa 100644
--- a/app/bundles/AssetBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/DashboardSubscriber.php
@@ -1,54 +1,52 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\AssetBundle\EventListener;
 
 use Mautic\AssetBundle\Model\AssetModel;
-use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'asset';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var array
      */
-    protected $types = array(
-        'asset.downloads.in.time' => array(),
-        'unique.vs.repetitive.downloads' => array(),
-        'popular.assets' => array(),
-        'created.assets' => array()
-    );
+    protected $types = [
+        'asset.downloads.in.time'        => [],
+        'unique.vs.repetitive.downloads' => [],
+        'popular.assets'                 => [],
+        'created.assets'                 => [],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'asset:assets:viewown',
-        'asset:assets:viewother'
-    );
+        'asset:assets:viewother',
+    ];
 
     /**
      * @var AssetModel
@@ -66,23 +64,21 @@ public function __construct(AssetModel $assetModel)
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
         $this->checkPermissions($event);
         $canViewOthers = $event->hasPermission('asset:assets:viewother');
-        
+
         if ($event->getType() == 'asset.downloads.in.time') {
             $widget = $event->getWidget();
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->assetModel->getDownloadsLineChartData(
@@ -91,8 +87,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateTo'],
                         $params['dateFormat'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -102,12 +98,12 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
         if ($event->getType() == 'unique.vs.repetitive.downloads') {
             if (!$event->isCached()) {
                 $params = $event->getWidget()->getParams();
-                $model = $this->factory->getModel('asset');
-                $event->setTemplateData(array(
+                $model  = $this->factory->getModel('asset');
+                $event->setTemplateData([
                     'chartType'   => 'pie',
                     'chartHeight' => $event->getWidget()->getHeight() - 80,
-                    'chartData'   => $this->assetModel->getUniqueVsRepetitivePieChartData($params['dateFrom'], $params['dateTo'], $canViewOthers)
-                ));
+                    'chartData'   => $this->assetModel->getUniqueVsRepetitivePieChartData($params['dateFrom'], $params['dateTo'], $canViewOthers),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -124,36 +120,36 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 } else {
                     $limit = $params['limit'];
                 }
-                
+
                 $assets = $this->assetModel->getPopularAssets($limit, $params['dateFrom'], $params['dateTo'], $canViewOthers);
-                $items  = array();
+                $items  = [];
 
                 // Build table rows with links
                 if ($assets) {
                     foreach ($assets as &$asset) {
-                        $assetUrl = $this->router->generate('mautic_asset_action', array('objectAction' => 'view', 'objectId' => $asset['id']));
-                        $row = array(
-                            array(
+                        $assetUrl = $this->router->generate('mautic_asset_action', ['objectAction' => 'view', 'objectId' => $asset['id']]);
+                        $row      = [
+                            [
                                 'value' => $asset['title'],
-                                'type' => 'link',
-                                'link' => $assetUrl
-                            ),
-                            array(
-                                'value' => $asset['download_count']
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $assetUrl,
+                            ],
+                            [
+                                'value' => $asset['download_count'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
-                
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.dashboard.label.title'),
-                        $event->getTranslator()->trans('mautic.dashboard.label.downloads')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $assets
-                ));
+                        $event->getTranslator()->trans('mautic.dashboard.label.downloads'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $assets,
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
@@ -171,33 +167,33 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit = $params['limit'];
                 }
 
-                $assets = $this->assetModel->getAssetList($limit, $params['dateFrom'], $params['dateTo'], array(), array('canViewOthers' => $canViewOthers));
-                $items = array();
+                $assets = $this->assetModel->getAssetList($limit, $params['dateFrom'], $params['dateTo'], [], ['canViewOthers' => $canViewOthers]);
+                $items  = [];
 
                 // Build table rows with links
                 if ($assets) {
                     foreach ($assets as &$asset) {
-                        $assetUrl = $this->router->generate('mautic_asset_action', array('objectAction' => 'view', 'objectId' => $asset['id']));
-                        $row = array(
-                            array(
+                        $assetUrl = $this->router->generate('mautic_asset_action', ['objectAction' => 'view', 'objectId' => $asset['id']]);
+                        $row      = [
+                            [
                                 'value' => $asset['name'],
-                                'type' => 'link',
-                                'link' => $assetUrl
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $assetUrl,
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
-                        $event->getTranslator()->trans('mautic.dashboard.label.title')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $assets
-                ));
+                $event->setTemplateData([
+                    'headItems' => [
+                        $event->getTranslator()->trans('mautic.dashboard.label.title'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $assets,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
diff --git a/app/bundles/AssetBundle/EventListener/EmailSubscriber.php b/app/bundles/AssetBundle/EventListener/EmailSubscriber.php
index f3d2c3e76b8..289b667be82 100644
--- a/app/bundles/AssetBundle/EventListener/EmailSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/EmailSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,33 +15,32 @@
 use Mautic\EmailBundle\Event\EmailBuilderEvent;
 
 /**
- * Class EmailSubscriber
+ * Class EmailSubscriber.
  */
 class EmailSubscriber extends CommonSubscriber
 {
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_ON_BUILD => array('onEmailBuild', 0),
-        );
+        return [
+            EmailEvents::EMAIL_ON_BUILD => ['onEmailBuild', 0],
+        ];
     }
 
     /**
-     *
      * @param EmailBuilderEvent $event
      */
-    public function onEmailBuild (EmailBuilderEvent $event)
+    public function onEmailBuild(EmailBuilderEvent $event)
     {
         if ($event->abTestWinnerCriteriaRequested()) {
             //add AB Test Winner Criteria
-            $formSubmissions = array(
+            $formSubmissions = [
                 'group'    => 'mautic.asset.abtest.criteria',
                 'label'    => 'mautic.asset.abtest.criteria.downloads',
-                'callback' => '\Mautic\AssetBundle\Helper\AbTestHelper::determineDownloadWinner'
-            );
+                'callback' => '\Mautic\AssetBundle\Helper\AbTestHelper::determineDownloadWinner',
+            ];
             $event->addAbTestWinnerCriteria('asset.downloads', $formSubmissions);
         }
     }
diff --git a/app/bundles/AssetBundle/EventListener/FormSubscriber.php b/app/bundles/AssetBundle/EventListener/FormSubscriber.php
index 91d5cc6d1d5..1cb19ebf716 100644
--- a/app/bundles/AssetBundle/EventListener/FormSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/FormSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,40 +15,38 @@
 use Mautic\FormBundle\FormEvents;
 
 /**
- * Class FormSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class FormSubscriber.
  */
 class FormSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            FormEvents::FORM_ON_BUILD => array('onFormBuilder', 0),
-        );
+        return [
+            FormEvents::FORM_ON_BUILD => ['onFormBuilder', 0],
+        ];
     }
 
     /**
-     * Add a lead generation action to available form submit actions
+     * Add a lead generation action to available form submit actions.
      *
      * @param FormBuilderEvent $event
      */
     public function onFormBuilder(FormBuilderEvent $event)
     {
         //add form submit actions
-        $action = array(
+        $action = [
             'group'              => 'mautic.asset.actions',
             'label'              => 'mautic.asset.asset.submitaction.downloadfile',
             'description'        => 'mautic.asset.asset.submitaction.downloadfile_descr',
             'formType'           => 'asset_submitaction_downloadfile',
-            'formTypeCleanMasks' => array('message' => 'html'),
+            'formTypeCleanMasks' => ['message' => 'html'],
             'callback'           => '\Mautic\AssetBundle\Helper\FormSubmitHelper::onFormSubmit',
-            'allowCampaignForm'  => true
-        );
+            'allowCampaignForm'  => true,
+        ];
 
         $event->addSubmitAction('asset.download', $action);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/EventListener/LeadSubscriber.php b/app/bundles/AssetBundle/EventListener/LeadSubscriber.php
index b7d6d6c4959..6d3ebd56c4e 100644
--- a/app/bundles/AssetBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/LeadSubscriber.php
@@ -1,26 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\AssetBundle\EventListener;
 
-use Mautic\AssetBundle\AssetEvents;
 use Mautic\AssetBundle\Model\AssetModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Event\LeadChangeEvent;
 use Mautic\LeadBundle\Event\LeadMergeEvent;
 use Mautic\LeadBundle\Event\LeadTimelineEvent;
 use Mautic\LeadBundle\LeadEvents;
 
 /**
- * Class AssetBundle
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class AssetBundle.
  */
 class LeadSubscriber extends CommonSubscriber
 {
@@ -42,7 +40,7 @@ public function __construct(AssetModel $assetModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             LeadEvents::TIMELINE_ON_GENERATE => ['onTimelineGenerate', 0],
@@ -52,7 +50,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -65,7 +63,6 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
 
         // Decide if those events are filtered
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
@@ -85,19 +82,19 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                 $asset = $this->assetModel->getEntity($download['asset_id']);
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => [
+                        'event'      => $eventTypeKey,
+                        'eventLabel' => [
                             'label' => $download['title'],
-                            'href'  => $this->router->generate('mautic_asset_action', ['objectAction' => 'view', 'objectId' => $download['asset_id']])
+                            'href'  => $this->router->generate('mautic_asset_action', ['objectAction' => 'view', 'objectId' => $download['asset_id']]),
                         ],
-                        'extra'           => [
+                        'extra' => [
                             'asset'            => $asset,
-                            'assetDownloadUrl' => $this->assetModel->generateUrl($asset)
+                            'assetDownloadUrl' => $this->assetModel->generateUrl($asset),
                         ],
                         'eventType'       => $eventTypeName,
                         'timestamp'       => $download['dateDownload'],
                         'icon'            => 'fa-download',
-                        'contentTemplate' => 'MauticAssetBundle:SubscribedEvents\Timeline:index.html.php'
+                        'contentTemplate' => 'MauticAssetBundle:SubscribedEvents\Timeline:index.html.php',
                     ]
                 );
             }
diff --git a/app/bundles/AssetBundle/EventListener/PageSubscriber.php b/app/bundles/AssetBundle/EventListener/PageSubscriber.php
index e226c0679c5..aa98a8964e1 100644
--- a/app/bundles/AssetBundle/EventListener/PageSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/PageSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,34 +15,34 @@
 use Mautic\PageBundle\PageEvents;
 
 /**
- * Class PageSubscriber
+ * Class PageSubscriber.
  */
 class PageSubscriber extends CommonSubscriber
 {
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PageEvents::PAGE_ON_BUILD   => array('OnPageBuild', 0)
-        );
+        return [
+            PageEvents::PAGE_ON_BUILD => ['OnPageBuild', 0],
+        ];
     }
 
     /**
-     * Add forms to available page tokens
+     * Add forms to available page tokens.
      *
      * @param PageBuilderEvent $event
      */
-    public function onPageBuild (PageBuilderEvent $event)
+    public function onPageBuild(PageBuilderEvent $event)
     {
         if ($event->abTestWinnerCriteriaRequested()) {
             //add AB Test Winner Criteria
-            $assetDownloads = array(
+            $assetDownloads = [
                 'group'    => 'mautic.asset.abtest.criteria',
                 'label'    => 'mautic.asset.abtest.criteria.downloads',
-                'callback' => '\Mautic\AssetBundle\Helper\AbTestHelper::determineDownloadWinner'
-            );
+                'callback' => '\Mautic\AssetBundle\Helper\AbTestHelper::determineDownloadWinner',
+            ];
             $event->addAbTestWinnerCriteria('asset.downloads', $assetDownloads);
         }
     }
diff --git a/app/bundles/AssetBundle/EventListener/PointSubscriber.php b/app/bundles/AssetBundle/EventListener/PointSubscriber.php
index 86e86efaa6f..7e1ba9432fa 100644
--- a/app/bundles/AssetBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/PointSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\AssetBundle\EventListener;
 
 use Mautic\AssetBundle\AssetEvents;
@@ -16,9 +18,7 @@
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
@@ -40,12 +40,12 @@ public function __construct(PointModel $pointModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::POINT_ON_BUILD    => array('onPointBuild', 0),
-            AssetEvents::ASSET_ON_LOAD => array('onAssetDownload', 0)
-        );
+        return [
+            PointEvents::POINT_ON_BUILD => ['onPointBuild', 0],
+            AssetEvents::ASSET_ON_LOAD  => ['onAssetDownload', 0],
+        ];
     }
 
     /**
@@ -53,28 +53,28 @@ static public function getSubscribedEvents()
      */
     public function onPointBuild(PointBuilderEvent $event)
     {
-        $action = array(
+        $action = [
             'group'       => 'mautic.asset.actions',
             'label'       => 'mautic.asset.point.action.download',
             'description' => 'mautic.asset.point.action.download_descr',
-            'callback'    => array('\\Mautic\\AssetBundle\\Helper\\PointActionHelper', 'validateAssetDownload'),
-            'formType'    => 'pointaction_assetdownload'
-        );
+            'callback'    => ['\\Mautic\\AssetBundle\\Helper\\PointActionHelper', 'validateAssetDownload'],
+            'formType'    => 'pointaction_assetdownload',
+        ];
 
         $event->addAction('asset.download', $action);
     }
 
     /**
-     * Trigger point actions for asset download
+     * Trigger point actions for asset download.
      *
      * @param AssetLoadEvent $event
      */
     public function onAssetDownload(AssetLoadEvent $event)
     {
         $asset = $event->getRecord()->getAsset();
-        
+
         if ($asset !== null) {
             $this->pointModel->triggerAction('asset.download', $asset);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/EventListener/ReportSubscriber.php b/app/bundles/AssetBundle/EventListener/ReportSubscriber.php
index 62161799b57..25846fd9460 100644
--- a/app/bundles/AssetBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/ReportSubscriber.php
@@ -1,46 +1,43 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\ReportBundle\Event\ReportBuilderEvent;
 use Mautic\ReportBundle\Event\ReportGeneratorEvent;
 use Mautic\ReportBundle\Event\ReportGraphEvent;
 use Mautic\ReportBundle\ReportEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
 
 /**
- * Class ReportSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class ReportSubscriber.
  */
 class ReportSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             ReportEvents::REPORT_ON_BUILD          => ['onReportBuilder', 0],
             ReportEvents::REPORT_ON_GENERATE       => ['onReportGenerate', 0],
-            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0]
+            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0],
         ];
     }
 
     /**
-     * Add available tables and columns to the report builder lookup
+     * Add available tables and columns to the report builder lookup.
      *
      * @param ReportBuilderEvent $event
-     *
-     * @return void
      */
     public function onReportBuilder(ReportBuilderEvent $event)
     {
@@ -48,26 +45,26 @@ public function onReportBuilder(ReportBuilderEvent $event)
             // Assets
             $prefix  = 'a.';
             $columns = [
-                $prefix.'download_count'        => [
+                $prefix.'download_count' => [
                     'label' => 'mautic.asset.report.download_count',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
                 $prefix.'unique_download_count' => [
                     'label' => 'mautic.asset.report.unique_download_count',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                $prefix.'alias'                 => [
+                $prefix.'alias' => [
                     'label' => 'mautic.core.alias',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'lang'                  => [
+                $prefix.'lang' => [
                     'label' => 'mautic.core.language',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'title'                 => [
+                $prefix.'title' => [
                     'label' => 'mautic.core.title',
-                    'type'  => 'string'
-                ]
+                    'type'  => 'string',
+                ],
             ];
 
             $columns = array_merge($columns, $event->getStandardColumns($prefix, ['name'], 'mautic_asset_action'), $event->getCategoryColumns());
@@ -75,7 +72,7 @@ public function onReportBuilder(ReportBuilderEvent $event)
                 'assets',
                 [
                     'display_name' => 'mautic.asset.assets',
-                    'columns'      => $columns
+                    'columns'      => $columns,
                 ]
             );
 
@@ -85,31 +82,31 @@ public function onReportBuilder(ReportBuilderEvent $event)
                 $downloadColumns = [
                     $downloadPrefix.'date_download' => [
                         'label' => 'mautic.asset.report.download.date_download',
-                        'type'  => 'datetime'
+                        'type'  => 'datetime',
                     ],
-                    $downloadPrefix.'code'          => [
+                    $downloadPrefix.'code' => [
                         'label' => 'mautic.asset.report.download.code',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $downloadPrefix.'referer'       => [
+                    $downloadPrefix.'referer' => [
                         'label' => 'mautic.core.referer',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $downloadPrefix.'source'        => [
+                    $downloadPrefix.'source' => [
                         'label' => 'mautic.report.field.source',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $downloadPrefix.'source_id'     => [
+                    $downloadPrefix.'source_id' => [
                         'label' => 'mautic.report.field.source_id',
-                        'type'  => 'int'
-                    ]
+                        'type'  => 'int',
+                    ],
                 ];
 
                 $event->addTable(
                     'asset.downloads',
                     [
                         'display_name' => 'mautic.asset.report.downloads.table',
-                        'columns'      => array_merge($columns, $downloadColumns, $event->getLeadColumns(), $event->getIpColumn())
+                        'columns'      => array_merge($columns, $downloadColumns, $event->getLeadColumns(), $event->getIpColumn()),
                     ],
                     'assets'
                 );
@@ -125,11 +122,9 @@ public function onReportBuilder(ReportBuilderEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGeneratorEvent $event
-     *
-     * @return void
      */
     public function onReportGenerate(ReportGeneratorEvent $event)
     {
@@ -153,11 +148,9 @@ public function onReportGenerate(ReportGeneratorEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGraphEvent $event
-     *
-     * @return void
      */
     public function onReportGraphGenerate(ReportGraphEvent $event)
     {
diff --git a/app/bundles/AssetBundle/EventListener/SearchSubscriber.php b/app/bundles/AssetBundle/EventListener/SearchSubscriber.php
index 47213f8baec..b0e84ab6e87 100644
--- a/app/bundles/AssetBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/SearchSubscriber.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\EventListener;
 
 use Mautic\AssetBundle\Model\AssetModel;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -39,12 +38,12 @@ public function __construct(AssetModel $assetModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
@@ -57,44 +56,44 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
             return;
         }
 
-        $filter     = array("string" => $str, "force" => array());
+        $filter = ['string' => $str, 'force' => []];
 
         $permissions = $this->security->isGranted(
-            array('asset:assets:viewown', 'asset:assets:viewother'),
+            ['asset:assets:viewown', 'asset:assets:viewother'],
             'RETURN_ARRAY'
         );
         if ($permissions['asset:assets:viewown'] || $permissions['asset:assets:viewother']) {
             if (!$permissions['asset:assets:viewother']) {
-                $filter['force'][] = array(
+                $filter['force'][] = [
                     'column' => 'IDENTITY(a.createdBy)',
                     'expr'   => 'eq',
-                    'value'  => $this->factory->getUser()->getId()
-                );
+                    'value'  => $this->factory->getUser()->getId(),
+                ];
             }
 
             $assets = $this->assetModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $filter
-                ));
+                    'filter' => $filter,
+                ]);
 
             if (count($assets) > 0) {
-                $assetResults = array();
+                $assetResults = [];
 
                 foreach ($assets as $asset) {
                     $assetResults[] = $this->templating->renderResponse(
                         'MauticAssetBundle:SubscribedEvents\Search:global.html.php',
-                        array('asset' => $asset)
+                        ['asset' => $asset]
                     )->getContent();
                 }
                 if (count($assets) > 5) {
                     $assetResults[] = $this->templating->renderResponse(
                         'MauticAssetBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($assets) - 5)
-                        )
+                            'remaining'    => (count($assets) - 5),
+                        ]
                     )->getContent();
                 }
                 $assetResults['count'] = count($assets);
@@ -108,11 +107,11 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
      */
     public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        if ($this->security->isGranted(array('asset:assets:viewown', 'asset:assets:viewother'), "MATCH_ONE")) {
+        if ($this->security->isGranted(['asset:assets:viewown', 'asset:assets:viewother'], 'MATCH_ONE')) {
             $event->addCommands(
                 'mautic.asset.assets',
                 $this->assetModel->getCommandList()
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/EventListener/UploadSubscriber.php b/app/bundles/AssetBundle/EventListener/UploadSubscriber.php
index e9220e66236..fc5e95da20d 100644
--- a/app/bundles/AssetBundle/EventListener/UploadSubscriber.php
+++ b/app/bundles/AssetBundle/EventListener/UploadSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,9 +20,7 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class UploadSubscriber
- *
- * @package Mautic\AssetBundle\EventListener
+ * Class UploadSubscriber.
  */
 class UploadSubscriber extends CommonSubscriber
 {
@@ -42,26 +41,26 @@ class UploadSubscriber extends CommonSubscriber
 
     /**
      * UploadSubscriber constructor.
-     * 
-     * @param TranslatorInterface $translator
+     *
+     * @param TranslatorInterface  $translator
      * @param CoreParametersHelper $coreParametersHelper
-     * @param AssetModel $assetModel
+     * @param AssetModel           $assetModel
      */
     public function __construct(TranslatorInterface $translator, CoreParametersHelper $coreParametersHelper, AssetModel $assetModel)
     {
-        $this->translator = $translator;
+        $this->translator           = $translator;
         $this->coreParametersHelper = $coreParametersHelper;
-        $this->assetModel = $assetModel;
+        $this->assetModel           = $assetModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
         return [
             UploadEvents::POST_UPLOAD => ['onPostUpload', 0],
-            UploadEvents::VALIDATION  => ['onUploadValidation', 0]
+            UploadEvents::VALIDATION  => ['onUploadValidation', 0],
         ];
     }
 
@@ -71,7 +70,7 @@ static public function getSubscribedEvents ()
      *
      * @param PostUploadEvent $event
      */
-    public function onPostUpload (PostUploadEvent $event)
+    public function onPostUpload(PostUploadEvent $event)
     {
         $request   = $event->getRequest()->request;
         $response  = $event->getResponse();
@@ -79,7 +78,7 @@ public function onPostUpload (PostUploadEvent $event)
         $file      = $event->getFile();
         $config    = $event->getConfig();
         $uploadDir = $config['storage']['directory'];
-        $tmpDir    = $uploadDir . '/tmp/' . $tempId;
+        $tmpDir    = $uploadDir.'/tmp/'.$tempId;
 
         // Move uploaded file to temporary folder
         $file->move($tmpDir);
@@ -90,11 +89,11 @@ public function onPostUpload (PostUploadEvent $event)
     }
 
     /**
-     * Validates file before upload
+     * Validates file before upload.
      *
      * @param ValidationEvent $event
      */
-    public function onUploadValidation (ValidationEvent $event)
+    public function onUploadValidation(ValidationEvent $event)
     {
         $file       = $event->getFile();
         $extensions = $this->coreParametersHelper->getParameter('allowed_extensions');
@@ -104,7 +103,7 @@ public function onUploadValidation (ValidationEvent $event)
             if ($file->getSize() > $maxSize) {
                 $message = $this->translator->trans('mautic.asset.asset.error.file.size', [
                     '%fileSize%' => round($file->getSize() / 1048576, 2),
-                    '%maxSize%'  => round($maxSize / 1048576, 2)
+                    '%maxSize%'  => round($maxSize / 1048576, 2),
                 ], 'validators');
                 throw new ValidationException($message);
             }
@@ -112,7 +111,7 @@ public function onUploadValidation (ValidationEvent $event)
             if (!in_array(strtolower($file->getExtension()), array_map('strtolower', $extensions))) {
                 $message = $this->translator->trans('mautic.asset.asset.error.file.extension', [
                     '%fileExtension%' => $file->getExtension(),
-                    '%extensions%'    => implode(', ', $extensions)
+                    '%extensions%'    => implode(', ', $extensions),
                 ], 'validators');
                 throw new ValidationException($message);
             }
diff --git a/app/bundles/AssetBundle/Form/Type/AssetListType.php b/app/bundles/AssetBundle/Form/Type/AssetListType.php
index 5908dd5300e..1de69062048 100644
--- a/app/bundles/AssetBundle/Form/Type/AssetListType.php
+++ b/app/bundles/AssetBundle/Form/Type/AssetListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,17 +15,14 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class AssetListType
- *
- * @package Mautic\AssetBundle\Form\Type
+ * Class AssetListType.
  */
 class AssetListType extends AbstractType
 {
-
     /**
      * @var array
      */
-    private $choices = array();
+    private $choices = [];
 
     /**
      * @param MauticFactory $factory
@@ -32,10 +30,10 @@ class AssetListType extends AbstractType
     public function __construct(MauticFactory $factory)
     {
         $viewOther = $factory->getSecurity()->isGranted('asset:assets:viewother');
-        $repo = $factory->getModel('asset')->getRepository();
+        $repo      = $factory->getModel('asset')->getRepository();
         $repo->setCurrentUser($factory->getUser());
         $choices = $repo->getAssetList('', 0, 0, $viewOther);
- 
+
         foreach ($choices as $asset) {
             $this->choices[$asset['language']][$asset['id']] = $asset['title'];
         }
@@ -49,13 +47,13 @@ public function __construct(MauticFactory $factory)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'choices'       => $this->choices,
-            'empty_value'   => false,
-            'expanded'      => false,
-            'multiple'      => true,
-            'required'      => false
-        ));
+        $resolver->setDefaults([
+            'choices'     => $this->choices,
+            'empty_value' => false,
+            'expanded'    => false,
+            'multiple'    => true,
+            'required'    => false,
+        ]);
     }
 
     /**
@@ -63,7 +61,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "asset_list";
+        return 'asset_list';
     }
 
     /**
diff --git a/app/bundles/AssetBundle/Form/Type/AssetType.php b/app/bundles/AssetBundle/Form/Type/AssetType.php
index e2b715f1107..2c649e063f5 100644
--- a/app/bundles/AssetBundle/Form/Type/AssetType.php
+++ b/app/bundles/AssetBundle/Form/Type/AssetType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,9 +21,7 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class AssetType
- *
- * @package Mautic\AssetBundle\Form\Type
+ * Class AssetType.
  */
 class AssetType extends AbstractType
 {
@@ -36,17 +35,17 @@ class AssetType extends AbstractType
      */
     private $themes;
 
-    /** 
+    /**
      * @var AssetModel
      */
     private $assetModel;
 
     /**
      * AssetType constructor.
-     * 
+     *
      * @param TranslatorInterface $translator
-     * @param ThemeHelper $themeHelper
-     * @param AssetModel $assetModel
+     * @param ThemeHelper         $themeHelper
+     * @param AssetModel          $assetModel
      */
     public function __construct(TranslatorInterface $translator, ThemeHelper $themeHelper, AssetModel $assetModel)
     {
@@ -59,44 +58,44 @@ public function __construct(TranslatorInterface $translator, ThemeHelper $themeH
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    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', [
-            'label' => 'mautic.asset.asset.form.storageLocation',
+            'label'       => 'mautic.asset.asset.form.storageLocation',
             'choice_list' => new ChoiceList(
                 ['local', 'remote'],
                 ['mautic.asset.asset.form.storageLocation.local', 'mautic.asset.asset.form.storageLocation.remote']
             ),
             'attr' => [
-                'onchange' => 'Mautic.changeAssetStorageLocation();'
-            ]
+                'onchange' => 'Mautic.changeAssetStorageLocation();',
+            ],
         ]);
 
         $maxUploadSize = $this->assetModel->getMaxUploadSize('', true);
         $builder->add('tempName', 'hidden', [
             'label'      => $this->translator->trans('mautic.asset.asset.form.file.upload', ['%max%' => $maxUploadSize]),
             'label_attr' => ['class' => 'control-label'],
-            'required'   => false
+            'required'   => false,
         ]);
 
         $builder->add('originalFileName', 'hidden', [
-            'required'   => false
+            'required' => false,
         ]);
 
         $builder->add('remotePath', 'text', [
             'label'      => 'mautic.asset.asset.form.remotePath',
             'label_attr' => ['class' => 'control-label'],
             'attr'       => ['class' => 'form-control'],
-            'required'   => false
+            'required'   => false,
         ]);
 
         $builder->add('title', 'text', [
             'label'      => 'mautic.core.title',
             'label_attr' => ['class' => 'control-label'],
-            'attr'       => ['class' => 'form-control']
+            'attr'       => ['class' => 'form-control'],
         ]);
 
         $builder->add('alias', 'text', [
@@ -106,18 +105,18 @@ public function buildForm (FormBuilderInterface $builder, array $options)
                 'class'   => 'form-control',
                 'tooltip' => 'mautic.asset.asset.help.alias',
             ],
-            'required'   => false
+            'required' => false,
         ]);
 
         $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
             'label_attr' => ['class' => 'control-label'],
             'attr'       => ['class' => 'form-control editor'],
-            'required'   => false
+            'required'   => false,
         ]);
 
         $builder->add('category', 'category', [
-            'bundle' => 'asset'
+            'bundle' => 'asset',
         ]);
 
         $builder->add('language', 'locale', [
@@ -127,7 +126,7 @@ public function buildForm (FormBuilderInterface $builder, array $options)
                 'class'   => 'form-control',
                 'tooltip' => 'mautic.asset.asset.form.language.help',
             ],
-            'required'   => false
+            'required' => false,
         ]);
 
         $builder->add('isPublished', 'yesno_button_group');
@@ -138,10 +137,10 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             'label_attr' => ['class' => 'control-label'],
             'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
+                'data-toggle' => 'datetime',
             ],
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
         ]);
 
         $builder->add('publishDown', 'datetime', [
@@ -150,20 +149,20 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             'label_attr' => ['class' => 'control-label'],
             'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
+                'data-toggle' => 'datetime',
             ],
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
         ]);
 
         $builder->add('tempId', 'hidden', [
-            'required'   => false
+            'required' => false,
         ]);
 
         $builder->add('buttons', 'form_buttons', []);
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -180,6 +179,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "asset";
+        return 'asset';
     }
 }
diff --git a/app/bundles/AssetBundle/Form/Type/CampaignEventAssetDownloadType.php b/app/bundles/AssetBundle/Form/Type/CampaignEventAssetDownloadType.php
index aa98fa18ab6..d44f30f3236 100644
--- a/app/bundles/AssetBundle/Form/Type/CampaignEventAssetDownloadType.php
+++ b/app/bundles/AssetBundle/Form/Type/CampaignEventAssetDownloadType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,33 +14,31 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class CampaignEventAssetDownloadType
- *
- * @package Mautic\AssetBundle\Form\Type
+ * Class CampaignEventAssetDownloadType.
  */
 class CampaignEventAssetDownloadType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('assets', 'asset_list', array(
-            'label'         => 'mautic.asset.campaign.event.assets',
-            'label_attr'    => array('class' => 'control-label'),
-            'attr'       => array(
+        $builder->add('assets', 'asset_list', [
+            'label'      => 'mautic.asset.campaign.event.assets',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.asset.campaign.event.assets.descr'
-            )
-        ));
+                'tooltip' => 'mautic.asset.campaign.event.assets.descr',
+            ],
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "campaignevent_assetdownload";
+    public function getName()
+    {
+        return 'campaignevent_assetdownload';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/Form/Type/ConfigType.php b/app/bundles/AssetBundle/Form/Type/ConfigType.php
index 66ec65a10ce..435050c8cc0 100644
--- a/app/bundles/AssetBundle/Form/Type/ConfigType.php
+++ b/app/bundles/AssetBundle/Form/Type/ConfigType.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Form\Type;
 
+use Mautic\CoreBundle\Form\DataTransformer\ArrayStringTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Mautic\CoreBundle\Form\DataTransformer\ArrayStringTransformer;
 
 /**
- * Class ConfigType
- *
- * @package Mautic\AssetBundle\Form\Type
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
@@ -25,47 +24,47 @@ class ConfigType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('upload_dir', 'text', array(
-            'label'       => 'mautic.asset.config.form.upload.dir',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.asset.config.form.upload.dir.tooltip'
-                ),
-            'constraints' => array(
-                new NotBlank(array(
-                    'message' => 'mautic.core.value.required'
-                ))
-            )
-        ));
+        $builder->add('upload_dir', 'text', [
+            'label'      => 'mautic.asset.config.form.upload.dir',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.asset.config.form.upload.dir.tooltip',
+                ],
+            'constraints' => [
+                new NotBlank([
+                    'message' => 'mautic.core.value.required',
+                ]),
+            ],
+        ]);
 
-        $builder->add('max_size', 'text', array(
-            'label'       => 'mautic.asset.config.form.max.size',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.asset.config.form.max.size.tooltip'
-                ),
-            'constraints' => array(
-                new NotBlank(array(
-                    'message' => 'mautic.core.value.required'
-                ))
-            )
-        ));
+        $builder->add('max_size', 'text', [
+            'label'      => 'mautic.asset.config.form.max.size',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.asset.config.form.max.size.tooltip',
+                ],
+            'constraints' => [
+                new NotBlank([
+                    'message' => 'mautic.core.value.required',
+                ]),
+            ],
+        ]);
 
         $arrayStringTransformer = new ArrayStringTransformer();
         $builder->add(
-            $builder->create('allowed_extensions', 'text', array(
+            $builder->create('allowed_extensions', 'text', [
                 'label'      => 'mautic.asset.config.form.allowed.extensions',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.asset.config.form.allowed.extensions.tooltip'
-                ),
-                'required'   => false
-            ))->addViewTransformer($arrayStringTransformer)
+                    'tooltip' => 'mautic.asset.config.form.allowed.extensions.tooltip',
+                ],
+                'required' => false,
+            ])->addViewTransformer($arrayStringTransformer)
         );
     }
 
@@ -76,4 +75,4 @@ public function getName()
     {
         return 'assetconfig';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/Form/Type/FormSubmitActionDownloadFileType.php b/app/bundles/AssetBundle/Form/Type/FormSubmitActionDownloadFileType.php
index ba764be80b2..cb293d84d16 100644
--- a/app/bundles/AssetBundle/Form/Type/FormSubmitActionDownloadFileType.php
+++ b/app/bundles/AssetBundle/Form/Type/FormSubmitActionDownloadFileType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,37 +14,35 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class FormSubmitActionDownloadFileType
- *
- * @package Mautic\AssetBundle\Form\Type
+ * Class FormSubmitActionDownloadFileType.
  */
 class FormSubmitActionDownloadFileType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('asset', 'asset_list', array(
-            'expanded'      => false,
-            'multiple'      => false,
-            'label'         => 'mautic.asset.form.submit.assets',
-            'label_attr'    => array('class' => 'control-label'),
-            'empty_value'   => false,
-            'required'      => false,
-            'attr'       => array(
+        $builder->add('asset', 'asset_list', [
+            'expanded'    => false,
+            'multiple'    => false,
+            'label'       => 'mautic.asset.form.submit.assets',
+            'label_attr'  => ['class' => 'control-label'],
+            'empty_value' => false,
+            'required'    => false,
+            'attr'        => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.asset.form.submit.assets_descr'
-            )
-        ));
+                'tooltip' => 'mautic.asset.form.submit.assets_descr',
+            ],
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "asset_submitaction_downloadfile";
+    public function getName()
+    {
+        return 'asset_submitaction_downloadfile';
     }
 }
diff --git a/app/bundles/AssetBundle/Form/Type/PointActionAssetDownloadType.php b/app/bundles/AssetBundle/Form/Type/PointActionAssetDownloadType.php
index 53ace1d13cb..1093d2d66bc 100644
--- a/app/bundles/AssetBundle/Form/Type/PointActionAssetDownloadType.php
+++ b/app/bundles/AssetBundle/Form/Type/PointActionAssetDownloadType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PointActionFormSubmitType
- *
- * @package Mautic\AssetBundle\Form\Type
+ * Class PointActionFormSubmitType.
  */
 class PointActionAssetDownloadType extends AbstractType
 {
@@ -23,26 +22,27 @@ class PointActionAssetDownloadType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('assets', 'asset_list', array(
-            'expanded'      => false,
-            'multiple'      => true,
-            'label'         => 'mautic.asset.point.action.assets',
-            'label_attr'    => array('class' => 'control-label'),
-            'empty_value'   => false,
-            'required'      => false,
-            'attr'       => array(
+        $builder->add('assets', 'asset_list', [
+            'expanded'    => false,
+            'multiple'    => true,
+            'label'       => 'mautic.asset.point.action.assets',
+            'label_attr'  => ['class' => 'control-label'],
+            'empty_value' => false,
+            'required'    => false,
+            'attr'        => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.asset.point.action.assets.descr'
-            )
-        ));
+                'tooltip' => 'mautic.asset.point.action.assets.descr',
+            ],
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "pointaction_assetdownload";
+    public function getName()
+    {
+        return 'pointaction_assetdownload';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/Helper/AbTestHelper.php b/app/bundles/AssetBundle/Helper/AbTestHelper.php
index 7b955d7609d..82c869303e0 100644
--- a/app/bundles/AssetBundle/Helper/AbTestHelper.php
+++ b/app/bundles/AssetBundle/Helper/AbTestHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,12 @@
 use Mautic\PageBundle\Entity\Page;
 
 /**
- * Class AbTestHelper
+ * Class AbTestHelper.
  */
 class AbTestHelper
 {
-
     /**
-     * Determines the winner of A/B test based on number of asset downloads
+     * Determines the winner of A/B test based on number of asset downloads.
      *
      * @param MauticFactory $factory
      * @param Page          $parent
@@ -28,7 +28,7 @@ class AbTestHelper
      *
      * @return array
      */
-    public static function determineDownloadWinner ($factory, $parent, $children)
+    public static function determineDownloadWinner($factory, $parent, $children)
     {
         $repo = $factory->getEntityManager()->getRepository('MauticAssetBundle:Download');
 
@@ -36,7 +36,7 @@ public static function determineDownloadWinner ($factory, $parent, $children)
         //if it is a page A/B test, then link form submission to page
         $type = ($parent instanceof Email) ? 'email' : 'page';
 
-        $ids = array($parent->getId());
+        $ids = [$parent->getId()];
 
         foreach ($children as $c) {
             if ($c->isPublished()) {
@@ -51,40 +51,40 @@ public static function determineDownloadWinner ($factory, $parent, $children)
 
             $translator = $factory->getTranslator();
             if ($counts) {
-                $downloads  = $support = $data = array();
-                $hasResults = array();
+                $downloads  = $support  = $data  = [];
+                $hasResults = [];
 
                 $downloadsLabel = $translator->trans('mautic.asset.abtest.label.downloads');
-                $hitsLabel        = ($type == 'page') ? $translator->trans('mautic.asset.abtest.label.hits') : $translator->trans('mautic.asset.abtest.label.sentemils');
+                $hitsLabel      = ($type == 'page') ? $translator->trans('mautic.asset.abtest.label.hits') : $translator->trans('mautic.asset.abtest.label.sentemils');
                 foreach ($counts as $stats) {
                     $rate                    = ($stats['total']) ? round(($stats['count'] / $stats['total']) * 100, 2) : 0;
                     $downloads[$stats['id']] = $rate;
                     $data[$downloadsLabel][] = $stats['count'];
                     $data[$hitsLabel][]      = $stats['total'];
-                    $support['labels'][]     = $stats['id'] . ':' . $stats['name'] . ' (' . $rate . '%)';
+                    $support['labels'][]     = $stats['id'].':'.$stats['name'].' ('.$rate.'%)';
                     $hasResults[]            = $stats['id'];
                 }
 
                 //make sure that parent and published children are included
                 if (!in_array($parent->getId(), $hasResults)) {
                     $data[$downloadsLabel][] = 0;
-                    $data[$hitsLabel][]        = 0;
-                    $support['labels'][]      = $parent->getId() . ':' . (($type == 'page') ? $parent->getTitle() : $parent->getName()) . ' (0%)';
+                    $data[$hitsLabel][]      = 0;
+                    $support['labels'][]     = $parent->getId().':'.(($type == 'page') ? $parent->getTitle() : $parent->getName()).' (0%)';
                 }
 
                 foreach ($children as $c) {
                     if ($c->isPublished()) {
                         if (!in_array($c->getId(), $hasResults)) {
                             $data[$downloadsLabel][] = 0;
-                            $data[$hitsLabel][]        = 0;
-                            $support['labels'][]      = $c->getId() . ':' . (($type == 'page') ? $c->getTitle() : $c->getName()) . ' (0%)';
+                            $data[$hitsLabel][]      = 0;
+                            $support['labels'][]     = $c->getId().':'.(($type == 'page') ? $c->getTitle() : $c->getName()).' (0%)';
                         }
                     }
                 }
                 $support['data'] = $data;
 
                 //set max for scales
-                $maxes = array();
+                $maxes = [];
                 foreach ($support['data'] as $label => $data) {
                     $maxes[] = max($data);
                 }
@@ -98,21 +98,21 @@ public static function determineDownloadWinner ($factory, $parent, $children)
                 $max = max($downloads);
 
                 //get the page ids with the most number of downloads
-                $winners = ($max > 0) ? array_keys($downloads, $max) : array();
+                $winners = ($max > 0) ? array_keys($downloads, $max) : [];
 
-                return array(
+                return [
                     'winners'         => $winners,
                     'support'         => $support,
                     'basedOn'         => 'asset.downloads',
-                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php'
-                );
+                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php',
+                ];
             }
         }
 
-        return array(
-            'winners' => array(),
-            'support' => array(),
-            'basedOn' => 'asset.downloads'
-        );
+        return [
+            'winners' => [],
+            'support' => [],
+            'basedOn' => 'asset.downloads',
+        ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/Helper/FormSubmitHelper.php b/app/bundles/AssetBundle/Helper/FormSubmitHelper.php
index 9afa15ddca8..4d85ccce208 100644
--- a/app/bundles/AssetBundle/Helper/FormSubmitHelper.php
+++ b/app/bundles/AssetBundle/Helper/FormSubmitHelper.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Helper;
+
 use Mautic\AssetBundle\Entity\Asset;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\FormBundle\Entity\Action;
@@ -16,13 +18,10 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class FormSubmitHelper
- *
- * @package Mautic\AssetBundle\Helper
+ * Class FormSubmitHelper.
  */
 class FormSubmitHelper
 {
-
     /**
      * @param Action        $action
      * @param MauticFactory $factory
@@ -33,22 +32,22 @@ public static function onFormSubmit(Action $action, MauticFactory $factory)
     {
         $properties = $action->getProperties();
 
-        $assetId  = $properties['asset'];
+        $assetId = $properties['asset'];
 
         /** @var \Mautic\AssetBundle\Model\AssetModel $model */
-        $model  = $factory->getModel('asset');
-        $asset  = $model->getEntity($assetId);
-        $form   = $action->getForm();
+        $model = $factory->getModel('asset');
+        $asset = $model->getEntity($assetId);
+        $form  = $action->getForm();
 
         //make sure the asset still exists and is published
         if ($asset != null && $asset->isPublished()) {
             //register a callback after the other actions have been fired
-            return array(
+            return [
                 'callback' => '\Mautic\AssetBundle\Helper\FormSubmitHelper::downloadFile',
                 'form'     => $form,
                 'asset'    => $asset,
-                'message'  => (isset($properties['message'])) ? $properties['message'] : ''
-            );
+                'message'  => (isset($properties['message'])) ? $properties['message'] : '',
+            ];
         }
     }
 
@@ -65,29 +64,29 @@ public static function downloadFile(Form $form, Asset $asset, MauticFactory $fac
     {
         /** @var \Mautic\AssetBundle\Model\AssetModel $model */
         $model = $factory->getModel('asset');
-        $url   = $model->generateUrl($asset, true, array('form', $form->getId()));
+        $url   = $model->generateUrl($asset, true, ['form', $form->getId()]);
 
         if ($messengerMode) {
-            return array('download' => $url);
+            return ['download' => $url];
         }
 
-        $msg = $message . $factory->getTranslator()->trans('mautic.asset.asset.submitaction.downloadfile.msg', array(
-            '%url%' => $url
-        ));
+        $msg = $message.$factory->getTranslator()->trans('mautic.asset.asset.submitaction.downloadfile.msg', [
+            '%url%' => $url,
+        ]);
 
         $analytics = $factory->getHelper('template.analytics')->getCode();
 
-        if (! empty($analytics)) {
+        if (!empty($analytics)) {
             $factory->getHelper('template.assets')->addCustomDeclaration($analytics);
         }
 
-        $logicalName = $factory->getHelper('theme')->checkForTwigTemplate(':' . $factory->getParameter('theme') . ':message.html.php');
+        $logicalName = $factory->getHelper('theme')->checkForTwigTemplate(':'.$factory->getParameter('theme').':message.html.php');
 
-        $content = $factory->getTemplating()->renderResponse($logicalName, array(
+        $content = $factory->getTemplating()->renderResponse($logicalName, [
             'message'  => $msg,
             'type'     => 'notice',
-            'template' => $factory->getParameter('theme')
-        ))->getContent();
+            'template' => $factory->getParameter('theme'),
+        ])->getContent();
 
         return new Response($content);
     }
diff --git a/app/bundles/AssetBundle/Helper/PointActionHelper.php b/app/bundles/AssetBundle/Helper/PointActionHelper.php
index 8051d48297b..bdd21425272 100644
--- a/app/bundles/AssetBundle/Helper/PointActionHelper.php
+++ b/app/bundles/AssetBundle/Helper/PointActionHelper.php
@@ -1,18 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Helper;
 
 /**
- * Class PointActionHelper
- *
- * @package Mautic\AssetBundle\Helper
+ * Class PointActionHelper.
  */
 class PointActionHelper
 {
diff --git a/app/bundles/AssetBundle/Helper/TokenHelper.php b/app/bundles/AssetBundle/Helper/TokenHelper.php
index 9d18b4f32e5..9d729ccad5b 100644
--- a/app/bundles/AssetBundle/Helper/TokenHelper.php
+++ b/app/bundles/AssetBundle/Helper/TokenHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\AssetBundle\Model\AssetModel;
 
 /**
- * Class TokenHelper
+ * Class TokenHelper.
  */
 class TokenHelper
 {
@@ -57,4 +58,4 @@ public function findAssetTokens($content, $clickthrough = [])
 
         return $tokens;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/AssetBundle/MauticAssetBundle.php b/app/bundles/AssetBundle/MauticAssetBundle.php
index 6f27b48ef76..e7b07128ee7 100644
--- a/app/bundles/AssetBundle/MauticAssetBundle.php
+++ b/app/bundles/AssetBundle/MauticAssetBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticAssetBundle
- *
- * @package Mautic\AssetBundle
+ * Class MauticAssetBundle.
  */
 class MauticAssetBundle extends Bundle
 {
-
 }
diff --git a/app/bundles/AssetBundle/Model/AssetModel.php b/app/bundles/AssetBundle/Model/AssetModel.php
index 2cb0b2e85a0..66a6b8bf68c 100644
--- a/app/bundles/AssetBundle/Model/AssetModel.php
+++ b/app/bundles/AssetBundle/Model/AssetModel.php
@@ -1,36 +1,37 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Model;
 
 use Doctrine\ORM\PersistentCollection;
+use Mautic\AssetBundle\AssetEvents;
+use Mautic\AssetBundle\Entity\Asset;
+use Mautic\AssetBundle\Entity\Download;
 use Mautic\AssetBundle\Event\AssetEvent;
 use Mautic\AssetBundle\Event\AssetLoadEvent;
 use Mautic\CategoryBundle\Model\CategoryModel;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
+use Mautic\CoreBundle\Helper\Chart\PieChart;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\FormModel;
-use Mautic\AssetBundle\Entity\Asset;
-use Mautic\AssetBundle\Entity\Download;
-use Mautic\AssetBundle\AssetEvents;
 use Mautic\EmailBundle\Entity\Email;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Mautic\LeadBundle\Model\LeadModel;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class AssetModel
+ * Class AssetModel.
  */
 class AssetModel extends FormModel
 {
@@ -70,11 +71,11 @@ class AssetModel extends FormModel
      */
     public function __construct(LeadModel $leadModel, CategoryModel $categoryModel, RequestStack $requestStack, IpLookupHelper $ipLookupHelper, CoreParametersHelper $coreParametersHelper)
     {
-        $this->leadModel = $leadModel;
-        $this->categoryModel = $categoryModel;
-        $this->request = $requestStack->getCurrentRequest();
+        $this->leadModel      = $leadModel;
+        $this->categoryModel  = $categoryModel;
+        $this->request        = $requestStack->getCurrentRequest();
         $this->ipLookupHelper = $ipLookupHelper;
-        $this->maxAssetSize = $coreParametersHelper->getParameter('mautic.max_size');
+        $this->maxAssetSize   = $coreParametersHelper->getParameter('mautic.max_size');
     }
 
     /**
@@ -96,9 +97,9 @@ public function saveEntity($entity, $unlock = true)
             $aliasTag  = $count;
 
             while ($count) {
-                $testAlias = $alias . $aliasTag;
+                $testAlias = $alias.$aliasTag;
                 $count     = $repo->checkUniqueAlias($testAlias, $entity);
-                $aliasTag++;
+                ++$aliasTag;
             }
             if ($testAlias != $alias) {
                 $alias = $testAlias;
@@ -110,7 +111,7 @@ public function saveEntity($entity, $unlock = true)
         if (!$entity->isNew()) {
             //increase the revision
             $revision = $entity->getRevision();
-            $revision++;
+            ++$revision;
             $entity->setRevision($revision);
         }
 
@@ -119,13 +120,14 @@ public function saveEntity($entity, $unlock = true)
 
     /**
      * @param $asset
-     * @param null $request
+     * @param null   $request
      * @param string $code
-     * @param array $systemEntry
+     * @param array  $systemEntry
+     *
      * @throws \Doctrine\ORM\ORMException
      * @throws \Exception
      */
-    public function trackDownload($asset, $request = null, $code = '200', $systemEntry = array())
+    public function trackDownload($asset, $request = null, $code = '200', $systemEntry = [])
     {
         // Don't skew results with in-house downloads
         if (empty($systemEntry) && !$this->security->isAnonymous()) {
@@ -152,7 +154,7 @@ public function trackDownload($asset, $request = null, $code = '200', $systemEnt
                     if ($lead !== null) {
                         $this->leadModel->setLeadCookie($clickthrough['lead']);
                         list($trackingId, $trackingNewlyGenerated) = $this->leadModel->getTrackingCookie();
-                        $leadClickthrough = true;
+                        $leadClickthrough                          = true;
 
                         $this->leadModel->setCurrentLead($lead);
                     }
@@ -173,7 +175,7 @@ public function trackDownload($asset, $request = null, $code = '200', $systemEnt
                 }
 
                 if (!empty($clickthrough['email'])) {
-                    $emailRepo = $this->em->getRepository("MauticEmailBundle:Email");
+                    $emailRepo = $this->em->getRepository('MauticEmailBundle:Email');
                     if ($emailEntity = $emailRepo->getEntity($clickthrough['email'])) {
                         $download->setEmail($emailEntity);
                     }
@@ -272,7 +274,7 @@ public function trackDownload($asset, $request = null, $code = '200', $systemEnt
     }
 
     /**
-     * Increase the download count
+     * Increase the download count.
      *
      * @param            $asset
      * @param int        $increaseBy
@@ -314,7 +316,7 @@ public function getPermissionBase()
      */
     public function getNameGetter()
     {
-        return "getTitle";
+        return 'getTitle';
     }
 
     /**
@@ -322,19 +324,21 @@ public function getNameGetter()
      *
      * @throws NotFoundHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Asset) {
-            throw new MethodNotAllowedHttpException(array('Asset'));
+            throw new MethodNotAllowedHttpException(['Asset']);
         }
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
+
         return $formFactory->create('asset', $entity, $params);
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
+     *
      * @return null|Asset
      */
     public function getEntity($id = null)
@@ -355,25 +359,26 @@ public function getEntity($id = null)
      * @param $event
      * @param $entity
      * @param $isNew
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Asset) {
-            throw new MethodNotAllowedHttpException(array('Asset'));
+            throw new MethodNotAllowedHttpException(['Asset']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = AssetEvents::ASSET_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = AssetEvents::ASSET_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = AssetEvents::ASSET_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = AssetEvents::ASSET_POST_DELETE;
                 break;
             default:
@@ -387,6 +392,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
             }
 
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         } else {
             return null;
@@ -394,7 +400,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     }
 
     /**
-     * Get list of entities for autopopulate fields
+     * Get list of entities for autopopulate fields.
      *
      * @param $type
      * @param $filter
@@ -404,7 +410,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
      */
     public function getLookupResults($type, $filter = '', $limit = 10)
     {
-        $results = array();
+        $results = [];
         switch ($type) {
             case 'asset':
                 $viewOther = $this->security->isGranted('asset:assets:viewother');
@@ -421,7 +427,7 @@ public function getLookupResults($type, $filter = '', $limit = 10)
     }
 
     /**
-     * Generate url for an asset
+     * Generate url for an asset.
      *
      * @param Asset $entity
      * @param bool  $absolute
@@ -429,22 +435,22 @@ public function getLookupResults($type, $filter = '', $limit = 10)
      *
      * @return string
      */
-    public function generateUrl($entity, $absolute = true, $clickthrough = array())
+    public function generateUrl($entity, $absolute = true, $clickthrough = [])
     {
-        $assetSlug = $entity->getId() . ':' . $entity->getAlias();
+        $assetSlug = $entity->getId().':'.$entity->getAlias();
 
-        $slugs = array(
-            'slug' => $assetSlug
-        );
+        $slugs = [
+            'slug' => $assetSlug,
+        ];
 
         return $this->buildUrl('mautic_asset_download', $slugs, $absolute, $clickthrough);
     }
 
     /**
-     * Determine the max upload size based on PHP restrictions and config
+     * Determine the max upload size based on PHP restrictions and config.
      *
-     * @param string     $unit              If '', determine the best unit based on the number
-     * @param bool|false $humanReadable     Return as a human readable filesize
+     * @param string     $unit          If '', determine the best unit based on the number
+     * @param bool|false $humanReadable Return as a human readable filesize
      *
      * @return float
      */
@@ -455,7 +461,7 @@ public function getMaxUploadSize($unit = 'M', $humanReadable = false)
         $maxPostSize   = Asset::getIniValue('post_max_size');
         $maxUploadSize = Asset::getIniValue('upload_max_filesize');
         $memoryLimit   = Asset::getIniValue('memory_limit');
-        $maxAllowed    = min(array_filter(array($maxAssetSize, $maxPostSize, $maxUploadSize, $memoryLimit)));
+        $maxAllowed    = min(array_filter([$maxAssetSize, $maxPostSize, $maxUploadSize, $memoryLimit]));
 
         if ($humanReadable) {
             $number = Asset::convertBytesToHumanReadable($maxAllowed);
@@ -475,7 +481,7 @@ public function getTotalFilesize($assets)
     {
         $firstAsset = is_array($assets) ? reset($assets) : false;
         if ($assets instanceof PersistentCollection || is_object($firstAsset)) {
-            $assetIds = array();
+            $assetIds = [];
             foreach ($assets as $asset) {
                 $assetIds[] = $asset->getId();
             }
@@ -483,7 +489,7 @@ public function getTotalFilesize($assets)
         }
 
         if (!is_array($assets)) {
-            $assets = array($assets);
+            $assets = [$assets];
         }
 
         if (empty($assets)) {
@@ -501,22 +507,22 @@ public function getTotalFilesize($assets)
     }
 
     /**
-     * Get line chart data of downloads
+     * Get line chart data of downloads.
      *
-     * @param char      $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getDownloadsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getDownloadsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
-        $chart     = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
-        $query     = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
-        $q         = $query->prepareTimeDataQuery('asset_downloads', 'date_download', $filter);
+        $chart = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
+        $query = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
+        $q     = $query->prepareTimeDataQuery('asset_downloads', 'date_download', $filter);
 
         if (!$canViewOthers) {
             $q->join('t', MAUTIC_TABLE_PREFIX.'assets', 'a', 'a.id = t.asset_id')
@@ -527,26 +533,27 @@ public function getDownloadsLineChartData($unit, \DateTime $dateFrom, \DateTime
         $data = $query->loadAndBuildTimeData($q);
 
         $chart->setDataset($this->translator->trans('mautic.asset.downloadcount'), $data);
+
         return $chart->render();
     }
 
     /**
      * Get pie chart data of unique vs repetitive downloads.
-     * Repetitive in this case mean if a lead downloaded any of the assets more than once
+     * Repetitive in this case mean if a lead downloaded any of the assets more than once.
      *
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
-    public function getUniqueVsRepetitivePieChartData($dateFrom, $dateTo, $filters = array(), $canViewOthers = true)
+    public function getUniqueVsRepetitivePieChartData($dateFrom, $dateTo, $filters = [], $canViewOthers = true)
     {
-        $chart      = new PieChart();
-        $query      = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
-        $allQ       = $query->getCountQuery('asset_downloads', 'id', 'date_download', $filters);
-        $uniqueQ    = $query->getCountQuery('asset_downloads', 'lead_id', 'date_download', $filters, array('getUnique' => true));
+        $chart   = new PieChart();
+        $query   = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
+        $allQ    = $query->getCountQuery('asset_downloads', 'id', 'date_download', $filters);
+        $uniqueQ = $query->getCountQuery('asset_downloads', 'lead_id', 'date_download', $filters, ['getUnique' => true]);
 
         if (!$canViewOthers) {
             $allQ->join('t', MAUTIC_TABLE_PREFIX.'assets', 'a', 'a.id = t.asset_id')
@@ -557,7 +564,7 @@ public function getUniqueVsRepetitivePieChartData($dateFrom, $dateTo, $filters =
                 ->setParameter('userId', $this->user->getId());
         }
 
-        $all = $query->fetchCount($allQ);
+        $all    = $query->fetchCount($allQ);
         $unique = $query->fetchCount($uniqueQ);
 
         $repetitive = $all - $unique;
@@ -568,17 +575,17 @@ public function getUniqueVsRepetitivePieChartData($dateFrom, $dateTo, $filters =
     }
 
     /**
-     * Get a list of popular (by downloads) assets
+     * Get a list of popular (by downloads) assets.
      *
-     * @param integer $limit
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param int    $limit
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
-    public function getPopularAssets($limit = 10, $dateFrom = null, $dateTo = null, $filters = array(), $canViewOthers = true)
+    public function getPopularAssets($limit = 10, $dateFrom = null, $dateTo = null, $filters = [], $canViewOthers = true)
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('COUNT(DISTINCT t.id) AS download_count, a.id, a.title')
@@ -603,9 +610,9 @@ public function getPopularAssets($limit = 10, $dateFrom = null, $dateTo = null,
     }
 
     /**
-     * Get a list of assets in a date range
+     * Get a list of assets in a date range.
      *
-     * @param integer   $limit
+     * @param int       $limit
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
@@ -613,7 +620,7 @@ public function getPopularAssets($limit = 10, $dateFrom = null, $dateTo = null,
      *
      * @return array
      */
-    public function getAssetList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = array(), $options = array())
+    public function getAssetList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = [], $options = [])
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('t.id, t.title as name, t.date_added, t.date_modified')
diff --git a/app/bundles/AssetBundle/Security/Permissions/AssetPermissions.php b/app/bundles/AssetBundle/Security/Permissions/AssetPermissions.php
index 9c5c4cc2427..1527286e44f 100644
--- a/app/bundles/AssetBundle/Security/Permissions/AssetPermissions.php
+++ b/app/bundles/AssetBundle/Security/Permissions/AssetPermissions.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\AssetBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class AssetPermissions
- *
- * @package Mautic\AssetBundle\Security\Permissions
+ * Class AssetPermissions.
  */
 class AssetPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/AssetBundle/Views/Asset/details.html.php b/app/bundles/AssetBundle/Views/Asset/details.html.php
index 68ab2df2f6c..52a59e957d1 100644
--- a/app/bundles/AssetBundle/Views/Asset/details.html.php
+++ b/app/bundles/AssetBundle/Views/Asset/details.html.php
@@ -1,50 +1,50 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'asset');
-$view['slots']->set("headerTitle", $activeAsset->getTitle());
+$view['slots']->set('headerTitle', $activeAsset->getTitle());
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
+        [
             'item'            => $activeAsset,
-            'templateButtons' => array(
-                'edit'   => $security->hasEntityAccess(
+            'templateButtons' => [
+                'edit' => $security->hasEntityAccess(
                     $permissions['asset:assets:editown'],
                     $permissions['asset:assets:editother'],
                     $activeAsset->getCreatedBy()
                 ),
-                'clone'   => $permissions['asset:assets:create'],
+                'clone'  => $permissions['asset:assets:create'],
                 'delete' => $security->hasEntityAccess(
                     $permissions['asset:assets:deleteown'],
                     $permissions['asset:assets:deleteother'],
                     $activeAsset->getCreatedBy()
                 ),
-                'close'  => $security->hasEntityAccess(
+                'close' => $security->hasEntityAccess(
                     $permissions['asset:assets:viewown'],
                     $permissions['asset:assets:viewother'],
                     $activeAsset->getCreatedBy()
-                )
-            ),
-            'routeBase'       => 'asset',
-            'langVar'         => 'asset.asset',
-            'nameGetter'      => 'getTitle'
-        )
+                ),
+            ],
+            'routeBase'  => 'asset',
+            'langVar'    => 'asset.asset',
+            'nameGetter' => 'getTitle',
+        ]
     )
 );
 
 $view['slots']->set(
     'publishStatus',
-    $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', array('entity' => $activeAsset))
+    $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', ['entity' => $activeAsset])
 );
 
 ?>
@@ -71,7 +71,7 @@
                             <tbody>
                             <?php echo $view->render(
                                 'MauticCoreBundle:Helper:details.html.php',
-                                array('entity' => $activeAsset)
+                                ['entity' => $activeAsset]
                             ); ?>
                             <tr>
                                 <td width="20%"><span class="fw-b"><?php echo $view['translator']->trans(
@@ -132,16 +132,16 @@
                                     </h5>
                                 </div>
                                 <div class="col-md-2 va-m text-center">
-                                    <span class="text-white dark-md fw-sb mb-xs"><?php echo $view['translator']->trans('mautic.asset.asset.downloads.total', array('count' => $stats['downloads']['total'])); ?></span>
+                                    <span class="text-white dark-md fw-sb mb-xs"><?php echo $view['translator']->trans('mautic.asset.asset.downloads.total', ['count' => $stats['downloads']['total']]); ?></span>
                                     <span class="text-white dark-md fw-sb mb-xs">|</span>
-                                    <span class="text-white dark-md fw-sb mb-xs"><?php echo $view['translator']->trans('mautic.asset.asset.downloads.unique', array('count' => $stats['downloads']['unique'])); ?></span>
+                                    <span class="text-white dark-md fw-sb mb-xs"><?php echo $view['translator']->trans('mautic.asset.asset.downloads.unique', ['count' => $stats['downloads']['unique']]); ?></span>
                                 </div>
                                 <div class="col-md-8 va-m">
-                                    <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', array('dateRangeForm' => $dateRangeForm, 'class' => 'pull-right')); ?>
+                                    <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['dateRangeForm' => $dateRangeForm, 'class' => 'pull-right']); ?>
                                 </div>
                             </div>
                             <div class="pt-0 pl-15 pb-10 pr-15">
-                                <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', array('chartData' => $stats['downloads']['timeStats'], 'chartType' => 'line', 'chartHeight' => 300)); ?>
+                                <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $stats['downloads']['timeStats'], 'chartType' => 'line', 'chartHeight' => 300]); ?>
                             </div>
                         </div>
                     </div>
@@ -154,7 +154,7 @@
         <div class="tab-content pa-md preview-detail">
             <?php echo $view->render(
                 'MauticAssetBundle:Asset:preview.html.php',
-                array('activeAsset' => $activeAsset, 'assetDownloadUrl' => $assetDownloadUrl)
+                ['activeAsset' => $activeAsset, 'assetDownloadUrl' => $assetDownloadUrl]
             ); ?>
         </div>
         <!--/ end: tab-content -->
@@ -186,7 +186,7 @@
         <hr class="hr-w-2" style="width:50%">
 
         <!-- activity feed -->
-        <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', array('logs' => $logs)); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', ['logs' => $logs]); ?>
     </div>
     <!--/ right section -->
     <input name="entityId" id="entityId" type="hidden" value="<?php echo $activeAsset->getId(); ?>"/>
diff --git a/app/bundles/AssetBundle/Views/Asset/form.html.php b/app/bundles/AssetBundle/Views/Asset/form.html.php
index a64bb849160..6da101277d0 100644
--- a/app/bundles/AssetBundle/Views/Asset/form.html.php
+++ b/app/bundles/AssetBundle/Views/Asset/form.html.php
@@ -1,25 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $header = ($activeAsset->getId()) ?
     $view['translator']->trans('mautic.asset.asset.menu.edit',
-        array('%name%' => $activeAsset->getTitle())) :
+        ['%name%' => $activeAsset->getTitle()]) :
     $view['translator']->trans('mautic.asset.asset.menu.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 $view['slots']->set('mauticContent', 'asset');
 ?>
 <script>
-	<?php echo 'mauticAssetUploadEndpoint = "' . $uploadEndpoint . '";'; ?>
-	<?php echo 'mauticAssetUploadMaxSize = ' . $maxSize . ';'; ?>
-	<?php echo 'mauticAssetUploadMaxSizeError = "' . $maxSizeError . '";'; ?>
-	<?php echo 'mauticAssetUploadExtensions = "' . $extensions . '";'; ?>
-	<?php echo 'mauticAssetUploadExtensionError = "' . $extensionError . '";'; ?>
+	<?php echo 'mauticAssetUploadEndpoint = "'.$uploadEndpoint.'";'; ?>
+	<?php echo 'mauticAssetUploadMaxSize = '.$maxSize.';'; ?>
+	<?php echo 'mauticAssetUploadMaxSizeError = "'.$maxSizeError.'";'; ?>
+	<?php echo 'mauticAssetUploadExtensions = "'.$extensions.'";'; ?>
+	<?php echo 'mauticAssetUploadExtensionError = "'.$extensionError.'";'; ?>
 </script>
 <?php echo $view['form']->start($form); ?>
 <!-- start: box layout -->
@@ -32,14 +33,18 @@
 					<div class="col-md-7 pl-0">
 						<?php echo $view['form']->row($form['storageLocation']); ?>
 					</div>
-			        <div class="col-md-5 text-left mt-lg<?php if ($startOnLocal) echo ' hide'; ?>" id="remote-button">
+			        <div class="col-md-5 text-left mt-lg<?php if ($startOnLocal) {
+    echo ' hide';
+} ?>" id="remote-button">
 						<?php if ($integrations) : ?>
 							<a data-toggle="ajaxmodal" data-target="#RemoteFileModal" data-header="<?php echo $view['translator']->trans('mautic.asset.remote.file.browse'); ?>" href="<?php echo $view['router']->path('mautic_asset_remote'); ?>?tmpl=modal" class="btn btn-primary">
 								<?php echo $view['translator']->trans('mautic.asset.remote.file.browse'); ?>
 							</a>
 						<?php endif; ?>
 					</div>
-			        <div id="storage-local"<?php if (!$startOnLocal) echo ' class="hide"'; ?>>
+			        <div id="storage-local"<?php if (!$startOnLocal) {
+    echo ' class="hide"';
+} ?>>
 				        <div class="row">
 					        <div class="form-group col-xs-12 ">
 						        <?php echo $view['form']->label($form['tempName']); ?>
@@ -54,14 +59,16 @@
 					        </div>
 				        </div>
 			        </div>
-			        <div id="storage-remote"<?php if ($startOnLocal) echo ' class="hide"'; ?>>
+			        <div id="storage-remote"<?php if ($startOnLocal) {
+    echo ' class="hide"';
+} ?>>
 				        <?php echo $view['form']->row($form['remotePath']); ?>
 			        </div>
 		    	</div>
 		    	<div class="col-md-6">
 		    		<div class="row">
 				    	<div class="form-group col-xs-12 preview">
-				    		<?php echo $view->render('MauticAssetBundle:Asset:preview.html.php', array('activeAsset' => $activeAsset, 'assetDownloadUrl' => $assetDownloadUrl)); ?>
+				    		<?php echo $view->render('MauticAssetBundle:Asset:preview.html.php', ['activeAsset' => $activeAsset, 'assetDownloadUrl' => $assetDownloadUrl]); ?>
 			    		</div>
 		    		</div>
 		    	</div>
@@ -84,21 +91,21 @@
  	<div class="col-md-3 bg-white height-auto">
 		<div class="pr-lg pl-lg pt-md pb-md">
 			<?php
-				echo $view['form']->row($form['category']);
-				echo $view['form']->row($form['language']);
-				echo $view['form']->row($form['isPublished']);
-				echo $view['form']->row($form['publishUp']);
-				echo $view['form']->row($form['publishDown']);
-			?>
+                echo $view['form']->row($form['category']);
+                echo $view['form']->row($form['language']);
+                echo $view['form']->row($form['isPublished']);
+                echo $view['form']->row($form['publishUp']);
+                echo $view['form']->row($form['publishDown']);
+            ?>
 		</div>
 	</div>
 </div>
 <?php echo $view['form']->end($form); ?>
 
 <?php if ($integrations) : ?>
-	<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', array(
-	    'id'            => 'RemoteFileModal',
-	    'size'          => 'lg',
-	    'footerButtons' => true
-	)); ?>
+	<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
+        'id'            => 'RemoteFileModal',
+        'size'          => 'lg',
+        'footerButtons' => true,
+    ]); ?>
 <?php endif; ?>
diff --git a/app/bundles/AssetBundle/Views/Asset/index.html.php b/app/bundles/AssetBundle/Views/Asset/index.html.php
index 2b0eb200d11..ae177e5cf0f 100644
--- a/app/bundles/AssetBundle/Views/Asset/index.html.php
+++ b/app/bundles/AssetBundle/Views/Asset/index.html.php
@@ -1,41 +1,41 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'asset');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.asset.assets'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.asset.assets'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['asset:assets:create']
-            ),
-            'routeBase'       => 'asset',
-            'langVar'         => 'asset.asset'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['asset:assets:create'],
+            ],
+            'routeBase' => 'asset',
+            'langVar'   => 'asset.asset',
+        ]
     )
 );
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'action'      => $currentRoute,
-        'langVar'     => 'asset.asset',
-        'routeBase'   => 'asset',
-        'templateButtons' => array(
-            'delete' => $permissions['asset:assets:deleteown'] || $permissions['asset:assets:deleteother']
-        )
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'     => $searchValue,
+        'action'          => $currentRoute,
+        'langVar'         => 'asset.asset',
+        'routeBase'       => 'asset',
+        'templateButtons' => [
+            'delete' => $permissions['asset:assets:deleteown'] || $permissions['asset:assets:deleteother'],
+        ],
+    ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
     </div>
diff --git a/app/bundles/AssetBundle/Views/Asset/list.html.php b/app/bundles/AssetBundle/Views/Asset/list.html.php
index 2645d8d29ce..3f26ab517ec 100644
--- a/app/bundles/AssetBundle/Views/Asset/list.html.php
+++ b/app/bundles/AssetBundle/Views/Asset/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
-$view->extend('MauticAssetBundle:Asset:index.html.php');
+if ($tmpl == 'index') {
+    $view->extend('MauticAssetBundle:Asset:index.html.php');
+}
 ?>
 <?php if (count($items)): ?>
     <div class="table-responsive">
@@ -17,7 +19,7 @@
                 <?php
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#assetTable'
+                    'target'   => '#assetTable',
                 ]);
 
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
@@ -25,28 +27,28 @@
                     'orderBy'    => 'a.title',
                     'text'       => 'mautic.core.title',
                     'class'      => 'col-asset-title',
-                    'default'    => true
+                    'default'    => true,
                 ]);
 
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'asset',
                     'orderBy'    => 'c.title',
                     'text'       => 'mautic.core.category',
-                    'class'      => 'visible-md visible-lg col-asset-category'
+                    'class'      => 'visible-md visible-lg col-asset-category',
                 ]);
 
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'asset',
                     'orderBy'    => 'a.downloadCount',
                     'text'       => 'mautic.asset.asset.thead.download.count',
-                    'class'      => 'visible-md visible-lg col-asset-download-count'
+                    'class'      => 'visible-md visible-lg col-asset-download-count',
                 ]);
 
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'asset',
                     'orderBy'    => 'a.id',
                     'text'       => 'mautic.core.id',
-                    'class'      => 'visible-md visible-lg col-asset-id'
+                    'class'      => 'visible-md visible-lg col-asset-id',
                 ]);
                 ?>
             </tr>
@@ -57,37 +59,37 @@
                     <td>
                         <?php
                         echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
-                            'item'       => $item,
+                            'item'            => $item,
                             'templateButtons' => [
-                                'edit'       => $security->hasEntityAccess($permissions['asset:assets:editown'], $permissions['asset:assets:editother'], $item->getCreatedBy()),
-                                'delete'     => $security->hasEntityAccess($permissions['asset:assets:deleteown'], $permissions['asset:assets:deleteother'], $item->getCreatedBy()),
-                                'clone'      => $permissions['asset:assets:create'],
+                                'edit'   => $security->hasEntityAccess($permissions['asset:assets:editown'], $permissions['asset:assets:editother'], $item->getCreatedBy()),
+                                'delete' => $security->hasEntityAccess($permissions['asset:assets:deleteown'], $permissions['asset:assets:deleteother'], $item->getCreatedBy()),
+                                'clone'  => $permissions['asset:assets:create'],
                             ],
-                            'routeBase'  => 'asset',
-                            'langVar'    => 'asset.asset',
-                            'nameGetter' => 'getTitle',
+                            'routeBase'     => 'asset',
+                            'langVar'       => 'asset.asset',
+                            'nameGetter'    => 'getTitle',
                             'customButtons' => [
                                 [
                                     'attr' => [
                                         'data-toggle' => 'ajaxmodal',
                                         'data-target' => '#AssetPreviewModal',
-                                        'href' => $view['router']->path('mautic_asset_action', ['objectAction' => 'preview', 'objectId' => $item->getId()])
+                                        'href'        => $view['router']->path('mautic_asset_action', ['objectAction' => 'preview', 'objectId' => $item->getId()]),
                                     ],
                                     'btnText'   => $view['translator']->trans('mautic.asset.asset.preview'),
-                                    'iconClass' => 'fa fa-image'
-                                ]
-                            ]
+                                    'iconClass' => 'fa fa-image',
+                                ],
+                            ],
                         ]);
                         ?>
                     </td>
                     <td>
                         <div>
                             <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', [
-                                'item'       => $item,
-                                'model'      => 'asset.asset'
+                                'item'  => $item,
+                                'model' => 'asset.asset',
                             ]); ?>
                             <a href="<?php echo $view['router']->path('mautic_asset_action',
-                                ["objectAction" => "view", "objectId" => $item->getId()]); ?>"
+                                ['objectAction' => 'view', 'objectId' => $item->getId()]); ?>"
                                 data-toggle="ajax">
                                 <?php echo $item->getTitle(); ?> (<?php echo $item->getAlias(); ?>)
                             </a>
@@ -100,7 +102,7 @@
                     <td class="visible-md visible-lg">
                         <?php $category = $item->getCategory(); ?>
                         <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                        <?php $color    = ($category) ? '#' . $category->getColor() : 'inherit'; ?>
+                        <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                         <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                     </td>
                     <td class="visible-md visible-lg"><?php echo $item->getDownloadCount(); ?></td>
@@ -113,12 +115,12 @@
 
     <div class="panel-footer">
         <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
-            "totalItems"      => count($items),
-            "page"            => $page,
-            "limit"           => $limit,
-            "menuLinkId"      => 'mautic_asset_index',
-            "baseUrl"         => $view['router']->path('mautic_asset_index'),
-            'sessionVar'      => 'asset'
+            'totalItems' => count($items),
+            'page'       => $page,
+            'limit'      => $limit,
+            'menuLinkId' => 'mautic_asset_index',
+            'baseUrl'    => $view['router']->path('mautic_asset_index'),
+            'sessionVar' => 'asset',
         ]); ?>
     </div>
 <?php else: ?>
@@ -127,5 +129,5 @@
 
 <?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
     'id'     => 'AssetPreviewModal',
-    'header' => false
+    'header' => false,
 ]);
diff --git a/app/bundles/AssetBundle/Views/Asset/preview.html.php b/app/bundles/AssetBundle/Views/Asset/preview.html.php
index 687ccd38d59..c9766bed461 100644
--- a/app/bundles/AssetBundle/Views/Asset/preview.html.php
+++ b/app/bundles/AssetBundle/Views/Asset/preview.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -11,14 +12,14 @@
 <h5 class="fw-sb mb-xs"><?php echo $view['translator']->trans('mautic.asset.asset.preview'); ?></h5>
 <div class="text-center">
     <?php if ($activeAsset->isImage()): ?>
-        <img src="<?php echo $assetDownloadUrl . '?stream=1'; ?>" alt="<?php echo $activeAsset->getTitle(); ?>" class="img-thumbnail" />
+        <img src="<?php echo $assetDownloadUrl.'?stream=1'; ?>" alt="<?php echo $activeAsset->getTitle(); ?>" class="img-thumbnail" />
     <?php elseif (strtolower($activeAsset->getFileType()) == 'pdf') : ?>
-        <iframe src="<?php echo $assetDownloadUrl . '?stream=1'; ?>#view=FitH" class="col-sm-12"></iframe>
-    <?php elseif (strpos($activeAsset->getMime(), 'video') === 0 || in_array($activeAsset->getExtension(), array('mp4', 'webm'))): ?>
+        <iframe src="<?php echo $assetDownloadUrl.'?stream=1'; ?>#view=FitH" class="col-sm-12"></iframe>
+    <?php elseif (strpos($activeAsset->getMime(), 'video') === 0 || in_array($activeAsset->getExtension(), ['mp4', 'webm'])): ?>
         <video src="<?php echo $assetDownloadUrl; ?>" controls>
             <?php echo $view['translator']->trans('mautic.asset.no_video_support'); ?>
         </video>
-    <?php elseif (strpos($activeAsset->getMime(), 'audio') === 0 || in_array($activeAsset->getExtension(), array('mpg', 'mpeg', 'mp3', 'ogg', 'wav'))): ?>
+    <?php elseif (strpos($activeAsset->getMime(), 'audio') === 0 || in_array($activeAsset->getExtension(), ['mpg', 'mpeg', 'mp3', 'ogg', 'wav'])): ?>
         <audio controls>
             <source src="<?php echo $assetDownloadUrl; ?>" type="<?php echo $activeAsset->getMime(); ?>">
             <?php echo $view['translator']->trans('mautic.asset.no_audio_support'); ?>
diff --git a/app/bundles/AssetBundle/Views/FormTheme/Config/_config_assetconfig_widget.html.php b/app/bundles/AssetBundle/Views/FormTheme/Config/_config_assetconfig_widget.html.php
index 02609967854..1eaa4528327 100644
--- a/app/bundles/AssetBundle/Views/FormTheme/Config/_config_assetconfig_widget.html.php
+++ b/app/bundles/AssetBundle/Views/FormTheme/Config/_config_assetconfig_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/AssetBundle/Views/Public/download.html.php b/app/bundles/AssetBundle/Views/Public/download.html.php
index d8eed4bc69f..d80c1c61ed7 100644
--- a/app/bundles/AssetBundle/Views/Public/download.html.php
+++ b/app/bundles/AssetBundle/Views/Public/download.html.php
@@ -1,8 +1,8 @@
 <?php
-/**
+/*
  * @package     Mautic
  * @copyright   2015 Mautic Contributors. All rights reserved.
  * @author      Mautic
  * @link        http://mautic.org
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
\ No newline at end of file
+ */
diff --git a/app/bundles/AssetBundle/Views/Remote/browse.html.php b/app/bundles/AssetBundle/Views/Remote/browse.html.php
index 65cee075d70..154bc4aeda6 100644
--- a/app/bundles/AssetBundle/Views/Remote/browse.html.php
+++ b/app/bundles/AssetBundle/Views/Remote/browse.html.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') :
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'asset');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.asset.remote.file.browse'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.asset.remote.file.browse'));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
@@ -26,12 +26,14 @@
                             <?php $step = 1; ?>
                             <?php /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $integration */ ?>
                             <?php foreach ($integrations as $integration): ?>
-                                <li class="list-group-item<?php if ($step === 1) echo " active"; ?>" id="tab<?php echo $integration->getName(); ?>">
+                                <li class="list-group-item<?php if ($step === 1) {
+    echo ' active';
+} ?>" id="tab<?php echo $integration->getName(); ?>">
                                     <a href="#" class="steps" onclick="Mautic.updateRemoteBrowser('<?php echo $integration->getName(); ?>');">
                                         <?php echo $integration->getDisplayName(); ?>
                                     </a>
                                 </li>
-                                <?php $step++; ?>
+                                <?php ++$step; ?>
                             <?php endforeach; ?>
                         </ul>
                     </div>
diff --git a/app/bundles/AssetBundle/Views/Remote/list.html.php b/app/bundles/AssetBundle/Views/Remote/list.html.php
index 5fe69c52b65..b1e7d2489fe 100644
--- a/app/bundles/AssetBundle/Views/Remote/list.html.php
+++ b/app/bundles/AssetBundle/Views/Remote/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 /** @var \Gaufrette\Filesystem $connector */
@@ -11,7 +12,7 @@
 if (count($items)): ?>
     <div class="panel panel-primary mb-0">
         <div class="panel-body">
-            <input type='text' class='remote-file-search form-control mb-lg' autocomplete='off' placeholder="<?php echo $view['translator']->trans("mautic.core.search.placeholder"); ?>" />
+            <input type='text' class='remote-file-search form-control mb-lg' autocomplete='off' placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" />
 
             <div class="list-group remote-file-list">
                 <?php if (array_key_exists('dirs', $items)) : ?>
@@ -42,5 +43,5 @@
         </div>
     </div>
 <?php else: ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', array('message' => 'mautic.asset.remote.no_results')); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', ['message' => 'mautic.asset.remote.no_results']); ?>
 <?php endif; ?>
diff --git a/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/index.html.php b/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/index.html.php
index 73b476a9cca..dc423be7ebd 100644
--- a/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/index.html.php
+++ b/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/index.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-$searchBtnClass = (!empty($searchValue)) ? "fa-eraser" : "fa-search";
+$searchBtnClass = (!empty($searchValue)) ? 'fa-eraser' : 'fa-search';
 ?>
 
 <div class="input-group ma-5">
-    <input type="search" class="form-control" id="assetBuilderTokenSearch" name="search" placeholder="<?php echo $view->escape($view['translator']->trans('mautic.core.search.placeholder')); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#assetBuilderTokens" data-action="<?php echo $view['router']->path('mautic_asset_buildertoken_index', array('page' => $page)); ?>" />
+    <input type="search" class="form-control" id="assetBuilderTokenSearch" name="search" placeholder="<?php echo $view->escape($view['translator']->trans('mautic.core.search.placeholder')); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#assetBuilderTokens" data-action="<?php echo $view['router']->path('mautic_asset_buildertoken_index', ['page' => $page]); ?>" />
     <div class="input-group-btn">
         <button type="button" class="btn btn-default btn-search btn-filter" data-livesearch-parent="assetBuilderTokenSearch">
             <i class="fa <?php echo $searchBtnClass; ?> fa-fw"></i>
diff --git a/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/list.html.php b/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/list.html.php
index b1fc71227a6..7b556836168 100644
--- a/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/list.html.php
+++ b/app/bundles/AssetBundle/Views/SubscribedEvents/BuilderToken/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') {
     $view->extend('MauticAssetBundle:SubscribedEvents\BuilderToken:index.html.php');
 }
@@ -17,24 +17,24 @@
         <?php foreach ($items as $i) : ?>
             <a href="#" class="list-group-item" data-token='<a href="%url={assetlink=<?php echo $i->getId(); ?>}%">%text=<?php echo $view->escape($i->getName()); ?>%</a>' data-drop="showBuilderLinkModal">
                 <div>
-                    <span><i class="fa fa-fw fa-file-o"></i><?php echo $view->escape($i->getName()) . ' (' . $i->getLanguage() . ')'; ?></span>
+                    <span><i class="fa fa-fw fa-file-o"></i><?php echo $view->escape($i->getName()).' ('.$i->getLanguage().')'; ?></span>
                 </div>
             </a>
         <?php endforeach; ?>
     </div>
 
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems"        => count($items),
-        "page"              => $page,
-        "limit"             => $limit,
-        "fixedLimit"        => true,
-        "baseUrl"           => $view['router']->path('mautic_asset_buildertoken_index'),
-        "paginationWrapper" => 'text-center',
-        "paginationClass"   => "sm",
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems'        => count($items),
+        'page'              => $page,
+        'limit'             => $limit,
+        'fixedLimit'        => true,
+        'baseUrl'           => $view['router']->path('mautic_asset_buildertoken_index'),
+        'paginationWrapper' => 'text-center',
+        'paginationClass'   => 'sm',
         'sessionVar'        => 'asset.buildertoken',
         'ignoreFormExit'    => true,
         'queryString'       => 'tmpl=list',
-        'target'            => '#assetBuilderTokens'
-    )); ?>
+        'target'            => '#assetBuilderTokens',
+    ]); ?>
     <?php endif; ?>
 </div>
\ No newline at end of file
diff --git a/app/bundles/AssetBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/AssetBundle/Views/SubscribedEvents/Search/global.html.php
index 6f6c53efcd3..31d66e95188 100644
--- a/app/bundles/AssetBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/AssetBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,18 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_asset_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view->escape($view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining))); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_asset_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view->escape($view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining])); ?></span>
 </a>
 <?php else: ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_asset_action', array('objectAction' => 'view', 'objectId' => $asset->getId())); ?>" data-toggle="ajax">
+<a href="<?php echo $this->container->get('router')->generate('mautic_asset_action', ['objectAction' => 'view', 'objectId' => $asset->getId()]); ?>" data-toggle="ajax">
     <?php echo $view->escape($asset->getTitle()); ?>
     <span class="label label-default pull-right" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.asset.downloadcount'); ?>" data-placement="left">
         <?php echo $asset->getDownloadCount(); ?>
diff --git a/app/bundles/AssetBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/AssetBundle/Views/SubscribedEvents/Timeline/index.html.php
index 19635282af2..013fe4b6677 100644
--- a/app/bundles/AssetBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/AssetBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 
 <div>
diff --git a/app/bundles/CalendarBundle/CalendarEvents.php b/app/bundles/CalendarBundle/CalendarEvents.php
index 20a55a028e8..0f875c072c3 100644
--- a/app/bundles/CalendarBundle/CalendarEvents.php
+++ b/app/bundles/CalendarBundle/CalendarEvents.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CalendarBundle;
 
 /**
- * Class CalendarEvents
+ * Class CalendarEvents.
  *
  * Events available for CalendarBundle
  */
 final class CalendarEvents
 {
-
     /**
-     * The mautic.calendar_on_generate event is thrown when generating a calendar view
+     * The mautic.calendar_on_generate event is thrown when generating a calendar view.
      *
      * The event listener receives a Mautic\CalendarBundle\Event\CalendarGeneratorEvent instance.
      *
@@ -27,7 +27,7 @@ final class CalendarEvents
     const CALENDAR_ON_GENERATE = 'mautic.calendar_on_generate';
 
     /**
-     * The mautic.calendar_event_on_generate event is thrown when generating a calendar edit / new view
+     * The mautic.calendar_event_on_generate event is thrown when generating a calendar edit / new view.
      *
      * The event listener receives a Mautic\CalendarBundle\Event\EventGeneratorEvent instance.
      *
diff --git a/app/bundles/CalendarBundle/Config/config.php b/app/bundles/CalendarBundle/Config/config.php
index 31cdf77ac09..06ad20ad344 100644
--- a/app/bundles/CalendarBundle/Config/config.php
+++ b/app/bundles/CalendarBundle/Config/config.php
@@ -1,41 +1,42 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes' => array(
-        'main' => array(
-            'mautic_calendar_index'  => array(
+return [
+    'routes' => [
+        'main' => [
+            'mautic_calendar_index' => [
                 'path'       => '/calendar',
-                'controller' => 'MauticCalendarBundle:Default:index'
-            ),
-            'mautic_calendar_action' => array(
+                'controller' => 'MauticCalendarBundle:Default:index',
+            ],
+            'mautic_calendar_action' => [
                 'path'       => '/calendar/{objectAction}',
-                'controller' => 'MauticCalendarBundle:Default:execute'
-            )
-        )
-    ),
-    'services' => array(
-        'models' =>  array(
-            'mautic.calendar.model.calendar' => array(
-                'class' => 'Mautic\CalendarBundle\Model\CalendarModel'
-            )
-        )
-    ),
-    'menu'   => array(
-        'main' => array(
+                'controller' => 'MauticCalendarBundle:Default:execute',
+            ],
+        ],
+    ],
+    'services' => [
+        'models' => [
+            'mautic.calendar.model.calendar' => [
+                'class' => 'Mautic\CalendarBundle\Model\CalendarModel',
+            ],
+        ],
+    ],
+    'menu' => [
+        'main' => [
             'priority' => 90,
-            'items'    => array(
-                'mautic.calendar.menu.index' => array(
+            'items'    => [
+                'mautic.calendar.menu.index' => [
                     'route'     => 'mautic_calendar_index',
-                    'iconClass' => 'fa-calendar'
-                )
-            )
-        )
-    )
-);
+                    'iconClass' => 'fa-calendar',
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/bundles/CalendarBundle/Controller/AjaxController.php b/app/bundles/CalendarBundle/Controller/AjaxController.php
index a85a9f52be8..b83cbe3bb99 100644
--- a/app/bundles/CalendarBundle/Controller/AjaxController.php
+++ b/app/bundles/CalendarBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,12 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
-
     /**
-     * Generates the calendar data
+     * Generates the calendar data.
      *
      * @param Request $request
      *
@@ -28,17 +28,17 @@ class AjaxController extends CommonAjaxController
      */
     public function generateDataAction(Request $request)
     {
-        $dates = array(
+        $dates = [
             'start_date' => $request->query->get('start'),
-            'end_date'   => $request->query->get('end')
-        );
+            'end_date'   => $request->query->get('end'),
+        ];
 
         /* @type \Mautic\CalendarBundle\Model\CalendarModel $model */
         $model  = $this->getModel('calendar');
         $events = $model->getCalendarEvents($dates);
 
-        // Can't use $this->sendJsonResponse, because it converts arrays to objects and Fullcalendar doesn't render events then. 
-        $response = new Response;
+        // Can't use $this->sendJsonResponse, because it converts arrays to objects and Fullcalendar doesn't render events then.
+        $response = new Response();
         $response->setContent(json_encode($events));
         $response->headers->set('Content-Type', 'application/json');
 
@@ -46,7 +46,7 @@ public function generateDataAction(Request $request)
     }
 
     /**
-     * Updates an event on dragging the event around the calendar
+     * Updates an event on dragging the event around the calendar.
      *
      * @param Request $request
      *
@@ -54,18 +54,18 @@ public function generateDataAction(Request $request)
      */
     public function updateEventAction(Request $request)
     {
-        $entityId   = $request->request->get('entityId');
-        $source     = $request->request->get('entityType');
-        $setter     = 'set' . $request->request->get('setter');
-        $dateValue  = new \DateTime($request->request->get('startDate'));
-        $response   = array('success' => false);
+        $entityId  = $request->request->get('entityId');
+        $source    = $request->request->get('entityType');
+        $setter    = 'set'.$request->request->get('setter');
+        $dateValue = new \DateTime($request->request->get('startDate'));
+        $response  = ['success' => false];
 
         /* @type \Mautic\CalendarBundle\Model\CalendarModel $model */
-        $calendarModel  = $this->getModel('calendar');
-        $event          = $calendarModel->editCalendarEvent($source, $entityId);
+        $calendarModel = $this->getModel('calendar');
+        $event         = $calendarModel->editCalendarEvent($source, $entityId);
 
-        $model   = $event->getModel();
-        $entity  = $event->getEntity();
+        $model  = $event->getModel();
+        $entity = $event->getEntity();
 
         //not found
         if ($entity === null) {
@@ -73,27 +73,27 @@ public function updateEventAction(Request $request)
         } elseif (!$event->hasAccess()) {
             $this->addFlash('mautic.core.error.accessdenied', 'error');
         } elseif ($model->isLocked($entity)) {
-            $this->addFlash('mautic.core.error.locked', array(
+            $this->addFlash('mautic.core.error.locked', [
                 '%name%'      => $entity->getTitle(),
-                '%menu_link%' => 'mautic_' . $source . '_index',
-                '%url%'       => $this->generateUrl('mautic_' . $source . '_action', array(
+                '%menu_link%' => 'mautic_'.$source.'_index',
+                '%url%'       => $this->generateUrl('mautic_'.$source.'_action', [
                     'objectAction' => 'edit',
-                    'objectId'     => $entity->getId()
-                ))
-            ));
+                    'objectId'     => $entity->getId(),
+                ]),
+            ]);
         } elseif ($this->request->getMethod() == 'POST') {
             $entity->$setter($dateValue);
             $model->saveEntity($entity);
             $response['success'] = true;
 
-            $this->addFlash('mautic.core.notice.updated', array(
+            $this->addFlash('mautic.core.notice.updated', [
                 '%name%'      => $entity->getTitle(),
-                '%menu_link%' => 'mautic_' . $source . '_index',
-                '%url%'       => $this->generateUrl('mautic_' . $source . '_action', array(
+                '%menu_link%' => 'mautic_'.$source.'_index',
+                '%url%'       => $this->generateUrl('mautic_'.$source.'_action', [
                     'objectAction' => 'edit',
-                    'objectId'     => $entity->getId()
-                ))
-            ));
+                    'objectId'     => $entity->getId(),
+                ]),
+            ]);
         }
 
         //render flashes
diff --git a/app/bundles/CalendarBundle/Controller/DefaultController.php b/app/bundles/CalendarBundle/Controller/DefaultController.php
index b488b27d020..af11a69ae22 100644
--- a/app/bundles/CalendarBundle/Controller/DefaultController.php
+++ b/app/bundles/CalendarBundle/Controller/DefaultController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,98 +14,97 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class DefaultController
+ * Class DefaultController.
  */
 class DefaultController extends FormController
 {
-
     /**
-     * Generates the default view
+     * Generates the default view.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function indexAction()
     {
-        return $this->delegateView(array(
+        return $this->delegateView([
             'contentTemplate' => 'MauticCalendarBundle:Default:index.html.php',
-            'passthroughVars' => array(
-                'activeLink'     => '#mautic_calendar_index',
-                'mauticContent'  => 'calendar',
-                'route'          => $this->generateUrl('mautic_calendar_index')
-            )
-        ));
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_calendar_index',
+                'mauticContent' => 'calendar',
+                'route'         => $this->generateUrl('mautic_calendar_index'),
+            ],
+        ]);
     }
 
     /**
-     * Generates the modal view
+     * Generates the modal view.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function editAction()
     {
-        $source     = $this->request->query->get('source');
-        $startDate  = new \DateTime($this->request->query->get('startDate'));
-        $entityId   = $this->request->query->get('objectId');
+        $source    = $this->request->query->get('source');
+        $startDate = new \DateTime($this->request->query->get('startDate'));
+        $entityId  = $this->request->query->get('objectId');
 
         /* @type \Mautic\CalendarBundle\Model\CalendarModel $model */
-        $calendarModel  = $this->getModel('calendar');
-        $event          = $calendarModel->editCalendarEvent($source, $entityId);
+        $calendarModel = $this->getModel('calendar');
+        $event         = $calendarModel->editCalendarEvent($source, $entityId);
 
-        $model   = $event->getModel();
-        $entity  = $event->getEntity();
-        $session = $this->get('session');
-        $sourceSession = $this->get('session')->get('mautic.calendar.' . $source, 1);
+        $model         = $event->getModel();
+        $entity        = $event->getEntity();
+        $session       = $this->get('session');
+        $sourceSession = $this->get('session')->get('mautic.calendar.'.$source, 1);
 
         //set the return URL
-        $returnUrl = $this->generateUrl('mautic_calendar_index', array($source => $sourceSession));
+        $returnUrl = $this->generateUrl('mautic_calendar_index', [$source => $sourceSession]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array($source => $sourceSession),
+            'viewParameters'  => [$source => $sourceSession],
             'contentTemplate' => $event->getContentTemplate(),
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => 'mautic_calendar_index',
-                'mauticContent' => $source
-            )
-        );
+                'mauticContent' => $source,
+            ],
+        ];
 
         //not found
         if ($entity === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
-                            'type' => 'error',
-                            'msg'  => 'mautic.' . $source . '.error.notfound',
-                            'msgVars' => array('%id%' => $entityId)
-                        )
-                    )
-                ))
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
+                            'type'    => 'error',
+                            'msg'     => 'mautic.'.$source.'.error.notfound',
+                            'msgVars' => ['%id%' => $entityId],
+                        ],
+                    ],
+                ])
             );
         } elseif (!$event->hasAccess()) {
             return $this->accessDenied();
         } elseif ($model->isLocked($entity)) {
             //deny access if the entity is locked
-            return $this->isLocked($postActionVars, $entity, $source. '.' . $source);
+            return $this->isLocked($postActionVars, $entity, $source.'.'.$source);
         }
 
         //Create the form
-        $action = $this->generateUrl('mautic_calendar_action', array(
+        $action = $this->generateUrl('mautic_calendar_action', [
             'objectAction' => 'edit',
             'objectId'     => $entity->getId(),
             'source'       => $source,
-            'startDate'    => $startDate->format('Y-m-d H:i:s')
-        ));
-        $form   = $model->createForm($entity, $this->get('form.factory'), $action, array('formName' => $event->getFormName()));
+            'startDate'    => $startDate->format('Y-m-d H:i:s'),
+        ]);
+        $form = $model->createForm($entity, $this->get('form.factory'), $action, ['formName' => $event->getFormName()]);
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
                 if ($valid = $this->isFormValid($form)) {
-                    $contentName     = 'mautic.' . $source . 'builder.'.$entity->getSessionId().'.content';
+                    $contentName     = 'mautic.'.$source.'builder.'.$entity->getSessionId().'.content';
                     $existingContent = $entity->getContent();
-                    $newContent      = $session->get($contentName, array());
+                    $newContent      = $session->get($contentName, []);
                     $content         = array_merge($existingContent, $newContent);
                     $entity->setContent($content);
 
@@ -114,53 +114,53 @@ public function editAction()
                     //clear the session
                     $session->remove($contentName);
 
-                    $this->addFlash('mautic.core.notice.updated', array(
+                    $this->addFlash('mautic.core.notice.updated', [
                         '%name%'      => $entity->getTitle(),
-                        '%menu_link%' => 'mautic_' . $source . '_index',
-                        '%url%'       => $this->generateUrl('mautic_' . $source . '_action', array(
+                        '%menu_link%' => 'mautic_'.$source.'_index',
+                        '%url%'       => $this->generateUrl('mautic_'.$source.'_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ))
-                    ));
+                            'objectId'     => $entity->getId(),
+                        ]),
+                    ]);
                 }
             } else {
                 //clear any modified content
-                $session->remove('mautic.' . $source . 'builder.'.$entityId.'.content');
+                $session->remove('mautic.'.$source.'builder.'.$entityId.'.content');
                 //unlock the entity
                 $model->unlockEntity($entity);
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-                return new JsonResponse(array(
+                return new JsonResponse([
                     'mauticContent' => 'calendarModal',
                     'closeModal'    => 1,
-                ));
+                ]);
             }
         } else {
             //lock the entity
             $model->lockEntity($entity);
         }
 
-        $builderComponents    = $model->getBuilderComponents($entity);
-        return $this->delegateView(array(
-            'viewParameters'  =>  array(
-                'form'        => $this->setFormTheme($form, $event->getContentTemplate()),
-                'tokens'      => $builderComponents[$source . 'Tokens'],
-                'entity'      => $entity,
-                'model'       => $model
-            ),
+        $builderComponents = $model->getBuilderComponents($entity);
+
+        return $this->delegateView([
+            'viewParameters' => [
+                'form'   => $this->setFormTheme($form, $event->getContentTemplate()),
+                'tokens' => $builderComponents[$source.'Tokens'],
+                'entity' => $entity,
+                'model'  => $model,
+            ],
             'contentTemplate' => $event->getContentTemplate(),
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_calendar_index',
                 'mauticContent' => 'calendarModal',
-                'route'         => $this->generateUrl('mautic_calendar_action', array(
+                'route'         => $this->generateUrl('mautic_calendar_action', [
                     'objectAction' => 'edit',
                     'objectId'     => $entity->getId(),
                     'source'       => $source,
-                    'startDate'    => $startDate->format('Y-m-d H:i:s')
-                ))
-            )
-        ));
+                    'startDate'    => $startDate->format('Y-m-d H:i:s'),
+                ]),
+            ],
+        ]);
     }
-
 }
diff --git a/app/bundles/CalendarBundle/Event/CalendarGeneratorEvent.php b/app/bundles/CalendarBundle/Event/CalendarGeneratorEvent.php
index 079586418ae..b86a75dae4b 100644
--- a/app/bundles/CalendarBundle/Event/CalendarGeneratorEvent.php
+++ b/app/bundles/CalendarBundle/Event/CalendarGeneratorEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class CalendarGeneratorEvent
+ * Class CalendarGeneratorEvent.
  */
 class CalendarGeneratorEvent extends Event
 {
-
     /**
      * @var array
      */
@@ -25,7 +25,7 @@ class CalendarGeneratorEvent extends Event
     /**
      * @var array
      */
-    private $events = array();
+    private $events = [];
 
     /**
      * @param array $dates
@@ -36,11 +36,9 @@ public function __construct(array $dates)
     }
 
     /**
-     * Adds an array of events to the container
+     * Adds an array of events to the container.
      *
      * @param array $events
-     *
-     * @return void
      */
     public function addEvents(array $events)
     {
@@ -48,7 +46,7 @@ public function addEvents(array $events)
         foreach ($events as &$event) {
             if (isset($event['color']) && $event['color']) {
                 $event['textColor'] = $this->getContrastColor($event['color']);
-                $event['color'] = '#' . $event['color'];
+                $event['color']     = '#'.$event['color'];
             }
         }
 
@@ -56,7 +54,7 @@ public function addEvents(array $events)
     }
 
     /**
-     * Fetches the event dates
+     * Fetches the event dates.
      *
      * @return array
      */
@@ -66,7 +64,7 @@ public function getDates()
     }
 
     /**
-     * Fetches the events container
+     * Fetches the events container.
      *
      * @return array
      */
@@ -78,9 +76,9 @@ public function getEvents()
     /**
      * Returns contrast hexadecimal color from color in the param.
      * It is used for picking contrast font color on $hex background.
-     * 
+     *
      * @param string $hex
-     * 
+     *
      * @return string
      */
     public function getContrastColor($hex)
diff --git a/app/bundles/CalendarBundle/Event/EventGeneratorEvent.php b/app/bundles/CalendarBundle/Event/EventGeneratorEvent.php
index 51779acd17f..cd60e69b198 100644
--- a/app/bundles/CalendarBundle/Event/EventGeneratorEvent.php
+++ b/app/bundles/CalendarBundle/Event/EventGeneratorEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,18 +13,17 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class EventGeneratorEvent
+ * Class EventGeneratorEvent.
  */
 class EventGeneratorEvent extends Event
 {
-
     /**
      * @var string
      */
     private $source;
 
     /**
-     * @var integer
+     * @var int
      */
     private $entityId;
 
@@ -53,21 +53,19 @@ class EventGeneratorEvent extends Event
     private $formName;
 
     /**
-     * @param string    $source
-     * @param integer   $id
+     * @param string $source
+     * @param int    $id
      */
     public function __construct($source, $entityId)
     {
-        $this->source    = $source;
-        $this->entityId  = $entityId;
+        $this->source   = $source;
+        $this->entityId = $entityId;
     }
 
     /**
-     * Set content template
+     * Set content template.
      *
      * @param string $contentTemplate
-     *
-     * @return void
      */
     public function setContentTemplate($contentTemplate)
     {
@@ -75,7 +73,7 @@ public function setContentTemplate($contentTemplate)
     }
 
     /**
-     * Fetches the event source
+     * Fetches the event source.
      *
      * @return string
      */
@@ -85,9 +83,9 @@ public function getSource()
     }
 
     /**
-     * Fetches the event entityId
+     * Fetches the event entityId.
      *
-     * @return integer
+     * @return int
      */
     public function getEntityId()
     {
@@ -95,7 +93,7 @@ public function getEntityId()
     }
 
     /**
-     * Fetches the event model
+     * Fetches the event model.
      *
      * @return \Mautic\CoreBundle\Model\FormModel
      */
@@ -105,7 +103,7 @@ public function getModel()
     }
 
     /**
-     * Set the event model
+     * Set the event model.
      */
     public function setModel(\Mautic\CoreBundle\Model\FormModel $model)
     {
@@ -113,7 +111,7 @@ public function setModel(\Mautic\CoreBundle\Model\FormModel $model)
     }
 
     /**
-     * Fetches the event entity
+     * Fetches the event entity.
      *
      * @return \Mautic\CoreBundle\Entity\FormEntity
      */
@@ -123,7 +121,7 @@ public function getEntity()
     }
 
     /**
-     * Set the event entity
+     * Set the event entity.
      */
     public function setEntity(\Mautic\CoreBundle\Entity\FormEntity $entity)
     {
@@ -131,7 +129,7 @@ public function setEntity(\Mautic\CoreBundle\Entity\FormEntity $entity)
     }
 
     /**
-     * Fetches the events content template
+     * Fetches the events content template.
      *
      * @return string
      */
@@ -141,9 +139,9 @@ public function getContentTemplate()
     }
 
     /**
-     * Confirmes that user can access the entity
+     * Confirmes that user can access the entity.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasAccess()
     {
@@ -151,7 +149,7 @@ public function hasAccess()
     }
 
     /**
-     * Set the event access
+     * Set the event access.
      */
     public function setAccess($access)
     {
@@ -169,7 +167,7 @@ public function getFormName()
     }
 
     /**
-     * Set the event formName
+     * Set the event formName.
      */
     public function setFormName($formName)
     {
diff --git a/app/bundles/CalendarBundle/MauticCalendarBundle.php b/app/bundles/CalendarBundle/MauticCalendarBundle.php
index 43fa34cd693..f260ef312de 100644
--- a/app/bundles/CalendarBundle/MauticCalendarBundle.php
+++ b/app/bundles/CalendarBundle/MauticCalendarBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticCalendarBundle
- *
- * @package Mautic\CalendarBundle
+ * Class MauticCalendarBundle.
  */
 class MauticCalendarBundle extends Bundle
 {
-
 }
diff --git a/app/bundles/CalendarBundle/Model/CalendarModel.php b/app/bundles/CalendarBundle/Model/CalendarModel.php
index 7b68497556a..7ca6e8803dd 100644
--- a/app/bundles/CalendarBundle/Model/CalendarModel.php
+++ b/app/bundles/CalendarBundle/Model/CalendarModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,12 @@
 use Mautic\CoreBundle\Model\FormModel;
 
 /**
- * Class CalendarModel
+ * Class CalendarModel.
  */
 class CalendarModel extends FormModel
 {
-
     /**
-     * Collects data for the calendar display
+     * Collects data for the calendar display.
      *
      * @param array $dates Associative array containing a 'start_date' and 'end_date' key
      *
@@ -36,10 +36,10 @@ public function getCalendarEvents(array $dates)
     }
 
     /**
-     * Collects data for the calendar display
+     * Collects data for the calendar display.
      *
-     * @param string    $bundle
-     * @param integer   $id
+     * @param string $bundle
+     * @param int    $id
      *
      * @return array
      */
diff --git a/app/bundles/CalendarBundle/Views/Default/index.html.php b/app/bundles/CalendarBundle/Views/Default/index.html.php
index 0281b968e04..c49763c1258 100644
--- a/app/bundles/CalendarBundle/Views/Default/index.html.php
+++ b/app/bundles/CalendarBundle/Views/Default/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
@@ -17,7 +18,7 @@
 	</div>
 </div>
 
-<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', array(
+<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
     'id'            => 'CalendarEditModal',
-	'footerButtons' => true
-));
+    'footerButtons' => true,
+]);
diff --git a/app/bundles/CampaignBundle/CampaignEvents.php b/app/bundles/CampaignBundle/CampaignEvents.php
index 0742ba6e472..6f609b97240 100644
--- a/app/bundles/CampaignBundle/CampaignEvents.php
+++ b/app/bundles/CampaignBundle/CampaignEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,9 +12,7 @@
 
 /**
  * Class CampaignEvents
- * Events available for CampaignBundle
- *
- * @package Mautic\CampaignBundle
+ * Events available for CampaignBundle.
  */
 final class CampaignEvents
 {
@@ -25,7 +24,7 @@ final class CampaignEvents
      *
      * @var string
      */
-    const CAMPAIGN_PRE_SAVE   = 'mautic.campaign_pre_save';
+    const CAMPAIGN_PRE_SAVE = 'mautic.campaign_pre_save';
 
     /**
      * The mautic.campaign_post_save event is thrown right after a form is persisted.
@@ -35,7 +34,7 @@ final class CampaignEvents
      *
      * @var string
      */
-    const CAMPAIGN_POST_SAVE   = 'mautic.campaign_post_save';
+    const CAMPAIGN_POST_SAVE = 'mautic.campaign_post_save';
 
     /**
      * The mautic.campaign_pre_delete event is thrown before a form is deleted.
@@ -45,7 +44,7 @@ final class CampaignEvents
      *
      * @var string
      */
-    const CAMPAIGN_PRE_DELETE   = 'mautic.campaign_pre_delete';
+    const CAMPAIGN_PRE_DELETE = 'mautic.campaign_pre_delete';
 
     /**
      * The mautic.campaign_post_delete event is thrown after a form is deleted.
@@ -55,30 +54,30 @@ final class CampaignEvents
      *
      * @var string
      */
-    const CAMPAIGN_POST_DELETE   = 'mautic.campaign_post_delete';
+    const CAMPAIGN_POST_DELETE = 'mautic.campaign_post_delete';
 
     /**
-     * The mautic.campaign_on_build event is thrown before displaying the campaign builder form to allow adding of custom actions
+     * The mautic.campaign_on_build event is thrown before displaying the campaign builder form to allow adding of custom actions.
      *
      * The event listener receives a
      * Mautic\CampaignBundle\Event\CampaignBuilderEvent instance.
      *
      * @var string
      */
-    const CAMPAIGN_ON_BUILD  = 'mautic.campaign_on_build';
+    const CAMPAIGN_ON_BUILD = 'mautic.campaign_on_build';
 
     /**
-     * The mautic.campaign_on_leadchange event is thrown when a lead was added or removed from the campaign
+     * The mautic.campaign_on_leadchange event is thrown when a lead was added or removed from the campaign.
      *
      * The event listener receives a
      * Mautic\CampaignBundle\Event\CampaignLeadChangeEvent instance.
      *
      * @var string
      */
-    const CAMPAIGN_ON_LEADCHANGE  = 'mautic.campaign_on_leadchange';
+    const CAMPAIGN_ON_LEADCHANGE = 'mautic.campaign_on_leadchange';
 
     /**
-     * The mautic.campaign_on_event_execution event is dispatched when a campaign event is executed
+     * The mautic.campaign_on_event_execution event is dispatched when a campaign event is executed.
      *
      * The event listener receives a
      * Mautic\CampaignBundle\Event\CampaignExecutionEvent instance.
@@ -89,7 +88,7 @@ final class CampaignEvents
 
     /**
      * The mautic.campaign_on_event_decision_trigger event is dispatched after a lead decision triggers a set of actions or if the decision is set
-     * as a root level event
+     * as a root level event.
      *
      * The event listener receives a
      * Mautic\CampaignBundle\Event\CampaignDecisionEvent instance.
@@ -99,7 +98,7 @@ final class CampaignEvents
     const ON_EVENT_DECISION_TRIGGER = 'matuic.campaign_on_event_decision_trigger';
 
     /**
-     * The mautic.campaign_on_event_scheduled event is dispatched when a campaign event is scheduled
+     * The mautic.campaign_on_event_scheduled event is dispatched when a campaign event is scheduled.
      *
      * The event listener receives a
      * Mautic\CampaignBundle\Event\CampaignScheduledEvent instance.
@@ -107,4 +106,4 @@ final class CampaignEvents
      * @var string
      */
     const ON_EVENT_SCHEDULED = 'matuic.campaign_on_event_scheduled';
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Command/ProcessMarketingMessagesQueueCommand.php b/app/bundles/CampaignBundle/Command/ProcessMarketingMessagesQueueCommand.php
index fdb6c634faa..1728f9b42c3 100644
--- a/app/bundles/CampaignBundle/Command/ProcessMarketingMessagesQueueCommand.php
+++ b/app/bundles/CampaignBundle/Command/ProcessMarketingMessagesQueueCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,8 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-
 /**
- * Class ProcessMarketingMessagesQueueCommand
+ * Class ProcessMarketingMessagesQueueCommand.
  */
 class ProcessMarketingMessagesQueueCommand extends ContainerAwareCommand
 {
@@ -28,9 +28,9 @@ protected function configure()
         $this
             ->setName('mautic:campaigns:messagequeue')
             ->setAliases(
-                array(
-                    'mautic:campaigns:messages'
-                )
+                [
+                    'mautic:campaigns:messages',
+                ]
             )
             ->setDescription('Process sending of messages queue.')
             ->addOption(
@@ -61,10 +61,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /** @var \Mautic\CoreBundle\Factory\MauticFactory $factory */
         $factory = $container->get('mautic.factory');
 
-        $translator     = $factory->getTranslator();
-        $channel        = $input->getOption('channel');
-        $channelId      = $input->getOption('channelid');
-
+        $translator = $factory->getTranslator();
+        $channel    = $input->getOption('channel');
+        $channelId  = $input->getOption('channelid');
 
         /** @var \Mautic\CoreBundle\Model\MessageQueueModel $model */
         $model = $factory->getModel('core.messagequeue');
@@ -73,8 +72,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $processed = intval($model->sendMessages($channel, $channelId));
 
-        $output->writeln('<comment>'.$translator->trans('mautic.campaign.command.messages.sent', array('%events%' => $processed)).'</comment>'."\n");
+        $output->writeln('<comment>'.$translator->trans('mautic.campaign.command.messages.sent', ['%events%' => $processed]).'</comment>'."\n");
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Command/TriggerCampaignCommand.php b/app/bundles/CampaignBundle/Command/TriggerCampaignCommand.php
index 9653e36cf93..f281597fa2f 100644
--- a/app/bundles/CampaignBundle/Command/TriggerCampaignCommand.php
+++ b/app/bundles/CampaignBundle/Command/TriggerCampaignCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Class TriggerCampaignCommand
+ * Class TriggerCampaignCommand.
  */
 class TriggerCampaignCommand extends ModeratedCommand
 {
@@ -72,7 +73,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $max           = $input->getOption('max-events');
 
         if (!$this->checkRunStatus($input, $output, ($id) ? $id : 'all')) {
-
             return 0;
         }
 
@@ -82,14 +82,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             if ($campaign !== null && $campaign->isPublished()) {
                 $totalProcessed = 0;
-                $output->writeln('<info>'.$translator->trans('mautic.campaign.trigger.triggering', array('%id%' => $id)).'</info>');
+                $output->writeln('<info>'.$translator->trans('mautic.campaign.trigger.triggering', ['%id%' => $id]).'</info>');
 
                 if (!$negativeOnly && !$scheduleOnly) {
                     //trigger starting action events for newly added contacts
                     $output->writeln('<comment>'.$translator->trans('mautic.campaign.trigger.starting').'</comment>');
                     $processed = $model->triggerStartingEvents($campaign, $totalProcessed, $batch, $max, $output);
                     $output->writeln(
-                        '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', array('%events%' => $processed)).'</comment>'."\n"
+                        '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', ['%events%' => $processed]).'</comment>'."\n"
                     );
                 }
 
@@ -98,7 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     $output->writeln('<comment>'.$translator->trans('mautic.campaign.trigger.scheduled').'</comment>');
                     $processed = $model->triggerScheduledEvents($campaign, $totalProcessed, $batch, $max, $output);
                     $output->writeln(
-                        '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', array('%events%' => $processed)).'</comment>'."\n"
+                        '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', ['%events%' => $processed]).'</comment>'."\n"
                     );
                 }
 
@@ -107,17 +107,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     $output->writeln('<comment>'.$translator->trans('mautic.campaign.trigger.negative').'</comment>');
                     $processed = $model->triggerNegativeEvents($campaign, $totalProcessed, $batch, $max, $output);
                     $output->writeln(
-                        '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', array('%events%' => $processed)).'</comment>'."\n"
+                        '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', ['%events%' => $processed]).'</comment>'."\n"
                     );
                 }
             } else {
-                $output->writeln('<error>'.$translator->trans('mautic.campaign.rebuild.not_found', array('%id%' => $id)).'</error>');
+                $output->writeln('<error>'.$translator->trans('mautic.campaign.rebuild.not_found', ['%id%' => $id]).'</error>');
             }
         } else {
             $campaigns = $campaignModel->getEntities(
-                array(
-                    'iterator_mode' => true
-                )
+                [
+                    'iterator_mode' => true,
+                ]
             );
 
             while (($c = $campaigns->next()) !== false) {
@@ -127,19 +127,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $c = reset($c);
 
                 if ($c->isPublished()) {
-                    $output->writeln('<info>'.$translator->trans('mautic.campaign.trigger.triggering', array('%id%' => $c->getId())).'</info>');
+                    $output->writeln('<info>'.$translator->trans('mautic.campaign.trigger.triggering', ['%id%' => $c->getId()]).'</info>');
                     if (!$negativeOnly && !$scheduleOnly) {
                         //trigger starting action events for newly added contacts
                         $output->writeln('<comment>'.$translator->trans('mautic.campaign.trigger.starting').'</comment>');
                         $processed = $model->triggerStartingEvents($c, $totalProcessed, $batch, $max, $output);
                         $output->writeln(
-                            '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', array('%events%' => $processed)).'</comment>'
+                            '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', ['%events%' => $processed]).'</comment>'
                             ."\n"
                         );
                     }
 
                     if ($max && $totalProcessed >= $max) {
-
                         continue;
                     }
 
@@ -148,13 +147,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         $output->writeln('<comment>'.$translator->trans('mautic.campaign.trigger.scheduled').'</comment>');
                         $processed = $model->triggerScheduledEvents($c, $totalProcessed, $batch, $max, $output);
                         $output->writeln(
-                            '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', array('%events%' => $processed)).'</comment>'
+                            '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', ['%events%' => $processed]).'</comment>'
                             ."\n"
                         );
                     }
 
                     if ($max && $totalProcessed >= $max) {
-
                         continue;
                     }
 
@@ -163,7 +161,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         $output->writeln('<comment>'.$translator->trans('mautic.campaign.trigger.negative').'</comment>');
                         $processed = $model->triggerNegativeEvents($c, $totalProcessed, $batch, $max, $output);
                         $output->writeln(
-                            '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', array('%events%' => $processed)).'</comment>'
+                            '<comment>'.$translator->trans('mautic.campaign.trigger.events_executed', ['%events%' => $processed]).'</comment>'
                             ."\n"
                         );
                     }
@@ -180,4 +178,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Command/UpdateLeadCampaignsCommand.php b/app/bundles/CampaignBundle/Command/UpdateLeadCampaignsCommand.php
index dcab6de81ad..f3f9aa6f277 100644
--- a/app/bundles/CampaignBundle/Command/UpdateLeadCampaignsCommand.php
+++ b/app/bundles/CampaignBundle/Command/UpdateLeadCampaignsCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -51,26 +52,25 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $max   = $input->getOption('max-contacts');
 
         if (!$this->checkRunStatus($input, $output, ($id) ? $id : 'all')) {
-
             return 0;
         }
 
         if ($id) {
             $campaign = $campaignModel->getEntity($id);
             if ($campaign !== null) {
-                $output->writeln('<info>'.$translator->trans('mautic.campaign.rebuild.rebuilding', array('%id%' => $id)).'</info>');
+                $output->writeln('<info>'.$translator->trans('mautic.campaign.rebuild.rebuilding', ['%id%' => $id]).'</info>');
                 $processed = $campaignModel->rebuildCampaignLeads($campaign, $batch, $max, $output);
                 $output->writeln(
-                    '<comment>'.$translator->trans('mautic.campaign.rebuild.leads_affected', array('%leads%' => $processed)).'</comment>'."\n"
+                    '<comment>'.$translator->trans('mautic.campaign.rebuild.leads_affected', ['%leads%' => $processed]).'</comment>'."\n"
                 );
             } else {
-                $output->writeln('<error>'.$translator->trans('mautic.campaign.rebuild.not_found', array('%id%' => $id)).'</error>');
+                $output->writeln('<error>'.$translator->trans('mautic.campaign.rebuild.not_found', ['%id%' => $id]).'</error>');
             }
         } else {
             $campaigns = $campaignModel->getEntities(
-                array(
-                    'iterator_mode' => true
-                )
+                [
+                    'iterator_mode' => true,
+                ]
             );
 
             while (($c = $campaigns->next()) !== false) {
@@ -78,11 +78,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $c = reset($c);
 
                 if ($c->isPublished()) {
-                    $output->writeln('<info>'.$translator->trans('mautic.campaign.rebuild.rebuilding', array('%id%' => $c->getId())).'</info>');
+                    $output->writeln('<info>'.$translator->trans('mautic.campaign.rebuild.rebuilding', ['%id%' => $c->getId()]).'</info>');
 
                     $processed = $campaignModel->rebuildCampaignLeads($c, $batch, $max, $output);
                     $output->writeln(
-                        '<comment>'.$translator->trans('mautic.campaign.rebuild.leads_affected', array('%leads%' => $processed)).'</comment>'."\n"
+                        '<comment>'.$translator->trans('mautic.campaign.rebuild.leads_affected', ['%leads%' => $processed]).'</comment>'."\n"
                     );
                 }
 
@@ -97,4 +97,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Config/config.php b/app/bundles/CampaignBundle/Config/config.php
index 29bde352a5e..98b3eb9e612 100644
--- a/app/bundles/CampaignBundle/Config/config.php
+++ b/app/bundles/CampaignBundle/Config/config.php
@@ -1,173 +1,174 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes'   => array(
-        'main' => array(
-            'mautic_campaignevent_action' => array(
+return [
+    'routes' => [
+        'main' => [
+            'mautic_campaignevent_action' => [
                 'path'       => '/campaigns/events/{objectAction}/{objectId}',
-                'controller' => 'MauticCampaignBundle:Event:execute'
-            ),
-            'mautic_campaignsource_action'      => array(
+                'controller' => 'MauticCampaignBundle:Event:execute',
+            ],
+            'mautic_campaignsource_action' => [
                 'path'       => '/campaigns/sources/{objectAction}/{objectId}',
-                'controller' => 'MauticCampaignBundle:Source:execute'
-            ),
-            'mautic_campaign_index'       => array(
+                'controller' => 'MauticCampaignBundle:Source:execute',
+            ],
+            'mautic_campaign_index' => [
                 'path'       => '/campaigns/{page}',
-                'controller' => 'MauticCampaignBundle:Campaign:index'
-            ),
-            'mautic_campaign_action'      => array(
+                'controller' => 'MauticCampaignBundle:Campaign:index',
+            ],
+            'mautic_campaign_action' => [
                 'path'       => '/campaigns/{objectAction}/{objectId}',
-                'controller' => 'MauticCampaignBundle:Campaign:execute'
-            ),
-            'mautic_campaign_contacts'       => array(
+                'controller' => 'MauticCampaignBundle:Campaign:execute',
+            ],
+            'mautic_campaign_contacts' => [
                 'path'       => '/campaigns/view/{objectId}/contact/{page}',
                 'controller' => 'MauticCampaignBundle:Campaign:contacts',
-            )
-        ),
-        'api'  => array(
-            'mautic_api_getcampaigns' => array(
+            ],
+        ],
+        'api' => [
+            'mautic_api_getcampaigns' => [
                 'path'       => '/campaigns',
-                'controller' => 'MauticCampaignBundle:Api\CampaignApi:getEntities'
-            ),
-            'mautic_api_getcampaign'  => array(
+                'controller' => 'MauticCampaignBundle:Api\CampaignApi:getEntities',
+            ],
+            'mautic_api_getcampaign' => [
                 'path'       => '/campaigns/{id}',
-                'controller' => 'MauticCampaignBundle:Api\CampaignApi:getEntity'
-            ),
-            'mautic_api_campaignaddcontact' => array(
+                'controller' => 'MauticCampaignBundle:Api\CampaignApi:getEntity',
+            ],
+            'mautic_api_campaignaddcontact' => [
                 'path'       => '/campaigns/{id}/contact/add/{leadId}',
                 'controller' => 'MauticCampaignBundle:Api\CampaignApi:addLead',
-                'method'     => 'POST'
-            ),
-            'mautic_api_campaignremovecontact' => array(
+                'method'     => 'POST',
+            ],
+            'mautic_api_campaignremovecontact' => [
                 'path'       => '/campaigns/{id}/contact/remove/{leadId}',
                 'controller' => 'MauticCampaignBundle:Api\CampaignApi:removeLead',
-                'method'     => 'POST'
-            )
-        )
-    ),
+                'method'     => 'POST',
+            ],
+        ],
+    ],
 
-    'menu'     => array(
-        'main' => array(
-            'mautic.campaign.menu.index' => array(
+    'menu' => [
+        'main' => [
+            'mautic.campaign.menu.index' => [
                 'iconClass' => 'fa-clock-o',
                 'route'     => 'mautic_campaign_index',
                 'access'    => 'campaign:campaigns:view',
-                'priority'  => 50
-            )
-        )
-    ),
+                'priority'  => 50,
+            ],
+        ],
+    ],
 
-    'categories' => array(
-        'campaign' => null
-    ),
+    'categories' => [
+        'campaign' => null,
+    ],
 
-    'services' => array(
-        'events' => array(
-            'mautic.campaign.subscriber'                => array(
-                'class' => 'Mautic\CampaignBundle\EventListener\CampaignSubscriber',
+    'services' => [
+        'events' => [
+            'mautic.campaign.subscriber' => [
+                'class'     => 'Mautic\CampaignBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
-            ),
-            'mautic.campaign.leadbundle.subscriber'     => array(
-                'class' => 'Mautic\CampaignBundle\EventListener\LeadSubscriber',
+                    'mautic.core.model.auditlog',
+                ],
+            ],
+            'mautic.campaign.leadbundle.subscriber' => [
+                'class'     => 'Mautic\CampaignBundle\EventListener\LeadSubscriber',
                 'arguments' => [
                     'mautic.campaign.model.campaign',
-                    'mautic.lead.model.lead'
-                ]
-            ),
-            'mautic.campaign.calendarbundle.subscriber' => array(
-                'class' => 'Mautic\CampaignBundle\EventListener\CalendarSubscriber'
-            ),
-            'mautic.campaign.pointbundle.subscriber'    => array(
-                'class' => 'Mautic\CampaignBundle\EventListener\PointSubscriber'
-            ),
-            'mautic.campaign.search.subscriber'         => array(
-                'class' => 'Mautic\CampaignBundle\EventListener\SearchSubscriber',
+                    'mautic.lead.model.lead',
+                ],
+            ],
+            'mautic.campaign.calendarbundle.subscriber' => [
+                'class' => 'Mautic\CampaignBundle\EventListener\CalendarSubscriber',
+            ],
+            'mautic.campaign.pointbundle.subscriber' => [
+                'class' => 'Mautic\CampaignBundle\EventListener\PointSubscriber',
+            ],
+            'mautic.campaign.search.subscriber' => [
+                'class'     => 'Mautic\CampaignBundle\EventListener\SearchSubscriber',
                 'arguments' => [
-                    'mautic.campaign.model.campaign'
-                ]
-            ),
-            'mautic.campaign.dashboard.subscriber'           => array(
-                'class' => 'Mautic\CampaignBundle\EventListener\DashboardSubscriber',
+                    'mautic.campaign.model.campaign',
+                ],
+            ],
+            'mautic.campaign.dashboard.subscriber' => [
+                'class'     => 'Mautic\CampaignBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
                     'mautic.campaign.model.campaign',
-                    'mautic.campaign.model.event'
-                ]
-            ),
-            'mautic.campaignconfigbundle.subscriber'   => array(
-                'class' => 'Mautic\CampaignBundle\EventListener\ConfigSubscriber'
-            ),
-        ),
-        'forms'  => array(
-            'mautic.campaign.type.form'                 => array(
+                    'mautic.campaign.model.event',
+                ],
+            ],
+            'mautic.campaignconfigbundle.subscriber' => [
+                'class' => 'Mautic\CampaignBundle\EventListener\ConfigSubscriber',
+            ],
+        ],
+        'forms' => [
+            'mautic.campaign.type.form' => [
                 'class'     => 'Mautic\CampaignBundle\Form\Type\CampaignType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'campaign'
-            ),
-            'mautic.campaignrange.type.action'          => array(
+                'alias'     => 'campaign',
+            ],
+            'mautic.campaignrange.type.action' => [
                 'class' => 'Mautic\CampaignBundle\Form\Type\EventType',
-                'alias' => 'campaignevent'
-            ),
-            'mautic.campaign.type.campaignlist'         => array(
+                'alias' => 'campaignevent',
+            ],
+            'mautic.campaign.type.campaignlist' => [
                 'class'     => 'Mautic\CampaignBundle\Form\Type\CampaignListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'campaign_list'
-            ),
-            'mautic.campaign.type.trigger.leadchange'   => array(
+                'alias'     => 'campaign_list',
+            ],
+            'mautic.campaign.type.trigger.leadchange' => [
                 'class' => 'Mautic\CampaignBundle\Form\Type\CampaignEventLeadChangeType',
-                'alias' => 'campaignevent_leadchange'
-            ),
-            'mautic.campaign.type.action.addremovelead' => array(
+                'alias' => 'campaignevent_leadchange',
+            ],
+            'mautic.campaign.type.action.addremovelead' => [
                 'class' => 'Mautic\CampaignBundle\Form\Type\CampaignEventAddRemoveLeadType',
-                'alias' => 'campaignevent_addremovelead'
-            ),
-            'mautic.campaign.type.canvassettings'       => array(
+                'alias' => 'campaignevent_addremovelead',
+            ],
+            'mautic.campaign.type.canvassettings' => [
                 'class' => 'Mautic\CampaignBundle\Form\Type\EventCanvasSettingsType',
-                'alias' => 'campaignevent_canvassettings'
-            ),
-            'mautic.campaign.type.leadsource'           => array(
+                'alias' => 'campaignevent_canvassettings',
+            ],
+            'mautic.campaign.type.leadsource' => [
                 'class'     => 'Mautic\CampaignBundle\Form\Type\CampaignLeadSourceType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'campaign_leadsource'
-            ),
-            'mautic.form.type.campaignconfig'                    => array(
+                'alias'     => 'campaign_leadsource',
+            ],
+            'mautic.form.type.campaignconfig' => [
                 'class'     => 'Mautic\CampaignBundle\Form\Type\ConfigType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'campaignconfig'
-            ),
-        ),
-        'models' =>  array(
-            'mautic.campaign.model.campaign' => array(
-                'class' => 'Mautic\CampaignBundle\Model\CampaignModel',
-                'arguments' => array(
+                'alias'     => 'campaignconfig',
+            ],
+        ],
+        'models' => [
+            'mautic.campaign.model.campaign' => [
+                'class'     => 'Mautic\CampaignBundle\Model\CampaignModel',
+                'arguments' => [
                     'mautic.helper.core_parameters',
                     'mautic.lead.model.lead',
                     'mautic.lead.model.list',
-                    'mautic.form.model.form'
-                )
-            ),
-            'mautic.campaign.model.event' => array(
-                'class' => 'Mautic\CampaignBundle\Model\EventModel',
-                'arguments' => array(
+                    'mautic.form.model.form',
+                ],
+            ],
+            'mautic.campaign.model.event' => [
+                'class'     => 'Mautic\CampaignBundle\Model\EventModel',
+                'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.helper.core_parameters',
                     'mautic.lead.model.lead',
                     'mautic.campaign.model.campaign',
-                    'mautic.factory'
-                )
-            )
-        )
-    ),
-    'parameters' => array(
-        'campaign_time_wait_on_event_false' => 'PT1H'
-    )
-);
+                    'mautic.factory',
+                ],
+            ],
+        ],
+    ],
+    'parameters' => [
+        'campaign_time_wait_on_event_false' => 'PT1H',
+    ],
+];
diff --git a/app/bundles/CampaignBundle/Controller/AjaxController.php b/app/bundles/CampaignBundle/Controller/AjaxController.php
index ccffa29017e..e25199912b8 100644
--- a/app/bundles/CampaignBundle/Controller/AjaxController.php
+++ b/app/bundles/CampaignBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,32 +15,29 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
- *
- * @package Mautic\CampaignBundle\Controller
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
-
     /**
      * @param Request $request
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    protected function updateConnectionsAction (Request $request)
+    protected function updateConnectionsAction(Request $request)
     {
         $session        = $this->get('session');
         $campaignId     = InputHelper::clean($request->query->get('campaignId'));
-        $canvasSettings = $request->request->get('canvasSettings', array(), true);
+        $canvasSettings = $request->request->get('canvasSettings', [], true);
 
         if (empty($campaignId)) {
-            $dataArray = array('success' => 0);
+            $dataArray = ['success' => 0];
         } else {
             $session->set('mautic.campaign.'.$campaignId.'.events.canvassettings', $canvasSettings);
 
-            $dataArray = array('success' => 1);
+            $dataArray = ['success' => 1];
         }
 
         return $this->sendJsonResponse($dataArray);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Controller/Api/CampaignApiController.php b/app/bundles/CampaignBundle/Controller/Api/CampaignApiController.php
index 10bb3442f45..2fe68e9f73a 100644
--- a/app/bundles/CampaignBundle/Controller/Api/CampaignApiController.php
+++ b/app/bundles/CampaignBundle/Controller/Api/CampaignApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,14 +15,11 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class CampaignApiController
- *
- * @package Mautic\CampaignBundle\Controller\Api
+ * Class CampaignApiController.
  */
 class CampaignApiController extends CommonApiController
 {
-
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('campaign');
@@ -29,19 +27,20 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'campaign';
         $this->entityNameMulti  = 'campaigns';
         $this->permissionBase   = 'campaign:campaigns';
-        $this->serializerGroups = array("campaignDetails", "categoryList", "publishDetails");
+        $this->serializerGroups = ['campaignDetails', 'categoryList', 'publishDetails'];
     }
 
     /**
-     * Adds a lead to a campaign
+     * Adds a lead to a campaign.
      *
      * @param int $id     Campaign ID
      * @param int $leadId Lead ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function addLeadAction ($id, $leadId)
+    public function addLeadAction($id, $leadId)
     {
         $entity = $this->model->getEntity($id);
         if (null !== $entity) {
@@ -56,25 +55,25 @@ public function addLeadAction ($id, $leadId)
 
             $this->model->addLead($entity, $leadId);
 
-            $view = $this->view(array('success' => 1), Codes::HTTP_OK);
+            $view = $this->view(['success' => 1], Codes::HTTP_OK);
 
             return $this->handleView($view);
-
         }
 
         return $this->notFound();
     }
 
     /**
-     * Removes given lead from a campaign
+     * Removes given lead from a campaign.
      *
      * @param int $id     Campaign ID
      * @param int $leadId Lead ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function removeLeadAction ($id, $leadId)
+    public function removeLeadAction($id, $leadId)
     {
         $entity = $this->model->getEntity($id);
         if (null !== $entity) {
@@ -89,10 +88,9 @@ public function removeLeadAction ($id, $leadId)
 
             $this->model->removeLead($entity, $leadId);
 
-            $view = $this->view(array('success' => 1), Codes::HTTP_OK);
+            $view = $this->view(['success' => 1], Codes::HTTP_OK);
 
             return $this->handleView($view);
-
         }
 
         return $this->notFound();
diff --git a/app/bundles/CampaignBundle/Controller/CampaignController.php b/app/bundles/CampaignBundle/Controller/CampaignController.php
index 5e30ca84a6e..629a9dd7539 100644
--- a/app/bundles/CampaignBundle/Controller/CampaignController.php
+++ b/app/bundles/CampaignBundle/Controller/CampaignController.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Controller;
 
-use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CampaignBundle\Entity\Campaign;
+use Mautic\CoreBundle\Controller\FormController;
 use Mautic\LeadBundle\Controller\EntityContactsTrait;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -38,10 +39,10 @@ public function indexAction($page = 1)
                 'campaign:campaigns:create',
                 'campaign:campaigns:edit',
                 'campaign:campaigns:delete',
-                'campaign:campaigns:publish'
+                'campaign:campaigns:publish',
 
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if (!$permissions['campaign:campaigns:view']) {
@@ -75,14 +76,14 @@ public function indexAction($page = 1)
                 'groups'      => [
                     'mautic.campaign.leadsource.form' => [
                         'options' => $sourceLists['forms'],
-                        'prefix'  => 'form'
+                        'prefix'  => 'form',
                     ],
                     'mautic.campaign.leadsource.list' => [
                         'options' => $sourceLists['lists'],
-                        'prefix'  => 'list'
-                    ]
-                ]
-            ]
+                        'prefix'  => 'list',
+                    ],
+                ],
+            ],
         ];
 
         if ($updatedFilters) {
@@ -143,7 +144,7 @@ public function indexAction($page = 1)
                 'orderBy'    => $orderBy,
                 'orderByDir' => $orderByDir,
                 'joinLists'  => $joinLists,
-                'joinForms'  => $joinForms
+                'joinForms'  => $joinForms,
             ]
         );
 
@@ -165,8 +166,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticCampaignBundle:Campaign:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_campaign_index',
-                        'mauticContent' => 'campaign'
-                    ]
+                        'mauticContent' => 'campaign',
+                    ],
                 ]
             );
         }
@@ -178,27 +179,27 @@ public function indexAction($page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'searchValue' => $search,
                     'items'       => $campaigns,
                     'page'        => $page,
                     'limit'       => $limit,
                     'permissions' => $permissions,
                     'tmpl'        => $tmpl,
-                    'filters'     => $listFilters
+                    'filters'     => $listFilters,
                 ],
                 'contentTemplate' => 'MauticCampaignBundle:Campaign:list.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_campaign_index',
                     'mauticContent' => 'campaign',
-                    'route'         => $this->generateUrl('mautic_campaign_index', ['page' => $page])
-                ]
+                    'route'         => $this->generateUrl('mautic_campaign_index', ['page' => $page]),
+                ],
             ]
         );
     }
 
     /**
-     * View a specific campaign
+     * View a specific campaign.
      *
      * @param $objectId
      *
@@ -220,9 +221,9 @@ public function viewAction($objectId)
                 'campaign:campaigns:create',
                 'campaign:campaigns:edit',
                 'campaign:campaigns:delete',
-                'campaign:campaigns:publish'
+                'campaign:campaigns:publish',
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if ($entity === null) {
@@ -236,19 +237,18 @@ public function viewAction($objectId)
                     'contentTemplate' => 'MauticCampaignBundle:Campaign:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_campaign_index',
-                        'mauticContent' => 'campaign'
+                        'mauticContent' => 'campaign',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.campaign.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$permissions['campaign:campaigns:view']) {
-
             return $this->accessDenied();
         }
 
@@ -266,7 +266,7 @@ public function viewAction($objectId)
         $sortedEvents = [
             'decision'  => [],
             'action'    => [],
-            'condition' => []
+            'condition' => [],
         ];
         foreach ($events as $event) {
             $event['logCount']                   = (isset($campaignLogCounts[$event['id']])) ? (int) $campaignLogCounts[$event['id']] : 0;
@@ -287,7 +287,7 @@ public function viewAction($objectId)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'campaign'      => $entity,
                     'permissions'   => $permissions,
                     'security'      => $security,
@@ -301,9 +301,9 @@ public function viewAction($objectId)
                         [
                             'objectId'   => $entity->getId(),
                             'page'       => $this->get('session')->get('mautic.campaign.contact.page', 1),
-                            'ignoreAjax' => true
+                            'ignoreAjax' => true,
                         ]
-                    )->getContent()
+                    )->getContent(),
                 ],
                 'contentTemplate' => 'MauticCampaignBundle:Campaign:details.html.php',
                 'passthroughVars' => [
@@ -313,10 +313,10 @@ public function viewAction($objectId)
                         'mautic_campaign_action',
                         [
                             'objectAction' => 'view',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
@@ -329,7 +329,6 @@ public function viewAction($objectId)
      */
     public function contactsAction($objectId, $page = 1)
     {
-
         return $this->generateContactsGrid(
             $objectId,
             $page,
@@ -343,7 +342,7 @@ public function contactsAction($objectId, $page = 1)
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -424,19 +423,19 @@ public function newAction()
                                     'mautic_campaign_action',
                                     [
                                         'objectAction' => 'edit',
-                                        'objectId'     => $entity->getId()
+                                        'objectId'     => $entity->getId(),
                                     ]
-                                )
+                                ),
                             ]
                         );
 
                         if ($form->get('buttons')->get('save')->isClicked()) {
                             $viewParameters = [
                                 'objectAction' => 'view',
-                                'objectId'     => $entity->getId()
+                                'objectId'     => $entity->getId(),
                             ];
-                            $returnUrl      = $this->generateUrl('mautic_campaign_action', $viewParameters);
-                            $template       = 'MauticCampaignBundle:Campaign:view';
+                            $returnUrl = $this->generateUrl('mautic_campaign_action', $viewParameters);
+                            $template  = 'MauticCampaignBundle:Campaign:view';
                         } else {
                             //return edit view so that all the session stuff is loaded
                             return $this->editAction($entity->getId(), true);
@@ -454,7 +453,7 @@ public function newAction()
                             $campaignSources[$type] = [
                                 'sourceType' => $type,
                                 'campaignId' => $sessionId,
-                                'names'      => implode(', ', array_intersect_key($sourceList, array_flip($sources)))
+                                'names'      => implode(', ', array_intersect_key($sourceList, array_flip($sources))),
                             ];
                         }
                     }
@@ -476,8 +475,8 @@ public function newAction()
                         'contentTemplate' => $template,
                         'passthroughVars' => [
                             'activeLink'    => '#mautic_campaign_index',
-                            'mauticContent' => 'campaign'
-                        ]
+                            'mauticContent' => 'campaign',
+                        ],
                     ]
                 );
             }
@@ -491,7 +490,7 @@ public function newAction()
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'eventSettings' => $eventSettings,
 
                     'campaignEvents'  => $modifiedEvents,
@@ -499,7 +498,7 @@ public function newAction()
                     'deletedEvents'   => $deletedEvents,
                     'tmpl'            => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                     'entity'          => $entity,
-                    'form'            => $form->createView()
+                    'form'            => $form->createView(),
                 ],
                 'contentTemplate' => 'MauticCampaignBundle:Campaign:form.html.php',
                 'passthroughVars' => [
@@ -509,21 +508,21 @@ public function newAction()
                         'mautic_campaign_action',
                         [
                             'objectAction' => (!empty($valid) ? 'edit' : 'new'), //valid means a new form was applied
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
-     * @param integer|string $objectId
-     * @param boolean        $ignorePost
-     * @param Campaign       $clonedEntity
-     * @param array          $currentSources
+     * @param int|string $objectId
+     * @param bool       $ignorePost
+     * @param Campaign   $clonedEntity
+     * @param array      $currentSources
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
@@ -534,7 +533,7 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
         $formData  = $this->request->request->get('campaign');
         $sessionId = isset($formData['sessionId']) ? $formData['sessionId'] : null;
         $session   = $this->get('session');
-        $isClone = false;
+        $isClone   = false;
         if ($clonedEntity instanceof Campaign) {
             $entity  = $clonedEntity;
             $isClone = true;
@@ -560,8 +559,8 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
             'contentTemplate' => 'MauticCampaignBundle:Campaign:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_campaign_index',
-                'mauticContent' => 'campaign'
-            ]
+                'mauticContent' => 'campaign',
+            ],
         ];
         //form not found
         if ($entity === null) {
@@ -573,9 +572,9 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.campaign.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -649,7 +648,7 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
 
                         if ($entity->getId() !== $objectId) {
                             // No longer a clone - this is important for Apply
-                            $isClone = false;
+                            $isClone  = false;
                             $objectId = $entity->getId();
                         }
 
@@ -662,9 +661,9 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
                                     'mautic_campaign_action',
                                     [
                                         'objectAction' => 'edit',
-                                        'objectId'     => $entity->getId()
+                                        'objectId'     => $entity->getId(),
                                     ]
-                                )
+                                ),
                             ]
                         );
                     }
@@ -686,7 +685,7 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
 
                 $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId'     => $entity->getId()
+                    'objectId'     => $entity->getId(),
                 ];
 
                 if (!$isClone) {
@@ -695,7 +694,7 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
                         [
                             'returnUrl'       => $this->generateUrl('mautic_campaign_action', $viewParameters),
                             'viewParameters'  => $viewParameters,
-                            'contentTemplate' => 'MauticCampaignBundle:Campaign:view'
+                            'contentTemplate' => 'MauticCampaignBundle:Campaign:view',
                         ]
                     );
                 } // else redirect to index since there is no view page for the cancelled clone
@@ -769,7 +768,7 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
                     $campaignSources[$type] = [
                         'sourceType' => $type,
                         'campaignId' => $objectId,
-                        'names'      => implode(', ', array_intersect_key($sourceList, $sources))
+                        'names'      => implode(', ', array_intersect_key($sourceList, $sources)),
                     ];
                 }
             }
@@ -777,14 +776,14 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'eventSettings'   => $eventSettings,
                     'campaignEvents'  => $campaignEvents,
                     'campaignSources' => $campaignSources,
                     'deletedEvents'   => $deletedEvents,
                     'tmpl'            => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                     'entity'          => $entity,
-                    'form'            => $form->createView()
+                    'form'            => $form->createView(),
                 ],
                 'contentTemplate' => 'MauticCampaignBundle:Campaign:form.html.php',
                 'passthroughVars' => [
@@ -794,16 +793,16 @@ public function editAction($objectId, $ignorePost = false, Campaign $clonedEntit
                         'mautic_campaign_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param $objectId
      *
@@ -883,9 +882,9 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -901,8 +900,8 @@ public function deleteAction($objectId)
             'contentTemplate' => 'MauticCampaignBundle:Campaign:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_campaign_index',
-                'mauticContent' => 'campaign'
-            ]
+                'mauticContent' => 'campaign',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -913,7 +912,7 @@ public function deleteAction($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.campaign.error.notfound',
-                    'msgVars' => ['%id%' => $objectId]
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->isGranted('campaign:campaigns:delete')) {
                 return $this->accessDenied();
@@ -929,8 +928,8 @@ public function deleteAction($objectId)
                 'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $identifier,
-                    '%id%'   => $objectId
-                ]
+                    '%id%'   => $objectId,
+                ],
             ];
         } //else don't do anything
 
@@ -938,14 +937,14 @@ public function deleteAction($objectId)
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -961,8 +960,8 @@ public function batchDeleteAction()
             'contentTemplate' => 'MauticCampaignBundle:Campaign:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_campaign_index',
-                'mauticContent' => 'campaign'
-            ]
+                'mauticContent' => 'campaign',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -978,7 +977,7 @@ public function batchDeleteAction()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.campaign.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->isGranted('campaign:campaigns:delete')) {
                     $flashes[] = $this->accessDenied(true);
@@ -997,8 +996,8 @@ public function batchDeleteAction()
                     'type'    => 'notice',
                     'msg'     => 'mautic.campaign.notice.batch_deleted',
                     'msgVars' => [
-                        '%count%' => count($entities)
-                    ]
+                        '%count%' => count($entities),
+                    ],
                 ];
             }
         } //else don't do anything
@@ -1007,14 +1006,14 @@ public function batchDeleteAction()
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Clear field and events from the session
+     * Clear field and events from the session.
      *
      * @param $id
      */
@@ -1030,7 +1029,7 @@ private function clearSessionComponents($id)
     }
 
     /**
-     * Get events from session
+     * Get events from session.
      *
      * @param $id
      *
@@ -1049,7 +1048,7 @@ private function getSessionEvents($id)
     }
 
     /**
-     * Set events to session
+     * Set events to session.
      *
      * @param $id
      * @param $events
@@ -1062,7 +1061,7 @@ private function setSessionEvents($id, $events)
     }
 
     /**
-     * Get events from session
+     * Get events from session.
      *
      * @param $id
      * @param $isClone
@@ -1081,7 +1080,6 @@ private function getSessionSources($id, $isClone = false)
                 // Clone hasn't saved the sources yet so return the current list as added
                 return [$currentSources, [], $currentSources];
             } else {
-
                 return [[], [], $currentSources];
             }
         }
@@ -1110,7 +1108,7 @@ private function getSessionSources($id, $isClone = false)
     }
 
     /**
-     * Set sources to session
+     * Set sources to session.
      *
      * @param $id
      * @param $sources
diff --git a/app/bundles/CampaignBundle/Controller/EventController.php b/app/bundles/CampaignBundle/Controller/EventController.php
index 7c7f65f2297..bdf55af5841 100644
--- a/app/bundles/CampaignBundle/Controller/EventController.php
+++ b/app/bundles/CampaignBundle/Controller/EventController.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Controller;
 
-use Mautic\CoreBundle\Controller\FormController as CommonFormController;
 use Mautic\CampaignBundle\Entity\Event;
+use Mautic\CoreBundle\Controller\FormController as CommonFormController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 class EventController extends CommonFormController
@@ -18,14 +19,14 @@ class EventController extends CommonFormController
     private $supportedEventTypes = ['decision', 'action', 'condition'];
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function newAction()
     {
         $success = 0;
-        $valid   = $cancelled = false;
+        $valid   = $cancelled   = false;
         $method  = $this->request->getMethod();
         $session = $this->get('session');
         if ($method == 'POST') {
@@ -44,7 +45,7 @@ public function newAction()
                 'type'       => $type,
                 'eventType'  => $eventType,
                 'campaignId' => $campaignId,
-                'anchor'     => $anchorName
+                'anchor'     => $anchorName,
             ];
         }
 
@@ -59,7 +60,7 @@ public function newAction()
             || !$this->get('mautic.security')->isGranted(
                 [
                     'campaign:campaigns:edit',
-                    'campaign:campaigns:create'
+                    'campaign:campaigns:create',
                 ],
                 'MATCH_ONE'
             )
@@ -68,13 +69,13 @@ public function newAction()
         }
 
         //fire the builder event
-        $events            = $this->getModel('campaign')->getEvents();
-        $form              = $this->get('form.factory')->create(
+        $events = $this->getModel('campaign')->getEvents();
+        $form   = $this->get('form.factory')->create(
             'campaignevent',
             $event,
             [
                 'action'   => $this->generateUrl('mautic_campaignevent_action', ['objectAction' => 'new']),
-                'settings' => $events[$eventType][$type]
+                'settings' => $events[$eventType][$type],
             ]
         );
         $event['settings'] = $events[$eventType][$type];
@@ -94,7 +95,7 @@ public function newAction()
                     $modifiedEvents = $session->get('mautic.campaign.'.$campaignId.'.events.modified');
                     $formData       = $form->getData();
                     $event          = array_merge($event, $formData);
-                    $event['id']    = $event['tempId'] = $keyId;
+                    $event['id']    = $event['tempId']    = $keyId;
                     if (empty($event['name'])) {
                         //set it to the event default
                         $event['name'] = $this->get('translator')->trans($event['settings']['label']);
@@ -117,7 +118,7 @@ public function newAction()
                 $formThemes[] = $event['settings']['formTheme'];
             }
 
-            $viewParams['form'] = $this->setFormTheme($form, 'MauticCampaignBundle:Campaign:index.html.php', $formThemes);;
+            $viewParams['form']             = $this->setFormTheme($form, 'MauticCampaignBundle:Campaign:index.html.php', $formThemes);
             $viewParams['eventHeader']      = $this->get('translator')->trans($event['settings']['label']);
             $viewParams['eventDescription'] = (!empty($event['settings']['description'])) ? $this->get('translator')->trans(
                 $event['settings']['description']
@@ -129,7 +130,7 @@ public function newAction()
         $passthroughVars = [
             'mauticContent' => 'campaignEvent',
             'success'       => $success,
-            'route'         => false
+            'route'         => false,
         ];
 
         if (!empty($keyId)) {
@@ -147,7 +148,7 @@ public function newAction()
                 [
                     'event'      => $event,
                     'id'         => $keyId,
-                    'campaignId' => $campaignId
+                    'campaignId' => $campaignId,
                 ]
             );
             $passthroughVars['eventType'] = $eventType;
@@ -165,7 +166,7 @@ public function newAction()
                         '%unit%'   => $translator->transChoice(
                             'mautic.campaign.event.intervalunit.'.$event['triggerIntervalUnit'],
                             $event['triggerInterval']
-                        )
+                        ),
                     ]
                 );
             } elseif ($event['triggerMode'] == 'date') {
@@ -180,7 +181,7 @@ public function newAction()
                     [
                         '%full%' => $dh->toFull($event['triggerDate']),
                         '%time%' => $dh->toTime($event['triggerDate']),
-                        '%date%' => $dh->toShort($event['triggerDate'])
+                        '%date%' => $dh->toShort($event['triggerDate']),
                     ]
                 );
             }
@@ -197,29 +198,29 @@ public function newAction()
                 [
                     'contentTemplate' => 'MauticCampaignBundle:Event:form.html.php',
                     'viewParameters'  => $viewParams,
-                    'passthroughVars' => $passthroughVars
+                    'passthroughVars' => $passthroughVars,
                 ]
             );
         }
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function editAction($objectId)
     {
-        $session        = $this->get('session');
-        $method         = $this->request->getMethod();
-        $campaignId     = ($method == "POST")
+        $session    = $this->get('session');
+        $method     = $this->request->getMethod();
+        $campaignId = ($method == 'POST')
             ? $this->request->request->get('campaignevent[campaignId]', '', true)
             : $this->request->query->get(
                 'campaignId'
             );
         $modifiedEvents = $session->get('mautic.campaign.'.$campaignId.'.events.modified', []);
         $success        = 0;
-        $valid          = $cancelled = false;
+        $valid          = $cancelled          = false;
         $event          = (array_key_exists($objectId, $modifiedEvents)) ? $modifiedEvents[$objectId] : null;
 
         if ($method == 'POST') {
@@ -240,7 +241,6 @@ public function editAction($objectId)
             $type      = $event['type'];
             $eventType = $event['eventType'];
             if (!in_array($eventType, $this->supportedEventTypes)) {
-
                 return $this->modalAccessDenied();
             }
 
@@ -249,7 +249,7 @@ public function editAction($objectId)
                 || !$this->get('mautic.security')->isGranted(
                     [
                         'campaign:campaigns:edit',
-                        'campaign:campaigns:create'
+                        'campaign:campaigns:create',
                     ],
                     'MATCH_ONE'
                 )
@@ -258,13 +258,13 @@ public function editAction($objectId)
             }
 
             //fire the builder event
-            $events            = $this->getModel('campaign')->getEvents();
-            $form              = $this->get('form.factory')->create(
+            $events = $this->getModel('campaign')->getEvents();
+            $form   = $this->get('form.factory')->create(
                 'campaignevent',
                 $event,
                 [
                     'action'   => $this->generateUrl('mautic_campaignevent_action', ['objectAction' => 'edit', 'objectId' => $objectId]),
-                    'settings' => $events[$eventType][$type]
+                    'settings' => $events[$eventType][$type],
                 ]
             );
             $event['settings'] = $events[$eventType][$type];
@@ -304,7 +304,7 @@ public function editAction($objectId)
                 if (isset($event['settings']['formTheme'])) {
                     $formThemes[] = $event['settings']['formTheme'];
                 }
-                $viewParams['form'] = $this->setFormTheme($form, 'MauticCampaignBundle:Campaign:index.html.php', $formThemes);
+                $viewParams['form']             = $this->setFormTheme($form, 'MauticCampaignBundle:Campaign:index.html.php', $formThemes);
                 $viewParams['eventHeader']      = $this->get('translator')->trans($event['settings']['label']);
                 $viewParams['eventDescription'] = (!empty($event['settings']['description'])) ? $this->get('translator')->trans(
                     $event['settings']['description']
@@ -316,7 +316,7 @@ public function editAction($objectId)
             $passthroughVars = [
                 'mauticContent' => 'campaignEvent',
                 'success'       => $success,
-                'route'         => false
+                'route'         => false,
             ];
 
             if ($closeModal) {
@@ -337,10 +337,10 @@ public function editAction($objectId)
                             'event'      => $event,
                             'id'         => $objectId,
                             'update'     => true,
-                            'campaignId' => $campaignId
+                            'campaignId' => $campaignId,
                         ]
                     );
-                    $passthroughVars['eventType']  = $eventType;
+                    $passthroughVars['eventType'] = $eventType;
 
                     $translator = $this->translator;
                     if ($event['triggerMode'] == 'interval') {
@@ -355,7 +355,7 @@ public function editAction($objectId)
                                 '%unit%'   => $translator->transChoice(
                                     'mautic.campaign.event.intervalunit.'.$event['triggerIntervalUnit'],
                                     $event['triggerInterval']
-                                )
+                                ),
                             ]
                         );
                     } elseif ($event['triggerMode'] == 'date') {
@@ -370,7 +370,7 @@ public function editAction($objectId)
                             [
                                 '%full%' => $dh->toFull($event['triggerDate']),
                                 '%time%' => $dh->toTime($event['triggerDate']),
-                                '%date%' => $dh->toShort($event['triggerDate'])
+                                '%date%' => $dh->toShort($event['triggerDate']),
                             ]
                         );
                     }
@@ -385,7 +385,7 @@ public function editAction($objectId)
                     [
                         'contentTemplate' => 'MauticCampaignBundle:Event:form.html.php',
                         'viewParameters'  => $viewParams,
-                        'passthroughVars' => $passthroughVars
+                        'passthroughVars' => $passthroughVars,
                     ]
                 );
             }
@@ -395,9 +395,9 @@ public function editAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -413,7 +413,7 @@ public function deleteAction($objectId)
             || !$this->get('mautic.security')->isGranted(
                 [
                     'campaign:campaigns:edit',
-                    'campaign:campaigns:create'
+                    'campaign:campaigns:create',
                 ],
                 'MATCH_ONE'
             )
@@ -439,7 +439,7 @@ public function deleteAction($objectId)
                 'route'         => false,
                 'eventId'       => $objectId,
                 'deleted'       => 1,
-                'event'         => $event
+                'event'         => $event,
             ];
         } else {
             $dataArray = ['success' => 0];
@@ -451,9 +451,9 @@ public function deleteAction($objectId)
     }
 
     /**
-     * Undeletes the entity
+     * Undeletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -469,7 +469,7 @@ public function undeleteAction($objectId)
             || !$this->get('mautic.security')->isGranted(
                 [
                     'campaign:campaigns:edit',
-                    'campaign:campaigns:create'
+                    'campaign:campaigns:create',
                 ],
                 'MATCH_ONE'
             )
@@ -508,9 +508,9 @@ public function undeleteAction($objectId)
                     [
                         'event'      => $event,
                         'id'         => $objectId,
-                        'campaignId' => $campaignId
+                        'campaignId' => $campaignId,
                     ]
-                )
+                ),
             ];
         } else {
             $dataArray = ['success' => 0];
diff --git a/app/bundles/CampaignBundle/Controller/SourceController.php b/app/bundles/CampaignBundle/Controller/SourceController.php
index 8766796ce1c..e369aeb0f4b 100644
--- a/app/bundles/CampaignBundle/Controller/SourceController.php
+++ b/app/bundles/CampaignBundle/Controller/SourceController.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Controller;
 
-use Mautic\CoreBundle\Controller\FormController as CommonFormController;
 use Mautic\CampaignBundle\Entity\Source;
+use Mautic\CoreBundle\Controller\FormController as CommonFormController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 class SourceController extends CommonFormController
 {
-    private $supportedSourceTypes = array('lists', 'forms');
+    private $supportedSourceTypes = ['lists', 'forms'];
 
     /**
      * @param int $objectId
@@ -25,7 +26,7 @@ class SourceController extends CommonFormController
     public function newAction($objectId = 0)
     {
         $success = 0;
-        $valid   = $cancelled = false;
+        $valid   = $cancelled   = false;
         $method  = $this->request->getMethod();
         $session = $this->get('session');
         if ($method == 'POST') {
@@ -33,9 +34,9 @@ public function newAction($objectId = 0)
             $sourceType = $source['sourceType'];
         } else {
             $sourceType = $this->request->query->get('sourceType');
-            $source     = array(
-                'sourceType' => $sourceType
-            );
+            $source     = [
+                'sourceType' => $sourceType,
+            ];
         }
 
         //set the sourceType key for sources
@@ -46,10 +47,10 @@ public function newAction($objectId = 0)
         //ajax only for form fields
         if (!$this->request->isXmlHttpRequest()
             || !$this->get('mautic.security')->isGranted(
-                array(
+                [
                     'campaign:campaigns:edit',
-                    'campaign:campaigns:create'
-                ),
+                    'campaign:campaigns:create',
+                ],
                 'MATCH_ONE'
             )
         ) {
@@ -60,10 +61,10 @@ public function newAction($objectId = 0)
         $form       = $this->get('form.factory')->create(
             'campaign_leadsource',
             $source,
-            array(
-                'action'         => $this->generateUrl('mautic_campaignsource_action', array('objectAction' => 'new', 'objectId' => $objectId)),
-                'source_choices' => $sourceList
-            )
+            [
+                'action'         => $this->generateUrl('mautic_campaignsource_action', ['objectAction' => 'new', 'objectId' => $objectId]),
+                'source_choices' => $sourceList,
+            ]
         );
 
         //Check for a submitted form and process it
@@ -81,21 +82,21 @@ public function newAction($objectId = 0)
             }
         }
 
-        $passthroughVars = array(
+        $passthroughVars = [
             'mauticContent' => 'campaignSource',
             'success'       => $success,
-            'route'         => false
-        );
+            'route'         => false,
+        ];
 
         if ($cancelled || $valid) {
             if ($valid) {
                 $passthroughVars['sourceHtml'] = $this->renderView(
                     'MauticCampaignBundle:Source:index.html.php',
-                    array(
+                    [
                         'sourceType' => $sourceType,
                         'campaignId' => $objectId,
-                        'names'      => implode(', ', array_intersect_key($sourceList, array_flip($modifiedSources[$sourceType])))
-                    )
+                        'names'      => implode(', ', array_intersect_key($sourceList, array_flip($modifiedSources[$sourceType]))),
+                    ]
                 );
                 $passthroughVars['sourceType'] = $sourceType;
             }
@@ -105,18 +106,17 @@ public function newAction($objectId = 0)
 
             return new JsonResponse($passthroughVars);
         } else {
-
-            $viewParams = array(
+            $viewParams = [
                 'sourceType' => $sourceType,
-                'form'       => $form->createView()
-            );
+                'form'       => $form->createView(),
+            ];
 
             return $this->ajaxAction(
-                array(
+                [
                     'contentTemplate' => 'MauticCampaignBundle:Source:form.html.php',
                     'viewParameters'  => $viewParams,
-                    'passthroughVars' => $passthroughVars
-                )
+                    'passthroughVars' => $passthroughVars,
+                ]
             );
         }
     }
@@ -130,20 +130,20 @@ public function editAction($objectId)
     {
         $session         = $this->get('session');
         $method          = $this->request->getMethod();
-        $selectedSources = $session->get('mautic.campaign.'.$objectId.'.leadsources.modified', array());
+        $selectedSources = $session->get('mautic.campaign.'.$objectId.'.leadsources.modified', []);
         if ($method == 'POST') {
             $source     = $this->request->request->get('campaign_leadsource');
             $sourceType = $source['sourceType'];
         } else {
             $sourceType = $this->request->query->get('sourceType');
-            $source     = array(
+            $source     = [
                 'sourceType' => $sourceType,
-                $sourceType  => $selectedSources[$sourceType]
-            );
+                $sourceType  => $selectedSources[$sourceType],
+            ];
         }
 
         $success = 0;
-        $valid   = $cancelled = false;
+        $valid   = $cancelled   = false;
 
         if (!in_array($sourceType, $this->supportedSourceTypes)) {
             return $this->modalAccessDenied();
@@ -152,10 +152,10 @@ public function editAction($objectId)
         //ajax only for form fields
         if (!$this->request->isXmlHttpRequest()
             || !$this->get('mautic.security')->isGranted(
-                array(
+                [
                     'campaign:campaigns:edit',
-                    'campaign:campaigns:create'
-                ),
+                    'campaign:campaigns:create',
+                ],
                 'MATCH_ONE'
             )
         ) {
@@ -166,10 +166,10 @@ public function editAction($objectId)
         $form       = $this->get('form.factory')->create(
             'campaign_leadsource',
             $source,
-            array(
-                'action'         => $this->generateUrl('mautic_campaignsource_action', array('objectAction' => 'edit', 'objectId' => $objectId)),
-                'source_choices' => $sourceList
-            )
+            [
+                'action'         => $this->generateUrl('mautic_campaignsource_action', ['objectAction' => 'edit', 'objectId' => $objectId]),
+                'source_choices' => $sourceList,
+            ]
         );
 
         //Check for a submitted form and process it
@@ -187,22 +187,22 @@ public function editAction($objectId)
             }
         }
 
-        $passthroughVars = array(
+        $passthroughVars = [
             'mauticContent' => 'campaignSource',
             'success'       => $success,
-            'route'         => false
-        );
+            'route'         => false,
+        ];
 
         if ($cancelled || $valid) {
             if ($valid) {
                 $passthroughVars['updateHtml'] = $this->renderView(
                     'MauticCampaignBundle:Source:index.html.php',
-                    array(
+                    [
                         'sourceType' => $sourceType,
                         'campaignId' => $objectId,
                         'names'      => implode(', ', array_intersect_key($sourceList, array_flip($modifiedSources[$sourceType]))),
-                        'update'     => true
-                    )
+                        'update'     => true,
+                    ]
                 );
                 $passthroughVars['sourceType'] = $sourceType;
             }
@@ -212,42 +212,41 @@ public function editAction($objectId)
 
             return new JsonResponse($passthroughVars);
         } else {
-
-            $viewParams = array(
+            $viewParams = [
                 'sourceType' => $sourceType,
-                'form'       => $form->createView()
-            );
+                'form'       => $form->createView(),
+            ];
 
             return $this->ajaxAction(
-                array(
+                [
                     'contentTemplate' => 'MauticCampaignBundle:Source:form.html.php',
                     'viewParameters'  => $viewParams,
-                    'passthroughVars' => $passthroughVars
-                )
+                    'passthroughVars' => $passthroughVars,
+                ]
             );
         }
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function deleteAction($objectId)
     {
         $session         = $this->get('session');
-        $modifiedSources = $session->get('mautic.campaign.'.$objectId.'.leadsources.modified', array());
+        $modifiedSources = $session->get('mautic.campaign.'.$objectId.'.leadsources.modified', []);
         $sourceType      = $this->request->get('sourceType');
 
         //ajax only for form fields
         if (!$this->request->isXmlHttpRequest()
             || !$this->get('mautic.security')->isGranted(
-                array(
+                [
                     'campaign:campaigns:edit',
-                    'campaign:campaigns:create'
-                ),
+                    'campaign:campaigns:create',
+                ],
                 'MATCH_ONE'
             )
         ) {
@@ -261,19 +260,19 @@ public function deleteAction($objectId)
                 $session->set('mautic.campaign.'.$objectId.'.leadsources.modified', $modifiedSources);
             }
 
-            $dataArray = array(
+            $dataArray = [
                 'mauticContent' => 'campaignSource',
                 'success'       => 1,
                 'route'         => false,
                 'sourceType'    => $sourceType,
-                'deleted'       => 1
-            );
+                'deleted'       => 1,
+            ];
         } else {
-            $dataArray = array('success' => 0);
+            $dataArray = ['success' => 0];
         }
 
         $response = new JsonResponse($dataArray);
 
         return $response;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Entity/Campaign.php b/app/bundles/CampaignBundle/Entity/Campaign.php
index 9953cfd16f5..12d17675b33 100644
--- a/app/bundles/CampaignBundle/Entity/Campaign.php
+++ b/app/bundles/CampaignBundle/Entity/Campaign.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,18 +17,14 @@
 use Mautic\CoreBundle\Entity\FormEntity;
 use Mautic\FormBundle\Entity\Form;
 use Mautic\LeadBundle\Entity\LeadList;
-use Mautic\LeadBundle\Form\Validator\Constraints\LeadListAccess;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Campaign
- *
- * @package Mautic\CampaignBundle\Entity
+ * Class Campaign.
  */
 class Campaign extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -81,12 +78,12 @@ class Campaign extends FormEntity
     /**
      * @var array
      */
-    private $canvasSettings = array();
+    private $canvasSettings = [];
 
     /**
-     * Constructor
+     * Constructor.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->events = new ArrayCollection();
         $this->leads  = new ArrayCollection();
@@ -94,9 +91,6 @@ public function __construct ()
         $this->forms  = new ArrayCollection();
     }
 
-    /**
-     *
-     */
     public function __clone()
     {
         $this->leads  = new ArrayCollection();
@@ -111,7 +105,7 @@ public function __clone()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -126,7 +120,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
 
         $builder->createOneToMany('events', 'Event')
             ->setIndexBy('id')
-            ->setOrderBy(array('order' => 'ASC'))
+            ->setOrderBy(['order' => 'ASC'])
             ->mappedBy('campaign')
             ->cascadeAll()
             ->fetchExtraLazy()
@@ -161,15 +155,15 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('name', new Assert\NotBlank(array(
-            'message' => 'mautic.core.name.required'
-        )));
+        $metadata->addPropertyConstraint('name', new Assert\NotBlank([
+            'message' => 'mautic.core.name.required',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -177,23 +171,23 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('campaign')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'category',
-                    'description'
-                )
+                    'description',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'publishUp',
                     'publishDown',
                     'events',
                     'leads',
                     'forms',
                     'lists',
-                    'canvasSettings'
-                )
+                    'canvasSettings',
+                ]
             )
             ->build();
     }
@@ -201,7 +195,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
@@ -209,42 +203,40 @@ public function convertToArray ()
     /**
      * @param string $prop
      * @param mixed  $val
-     *
-     * @return void
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'category') {
             $currentId = ($current) ? $current->getId() : '';
             $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
-                $this->changes[$prop] = array($currentId, $newId);
+                $this->changes[$prop] = [$currentId, $newId];
             }
         } elseif ($current != $val) {
-            $this->changes[$prop] = array($current, $val);
+            $this->changes[$prop] = [$current, $val];
         }
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Campaign
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -253,23 +245,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Campaign
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -278,27 +270,27 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Add events
+     * Add events.
      *
      * @param                                     $key
      * @param \Mautic\CampaignBundle\Entity\Event $event
      *
      * @return Campaign
      */
-    public function addEvent ($key, Event $event)
+    public function addEvent($key, Event $event)
     {
         if ($changes = $event->getChanges()) {
-            $this->changes['events']['added'][$key] = array($key, $changes);
+            $this->changes['events']['added'][$key] = [$key, $changes];
         }
         $this->events[$key] = $event;
 
@@ -306,11 +298,11 @@ public function addEvent ($key, Event $event)
     }
 
     /**
-     * Remove events
+     * Remove events.
      *
      * @param \Mautic\CampaignBundle\Entity\Event $event
      */
-    public function removeEvent (\Mautic\CampaignBundle\Entity\Event $event)
+    public function removeEvent(\Mautic\CampaignBundle\Entity\Event $event)
     {
         $this->changes['events']['removed'][$event->getId()] = $event->getName();
 
@@ -318,23 +310,23 @@ public function removeEvent (\Mautic\CampaignBundle\Entity\Event $event)
     }
 
     /**
-     * Get events
+     * Get events.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getEvents ()
+    public function getEvents()
     {
         return $this->events;
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
      *
      * @return Campaign
      */
-    public function setPublishUp ($publishUp)
+    public function setPublishUp($publishUp)
     {
         $this->isChanged('publishUp', $publishUp);
         $this->publishUp = $publishUp;
@@ -343,23 +335,23 @@ public function setPublishUp ($publishUp)
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
-    public function getPublishUp ()
+    public function getPublishUp()
     {
         return $this->publishUp;
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
      *
      * @return Campaign
      */
-    public function setPublishDown ($publishDown)
+    public function setPublishDown($publishDown)
     {
         $this->isChanged('publishDown', $publishDown);
         $this->publishDown = $publishDown;
@@ -368,11 +360,11 @@ public function setPublishDown ($publishDown)
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
-    public function getPublishDown ()
+    public function getPublishDown()
     {
         return $this->publishDown;
     }
@@ -380,7 +372,7 @@ public function getPublishDown ()
     /**
      * @return mixed
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
@@ -388,21 +380,21 @@ public function getCategory ()
     /**
      * @param mixed $category
      */
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->isChanged('category', $category);
         $this->category = $category;
     }
 
     /**
-     * Add lead
+     * Add lead.
      *
      * @param                                    $key
      * @param \Mautic\CampaignBundle\Entity\Lead $lead
      *
      * @return Campaign
      */
-    public function addLead ($key, Lead $lead)
+    public function addLead($key, Lead $lead)
     {
         $action     = ($this->leads->contains($lead)) ? 'updated' : 'added';
         $leadEntity = $lead->getLead();
@@ -414,11 +406,11 @@ public function addLead ($key, Lead $lead)
     }
 
     /**
-     * Remove lead
+     * Remove lead.
      *
      * @param Lead $lead
      */
-    public function removeLead (Lead $lead)
+    public function removeLead(Lead $lead)
     {
         $leadEntity                                              = $lead->getLead();
         $this->changes['leads']['removed'][$leadEntity->getId()] = $leadEntity->getPrimaryIdentifier();
@@ -426,11 +418,11 @@ public function removeLead (Lead $lead)
     }
 
     /**
-     * Get leads
+     * Get leads.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getLeads ()
+    public function getLeads()
     {
         return $this->leads;
     }
@@ -438,15 +430,16 @@ public function getLeads ()
     /**
      * @return ArrayCollection
      */
-    public function getLists ()
+    public function getLists()
     {
         return $this->lists;
     }
 
     /**
-     * Add list
+     * Add list.
      *
      * @param LeadList $list
+     *
      * @return Campaign
      */
     public function addList(LeadList $list)
@@ -459,7 +452,7 @@ public function addList(LeadList $list)
     }
 
     /**
-     * Remove list
+     * Remove list.
      *
      * @param LeadList $list
      */
@@ -478,7 +471,7 @@ public function getForms()
     }
 
     /**
-     * Add form
+     * Add form.
      *
      * @param Form $form
      *
@@ -494,7 +487,7 @@ public function addForm(Form $form)
     }
 
     /**
-     * Remove form
+     * Remove form.
      *
      * @param Form $form
      */
@@ -507,7 +500,7 @@ public function removeForm(Form $form)
     /**
      * @return mixed
      */
-    public function getCanvasSettings ()
+    public function getCanvasSettings()
     {
         return $this->canvasSettings;
     }
@@ -515,7 +508,7 @@ public function getCanvasSettings ()
     /**
      * @param array $canvasSettings
      */
-    public function setCanvasSettings (array $canvasSettings)
+    public function setCanvasSettings(array $canvasSettings)
     {
         $this->canvasSettings = $canvasSettings;
     }
diff --git a/app/bundles/CampaignBundle/Entity/CampaignRepository.php b/app/bundles/CampaignBundle/Entity/CampaignRepository.php
index 24fbf27bbe6..8288fefa3a3 100644
--- a/app/bundles/CampaignBundle/Entity/CampaignRepository.php
+++ b/app/bundles/CampaignBundle/Entity/CampaignRepository.php
@@ -1,34 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Entity;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class CampaignRepository
- *
- * @package Mautic\CampaignBundle\Entity
+ * Class CampaignRepository.
  */
 class CampaignRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this->getEntityManager()
             ->createQueryBuilder()
-            ->select($this->getTableAlias() . ', cat')
-            ->from('MauticCampaignBundle:Campaign', $this->getTableAlias(), $this->getTableAlias() . '.id')
+            ->select($this->getTableAlias().', cat')
+            ->from('MauticCampaignBundle:Campaign', $this->getTableAlias(), $this->getTableAlias().'.id')
             ->leftJoin($this->getTableAlias().'.category', 'cat');
 
         if (!empty($args['joinLists'])) {
@@ -54,33 +51,33 @@ public function deleteEntity($entity, $flush = true)
     {
         // Null parents of associated events first
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'campaign_events')
+        $q->update(MAUTIC_TABLE_PREFIX.'campaign_events')
             ->set('parent_id', ':null')
             ->setParameter('null', null)
-            ->where('campaign_id = ' . $entity->getId())
+            ->where('campaign_id = '.$entity->getId())
             ->execute();
 
         // Delete events
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
-        $q->delete(MAUTIC_TABLE_PREFIX . 'campaign_events')
-            ->where('campaign_id = ' . $entity->getId())
+        $q->delete(MAUTIC_TABLE_PREFIX.'campaign_events')
+            ->where('campaign_id = '.$entity->getId())
             ->execute();
 
         parent::deleteEntity($entity, $flush);
     }
 
     /**
-     * Returns a list of all published (and active) campaigns (optionally for a specific lead)
+     * Returns a list of all published (and active) campaigns (optionally for a specific lead).
      *
      * @param null $specificId
      * @param null $leadId
-     * @param bool $forList If true, returns ID and name only
+     * @param bool $forList    If true, returns ID and name only
      *
      * @return array
      */
     public function getPublishedCampaigns($specificId = null, $leadId = null, $forList = false)
     {
-        $q   = $this->getEntityManager()->createQueryBuilder()
+        $q = $this->getEntityManager()->createQueryBuilder()
             ->from('MauticCampaignBundle:Campaign', 'c', 'c.id');
 
         if ($forList && $leadId) {
@@ -116,11 +113,12 @@ public function getPublishedCampaigns($specificId = null, $leadId = null, $forLi
         }
 
         $results = $q->getQuery()->getArrayResult();
+
         return $results;
     }
 
     /**
-     * Returns a list of all published (and active) campaigns that specific lead lists are part of
+     * Returns a list of all published (and active) campaigns that specific lead lists are part of.
      *
      * @param int|array $leadLists
      *
@@ -129,7 +127,7 @@ public function getPublishedCampaigns($specificId = null, $leadId = null, $forLi
     public function getPublishedCampaignsByLeadLists($leadLists)
     {
         if (!is_array($leadLists)) {
-            $leadLists = array( (int) $leadLists);
+            $leadLists = [(int) $leadLists];
         } else {
             foreach ($leadLists as &$id) {
                 $id = (int) $id;
@@ -148,26 +146,26 @@ public function getPublishedCampaignsByLeadLists($leadLists)
         );
         $results = $q->execute()->fetchAll();
 
-        $campaigns = array();
+        $campaigns = [];
         foreach ($results as $result) {
             if (!isset($campaigns[$result['id']])) {
-                $campaigns[$result['id']] = array(
+                $campaigns[$result['id']] = [
                     'id'    => $result['id'],
                     'name'  => $result['name'],
-                    'lists' => array()
-                );
+                    'lists' => [],
+                ];
             }
 
-            $campaigns[$result['id']]['lists'][$result['list_id']] = array(
-                'id' => $result['list_id']
-            );
+            $campaigns[$result['id']]['lists'][$result['list_id']] = [
+                'id' => $result['list_id'],
+            ];
         }
 
         return $campaigns;
     }
 
     /**
-     * Get array of list IDs assigned to this campaign
+     * Get array of list IDs assigned to this campaign.
      *
      * @param null $id
      *
@@ -188,7 +186,7 @@ public function getCampaignListIds($id = null)
             $q->select('DISTINCT cl.leadlist_id');
         }
 
-        $lists  = array();
+        $lists   = [];
         $results = $q->execute()->fetchAll();
 
         foreach ($results as $r) {
@@ -199,7 +197,7 @@ public function getCampaignListIds($id = null)
     }
 
     /**
-     * Get array of list IDs => name assigned to this campaign
+     * Get array of list IDs => name assigned to this campaign.
      *
      * @param null $id
      *
@@ -215,7 +213,7 @@ public function getCampaignListSources($id)
             $q->expr()->eq('cl.campaign_id', $id)
         );
 
-        $lists  = array();
+        $lists   = [];
         $results = $q->execute()->fetchAll();
 
         foreach ($results as $r) {
@@ -226,7 +224,7 @@ public function getCampaignListSources($id)
     }
 
     /**
-     * Get array of form IDs => name assigned to this campaign
+     * Get array of form IDs => name assigned to this campaign.
      *
      * @param $id
      *
@@ -242,7 +240,7 @@ public function getCampaignFormSources($id)
             $q->expr()->eq('cf.campaign_id', $id)
         );
 
-        $forms   = array();
+        $forms   = [];
         $results = $q->execute()->fetchAll();
 
         foreach ($results as $r) {
@@ -281,19 +279,21 @@ public function getTableAlias()
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        return $this->addStandardCatchAllWhereClause($q, $filter, array(
+        return $this->addStandardCatchAllWhereClause($q, $filter, [
             'c.name',
-            'c.description'
-        ));
+            'c.description',
+        ]);
     }
 
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
@@ -310,14 +310,15 @@ public function getSearchCommands()
     }
 
     /**
-     * Get a list of popular (by logs) campaigns
+     * Get a list of popular (by logs) campaigns.
+     *
+     * @param int $limit
      *
-     * @param integer $limit
      * @return array
      */
     public function getPopularCampaigns($limit = 10)
     {
-        $q  = $this->getEntityManager()->getConnection()->createQueryBuilder();
+        $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
         $q->select('count(cl.ip_id) as hits, c.id AS campaign_id, c.name')
             ->from(MAUTIC_TABLE_PREFIX.'campaign_lead_event_log', 'cl')
@@ -333,7 +334,7 @@ public function getPopularCampaigns($limit = 10)
     }
 
     /**
-     * Returns leads that are part of a lead list that belongs to a campaign
+     * Returns leads that are part of a lead list that belongs to a campaign.
      *
      * @param       $id
      * @param array $lists
@@ -341,14 +342,14 @@ public function getPopularCampaigns($limit = 10)
      *
      * @return array|int
      */
-    public function getCampaignLeadsFromLists($id, array $lists, $args = array())
+    public function getCampaignLeadsFromLists($id, array $lists, $args = [])
     {
         $batchLimiters = (!array_key_exists('batchLimiters', $args)) ? false : $args['batchLimiters'];
         $countOnly     = (!array_key_exists('countOnly', $args)) ? false : $args['countOnly'];
         $start         = (!array_key_exists('start', $args)) ? false : $args['start'];
         $limit         = (!array_key_exists('limit', $args)) ? false : $args['limit'];
 
-        $leads = ($countOnly) ? 0 : array();
+        $leads = ($countOnly) ? 0 : [];
 
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
         if ($countOnly) {
@@ -409,10 +410,10 @@ public function getCampaignLeadsFromLists($id, array $lists, $args = array())
 
         foreach ($results as $r) {
             if ($countOnly) {
-                $leads = array(
+                $leads = [
                     'count' => $r['lead_count'],
-                    'maxId' => $r['max_id']
-                );
+                    'maxId' => $r['max_id'],
+                ];
             } else {
                 $leads[] = $r['id'];
             }
@@ -424,7 +425,7 @@ public function getCampaignLeadsFromLists($id, array $lists, $args = array())
     }
 
     /**
-     * Get leads that do not belong based on lead lists
+     * Get leads that do not belong based on lead lists.
      *
      * @param       $id
      * @param array $lists
@@ -432,14 +433,14 @@ public function getCampaignLeadsFromLists($id, array $lists, $args = array())
      *
      * @return array|int
      */
-    public function getCampaignOrphanLeads($id, array $lists, $args = array())
+    public function getCampaignOrphanLeads($id, array $lists, $args = [])
     {
         $batchLimiters = (!array_key_exists('batchLimiters', $args)) ? false : $args['batchLimiters'];
         $countOnly     = (!array_key_exists('countOnly', $args)) ? false : $args['countOnly'];
         $start         = (!array_key_exists('start', $args)) ? false : $args['start'];
         $limit         = (!array_key_exists('limit', $args)) ? false : $args['limit'];
 
-        $leads = ($countOnly) ? 0 : array();
+        $leads = ($countOnly) ? 0 : [];
 
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
         if ($countOnly) {
@@ -499,10 +500,10 @@ public function getCampaignOrphanLeads($id, array $lists, $args = array())
 
         foreach ($results as $r) {
             if ($countOnly) {
-                $leads = array(
+                $leads = [
                     'count' => $r['lead_count'],
-                    'maxId' => $r['max_id']
-                );
+                    'maxId' => $r['max_id'],
+                ];
             } else {
                 $leads[] = $r['id'];
             }
@@ -514,15 +515,15 @@ public function getCampaignOrphanLeads($id, array $lists, $args = array())
     }
 
     /**
-     * Get a count of leads that belong to the campaign
+     * Get a count of leads that belong to the campaign.
      *
      * @param       $campaignId
-     * @param int   $leadId         Optional lead ID to check if lead is part of campaign
-     * @param array $pendingEvents  List of specific events to rule out
+     * @param int   $leadId        Optional lead ID to check if lead is part of campaign
+     * @param array $pendingEvents List of specific events to rule out
      *
      * @return mixed
      */
-    public function getCampaignLeadCount($campaignId, $leadId = null, $pendingEvents = array())
+    public function getCampaignLeadCount($campaignId, $leadId = null, $pendingEvents = [])
     {
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
@@ -565,11 +566,11 @@ public function getCampaignLeadCount($campaignId, $leadId = null, $pendingEvents
     }
 
     /**
-     * Get lead IDs of a campaign
+     * Get lead IDs of a campaign.
      *
-     * @param       $campaignId
-     * @param int   $start
-     * @param bool|false  $limit
+     * @param            $campaignId
+     * @param int        $start
+     * @param bool|false $limit
      * @param bool|false  getCampaignLeadIds
      *
      * @return array
@@ -611,13 +612,13 @@ public function getCampaignLeadIds($campaignId, $start = 0, $limit = false, $pen
             $q->setMaxResults($limit);
         }
 
-        if (!$pendingOnly && $start){
+        if (!$pendingOnly && $start) {
             $q->setFirstResult($start);
         }
 
         $results = $q->execute()->fetchAll();
 
-        $leads = array();
+        $leads = [];
         foreach ($results as $r) {
             $leads[] = $r['lead_id'];
         }
@@ -628,7 +629,7 @@ public function getCampaignLeadIds($campaignId, $start = 0, $limit = false, $pen
     }
 
     /**
-     * Get lead data of a campaign
+     * Get lead data of a campaign.
      *
      * @param            $campaignId
      * @param int        $start
@@ -637,7 +638,7 @@ public function getCampaignLeadIds($campaignId, $start = 0, $limit = false, $pen
      *
      * @return mixed
      */
-    public function getCampaignLeads($campaignId, $start = 0, $limit = false, $select = array('cl.lead_id'))
+    public function getCampaignLeads($campaignId, $start = 0, $limit = false, $select = ['cl.lead_id'])
     {
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
diff --git a/app/bundles/CampaignBundle/Entity/Event.php b/app/bundles/CampaignBundle/Entity/Event.php
index 6c4d957f5da..9e5d0f0af4b 100644
--- a/app/bundles/CampaignBundle/Entity/Event.php
+++ b/app/bundles/CampaignBundle/Entity/Event.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,10 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class Event
- *
- * @package Mautic\CampaignBundle\Entity
+ * Class Event.
  */
 class Event
 {
-
     /**
      * @var int
      */
@@ -55,7 +53,7 @@ class Event
     /**
      * @var array
      */
-    private $properties = array();
+    private $properties = [];
 
     /**
      * @var null|\DateTime
@@ -112,14 +110,14 @@ class Event
      */
     private $changes;
 
-    public function __construct ()
+    public function __construct()
     {
         $this->log      = new ArrayCollection();
         $this->children = new ArrayCollection();
     }
 
     /**
-     * Clean up after clone
+     * Clean up after clone.
      */
     public function __clone()
     {
@@ -131,7 +129,7 @@ public function __clone()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -186,7 +184,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
 
         $builder->createOneToMany('children', 'Event')
             ->setIndexBy('id')
-            ->setOrderBy(array('order' => 'ASC'))
+            ->setOrderBy(['order' => 'ASC'])
             ->mappedBy('parent')
             ->build();
 
@@ -212,12 +210,10 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->cascadeRemove()
             ->fetchExtraLazy()
             ->build();
-
-
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -225,7 +221,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('campaign')
             ->addProperties(
-                array(
+                [
                     'id',
                     'name',
                     'description',
@@ -239,8 +235,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'triggerMode',
                     'children',
                     'parent',
-                    'decisionPath'
-                )
+                    'decisionPath',
+                ]
             )
             ->setMaxDepth(1, 'parent')
             ->build();
@@ -249,50 +245,48 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @param string $prop
      * @param mixed  $val
-     *
-     * @return void
      */
-    private function isChanged ($prop, $val)
+    private function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'category' || $prop == 'parent') {
             $currentId = ($current) ? $current->getId() : '';
             $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
-                $this->changes[$prop] = array($currentId, $newId);
+                $this->changes[$prop] = [$currentId, $newId];
             }
         } elseif ($this->$prop != $val) {
-            $this->changes[$prop] = array($this->$prop, $val);
+            $this->changes[$prop] = [$this->$prop, $val];
         }
     }
 
     /**
      * @return mixed
      */
-    public function getChanges ()
+    public function getChanges()
     {
         return $this->changes;
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set order
+     * Set order.
      *
-     * @param integer $order
+     * @param int $order
      *
      * @return Event
      */
-    public function setOrder ($order)
+    public function setOrder($order)
     {
         $this->isChanged('order', $order);
 
@@ -302,23 +296,23 @@ public function setOrder ($order)
     }
 
     /**
-     * Get order
+     * Get order.
      *
-     * @return integer
+     * @return int
      */
-    public function getOrder ()
+    public function getOrder()
     {
         return $this->order;
     }
 
     /**
-     * Set properties
+     * Set properties.
      *
      * @param array $properties
      *
      * @return Event
      */
-    public function setProperties ($properties)
+    public function setProperties($properties)
     {
         $this->isChanged('properties', $properties);
 
@@ -328,23 +322,23 @@ public function setProperties ($properties)
     }
 
     /**
-     * Get properties
+     * Get properties.
      *
      * @return array
      */
-    public function getProperties ()
+    public function getProperties()
     {
         return $this->properties;
     }
 
     /**
-     * Set campaign
+     * Set campaign.
      *
      * @param \Mautic\CampaignBundle\Entity\Campaign $campaign
      *
      * @return Event
      */
-    public function setCampaign (\Mautic\CampaignBundle\Entity\Campaign $campaign)
+    public function setCampaign(\Mautic\CampaignBundle\Entity\Campaign $campaign)
     {
         $this->campaign = $campaign;
 
@@ -352,23 +346,23 @@ public function setCampaign (\Mautic\CampaignBundle\Entity\Campaign $campaign)
     }
 
     /**
-     * Get campaign
+     * Get campaign.
      *
      * @return \Mautic\CampaignBundle\Entity\Campaign
      */
-    public function getCampaign ()
+    public function getCampaign()
     {
         return $this->campaign;
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
      * @return Event
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->isChanged('type', $type);
         $this->type = $type;
@@ -377,11 +371,11 @@ public function setType ($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
@@ -389,19 +383,19 @@ public function getType ()
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Event
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -410,23 +404,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Event
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -435,23 +429,23 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Add log
+     * Add log.
      *
      * @param LeadEventLog $log
      *
      * @return Event
      */
-    public function addLog (LeadEventLog $log)
+    public function addLog(LeadEventLog $log)
     {
         $this->log[] = $log;
 
@@ -459,33 +453,33 @@ public function addLog (LeadEventLog $log)
     }
 
     /**
-     * Remove log
+     * Remove log.
      *
      * @param LeadEventLog $log
      */
-    public function removeLog (LeadEventLog $log)
+    public function removeLog(LeadEventLog $log)
     {
         $this->log->removeElement($log);
     }
 
     /**
-     * Get log
+     * Get log.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getLog ()
+    public function getLog()
     {
         return $this->log;
     }
 
     /**
-     * Add children
+     * Add children.
      *
      * @param \Mautic\CampaignBundle\Entity\Event $children
      *
      * @return Event
      */
-    public function addChild (\Mautic\CampaignBundle\Entity\Event $children)
+    public function addChild(\Mautic\CampaignBundle\Entity\Event $children)
     {
         $this->children[] = $children;
 
@@ -493,33 +487,33 @@ public function addChild (\Mautic\CampaignBundle\Entity\Event $children)
     }
 
     /**
-     * Remove children
+     * Remove children.
      *
      * @param \Mautic\CampaignBundle\Entity\Event $children
      */
-    public function removeChild (\Mautic\CampaignBundle\Entity\Event $children)
+    public function removeChild(\Mautic\CampaignBundle\Entity\Event $children)
     {
         $this->children->removeElement($children);
     }
 
     /**
-     * Get children
+     * Get children.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getChildren ()
+    public function getChildren()
     {
         return $this->children;
     }
 
     /**
-     * Set parent
+     * Set parent.
      *
      * @param \Mautic\CampaignBundle\Entity\Event $parent
      *
      * @return Event
      */
-    public function setParent (\Mautic\CampaignBundle\Entity\Event $parent = null)
+    public function setParent(\Mautic\CampaignBundle\Entity\Event $parent = null)
     {
         $this->isChanged('parent', $parent);
         $this->parent = $parent;
@@ -528,20 +522,20 @@ public function setParent (\Mautic\CampaignBundle\Entity\Event $parent = null)
     }
 
     /**
-     * Remove parent
+     * Remove parent.
      */
-    public function removeParent ()
+    public function removeParent()
     {
         $this->isChanged('parent', '');
         $this->parent = null;
     }
 
     /**
-     * Get parent
+     * Get parent.
      *
      * @return \Mautic\CampaignBundle\Entity\Event
      */
-    public function getParent ()
+    public function getParent()
     {
         return $this->parent;
     }
@@ -549,7 +543,7 @@ public function getParent ()
     /**
      * @return mixed
      */
-    public function getTriggerDate ()
+    public function getTriggerDate()
     {
         return $this->triggerDate;
     }
@@ -557,24 +551,24 @@ public function getTriggerDate ()
     /**
      * @param mixed $triggerDate
      */
-    public function setTriggerDate ($triggerDate)
+    public function setTriggerDate($triggerDate)
     {
         $this->isChanged('triggerDate', $triggerDate);
         $this->triggerDate = $triggerDate;
     }
 
     /**
-     * @return integer
+     * @return int
      */
-    public function getTriggerInterval ()
+    public function getTriggerInterval()
     {
         return $this->triggerInterval;
     }
 
     /**
-     * @param integer $triggerInterval
+     * @param int $triggerInterval
      */
-    public function setTriggerInterval ($triggerInterval)
+    public function setTriggerInterval($triggerInterval)
     {
         $this->isChanged('triggerInterval', $triggerInterval);
         $this->triggerInterval = $triggerInterval;
@@ -583,7 +577,7 @@ public function setTriggerInterval ($triggerInterval)
     /**
      * @return mixed
      */
-    public function getTriggerIntervalUnit ()
+    public function getTriggerIntervalUnit()
     {
         return $this->triggerIntervalUnit;
     }
@@ -591,7 +585,7 @@ public function getTriggerIntervalUnit ()
     /**
      * @param mixed $triggerIntervalUnit
      */
-    public function setTriggerIntervalUnit ($triggerIntervalUnit)
+    public function setTriggerIntervalUnit($triggerIntervalUnit)
     {
         $this->isChanged('triggerIntervalUnit', $triggerIntervalUnit);
         $this->triggerIntervalUnit = $triggerIntervalUnit;
@@ -600,7 +594,7 @@ public function setTriggerIntervalUnit ($triggerIntervalUnit)
     /**
      * @return mixed
      */
-    public function getEventType ()
+    public function getEventType()
     {
         return $this->eventType;
     }
@@ -608,7 +602,7 @@ public function getEventType ()
     /**
      * @param mixed $eventType
      */
-    public function setEventType ($eventType)
+    public function setEventType($eventType)
     {
         $this->eventType = $eventType;
     }
@@ -616,7 +610,7 @@ public function setEventType ($eventType)
     /**
      * @return mixed
      */
-    public function getTriggerMode ()
+    public function getTriggerMode()
     {
         return $this->triggerMode;
     }
@@ -624,7 +618,7 @@ public function getTriggerMode ()
     /**
      * @param mixed $triggerMode
      */
-    public function setTriggerMode ($triggerMode)
+    public function setTriggerMode($triggerMode)
     {
         $this->triggerMode = $triggerMode;
     }
@@ -632,7 +626,7 @@ public function setTriggerMode ($triggerMode)
     /**
      * @return mixed
      */
-    public function getDecisionPath ()
+    public function getDecisionPath()
     {
         return $this->decisionPath;
     }
@@ -640,7 +634,7 @@ public function getDecisionPath ()
     /**
      * @param mixed $decisionPath
      */
-    public function setDecisionPath ($decisionPath)
+    public function setDecisionPath($decisionPath)
     {
         $this->decisionPath = $decisionPath;
     }
@@ -648,7 +642,7 @@ public function setDecisionPath ($decisionPath)
     /**
      * @return mixed
      */
-    public function getTempId ()
+    public function getTempId()
     {
         return $this->tempId;
     }
@@ -656,7 +650,7 @@ public function getTempId ()
     /**
      * @param mixed $tempId
      */
-    public function setTempId ($tempId)
+    public function setTempId($tempId)
     {
         $this->tempId = $tempId;
     }
diff --git a/app/bundles/CampaignBundle/Entity/EventRepository.php b/app/bundles/CampaignBundle/Entity/EventRepository.php
index 847b1fb8049..f384ca46c13 100644
--- a/app/bundles/CampaignBundle/Entity/EventRepository.php
+++ b/app/bundles/CampaignBundle/Entity/EventRepository.php
@@ -1,31 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\LeadBundle\Entity\Lead as RealLead;
 
 /**
- * EventRepository
+ * EventRepository.
  */
 class EventRepository extends CommonRepository
 {
-
     /**
-     * Get a list of entities
+     * Get a list of entities.
      *
      * @param array $args
      *
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('e')
@@ -40,11 +39,12 @@ public function getEntities($args = array())
     }
 
     /**
-     * Get array of published events based on type
+     * Get array of published events based on type.
+     *
      * @param       $type
      * @param array $campaigns
-     * @param null  $leadId             If included, only events that have not been triggered by the lead yet will be included
-     * @param bool  $positivePathOnly   If negative, all events including those with a negative path will be returned
+     * @param null  $leadId           If included, only events that have not been triggered by the lead yet will be included
+     * @param bool  $positivePathOnly If negative, all events including those with a negative path will be returned
      *
      * @return array
      */
@@ -99,13 +99,12 @@ public function getPublishedByType($type, array $campaigns = null, $leadId = nul
                     $q->expr()->isNull('e.decisionPath')
                 )
             );
-
         }
 
         $results = $q->getQuery()->getArrayResult();
 
         //group them by campaign
-        $events = array();
+        $events = [];
         foreach ($results as $r) {
             $events[$r['campaign']['id']][$r['id']] = $r;
         }
@@ -114,7 +113,7 @@ public function getPublishedByType($type, array $campaigns = null, $leadId = nul
     }
 
     /**
-     * Get array of events by parent
+     * Get array of events by parent.
      *
      * @param      $parentId
      * @param null $decisionPath
@@ -142,7 +141,7 @@ public function getEventsByParent($parentId, $decisionPath = null)
     }
 
     /**
-     * Get the top level events for a campaign
+     * Get the top level events for a campaign.
      *
      * @param $id
      * @param $includeDecisions
@@ -174,7 +173,7 @@ public function getRootLevelEvents($id, $includeDecisions = false)
     }
 
     /**
-     * Gets ids of leads who have already triggered the event
+     * Gets ids of leads who have already triggered the event.
      *
      * @param $events
      * @param $leadId
@@ -200,7 +199,7 @@ public function getEventLogLeads($events, $leadId = null)
 
         $results = $q->execute()->fetchAll();
 
-        $log = array();
+        $log = [];
         foreach ($results as $r) {
             $log[] = $r['lead_id'];
         }
@@ -211,7 +210,7 @@ public function getEventLogLeads($events, $leadId = null)
     }
 
     /**
-     * Get an array of events that have been triggered by this lead
+     * Get an array of events that have been triggered by this lead.
      *
      * @param $leadId
      *
@@ -230,7 +229,7 @@ public function getLeadTriggeredEvents($leadId)
 
         $results = $q->getQuery()->getArrayResult();
 
-        $return = array();
+        $return = [];
         foreach ($results as $r) {
             $return[$r['id']] = $r;
         }
@@ -239,7 +238,7 @@ public function getLeadTriggeredEvents($leadId)
     }
 
     /**
-     * Get a list of scheduled events
+     * Get a list of scheduled events.
      *
      * @param      $campaignId
      * @param bool $count
@@ -284,7 +283,7 @@ public function getScheduledEvents($campaignId, $count = false, $limit = 0)
         $results = $q->getQuery()->getArrayResult();
 
         // Organize by lead
-        $leads = array();
+        $leads = [];
         foreach ($results as $e) {
             $leads[$e['lead_id']][$e['event_id']] = $e;
         }
@@ -311,7 +310,7 @@ public function getCampaignEvents($campaignId)
         $results = $q->getQuery()->getArrayResult();
 
         // Fix the parent ID
-        $events = array();
+        $events = [];
         foreach ($results as $id => $r) {
             $r[0]['parent_id'] = $r[1];
             $events[$id]       = $r[0];
@@ -322,13 +321,13 @@ public function getCampaignEvents($campaignId)
     }
 
     /**
-     * Get array of events with stats
+     * Get array of events with stats.
      *
      * @param array $args
      *
      * @return array
      */
-    public function getEvents($args = array())
+    public function getEvents($args = [])
     {
         $q = $this->createQueryBuilder('e')
             ->select('e, ec, ep')
@@ -352,7 +351,6 @@ public function getEvents($args = array())
                     $q->expr()->isNull('e.decisionPath')
                 )
             );
-
         }
 
         $events = $q->getQuery()->getArrayResult();
@@ -371,7 +369,7 @@ public function getCampaignActionAndConditionEvents($campaignId)
         $q->select('e')
             ->from('MauticCampaignBundle:Event', 'e', 'e.id')
             ->where($q->expr()->eq('IDENTITY(e.campaign)', (int) $campaignId))
-            ->andWhere($q->expr()->in('e.eventType', array('action', 'condition')));
+            ->andWhere($q->expr()->in('e.eventType', ['action', 'condition']));
 
         $events = $q->getQuery()->getArrayResult();
 
@@ -379,7 +377,7 @@ public function getCampaignActionAndConditionEvents($campaignId)
     }
 
     /**
-     * Get the non-action log
+     * Get the non-action log.
      *
      * @param            $campaignId
      * @param array      $leads
@@ -389,7 +387,7 @@ public function getCampaignActionAndConditionEvents($campaignId)
      *
      * @return array
      */
-    public function getEventLog($campaignId, $leads = array(), $havingEvents = array(), $excludeEvents = array(), $excludeScheduledFromHavingEvents = false)
+    public function getEventLog($campaignId, $leads = [], $havingEvents = [], $excludeEvents = [], $excludeScheduledFromHavingEvents = false)
     {
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
@@ -454,7 +452,7 @@ public function getEventLog($campaignId, $leads = array(), $havingEvents = array
 
         $results = $q->execute()->fetchAll();
 
-        $log = array();
+        $log = [];
         foreach ($results as $r) {
             $leadId  = $r['lead_id'];
             $eventId = $r['event_id'];
@@ -471,7 +469,7 @@ public function getEventLog($campaignId, $leads = array(), $havingEvents = array
     }
 
     /**
-     * Null event parents in preparation for deleting a campaign
+     * Null event parents in preparation for deleting a campaign.
      *
      * @param $campaignId
      */
@@ -479,13 +477,13 @@ public function nullEventParents($campaignId)
     {
         $this->getEntityManager()->getConnection()->update(
             MAUTIC_TABLE_PREFIX.'campaign_events',
-            array('parent_id' => null),
-            array('campaign_id' => (int) $campaignId)
+            ['parent_id'   => null],
+            ['campaign_id' => (int) $campaignId]
         );
     }
 
     /**
-     * Null event parents in preparation for deleting events from a campaign
+     * Null event parents in preparation for deleting events from a campaign.
      *
      * @param $campaignId
      */
diff --git a/app/bundles/CampaignBundle/Entity/Lead.php b/app/bundles/CampaignBundle/Entity/Lead.php
index f0f82094682..191fad9f755 100644
--- a/app/bundles/CampaignBundle/Entity/Lead.php
+++ b/app/bundles/CampaignBundle/Entity/Lead.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class Lead
- *
- * @package Mautic\CampaignBundle\Entity
+ * Class Lead.
  */
 class Lead
 {
-
     /**
      * @var Campaign
      */
@@ -48,7 +46,7 @@ class Lead
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -79,7 +77,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return \DateTime
      */
-    public function getDateAdded ()
+    public function getDateAdded()
     {
         return $this->dateAdded;
     }
@@ -87,7 +85,7 @@ public function getDateAdded ()
     /**
      * @param \DateTime $date
      */
-    public function setDateAdded ($date)
+    public function setDateAdded($date)
     {
         $this->dateAdded = $date;
     }
@@ -95,7 +93,7 @@ public function setDateAdded ($date)
     /**
      * @return mixed
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -103,7 +101,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead ($lead)
+    public function setLead($lead)
     {
         $this->lead = $lead;
     }
@@ -111,7 +109,7 @@ public function setLead ($lead)
     /**
      * @return Campaign
      */
-    public function getCampaign ()
+    public function getCampaign()
     {
         return $this->campaign;
     }
@@ -119,7 +117,7 @@ public function getCampaign ()
     /**
      * @param Campaign $campaign
      */
-    public function setCampaign ($campaign)
+    public function setCampaign($campaign)
     {
         $this->campaign = $campaign;
     }
@@ -127,7 +125,7 @@ public function setCampaign ($campaign)
     /**
      * @return bool
      */
-    public function getManuallyRemoved ()
+    public function getManuallyRemoved()
     {
         return $this->manuallyRemoved;
     }
@@ -135,7 +133,7 @@ public function getManuallyRemoved ()
     /**
      * @param bool $manuallyRemoved
      */
-    public function setManuallyRemoved ($manuallyRemoved)
+    public function setManuallyRemoved($manuallyRemoved)
     {
         $this->manuallyRemoved = $manuallyRemoved;
     }
@@ -143,7 +141,7 @@ public function setManuallyRemoved ($manuallyRemoved)
     /**
      * @return bool
      */
-    public function wasManuallyRemoved ()
+    public function wasManuallyRemoved()
     {
         return $this->manuallyRemoved;
     }
@@ -151,7 +149,7 @@ public function wasManuallyRemoved ()
     /**
      * @return bool
      */
-    public function getManuallyAdded ()
+    public function getManuallyAdded()
     {
         return $this->manuallyAdded;
     }
@@ -159,7 +157,7 @@ public function getManuallyAdded ()
     /**
      * @param bool $manuallyAdded
      */
-    public function setManuallyAdded ($manuallyAdded)
+    public function setManuallyAdded($manuallyAdded)
     {
         $this->manuallyAdded = $manuallyAdded;
     }
@@ -167,8 +165,8 @@ public function setManuallyAdded ($manuallyAdded)
     /**
      * @return bool
      */
-    public function wasManuallyAdded ()
+    public function wasManuallyAdded()
     {
         return $this->manuallyAdded;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Entity/LeadEventLog.php b/app/bundles/CampaignBundle/Entity/LeadEventLog.php
index 87ed0d417f1..a1c047f2d95 100644
--- a/app/bundles/CampaignBundle/Entity/LeadEventLog.php
+++ b/app/bundles/CampaignBundle/Entity/LeadEventLog.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class LeadEventLog
- *
- * @package Mautic\CampaignBundle\Entity
+ * Class LeadEventLog.
  */
 class LeadEventLog
 {
-
     /**
      * @var Event
      */
@@ -63,7 +61,7 @@ class LeadEventLog
     /**
      * @var array
      */
-    private $metadata = array();
+    private $metadata = [];
 
     /**
      * @var bool
@@ -83,7 +81,7 @@ class LeadEventLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -129,7 +127,6 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->nullable()
             ->build();
 
-
         $builder->addNullableField('channel', 'string');
         $builder->addNamedField('channelId', 'integer', 'channel_id', true);
 
@@ -139,7 +136,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return \DateTime
      */
-    public function getDateTriggered ()
+    public function getDateTriggered()
     {
         return $this->dateTriggered;
     }
@@ -147,7 +144,7 @@ public function getDateTriggered ()
     /**
      * @param \DateTime $dateTriggered
      */
-    public function setDateTriggered ($dateTriggered)
+    public function setDateTriggered($dateTriggered)
     {
         $this->dateTriggered = $dateTriggered;
     }
@@ -155,7 +152,7 @@ public function setDateTriggered ($dateTriggered)
     /**
      * @return \Mautic\CoreBundle\Entity\IpAddress
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
@@ -163,7 +160,7 @@ public function getIpAddress ()
     /**
      * @param \Mautic\CoreBundle\Entity\IpAddress $ipAddress
      */
-    public function setIpAddress ($ipAddress)
+    public function setIpAddress($ipAddress)
     {
         $this->ipAddress = $ipAddress;
     }
@@ -171,7 +168,7 @@ public function setIpAddress ($ipAddress)
     /**
      * @return mixed
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -179,7 +176,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead ($lead)
+    public function setLead($lead)
     {
         $this->lead = $lead;
     }
@@ -187,7 +184,7 @@ public function setLead ($lead)
     /**
      * @return mixed
      */
-    public function getEvent ()
+    public function getEvent()
     {
         return $this->event;
     }
@@ -195,7 +192,7 @@ public function getEvent ()
     /**
      * @param mixed $event
      */
-    public function setEvent ($event)
+    public function setEvent($event)
     {
         $this->event = $event;
     }
@@ -203,7 +200,7 @@ public function setEvent ($event)
     /**
      * @return bool
      */
-    public function getIsScheduled ()
+    public function getIsScheduled()
     {
         return $this->isScheduled;
     }
@@ -211,7 +208,7 @@ public function getIsScheduled ()
     /**
      * @param bool $isScheduled
      */
-    public function setIsScheduled ($isScheduled)
+    public function setIsScheduled($isScheduled)
     {
         $this->isScheduled = $isScheduled;
     }
@@ -219,7 +216,7 @@ public function setIsScheduled ($isScheduled)
     /**
      * @return mixed
      */
-    public function getTriggerDate ()
+    public function getTriggerDate()
     {
         return $this->triggerDate;
     }
@@ -227,7 +224,7 @@ public function getTriggerDate ()
     /**
      * @param mixed $triggerDate
      */
-    public function setTriggerDate ($triggerDate)
+    public function setTriggerDate($triggerDate)
     {
         $this->triggerDate = $triggerDate;
     }
@@ -235,7 +232,7 @@ public function setTriggerDate ($triggerDate)
     /**
      * @return mixed
      */
-    public function getCampaign ()
+    public function getCampaign()
     {
         return $this->campaign;
     }
@@ -243,7 +240,7 @@ public function getCampaign ()
     /**
      * @param mixed $campaign
      */
-    public function setCampaign ($campaign)
+    public function setCampaign($campaign)
     {
         $this->campaign = $campaign;
     }
@@ -251,7 +248,7 @@ public function setCampaign ($campaign)
     /**
      * @return bool
      */
-    public function getSystemTriggered ()
+    public function getSystemTriggered()
     {
         return $this->systemTriggered;
     }
@@ -259,7 +256,7 @@ public function getSystemTriggered ()
     /**
      * @param bool $systemTriggered
      */
-    public function setSystemTriggered ($systemTriggered)
+    public function setSystemTriggered($systemTriggered)
     {
         $this->systemTriggered = $systemTriggered;
     }
@@ -295,7 +292,7 @@ public function setMetadata($metadata)
     {
         if (!is_array($metadata)) {
             // Assumed output for timeline
-            $metadata = array('timeline' => $metadata);
+            $metadata = ['timeline' => $metadata];
         }
 
         $this->metadata = $metadata;
diff --git a/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php b/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php
index 31c38d696be..928e56451b4 100644
--- a/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php
+++ b/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Entity;
 
+use Doctrine\ORM\EntityRepository;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\LeadBundle\Entity\TimelineTrait;
 use Mautic\UserBundle\Entity\User;
-use Doctrine\ORM\EntityRepository;
 
 /**
- * LeadEventLogRepository
+ * LeadEventLogRepository.
  */
 class LeadEventLogRepository extends EntityRepository
 {
@@ -27,28 +28,27 @@ class LeadEventLogRepository extends EntityRepository
     protected $currentUser;
 
     /**
-     * Set the current user (i.e. from security context) for use within repositories
+     * Set the current user (i.e. from security context) for use within repositories.
      *
      * @param User $user
-     *
-     * @return void
      */
     public function setCurrentUser(User $user)
     {
         $this->currentUser = $user;
     }
 
-	/**
-     * Get a lead's page event log
+    /**
+     * Get a lead's page event log.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getLeadLogs($leadId, array $options = array())
+    public function getLeadLogs($leadId, array $options = [])
     {
         $query = $this->getEntityManager()
             ->getConnection()
@@ -69,17 +69,17 @@ public function getLeadLogs($leadId, array $options = array())
             ->from(MAUTIC_TABLE_PREFIX.'campaign_lead_event_log', 'll')
             ->leftJoin('ll', MAUTIC_TABLE_PREFIX.'campaign_events', 'e', 'll.event_id = e.id')
             ->leftJoin('ll', MAUTIC_TABLE_PREFIX.'campaigns', 'c', 'll.campaign_id = c.id')
-            ->where('ll.lead_id = ' . (int) $leadId)
+            ->where('ll.lead_id = '.(int) $leadId)
             ->andWhere('e.event_type = :eventType')
             ->andWhere('ll.metadata NOT LIKE \'%{s:6:"failed";i:1%\'')
             ->setParameter('eventType', 'action');
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere($query->expr()->orX(
-                $query->expr()->like('e.name', $query->expr()->literal('%' . $options['search'] . '%')),
-                $query->expr()->like('e.description', $query->expr()->literal('%' . $options['search'] . '%')),
-                $query->expr()->like('c.name', $query->expr()->literal('%' . $options['search'] . '%')),
-                $query->expr()->like('c.description', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('e.name', $query->expr()->literal('%'.$options['search'].'%')),
+                $query->expr()->like('e.description', $query->expr()->literal('%'.$options['search'].'%')),
+                $query->expr()->like('c.name', $query->expr()->literal('%'.$options['search'].'%')),
+                $query->expr()->like('c.description', $query->expr()->literal('%'.$options['search'].'%'))
             ));
         }
 
@@ -94,17 +94,18 @@ public function getLeadLogs($leadId, array $options = array())
     }
 
     /**
-     * Get a lead's upcoming events
+     * Get a lead's upcoming events.
      *
      * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getUpcomingEvents(array $options = null)
     {
-        $leadIps = array();
+        $leadIps = [];
 
         $query = $this->_em->getConnection()->createQueryBuilder();
         $today = new DateTimeHelper();
@@ -158,7 +159,7 @@ public function getUpcomingEvents(array $options = null)
         $query->orderBy('ll.trigger_date');
 
         if (!empty($ipIds)) {
-            $query->orWhere('ll.ip_address IN (' . implode(',', $ipIds) . ')');
+            $query->orWhere('ll.ip_address IN ('.implode(',', $ipIds).')');
         }
 
         if (!empty($options['canViewOthers']) && isset($this->currentUser)) {
@@ -201,7 +202,7 @@ public function getCampaignLogCounts($campaignId, $excludeScheduled = false)
 
         $results = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
 
         //group by event id
         foreach ($results as $l) {
@@ -218,15 +219,15 @@ public function getCampaignLogCounts($campaignId, $excludeScheduled = false)
     public function removeScheduledEvents($campaignId, $leadId)
     {
         $conn = $this->_em->getConnection();
-        $conn->delete(MAUTIC_TABLE_PREFIX.'campaign_lead_event_log', array(
-            'lead_id'     => (int) $leadId,
-            'campaign_id' => (int) $campaignId,
-            'is_scheduled' => 1
-        ));
+        $conn->delete(MAUTIC_TABLE_PREFIX.'campaign_lead_event_log', [
+            'lead_id'      => (int) $leadId,
+            'campaign_id'  => (int) $campaignId,
+            'is_scheduled' => 1,
+        ]);
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -240,7 +241,7 @@ public function updateLead($fromLeadId, $toLeadId)
             ->where('cl.lead_id = '.$toLeadId)
             ->execute()
             ->fetchAll();
-        $exists = array();
+        $exists = [];
         foreach ($results as $r) {
             $exists[] = $r['event_id'];
         }
diff --git a/app/bundles/CampaignBundle/Entity/LeadRepository.php b/app/bundles/CampaignBundle/Entity/LeadRepository.php
index a5efbff2df3..7f40568b93d 100644
--- a/app/bundles/CampaignBundle/Entity/LeadRepository.php
+++ b/app/bundles/CampaignBundle/Entity/LeadRepository.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * LeadRepository
+ * LeadRepository.
  */
 class LeadRepository extends CommonRepository
 {
     /**
-     * Get the details of leads added to a campaign
+     * Get the details of leads added to a campaign.
      *
      * @param      $campaignId
      * @param null $leads
@@ -44,7 +44,7 @@ public function getLeadDetails($campaignId, $leads = null)
 
         $results = $q->getQuery()->getArrayResult();
 
-        $return = array();
+        $return = [];
         foreach ($results as $r) {
             $return[$r['lead_id']][] = $r;
         }
@@ -53,7 +53,7 @@ public function getLeadDetails($campaignId, $leads = null)
     }
 
     /**
-     * Get leads for a specific campaign
+     * Get leads for a specific campaign.
      *
      * @deprecated  2.1.0; Use MauticLeadBundle\Entity\LeadRepository\getEntityContacts() instead
      *
@@ -63,7 +63,6 @@ public function getLeadDetails($campaignId, $leads = null)
      */
     public function getLeadsWithFields($args)
     {
-
         return $this->getEntityManager()->getRepository('MauticLeadBundle:Lead')->getEntityContacts(
             $args,
             'campaign_leads',
@@ -74,7 +73,7 @@ public function getLeadsWithFields($args)
     }
 
     /**
-     * Get leads for a specific campaign
+     * Get leads for a specific campaign.
      *
      * @param      $campaignId
      * @param null $eventId
@@ -117,7 +116,7 @@ public function getLeads($campaignId, $eventId = null)
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -127,19 +126,19 @@ public function updateLead($fromLeadId, $toLeadId)
         // First check to ensure the $toLead doesn't already exist
         $results = $this->getEntityManager()->getConnection()->createQueryBuilder()
             ->select('cl.campaign_id')
-            ->from(MAUTIC_TABLE_PREFIX . 'campaign_leads', 'cl')
-            ->where('cl.lead_id = ' . $toLeadId)
+            ->from(MAUTIC_TABLE_PREFIX.'campaign_leads', 'cl')
+            ->where('cl.lead_id = '.$toLeadId)
             ->execute()
             ->fetchAll();
-        $campaigns = array();
+        $campaigns = [];
         foreach ($results as $r) {
             $campaigns[] = $r['campaign_id'];
         }
 
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'campaign_leads')
-            ->set('lead_id', (int)$toLeadId)
-            ->where('lead_id = ' . (int)$fromLeadId);
+        $q->update(MAUTIC_TABLE_PREFIX.'campaign_leads')
+            ->set('lead_id', (int) $toLeadId)
+            ->where('lead_id = '.(int) $fromLeadId);
 
         if (!empty($campaigns)) {
             $q->andWhere(
@@ -148,8 +147,8 @@ public function updateLead($fromLeadId, $toLeadId)
 
             // Delete remaining leads as the new lead already belongs
             $this->getEntityManager()->getConnection()->createQueryBuilder()
-                ->delete(MAUTIC_TABLE_PREFIX . 'campaign_leads')
-                ->where('lead_id = ' . (int)$fromLeadId)
+                ->delete(MAUTIC_TABLE_PREFIX.'campaign_leads')
+                ->where('lead_id = '.(int) $fromLeadId)
                 ->execute();
         } else {
             $q->execute();
diff --git a/app/bundles/CampaignBundle/Event/CampaignBuilderEvent.php b/app/bundles/CampaignBundle/Event/CampaignBuilderEvent.php
index 00ac6b1f9ad..186384f4249 100644
--- a/app/bundles/CampaignBundle/Event/CampaignBuilderEvent.php
+++ b/app/bundles/CampaignBundle/Event/CampaignBuilderEvent.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Event;
 
 use Mautic\CoreBundle\Event\ComponentValidationTrait;
-use Symfony\Component\Process\Exception\InvalidArgumentException;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\Process\Exception\InvalidArgumentException;
 
 /**
- * Class CampaignBuilderEvent
- *
- * @package Mautic\CampaignBundle\Event
+ * Class CampaignBuilderEvent.
  */
 class CampaignBuilderEvent extends Event
 {
@@ -55,16 +54,16 @@ public function __construct($translator)
      *
      * @param string $key      a unique identifier; it is recommended that it be namespaced i.e. lead.mytrigger
      * @param array  $decision can contain the following keys:
-     *               $decision = [
-     *                  'label'              => (required) what to display in the list
-     *                  'eventName'          => (required) The event name to fire when this event is triggered.
-     *                  'description'        => (optional) short description of event
-     *                  'formType'           => (optional) name of the form type SERVICE for the action
-     *                  'formTypeOptions'    => (optional) array of options to pass to the formType service
-     *                  'formTheme'          => (optional) form theme
-     *                  'associatedActions'  => (optional) Array of action types to limit what this decision can be associated with
-     *                  'anchorRestrictions' => (optional) Array of event anchors this event should not be allowed to connect to
-     *               ]
+     *                         $decision = [
+     *                         'label'              => (required) what to display in the list
+     *                         'eventName'          => (required) The event name to fire when this event is triggered.
+     *                         'description'        => (optional) short description of event
+     *                         'formType'           => (optional) name of the form type SERVICE for the action
+     *                         'formTypeOptions'    => (optional) array of options to pass to the formType service
+     *                         'formTheme'          => (optional) form theme
+     *                         'associatedActions'  => (optional) Array of action types to limit what this decision can be associated with
+     *                         'anchorRestrictions' => (optional) Array of event anchors this event should not be allowed to connect to
+     *                         ]
      */
     public function addDecision($key, array $decision)
     {
@@ -86,7 +85,7 @@ public function addDecision($key, array $decision)
     }
 
     /**
-     * Get decisions
+     * Get decisions.
      *
      * @return mixed
      */
@@ -136,14 +135,14 @@ public function getLeadDecisions()
      *
      * @param string $key       a unique identifier; it is recommended that it be namespaced i.e. lead.mytrigger
      * @param array  $condition can contain the following keys:
-     *               $condition = [
-     *                   'label'           => (required) what to display in the list
-     *                   'eventName'       => (required) The event name to fire when this event is triggered.
-     *                   'description'     => (optional) short description of event
-     *                   'formType'        => (optional) name of the form type SERVICE for the action
-     *                   'formTypeOptions' => (optional) array of options to pass to the formType service
-     *                   'formTheme'       => (optional) form theme
-     *               ]
+     *                          $condition = [
+     *                          'label'           => (required) what to display in the list
+     *                          'eventName'       => (required) The event name to fire when this event is triggered.
+     *                          'description'     => (optional) short description of event
+     *                          'formType'        => (optional) name of the form type SERVICE for the action
+     *                          'formTypeOptions' => (optional) array of options to pass to the formType service
+     *                          'formTheme'       => (optional) form theme
+     *                          ]
      */
     public function addCondition($key, array $event)
     {
@@ -165,7 +164,7 @@ public function addCondition($key, array $event)
     }
 
     /**
-     * Get lead conditions
+     * Get lead conditions.
      *
      * @return array
      */
@@ -213,19 +212,19 @@ public function getLeadConditions()
     /**
      * Add an action to the list of available .
      *
-     * @param string $key       a unique identifier; it is recommended that it be namespaced i.e. lead.action
-     * @param array  $action    can contain the following keys:
-     *               $action = [
-     *                   'label'               => (required) what to display in the list
-     *                   'eventName'           => (required) The event to fire when this event is triggered.
-     *                   'description'         => (optional) short description of event
-     *                   'formType'            => (optional) name of the form type SERVICE for the action
-     *                   'formTypeOptions'     => (optional) array of options to pass to the formType service
-     *                   'formTheme'           => (optional) form theme
-     *                   'timelineTemplate'    => (optional) custom template for the lead timeline
-     *                   'associatedDecisions' => (optional) Array of decision types to limit what this action can be associated with
-     *                   'anchorRestrictions'  => (optional) Array of event anchors this event should not be allowed to connect to
-     *               ]
+     * @param string $key    a unique identifier; it is recommended that it be namespaced i.e. lead.action
+     * @param array  $action can contain the following keys:
+     *                       $action = [
+     *                       'label'               => (required) what to display in the list
+     *                       'eventName'           => (required) The event to fire when this event is triggered.
+     *                       'description'         => (optional) short description of event
+     *                       'formType'            => (optional) name of the form type SERVICE for the action
+     *                       'formTypeOptions'     => (optional) array of options to pass to the formType service
+     *                       'formTheme'           => (optional) form theme
+     *                       'timelineTemplate'    => (optional) custom template for the lead timeline
+     *                       'associatedDecisions' => (optional) Array of decision types to limit what this action can be associated with
+     *                       'anchorRestrictions'  => (optional) Array of event anchors this event should not be allowed to connect to
+     *                       ]
      */
     public function addAction($key, array $action)
     {
@@ -248,7 +247,7 @@ public function addAction($key, array $action)
     }
 
     /**
-     * Get actions
+     * Get actions.
      *
      * @return array
      */
diff --git a/app/bundles/CampaignBundle/Event/CampaignDecisionEvent.php b/app/bundles/CampaignBundle/Event/CampaignDecisionEvent.php
index ddb8d517ee7..061ca0d7f8a 100644
--- a/app/bundles/CampaignBundle/Event/CampaignDecisionEvent.php
+++ b/app/bundles/CampaignBundle/Event/CampaignDecisionEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,9 +13,7 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class CampaignDecisionEvent
- *
- * @package Mautic\CampaignBundle\Event
+ * Class CampaignDecisionEvent.
  */
 class CampaignDecisionEvent extends Event
 {
@@ -85,10 +84,8 @@ public function getDecisionEventDetails()
     public function getEventSettings($eventType = null, $type = null)
     {
         if ($type) {
-
             return (!empty($this->eventSettings[$eventType][$type])) ? $this->eventSettings[$eventType][$type] : false;
         } elseif ($eventType) {
-
             return (!empty($this->eventSettings[$eventType])) ? $this->eventSettings[$eventType] : false;
         }
 
@@ -106,7 +103,7 @@ public function isRootLevel()
     }
 
     /**
-     * Set if the decision has already been triggered and if so, child events will be executed
+     * Set if the decision has already been triggered and if so, child events will be executed.
      *
      * @param bool|true $triggered
      */
@@ -116,7 +113,7 @@ public function setDecisionAlreadyTriggered($triggered = true)
     }
 
     /**
-     * Returns if the decision has already been triggered
+     * Returns if the decision has already been triggered.
      *
      * @return mixed
      */
@@ -124,4 +121,4 @@ public function wasDecisionTriggered()
     {
         return $this->decisionTriggered;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Event/CampaignEvent.php b/app/bundles/CampaignBundle/Event/CampaignEvent.php
index 31f85c45799..cb77e8ad704 100644
--- a/app/bundles/CampaignBundle/Event/CampaignEvent.php
+++ b/app/bundles/CampaignBundle/Event/CampaignEvent.php
@@ -1,36 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Event;
 
-use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\CampaignBundle\Entity\Campaign;
+use Mautic\CoreBundle\Event\CommonEvent;
 
 /**
- * Class CampaignEvent
- *
- * @package Mautic\CampaignBundle\Event
+ * Class CampaignEvent.
  */
 class CampaignEvent extends CommonEvent
 {
     /**
      * @param Campaign $campaign
-     * @param bool $isNew
+     * @param bool     $isNew
      */
     public function __construct(Campaign &$campaign, $isNew = false)
     {
-        $this->entity  =& $campaign;
-        $this->isNew = $isNew;
+        $this->entity = &$campaign;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Campaign entity
+     * Returns the Campaign entity.
      *
      * @return Campaign
      */
@@ -40,7 +39,7 @@ public function getCampaign()
     }
 
     /**
-     * Sets the Campaign entity
+     * Sets the Campaign entity.
      *
      * @param Campaign $campaign
      */
@@ -48,4 +47,4 @@ public function setCampaign(Campaign $campaign)
     {
         $this->entity = $campaign;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Event/CampaignExecutionEvent.php b/app/bundles/CampaignBundle/Event/CampaignExecutionEvent.php
index 5bde61b572b..ace680c11ea 100644
--- a/app/bundles/CampaignBundle/Event/CampaignExecutionEvent.php
+++ b/app/bundles/CampaignBundle/Event/CampaignExecutionEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class CampaignExecutionEvent
+ * Class CampaignExecutionEvent.
  */
 class CampaignExecutionEvent extends Event
 {
@@ -136,13 +137,13 @@ public function setResult($result)
     }
 
     /**
-     * Set the result to failed
+     * Set the result to failed.
      */
     public function setFailed($reason = null)
     {
         $this->result = [
             'failed' => 1,
-            'reason' => $reason
+            'reason' => $reason,
         ];
     }
 
@@ -155,7 +156,7 @@ public function getEventSettings()
     }
 
     /**
-     * Set a custom log entry to override auto-handling of the log entry
+     * Set a custom log entry to override auto-handling of the log entry.
      *
      * @param LeadEventLog $log
      */
@@ -174,7 +175,7 @@ public function getLogEntry()
     }
 
     /**
-     * Returns if a listener updated the log entry
+     * Returns if a listener updated the log entry.
      *
      * @return bool
      */
@@ -184,13 +185,13 @@ public function wasLogUpdatedByListener()
     }
 
     /**
-     * Check if an event is applicable
+     * Check if an event is applicable.
      *
      * @param $eventType
      */
     public function checkContext($eventType)
     {
-        return (strtolower($eventType) == strtolower($this->event['type']));
+        return strtolower($eventType) == strtolower($this->event['type']);
     }
 
     /**
@@ -205,4 +206,4 @@ public function setChannel($channel, $channelId = null)
                 ->setChannelId($channelId);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Event/CampaignLeadChangeEvent.php b/app/bundles/CampaignBundle/Event/CampaignLeadChangeEvent.php
index 620405724f3..dc4e77ba23a 100644
--- a/app/bundles/CampaignBundle/Event/CampaignLeadChangeEvent.php
+++ b/app/bundles/CampaignBundle/Event/CampaignLeadChangeEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,7 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class CampaignLeadChangeEvent
- *
- * @package Mautic\CampaignBundle\Event
+ * Class CampaignLeadChangeEvent.
  */
 class CampaignLeadChangeEvent extends Event
 {
@@ -48,7 +47,7 @@ public function __construct(Campaign &$campaign, Lead $lead, $action)
     }
 
     /**
-     * Returns the Campaign entity
+     * Returns the Campaign entity.
      *
      * @return Campaign
      */
@@ -58,7 +57,7 @@ public function getCampaign()
     }
 
     /**
-     * Returns the Lead entity
+     * Returns the Lead entity.
      *
      * @return Lead
      */
@@ -68,7 +67,7 @@ public function getLead()
     }
 
     /**
-     * Returns added or removed
+     * Returns added or removed.
      *
      * @return mixed
      */
@@ -78,22 +77,22 @@ public function getAction()
     }
 
     /**
-     * Lead was removed from the campaign
+     * Lead was removed from the campaign.
      *
      * @return bool
      */
     public function wasRemoved()
     {
-        return ($this->action == 'removed');
+        return $this->action == 'removed';
     }
 
     /**
-     * Lead was added to the campaign
+     * Lead was added to the campaign.
      *
      * @return bool
      */
     public function wasAdded()
     {
-        return ($this->action == 'added');
+        return $this->action == 'added';
     }
 }
diff --git a/app/bundles/CampaignBundle/Event/CampaignScheduledEvent.php b/app/bundles/CampaignBundle/Event/CampaignScheduledEvent.php
index cc38f208335..28aba9bc428 100644
--- a/app/bundles/CampaignBundle/Event/CampaignScheduledEvent.php
+++ b/app/bundles/CampaignBundle/Event/CampaignScheduledEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class CampaignScheduledEvent
+ * Class CampaignScheduledEvent.
  */
 class CampaignScheduledEvent extends Event
 {
@@ -52,7 +53,7 @@ class CampaignScheduledEvent extends Event
     protected $eventSettings;
 
     /**
-     * Construct
+     * Construct.
      *
      * @param $args
      */
@@ -122,4 +123,4 @@ public function getEventSettings()
     {
         return $this->eventSettings;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/EventListener/CalendarSubscriber.php b/app/bundles/CampaignBundle/EventListener/CalendarSubscriber.php
index 1306944dc68..70cd2cb45fe 100644
--- a/app/bundles/CampaignBundle/EventListener/CalendarSubscriber.php
+++ b/app/bundles/CampaignBundle/EventListener/CalendarSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CampaignBundle\EventListener;
 
 use Mautic\CalendarBundle\CalendarEvents;
@@ -14,45 +16,41 @@
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class CalendarSubscriber
- *
- * @package Mautic\CampaignBundle\EventListener
+ * Class CalendarSubscriber.
  */
 class CalendarSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CalendarEvents::CALENDAR_ON_GENERATE => array('onCalendarGenerate', 0)
-        );
+        return [
+            CalendarEvents::CALENDAR_ON_GENERATE => ['onCalendarGenerate', 0],
+        ];
     }
 
     /**
-     * Adds events to the calendar
+     * Adds events to the calendar.
      *
      * @param CalendarGeneratorEvent $event
-     *
-     * @return void
      */
     public function onCalendarGenerate(CalendarGeneratorEvent $event)
     {
-        $dates  = $event->getDates();
-        $now    = new DateTimeHelper;
+        $dates = $event->getDates();
+        $now   = new DateTimeHelper();
 
-        $commonSelect = 'cl.campaign_id, c.name AS campaign_name, l.firstname, l.lastname, ce.type AS event_type, ce.name as event_name, cat.color';
-        $eventTypes = array();
-        $eventTypes['triggered'] = array('dateName' => 'cl.date_triggered');
-        $eventTypes['upcoming']  = array('dateName' => 'cl.trigger_date');
+        $commonSelect            = 'cl.campaign_id, c.name AS campaign_name, l.firstname, l.lastname, ce.type AS event_type, ce.name as event_name, cat.color';
+        $eventTypes              = [];
+        $eventTypes['triggered'] = ['dateName' => 'cl.date_triggered'];
+        $eventTypes['upcoming']  = ['dateName' => 'cl.trigger_date'];
 
         $query = $this->em->getConnection()->createQueryBuilder();
-        $query->from(MAUTIC_TABLE_PREFIX . 'campaign_lead_event_log', 'cl')
-            ->leftJoin('cl', MAUTIC_TABLE_PREFIX . 'campaigns', 'c', 'cl.campaign_id = c.id')
-            ->leftJoin('cl', MAUTIC_TABLE_PREFIX . 'leads', 'l', 'cl.lead_id = l.id')
-            ->leftJoin('cl', MAUTIC_TABLE_PREFIX . 'campaign_events', 'ce', 'cl.event_id = ce.id')
-            ->leftJoin('cl', MAUTIC_TABLE_PREFIX . 'categories', 'cat', 'cat.id = c.category_id AND cat.bundle=:bundle')
+        $query->from(MAUTIC_TABLE_PREFIX.'campaign_lead_event_log', 'cl')
+            ->leftJoin('cl', MAUTIC_TABLE_PREFIX.'campaigns', 'c', 'cl.campaign_id = c.id')
+            ->leftJoin('cl', MAUTIC_TABLE_PREFIX.'leads', 'l', 'cl.lead_id = l.id')
+            ->leftJoin('cl', MAUTIC_TABLE_PREFIX.'campaign_events', 'ce', 'cl.event_id = ce.id')
+            ->leftJoin('cl', MAUTIC_TABLE_PREFIX.'categories', 'cat', 'cat.id = c.category_id AND cat.bundle=:bundle')
             ->setParameter('bundle', 'campaign')
             ->setParameter('start', $dates['start_date'])
             ->setParameter('end', $dates['end_date'])
@@ -60,7 +58,7 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
             ->setMaxResults(50);
 
         foreach ($eventTypes as $eventKey => $eventType) {
-            $query->select($commonSelect . ', ' . $eventType['dateName'] . ' AS start')
+            $query->select($commonSelect.', '.$eventType['dateName'].' AS start')
                 ->where($query->expr()->andX(
                     $query->expr()->gte($eventType['dateName'], ':start'),
                     $query->expr()->lte($eventType['dateName'], ':end')
@@ -75,16 +73,16 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
             // We need to convert the date to a ISO8601 compliant string
             foreach ($results as &$object) {
                 if ($object['firstname'] || $object['lastname']) {
-                    $leadName = $object['firstname'] . ' ' . $object['lastname'];
+                    $leadName = $object['firstname'].' '.$object['lastname'];
                 } else {
                     $leadName = $this->translator->trans('mautic.lead.lead.anonymous');
                 }
-                $date = new DateTimeHelper($object['start']);
-                $object['start'] = $date->toLocalString(\DateTime::ISO8601);
-                $object['url']   = $this->router->generate('mautic_campaign_action', array('objectAction' => 'view', 'objectId' => $object['campaign_id']), true);
-                $object['attr']  = 'data-toggle="ajax"';
-                $object['description'] = $this->translator->trans('mautic.campaign.event.' . $eventKey . '.description', array('%campaign%' => $object['campaign_name'], '%lead%' => $leadName));
-                $object['title'] = $this->translator->trans('mautic.campaign.event.' . $eventKey, array('%event%' => $object['event_name']));
+                $date                  = new DateTimeHelper($object['start']);
+                $object['start']       = $date->toLocalString(\DateTime::ISO8601);
+                $object['url']         = $this->router->generate('mautic_campaign_action', ['objectAction' => 'view', 'objectId' => $object['campaign_id']], true);
+                $object['attr']        = 'data-toggle="ajax"';
+                $object['description'] = $this->translator->trans('mautic.campaign.event.'.$eventKey.'.description', ['%campaign%' => $object['campaign_name'], '%lead%' => $leadName]);
+                $object['title']       = $this->translator->trans('mautic.campaign.event.'.$eventKey, ['%event%' => $object['event_name']]);
             }
 
             $event->addEvents($results);
diff --git a/app/bundles/CampaignBundle/EventListener/CampaignSubscriber.php b/app/bundles/CampaignBundle/EventListener/CampaignSubscriber.php
index b15debf3ce2..ad3a1c1b458 100644
--- a/app/bundles/CampaignBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/CampaignBundle/EventListener/CampaignSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CampaignBundle\Event as Events;
 use Mautic\CampaignBundle\CampaignEvents;
+use Mautic\CampaignBundle\Event as Events;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 
 /**
- * Class CampaignSubscriber
- *
- * @package Mautic\CampaignBundle\EventListener
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -47,77 +46,77 @@ public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $audit
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CampaignEvents::CAMPAIGN_POST_SAVE     => array('onCampaignPostSave', 0),
-            CampaignEvents::CAMPAIGN_POST_DELETE   => array('onCampaignDelete', 0),
-            CampaignEvents::CAMPAIGN_ON_BUILD      => array('onCampaignBuild', 0)
-        );
+        return [
+            CampaignEvents::CAMPAIGN_POST_SAVE   => ['onCampaignPostSave', 0],
+            CampaignEvents::CAMPAIGN_POST_DELETE => ['onCampaignDelete', 0],
+            CampaignEvents::CAMPAIGN_ON_BUILD    => ['onCampaignBuild', 0],
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\CampaignEvent $event
      */
     public function onCampaignPostSave(Events\CampaignEvent $event)
     {
         $campaign = $event->getCampaign();
-        $details = $event->getChanges();
+        $details  = $event->getChanges();
 
         //don't set leads
         unset($details['leads']);
 
         if (!empty($details)) {
-            $log = array(
-                "bundle"    => "campaign",
-                "object"    => "campaign",
-                "objectId"  => $campaign->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'campaign',
+                'object'    => 'campaign',
+                'objectId'  => $campaign->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\CampaignEvent $event
      */
     public function onCampaignDelete(Events\CampaignEvent $event)
     {
         $campaign = $event->getCampaign();
-        $log = array(
-            "bundle"     => "campaign",
-            "object"     => "campaign",
-            "objectId"   => $campaign->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $campaign->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log      = [
+            'bundle'    => 'campaign',
+            'object'    => 'campaign',
+            'objectId'  => $campaign->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $campaign->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 
     /**
-     * Add event triggers and actions
+     * Add event triggers and actions.
      *
      * @param Events\CampaignBuilderEvent $event
      */
     public function onCampaignBuild(Events\CampaignBuilderEvent $event)
     {
         //Add action to actually add/remove lead to a specific lists
-        $addRemoveLeadAction = array(
+        $addRemoveLeadAction = [
             'label'           => 'mautic.campaign.event.addremovelead',
             'description'     => 'mautic.campaign.event.addremovelead_descr',
             'formType'        => 'campaignevent_addremovelead',
-            'formTypeOptions' => array(
-                'include_this' => true
-            ),
-            'callback'        => '\Mautic\CampaignBundle\Helper\CampaignEventHelper::addRemoveLead'
-        );
+            'formTypeOptions' => [
+                'include_this' => true,
+            ],
+            'callback' => '\Mautic\CampaignBundle\Helper\CampaignEventHelper::addRemoveLead',
+        ];
         $event->addAction('campaign.addremovelead', $addRemoveLeadAction);
     }
 }
diff --git a/app/bundles/CampaignBundle/EventListener/ConfigSubscriber.php b/app/bundles/CampaignBundle/EventListener/ConfigSubscriber.php
index 198d786b66d..41d088e12c2 100644
--- a/app/bundles/CampaignBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/CampaignBundle/EventListener/ConfigSubscriber.php
@@ -1,25 +1,26 @@
 <?php
+
 namespace Mautic\CampaignBundle\EventListener;
 
-use Mautic\ConfigBundle\Event\ConfigEvent;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\ConfigBundle\Event\ConfigEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class ConfigSubscriber
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE => array('onConfigGenerate', 0),
-            ConfigEvents::CONFIG_PRE_SAVE    => array('onConfigSave', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+            ConfigEvents::CONFIG_PRE_SAVE    => ['onConfigSave', 0],
+        ];
     }
 
     /**
@@ -28,12 +29,12 @@ static public function getSubscribedEvents()
     public function onConfigGenerate(ConfigBuilderEvent $event)
     {
         $event->addForm(
-            array(
+            [
                 'bundle'     => 'CampaignBundle',
                 'formAlias'  => 'campaignconfig',
                 'formTheme'  => 'MauticCampaignBundle:FormTheme\Config',
-                'parameters' => $event->getParametersFromConfig('MauticCampaignBundle')
-            )
+                'parameters' => $event->getParametersFromConfig('MauticCampaignBundle'),
+            ]
         );
     }
 
@@ -53,4 +54,4 @@ public function onConfigSave(ConfigEvent $event)
         // Set updated values
         $event->setConfig($values);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/EventListener/DashboardSubscriber.php b/app/bundles/CampaignBundle/EventListener/DashboardSubscriber.php
index 4728e499e39..72ebf647afd 100644
--- a/app/bundles/CampaignBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/CampaignBundle/EventListener/DashboardSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CampaignBundle\EventListener;
 
 use Mautic\CampaignBundle\Model\CampaignModel;
@@ -14,38 +16,36 @@
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\CampaignBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'campaign';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'events.in.time' => array(),
-        'leads.added.in.time' => array()
-    );
+    protected $types = [
+        'events.in.time'      => [],
+        'leads.added.in.time' => [],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'campaign:campaigns:viewown',
-        'campaign:campaigns:viewother'
-    );
+        'campaign:campaigns:viewother',
+    ];
 
     /**
      * @var EventModel
@@ -70,11 +70,9 @@ public function __construct(CampaignModel $campaignModel, EventModel $campaignEv
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
@@ -86,7 +84,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->campaignEventModel->getEventLineChartData(
@@ -95,8 +93,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateTo'],
                         $params['dateFormat'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -108,7 +106,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->campaignModel->getLeadsAddedLineChartData(
@@ -117,8 +115,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateTo'],
                         $params['dateFormat'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
diff --git a/app/bundles/CampaignBundle/EventListener/LeadSubscriber.php b/app/bundles/CampaignBundle/EventListener/LeadSubscriber.php
index 4064737956b..9a66a6398f7 100644
--- a/app/bundles/CampaignBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/CampaignBundle/EventListener/LeadSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,17 +12,14 @@
 
 use Mautic\CampaignBundle\Model\CampaignModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Event\LeadMergeEvent;
+use Mautic\LeadBundle\Event\LeadTimelineEvent;
 use Mautic\LeadBundle\Event\ListChangeEvent;
 use Mautic\LeadBundle\LeadEvents;
-use Mautic\LeadBundle\Event\LeadTimelineEvent;
 use Mautic\LeadBundle\Model\LeadModel;
 
 /**
- * Class LeadSubscriber
- *
- * @package Mautic\CampaignBundle\EventListener
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
@@ -50,18 +48,18 @@ public function __construct(CampaignModel $campaignModel, LeadModel $leadModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             LeadEvents::LEAD_LIST_BATCH_CHANGE => ['onLeadListBatchChange', 0],
             LeadEvents::LEAD_LIST_CHANGE       => ['onLeadListChange', 0],
             LeadEvents::TIMELINE_ON_GENERATE   => ['onTimelineGenerate', 0],
-            LeadEvents::LEAD_POST_MERGE        => ['onLeadMerge', 0]
+            LeadEvents::LEAD_POST_MERGE        => ['onLeadMerge', 0],
         ];
     }
 
     /**
-     * Add/remove leads from campaigns based on batch lead list changes
+     * Add/remove leads from campaigns based on batch lead list changes.
      *
      * @param ListChangeEvent $event
      */
@@ -117,7 +115,7 @@ public function onLeadListBatchChange(ListChangeEvent $event)
     }
 
     /**
-     * Add/remove leads from campaigns based on lead list changes
+     * Add/remove leads from campaigns based on lead list changes.
      *
      * @param ListChangeEvent $event
      */
@@ -152,7 +150,6 @@ public function onLeadListChange(ListChangeEvent $event)
                     $this->campaignModel->addLead($campaign, $lead);
                 } else {
                     if (array_intersect($leadListIds, $campaignLists[$c['id']])) {
-
                         continue;
                     }
 
@@ -165,7 +162,7 @@ public function onLeadListChange(ListChangeEvent $event)
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -178,7 +175,6 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
 
         // Decide if those events are filtered
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
@@ -206,21 +202,21 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
 
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => [
+                        'event'      => $eventTypeKey,
+                        'eventLabel' => [
                             'label' => $log['event_name'].' / '.$log['campaign_name'],
                             'href'  => $this->router->generate(
                                 'mautic_campaign_action',
                                 ['objectAction' => 'view', 'objectId' => $log['campaign_id']]
-                            )
+                            ),
                         ],
-                        'eventType'       => $eventTypeName,
-                        'timestamp'       => $log['dateTriggered'],
-                        'extra'           => [
-                            'log' => $log
+                        'eventType' => $eventTypeName,
+                        'timestamp' => $log['dateTriggered'],
+                        'extra'     => [
+                            'log' => $log,
                         ],
                         'contentTemplate' => $template,
-                        'icon'            => 'fa-clock-o'
+                        'icon'            => 'fa-clock-o',
                     ]
                 );
             }
@@ -228,7 +224,7 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
     }
 
     /**
-     * Update records after lead merge
+     * Update records after lead merge.
      *
      * @param LeadMergeEvent $event
      */
@@ -238,4 +234,4 @@ public function onLeadMerge(LeadMergeEvent $event)
 
         $this->em->getRepository('MauticCampaignBundle:Lead')->updateLead($event->getLoser()->getId(), $event->getVictor()->getId());
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/EventListener/PointSubscriber.php b/app/bundles/CampaignBundle/EventListener/PointSubscriber.php
index b98b41634fd..308e1cbc2a5 100644
--- a/app/bundles/CampaignBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/CampaignBundle/EventListener/PointSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,18 +15,18 @@
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::TRIGGER_ON_BUILD   => array('onTriggerBuild', 0)
-        );
+        return [
+            PointEvents::TRIGGER_ON_BUILD => ['onTriggerBuild', 0],
+        ];
     }
 
     /**
@@ -33,12 +34,12 @@ static public function getSubscribedEvents()
      */
     public function onTriggerBuild(TriggerBuilderEvent $event)
     {
-        $changeLists = array(
-            'group'       => 'mautic.campaign.point.trigger',
-            'label'       => 'mautic.campaign.point.trigger.changecampaigns',
-            'callback'    => array('\\Mautic\\CampaignBundle\\Helper\\CampaignEventHelper', 'addRemoveLead'),
-            'formType'    => 'campaignevent_addremovelead'
-        );
+        $changeLists = [
+            'group'    => 'mautic.campaign.point.trigger',
+            'label'    => 'mautic.campaign.point.trigger.changecampaigns',
+            'callback' => ['\\Mautic\\CampaignBundle\\Helper\\CampaignEventHelper', 'addRemoveLead'],
+            'formType' => 'campaignevent_addremovelead',
+        ];
 
         $event->addEvent('campaign.changecampaign', $changeLists);
     }
diff --git a/app/bundles/CampaignBundle/EventListener/SearchSubscriber.php b/app/bundles/CampaignBundle/EventListener/SearchSubscriber.php
index 978a89b6499..05a32416a1c 100644
--- a/app/bundles/CampaignBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/CampaignBundle/EventListener/SearchSubscriber.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\EventListener;
 
 use Mautic\CampaignBundle\Model\CampaignModel;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\CampaignBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -39,12 +38,12 @@ public function __construct(CampaignModel $campaignModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
@@ -59,29 +58,29 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
             }
 
             $campaigns = $this->campaignModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $str
-                ));
+                    'filter' => $str,
+                ]);
 
             if (count($campaigns) > 0) {
-                $campaignResults = array();
+                $campaignResults = [];
                 foreach ($campaigns as $campaign) {
                     $campaignResults[] = $this->templating->renderResponse(
                         'MauticCampaignBundle:SubscribedEvents\Search:global.html.php',
-                        array(
-                            'campaign'  => $campaign
-                        )
+                        [
+                            'campaign' => $campaign,
+                        ]
                     )->getContent();
                 }
                 if (count($campaigns) > 5) {
                     $campaignResults[] = $this->templating->renderResponse(
                         'MauticCampaignBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($campaigns) - 5)
-                        )
+                            'remaining'    => (count($campaigns) - 5),
+                        ]
                     )->getContent();
                 }
                 $campaignResults['count'] = count($campaigns);
@@ -95,7 +94,7 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
      */
     public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        $security   = $this->security;
+        $security = $this->security;
         if ($security->isGranted('campaign:campaigns:view')) {
             $event->addCommands(
                 'mautic.campaign.campaigns',
@@ -103,4 +102,4 @@ public function onBuildCommandList(MauticEvents\CommandListEvent $event)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Form/Type/CampaignEventAddRemoveLeadType.php b/app/bundles/CampaignBundle/Form/Type/CampaignEventAddRemoveLeadType.php
index 6e2da204af7..017af17b59d 100644
--- a/app/bundles/CampaignBundle/Form/Type/CampaignEventAddRemoveLeadType.php
+++ b/app/bundles/CampaignBundle/Form/Type/CampaignEventAddRemoveLeadType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,44 +15,42 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class CampaignEventAddRemoveLeadType
- *
- * @package Mautic\CampaignBundle\Form\Type
+ * Class CampaignEventAddRemoveLeadType.
  */
 class CampaignEventAddRemoveLeadType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('addTo', 'campaign_list', array(
+        $builder->add('addTo', 'campaign_list', [
             'label'      => 'mautic.campaign.form.addtocampaigns',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control'
-            ),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
+            'required' => false,
+        ]);
 
-        $builder->add('removeFrom', 'campaign_list', array(
+        $builder->add('removeFrom', 'campaign_list', [
             'label'      => 'mautic.campaign.form.removefromcampaigns',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control'
-            ),
-            'required'   => false,
-            'include_this' => $options['include_this']
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
+            'required'     => false,
+            'include_this' => $options['include_this'],
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "campaignevent_addremovelead";
+    public function getName()
+    {
+        return 'campaignevent_addremovelead';
     }
 
     /**
@@ -59,9 +58,8 @@ public function getName() {
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'include_this' => false
-        ));
+        $resolver->setDefaults([
+            'include_this' => false,
+        ]);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Form/Type/CampaignEventLeadChangeType.php b/app/bundles/CampaignBundle/Form/Type/CampaignEventLeadChangeType.php
index b20e5fd7791..7f4decb6648 100644
--- a/app/bundles/CampaignBundle/Form/Type/CampaignEventLeadChangeType.php
+++ b/app/bundles/CampaignBundle/Form/Type/CampaignEventLeadChangeType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,49 +14,47 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class CampaignEventLeadChangeType
- *
- * @package Mautic\CampaignBundle\Form\Type
+ * Class CampaignEventLeadChangeType.
  */
 class CampaignEventLeadChangeType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $data = (isset($options['data']['action'])) ? $options['data']['action'] : 'added';
-        $builder->add('action', 'button_group', array(
-            'choices' => array(
+        $builder->add('action', 'button_group', [
+            'choices' => [
                 'added'   => 'mautic.campaign.form.trigger_leadchanged_added',
-                'removed' => 'mautic.campaign.form.trigger_leadchanged_removed'
-            ),
+                'removed' => 'mautic.campaign.form.trigger_leadchanged_removed',
+            ],
             'expanded'    => true,
             'multiple'    => false,
-            'label_attr'  => array('class' => 'control-label'),
+            'label_attr'  => ['class' => 'control-label'],
             'label'       => 'mautic.campaign.form.trigger_leadchanged',
             'empty_value' => false,
             'required'    => false,
-            'data'        => $data
-        ));
+            'data'        => $data,
+        ]);
 
-        $builder->add('campaigns', 'campaign_list', array(
+        $builder->add('campaigns', 'campaign_list', [
             'label'      => 'mautic.campaign.form.limittocampaigns',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.campaign.form.limittocampaigns_descr'
-            ),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.campaign.form.limittocampaigns_descr',
+            ],
+            'required' => false,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "campaignevent_leadchange";
+    public function getName()
+    {
+        return 'campaignevent_leadchange';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Form/Type/CampaignLeadSourceType.php b/app/bundles/CampaignBundle/Form/Type/CampaignLeadSourceType.php
index 0c2d6186ee0..c87feab3773 100644
--- a/app/bundles/CampaignBundle/Form/Type/CampaignLeadSourceType.php
+++ b/app/bundles/CampaignBundle/Form/Type/CampaignLeadSourceType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class CampaignLeadSourceType
+ * Class CampaignLeadSourceType.
  */
 class CampaignLeadSourceType extends AbstractType
 {
@@ -42,44 +43,44 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $builder->add(
                     'lists',
                     'choice',
-                    array(
-                        'choices'     => $options['source_choices'],
-                        'multiple'    => true,
-                        'label'       => 'mautic.campaign.leadsource.lists',
-                        'label_attr'  => array('class' => 'control-label'),
-                        'attr'        => array(
-                            'class'   => 'form-control'
-                        ),
-                        'constraints' => array(
+                    [
+                        'choices'    => $options['source_choices'],
+                        'multiple'   => true,
+                        'label'      => 'mautic.campaign.leadsource.lists',
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
+                            'class' => 'form-control',
+                        ],
+                        'constraints' => [
                             new NotBlank(
-                                array(
-                                    'message' => 'mautic.core.value.required'
-                                )
-                            )
-                        )
-                    )
+                                [
+                                    'message' => 'mautic.core.value.required',
+                                ]
+                            ),
+                        ],
+                    ]
                 );
                 break;
             case 'forms':
                 $builder->add(
                     'forms',
                     'choice',
-                    array(
-                        'choices'     => $options['source_choices'],
-                        'multiple'    => true,
-                        'label'       => 'mautic.campaign.leadsource.forms',
-                        'label_attr'  => array('class' => 'control-label'),
-                        'attr'        => array(
-                            'class'   => 'form-control'
-                        ),
-                        'constraints' => array(
+                    [
+                        'choices'    => $options['source_choices'],
+                        'multiple'   => true,
+                        'label'      => 'mautic.campaign.leadsource.forms',
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
+                            'class' => 'form-control',
+                        ],
+                        'constraints' => [
                             new NotBlank(
-                                array(
-                                    'message' => 'mautic.core.value.required'
-                                )
-                            )
-                        )
-                    )
+                                [
+                                    'message' => 'mautic.core.value.required',
+                                ]
+                            ),
+                        ],
+                    ]
                 );
                 break;
             default:
@@ -101,13 +102,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $btnIcon  = 'fa fa-plus';
         }
 
-        $builder->add('buttons', 'form_buttons', array(
-            'save_text' => $btnValue,
-            'save_icon' => $btnIcon,
-            'save_onclick' => 'Mautic.submitCampaignSource(event)',
-            'apply_text' => false,
-            'container_class' => 'bottom-form-buttons'
-        ));
+        $builder->add('buttons', 'form_buttons', [
+            'save_text'       => $btnValue,
+            'save_icon'       => $btnIcon,
+            'save_onclick'    => 'Mautic.submitCampaignSource(event)',
+            'apply_text'      => false,
+            'container_class' => 'bottom-form-buttons',
+        ]);
     }
 
     /**
@@ -115,7 +116,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array('source_choices'));
+        $resolver->setRequired(['source_choices']);
     }
 
     /**
@@ -123,6 +124,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "campaign_leadsource";
+        return 'campaign_leadsource';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Form/Type/CampaignListType.php b/app/bundles/CampaignBundle/Form/Type/CampaignListType.php
index 4583007dcb7..02fe500ed77 100644
--- a/app/bundles/CampaignBundle/Form/Type/CampaignListType.php
+++ b/app/bundles/CampaignBundle/Form/Type/CampaignListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,20 +16,18 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class CampaignListType
- *
- * @package Mautic\CampaignBundle\Form\Type
+ * Class CampaignListType.
  */
 class CampaignListType extends AbstractType
 {
-
     private $model;
 
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
-        $this->model = $factory->getModel('campaign');
+    public function __construct(MauticFactory $factory)
+    {
+        $this->model      = $factory->getModel('campaign');
         $this->thisString = $factory->getTranslator()->trans('mautic.campaign.form.thiscampaign');
     }
 
@@ -39,9 +38,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $model = $this->model;
         $msg   = $this->thisString;
-        $resolver->setDefaults(array(
-            'choices'       => function (Options $options) use ($model, $msg) {
-                $choices = array();
+        $resolver->setDefaults([
+            'choices' => function (Options $options) use ($model, $msg) {
+                $choices = [];
                 $campaigns = $model->getRepository()->getPublishedCampaigns(null, null, true);
                 foreach ($campaigns as $campaign) {
                     $choices[$campaign['id']] = $campaign['name'];
@@ -51,28 +50,29 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 asort($choices);
 
                 if ($options['include_this']) {
-                    $choices = array('this' => $msg) + $choices;
+                    $choices = ['this' => $msg] + $choices;
                 }
 
                 return $choices;
             },
-            'empty_value'   => false,
-            'expanded'      => false,
-            'multiple'      => true,
-            'required'      => false,
-            'include_this'  => false
-        ));
+            'empty_value'  => false,
+            'expanded'     => false,
+            'multiple'     => true,
+            'required'     => false,
+            'include_this' => false,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "campaign_list";
+    public function getName()
+    {
+        return 'campaign_list';
     }
 
     public function getParent()
     {
         return 'choice';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Form/Type/CampaignType.php b/app/bundles/CampaignBundle/Form/Type/CampaignType.php
index 3fcd4e8693b..f70923a9c31 100644
--- a/app/bundles/CampaignBundle/Form/Type/CampaignType.php
+++ b/app/bundles/CampaignBundle/Form/Type/CampaignType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,20 +18,18 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class CampaignType
- *
- * @package Mautic\CampaignBundle\Form\Type
+ * Class CampaignType.
  */
 class CampaignType extends AbstractType
 {
-
     private $translator;
     private $em;
 
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->translator = $factory->getTranslator();
         $this->security   = $factory->getSecurity();
         $this->em         = $factory->getEntityManager();
@@ -40,32 +39,32 @@ public function __construct(MauticFactory $factory) {
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('description' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['description' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('campaign', $options));
 
-        $builder->add('name', 'text', array(
+        $builder->add('name', 'text', [
             'label'      => 'mautic.core.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control')
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('description', 'textarea', array(
+        $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control editor'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
 
         //add category
-        $builder->add('category', 'category', array(
-            'bundle' => 'campaign'
-        ));
+        $builder->add('category', 'category', [
+            'bundle' => 'campaign',
+        ]);
 
         if (!empty($options['data']) && $options['data']->getId()) {
             $readonly = !$this->security->isGranted('campaign:campaigns:publish');
-            $data = $options['data']->isPublished(false);
+            $data     = $options['data']->isPublished(false);
         } elseif (!$this->security->isGranted('campaign:campaigns:publish')) {
             $readonly = true;
             $data     = false;
@@ -74,56 +73,56 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $data     = false;
         }
 
-        $builder->add('isPublished', 'yesno_button_group', array(
-            'read_only'   => $readonly,
-            'data'        => $data
-        ));
+        $builder->add('isPublished', 'yesno_button_group', [
+            'read_only' => $readonly,
+            'data'      => $data,
+        ]);
 
-        $builder->add('publishUp', 'datetime', array(
+        $builder->add('publishUp', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishup',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
-        $builder->add('publishDown', 'datetime', array(
+        $builder->add('publishDown', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishdown',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
-
-        $builder->add('sessionId', 'hidden', array(
-            'mapped' => false
-        ));
-
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
+
+        $builder->add('sessionId', 'hidden', [
+            'mapped' => false,
+        ]);
+
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
 
-        $builder->add('buttons', 'form_buttons', array(
-            'pre_extra_buttons' => array(
-                array(
+        $builder->add('buttons', 'form_buttons', [
+            'pre_extra_buttons' => [
+                [
                     'name'  => 'builder',
                     'label' => 'mautic.campaign.campaign.launch.builder',
-                    'attr'  => array(
+                    'attr'  => [
                         'class'   => 'btn btn-default btn-dnd',
                         'icon'    => 'fa fa-cube',
-                        'onclick' => "Mautic.launchCampaignEditor();"
-                    )
-                )
-            )
-        ));
+                        'onclick' => 'Mautic.launchCampaignEditor();',
+                    ],
+                ],
+            ],
+        ]);
     }
 
     /**
@@ -131,15 +130,16 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Mautic\CampaignBundle\Entity\Campaign',
-        ));
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "campaign";
+    public function getName()
+    {
+        return 'campaign';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Form/Type/ConfigType.php b/app/bundles/CampaignBundle/Form/Type/ConfigType.php
index 01f38d377f2..a6b35b8b08c 100644
--- a/app/bundles/CampaignBundle/Form/Type/ConfigType.php
+++ b/app/bundles/CampaignBundle/Form/Type/ConfigType.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class ConfigType
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
@@ -39,11 +39,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'PT14D' => '1 week',
                     'P3M'   => '3 months',
                 ],
-                'attr'       => [
+                'attr' => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.campaignconfig.campaign_time_wait_on_event_false_tooltip'
+                    'tooltip' => 'mautic.campaignconfig.campaign_time_wait_on_event_false_tooltip',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
     }
@@ -55,4 +55,4 @@ public function getName()
     {
         return 'campaignconfig';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Form/Type/EventCanvasSettingsType.php b/app/bundles/CampaignBundle/Form/Type/EventCanvasSettingsType.php
index ddded8a2671..4a2558c6133 100644
--- a/app/bundles/CampaignBundle/Form/Type/EventCanvasSettingsType.php
+++ b/app/bundles/CampaignBundle/Form/Type/EventCanvasSettingsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class EventCanvasSettingsType
- *
- * @package Mautic\CampaignBundle\Form\Type
+ * Class EventCanvasSettingsType.
  */
 class EventCanvasSettingsType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -36,6 +34,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "campaignevent_canvassettings";
+        return 'campaignevent_canvassettings';
     }
 }
diff --git a/app/bundles/CampaignBundle/Form/Type/EventType.php b/app/bundles/CampaignBundle/Form/Type/EventType.php
index 0a6a4f82089..e9806584b1b 100644
--- a/app/bundles/CampaignBundle/Form/Type/EventType.php
+++ b/app/bundles/CampaignBundle/Form/Type/EventType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class EventType
- *
- * @package Mautic\CampaignBundle\Form\Type
+ * Class EventType.
  */
 class EventType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -37,7 +35,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.core.name',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => false
+                'required'   => false,
             ]
         );
 
@@ -45,7 +43,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'anchor',
             'hidden',
             [
-                'label'  => false
+                'label' => false,
             ]
         );
 
@@ -55,7 +53,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $choices = [
                 'immediate' => 'mautic.campaign.form.type.immediate',
                 'interval'  => 'mautic.campaign.form.type.interval',
-                'date'      => 'mautic.campaign.form.type.date'
+                'date'      => 'mautic.campaign.form.type.date',
             ];
 
             if ('no' == $options['data']['anchor'] && 'condition' != $options['data']['eventType']) {
@@ -63,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
                 unset($choices['immediate']);
                 $choices['interval'] = $choices['interval'].'_inaction';
-                $choices['date'] = $choices['date'].'_inaction';
+                $choices['date']     = $choices['date'].'_inaction';
             }
 
             reset($choices);
@@ -82,9 +80,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'empty_value' => false,
                     'required'    => false,
                     'attr'        => [
-                        'onchange' => 'Mautic.campaignToggleTimeframes();'
+                        'onchange' => 'Mautic.campaignToggleTimeframes();',
                     ],
-                    'data'        => $triggerMode
+                    'data' => $triggerMode,
                 ]
             );
 
@@ -92,14 +90,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'triggerDate',
                 'datetime',
                 [
-                    'label'  => false,
-                    'attr'   => [
+                    'label' => false,
+                    'attr'  => [
                         'class'       => 'form-control',
                         'preaddon'    => 'fa fa-calendar',
-                        'data-toggle' => 'datetime'
+                        'data-toggle' => 'datetime',
                     ],
                     'widget' => 'single_text',
-                    'format' => 'yyyy-MM-dd HH:mm'
+                    'format' => 'yyyy-MM-dd HH:mm',
                 ]
             );
 
@@ -111,34 +109,34 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label' => false,
                     'attr'  => [
                         'class'    => 'form-control',
-                        'preaddon' => 'symbol-hashtag'
+                        'preaddon' => 'symbol-hashtag',
                     ],
-                    'data'  => $data
+                    'data' => $data,
                 ]
             );
 
-            $data = (!empty($options['data']['triggerIntervalUnit'])) ? $options['data']['triggerIntervalUnit'] : 'd';;
+            $data = (!empty($options['data']['triggerIntervalUnit'])) ? $options['data']['triggerIntervalUnit'] : 'd';
 
             $builder->add(
                 'triggerIntervalUnit',
                 'choice',
                 [
-                    'choices'     => [
+                    'choices' => [
                         'i' => 'mautic.campaign.event.intervalunit.choice.i',
                         'h' => 'mautic.campaign.event.intervalunit.choice.h',
                         'd' => 'mautic.campaign.event.intervalunit.choice.d',
                         'm' => 'mautic.campaign.event.intervalunit.choice.m',
                         'y' => 'mautic.campaign.event.intervalunit.choice.y',
                     ],
-                    'multiple'    => false,
-                    'label_attr'  => ['class' => 'control-label'],
-                    'label'       => false,
-                    'attr'        => [
-                        'class' => 'form-control'
+                    'multiple'   => false,
+                    'label_attr' => ['class' => 'control-label'],
+                    'label'      => false,
+                    'attr'       => [
+                        'class' => 'form-control',
                     ],
                     'empty_value' => false,
                     'required'    => false,
-                    'data'        => $data
+                    'data'        => $data,
                 ]
             );
         }
@@ -147,7 +145,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $properties      = (!empty($options['data']['properties'])) ? $options['data']['properties'] : null;
             $formTypeOptions = [
                 'label' => false,
-                'data'  => $properties
+                'data'  => $properties,
             ];
             if (isset($options['settings']['formTypeCleanMasks'])) {
                 $masks['properties'] = $options['settings']['formTypeCleanMasks'];
@@ -165,7 +163,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'canvasSettings',
             'campaignevent_canvassettings',
             [
-                'label' => false
+                'label' => false,
             ]
         );
 
@@ -186,7 +184,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'save_icon'       => $btnIcon,
                 'save_onclick'    => 'Mautic.submitCampaignEvent(event)',
                 'apply_text'      => false,
-                'container_class' => 'bottom-form-buttons'
+                'container_class' => 'bottom-form-buttons',
             ]
         );
 
@@ -194,18 +192,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'campaignId',
             'hidden',
             [
-                'mapped' => false
+                'mapped' => false,
             ]
         );
 
         $builder->addEventSubscriber(new CleanFormSubscriber($masks));
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
-
     /**
      * @param OptionsResolver $resolver
      */
@@ -219,6 +216,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getName()
     {
-        return "campaignevent";
+        return 'campaignevent';
     }
 }
diff --git a/app/bundles/CampaignBundle/Helper/CampaignEventHelper.php b/app/bundles/CampaignBundle/Helper/CampaignEventHelper.php
index 9685d06da7b..082a443122f 100644
--- a/app/bundles/CampaignBundle/Helper/CampaignEventHelper.php
+++ b/app/bundles/CampaignBundle/Helper/CampaignEventHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,8 @@
 
 class CampaignEventHelper
 {
-
     /**
-     * Determine if this campaign applies
+     * Determine if this campaign applies.
      *
      * @param $eventDetails
      * @param $event
@@ -38,7 +38,7 @@ public static function validateLeadChangeTrigger(CampaignLeadChangeEvent $eventD
         }
 
         //check against the selected action (was lead removed or added)
-        $func = 'was' . ucfirst($action);
+        $func = 'was'.ucfirst($action);
         if (!$eventDetails->$func()) {
             return false;
         }
@@ -83,4 +83,4 @@ public static function addRemoveLead(MauticFactory $factory, $lead, $event)
 
         return $leadsModified;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/MauticCampaignBundle.php b/app/bundles/CampaignBundle/MauticCampaignBundle.php
index a91ca4a0190..4139698ed39 100644
--- a/app/bundles/CampaignBundle/MauticCampaignBundle.php
+++ b/app/bundles/CampaignBundle/MauticCampaignBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticCampaignBundle
- *
- * @package Mautic\CampaignBundle
+ * Class MauticCampaignBundle.
  */
 class MauticCampaignBundle extends Bundle
 {
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CampaignBundle/Model/CampaignModel.php b/app/bundles/CampaignBundle/Model/CampaignModel.php
index 7ba5d58db11..8f44d39edb0 100644
--- a/app/bundles/CampaignBundle/Model/CampaignModel.php
+++ b/app/bundles/CampaignBundle/Model/CampaignModel.php
@@ -1,39 +1,38 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Model;
 
 use Doctrine\ORM\PersistentCollection;
+use Mautic\CampaignBundle\CampaignEvents;
+use Mautic\CampaignBundle\Entity\Campaign;
+use Mautic\CampaignBundle\Entity\Event;
+use Mautic\CampaignBundle\Event as Events;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
+use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Mautic\CoreBundle\Model\FormModel as CommonFormModel;
 use Mautic\FormBundle\Entity\Form;
 use Mautic\FormBundle\Model\FormModel;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\CampaignBundle\Entity\Campaign;
-use Mautic\CampaignBundle\Entity\Event;
-use Mautic\CampaignBundle\Event as Events;
-use Mautic\CampaignBundle\CampaignEvents;
 use Mautic\LeadBundle\Entity\LeadList;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\LeadBundle\Model\ListModel;
-use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
  * Class CampaignModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class CampaignModel extends CommonFormModel
 {
@@ -66,16 +65,16 @@ class CampaignModel extends CommonFormModel
      * CampaignModel constructor.
      *
      * @param CoreParametersHelper $coreParametersHelper
-     * @param LeadModel $leadModel
-     * @param ListModel $leadListModel
-     * @param FormModel $formModel
+     * @param LeadModel            $leadModel
+     * @param ListModel            $leadListModel
+     * @param FormModel            $formModel
      */
     public function __construct(CoreParametersHelper $coreParametersHelper, LeadModel $leadModel, ListModel $leadListModel, FormModel $formModel)
     {
-        $this->leadModel = $leadModel;
-        $this->leadListModel = $leadListModel;
-        $this->formModel = $formModel;
-        $this->batchSleepTime = $coreParametersHelper->getParameter('mautic.batch_sleep_time');
+        $this->leadModel              = $leadModel;
+        $this->leadListModel          = $leadListModel;
+        $this->formModel              = $formModel;
+        $this->batchSleepTime         = $coreParametersHelper->getParameter('mautic.batch_sleep_time');
         $this->batchCampaignSleepTime = $coreParametersHelper->getParameter('mautic.batch_campaign_sleep_time');
     }
 
@@ -84,7 +83,7 @@ public function __construct(CoreParametersHelper $coreParametersHelper, LeadMode
      *
      * @return \Mautic\CampaignBundle\Entity\CampaignRepository
      */
-    public function getRepository ()
+    public function getRepository()
     {
         return $this->em->getRepository('MauticCampaignBundle:Campaign');
     }
@@ -92,7 +91,7 @@ public function getRepository ()
     /**
      * @return \Mautic\CampaignBundle\Entity\EventRepository
      */
-    public function getEventRepository ()
+    public function getEventRepository()
     {
         return $this->em->getRepository('MauticCampaignBundle:Event');
     }
@@ -100,7 +99,7 @@ public function getEventRepository ()
     /**
      * @return \Mautic\CampaignBundle\Entity\LeadRepository
      */
-    public function getCampaignLeadRepository ()
+    public function getCampaignLeadRepository()
     {
         return $this->em->getRepository('MauticCampaignBundle:Lead');
     }
@@ -110,7 +109,7 @@ public function getCampaignLeadRepository ()
      *
      * @return string
      */
-    public function getPermissionBase ()
+    public function getPermissionBase()
     {
         return 'campaign:campaigns';
     }
@@ -124,26 +123,27 @@ public function getPermissionBase ()
      * @param array $options
      *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm ($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Campaign) {
-            throw new MethodNotAllowedHttpException(array('Campaign'));
+            throw new MethodNotAllowedHttpException(['Campaign']);
         }
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
 
         return $formFactory->create('campaign', $entity, $params);
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
      *
      * @return null|Campaign
      */
-    public function getEntity ($id = null)
+    public function getEntity($id = null)
     {
         if ($id === null) {
             return new Campaign();
@@ -175,27 +175,27 @@ public function deleteEntity($entity)
      *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
-    protected function dispatchEvent ($action, &$entity, $isNew = false, \Symfony\Component\EventDispatcher\Event $event = null)
+    protected function dispatchEvent($action, &$entity, $isNew = false, \Symfony\Component\EventDispatcher\Event $event = null)
     {
         if ($entity instanceof \Mautic\CampaignBundle\Entity\Lead) {
             return;
         }
 
         if (!$entity instanceof Campaign) {
-            throw new MethodNotAllowedHttpException(array('Campaign'));
+            throw new MethodNotAllowedHttpException(['Campaign']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = CampaignEvents::CAMPAIGN_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = CampaignEvents::CAMPAIGN_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = CampaignEvents::CAMPAIGN_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = CampaignEvents::CAMPAIGN_POST_DELETE;
                 break;
             default:
@@ -223,12 +223,12 @@ protected function dispatchEvent ($action, &$entity, $isNew = false, \Symfony\Co
      *
      * @return array
      */
-    public function setEvents (Campaign $entity, $sessionEvents, $sessionConnections, $deletedEvents)
+    public function setEvents(Campaign $entity, $sessionEvents, $sessionConnections, $deletedEvents)
     {
         $existingEvents = $entity->getEvents()->toArray();
-        $events =
-        $hierarchy =
-        $parentUpdated = array();
+        $events         =
+        $hierarchy      =
+        $parentUpdated  = [];
 
         //set the events from session
         foreach ($sessionEvents as $id => $properties) {
@@ -241,10 +241,11 @@ public function setEvents (Campaign $entity, $sessionEvents, $sessionConnections
                     $event->setTempId($v);
                 }
 
-                if (in_array($f, array('id', 'order', 'parent')))
+                if (in_array($f, ['id', 'order', 'parent'])) {
                     continue;
+                }
 
-                $func = "set" . ucfirst($f);
+                $func = 'set'.ucfirst($f);
                 if (method_exists($event, $func)) {
                     $event->$func($v);
                 }
@@ -269,13 +270,13 @@ public function setEvents (Campaign $entity, $sessionEvents, $sessionConnections
             }
         }
 
-        $relationships = array();
+        $relationships = [];
         if (isset($sessionConnections['connections'])) {
             foreach ($sessionConnections['connections'] as $connection) {
                 $source = $connection['sourceId'];
                 $target = $connection['targetId'];
 
-                if (in_array($source, array('lists', 'forms'))) {
+                if (in_array($source, ['lists', 'forms'])) {
                     // Only concerned with events and not sources
                     continue;
                 }
@@ -286,10 +287,10 @@ public function setEvents (Campaign $entity, $sessionEvents, $sessionConnections
                     continue;
                 }
 
-                $relationships[$target] = array(
+                $relationships[$target] = [
                     'parent'   => $source,
-                    'decision' => $sourceDecision
-                );
+                    'decision' => $sourceDecision,
+                ];
             }
         }
 
@@ -297,7 +298,7 @@ public function setEvents (Campaign $entity, $sessionEvents, $sessionConnections
         foreach ($events as $id => $e) {
             if (isset($relationships[$id])) {
                 // Has a parent
-                $anchor = in_array($relationships[$id]['decision'], array('yes', 'no')) ? $relationships[$id]['decision'] : null;
+                $anchor = in_array($relationships[$id]['decision'], ['yes', 'no']) ? $relationships[$id]['decision'] : null;
                 $events[$id]->setDecisionPath($anchor);
 
                 $parentId = $relationships[$id]['parent'];
@@ -361,7 +362,7 @@ public function setCanvasSettings($entity, $settings, $persist = true, $events =
             $events = $entity->getEvents();
         }
 
-        $tempIds = array();
+        $tempIds = [];
 
         foreach ($events as $e) {
             if ($e instanceof Event) {
@@ -372,7 +373,7 @@ public function setCanvasSettings($entity, $settings, $persist = true, $events =
         }
 
         if (!isset($settings['nodes'])) {
-            $settings['nodes'] = array();
+            $settings['nodes'] = [];
         }
 
         foreach ($settings['nodes'] as &$node) {
@@ -383,7 +384,7 @@ public function setCanvasSettings($entity, $settings, $persist = true, $events =
         }
 
         if (!isset($settings['connections'])) {
-            $settings['connections'] = array();
+            $settings['connections'] = [];
         }
 
         foreach ($settings['connections'] as &$connection) {
@@ -401,7 +402,7 @@ public function setCanvasSettings($entity, $settings, $persist = true, $events =
 
             // Rebuild anchors
             if (!isset($connection['anchors']['source'])) {
-                $anchors = array();
+                $anchors = [];
                 foreach ($connection['anchors'] as $k => $anchor) {
                     $type           = ($k === 0) ? 'source' : 'target';
                     $anchors[$type] = $anchor['endpoint'];
@@ -416,7 +417,6 @@ public function setCanvasSettings($entity, $settings, $persist = true, $events =
         if ($persist) {
             $this->getRepository()->saveEntity($entity);
         } else {
-
             return $settings;
         }
     }
@@ -428,7 +428,7 @@ public function setCanvasSettings($entity, $settings, $persist = true, $events =
      * @param string   $root
      * @param int      $order
      */
-    private function buildOrder ($hierarchy, &$events, $entity, $root = 'null', $order = 1)
+    private function buildOrder($hierarchy, &$events, $entity, $root = 'null', $order = 1)
     {
         $count = count($hierarchy);
 
@@ -445,22 +445,22 @@ private function buildOrder ($hierarchy, &$events, $entity, $root = 'null', $ord
     }
 
     /**
-     * Gets array of custom events from bundles subscribed CampaignEvents::CAMPAIGN_ON_BUILD
+     * Gets array of custom events from bundles subscribed CampaignEvents::CAMPAIGN_ON_BUILD.
      *
      * @return mixed
      */
-    public function getEvents ()
+    public function getEvents()
     {
         static $events;
 
         if (empty($events)) {
             //build them
-            $events = array();
+            $events = [];
             $event  = new Events\CampaignBuilderEvent($this->translator);
             $this->dispatcher->dispatch(CampaignEvents::CAMPAIGN_ON_BUILD, $event);
-            $events['decision']     = $event->getDecisions();
-            $events['condition']    = $event->getConditions();
-            $events['action']       = $event->getActions();
+            $events['decision']  = $event->getDecisions();
+            $events['condition'] = $event->getConditions();
+            $events['action']    = $event->getActions();
 
             $associationRestrictions = ['action' => [], 'decision' => []];
             $anchorRestrictions      = [];
@@ -473,7 +473,7 @@ public function getEvents ()
                 }
                 if (isset($action['anchorRestrictions'])) {
                     foreach ($action['anchorRestrictions'] as $restriction) {
-                        list($group, $anchor) = explode('.',$restriction);
+                        list($group, $anchor) = explode('.', $restriction);
                         if (!isset($anchorRestrictions[$group])) {
                             $anchorRestrictions[$group][$key] = [];
                         }
@@ -487,7 +487,7 @@ public function getEvents ()
                 }
                 if (isset($action['anchorRestrictions'])) {
                     foreach ($action['anchorRestrictions'] as $restriction) {
-                        list($group, $anchor) = explode('.',$restriction);
+                        list($group, $anchor) = explode('.', $restriction);
                         if (!isset($anchorRestrictions[$group][$key])) {
                             $anchorRestrictions[$group][$key] = [];
                         }
@@ -504,7 +504,7 @@ public function getEvents ()
     }
 
     /**
-     * Get list of sources for a campaign
+     * Get list of sources for a campaign.
      *
      * @param $campaign
      *
@@ -514,7 +514,7 @@ public function getLeadSources($campaign)
     {
         $campaignId = ($campaign instanceof Campaign) ? $campaign->getId() : $campaign;
 
-        $sources = array();
+        $sources = [];
 
         // Lead lists
         $sources['lists'] = $this->getRepository()->getCampaignListSources($campaignId);
@@ -526,7 +526,7 @@ public function getLeadSources($campaign)
     }
 
     /**
-     * Add and/or delete lead sources from a campaign
+     * Add and/or delete lead sources from a campaign.
      *
      * @param $entity
      * @param $addedSources
@@ -566,7 +566,7 @@ public function setLeadSources(Campaign $entity, $addedSources, $deletedSources)
     }
 
     /**
-     * Get a list of source choices
+     * Get a list of source choices.
      *
      * @param $sourceType
      *
@@ -574,11 +574,11 @@ public function setLeadSources(Campaign $entity, $addedSources, $deletedSources)
      */
     public function getSourceLists($sourceType = null)
     {
-        $choices = array();
+        $choices = [];
         switch ($sourceType) {
             case 'lists':
             case null:
-                $choices['lists'] = array();
+                $choices['lists'] = [];
 
                 $lists = (empty($options['global_only'])) ? $this->leadListModel->getUserLists() : $this->leadListModel->getGlobalLists();
 
@@ -588,7 +588,7 @@ public function getSourceLists($sourceType = null)
 
             case 'forms':
             case null:
-                $choices['forms'] = array();
+                $choices['forms'] = [];
 
                 $viewOther = $this->security->isGranted('form:forms:viewother');
                 $repo      = $this->formModel->getRepository();
@@ -620,16 +620,16 @@ public function getCampaignsByForm($form)
     }
 
     /**
-     * Gets the campaigns a specific lead is part of
+     * Gets the campaigns a specific lead is part of.
      *
      * @param Lead $lead
      * @param bool $forList
      *
      * @return mixed
      */
-    public function getLeadCampaigns (Lead $lead = null, $forList = false)
+    public function getLeadCampaigns(Lead $lead = null, $forList = false)
     {
-        static $campaigns = array();
+        static $campaigns = [];
 
         if ($lead === null) {
             $lead = $this->leadModel->getCurrentLead();
@@ -646,15 +646,15 @@ public function getLeadCampaigns (Lead $lead = null, $forList = false)
     }
 
     /**
-     * Gets a list of published campaigns
+     * Gets a list of published campaigns.
      *
      * @param bool $forList
      *
      * @return array
      */
-    public function getPublishedCampaigns ($forList = false)
+    public function getPublishedCampaigns($forList = false)
     {
-        static $campaigns = array();
+        static $campaigns = [];
 
         if (empty($campaigns)) {
             $campaigns = $this->getRepository()->getPublishedCampaigns(null, null, $forList);
@@ -664,21 +664,21 @@ public function getPublishedCampaigns ($forList = false)
     }
 
     /**
-     * Add lead to the campaign
+     * Add lead to the campaign.
      *
      * @param Campaign  $campaign
      * @param           $lead
      * @param bool|true $manuallyAdded
      */
-    public function addLead (Campaign $campaign, $lead, $manuallyAdded = true)
+    public function addLead(Campaign $campaign, $lead, $manuallyAdded = true)
     {
-        $this->addLeads($campaign, array($lead), $manuallyAdded);
+        $this->addLeads($campaign, [$lead], $manuallyAdded);
 
         unset($campaign, $lead);
     }
 
     /**
-     * Add lead(s) to a campaign
+     * Add lead(s) to a campaign.
      *
      * @param Campaign $campaign
      * @param array    $leads
@@ -688,7 +688,7 @@ public function addLead (Campaign $campaign, $lead, $manuallyAdded = true)
      *
      * @throws \Doctrine\ORM\ORMException
      */
-    public function addLeads (Campaign $campaign, array $leads, $manuallyAdded = false, $batchProcess = false, $searchListLead = 1)
+    public function addLeads(Campaign $campaign, array $leads, $manuallyAdded = false, $batchProcess = false, $searchListLead = 1)
     {
         foreach ($leads as $lead) {
             if (!$lead instanceof Lead) {
@@ -699,15 +699,15 @@ public function addLeads (Campaign $campaign, array $leads, $manuallyAdded = fal
             if ($searchListLead == -1) {
                 $campaignLead = null;
             } elseif ($searchListLead) {
-                $campaignLead = $this->getCampaignLeadRepository()->findOneBy(array(
+                $campaignLead = $this->getCampaignLeadRepository()->findOneBy([
                     'lead'     => $lead,
-                    'campaign' => $campaign
-                ));
+                    'campaign' => $campaign,
+                ]);
             } else {
-                $campaignLead = $this->em->getReference('MauticCampaignBundle:Lead', array(
+                $campaignLead = $this->em->getReference('MauticCampaignBundle:Lead', [
                     'lead'     => $leadId,
-                    'campaign' => $campaign->getId()
-                ));
+                    'campaign' => $campaign->getId(),
+                ]);
             }
 
             $dispatchEvent = true;
@@ -766,21 +766,21 @@ public function addLeads (Campaign $campaign, array $leads, $manuallyAdded = fal
     }
 
     /**
-     * Remove lead from the campaign
+     * Remove lead from the campaign.
      *
      * @param Campaign $campaign
      * @param          $lead
      * @param bool     $manuallyRemoved
      */
-    public function removeLead (Campaign $campaign, $lead, $manuallyRemoved = true)
+    public function removeLead(Campaign $campaign, $lead, $manuallyRemoved = true)
     {
-        $this->removeLeads($campaign, array($lead), $manuallyRemoved);
+        $this->removeLeads($campaign, [$lead], $manuallyRemoved);
 
         unset($campaign, $lead);
     }
 
     /**
-     * Remove lead(s) from the campaign
+     * Remove lead(s) from the campaign.
      *
      * @param Campaign   $campaign
      * @param array      $leads
@@ -790,7 +790,7 @@ public function removeLead (Campaign $campaign, $lead, $manuallyRemoved = true)
      *
      * @throws \Doctrine\ORM\ORMException
      */
-    public function removeLeads (Campaign $campaign, array $leads, $manuallyRemoved = false, $batchProcess = false, $skipFindOne = false)
+    public function removeLeads(Campaign $campaign, array $leads, $manuallyRemoved = false, $batchProcess = false, $skipFindOne = false)
     {
         foreach ($leads as $lead) {
             $dispatchEvent = false;
@@ -801,14 +801,14 @@ public function removeLeads (Campaign $campaign, array $leads, $manuallyRemoved
             }
 
             $campaignLead = (!$skipFindOne) ?
-                $this->getCampaignLeadRepository()->findOneBy(array(
+                $this->getCampaignLeadRepository()->findOneBy([
                     'lead'     => $lead,
-                    'campaign' => $campaign
-                )) :
-                $this->em->getReference('MauticCampaignBundle:Lead', array(
+                    'campaign' => $campaign,
+                ]) :
+                $this->em->getReference('MauticCampaignBundle:Lead', [
                     'lead'     => $leadId,
-                    'campaign' => $campaign->getId()
-                ));
+                    'campaign' => $campaign->getId(),
+                ]);
 
             if ($campaignLead == null) {
                 if ($batchProcess) {
@@ -823,7 +823,7 @@ public function removeLeads (Campaign $campaign, array $leads, $manuallyRemoved
                 //lead was manually added and now manually removed or was not manually added and now being removed
 
                 // Manually added and manually removed so chuck it
-                $dispatchEvent   = true;
+                $dispatchEvent = true;
 
                 $this->getEventRepository()->deleteEntity($campaignLead);
             } elseif ($manuallyRemoved) {
@@ -857,14 +857,14 @@ public function removeLeads (Campaign $campaign, array $leads, $manuallyRemoved
     }
 
     /**
-     * Get details of leads in a campaign
+     * Get details of leads in a campaign.
      *
      * @param      $campaign
      * @param null $leads
      *
      * @return mixed
      */
-    public function getLeadDetails ($campaign, $leads = null)
+    public function getLeadDetails($campaign, $leads = null)
     {
         $campaignId = ($campaign instanceof Campaign) ? $campaign->getId() : $campaign;
 
@@ -883,7 +883,7 @@ public function getLeadDetails ($campaign, $leads = null)
      *
      * @return int
      */
-    public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLeads = false, OutputInterface $output = null)
+    public function rebuildCampaignLeads(Campaign $campaign, $limit = 1000, $maxLeads = false, OutputInterface $output = null)
     {
         defined('MAUTIC_REBUILDING_CAMPAIGNS') or define('MAUTIC_REBUILDING_CAMPAIGNS', 1);
 
@@ -892,19 +892,19 @@ public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLea
         // Get a list of lead lists this campaign is associated with
         $lists = $repo->getCampaignListIds($campaign->getId());
 
-        $batchLimiters = array(
-            'dateTime' => (new DateTimeHelper())->toUtcString()
-        );
+        $batchLimiters = [
+            'dateTime' => (new DateTimeHelper())->toUtcString(),
+        ];
 
         if (count($lists)) {
             // Get a count of new leads
             $newLeadsCount = $repo->getCampaignLeadsFromLists(
                 $campaign->getId(),
                 $lists,
-                array(
+                [
                     'countOnly'     => true,
-                    'batchLimiters' => $batchLimiters
-                )
+                    'batchLimiters' => $batchLimiters,
+                ]
             );
 
             // Ensure the same list is used each batch
@@ -918,7 +918,7 @@ public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLea
         }
 
         if ($output) {
-            $output->writeln($this->translator->trans('mautic.campaign.rebuild.to_be_added', array('%leads%' => $leadCount, '%batch%' => $limit)));
+            $output->writeln($this->translator->trans('mautic.campaign.rebuild.to_be_added', ['%leads%' => $leadCount, '%batch%' => $limit]));
         }
 
         // Handle by batches
@@ -944,18 +944,18 @@ public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLea
                 $newLeadList = $repo->getCampaignLeadsFromLists(
                     $campaign->getId(),
                     $lists,
-                    array(
+                    [
                         'limit'         => $limit,
-                        'batchLimiters' => $batchLimiters
-                    )
+                        'batchLimiters' => $batchLimiters,
+                    ]
                 );
 
                 $start += $limit;
 
                 foreach ($newLeadList as $l) {
-                    $this->addLeads($campaign, array($l), false, true, -1);
+                    $this->addLeads($campaign, [$l], false, true, -1);
 
-                    $leadsProcessed++;
+                    ++$leadsProcessed;
                     if ($output && $leadsProcessed < $maxCount) {
                         $progress->setProgress($leadsProcessed);
                     }
@@ -988,19 +988,19 @@ public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLea
         $removeLeadCount = $repo->getCampaignOrphanLeads(
             $campaign->getId(),
             $lists,
-            array(
+            [
                 'countOnly'     => true,
-                'batchLimiters' => $batchLimiters
-            )
+                'batchLimiters' => $batchLimiters,
+            ]
         );
 
         // Restart batching
-        $start                  = $lastRoundPercentage = 0;
+        $start                  = $lastRoundPercentage                  = 0;
         $leadCount              = $removeLeadCount['count'];
         $batchLimiters['maxId'] = $removeLeadCount['maxId'];
 
         if ($output) {
-            $output->writeln($this->translator->trans('mautic.lead.list.rebuild.to_be_removed', array('%leads%' => $leadCount, '%batch%' => $limit)));
+            $output->writeln($this->translator->trans('mautic.lead.list.rebuild.to_be_removed', ['%leads%' => $leadCount, '%batch%' => $limit]));
         }
 
         if ($leadCount) {
@@ -1019,16 +1019,16 @@ public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLea
                 $removeLeadList = $repo->getCampaignOrphanLeads(
                     $campaign->getId(),
                     $lists,
-                    array(
+                    [
                         'limit'         => $limit,
-                        'batchLimiters' => $batchLimiters
-                    )
+                        'batchLimiters' => $batchLimiters,
+                    ]
                 );
 
                 foreach ($removeLeadList as $l) {
-                    $this->removeLeads($campaign, array($l), false, true, true);
+                    $this->removeLeads($campaign, [$l], false, true, true);
 
-                    $leadsProcessed++;
+                    ++$leadsProcessed;
                     if ($output && $leadsProcessed < $maxCount) {
                         $progress->setProgress($leadsProcessed);
                     }
@@ -1049,7 +1049,7 @@ public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLea
                 gc_collect_cycles();
             }
 
-            if($output) {
+            if ($output) {
                 $progress->finish();
                 $output->writeln('');
             }
@@ -1059,7 +1059,7 @@ public function rebuildCampaignLeads (Campaign $campaign, $limit = 1000, $maxLea
     }
 
     /**
-     * Get leads for a campaign.  If $event is passed in, only leads who have not triggered the event are returned
+     * Get leads for a campaign.  If $event is passed in, only leads who have not triggered the event are returned.
      *
      * @param Campaign $campaign
      * @param array    $event
@@ -1095,7 +1095,7 @@ public function getCampaignListIds($id)
     }
 
     /**
-     * Batch sleep according to settings
+     * Batch sleep according to settings.
      */
     protected function batchSleep()
     {
@@ -1113,18 +1113,18 @@ protected function batchSleep()
     }
 
     /**
-     * Get line chart data of leads added to campaigns
+     * Get line chart data of leads added to campaigns.
      *
-     * @param char      $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getLeadsAddedLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getLeadsAddedLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
         $chart = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
         $query = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
@@ -1143,9 +1143,9 @@ public function getLeadsAddedLineChartData($unit, \DateTime $dateFrom, \DateTime
     }
 
     /**
-     * Get line chart data of hits
+     * Get line chart data of hits.
      *
-     * @param char     $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char     $unit       {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param DateTime $dateFrom
      * @param DateTime $dateTo
      * @param string   $dateFormat
@@ -1153,9 +1153,9 @@ public function getLeadsAddedLineChartData($unit, \DateTime $dateFrom, \DateTime
      *
      * @return array
      */
-    public function getCampaignMetricsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array())
+    public function getCampaignMetricsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [])
     {
-        $events = array();
+        $events = [];
         $chart  = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
         $query  = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
 
@@ -1171,7 +1171,7 @@ public function getCampaignMetricsLineChartData($unit, \DateTime $dateFrom, \Dat
                     if (isset($events[$event['type']])) {
                         $events[$event['type']][] = $event['id'];
                     } else {
-                        $events[$event['type']] = array($event['id']);
+                        $events[$event['type']] = [$event['id']];
                     }
                 }
             }
@@ -1179,8 +1179,8 @@ public function getCampaignMetricsLineChartData($unit, \DateTime $dateFrom, \Dat
             if ($events) {
                 foreach ($events as $type => $eventIds) {
                     $filter['event_id'] = $eventIds;
-                    $q = $query->prepareTimeDataQuery('campaign_lead_event_log', 'date_triggered', $filter);
-                    $rawData = $q->execute()->fetchAll();
+                    $q                  = $query->prepareTimeDataQuery('campaign_lead_event_log', 'date_triggered', $filter);
+                    $rawData            = $q->execute()->fetchAll();
                     if (!empty($rawData)) {
                         $triggers = $query->completeTimeData($rawData);
                         $chart->setDataset($this->translator->trans('mautic.campaign.'.$type), $triggers);
diff --git a/app/bundles/CampaignBundle/Model/EventModel.php b/app/bundles/CampaignBundle/Model/EventModel.php
index d0664afe089..debce65726f 100644
--- a/app/bundles/CampaignBundle/Model/EventModel.php
+++ b/app/bundles/CampaignBundle/Model/EventModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,28 +14,26 @@
 use Doctrine\ORM\EntityNotFoundException;
 use Mautic\CampaignBundle\CampaignEvents;
 use Mautic\CampaignBundle\Entity\Campaign;
+use Mautic\CampaignBundle\Entity\Event;
 use Mautic\CampaignBundle\Entity\LeadEventLog;
 use Mautic\CampaignBundle\Event\CampaignDecisionEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CampaignBundle\Event\CampaignScheduledEvent;
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
+use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Mautic\CoreBundle\Model\FormModel as CommonFormModel;
-use Mautic\CampaignBundle\Entity\Event;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Mautic\LeadBundle\Model\LeadModel;
-use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class EventModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class EventModel extends CommonFormModel
 {
@@ -49,7 +48,7 @@ class EventModel extends CommonFormModel
     protected $batchCampaignSleepTime;
 
     /**
-     * Used in triggerEvent so that responses from recursive events are saved
+     * Used in triggerEvent so that responses from recursive events are saved.
      *
      * @var bool
      */
@@ -111,7 +110,7 @@ public function getRepository()
     }
 
     /**
-     * Get CampaignRepository
+     * Get CampaignRepository.
      *
      * @return \Mautic\CampaignBundle\Entity\CampaignRepository
      */
@@ -131,7 +130,7 @@ public function getPermissionBase()
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
      *
@@ -149,7 +148,7 @@ public function getEntity($id = null)
     }
 
     /**
-     * Delete events
+     * Delete events.
      *
      * @param $currentEvents
      * @param $originalEvents
@@ -182,7 +181,7 @@ public function deleteEvents($currentEvents, $deletedEvents)
     }
 
     /**
-     * Triggers an event
+     * Triggers an event.
      *
      * @param      $type
      * @param null $eventDetails
@@ -193,7 +192,7 @@ public function deleteEvents($currentEvents, $deletedEvents)
      */
     public function triggerEvent($type, $eventDetails = null, $channel = null, $channelId = null)
     {
-        static $leadCampaigns = array(), $eventList = array(), $availableEventSettings = array(), $leadsEvents = array(), $examinedEvents = array();
+        static $leadCampaigns = [], $eventList = [], $availableEventSettings = [], $leadsEvents = [], $examinedEvents = [];
 
         $this->logger->debug('CAMPAIGN: Campaign triggered for event type '.$type.'('.$channel.' / '.$channelId.')');
 
@@ -212,8 +211,8 @@ public function triggerEvent($type, $eventDetails = null, $channel = null, $chan
         }
 
         //get the current lead
-        $lead      = $this->leadModel->getCurrentLead();
-        $leadId    = $lead->getId();
+        $lead   = $this->leadModel->getCurrentLead();
+        $leadId = $lead->getId();
         $this->logger->debug('CAMPAIGN: Current Lead ID# '.$leadId);
 
         //get the lead's campaigns so we have when the lead was added
@@ -249,18 +248,18 @@ public function triggerEvent($type, $eventDetails = null, $channel = null, $chan
 
         //get campaign list
         $campaigns = $this->campaignModel->getEntities(
-            array(
-                'force'            => array(
-                    'filter' => array(
-                        array(
+            [
+                'force' => [
+                    'filter' => [
+                        [
                             'column' => 'c.id',
                             'expr'   => 'in',
-                            'value'  => array_keys($events)
-                        )
-                    )
-                ),
-                'ignore_paginator' => true
-            )
+                            'value'  => array_keys($events),
+                        ],
+                    ],
+                ],
+                'ignore_paginator' => true,
+            ]
         );
 
         //get a list of events that has already been executed for this lead
@@ -269,10 +268,10 @@ public function triggerEvent($type, $eventDetails = null, $channel = null, $chan
         }
 
         if (!isset($examinedEvents[$leadId])) {
-            $examinedEvents[$leadId] = array();
+            $examinedEvents[$leadId] = [];
         }
 
-        $this->triggeredResponses = array();
+        $this->triggeredResponses = [];
         foreach ($events as $campaignId => $campaignEvents) {
             if (empty($campaigns[$campaignId])) {
                 $this->logger->debug('CAMPAIGN: Campaign entity for ID# '.$campaignId.' not found');
@@ -326,7 +325,7 @@ public function triggerEvent($type, $eventDetails = null, $channel = null, $chan
 
                 //check the callback function for the event to make sure it even applies based on its settings
                 if (!$response = $this->invokeEventCallback($event, $decisionEventSettings, $lead, $eventDetails, $systemTriggered)) {
-                    $this->logger->debug('CAMPAIGN: '.ucfirst($event['eventType']).' ID# '.$event['id'].' callback check failed with a response of '.var_export($response,true));
+                    $this->logger->debug('CAMPAIGN: '.ucfirst($event['eventType']).' ID# '.$event['id'].' callback check failed with a response of '.var_export($response, true));
 
                     continue;
                 }
@@ -395,7 +394,7 @@ public function triggerEvent($type, $eventDetails = null, $channel = null, $chan
     }
 
     /**
-     * Trigger the root level action(s) in campaign(s)
+     * Trigger the root level action(s) in campaign(s).
      *
      * @param Campaign        $campaign
      * @param                 $totalEventCount
@@ -403,7 +402,7 @@ public function triggerEvent($type, $eventDetails = null, $channel = null, $chan
      * @param bool            $max
      * @param OutputInterface $output
      * @param int|null        $leadId
-     * @param bool|false      $returnCounts If true, returns array of counters
+     * @param bool|false      $returnCounts    If true, returns array of counters
      *
      * @return int
      */
@@ -430,7 +429,7 @@ public function triggerStartingEvents(
             $events = $repo->getRootLevelEvents($campaignId, true);
 
             // Filter out decisions
-            $decisionChildren = array();
+            $decisionChildren = [];
             foreach ($events as $event) {
                 if ($event['eventType'] == 'decision') {
                     $decisionChildren[$event['id']] = $repo->getEventsByParent($event['id']);
@@ -444,13 +443,14 @@ public function triggerStartingEvents(
 
         if (empty($rootEventCount)) {
             $this->logger->debug('CAMPAIGN: No events to trigger');
-            return ($returnCounts) ? array(
+
+            return ($returnCounts) ? [
                 'events'         => 0,
                 'evaluated'      => 0,
                 'executed'       => 0,
                 'totalEvaluated' => 0,
-                'totalExecuted'  => 0
-            ) : 0;
+                'totalExecuted'  => 0,
+            ] : 0;
         }
 
         // Event settings
@@ -466,7 +466,7 @@ public function triggerStartingEvents(
             $output->writeln(
                 $this->translator->trans(
                     'mautic.campaign.trigger.event_count',
-                    array('%events%' => $totalStartingEvents, '%batch%' => $limit)
+                    ['%events%' => $totalStartingEvents, '%batch%' => $limit]
                 )
             );
         }
@@ -476,13 +476,13 @@ public function triggerStartingEvents(
 
             unset($events);
 
-            return ($returnCounts) ? array(
+            return ($returnCounts) ? [
                 'events'         => 0,
                 'evaluated'      => 0,
                 'executed'       => 0,
                 'totalEvaluated' => 0,
-                'totalExecuted'  => 0
-            ) : 0;
+                'totalExecuted'  => 0,
+            ] : 0;
         }
 
         $evaluatedEventCount = $executedEventCount = $rootEvaluatedCount = $rootExecutedCount = 0;
@@ -508,7 +508,7 @@ public function triggerStartingEvents(
             $this->logger->debug('CAMPAIGN: Batch #'.$batchDebugCounter);
 
             // Get list of all campaign leads; start is always zero in practice because of $pendingOnly
-            $campaignLeads = ($leadId) ? array($leadId) : $campaignRepo->getCampaignLeadIds($campaignId, 0, $limit, true);
+            $campaignLeads = ($leadId) ? [$leadId] : $campaignRepo->getCampaignLeadIds($campaignId, 0, $limit, true);
 
             if (empty($campaignLeads)) {
                 // No leads found
@@ -518,19 +518,19 @@ public function triggerStartingEvents(
             }
 
             $leads = $this->leadModel->getEntities(
-                array(
-                    'filter'     => array(
-                        'force' => array(
-                            array(
+                [
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'l.id',
                                 'expr'   => 'in',
-                                'value'  => $campaignLeads
-                            )
-                        )
-                    ),
+                                'value'  => $campaignLeads,
+                            ],
+                        ],
+                    ],
                     'orderBy'    => 'l.id',
-                    'orderByDir' => 'asc'
-                )
+                    'orderByDir' => 'asc',
+                ]
             );
 
             $this->logger->debug('CAMPAIGN: Processing the following contacts: '.implode(', ', array_keys($leads)));
@@ -559,41 +559,41 @@ public function triggerStartingEvents(
                 $this->leadModel->setSystemCurrentLead($lead);
 
                 foreach ($events as $event) {
-                    $rootEvaluatedCount++;
+                    ++$rootEvaluatedCount;
 
                     if ($sleepBatchCount == $limit) {
                         // Keep CPU down
                         $this->batchSleep();
                         $sleepBatchCount = 0;
                     } else {
-                        $sleepBatchCount++;
+                        ++$sleepBatchCount;
                     }
 
                     if ($event['eventType'] == 'decision') {
-                        $evaluatedEventCount++;
-                        $totalEventCount++;
+                        ++$evaluatedEventCount;
+                        ++$totalEventCount;
 
-                        $event['campaign'] = array(
+                        $event['campaign'] = [
                             'id'   => $campaign->getId(),
                             'name' => $campaign->getName(),
-                        );
+                        ];
 
-                        $decisionEvent        = array(
-                            $campaignId => array(
+                        $decisionEvent = [
+                            $campaignId => [
                                 array_merge(
                                     $event,
-                                    array('children' => $decisionChildren[$event['id']])
-                                )
-                            )
-                        );
+                                    ['children' => $decisionChildren[$event['id']]]
+                                ),
+                            ],
+                        ];
                         $decisionTriggerEvent = new CampaignDecisionEvent($lead, $event['type'], null, $decisionEvent, $eventSettings, true);
                         $this->dispatcher->dispatch(
                             CampaignEvents::ON_EVENT_DECISION_TRIGGER,
                             $decisionTriggerEvent
                         );
                         if ($decisionTriggerEvent->wasDecisionTriggered()) {
-                            $executedEventCount++;
-                            $rootExecutedCount++;
+                            ++$executedEventCount;
+                            ++$rootExecutedCount;
 
                             $this->logger->debug(
                                 'CAMPAIGN: Decision ID# '.$event['id'].' for contact ID# '.$lead->getId()
@@ -646,7 +646,7 @@ public function triggerStartingEvents(
                             $executedEventCount,
                             $totalEventCount
                         )) {
-                            $rootExecutedCount++;
+                            ++$rootExecutedCount;
                         }
                     }
 
@@ -661,7 +661,7 @@ public function triggerStartingEvents(
                 $this->em->detach($lead);
                 unset($lead);
 
-                $leadDebugCounter++;
+                ++$leadDebugCounter;
             }
 
             $this->em->clear('Mautic\LeadBundle\Entity\Lead');
@@ -672,7 +672,7 @@ public function triggerStartingEvents(
             // Free some memory
             gc_collect_cycles();
 
-            $batchDebugCounter++;
+            ++$batchDebugCounter;
         }
 
         if ($output) {
@@ -680,32 +680,32 @@ public function triggerStartingEvents(
             $output->writeln('');
         }
 
-        $counts = array(
+        $counts = [
             'events'         => $totalStartingEvents,
             'evaluated'      => $rootEvaluatedCount,
             'executed'       => $rootExecutedCount,
             'totalEvaluated' => $evaluatedEventCount,
-            'totalExecuted'  => $executedEventCount
-        );
+            'totalExecuted'  => $executedEventCount,
+        ];
         $this->logger->debug('CAMPAIGN: Counts - '.var_export($counts, true));
 
         return ($returnCounts) ? $counts : $executedEventCount;
     }
 
     /**
-     * Execute or schedule an event. Condition events are executed recursively
+     * Execute or schedule an event. Condition events are executed recursively.
      *
-     * @param  array          $event
-     * @param  Campaign       $campaign
-     * @param  Lead           $lead
-     * @param  array          $eventSettings
-     * @param  bool           $allowNegative
-     * @param  \DateTime      $parentTriggeredDate
-     * @param  \DateTime|bool $eventTriggerDate
-     * @param  bool           $logExists
-     * @param  integer        $evaluatedEventCount The number of events evaluated for the current method (kickoff, negative/inaction, scheduled)
-     * @param  integer        $executedEventCount  The number of events successfully executed for the current method
-     * @param  integer        $totalEventCount     The total number of events across all methods
+     * @param array          $event
+     * @param Campaign       $campaign
+     * @param Lead           $lead
+     * @param array          $eventSettings
+     * @param bool           $allowNegative
+     * @param \DateTime      $parentTriggeredDate
+     * @param \DateTime|bool $eventTriggerDate
+     * @param bool           $logExists
+     * @param int            $evaluatedEventCount The number of events evaluated for the current method (kickoff, negative/inaction, scheduled)
+     * @param int            $executedEventCount  The number of events successfully executed for the current method
+     * @param int            $totalEventCount     The total number of events across all methods
      *
      * @return bool
      */
@@ -722,8 +722,8 @@ public function executeEvent(
         &$executedEventCount = 0,
         &$totalEventCount = 0
     ) {
-        $evaluatedEventCount++;
-        $totalEventCount++;
+        ++$evaluatedEventCount;
+        ++$totalEventCount;
 
         // Get event settings if applicable
         if ($eventSettings === null) {
@@ -754,14 +754,14 @@ public function executeEvent(
         }
 
         // Set campaign ID
-        $event['campaign'] = array(
+        $event['campaign'] = [
             'id'   => $campaign->getId(),
             'name' => $campaign->getName(),
-        );
+        ];
 
         // Ensure properties is an array
         if ($event['properties'] === null) {
-            $event['properties'] = array();
+            $event['properties'] = [];
         } elseif (!is_array($event['properties'])) {
             $event['properties'] = unserialize($event['properties']);
         }
@@ -782,10 +782,10 @@ public function executeEvent(
         if ($logExists) {
             $log = $this->em->getReference(
                 'MauticCampaignBundle:LeadEventLog',
-                array(
+                [
                     'lead'  => $lead->getId(),
-                    'event' => $event['id']
-                )
+                    'event' => $event['id'],
+                ]
             );
         } else {
             $systemTriggered = !defined('MAUTIC_CAMPAIGN_NOT_SYSTEM_TRIGGERED');
@@ -793,13 +793,12 @@ public function executeEvent(
         }
 
         if ($eventTriggerDate instanceof \DateTime) {
-            $executedEventCount++;
+            ++$executedEventCount;
 
             $log->setIsScheduled(true);
             $log->setTriggerDate($eventTriggerDate);
             $repo->saveEntity($log);
 
-
             //lead actively triggered this event, a decision wasn't involved, or it was system triggered and a "no" path so schedule the event to be fired at the defined time
             $this->logger->debug(
                 'CAMPAIGN: '.ucfirst($event['eventType']).' ID# '.$event['id'].' for contact ID# '.$lead->getId()
@@ -807,14 +806,14 @@ public function executeEvent(
             );
 
             if ($this->dispatcher->hasListeners(CampaignEvents::ON_EVENT_SCHEDULED)) {
-                $args = array(
+                $args = [
                     'eventSettings'   => $thisEventSettings,
                     'eventDetails'    => null,
                     'event'           => $event,
                     'lead'            => $lead,
                     'systemTriggered' => true,
-                    'dateScheduled'   => $eventTriggerDate
-                );
+                    'dateScheduled'   => $eventTriggerDate,
+                ];
 
                 $scheduledEvent = new CampaignScheduledEvent($args);
                 $this->dispatcher->dispatch(CampaignEvents::ON_EVENT_SCHEDULED, $scheduledEvent);
@@ -860,14 +859,14 @@ public function executeEvent(
                 $repo->saveEntity($response);
                 $this->em->detach($response);
 
-                $executedEventCount++;
+                ++$executedEventCount;
 
                 $this->logger->debug(
                     'CAMPAIGN: Listener handled event for '.ucfirst($event['eventType']).' ID# '.$event['id'].' for contact ID# '.$lead->getId()
                 );
             } elseif ($response === false && $event['eventType'] == 'action') {
                 $result = false;
-                $debug = 'CAMPAIGN: '.ucfirst($event['eventType']).' ID# '.$event['id'].' for contact ID# '.$lead->getId().' failed with a response of '.var_export($response, true);
+                $debug  = 'CAMPAIGN: '.ucfirst($event['eventType']).' ID# '.$event['id'].' for contact ID# '.$lead->getId().' failed with a response of '.var_export($response, true);
 
                 // Something failed
                 if ($wasScheduled || !empty($this->scheduleTimeForFailedEvents)) {
@@ -889,7 +888,7 @@ public function executeEvent(
 
                 $this->logger->debug($debug);
             } else {
-                $executedEventCount++;
+                ++$executedEventCount;
 
                 if ($response !== true) {
                     if ($this->triggeredResponses !== false) {
@@ -939,18 +938,18 @@ public function executeEvent(
     }
 
     /**
-     * Handles condition type events
+     * Handles condition type events.
      *
-     * @param  boolean  $response
-     * @param  array    $eventSettings
-     * @param  array    $event
-     * @param  Campaign $campaign
-     * @param  Lead     $lead
-     * @param  integer  $evaluatedEventCount The number of events evaluated for the current method (kickoff, negative/inaction, scheduled)
-     * @param  integer  $executedEventCount  The number of events successfully executed for the current method
-     * @param  integer  $totalEventCount     The total number of events across all methods
+     * @param bool     $response
+     * @param array    $eventSettings
+     * @param array    $event
+     * @param Campaign $campaign
+     * @param Lead     $lead
+     * @param int      $evaluatedEventCount The number of events evaluated for the current method (kickoff, negative/inaction, scheduled)
+     * @param int      $executedEventCount  The number of events successfully executed for the current method
+     * @param int      $totalEventCount     The total number of events across all methods
      *
-     * @return bool     True if an event was executed
+     * @return bool True if an event was executed
      */
     public function handleCondition(
         $response,
@@ -963,7 +962,6 @@ public function handleCondition(
         &$totalEventCount = 0
     ) {
         if (empty($event['eventType']) || $event['eventType'] != 'condition') {
-
             return false;
         }
 
@@ -1005,9 +1003,10 @@ public function handleCondition(
      * @param int             $limit
      * @param bool            $max
      * @param OutputInterface $output
-     * @param bool|false      $returnCounts If true, returns array of counters
+     * @param bool|false      $returnCounts    If true, returns array of counters
      *
      * @return int
+     *
      * @throws \Doctrine\ORM\ORMException
      */
     public function triggerScheduledEvents(
@@ -1035,7 +1034,7 @@ public function triggerScheduledEvents(
             $output->writeln(
                 $this->translator->trans(
                     'mautic.campaign.trigger.event_count',
-                    array('%events%' => $totalScheduledCount, '%batch%' => $limit)
+                    ['%events%' => $totalScheduledCount, '%batch%' => $limit]
                 )
             );
         }
@@ -1043,13 +1042,13 @@ public function triggerScheduledEvents(
         if (empty($totalScheduledCount)) {
             $this->logger->debug('CAMPAIGN: No events to trigger');
 
-            return ($returnCounts) ? array(
+            return ($returnCounts) ? [
                 'events'         => 0,
                 'evaluated'      => 0,
                 'executed'       => 0,
                 'totalEvaluated' => 0,
-                'totalExecuted'  => 0
-            ) : 0;
+                'totalExecuted'  => 0,
+            ] : 0;
         }
 
         // Get events to avoid joins
@@ -1083,32 +1082,32 @@ public function triggerScheduledEvents(
             if (empty($events)) {
                 unset($campaignEvents, $event, $leads, $eventSettings);
 
-                $counts = array(
+                $counts = [
                     'events'         => $totalScheduledCount,
                     'evaluated'      => $scheduledEvaluatedCount,
                     'executed'       => $scheduledExecutedCount,
                     'totalEvaluated' => $evaluatedEventCount,
-                    'totalExecuted'  => $executedEventCount
-                );
+                    'totalExecuted'  => $executedEventCount,
+                ];
                 $this->logger->debug('CAMPAIGN: Counts - '.var_export($counts, true));
 
                 return ($returnCounts) ? $counts : $executedEventCount;
             }
 
             $leads = $this->leadModel->getEntities(
-                array(
-                    'filter'     => array(
-                        'force' => array(
-                            array(
+                [
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'l.id',
                                 'expr'   => 'in',
-                                'value'  => array_keys($events)
-                            )
-                        )
-                    ),
+                                'value'  => array_keys($events),
+                            ],
+                        ],
+                    ],
                     'orderBy'    => 'l.id',
-                    'orderByDir' => 'asc'
-                )
+                    'orderByDir' => 'asc',
+                ]
             );
 
             if (!count($leads)) {
@@ -1138,23 +1137,23 @@ public function triggerScheduledEvents(
                 $this->logger->debug('CAMPAIGN: Processing the following events for contact ID '.$leadId.': '.implode(', ', array_keys($leadEvents)));
 
                 foreach ($leadEvents as $log) {
-                    $scheduledEvaluatedCount++;
+                    ++$scheduledEvaluatedCount;
 
                     if ($sleepBatchCount == $limit) {
                         // Keep CPU down
                         $this->batchSleep();
                         $sleepBatchCount = 0;
                     } else {
-                        $sleepBatchCount++;
+                        ++$sleepBatchCount;
                     }
 
                     $event = $campaignEvents[$log['event_id']];
 
                     // Set campaign ID
-                    $event['campaign'] = array(
+                    $event['campaign'] = [
                         'id'   => $campaignId,
-                        'name' => $campaignName
-                    );
+                        'name' => $campaignName,
+                    ];
 
                     // Execute event
                     if ($this->executeEvent(
@@ -1170,7 +1169,7 @@ public function triggerScheduledEvents(
                         $executedEventCount,
                         $totalEventCount
                     )) {
-                        $scheduledExecutedCount++;
+                        ++$scheduledExecutedCount;
                     }
 
                     if ($max && $totalEventCount >= $max) {
@@ -1185,24 +1184,23 @@ public function triggerScheduledEvents(
 
                         // Hit the max, bye bye
 
-                        $counts = array(
+                        $counts = [
                             'events'         => $totalScheduledCount,
                             'evaluated'      => $scheduledEvaluatedCount,
                             'executed'       => $scheduledExecutedCount,
                             'totalEvaluated' => $evaluatedEventCount,
-                            'totalExecuted'  => $executedEventCount
-                        );
+                            'totalExecuted'  => $executedEventCount,
+                        ];
                         $this->logger->debug('CAMPAIGN: Counts - '.var_export($counts, true));
 
                         return ($returnCounts) ? $counts : $executedEventCount;
-
                     } elseif ($output) {
                         $currentCount = ($max) ? $totalEventCount : $evaluatedEventCount;
                         $progress->setProgress($currentCount);
                     }
                 }
 
-                $leadDebugCounter++;
+                ++$leadDebugCounter;
             }
 
             // Free RAM
@@ -1213,7 +1211,7 @@ public function triggerScheduledEvents(
             // Free some memory
             gc_collect_cycles();
 
-            $batchDebugCounter++;
+            ++$batchDebugCounter;
         }
 
         if ($output) {
@@ -1221,27 +1219,27 @@ public function triggerScheduledEvents(
             $output->writeln('');
         }
 
-        $counts = array(
+        $counts = [
             'events'         => $totalScheduledCount,
             'evaluated'      => $scheduledEvaluatedCount,
             'executed'       => $scheduledExecutedCount,
             'totalEvaluated' => $evaluatedEventCount,
-            'totalExecuted'  => $executedEventCount
-        );
+            'totalExecuted'  => $executedEventCount,
+        ];
         $this->logger->debug('CAMPAIGN: Counts - '.var_export($counts, true));
 
         return ($returnCounts) ? $counts : $executedEventCount;
     }
 
     /**
-     * Find and trigger the negative events, i.e. the events with a no decision path
+     * Find and trigger the negative events, i.e. the events with a no decision path.
      *
      * @param Campaign        $campaign
      * @param int             $totalEventCount
      * @param int             $limit
      * @param bool            $max
      * @param OutputInterface $output
-     * @param bool|false      $returnCounts If true, returns array of counters
+     * @param bool|false      $returnCounts    If true, returns array of counters
      *
      * @return int
      */
@@ -1267,8 +1265,8 @@ public function triggerNegativeEvents(
         $campaignEvents = $repo->getCampaignEvents($campaignId);
 
         // Get an array of events that are non-action based
-        $nonActionEvents = array();
-        $actionEvents    = array();
+        $nonActionEvents = [];
+        $actionEvents    = [];
         foreach ($campaignEvents as $id => $e) {
             if (!empty($e['decisionPath']) && !empty($e['parent_id']) && $campaignEvents[$e['parent_id']]['eventType'] != 'condition') {
                 if ($e['decisionPath'] == 'no') {
@@ -1295,12 +1293,12 @@ public function triggerNegativeEvents(
             $output->writeln(
                 $this->translator->trans(
                     'mautic.campaign.trigger.lead_count_analyzed',
-                    array('%leads%' => $leadCount, '%batch%' => $limit)
+                    ['%leads%' => $leadCount, '%batch%' => $limit]
                 )
             );
         }
 
-        $start               = $leadProcessedCount = $lastRoundPercentage = $executedEventCount = $evaluatedEventCount = $negativeExecutedCount = $negativeEvaluatedCount = 0;
+        $start               = $leadProcessedCount               = $lastRoundPercentage               = $executedEventCount               = $evaluatedEventCount               = $negativeExecutedCount               = $negativeEvaluatedCount               = 0;
         $nonActionEventCount = $leadCount * count($nonActionEvents);
         $eventSettings       = $this->campaignModel->getEvents();
         $maxCount            = ($max) ? $max : $nonActionEventCount;
@@ -1323,10 +1321,10 @@ public function triggerNegativeEvents(
                 $this->logger->debug('CAMPAIGN: Batch #'.$batchDebugCounter);
 
                 // Get batched campaign ids
-                $campaignLeads = $campaignRepo->getCampaignLeads($campaignId, $start, $limit, array('cl.lead_id, cl.date_added'));
+                $campaignLeads = $campaignRepo->getCampaignLeads($campaignId, $start, $limit, ['cl.lead_id, cl.date_added']);
 
-                $campaignLeadIds   = array();
-                $campaignLeadDates = array();
+                $campaignLeadIds   = [];
+                $campaignLeadDates = [];
                 foreach ($campaignLeads as $r) {
                     $campaignLeadIds[]                = $r['lead_id'];
                     $campaignLeadDates[$r['lead_id']] = $r['date_added'];
@@ -1352,14 +1350,14 @@ public function triggerNegativeEvents(
                     if ($grandParentId) {
                         $this->logger->debug('CAMPAIGN: Checking for contacts based on grand parent execution.');
 
-                        $leadLog         = $repo->getEventLog($campaignId, $campaignLeadIds, array($grandParentId), array_keys($events), true);
+                        $leadLog         = $repo->getEventLog($campaignId, $campaignLeadIds, [$grandParentId], array_keys($events), true);
                         $applicableLeads = array_keys($leadLog);
                     } else {
                         $this->logger->debug('CAMPAIGN: Checking for contacts based on exclusion due to being at root level');
 
                         // The event has no grandparent (likely because the decision is first in the campaign) so find leads that HAVE
                         // already executed the events in the root level and exclude them
-                        $havingEvents      = (isset($actionEvents[$parentId]))
+                        $havingEvents = (isset($actionEvents[$parentId]))
                             ? array_merge($actionEvents[$parentId], array_keys($events))
                             : array_keys(
                                 $events
@@ -1383,19 +1381,19 @@ public function triggerNegativeEvents(
 
                     // Get the leads
                     $leads = $this->leadModel->getEntities(
-                        array(
-                            'filter'     => array(
-                                'force' => array(
-                                    array(
+                        [
+                            'filter' => [
+                                'force' => [
+                                    [
                                         'column' => 'l.id',
                                         'expr'   => 'in',
-                                        'value'  => $applicableLeads
-                                    )
-                                )
-                            ),
+                                        'value'  => $applicableLeads,
+                                    ],
+                                ],
+                            ],
                             'orderBy'    => 'l.id',
-                            'orderByDir' => 'asc'
-                        )
+                            'orderByDir' => 'asc',
+                        ]
                     );
 
                     if (!count($leads)) {
@@ -1410,7 +1408,7 @@ public function triggerNegativeEvents(
                     $leadDebugCounter = 1;
                     /** @var \Mautic\LeadBundle\Entity\Lead $lead */
                     foreach ($leads as $lead) {
-                        $negativeEvaluatedCount++;
+                        ++$negativeEvaluatedCount;
 
                         // Set lead for listeners
                         $this->leadModel->setSystemCurrentLead($lead);
@@ -1428,7 +1426,7 @@ public function triggerNegativeEvents(
                             $grandParentDate = (new DateTimeHelper($utcDateString))->getLocalDateTime();
 
                             // Non-decision has not taken place yet, so cycle over each associated action to see if timing is right
-                            $eventTiming   = array();
+                            $eventTiming   = [];
                             $executeAction = false;
                             foreach ($events as $id => $e) {
                                 if ($sleepBatchCount == $limit) {
@@ -1436,7 +1434,7 @@ public function triggerNegativeEvents(
                                     $this->batchSleep();
                                     $sleepBatchCount = 0;
                                 } else {
-                                    $sleepBatchCount++;
+                                    ++$sleepBatchCount;
                                 }
 
                                 if (isset($leadLog[$lead->getId()]) && array_key_exists($id, $leadLog[$lead->getId()])) {
@@ -1480,13 +1478,13 @@ public function triggerNegativeEvents(
                                     $output->writeln('');
                                 }
 
-                                $counts = array(
+                                $counts = [
                                     'events'         => $nonActionEventCount,
                                     'evaluated'      => $negativeEvaluatedCount,
                                     'executed'       => $negativeExecutedCount,
                                     'totalEvaluated' => $evaluatedEventCount,
-                                    'totalExecuted'  => $executedEventCount
-                                );
+                                    'totalExecuted'  => $executedEventCount,
+                                ];
                                 $this->logger->debug('CAMPAIGN: Counts - '.var_export($counts, true));
 
                                 return ($returnCounts) ? $counts : $executedEventCount;
@@ -1502,10 +1500,10 @@ public function triggerNegativeEvents(
                             foreach ($eventTiming as $id => $eventTriggerDate) {
                                 // Set event
                                 $event             = $events[$id];
-                                $event['campaign'] = array(
+                                $event['campaign'] = [
                                     'id'   => $campaignId,
-                                    'name' => $campaignName
-                                );
+                                    'name' => $campaignName,
+                                ];
 
                                 // Set lead in case this is triggered by the system
                                 $this->leadModel->setSystemCurrentLead($lead);
@@ -1536,7 +1534,7 @@ public function triggerNegativeEvents(
                                         $decisionLogged = true;
                                     }
 
-                                    $negativeExecutedCount++;
+                                    ++$negativeExecutedCount;
                                 }
 
                                 unset($utcDateString, $grandParentDate);
@@ -1550,7 +1548,7 @@ public function triggerNegativeEvents(
                             $progress->setProgress($currentCount);
                         }
 
-                        $leadDebugCounter++;
+                        ++$leadDebugCounter;
 
                         // Save RAM
                         $this->em->detach($lead);
@@ -1575,36 +1573,35 @@ public function triggerNegativeEvents(
                 // Free some memory
                 gc_collect_cycles();
 
-                $batchDebugCounter++;
+                ++$batchDebugCounter;
             }
 
             if ($output) {
                 $progress->finish();
                 $output->writeln('');
             }
-
         }
 
-        $counts = array(
+        $counts = [
             'events'         => $nonActionEventCount,
             'evaluated'      => $negativeEvaluatedCount,
             'executed'       => $negativeExecutedCount,
             'totalEvaluated' => $evaluatedEventCount,
-            'totalExecuted'  => $executedEventCount
-        );
+            'totalExecuted'  => $executedEventCount,
+        ];
         $this->logger->debug('CAMPAIGN: Counts - '.var_export($counts, true));
 
         return ($returnCounts) ? $counts : $executedEventCount;
     }
 
     /**
-     * Invoke the event's callback function
+     * Invoke the event's callback function.
      *
-     * @param      $event
-     * @param      $settings
-     * @param null $lead
-     * @param null $eventDetails
-     * @param bool $systemTriggered
+     * @param              $event
+     * @param              $settings
+     * @param null         $lead
+     * @param null         $eventDetails
+     * @param bool         $systemTriggered
      * @param LeadEventLog $log
      *
      * @return bool|mixed
@@ -1619,7 +1616,7 @@ public function invokeEventCallback($event, $settings, $lead = null, $eventDetai
                 'event'           => $event,
                 'lead'            => $lead,
                 'systemTriggered' => $systemTriggered,
-                'config'          => $event['properties']
+                'config'          => $event['properties'],
             ], true, $log);
 
             $eventName = array_key_exists('eventName', $settings) ? $settings['eventName'] : null;
@@ -1639,19 +1636,19 @@ public function invokeEventCallback($event, $settings, $lead = null, $eventDetai
             return $campaignEvent->getResult();
         }
 
-        /**
+        /*
          * @deprecated 2.0 - to be removed in 3.0; Use the new eventName method instead
          */
         if (isset($settings['callback']) && is_callable($settings['callback'])) {
-            $args = array(
+            $args = [
                 'eventSettings'   => $settings,
                 'eventDetails'    => $eventDetails,
                 'event'           => $event,
                 'lead'            => $lead,
                 'factory'         => $this->factory,
                 'systemTriggered' => $systemTriggered,
-                'config'          => $event['properties']
-            );
+                'config'          => $event['properties'],
+            ];
 
             if (is_array($settings['callback'])) {
                 $reflection = new \ReflectionMethod($settings['callback'][0], $settings['callback'][1]);
@@ -1662,7 +1659,7 @@ public function invokeEventCallback($event, $settings, $lead = null, $eventDetai
                 $reflection = new \ReflectionMethod(null, $settings['callback']);
             }
 
-            $pass = array();
+            $pass = [];
             foreach ($reflection->getParameters() as $param) {
                 if (isset($args[$param->getName()])) {
                     $pass[] = $args[$param->getName()];
@@ -1691,7 +1688,7 @@ public function invokeEventCallback($event, $settings, $lead = null, $eventDetai
     }
 
     /**
-     * Check to see if the interval between events are appropriate to fire currentEvent
+     * Check to see if the interval between events are appropriate to fire currentEvent.
      *
      * @param           $action
      * @param \DateTime $parentTriggeredDate
@@ -1701,7 +1698,7 @@ public function invokeEventCallback($event, $settings, $lead = null, $eventDetai
      */
     public function checkEventTiming($action, \DateTime $parentTriggeredDate = null, $allowNegative = false)
     {
-        $now    = new \DateTime();
+        $now = new \DateTime();
 
         $this->logger->debug('CAMPAIGN: Check timing for '.ucfirst($action['eventType']).' ID# '.$action['id']);
 
@@ -1749,7 +1746,7 @@ public function checkEventTiming($action, \DateTime $parentTriggeredDate = null,
                 if ($triggerOn > $now) {
                     $this->logger->debug(
                         'CAMPAIGN: Date to execute ('.$triggerOn->format('Y-m-d H:i:s T').') is later than now ('.$now->format('Y-m-d H:i:s T')
-                        .')' . (($action['decisionPath'] == 'no') ? ' so ignore' : ' so schedule')
+                        .')'.(($action['decisionPath'] == 'no') ? ' so ignore' : ' so schedule')
                     );
 
                     // Save some RAM for batch processing
@@ -1784,7 +1781,6 @@ public function checkEventTiming($action, \DateTime $parentTriggeredDate = null,
 
                     return $return;
                 } elseif (!$pastDue) {
-
                     $this->logger->debug(
                         'CAMPAIGN: Non-negative comparison; Date to execute ('.$action['triggerDate']->format('Y-m-d H:i:s T').') compared to now ('
                         .$now->format('Y-m-d H:i:s T').') and is thus not past due'
@@ -1810,6 +1806,7 @@ public function checkEventTiming($action, \DateTime $parentTriggeredDate = null,
      * @param bool                                     $systemTriggered
      *
      * @return LeadEventLog
+     *
      * @throws \Doctrine\ORM\ORMException
      */
     public function getLogEntity($event, $campaign, $lead = null, $ipAddress = null, $systemTriggered = false)
@@ -1833,7 +1830,7 @@ public function getLogEntity($event, $campaign, $lead = null, $ipAddress = null,
         $log->setCampaign($campaign);
 
         if ($lead == null) {
-            $lead      = $this->leadModel->getCurrentLead();
+            $lead = $this->leadModel->getCurrentLead();
         }
         $log->setLead($lead);
         $log->setDateTriggered(new \DateTime());
@@ -1846,14 +1843,13 @@ public function getLogEntity($event, $campaign, $lead = null, $ipAddress = null,
     }
 
     /**
-     * Batch sleep according to settings
+     * Batch sleep according to settings.
      */
     protected function batchSleep()
     {
         $eventSleepTime = $this->batchCampaignSleepTime ? $this->batchCampaignSleepTime : ($this->batchSleepTime ? $this->batchSleepTime : 1);
 
         if (empty($eventSleepTime)) {
-
             return;
         }
 
@@ -1865,18 +1861,18 @@ protected function batchSleep()
     }
 
     /**
-     * Get line chart data of campaign events
+     * Get line chart data of campaign events.
      *
-     * @param char      $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getEventLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getEventLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
         $chart = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
         $query = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
diff --git a/app/bundles/CampaignBundle/Security/Permissions/CampaignPermissions.php b/app/bundles/CampaignBundle/Security/Permissions/CampaignPermissions.php
index 2b6c7378bda..4fcb20f634f 100644
--- a/app/bundles/CampaignBundle/Security/Permissions/CampaignPermissions.php
+++ b/app/bundles/CampaignBundle/Security/Permissions/CampaignPermissions.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CampaignBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class CampaignPermissions
- *
- * @package Mautic\CampaignBundle\Security\Permissions
+ * Class CampaignPermissions.
  */
 class CampaignPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/CampaignBundle/Views/Campaign/builder.html.php b/app/bundles/CampaignBundle/Views/Campaign/builder.html.php
index da5947e46d8..ce175505224 100644
--- a/app/bundles/CampaignBundle/Views/Campaign/builder.html.php
+++ b/app/bundles/CampaignBundle/Views/Campaign/builder.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -14,7 +15,9 @@
 
     <div class="builder-content">
         <div id="CampaignCanvas">
-            <div id="CampaignEvent_newsource<?php if (!empty($campaignSources)) echo "_hide"; ?>" class="text-center list-campaign-source list-campaign-leadsource">
+            <div id="CampaignEvent_newsource<?php if (!empty($campaignSources)) {
+    echo '_hide';
+} ?>" class="text-center list-campaign-source list-campaign-leadsource">
                 <div class="campaign-event-content">
                     <div>
                         <span class="campaign-event-name ellipsis">
@@ -124,7 +127,9 @@ class="option_campaignLeadSource_<?php echo $option; ?>"
                                     data-target="#CampaignEventModal"
                                     title="<?php echo $view->escape($view['translator']->trans('mautic.campaign.leadsource.'.$option.'.tooltip')); ?>"
                                     value="<?php echo $option; ?>"
-                                <?php if (!empty($campaignSources[$option])) echo 'disabled'; ?>>
+                                <?php if (!empty($campaignSources[$option])) {
+                                        echo 'disabled';
+                                    } ?>>
                                 <span><?php echo $view['translator']->trans('mautic.campaign.leadsource.'.$option); ?></span>
                             </option>
                         <?php endforeach; ?>
@@ -185,8 +190,9 @@ class="option_campaignEvent_<?php echo str_replace('.', '', $k); ?>"
         $sourceFound = false;
 
         foreach ($canvasSettings['nodes'] as $n):
-        if (isset($campaignSources[$n['id']]))
+        if (isset($campaignSources[$n['id']])) {
             $sourceFound = true;
+        }
         ?>
 
         mQuery('#CampaignEvent_<?php echo $n['id']; ?>').css({
@@ -278,7 +284,7 @@ class="option_campaignEvent_<?php echo str_replace('.', '', $k); ?>"
             <?php
             $restrictions = [];
             foreach ($groupRestrictions as $event => $allowed):
-                $allowedString = implode("', '", $allowed);
+                $allowedString  = implode("', '", $allowed);
                 $restrictions[] = "'$event': ['$allowedString']";
             endforeach;
             ?>
@@ -296,7 +302,7 @@ class="option_campaignEvent_<?php echo str_replace('.', '', $k); ?>"
                 <?php
                 $restrictions = [];
                 foreach ($groupRestrictions as $event => $disallow):
-                    $allowedString = implode("', '", $disallow);
+                    $allowedString  = implode("', '", $disallow);
                     $restrictions[] = "'$event': ['$allowedString']";
                 endforeach;
                 ?>
diff --git a/app/bundles/CampaignBundle/Views/Campaign/details.html.php b/app/bundles/CampaignBundle/Views/Campaign/details.html.php
index 78ed4b160b9..ad3d8b37588 100644
--- a/app/bundles/CampaignBundle/Views/Campaign/details.html.php
+++ b/app/bundles/CampaignBundle/Views/Campaign/details.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'campaign');
-$view['slots']->set("headerTitle", $campaign->getName());
+$view['slots']->set('headerTitle', $campaign->getName());
 
 $view['slots']->set(
     'actions',
@@ -23,7 +23,7 @@
                 'delete' => $permissions['campaign:campaigns:delete'],
                 'close'  => $permissions['campaign:campaigns:view'],
             ],
-            'routeBase'       => 'campaign',
+            'routeBase' => 'campaign',
         ]
     )
 );
@@ -37,13 +37,13 @@
 $conditions = trim($view->render('MauticCampaignBundle:Campaign:events.html.php', ['events' => $events['condition']]));
 
 switch (true) {
-    case (!empty($decisions)):
+    case !empty($decisions):
         $firstTab = 'decision';
         break;
-    case (!empty($actions)):
+    case !empty($actions):
         $firstTab = 'action';
         break;
-    case (!empty($conditions)):
+    case !empty($conditions):
         $firstTab = 'condition';
         break;
 }
@@ -140,8 +140,8 @@ class="caret"></span> <?php echo $view['translator']->trans('mautic.core.details
             <ul class="nav nav-tabs pr-md pl-md">
                 <?php if ($decisions): ?>
                     <li class="<?php if ('decision' == $firstTab) {
-                        echo 'active';
-                    } ?>">
+                                    echo 'active';
+                                } ?>">
                         <a href="#decisions-container" role="tab" data-toggle="tab">
                             <?php echo $view['translator']->trans('mautic.campaign.event.decisions.header'); ?>
                         </a>
@@ -149,8 +149,8 @@ class="caret"></span> <?php echo $view['translator']->trans('mautic.core.details
                 <?php endif; ?>
                 <?php if ($actions): ?>
                     <li class="<?php if ('action' == $firstTab) {
-                        echo 'active';
-                    } ?>">
+                                    echo 'active';
+                                } ?>">
                         <a href="#actions-container" role="tab" data-toggle="tab">
                             <?php echo $view['translator']->trans('mautic.campaign.event.actions.header'); ?>
                         </a>
@@ -158,8 +158,8 @@ class="caret"></span> <?php echo $view['translator']->trans('mautic.core.details
                 <?php endif; ?>
                 <?php if ($conditions): ?>
                     <li class="<?php if ('condition' == $firstTab) {
-                        echo 'active';
-                    } ?>">
+                                    echo 'active';
+                                } ?>">
                         <a href="#conditions-container" role="tab" data-toggle="tab">
                             <?php echo $view['translator']->trans('mautic.campaign.event.conditions.header'); ?>
                         </a>
@@ -179,22 +179,22 @@ class="caret"></span> <?php echo $view['translator']->trans('mautic.core.details
             <!-- #events-container -->
             <?php if ($decisions): ?>
                 <div class="<?php if ('decision' == $firstTab) {
-                    echo 'active ';
-                } ?>tab-pane fade in bdr-w-0" id="decisions-container">
+                                    echo 'active ';
+                                } ?>tab-pane fade in bdr-w-0" id="decisions-container">
                     <?php echo $decisions; ?>
                 </div>
             <?php endif; ?>
             <?php if ($actions): ?>
                 <div class="<?php if ('action' == $firstTab) {
-                    echo 'active ';
-                } ?>tab-pane fade in bdr-w-0" id="actions-container">
+                                    echo 'active ';
+                                } ?>tab-pane fade in bdr-w-0" id="actions-container">
                     <?php echo $actions; ?>
                 </div>
             <?php endif; ?>
             <?php if ($conditions): ?>
                 <div class="<?php if ('condition' == $firstTab) {
-                    echo 'active ';
-                } ?>tab-pane fade in bdr-w-0" id="conditions-container">
+                                    echo 'active ';
+                                } ?>tab-pane fade in bdr-w-0" id="conditions-container">
                     <?php echo $conditions; ?>
                 </div>
             <?php endif; ?>
diff --git a/app/bundles/CampaignBundle/Views/Campaign/events.html.php b/app/bundles/CampaignBundle/Views/Campaign/events.html.php
index 16d42fbca1c..b3f5da930c1 100644
--- a/app/bundles/CampaignBundle/Views/Campaign/events.html.php
+++ b/app/bundles/CampaignBundle/Views/Campaign/events.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <?php if (!empty($events) && is_array($events)) : ?>
 <!-- start: trigger type event -->
@@ -34,7 +34,7 @@
                     <h6 class="text-white dark-sm"><?php echo $event['description']; ?></h6>
                 </div>
                 <div class="col-md-4 va-m text-right">
-                    <em class="text-white dark-sm"><?php echo $view['translator']->trans('mautic.campaign.' . $event['type']); ?></em>
+                    <em class="text-white dark-sm"><?php echo $view['translator']->trans('mautic.campaign.'.$event['type']); ?></em>
                 </div>
             </div>
         </li>
diff --git a/app/bundles/CampaignBundle/Views/Campaign/form.html.php b/app/bundles/CampaignBundle/Views/Campaign/form.html.php
index 923371d5d6d..cf5c448e6f9 100644
--- a/app/bundles/CampaignBundle/Views/Campaign/form.html.php
+++ b/app/bundles/CampaignBundle/Views/Campaign/form.html.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'campaign');
 
 $header = ($entity->getId()) ?
     $view['translator']->trans('mautic.campaign.menu.edit',
-        array('%name%' => $view['translator']->trans($entity->getName()))) :
+        ['%name%' => $view['translator']->trans($entity->getName())]) :
     $view['translator']->trans('mautic.campaign.menu.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 ?>
 
 <?php echo $view['form']->start($form); ?>
@@ -52,10 +52,10 @@
 </div>
 
 <?php echo $view['form']->end($form); ?>
-<?php echo $view->render('MauticCampaignBundle:Campaign:builder.html.php', array(
+<?php echo $view->render('MauticCampaignBundle:Campaign:builder.html.php', [
     'campaignId'      => $form['sessionId']->vars['data'],
     'campaignEvents'  => $campaignEvents,
     'campaignSources' => $campaignSources,
     'eventSettings'   => $eventSettings,
-    'canvasSettings'  => $entity->getCanvasSettings()
-)); ?>
+    'canvasSettings'  => $entity->getCanvasSettings(),
+]); ?>
diff --git a/app/bundles/CampaignBundle/Views/Campaign/index.html.php b/app/bundles/CampaignBundle/Views/Campaign/index.html.php
index c0034273f51..3c7108a3e40 100644
--- a/app/bundles/CampaignBundle/Views/Campaign/index.html.php
+++ b/app/bundles/CampaignBundle/Views/Campaign/index.html.php
@@ -1,40 +1,41 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'campaign');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.campaign.campaigns'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.campaign.campaigns'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['campaign:campaigns:create']
-            ),
-            'routeBase'       => 'campaign'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['campaign:campaigns:create'],
+            ],
+            'routeBase' => 'campaign',
+        ]
     )
 );
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0">
-	<?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'searchHelp'  => 'mautic.core.help.searchcommands',
-        'action'      => $currentRoute,
-        'routeBase'   => 'campaign',
-        'templateButtons' => array(
-            'delete' => $permissions['campaign:campaigns:delete']
-        ),
-        'filters'     => $filters
-    )); ?>
+	<?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.core.help.searchcommands',
+        'action'          => $currentRoute,
+        'routeBase'       => 'campaign',
+        'templateButtons' => [
+            'delete' => $permissions['campaign:campaigns:delete'],
+        ],
+        'filters' => $filters,
+    ]); ?>
 
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/CampaignBundle/Views/Campaign/leads.html.php b/app/bundles/CampaignBundle/Views/Campaign/leads.html.php
index 71143689ecf..8f10ae1aec7 100644
--- a/app/bundles/CampaignBundle/Views/Campaign/leads.html.php
+++ b/app/bundles/CampaignBundle/Views/Campaign/leads.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -23,7 +24,7 @@
                                         <?php $img = $view['gravatar']->getImage($item['email'], '250'); ?>
                                     <?php else : ?>
                                         <?php $socialData = unserialize($item['social_cache']); ?>
-                                        <?php $img = (!empty($socialData[$preferred]['profile']['profileImage'])) ? $socialData[$preferred]['profile']['profileImage'] : $view['gravatar']->getImage($item['email'], '250'); ?>
+                                        <?php $img        = (!empty($socialData[$preferred]['profile']['profileImage'])) ? $socialData[$preferred]['profile']['profileImage'] : $view['gravatar']->getImage($item['email'], '250'); ?>
                                     <?php endif; ?>
                                     <img class="img img-responsive" src="<?php echo $img; ?>" />
                                 </span>
@@ -35,11 +36,11 @@
                                     <div class="pull-right label label-danger"><i class="fa fa-ban"> </i></div>
                                 <?php endif; ?>
                                 <h4 class="fw-sb mb-xs">
-                                    <a href="<?php echo $view['router']->path('mautic_contact_action', array("objectAction" => "view", "objectId" => $item['id'])); ?>" data-toggle="ajax">
+                                    <a href="<?php echo $view['router']->path('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $item['id']]); ?>" data-toggle="ajax">
                                         <span>
                                             <?php
                                             if (!empty($item['firstname']) && !empty($item['lastname'])):
-                                                echo $item['lastname'] . ', ' . $item['firstname'];
+                                                echo $item['lastname'].', '.$item['firstname'];
                                             elseif (!empty($item['lastname'])):
                                                 echo $item['lastname'];
                                             elseif (!empty($item['firstname'])):
@@ -58,8 +59,8 @@
                                 </div>
                                 <div class="text-muted mb-1">
                                     <i class="fa fa-fw fa-map-marker mr-xs"></i><?php
-                                    $available = array('city', 'state');
-                                    $location = array();
+                                    $available = ['city', 'state'];
+                                    $location  = [];
                                     foreach ($available as $a):
                                         if (!empty($item[$a])):
                                             $location[] = $a;
@@ -86,17 +87,17 @@
 <?php if (count($items)): ?>
 <div class="panel-footer">
     <?php
-    $link = (isset($link))? $link : 'mautic_contact_index';
-    echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        'totalItems'      => $totalItems,
-        'page'            => $page,
-        'limit'           => $limit,
-        'menuLinkId'      => $link,
-        'baseUrl'         => (isset($objectId)) ? $view['router']->path($link, array('objectId' => $objectId)) : $view['router']->path($link),
-        'tmpl'            => (!in_array($tmpl, array('grid', 'index'))) ? $tmpl : $indexMode,
-        'sessionVar'      => (isset($sessionVar)) ? $sessionVar : 'lead',
-        'target'          => (isset($target)) ? $target : '.page-list'
-    ));
+    $link = (isset($link)) ? $link : 'mautic_contact_index';
+    echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => $totalItems,
+        'page'       => $page,
+        'limit'      => $limit,
+        'menuLinkId' => $link,
+        'baseUrl'    => (isset($objectId)) ? $view['router']->path($link, ['objectId' => $objectId]) : $view['router']->path($link),
+        'tmpl'       => (!in_array($tmpl, ['grid', 'index'])) ? $tmpl : $indexMode,
+        'sessionVar' => (isset($sessionVar)) ? $sessionVar : 'lead',
+        'target'     => (isset($target)) ? $target : '.page-list',
+    ]);
     ?>
 </div>
 <?php endif; ?>
diff --git a/app/bundles/CampaignBundle/Views/Campaign/list.html.php b/app/bundles/CampaignBundle/Views/Campaign/list.html.php
index 0399d6ddcd1..ae3c18109cb 100644
--- a/app/bundles/CampaignBundle/Views/Campaign/list.html.php
+++ b/app/bundles/CampaignBundle/Views/Campaign/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticCampaignBundle:Campaign:index.html.php');
+}
 ?>
 <?php if (count($items)): ?>
 <div class="table-responsive">
@@ -15,32 +17,32 @@
         <thead>
             <tr>
                 <?php
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#campaignTable'
-                ));
+                    'target'   => '#campaignTable',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'campaign',
                     'orderBy'    => 'c.name',
                     'text'       => 'mautic.core.name',
                     'class'      => 'col-campaign-name',
-                    'default'    => true
-                ));
+                    'default'    => true,
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'campaign',
                     'orderBy'    => 'cat.title',
                     'text'       => 'mautic.core.category',
-                    'class'      => 'visible-md visible-lg col-campaign-category'
-                ));
+                    'class'      => 'visible-md visible-lg col-campaign-category',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'campaign',
                     'orderBy'    => 'c.id',
                     'text'       => 'mautic.core.id',
-                    'class'      => 'visible-md visible-lg col-campaign-id'
-                ));
+                    'class'      => 'visible-md visible-lg col-campaign-id',
+                ]);
                 ?>
             </tr>
         </thead>
@@ -49,24 +51,24 @@
             <tr>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => $permissions['campaign:campaigns:edit'],
-                            'clone'     => $permissions['campaign:campaigns:create'],
-                            'delete'    => $permissions['campaign:campaigns:delete'],
-                        ),
-                        'routeBase' => 'campaign'
-                    ));
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => $permissions['campaign:campaigns:edit'],
+                            'clone'  => $permissions['campaign:campaigns:create'],
+                            'delete' => $permissions['campaign:campaigns:delete'],
+                        ],
+                        'routeBase' => 'campaign',
+                    ]);
                     ?>
                 </td>
                 <td>
                     <div>
-                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array(
-                            'item'       => $item,
-                            'model'      => 'campaign'
-                        )); ?>
-                        <a href="<?php echo $view['router']->path('mautic_campaign_action', array("objectAction" => "view", "objectId" => $item->getId())); ?>" data-toggle="ajax">
+                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', [
+                            'item'  => $item,
+                            'model' => 'campaign',
+                        ]); ?>
+                        <a href="<?php echo $view['router']->path('mautic_campaign_action', ['objectAction' => 'view', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                             <?php echo $item->getName(); ?>
                         </a>
                     </div>
@@ -77,7 +79,7 @@
                 <td class="visible-md visible-lg">
                     <?php $category = $item->getCategory(); ?>
                     <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                    <?php $color    = ($category) ? '#' . $category->getColor() : 'inherit'; ?>
+                    <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                     <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                 </td>
                 <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
@@ -87,15 +89,15 @@
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems"      => count($items),
-        "page"            => $page,
-        "limit"           => $limit,
-        "menuLinkId"      => 'mautic_campaign_index',
-        "baseUrl"         => $view['router']->path('mautic_campaign_index'),
-        'sessionVar'      => 'campaign'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => count($items),
+        'page'       => $page,
+        'limit'      => $limit,
+        'menuLinkId' => 'mautic_campaign_index',
+        'baseUrl'    => $view['router']->path('mautic_campaign_index'),
+        'sessionVar' => 'campaign',
+    ]); ?>
 </div>
  <?php else: ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', array('tip' => 'mautic.campaign.noresults.tip')); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', ['tip' => 'mautic.campaign.noresults.tip']); ?>
 <?php endif; ?>
diff --git a/app/bundles/CampaignBundle/Views/Event/form.html.php b/app/bundles/CampaignBundle/Views/Event/form.html.php
index 129ee95bc1e..bcbe0d16e9a 100644
--- a/app/bundles/CampaignBundle/Views/Event/form.html.php
+++ b/app/bundles/CampaignBundle/Views/Event/form.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CampaignBundle/Views/Event/generic.html.php b/app/bundles/CampaignBundle/Views/Event/generic.html.php
index e5b55c50ed8..a9702d3e16f 100644
--- a/app/bundles/CampaignBundle/Views/Event/generic.html.php
+++ b/app/bundles/CampaignBundle/Views/Event/generic.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-if (empty($route))
+if (empty($route)) {
     $route = 'mautic_campaignevent_action';
+}
 
 ?>
 <?php if (empty($update)): ?>
@@ -19,10 +20,10 @@
     </div>
 <?php if (empty($update)): ?>
     <div class="campaign-event-buttons hide">
-        <a data-toggle="ajaxmodal" data-target="#CampaignEventModal" href="<?php echo $view['router']->path($route, array('objectAction' => 'edit', 'objectId' => $event['id'], 'campaignId' => $campaignId)); ?>" class="btn btn-primary btn-xs btn-edit">
+        <a data-toggle="ajaxmodal" data-target="#CampaignEventModal" href="<?php echo $view['router']->path($route, ['objectAction' => 'edit', 'objectId' => $event['id'], 'campaignId' => $campaignId]); ?>" class="btn btn-primary btn-xs btn-edit">
             <i class="fa fa-pencil"></i>
         </a>
-        <a data-toggle="ajax" data-target="CampaignEvent_<?php echo $event['id'] ?>" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path($route, array('objectAction' => 'delete', 'objectId' => $event['id'], 'campaignId' => $campaignId)); ?>"  class="btn btn-delete btn-danger btn-xs">
+        <a data-toggle="ajax" data-target="CampaignEvent_<?php echo $event['id'] ?>" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path($route, ['objectAction' => 'delete', 'objectId' => $event['id'], 'campaignId' => $campaignId]); ?>"  class="btn btn-delete btn-danger btn-xs">
             <i class="fa fa-times"></i>
         </a>
     </div>
diff --git a/app/bundles/CampaignBundle/Views/FormTheme/Config/_config_campaignconfig_widget.html.php b/app/bundles/CampaignBundle/Views/FormTheme/Config/_config_campaignconfig_widget.html.php
index 8c26cede59c..07a6a1ea50f 100644
--- a/app/bundles/CampaignBundle/Views/FormTheme/Config/_config_campaignconfig_widget.html.php
+++ b/app/bundles/CampaignBundle/Views/FormTheme/Config/_config_campaignconfig_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CampaignBundle/Views/FormTheme/Event/_campaignevent_properties_row.html.php b/app/bundles/CampaignBundle/Views/FormTheme/Event/_campaignevent_properties_row.html.php
index cbc57b3b58e..1a1f7963f59 100644
--- a/app/bundles/CampaignBundle/Views/FormTheme/Event/_campaignevent_properties_row.html.php
+++ b/app/bundles/CampaignBundle/Views/FormTheme/Event/_campaignevent_properties_row.html.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo "<hr />\n";
-echo $view['form']->row($form);
\ No newline at end of file
+echo $view['form']->row($form);
diff --git a/app/bundles/CampaignBundle/Views/Source/form.html.php b/app/bundles/CampaignBundle/Views/Source/form.html.php
index 59e09d51083..e6d5ab26d5f 100644
--- a/app/bundles/CampaignBundle/Views/Source/form.html.php
+++ b/app/bundles/CampaignBundle/Views/Source/form.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -11,7 +12,7 @@
 <div class="bundle-form">
     <div class="bundle-form-header mb-15">
         <h3><?php echo $view['translator']->trans('mautic.campaign.leadsource.header.singular'); ?></h3>
-        <h6 class="text-muted"><?php echo $view['translator']->trans('mautic.campaign.leadsource.' . $sourceType. '.tooltip'); ?></h6>
+        <h6 class="text-muted"><?php echo $view['translator']->trans('mautic.campaign.leadsource.'.$sourceType.'.tooltip'); ?></h6>
     </div>
 
     <?php echo $view['form']->start($form); ?>
diff --git a/app/bundles/CampaignBundle/Views/Source/index.html.php b/app/bundles/CampaignBundle/Views/Source/index.html.php
index d41711c4d6d..e7af25ad7ed 100644
--- a/app/bundles/CampaignBundle/Views/Source/index.html.php
+++ b/app/bundles/CampaignBundle/Views/Source/index.html.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <?php if (empty($update)): ?>
 <div id="CampaignEvent_<?php echo $sourceType; ?>" data-type="source" class="draggable list-campaign-source list-campaign-leadsource">
 <?php endif; ?>
     <div class="campaign-event-content">
-        <div><span class="campaign-event-name ellipsis"><i class="mr-sm fa fa-<?php echo ($sourceType == 'lists') ? 'list': 'pencil-square-o'; ?>"></i><?php echo $names; ?></span></div>
+        <div><span class="campaign-event-name ellipsis"><i class="mr-sm fa fa-<?php echo ($sourceType == 'lists') ? 'list' : 'pencil-square-o'; ?>"></i><?php echo $names; ?></span></div>
     </div>
 <?php if (empty($update)): ?>
     <div class="campaign-event-buttons hide">
-        <a data-toggle="ajaxmodal" data-target="#CampaignEventModal" href="<?php echo $view['router']->path('mautic_campaignsource_action', array('objectAction' => 'edit', 'objectId' => $campaignId, 'sourceType' => $sourceType)); ?>" class="btn btn-primary btn-xs btn-edit">
+        <a data-toggle="ajaxmodal" data-target="#CampaignEventModal" href="<?php echo $view['router']->path('mautic_campaignsource_action', ['objectAction' => 'edit', 'objectId' => $campaignId, 'sourceType' => $sourceType]); ?>" class="btn btn-primary btn-xs btn-edit">
             <i class="fa fa-pencil"></i>
         </a>
-        <a data-toggle="ajax" data-target="CampaignEvent_<?php echo $sourceType; ?>" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path('mautic_campaignsource_action', array('objectAction' => 'delete', 'objectId' => $campaignId, 'sourceType' => $sourceType)); ?>"  class="btn btn-delete btn-danger btn-xs">
+        <a data-toggle="ajax" data-target="CampaignEvent_<?php echo $sourceType; ?>" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path('mautic_campaignsource_action', ['objectAction' => 'delete', 'objectId' => $campaignId, 'sourceType' => $sourceType]); ?>"  class="btn btn-delete btn-danger btn-xs">
             <i class="fa fa-times"></i>
         </a>
     </div>
diff --git a/app/bundles/CampaignBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/CampaignBundle/Views/SubscribedEvents/Search/global.html.php
index bd70801d8ec..9da53ade0fd 100644
--- a/app/bundles/CampaignBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/CampaignBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_campaign_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-        <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+    <a href="<?php echo $this->container->get('router')->generate('mautic_campaign_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+        <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
     </a>
 </div>
 <?php else: ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_campaign_action', array('objectAction' => 'view', 'objectId' => $campaign->getId())); ?>" data-toggle="ajax">
-    <?php echo $campaign->getName();?>
+<a href="<?php echo $this->container->get('router')->generate('mautic_campaign_action', ['objectAction' => 'view', 'objectId' => $campaign->getId()]); ?>" data-toggle="ajax">
+    <?php echo $campaign->getName(); ?>
 </a>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/bundles/CampaignBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/CampaignBundle/Views/SubscribedEvents/Timeline/index.html.php
index 68755529c2b..636f8304185 100644
--- a/app/bundles/CampaignBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/CampaignBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $item = $event['extra']['log'];
 ?>
 
 <?php if ($item['isScheduled']): ?>
-    <p class="mb-0 text-danger"><?php echo $view['translator']->trans('mautic.core.timeline.event.scheduled.time', array('%date%' => $view['date']->toFullConcat($item['triggerDate']), '%event%' => $event['eventLabel'])); ?></p>
+    <p class="mb-0 text-danger"><?php echo $view['translator']->trans('mautic.core.timeline.event.scheduled.time', ['%date%' => $view['date']->toFullConcat($item['triggerDate']), '%event%' => $event['eventLabel']]); ?></p>
 <?php endif; ?>
 
 <?php if (!empty($item['metadata']['timeline'])): ?>
@@ -19,8 +19,8 @@
 <?php endif; ?>
 
 <?php if ($item['campaign_description']): ?>
-    <p><?php echo $view['translator']->trans('mautic.campaign.campaign.description', array('%description%' => $item['campaign_description'])); ?></p>
+    <p><?php echo $view['translator']->trans('mautic.campaign.campaign.description', ['%description%' => $item['campaign_description']]); ?></p>
 <?php endif; ?>
 <?php if ($item['event_description']): ?>
-    <p><?php echo $view['translator']->trans('mautic.campaign.campaign.description', array('%description%' => $item['event_description'])); ?></p>
+    <p><?php echo $view['translator']->trans('mautic.campaign.campaign.description', ['%description%' => $item['event_description']]); ?></p>
 <?php endif; ?>
diff --git a/app/bundles/CategoryBundle/CategoryEvents.php b/app/bundles/CategoryBundle/CategoryEvents.php
index 8a69437859a..bf248f78dad 100644
--- a/app/bundles/CategoryBundle/CategoryEvents.php
+++ b/app/bundles/CategoryBundle/CategoryEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,9 +12,7 @@
 
 /**
  * Class CategoryBundle
- * Events available for CategoryBundle
- *
- * @package Mautic\CategoryBundle
+ * Events available for CategoryBundle.
  */
 final class CategoryEvents
 {
@@ -25,7 +24,7 @@ final class CategoryEvents
      *
      * @var string
      */
-    const CATEGORY_PRE_SAVE   = 'mautic.category_pre_save';
+    const CATEGORY_PRE_SAVE = 'mautic.category_pre_save';
 
     /**
      * The mautic.category_post_save event is thrown right after a category is persisted.
@@ -35,7 +34,7 @@ final class CategoryEvents
      *
      * @var string
      */
-    const CATEGORY_POST_SAVE   = 'mautic.category_post_save';
+    const CATEGORY_POST_SAVE = 'mautic.category_post_save';
 
     /**
      * The mautic.category_pre_delete event is thrown prior to when a category is deleted.
@@ -45,8 +44,7 @@ final class CategoryEvents
      *
      * @var string
      */
-    const CATEGORY_PRE_DELETE   = 'mautic.category_pre_delete';
-
+    const CATEGORY_PRE_DELETE = 'mautic.category_pre_delete';
 
     /**
      * The mautic.category_post_delete event is thrown after a category is deleted.
@@ -56,7 +54,7 @@ final class CategoryEvents
      *
      * @var string
      */
-    const CATEGORY_POST_DELETE   = 'mautic.category_post_delete';
+    const CATEGORY_POST_DELETE = 'mautic.category_post_delete';
 
     /**
      * The mautic.category_on_bundle_list_build event is thrown when a list of bundles supporting categories is build.
diff --git a/app/bundles/CategoryBundle/Config/config.php b/app/bundles/CategoryBundle/Config/config.php
index 4c1d5df59a0..61fa5ec2c23 100644
--- a/app/bundles/CategoryBundle/Config/config.php
+++ b/app/bundles/CategoryBundle/Config/config.php
@@ -1,78 +1,79 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes'   => array(
-        'main' => array(
-            'mautic_category_index'  => array(
+return [
+    'routes' => [
+        'main' => [
+            'mautic_category_index' => [
                 'path'       => '/categories/{bundle}/{page}',
                 'controller' => 'MauticCategoryBundle:Category:index',
-                'defaults'   => array(
-                    'bundle' => 'category'
-                )
-            ),
-            'mautic_category_action' => array(
+                'defaults'   => [
+                    'bundle' => 'category',
+                ],
+            ],
+            'mautic_category_action' => [
                 'path'       => '/categories/{bundle}/{objectAction}/{objectId}',
                 'controller' => 'MauticCategoryBundle:Category:executeCategory',
-                'defaults'   => array(
-                    'bundle' => 'category'
-                )
-            )
-        )
-    ),
+                'defaults'   => [
+                    'bundle' => 'category',
+                ],
+            ],
+        ],
+    ],
 
-    'menu' => array(
-        'admin' => array(
-            'mautic.category.menu.index' => array(
+    'menu' => [
+        'admin' => [
+            'mautic.category.menu.index' => [
                 'route'     => 'mautic_category_index',
                 'access'    => 'category:categories:view',
                 'iconClass' => 'fa-folder',
-                'id'        => 'mautic_category_index'
-            )
-        )
-    ),
+                'id'        => 'mautic_category_index',
+            ],
+        ],
+    ],
 
-    'services' => array(
-        'events' => array(
-            'mautic.category.subscriber' => array(
-                'class' => 'Mautic\CategoryBundle\EventListener\CategorySubscriber',
+    'services' => [
+        'events' => [
+            'mautic.category.subscriber' => [
+                'class'     => 'Mautic\CategoryBundle\EventListener\CategorySubscriber',
                 'arguments' => [
                     'mautic.helper.bundle',
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
-            )
-        ),
-        'forms'  => array(
-            'mautic.form.type.category'      => array(
+                    'mautic.core.model.auditlog',
+                ],
+            ],
+        ],
+        'forms' => [
+            'mautic.form.type.category' => [
                 'class'     => 'Mautic\CategoryBundle\Form\Type\CategoryListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'category'
-            ),
-            'mautic.form.type.category_form' => array(
+                'alias'     => 'category',
+            ],
+            'mautic.form.type.category_form' => [
                 'class'     => 'Mautic\CategoryBundle\Form\Type\CategoryType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'category_form'
-            ),
-            'mautic.form.type.category_bundles_form' => array(
+                'alias'     => 'category_form',
+            ],
+            'mautic.form.type.category_bundles_form' => [
                 'class'     => 'Mautic\CategoryBundle\Form\Type\CategoryBundlesType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'category_bundles_form'
-            )
-        ),
-        'models' =>  array(
-            'mautic.category.model.category' => array(
-                'class' => 'Mautic\CategoryBundle\Model\CategoryModel',
-                'arguments' => array(
-                    'request_stack'
-                )
-            )
-        )
-    )
-);
+                'alias'     => 'category_bundles_form',
+            ],
+        ],
+        'models' => [
+            'mautic.category.model.category' => [
+                'class'     => 'Mautic\CategoryBundle\Model\CategoryModel',
+                'arguments' => [
+                    'request_stack',
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/bundles/CategoryBundle/Controller/AjaxController.php b/app/bundles/CategoryBundle/Controller/AjaxController.php
index 4f68de6d28c..6b7ccbfb1d0 100644
--- a/app/bundles/CategoryBundle/Controller/AjaxController.php
+++ b/app/bundles/CategoryBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,14 +15,13 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
- *
- * @package Mautic\CategoryBundle\Controller
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
     /**
      * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     protected function categoryListAction(Request $request)
@@ -29,13 +29,14 @@ protected function categoryListAction(Request $request)
         $bundle    = InputHelper::clean($request->query->get('bundle'));
         $filter    = InputHelper::clean($request->query->get('filter'));
         $results   = $this->getModel('category')->getLookupResults($bundle, $filter, 10);
-        $dataArray = array();
+        $dataArray = [];
         foreach ($results as $r) {
-            $dataArray[] = array(
-                "label" => $r['title'] . " ({$r['id']})",
-                "value" => $r['id']
-            );
+            $dataArray[] = [
+                'label' => $r['title']." ({$r['id']})",
+                'value' => $r['id'],
+            ];
         }
+
         return $this->sendJsonResponse($dataArray);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CategoryBundle/Controller/CategoryController.php b/app/bundles/CategoryBundle/Controller/CategoryController.php
index 9a01b36910a..484de3a2aaa 100644
--- a/app/bundles/CategoryBundle/Controller/CategoryController.php
+++ b/app/bundles/CategoryBundle/Controller/CategoryController.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CategoryBundle\Controller;
 
-use Mautic\CategoryBundle\Model\CategoryModel;
-use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CategoryBundle\CategoryEvents;
 use Mautic\CategoryBundle\Event\CategoryTypesEvent;
+use Mautic\CategoryBundle\Model\CategoryModel;
+use Mautic\CoreBundle\Controller\FormController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 class CategoryController extends FormController
 {
-
     /**
      * @param        $bundle
      * @param        $objectAction
@@ -26,7 +26,7 @@ class CategoryController extends FormController
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function executeCategoryAction ($bundle, $objectAction, $objectId = 0, $objectModel = '')
+    public function executeCategoryAction($bundle, $objectAction, $objectId = 0, $objectModel = '')
     {
         if (method_exists($this, "{$objectAction}Action")) {
             return $this->{"{$objectAction}Action"}($bundle, $objectId, $objectModel);
@@ -41,7 +41,7 @@ public function executeCategoryAction ($bundle, $objectAction, $objectId = 0, $o
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function indexAction ($bundle, $page = 1)
+    public function indexAction($bundle, $page = 1)
     {
         $session = $this->get('session');
 
@@ -60,14 +60,14 @@ public function indexAction ($bundle, $page = 1)
         $session->set('mautic.category.filter', $search);
 
         //set some permissions
-        $permissions = $this->get('mautic.security')->isGranted(array(
-            $bundle . ':categories:view',
-            $bundle . ':categories:create',
-            $bundle . ':categories:edit',
-            $bundle . ':categories:delete'
-        ), "RETURN_ARRAY");
-
-        if (!$permissions[$bundle . ':categories:view']) {
+        $permissions = $this->get('mautic.security')->isGranted([
+            $bundle.':categories:view',
+            $bundle.':categories:create',
+            $bundle.':categories:edit',
+            $bundle.':categories:delete',
+        ], 'RETURN_ARRAY');
+
+        if (!$permissions[$bundle.':categories:view']) {
             return $this->accessDenied();
         }
 
@@ -75,10 +75,10 @@ public function indexAction ($bundle, $page = 1)
             $this->setListFilters();
         }
 
-        $viewParams = array(
+        $viewParams = [
             'page'   => $page,
-            'bundle' => $bundle
-        );
+            'bundle' => $bundle,
+        ];
 
         //set limits
         $limit = $session->get('mautic.category.limit', $this->coreParametersHelper->getParameter('default_pagelimit'));
@@ -90,26 +90,26 @@ public function indexAction ($bundle, $page = 1)
         if ($bundle == 'category') {
             $bundleFilter = null;
         } else {
-            $bundleFilter = array(
+            $bundleFilter = [
                 'column' => 'c.bundle',
                 'expr'   => 'eq',
-                'value'  => $bundle
-            );
+                'value'  => $bundle,
+            ];
         }
 
-        $filter = array('string' => $search, 'force' => array($bundleFilter));
+        $filter = ['string' => $search, 'force' => [$bundleFilter]];
 
         $orderBy    = $this->get('session')->get('mautic.category.orderby', 'c.title');
         $orderByDir = $this->get('session')->get('mautic.category.orderbydir', 'DESC');
 
         $entities = $this->getModel('category')->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
-            )
+                'orderByDir' => $orderByDir,
+            ]
         );
 
         $count = count($entities);
@@ -124,22 +124,22 @@ public function indexAction ($bundle, $page = 1)
             $session->set('mautic.category.page', $lastPage);
             $returnUrl = $this->generateUrl('mautic_category_index', $viewParams);
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $returnUrl,
-                'viewParameters'  => array('page' => $lastPage),
+                'viewParameters'  => ['page' => $lastPage],
                 'contentTemplate' => 'MauticCategoryBundle:Category:index',
-                'passthroughVars' => array(
-                    'activeLink'    => '#mautic_' . $bundle . 'category_index',
-                    'mauticContent' => 'category'
-                )
-            ));
+                'passthroughVars' => [
+                    'activeLink'    => '#mautic_'.$bundle.'category_index',
+                    'mauticContent' => 'category',
+                ],
+            ]);
         }
 
-        $categoryTypes = array('category' => $this->get('translator')->trans('mautic.core.select'));
+        $categoryTypes = ['category' => $this->get('translator')->trans('mautic.core.select')];
 
         $dispatcher = $this->dispatcher;
         if ($dispatcher->hasListeners(CategoryEvents::CATEGORY_ON_BUNDLE_LIST_BUILD)) {
-            $event = new CategoryTypesEvent;
+            $event = new CategoryTypesEvent();
             $dispatcher->dispatch(CategoryEvents::CATEGORY_ON_BUNDLE_LIST_BUILD, $event);
             $categoryTypes = array_merge($categoryTypes, $event->getCategoryTypes());
         }
@@ -149,9 +149,9 @@ public function indexAction ($bundle, $page = 1)
 
         $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
 
-        return $this->delegateView(array(
-            'returnUrl'       => $this->generateUrl('mautic_category_index', $viewParams),
-            'viewParameters'    => array(
+        return $this->delegateView([
+            'returnUrl'      => $this->generateUrl('mautic_category_index', $viewParams),
+            'viewParameters' => [
                 'bundle'        => $bundle,
                 'searchValue'   => $search,
                 'items'         => $entities,
@@ -159,43 +159,43 @@ public function indexAction ($bundle, $page = 1)
                 'limit'         => $limit,
                 'permissions'   => $permissions,
                 'tmpl'          => $tmpl,
-                'categoryTypes' => $categoryTypes
-            ),
+                'categoryTypes' => $categoryTypes,
+            ],
             'contentTemplate' => 'MauticCategoryBundle:Category:list.html.php',
-            'passthroughVars' => array(
-                'activeLink'    => '#mautic_' . $bundle . 'category_index',
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_'.$bundle.'category_index',
                 'mauticContent' => 'category',
-                'route'         => $this->generateUrl('mautic_category_index', $viewParams)
-            )
-        ));
+                'route'         => $this->generateUrl('mautic_category_index', $viewParams),
+            ],
+        ]);
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function newAction ($bundle)
+    public function newAction($bundle)
     {
-        $session   = $this->get('session');
-        $model     = $this->getModel('category');
-        $entity    = $model->getEntity();
-        $success   = $closeModal = 0;
-        $cancelled = $valid = false;
-        $method    = $this->request->getMethod();
-        $inForm    = ($method == 'POST') ? $this->request->request->get('category_form[inForm]', 0, true) : $this->request->get('inForm', 0);
+        $session    = $this->get('session');
+        $model      = $this->getModel('category');
+        $entity     = $model->getEntity();
+        $success    = $closeModal    = 0;
+        $cancelled  = $valid  = false;
+        $method     = $this->request->getMethod();
+        $inForm     = ($method == 'POST') ? $this->request->request->get('category_form[inForm]', 0, true) : $this->request->get('inForm', 0);
         $showSelect = $this->request->get('show_bundle_select', false);
 
         //not found
-        if (!$this->get('mautic.security')->isGranted($bundle . ':categories:create')) {
+        if (!$this->get('mautic.security')->isGranted($bundle.':categories:create')) {
             return $this->modalAccessDenied();
         }
         //Create the form
-        $action = $this->generateUrl('mautic_category_action', array(
+        $action = $this->generateUrl('mautic_category_action', [
             'objectAction' => 'new',
-            'bundle'       => $bundle
-        ));
-        $form   = $model->createForm($entity, $this->get('form.factory'), $action, array('bundle' => $bundle, 'show_bundle_select' => $showSelect));
+            'bundle'       => $bundle,
+        ]);
+        $form = $model->createForm($entity, $this->get('form.factory'), $action, ['bundle' => $bundle, 'show_bundle_select' => $showSelect]);
         $form['inForm']->setData($inForm);
         ///Check for a submitted form and process it
         if ($method == 'POST') {
@@ -207,9 +207,9 @@ public function newAction ($bundle)
                     //form is valid so process the data
                     $model->saveEntity($entity, $form->get('buttons')->get('save')->isClicked());
 
-                    $this->addFlash('mautic.category.notice.created', array(
-                        '%name%' => $entity->getName()
-                    ));
+                    $this->addFlash('mautic.category.notice.created', [
+                        '%name%' => $entity->getName(),
+                    ]);
                 }
             } else {
                 $success = 1;
@@ -220,64 +220,63 @@ public function newAction ($bundle)
 
         if ($closeModal) {
             if ($inForm) {
-                return new JsonResponse(array(
+                return new JsonResponse([
                     'mauticContent' => 'category',
                     'closeModal'    => 1,
                     'inForm'        => 1,
                     'categoryName'  => $entity->getName(),
-                    'categoryId'    => $entity->getId()
-                ));
+                    'categoryId'    => $entity->getId(),
+                ]);
             }
 
-            $viewParameters = array(
+            $viewParameters = [
                 'page'   => $session->get('mautic.category.page'),
-                'bundle' => $bundle
-            );
+                'bundle' => $bundle,
+            ];
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $this->generateUrl('mautic_category_index', $viewParameters),
                 'viewParameters'  => $viewParameters,
                 'contentTemplate' => 'MauticCategoryBundle:Category:index',
-                'passthroughVars' => array(
-                    'activeLink'    => '#mautic_' . $bundle . 'category_index',
+                'passthroughVars' => [
+                    'activeLink'    => '#mautic_'.$bundle.'category_index',
                     'mauticContent' => 'category',
-                    'closeModal'    => 1
-                )
-            ));
+                    'closeModal'    => 1,
+                ],
+            ]);
         } elseif (!empty($valid)) {
 
             //return edit view to prevent duplicates
             return $this->editAction($bundle, $entity->getId(), true);
-
         } else {
-            return $this->ajaxAction(array(
+            return $this->ajaxAction([
                 'contentTemplate' => 'MauticCategoryBundle:Category:form.html.php',
-                'viewParameters'  => array(
+                'viewParameters'  => [
                     'form'           => $form->createView(),
                     'activeCategory' => $entity,
-                    'bundle'         => $bundle
-                ),
-                'passthroughVars' => array(
+                    'bundle'         => $bundle,
+                ],
+                'passthroughVars' => [
                     'mauticContent' => 'category',
                     'success'       => $success,
-                    'route'         => false
-                )
-            ));
+                    'route'         => false,
+                ],
+            ]);
         }
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function editAction ($bundle, $objectId, $ignorePost = false)
+    public function editAction($bundle, $objectId, $ignorePost = false)
     {
         $session = $this->get('session');
         /** @var CategoryModel $model */
         $model     = $this->getModel('category');
         $entity    = $model->getEntity($objectId);
-        $success   = $closeModal = 0;
+        $success   = $closeModal   = 0;
         $cancelled = $valid = false;
         $method    = $this->request->getMethod();
         $inForm    = ($method == 'POST') ? $this->request->request->get('category_form[inForm]', 0, true) : $this->request->get('inForm', 0);
@@ -297,10 +296,10 @@ public function editAction ($bundle, $objectId, $ignorePost = false)
             [
                 'objectAction' => 'edit',
                 'objectId'     => $objectId,
-                'bundle'       => $bundle
+                'bundle'       => $bundle,
             ]
         );
-        $form   = $model->createForm($entity, $this->get('form.factory'), $action, ['bundle' => $bundle]);
+        $form = $model->createForm($entity, $this->get('form.factory'), $action, ['bundle' => $bundle]);
         $form['inForm']->setData($inForm);
 
         ///Check for a submitted form and process it
@@ -316,7 +315,7 @@ public function editAction ($bundle, $objectId, $ignorePost = false)
                     $this->addFlash(
                         'mautic.category.notice.updated',
                         [
-                            '%name%' => $entity->getTitle()
+                            '%name%' => $entity->getTitle(),
                         ]
                     );
 
@@ -327,10 +326,10 @@ public function editAction ($bundle, $objectId, $ignorePost = false)
                             [
                                 'objectAction' => 'edit',
                                 'objectId'     => $entity->getId(),
-                                'bundle'       => $bundle
+                                'bundle'       => $bundle,
                             ]
                         );
-                        $form   = $model->createForm($entity, $this->get('form.factory'), $action, ['bundle' => $bundle]);
+                        $form = $model->createForm($entity, $this->get('form.factory'), $action, ['bundle' => $bundle]);
                     }
                 }
             } else {
@@ -354,14 +353,14 @@ public function editAction ($bundle, $objectId, $ignorePost = false)
                         'closeModal'    => 1,
                         'inForm'        => 1,
                         'categoryName'  => $entity->getTitle(),
-                        'categoryId'    => $entity->getId()
+                        'categoryId'    => $entity->getId(),
                     ]
                 );
             }
 
             $viewParameters = [
                 'page'   => $session->get('mautic.category.page'),
-                'bundle' => $bundle
+                'bundle' => $bundle,
             ];
 
             return $this->postActionRedirect(
@@ -372,8 +371,8 @@ public function editAction ($bundle, $objectId, $ignorePost = false)
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_'.$bundle.'category_index',
                         'mauticContent' => 'category',
-                        'closeModal'    => 1
-                    ]
+                        'closeModal'    => 1,
+                    ],
                 ]
             );
         } else {
@@ -383,57 +382,57 @@ public function editAction ($bundle, $objectId, $ignorePost = false)
                     'viewParameters'  => [
                         'form'           => $form->createView(),
                         'activeCategory' => $entity,
-                        'bundle'         => $bundle
+                        'bundle'         => $bundle,
                     ],
                     'passthroughVars' => [
                         'mauticContent' => 'category',
                         'success'       => $success,
-                        'route'         => false
-                    ]
+                        'route'         => false,
+                    ],
                 ]
             );
         }
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteAction ($bundle, $objectId)
+    public function deleteAction($bundle, $objectId)
     {
         $session    = $this->get('session');
         $page       = $session->get('mautic.category.page', 1);
-        $viewParams = array(
+        $viewParams = [
             'page'   => $page,
-            'bundle' => $bundle
-        );
-        $returnUrl  = $this->generateUrl('mautic_category_index', $viewParams);
-        $flashes    = array();
+            'bundle' => $bundle,
+        ];
+        $returnUrl = $this->generateUrl('mautic_category_index', $viewParams);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'viewParameters'  => $viewParams,
             'contentTemplate' => 'MauticCategoryBundle:Category:index',
-            'passthroughVars' => array(
-                'activeLink'    => 'mautic_' . $bundle . 'category_index',
-                'mauticContent' => 'category'
-            )
-        );
+            'passthroughVars' => [
+                'activeLink'    => 'mautic_'.$bundle.'category_index',
+                'mauticContent' => 'category',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model  = $this->getModel('category');
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.category.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
-            } elseif (!$this->get('mautic.security')->isGranted($bundle . ':categories:delete')) {
+                    'msgVars' => ['%id%' => $objectId],
+                ];
+            } elseif (!$this->get('mautic.security')->isGranted($bundle.':categories:delete')) {
                 return $this->accessDenied();
             } elseif ($model->isLocked($entity)) {
                 return $this->isLocked($postActionVars, $entity, 'category.category');
@@ -441,67 +440,67 @@ public function deleteAction ($bundle, $objectId)
 
             $model->deleteEntity($entity);
 
-            $flashes[] = array(
+            $flashes[] = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $entity->getTitle(),
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @param string $bundle
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function batchDeleteAction ($bundle)
+    public function batchDeleteAction($bundle)
     {
         $session    = $this->get('session');
         $page       = $session->get('mautic.category.page', 1);
-        $viewParams = array(
+        $viewParams = [
             'page'   => $page,
-            'bundle' => $bundle
-        );
-        $returnUrl  = $this->generateUrl('mautic_category_index', $viewParams);
-        $flashes    = array();
+            'bundle' => $bundle,
+        ];
+        $returnUrl = $this->generateUrl('mautic_category_index', $viewParams);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'viewParameters'  => $viewParams,
             'contentTemplate' => 'MauticCategoryBundle:Category:index',
-            'passthroughVars' => array(
-                'activeLink'    => 'mautic_' . $bundle . 'category_index',
-                'mauticContent' => 'category'
-            )
-        );
+            'passthroughVars' => [
+                'activeLink'    => 'mautic_'.$bundle.'category_index',
+                'mauticContent' => 'category',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model     = $this->getModel('category');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.category.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
-                } elseif (!$this->get('mautic.security')->isGranted($bundle . ':categories:delete')) {
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
+                } elseif (!$this->get('mautic.security')->isGranted($bundle.':categories:delete')) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
                     $flashes[] = $this->isLocked($postActionVars, $entity, 'category', true);
@@ -514,20 +513,20 @@ public function batchDeleteAction ($bundle)
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'notice',
                     'msg'     => 'mautic.category.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 }
diff --git a/app/bundles/CategoryBundle/Entity/Category.php b/app/bundles/CategoryBundle/Entity/Category.php
index 12610023740..bc69cf01265 100644
--- a/app/bundles/CategoryBundle/Entity/Category.php
+++ b/app/bundles/CategoryBundle/Entity/Category.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,13 +18,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Category
- *
- * @package Mautic\CategoryBundle\Entity
+ * Class Category.
  */
 class Category extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -57,13 +55,13 @@ class Category extends FormEntity
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('categories')
             ->setCustomRepositoryClass('Mautic\CategoryBundle\Entity\CategoryRepository')
-            ->addIndex(array('alias'), 'category_alias_search');
+            ->addIndex(['alias'], 'category_alias_search');
 
         $builder->addIdColumns('title');
 
@@ -82,15 +80,15 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('title', new NotBlank(array(
-            'message' => 'mautic.core.title.required'
-        )));
+        $metadata->addPropertyConstraint('title', new NotBlank([
+            'message' => 'mautic.core.title.required',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -98,21 +96,18 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('category')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'title',
                     'alias',
                     'description',
-                    'color'
-                )
+                    'color',
+                ]
             )
             ->build();
     }
 
-    /**
-     * @return void
-     */
-    public function __clone ()
+    public function __clone()
     {
         $this->id = null;
 
@@ -120,23 +115,23 @@ public function __clone ()
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set title
+     * Set title.
      *
      * @param string $title
      *
      * @return Category
      */
-    public function setTitle ($title)
+    public function setTitle($title)
     {
         $this->title = $title;
 
@@ -144,23 +139,23 @@ public function setTitle ($title)
     }
 
     /**
-     * Get title
+     * Get title.
      *
      * @return string
      */
-    public function getTitle ()
+    public function getTitle()
     {
         return $this->title;
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
      *
      * @return Category
      */
-    public function setAlias ($alias)
+    public function setAlias($alias)
     {
         $this->alias = $alias;
 
@@ -168,23 +163,23 @@ public function setAlias ($alias)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
-    public function getAlias ()
+    public function getAlias()
     {
         return $this->alias;
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Category
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->description = $description;
 
@@ -192,55 +187,55 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set color
+     * Set color.
      *
      * @param string $color
      *
      * @return Category
      */
-    public function setColor ($color)
+    public function setColor($color)
     {
         $this->color = $color;
     }
 
     /**
-     * Get color
+     * Get color.
      *
      * @return string
      */
-    public function getColor ()
+    public function getColor()
     {
         return $this->color;
     }
 
     /**
-     * Set bundle
+     * Set bundle.
      *
      * @param string $bundle
      *
      * @return Category
      */
-    public function setBundle ($bundle)
+    public function setBundle($bundle)
     {
         $this->bundle = $bundle;
     }
 
     /**
-     * Get bundle
+     * Get bundle.
      *
      * @return string
      */
-    public function getBundle ()
+    public function getBundle()
     {
         return $this->bundle;
     }
diff --git a/app/bundles/CategoryBundle/Entity/CategoryRepository.php b/app/bundles/CategoryBundle/Entity/CategoryRepository.php
index 0a4d347d76d..53185ac4cf3 100644
--- a/app/bundles/CategoryBundle/Entity/CategoryRepository.php
+++ b/app/bundles/CategoryBundle/Entity/CategoryRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,20 +14,18 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class CategoryRepository
- *
- * @package Mautic\CategoryBundle\Entity
+ * Class CategoryRepository.
  */
 class CategoryRepository extends CommonRepository
 {
-
     /**
-     * Get a list of entities
+     * Get a list of entities.
+     *
+     * @param array $args
      *
-     * @param array      $args
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('c')
@@ -68,18 +67,20 @@ public function getCategoryList($bundle, $search = '', $limit = 10, $start = 0)
         }
 
         $results = $q->getQuery()->getArrayResult();
+
         return $results;
     }
 
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('c.title',  ':'.$unique),
@@ -89,30 +90,32 @@ protected function addCatchAllWhereClause(&$q, $filter)
         if ($filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
     {
-        $command         = $field = $filter->command;
-        $unique          = $this->generateRandomParameterName();
-        $expr            = false;
+        $command = $field = $filter->command;
+        $unique  = $this->generateRandomParameterName();
+        $expr    = false;
 
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq("c.isPublished", ":$unique");
+                $expr   = $q->expr()->eq('c.isPublished', ":$unique");
                 $string = true;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq("c.isPublished", ":$unique");
+                $expr   = $q->expr()->eq('c.isPublished', ":$unique");
                 $string = false;
                 break;
         }
@@ -121,10 +124,10 @@ protected function addSearchCommandWhereClause(&$q, $filter)
             $expr = $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -132,10 +135,10 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.core.searchcommand.ispublished',
-            'mautic.core.searchcommand.isunpublished'
-        );
+            'mautic.core.searchcommand.isunpublished',
+        ];
     }
 
     /**
@@ -143,9 +146,9 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('c.title', 'ASC')
-        );
+        return [
+            ['c.title', 'ASC'],
+        ];
     }
 
     /**
@@ -181,5 +184,4 @@ public function getTableAlias()
     {
         return 'c';
     }
-
 }
diff --git a/app/bundles/CategoryBundle/Event/CategoryEvent.php b/app/bundles/CategoryBundle/Event/CategoryEvent.php
index 770ba27e652..bfc7578ed7e 100644
--- a/app/bundles/CategoryBundle/Event/CategoryEvent.php
+++ b/app/bundles/CategoryBundle/Event/CategoryEvent.php
@@ -1,36 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CategoryBundle\Event;
 
-use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\CategoryBundle\Entity\Category;
+use Mautic\CoreBundle\Event\CommonEvent;
 
 /**
- * Class CategoryEvent
- *
- * @package Mautic\CategoryBundle\Event
+ * Class CategoryEvent.
  */
 class CategoryEvent extends CommonEvent
 {
     /**
      * @param Category $category
-     * @param bool $isNew
+     * @param bool     $isNew
      */
     public function __construct(Category &$category, $isNew = false)
     {
-        $this->entity  =& $category;
-        $this->isNew = $isNew;
+        $this->entity = &$category;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Category entity
+     * Returns the Category entity.
      *
      * @return Category
      */
@@ -40,7 +39,7 @@ public function getCategory()
     }
 
     /**
-     * Sets the Category entity
+     * Sets the Category entity.
      *
      * @param Category $category
      */
@@ -48,4 +47,4 @@ public function setCategory(Category $category)
     {
         $this->entity = $category;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CategoryBundle/Event/CategoryTypesEvent.php b/app/bundles/CategoryBundle/Event/CategoryTypesEvent.php
index 56c8378a7c1..7ade7f00fff 100644
--- a/app/bundles/CategoryBundle/Event/CategoryTypesEvent.php
+++ b/app/bundles/CategoryBundle/Event/CategoryTypesEvent.php
@@ -1,52 +1,50 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CategoryBundle\Event;
 
-use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\CategoryBundle\Entity\Category;
+use Mautic\CoreBundle\Event\CommonEvent;
 
 /**
- * Class CategoryTypesEvent
- *
- * @package Mautic\CategoryBundle\Event
+ * Class CategoryTypesEvent.
  */
 class CategoryTypesEvent extends CommonEvent
 {
     /**
-     * @var array $types
+     * @var array
      */
-    protected $types = array();
+    protected $types = [];
 
     /**
-     * Returns the array of Category Types
+     * Returns the array of Category Types.
      *
      * @return array
      */
     public function getCategoryTypes()
     {
         asort($this->types);
+
         return $this->types;
     }
 
     /**
-     * Adds the category type and label
+     * Adds the category type and label.
      *
      * @param string $type
      * @param string $label
-     *
-     * @return void
      */
     public function addCategoryType($type, $label = null)
     {
         if ($label === null) {
-            $label = 'mautic.' . $type . '.' . $type;
+            $label = 'mautic.'.$type.'.'.$type;
         }
 
         $this->types[$type] = $label;
diff --git a/app/bundles/CategoryBundle/EventListener/CategorySubscriber.php b/app/bundles/CategoryBundle/EventListener/CategorySubscriber.php
index 7de5c9b4cf0..3469882c9c5 100644
--- a/app/bundles/CategoryBundle/EventListener/CategorySubscriber.php
+++ b/app/bundles/CategoryBundle/EventListener/CategorySubscriber.php
@@ -1,26 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CategoryBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CategoryBundle\Event as Events;
 use Mautic\CategoryBundle\CategoryEvents;
+use Mautic\CategoryBundle\Event as Events;
 use Mautic\CategoryBundle\Event\CategoryTypesEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\BundleHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 
 /**
- * Class CategorySubscriber
- *
- * @package Mautic\CategoryBundle\EventListener
+ * Class CategorySubscriber.
  */
 class CategorySubscriber extends CommonSubscriber
 {
@@ -48,29 +47,27 @@ class CategorySubscriber extends CommonSubscriber
      */
     public function __construct(BundleHelper $bundleHelper, IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel)
     {
-        $this->bundleHelper = $bundleHelper;
+        $this->bundleHelper   = $bundleHelper;
         $this->ipLookupHelper = $ipLookupHelper;
-        $this->auditLogModel = $auditLogModel;
+        $this->auditLogModel  = $auditLogModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CategoryEvents::CATEGORY_ON_BUNDLE_LIST_BUILD => array('onCategoryBundleListBuild', 0),
-            CategoryEvents::CATEGORY_POST_SAVE            => array('onCategoryPostSave', 0),
-            CategoryEvents::CATEGORY_POST_DELETE          => array('onCategoryDelete', 0)
-        );
+        return [
+            CategoryEvents::CATEGORY_ON_BUNDLE_LIST_BUILD => ['onCategoryBundleListBuild', 0],
+            CategoryEvents::CATEGORY_POST_SAVE            => ['onCategoryPostSave', 0],
+            CategoryEvents::CATEGORY_POST_DELETE          => ['onCategoryDelete', 0],
+        ];
     }
 
     /**
-     * Add bundle to the category
+     * Add bundle to the category.
      *
      * @param CategoryTypesEvent $event
-     *
-     * @return void
      */
     public function onCategoryBundleListBuild(CategoryTypesEvent $event)
     {
@@ -86,7 +83,7 @@ public function onCategoryBundleListBuild(CategoryTypesEvent $event)
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\CategoryEvent $event
      */
@@ -94,34 +91,34 @@ public function onCategoryPostSave(Events\CategoryEvent $event)
     {
         $category = $event->getCategory();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "category",
-                "object"    => "category",
-                "objectId"  => $category->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'category',
+                'object'    => 'category',
+                'objectId'  => $category->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\CategoryEvent $event
      */
     public function onCategoryDelete(Events\CategoryEvent $event)
     {
         $category = $event->getCategory();
-        $log = array(
-            "bundle"     => "category",
-            "object"     => "category",
-            "objectId"   => $category->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $category->getTitle()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log      = [
+            'bundle'    => 'category',
+            'object'    => 'category',
+            'objectId'  => $category->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $category->getTitle()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 }
diff --git a/app/bundles/CategoryBundle/Form/Type/CategoryBundlesType.php b/app/bundles/CategoryBundle/Form/Type/CategoryBundlesType.php
index b7ba3dfe2a8..90aacc03a79 100644
--- a/app/bundles/CategoryBundle/Form/Type/CategoryBundlesType.php
+++ b/app/bundles/CategoryBundle/Form/Type/CategoryBundlesType.php
@@ -1,27 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CategoryBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
 use Mautic\CategoryBundle\CategoryEvents;
 use Mautic\CategoryBundle\Event\CategoryTypesEvent;
+use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class CategoryBundlesType
- *
- * @package Mautic\CategoryBundle\Form\Type
+ * Class CategoryBundlesType.
  */
 class CategoryBundlesType extends AbstractType
 {
@@ -32,7 +29,8 @@ class CategoryBundlesType extends AbstractType
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->translator = $factory->getTranslator();
         $this->dispatcher = $factory->getDispatcher();
     }
@@ -44,33 +42,34 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $dispatcher = $this->dispatcher;
 
-        $resolver->setDefaults(array(
-            'choices'       => function (Options $options) use ($dispatcher) {
+        $resolver->setDefaults([
+            'choices' => function (Options $options) use ($dispatcher) {
                 if ($dispatcher->hasListeners(CategoryEvents::CATEGORY_ON_BUNDLE_LIST_BUILD)) {
-                    $event = new CategoryTypesEvent;
+                    $event = new CategoryTypesEvent();
                     $dispatcher->dispatch(CategoryEvents::CATEGORY_ON_BUNDLE_LIST_BUILD, $event);
                     $types = $event->getCategoryTypes();
                 } else {
-                    $types = array();
+                    $types = [];
                 }
 
                 return $types;
             },
-            'expanded'      => false,
-            'multiple'      => false,
-            'required'      => false
-        ));
+            'expanded' => false,
+            'multiple' => false,
+            'required' => false,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "category_bundles_form";
+    public function getName()
+    {
+        return 'category_bundles_form';
     }
 
     public function getParent()
     {
-        return "choice";
+        return 'choice';
     }
 }
diff --git a/app/bundles/CategoryBundle/Form/Type/CategoryListType.php b/app/bundles/CategoryBundle/Form/Type/CategoryListType.php
index 5778ddffa74..861d3eb91d9 100644
--- a/app/bundles/CategoryBundle/Form/Type/CategoryListType.php
+++ b/app/bundles/CategoryBundle/Form/Type/CategoryListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,13 +18,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class CategoryListType
- *
- * @package Mautic\CategoryBundle\Form\Type
+ * Class CategoryListType.
  */
 class CategoryListType extends AbstractType
 {
-
     private $em;
 
     private $model;
@@ -35,7 +33,8 @@ class CategoryListType extends AbstractType
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->em         = $factory->getEntityManager();
         $this->translator = $factory->getTranslator();
         $this->model      = $factory->getModel('category');
@@ -53,50 +52,53 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $model = $this->model;
-        $createNew = $this->translator->trans('mautic.category.createnew');
+        $model       = $this->model;
+        $createNew   = $this->translator->trans('mautic.category.createnew');
         $modalHeader = $this->translator->trans('mautic.category.header.new');
-        $router     = $this->router;
-        $resolver->setDefaults(array(
-            'choices'    =>  function (Options $options) use ($model, $createNew, $modalHeader) {
+        $router      = $this->router;
+        $resolver->setDefaults([
+            'choices' => function (Options $options) use ($model, $createNew, $modalHeader) {
                 $categories = $model->getLookupResults($options['bundle'], '', 0);
-                $choices = array();
+                $choices = [];
                 foreach ($categories as $l) {
                     $choices[$l['id']] = $l['title'];
                 }
                 $choices['new'] = $createNew;
+
                 return $choices;
             },
-            'label'      => 'mautic.core.category',
-            'label_attr' => array('class' => 'control-label'),
-            'multiple'   => false,
-            'empty_value'=> 'mautic.core.form.uncategorized',
-            'attr'       => function (Options $options) use ($modalHeader, $router) {
-                $newUrl    = $router->generate('mautic_category_action', array(
+            'label'       => 'mautic.core.category',
+            'label_attr'  => ['class' => 'control-label'],
+            'multiple'    => false,
+            'empty_value' => 'mautic.core.form.uncategorized',
+            'attr'        => function (Options $options) use ($modalHeader, $router) {
+                $newUrl = $router->generate('mautic_category_action', [
                     'objectAction' => 'new',
                     'bundle'       => $options['bundle'],
-                    'inForm'       => 1
-                ));
-                return array(
-                    'class'     => 'form-control category-select',
-                    'onchange'  => "Mautic.onCategoryChange(this, '{$newUrl}', '{$modalHeader}');"
-                );
+                    'inForm'       => 1,
+                ]);
+
+                return [
+                    'class'    => 'form-control category-select',
+                    'onchange' => "Mautic.onCategoryChange(this, '{$newUrl}', '{$modalHeader}');",
+                ];
             },
-            'required'   => false
-        ));
+            'required' => false,
+        ]);
 
-        $resolver->setRequired(array('bundle'));
+        $resolver->setRequired(['bundle']);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "category";
+    public function getName()
+    {
+        return 'category';
     }
 
     public function getParent()
     {
-        return "choice";
+        return 'choice';
     }
 }
diff --git a/app/bundles/CategoryBundle/Form/Type/CategoryType.php b/app/bundles/CategoryBundle/Form/Type/CategoryType.php
index 3ba15df270e..dec0e2b36ea 100644
--- a/app/bundles/CategoryBundle/Form/Type/CategoryType.php
+++ b/app/bundles/CategoryBundle/Form/Type/CategoryType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,103 +14,100 @@
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class CategoryType
- *
- * @package Mautic\CategoryBundle\Form\Type
+ * Class CategoryType.
  */
 class CategoryType extends AbstractType
 {
-
     private $translator;
     private $session;
 
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->translator = $factory->getTranslator();
-        $this->session = $factory->getSession();
+        $this->session    = $factory->getSession();
     }
 
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('content' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['content' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('category.category', $options));
 
         if ($options['data']->getId()) {
             // Edit existing category from category manager - do not allow to edit bundle
-            $builder->add('bundle', 'hidden', array(
-                'data' => $options['data']->getBundle()
-            ));
+            $builder->add('bundle', 'hidden', [
+                'data' => $options['data']->getBundle(),
+            ]);
         } elseif ($options['show_bundle_select'] == true) {
-           // Create new category from category bundle - let user select the bundle
+            // Create new category from category bundle - let user select the bundle
            $selected = $this->session->get('mautic.category.type', 'category');
-           $builder->add('bundle', 'category_bundles_form', array(
+            $builder->add('bundle', 'category_bundles_form', [
                'label'      => 'mautic.core.type',
-               'label_attr' => array('class' => 'control-label'),
-               'attr'       => array('class' => 'form-control'),
+               'label_attr' => ['class' => 'control-label'],
+               'attr'       => ['class' => 'form-control'],
                'required'   => true,
-               'data'       => $selected
-           ));
-       } else {
+               'data'       => $selected,
+           ]);
+        } else {
             // Create new category directly from another bundle - preset bundle
-            $builder->add('bundle', 'hidden', array(
-                'data' => $options['bundle']
-            ));
+            $builder->add('bundle', 'hidden', [
+                'data' => $options['bundle'],
+            ]);
         }
 
-        $builder->add('title', 'text', array(
+        $builder->add('title', 'text', [
             'label'      => 'mautic.core.title',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control')
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('description', 'text', array(
+        $builder->add('description', 'text', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => false,
+        ]);
 
-        $builder->add('alias', 'text', array(
+        $builder->add('alias', 'text', [
             'label'      => 'mautic.core.alias',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
                 'tooltip' => 'mautic.category.form.alias.help',
-            ),
-            'required'   => false
-        ));
+            ],
+            'required' => false,
+        ]);
 
-        $builder->add('color', 'text', array(
+        $builder->add('color', 'text', [
             'label'      => 'mautic.core.color',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'color'
-            ),
-            'required'   => false
-        ));
+                'data-toggle' => 'color',
+            ],
+            'required' => false,
+        ]);
 
         $builder->add('isPublished', 'yesno_button_group');
 
-        $builder->add('inForm', 'hidden', array(
-            'mapped' => false
-        ));
+        $builder->add('inForm', 'hidden', [
+            'mapped' => false,
+        ]);
 
         $builder->add('buttons', 'form_buttons');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -118,18 +116,19 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Mautic\CategoryBundle\Entity\Category',
-            'show_bundle_select' => false
-        ));
+        $resolver->setDefaults([
+            'data_class'         => 'Mautic\CategoryBundle\Entity\Category',
+            'show_bundle_select' => false,
+        ]);
 
-        $resolver->setRequired(array('bundle'));
+        $resolver->setRequired(['bundle']);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "category_form";
+    public function getName()
+    {
+        return 'category_form';
     }
 }
diff --git a/app/bundles/CategoryBundle/Helper/MenuHelper.php b/app/bundles/CategoryBundle/Helper/MenuHelper.php
index ec1eda7c1c0..41575f0366d 100644
--- a/app/bundles/CategoryBundle/Helper/MenuHelper.php
+++ b/app/bundles/CategoryBundle/Helper/MenuHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 class MenuHelper
 {
     /**
-     * Adds the category menu items to a bundle's menu
+     * Adds the category menu items to a bundle's menu.
      *
      * @param $items
      * @param $bundleName
@@ -22,14 +23,14 @@ class MenuHelper
      */
     public static function addCategoryMenuItems(&$items, $bundleName, CorePermissions $security)
     {
-        if (!$security->isGranted($bundleName . ':categories:view')) {
+        if (!$security->isGranted($bundleName.':categories:view')) {
             return;
         }
 
-        $items['mautic.category.menu.index'] = array(
+        $items['mautic.category.menu.index'] = [
             'route'           => 'mautic_category_index',
             'id'              => "mautic_{$bundleName}category_index",
-            'routeParameters' => array("bundle"  => $bundleName),
-        );
+            'routeParameters' => ['bundle' => $bundleName],
+        ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CategoryBundle/MauticCategoryBundle.php b/app/bundles/CategoryBundle/MauticCategoryBundle.php
index a9d03bb865f..2de498ebca4 100644
--- a/app/bundles/CategoryBundle/MauticCategoryBundle.php
+++ b/app/bundles/CategoryBundle/MauticCategoryBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,9 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticCategoryBundle
- *
- * @package Mautic\CategoryBundle
+ * Class MauticCategoryBundle.
  */
 class MauticCategoryBundle extends Bundle
 {
diff --git a/app/bundles/CategoryBundle/Model/CategoryModel.php b/app/bundles/CategoryBundle/Model/CategoryModel.php
index 3ed154b019a..298d62da062 100644
--- a/app/bundles/CategoryBundle/Model/CategoryModel.php
+++ b/app/bundles/CategoryBundle/Model/CategoryModel.php
@@ -1,18 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CategoryBundle\Model;
 
+use Mautic\CategoryBundle\CategoryEvents;
+use Mautic\CategoryBundle\Entity\Category;
 use Mautic\CategoryBundle\Event\CategoryEvent;
 use Mautic\CoreBundle\Model\FormModel;
-use Mautic\CategoryBundle\Entity\Category;
-use Mautic\CategoryBundle\CategoryEvents;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
@@ -20,9 +21,7 @@
 /**
  * Class CategoryModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
-
 class CategoryModel extends FormModel
 {
     /**
@@ -47,12 +46,12 @@ public function getRepository()
 
     public function getNameGetter()
     {
-        return "getTitle";
+        return 'getTitle';
     }
 
     public function getPermissionBase()
     {
-        $bundle  = $this->request->get('bundle');
+        $bundle = $this->request->get('bundle');
 
         return $bundle.':categories';
     }
@@ -60,8 +59,9 @@ public function getPermissionBase()
     /**
      * {@inheritdoc}
      *
-     * @param       $entity
-     * @param       $unlock
+     * @param   $entity
+     * @param   $unlock
+     *
      * @return mixed
      */
     public function saveEntity($entity, $unlock = true)
@@ -80,9 +80,9 @@ public function saveEntity($entity, $unlock = true)
         $aliasTag  = $count;
 
         while ($count) {
-            $testAlias = $alias . $aliasTag;
+            $testAlias = $alias.$aliasTag;
             $count     = $repo->checkUniqueCategoryAlias($bundle, $testAlias, $entity);
-            $aliasTag++;
+            ++$aliasTag;
         }
         if ($testAlias != $alias) {
             $alias = $testAlias;
@@ -95,28 +95,32 @@ public function saveEntity($entity, $unlock = true)
     /**
      * {@inheritdoc}
      *
-     * @param      $entity
-     * @param      $formFactory
-     * @param null $action
+     * @param       $entity
+     * @param       $formFactory
+     * @param null  $action
      * @param array $options
+     *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Category) {
-            throw new MethodNotAllowedHttpException(array('Category'));
+            throw new MethodNotAllowedHttpException(['Category']);
         }
         if (!empty($action)) {
             $options['action'] = $action;
         }
+
         return $formFactory->create('category_form', $entity, $options);
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
+     *
      * @return Category
      */
     public function getEntity($id = null)
@@ -127,7 +131,6 @@ public function getEntity($id = null)
 
         $entity = parent::getEntity($id);
 
-
         return $entity;
     }
 
@@ -138,25 +141,26 @@ public function getEntity($id = null)
      * @param $event
      * @param $entity
      * @param $isNew
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Category) {
-            throw new MethodNotAllowedHttpException(array('Category'));
+            throw new MethodNotAllowedHttpException(['Category']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = CategoryEvents::CATEGORY_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = CategoryEvents::CATEGORY_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = CategoryEvents::CATEGORY_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = CategoryEvents::CATEGORY_POST_DELETE;
                 break;
             default:
@@ -170,6 +174,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
             }
 
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         } else {
             return null;
@@ -177,16 +182,18 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     }
 
     /**
-     * Get list of entities for autopopulate fields
+     * Get list of entities for autopopulate fields.
      *
      * @param $bundle
      * @param $filter
      * @param $limit
+     *
      * @return array
      */
     public function getLookupResults($bundle, $filter = '', $limit = 10)
     {
         $results = $this->getRepository()->getCategoryList($bundle, $filter, $limit, 0);
+
         return $results;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CategoryBundle/Security/Permissions/CategoryPermissions.php b/app/bundles/CategoryBundle/Security/Permissions/CategoryPermissions.php
index 4ccfdc4c81f..d0656a744d8 100644
--- a/app/bundles/CategoryBundle/Security/Permissions/CategoryPermissions.php
+++ b/app/bundles/CategoryBundle/Security/Permissions/CategoryPermissions.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CategoryBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class CategoryBundle
- *
- * @package Mautic\CategoryBundle\Security\Permissions
+ * Class CategoryBundle.
  */
 class CategoryPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/CategoryBundle/Views/Category/form.html.php b/app/bundles/CategoryBundle/Views/Category/form.html.php
index 3e7daa88852..1ca721d9a13 100644
--- a/app/bundles/CategoryBundle/Views/Category/form.html.php
+++ b/app/bundles/CategoryBundle/Views/Category/form.html.php
@@ -1,11 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
-<?php echo $view['form']->form($form, array('attr' => array('data-hide-loadingbar' => 'true'))); ?>
+<?php echo $view['form']->form($form, ['attr' => ['data-hide-loadingbar' => 'true']]); ?>
diff --git a/app/bundles/CategoryBundle/Views/Category/index.html.php b/app/bundles/CategoryBundle/Views/Category/index.html.php
index 3d21a8199a0..aaf62c6b327 100644
--- a/app/bundles/CategoryBundle/Views/Category/index.html.php
+++ b/app/bundles/CategoryBundle/Views/Category/index.html.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'category');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.category.header.index'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.category.header.index'));
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'templateButtons' => array(
-       'new'    => $permissions[$bundle.':categories:create']
-    ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'templateButtons' => [
+       'new' => $permissions[$bundle.':categories:create'],
+    ],
     'routeBase' => 'category',
-    'query'     => array('bundle' => $bundle, 'show_bundle_select' => true),
+    'query'     => ['bundle' => $bundle, 'show_bundle_select' => true],
     'editMode'  => 'ajaxmodal',
-    'editAttr'  => 'data-target="#MauticSharedModal" data-header="'.$view['translator']->trans('mautic.category.header.new').'"'
-)));
+    'editAttr'  => 'data-target="#MauticSharedModal" data-header="'.$view['translator']->trans('mautic.category.header.new').'"',
+]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
@@ -28,25 +28,25 @@
         <button type="button" class="btn btn-default"><i class="fa fa-upload"></i></button>
         <button type="button" class="btn btn-default"><i class="fa fa-archive"></i></button>
     </div>*/ ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
         'searchValue' => $searchValue,
         'searchHelp'  => 'mautic.category.help.searchcommands',
-        'filters'     => array(
-            'bundle' => array(
-                'options' => $categoryTypes,
-                'values'  => array($bundle),
-                'translateLabels' => true
-            )
-        ),
-        'action'      => $currentRoute,
-        'routeBase'   => 'category',
-        'templateButtons' => array(
-            'delete' => $permissions[$bundle . ':categories:delete'],
-        ),
-        'query'       => array(
-            'bundle' => $bundle
-        )
-    )); ?>
+        'filters'     => [
+            'bundle' => [
+                'options'         => $categoryTypes,
+                'values'          => [$bundle],
+                'translateLabels' => true,
+            ],
+        ],
+        'action'          => $currentRoute,
+        'routeBase'       => 'category',
+        'templateButtons' => [
+            'delete' => $permissions[$bundle.':categories:delete'],
+        ],
+        'query' => [
+            'bundle' => $bundle,
+        ],
+    ]); ?>
 
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/CategoryBundle/Views/Category/list.html.php b/app/bundles/CategoryBundle/Views/Category/list.html.php
index 8f7973ff142..760f7aa10f2 100644
--- a/app/bundles/CategoryBundle/Views/Category/list.html.php
+++ b/app/bundles/CategoryBundle/Views/Category/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticCategoryBundle:Category:index.html.php');
+}
 ?>
 
 <?php if (count($items)): ?>
@@ -16,38 +18,38 @@
             <thead>
             <tr>
                 <?php
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#categoryTable'
-                ));
+                    'target'   => '#categoryTable',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'category',
                     'text'       => '',
-                    'class'      => 'col-category-color'
-                ));
+                    'class'      => 'col-category-color',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'category',
                     'orderBy'    => 'c.title',
                     'text'       => 'mautic.core.title',
                     'class'      => 'col-category-title',
-                    'default'    => true
-                ));
+                    'default'    => true,
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'category',
                     'orderBy'    => 'c.bundle',
                     'text'       => 'mautic.core.type',
-                    'class'      => 'visible-md visible-lg col-page-bundle'
-                ));
+                    'class'      => 'visible-md visible-lg col-page-bundle',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'category',
                     'orderBy'    => 'c.id',
                     'text'       => 'mautic.core.id',
-                    'class'      => 'visible-md visible-lg col-page-id'
-                ));
+                    'class'      => 'visible-md visible-lg col-page-id',
+                ]);
                 ?>
             </tr>
             </thead>
@@ -56,24 +58,24 @@
                 <tr>
                     <td>
                         <?php
-                        $bundleName = $view['translator']->trans('mautic.' . $item->getBundle() . '.' . $item->getBundle());
-                        $title = $view['translator']->trans('mautic.category.header.edit', array("%type%" => $bundleName, "%name%" => $item->getTitle()));
-                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
+                        $bundleName = $view['translator']->trans('mautic.'.$item->getBundle().'.'.$item->getBundle());
+                        $title      = $view['translator']->trans('mautic.category.header.edit', ['%type%' => $bundleName, '%name%' => $item->getTitle()]);
+                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
                             'item'            => $item,
-                            'templateButtons' => array(
-                                'edit'   => $permissions[$bundle . ':categories:edit'],
-                                'delete' => $permissions[$bundle . ':categories:delete'],
-                            ),
-                            'editMode'        => 'ajaxmodal',
-                            'editAttr'        => array(
+                            'templateButtons' => [
+                                'edit'   => $permissions[$bundle.':categories:edit'],
+                                'delete' => $permissions[$bundle.':categories:delete'],
+                            ],
+                            'editMode' => 'ajaxmodal',
+                            'editAttr' => [
                                 'data-target' => '#MauticSharedModal',
                                 'data-header' => $title,
-                            ),
-                            'routeBase'       => 'category',
-                            'query'           => array(
-                                'bundle' => $bundle
-                            )
-                        ));
+                            ],
+                            'routeBase' => 'category',
+                            'query'     => [
+                                'bundle' => $bundle,
+                            ],
+                        ]);
                         ?>
                     </td>
                     <td>
@@ -81,12 +83,12 @@
                     </td>
                     <td>
                         <div>
-                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', array('item' => $item, 'model' => 'category', 'query' => 'bundle=' . $bundle)); ?>
-                            <?php if ($permissions[$bundle . ':categories:edit']): ?>
-                            <a href="<?php echo $view['router']->path('mautic_category_action', array('bundle' => $bundle, 'objectAction' => 'edit', 'objectId' => $item->getId())); ?>" data-toggle="ajaxmodal" data-target="#MauticSharedModal" data-header="<?php echo $title; ?>"
+                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'category', 'query' => 'bundle='.$bundle]); ?>
+                            <?php if ($permissions[$bundle.':categories:edit']): ?>
+                            <a href="<?php echo $view['router']->path('mautic_category_action', ['bundle' => $bundle, 'objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajaxmodal" data-target="#MauticSharedModal" data-header="<?php echo $title; ?>"
                             <?php endif; ?>
                             <span><?php echo $item->getTitle(); ?> (<?php echo $item->getAlias(); ?>)</span>
-                            <?php if ($permissions[$bundle . ':categories:edit']): ?>
+                            <?php if ($permissions[$bundle.':categories:edit']): ?>
                             </a>
                             <?php endif; ?>
                         </div>
@@ -104,18 +106,18 @@
         </table>
 
         <div class="panel-footer">
-            <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-                "totalItems" => count($items),
-                "page"       => $page,
-                "limit"      => $limit,
-                "menuLinkId" => 'mautic_category_index',
-                "baseUrl"    => $view['router']->path('mautic_category_index', array(
-                    'bundle' => ($bundle == 'category') ? 'all' : $bundle
-                )),
-                'sessionVar' => 'category'
-            )); ?>
+            <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+                'totalItems' => count($items),
+                'page'       => $page,
+                'limit'      => $limit,
+                'menuLinkId' => 'mautic_category_index',
+                'baseUrl'    => $view['router']->path('mautic_category_index', [
+                    'bundle' => ($bundle == 'category') ? 'all' : $bundle,
+                ]),
+                'sessionVar' => 'category',
+            ]); ?>
         </div>
     </div>
 <?php else: ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', array('tip' => 'mautic.category.noresults.tip')); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', ['tip' => 'mautic.category.noresults.tip']); ?>
 <?php endif; ?>
diff --git a/app/bundles/ConfigBundle/Config/config.php b/app/bundles/ConfigBundle/Config/config.php
index f3310405978..61bdb022c63 100644
--- a/app/bundles/ConfigBundle/Config/config.php
+++ b/app/bundles/ConfigBundle/Config/config.php
@@ -1,74 +1,75 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes' => array(
-        'main' => array(
-            'mautic_config_action' => array(
-                'path' => '/config/{objectAction}',
-                'controller' => 'MauticConfigBundle:Config:execute'
-            ),
-            'mautic_sysinfo_index' => array(
-                'path' => '/sysinfo',
-                'controller' => 'MauticConfigBundle:Sysinfo:index'
-            )
-        )
-    ),
+return [
+    'routes' => [
+        'main' => [
+            'mautic_config_action' => [
+                'path'       => '/config/{objectAction}',
+                'controller' => 'MauticConfigBundle:Config:execute',
+            ],
+            'mautic_sysinfo_index' => [
+                'path'       => '/sysinfo',
+                'controller' => 'MauticConfigBundle:Sysinfo:index',
+            ],
+        ],
+    ],
 
-    'menu' => array(
-        'admin' => array(
-            'mautic.config.menu.index' => array(
+    'menu' => [
+        'admin' => [
+            'mautic.config.menu.index' => [
                 'route'           => 'mautic_config_action',
-                'routeParameters' => array('objectAction' => 'edit'),
+                'routeParameters' => ['objectAction' => 'edit'],
                 'iconClass'       => 'fa-cogs',
                 'id'              => 'mautic_config_index',
-                'access'          => 'admin'
-            ),
-            'mautic.sysinfo.menu.index' => array(
-                'route'           => 'mautic_sysinfo_index',
-                'iconClass'       => 'fa-life-ring',
-                'id'              => 'mautic_sysinfo_index',
                 'access'          => 'admin',
-                'checks'    => array(
-                   'parameters' => array(
-                       'sysinfo_disabled' => false
-                   )
-                )
-            )
-        )
-    ),
+            ],
+            'mautic.sysinfo.menu.index' => [
+                'route'     => 'mautic_sysinfo_index',
+                'iconClass' => 'fa-life-ring',
+                'id'        => 'mautic_sysinfo_index',
+                'access'    => 'admin',
+                'checks'    => [
+                   'parameters' => [
+                       'sysinfo_disabled' => false,
+                   ],
+                ],
+            ],
+        ],
+    ],
 
-    'services' => array(
-        'events' => array(
-            'mautic.config.subscriber' => array(
-                'class' => 'Mautic\ConfigBundle\EventListener\ConfigSubscriber'
-            )
-        ),
+    'services' => [
+        'events' => [
+            'mautic.config.subscriber' => [
+                'class' => 'Mautic\ConfigBundle\EventListener\ConfigSubscriber',
+            ],
+        ],
 
-        'forms' => array(
-            'mautic.form.type.config' => array(
-                'class' => 'Mautic\ConfigBundle\Form\Type\ConfigType',
+        'forms' => [
+            'mautic.form.type.config' => [
+                'class'     => 'Mautic\ConfigBundle\Form\Type\ConfigType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'config'
-            )
-        ),
-        'models' =>  array(
-            'mautic.config.model.config' => array(
-                'class' => 'Mautic\ConfigBundle\Model\ConfigModel'
-            ),
-            'mautic.config.model.sysinfo' => array(
-                'class' => 'Mautic\ConfigBundle\Model\SysinfoModel',
-                'arguments' => array(
+                'alias'     => 'config',
+            ],
+        ],
+        'models' => [
+            'mautic.config.model.config' => [
+                'class' => 'Mautic\ConfigBundle\Model\ConfigModel',
+            ],
+            'mautic.config.model.sysinfo' => [
+                'class'     => 'Mautic\ConfigBundle\Model\SysinfoModel',
+                'arguments' => [
                     'mautic.helper.paths',
-                    'mautic.helper.core_parameters'
-                )
-            )
-        )
-    )
-);
+                    'mautic.helper.core_parameters',
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/bundles/ConfigBundle/ConfigEvents.php b/app/bundles/ConfigBundle/ConfigEvents.php
index bdd648bf2fb..2992d79d0a6 100644
--- a/app/bundles/ConfigBundle/ConfigEvents.php
+++ b/app/bundles/ConfigBundle/ConfigEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,13 +12,10 @@
 
 /**
  * Class ConfigEvents
- * Events available for ConfigBundle
- *
- * @package Mautic\ConfigBundle
+ * Events available for ConfigBundle.
  */
 final class ConfigEvents
 {
-
     /**
      * The mautic.config_on_generate event is thrown when the configuration form is generated.
      *
@@ -26,7 +24,7 @@ final class ConfigEvents
      *
      * @var string
      */
-    const CONFIG_ON_GENERATE   = 'mautic.config_on_generate';
+    const CONFIG_ON_GENERATE = 'mautic.config_on_generate';
 
     /**
      * The mautic.config_pre_save event is thrown right before config data are saved.
diff --git a/app/bundles/ConfigBundle/Controller/ConfigController.php b/app/bundles/ConfigBundle/Controller/ConfigController.php
index 6833f79057a..0f0bc2f3a56 100644
--- a/app/bundles/ConfigBundle/Controller/ConfigController.php
+++ b/app/bundles/ConfigBundle/Controller/ConfigController.php
@@ -1,33 +1,33 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ConfigBundle\Controller;
 
-use Mautic\CoreBundle\Controller\FormController;
-use Mautic\ConfigBundle\Event\ConfigEvent;
-use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
 use Mautic\ConfigBundle\ConfigEvents;
+use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\ConfigBundle\Event\ConfigEvent;
+use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\EncryptionHelper;
 use Symfony\Component\Form\FormError;
 
 /**
- * Class ConfigController
+ * Class ConfigController.
  */
 class ConfigController extends FormController
 {
-
     /**
-     * Controller action for editing the application configuration
+     * Controller action for editing the application configuration.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function editAction ()
+    public function editAction()
     {
         //admin only allowed
         if (!$this->user->isAdmin()) {
@@ -48,12 +48,12 @@ public function editAction ()
         $model = $this->getModel('config');
 
         // Create the form
-        $action = $this->generateUrl('mautic_config_action', array('objectAction' => 'edit'));
-        $form   = $model->createForm($formConfigs, $this->get('form.factory'), array(
+        $action = $this->generateUrl('mautic_config_action', ['objectAction' => 'edit']);
+        $form   = $model->createForm($formConfigs, $this->get('form.factory'), [
             'action'                 => $action,
             'doNotChange'            => $doNotChange,
-            'doNotChangeDisplayMode' => $doNotChangeDisplayMode
-        ));
+            'doNotChangeDisplayMode' => $doNotChangeDisplayMode,
+        ]);
 
         /** @var \Mautic\CoreBundle\Configurator\Configurator $configurator */
         $configurator = $this->get('mautic.configurator');
@@ -97,7 +97,7 @@ public function editAction ()
                         // Ensure the config has a secret key
                         $params = $configurator->getParameters();
                         if (empty($params['secret_key'])) {
-                            $configurator->mergeParameters(array('secret_key' => EncryptionHelper::generateKey()));
+                            $configurator->mergeParameters(['secret_key' => EncryptionHelper::generateKey()]);
                         }
 
                         $configurator->write();
@@ -108,9 +108,8 @@ public function editAction ()
                         /** @var \Mautic\CoreBundle\Helper\CacheHelper $cacheHelper */
                         $cacheHelper = $this->factory->getHelper('cache');
                         $cacheHelper->clearContainerFile();
-
                     } catch (\RuntimeException $exception) {
-                        $this->addFlash('mautic.config.config.error.not.updated', array('%exception%' => $exception->getMessage()), 'error');
+                        $this->addFlash('mautic.config.config.error.not.updated', ['%exception%' => $exception->getMessage()], 'error');
                     }
                 } elseif (!$isWritabale) {
                     $form->addError(new FormError(
@@ -122,7 +121,7 @@ public function editAction ()
             // If the form is saved or cancelled, redirect back to the dashboard
             if ($cancelled || $isValid) {
                 if (!$cancelled && $this->isFormApplied($form)) {
-                    return $this->delegateRedirect($this->generateUrl('mautic_config_action', array('objectAction' => 'edit')));
+                    return $this->delegateRedirect($this->generateUrl('mautic_config_action', ['objectAction' => 'edit']));
                 } else {
                     return $this->delegateRedirect($this->generateUrl('mautic_dashboard_index'));
                 }
@@ -131,32 +130,32 @@ public function editAction ()
 
         $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'tmpl'        => $tmpl,
                 'security'    => $this->get('mautic.security'),
                 'form'        => $this->setFormTheme($form, 'MauticConfigBundle:Config:form.html.php', $formThemes),
                 'formConfigs' => $formConfigs,
-                'isWritable'  => $isWritabale
-            ),
+                'isWritable'  => $isWritabale,
+            ],
             'contentTemplate' => 'MauticConfigBundle:Config:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_config_index',
                 'mauticContent' => 'config',
-                'route'         => $this->generateUrl('mautic_config_action', array('objectAction' => 'edit'))
-            )
-        ));
+                'route'         => $this->generateUrl('mautic_config_action', ['objectAction' => 'edit']),
+            ],
+        ]);
     }
 
     /**
-     * Merges default parameters from each subscribed bundle with the local (real) params
+     * Merges default parameters from each subscribed bundle with the local (real) params.
      *
      * @param array $forms
      * @param array $doNotChange
      *
      * @return array
      */
-    private function mergeParamsWithLocal (&$forms, $doNotChange)
+    private function mergeParamsWithLocal(&$forms, $doNotChange)
     {
         // Import the current local configuration, $parameters is defined in this file
         $localConfigFile = $this->factory->getLocalConfigFile();
diff --git a/app/bundles/ConfigBundle/Controller/SysinfoController.php b/app/bundles/ConfigBundle/Controller/SysinfoController.php
index 7345e382aa3..c74f6000fa0 100644
--- a/app/bundles/ConfigBundle/Controller/SysinfoController.php
+++ b/app/bundles/ConfigBundle/Controller/SysinfoController.php
@@ -1,20 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ConfigBundle\Controller;
 
 use Mautic\CoreBundle\Controller\FormController;
-use Mautic\CoreBundle\Helper\EncryptionHelper;
-use Symfony\Component\Form\FormError;
 
 /**
- * Class SysinfoController
+ * Class SysinfoController.
  */
 class SysinfoController extends FormController
 {
@@ -23,7 +22,7 @@ class SysinfoController extends FormController
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function indexAction ($page = 1)
+    public function indexAction($page = 1)
     {
         if (!$this->user->isAdmin() || $this->coreParametersHelper->getParameter('sysinfo_disabled')) {
             return $this->accessDenied();
@@ -35,18 +34,18 @@ public function indexAction ($page = 1)
         $folders = $model->getFolders();
         $log     = $model->getLogTail();
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'phpInfo' => $phpInfo,
                 'folders' => $folders,
-                'log'     => $log
-            ),
+                'log'     => $log,
+            ],
             'contentTemplate' => 'MauticConfigBundle:Sysinfo:index.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_sysinfo_index',
                 'mauticContent' => 'sysinfo',
-                'route'         => $this->generateUrl('mautic_sysinfo_index')
-            )
-        ));
+                'route'         => $this->generateUrl('mautic_sysinfo_index'),
+            ],
+        ]);
     }
 }
diff --git a/app/bundles/ConfigBundle/Event/ConfigBuilderEvent.php b/app/bundles/ConfigBundle/Event/ConfigBuilderEvent.php
index 1077e66e076..d556008d84d 100644
--- a/app/bundles/ConfigBundle/Event/ConfigBuilderEvent.php
+++ b/app/bundles/ConfigBundle/Event/ConfigBuilderEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,22 +14,19 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class ConfigEvent
- *
- * @package Mautic\ConfigBundle\Event
+ * Class ConfigEvent.
  */
 class ConfigBuilderEvent extends Event
 {
-
     /**
      * @var array
      */
-    private $forms = array();
+    private $forms = [];
 
     /**
      * @var array
      */
-    private $formThemes = array();
+    private $formThemes = [];
 
     /**
      * @var MauticFactory
@@ -38,19 +36,17 @@ class ConfigBuilderEvent extends Event
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
 
     /**
-     * Set new form to the forms array
+     * Set new form to the forms array.
      *
      * @param array $form
-     *
-     * @return void
      */
-    public function addForm ($form)
+    public function addForm($form)
     {
         if (isset($form['formTheme'])) {
             $this->formThemes[] = $form['formTheme'];
@@ -60,31 +56,31 @@ public function addForm ($form)
     }
 
     /**
-     * Returns the forms array
+     * Returns the forms array.
      *
      * @return array
      */
-    public function getForms ()
+    public function getForms()
     {
         return $this->forms;
     }
 
     /**
-     * Returns the formThemes array
+     * Returns the formThemes array.
      *
      * @return array
      */
-    public function getFormThemes ()
+    public function getFormThemes()
     {
         return $this->formThemes;
     }
 
     /**
-     * Returns the factory
+     * Returns the factory.
      *
      * @return MauticFactory
      */
-    public function getFactory ()
+    public function getFactory()
     {
         return $this->factory;
     }
@@ -96,9 +92,9 @@ public function getFactory ()
      *
      * @return array
      */
-    public function getParameters ($path = null)
+    public function getParameters($path = null)
     {
-        $paramsFile = $this->factory->getSystemPath('app') . $path;
+        $paramsFile = $this->factory->getSystemPath('app').$path;
 
         if (file_exists($paramsFile)) {
             // Import the bundle configuration, $parameters is defined in this file
@@ -106,7 +102,7 @@ public function getParameters ($path = null)
         }
 
         if (!isset($parameters)) {
-            $parameters = array();
+            $parameters = [];
         }
 
         return $parameters;
@@ -117,7 +113,7 @@ public function getParameters ($path = null)
      *
      * @return array
      */
-    public function getParametersFromConfig ($bundle)
+    public function getParametersFromConfig($bundle)
     {
         static $allBundles;
 
@@ -128,7 +124,7 @@ public function getParametersFromConfig ($bundle)
         if (isset($allBundles[$bundle]) && $allBundles[$bundle]['config']['parameters']) {
             return $allBundles[$bundle]['config']['parameters'];
         } else {
-            return array();
+            return [];
         }
     }
 }
diff --git a/app/bundles/ConfigBundle/Event/ConfigEvent.php b/app/bundles/ConfigBundle/Event/ConfigEvent.php
index 5a9de4d81ee..340c46024a9 100644
--- a/app/bundles/ConfigBundle/Event/ConfigEvent.php
+++ b/app/bundles/ConfigBundle/Event/ConfigEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,14 +14,14 @@
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
- * Class ConfigEvent
+ * Class ConfigEvent.
  */
 class ConfigEvent extends CommonEvent
 {
     /**
      * @var array
      */
-    private $preserve = array();
+    private $preserve = [];
 
     /**
      * @param array $config
@@ -35,7 +36,7 @@ class ConfigEvent extends CommonEvent
     /**
      * @var array
      */
-    private $errors = array();
+    private $errors = [];
 
     /**
      * @param array        $config
@@ -48,7 +49,7 @@ public function __construct(array $config, ParameterBag $post)
     }
 
     /**
-     * Returns the config array
+     * Returns the config array.
      *
      * @param string $key
      *
@@ -57,14 +58,14 @@ public function __construct(array $config, ParameterBag $post)
     public function getConfig($key = null)
     {
         if ($key) {
-            return (isset($this->config[$key])) ? $this->config[$key] : array();
+            return (isset($this->config[$key])) ? $this->config[$key] : [];
         }
 
         return $this->config;
     }
 
     /**
-     * Sets the config array
+     * Sets the config array.
      *
      * @param array $config
      * @param null  $key
@@ -79,7 +80,7 @@ public function setConfig(array $config, $key = null)
     }
 
     /**
-     * Returns the POST
+     * Returns the POST.
      *
      * @return \Symfony\Component\HttpFoundation\ParameterBag
      */
@@ -90,14 +91,14 @@ public function getPost()
 
     /**
      * Set fields such as passwords that will not overwrite existing values
-     * if the current is empty
+     * if the current is empty.
      *
      * @param array|string $fields
      */
     public function unsetIfEmpty($fields)
     {
         if (!is_array($fields)) {
-            $fields = array($fields);
+            $fields = [$fields];
         }
 
         $this->preserve = array_merge($this->preserve, $fields);
@@ -105,7 +106,7 @@ public function unsetIfEmpty($fields)
 
     /**
      * Return array of fields to unset if empty so that existing values are not
-     * overwritten if empty
+     * overwritten if empty.
      *
      * @return array
      */
@@ -115,20 +116,20 @@ public function getPreservedFields()
     }
 
     /**
-     * Set error message
+     * Set error message.
      *
-     * @param  string $message (untranslated)
-     * @param  array  $messageVars for translation
+     * @param string $message     (untranslated)
+     * @param array  $messageVars for translation
      */
-    public function setError($message, $messageVars = array())
+    public function setError($message, $messageVars = [])
     {
         $this->errors[$message] = $messageVars;
     }
 
     /**
-     * Get error messages
+     * Get error messages.
      *
-     * @return  array
+     * @return array
      */
     public function getErrors()
     {
diff --git a/app/bundles/ConfigBundle/EventListener/ConfigSubscriber.php b/app/bundles/ConfigBundle/EventListener/ConfigSubscriber.php
index 2e90ffcd07c..c55cfcb8ccf 100644
--- a/app/bundles/ConfigBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/ConfigBundle/EventListener/ConfigSubscriber.php
@@ -1,33 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ConfigBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\ConfigBundle\Event as Events;
 use Mautic\ConfigBundle\ConfigEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class ConfigSubscriber
- *
- * @package Mautic\ConfigBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
+        return [
             // ConfigEvents::CONFIG_POST_SAVE   => array('onConfigPostSave', 0)
-        );
+        ];
     }
 }
diff --git a/app/bundles/ConfigBundle/Form/Type/ConfigType.php b/app/bundles/ConfigBundle/Form/Type/ConfigType.php
index 53541d9fbd2..df4cdacefac 100644
--- a/app/bundles/ConfigBundle/Form/Type/ConfigType.php
+++ b/app/bundles/ConfigBundle/Form/Type/ConfigType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ConfigType
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
@@ -41,9 +42,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         foreach ($options['data'] as $config) {
             if (isset($config['formAlias']) && isset($config['parameters'])) {
-                $builder->add($config['formAlias'], $config['formAlias'], array(
-                    'data' => $config['parameters']
-                ));
+                $builder->add($config['formAlias'], $config['formAlias'], [
+                    'data' => $config['parameters'],
+                ]);
             }
         }
 
@@ -54,21 +55,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             foreach ($form as $config => $configForm) {
                 foreach ($configForm as $key => $child) {
                     if (in_array($key, $options['doNotChange'])) {
-
                         if ($options['doNotChangeDisplayMode'] == 'mask') {
                             $fieldOptions = $child->getConfig()->getOptions();
 
-                            $configForm->add($key, 'text', array(
-                                'label'      => $fieldOptions['label'],
-                                'required'   => false,
-                                'mapped'     => false,
-                                'disabled'   => true,
-                                'attr'       => array(
+                            $configForm->add($key, 'text', [
+                                'label'    => $fieldOptions['label'],
+                                'required' => false,
+                                'mapped'   => false,
+                                'disabled' => true,
+                                'attr'     => [
                                     'placeholder' => $translator->trans('mautic.config.restricted'),
-                                    'class'       => 'form-control'
-                                ),
-                                'label_attr' => array('class' => 'control-label'),
-                            ));
+                                    'class'       => 'form-control',
+                                ],
+                                'label_attr' => ['class' => 'control-label'],
+                            ]);
                         } elseif ($options['doNotChangeDisplayMode'] == 'remove') {
                             $configForm->remove($key);
                         }
@@ -78,10 +78,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         });
 
         $builder->add('buttons', 'form_buttons',
-            array(
+            [
                 'apply_onclick' => 'Mautic.activateBackdrop()',
-                'save_onclick'  => 'Mautic.activateBackdrop()'
-            )
+                'save_onclick'  => 'Mautic.activateBackdrop()',
+            ]
         );
 
         if (!empty($options['action'])) {
@@ -104,10 +104,9 @@ public function getName()
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array(
+        $resolver->setRequired([
             'doNotChange',
-            'doNotChangeDisplayMode'
-        ));
-
+            'doNotChangeDisplayMode',
+        ]);
     }
 }
diff --git a/app/bundles/ConfigBundle/MauticConfigBundle.php b/app/bundles/ConfigBundle/MauticConfigBundle.php
index 2d7b68788b7..6c36e12cfa0 100644
--- a/app/bundles/ConfigBundle/MauticConfigBundle.php
+++ b/app/bundles/ConfigBundle/MauticConfigBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticConfigBundle
+ * Class MauticConfigBundle.
  */
 class MauticConfigBundle extends Bundle
 {
diff --git a/app/bundles/ConfigBundle/Model/ConfigModel.php b/app/bundles/ConfigBundle/Model/ConfigModel.php
index c9e30179878..71307472639 100644
--- a/app/bundles/ConfigBundle/Model/ConfigModel.php
+++ b/app/bundles/ConfigBundle/Model/ConfigModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Mautic\CoreBundle\Model\AbstractCommonModel;
 
 /**
- * Class ConfigModel
+ * Class ConfigModel.
  */
 class ConfigModel extends AbstractCommonModel
 {
-
     /**
      * {@inheritdoc}
      */
@@ -26,16 +26,17 @@ public function getPermissionBase()
     }
 
     /**
-     * Creates the appropriate form per the model
+     * Creates the appropriate form per the model.
      *
      * @param array                                        $data
      * @param \Symfony\Component\Form\FormFactoryInterface $formFactory
      * @param array                                        $options
      *
      * @return \Symfony\Component\Form\Form
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm($data, $formFactory, $options = array())
+    public function createForm($data, $formFactory, $options = [])
     {
         return $formFactory->create('config', $data, $options);
     }
diff --git a/app/bundles/ConfigBundle/Model/SysinfoModel.php b/app/bundles/ConfigBundle/Model/SysinfoModel.php
index 66569fee944..42189d42668 100644
--- a/app/bundles/ConfigBundle/Model/SysinfoModel.php
+++ b/app/bundles/ConfigBundle/Model/SysinfoModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Model\AbstractCommonModel;
 
 /**
- * Class SysinfoModel
+ * Class SysinfoModel.
  */
 class SysinfoModel extends AbstractCommonModel
 {
@@ -33,72 +34,70 @@ class SysinfoModel extends AbstractCommonModel
 
     /**
      * SysinfoModel constructor.
-     * 
-     * @param PathsHelper $pathsHelper
+     *
+     * @param PathsHelper          $pathsHelper
      * @param CoreParametersHelper $coreParametersHelper
      */
     public function __construct(PathsHelper $pathsHelper, CoreParametersHelper $coreParametersHelper)
     {
-        $this->pathsHelper = $pathsHelper;
+        $this->pathsHelper          = $pathsHelper;
         $this->coreParametersHelper = $coreParametersHelper;
     }
 
     /**
-	 * Method to get the PHP info
-	 *
-	 * @return string
-	 */
-	public function getPhpInfo()
-	{
-		if (!is_null($this->phpInfo))
-		{
-			return $this->phpInfo;
-		}
+     * Method to get the PHP info.
+     *
+     * @return string
+     */
+    public function getPhpInfo()
+    {
+        if (!is_null($this->phpInfo)) {
+            return $this->phpInfo;
+        }
 
         if (function_exists('phpinfo')) {
-    		ob_start();
-    		date_default_timezone_set('UTC');
-    		phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES);
-    		$phpInfo = ob_get_contents();
-    		ob_end_clean();
-    		preg_match_all('#<body[^>]*>(.*)</body>#siU', $phpInfo, $output);
-    		$output = preg_replace('#<table[^>]*>#', '<table class="table table-striped">', $output[1][0]);
-    		$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
-    		$output = preg_replace('#<hr />#', '', $output);
-    		$output = str_replace('<div class="center">', '', $output);
-    		$output = preg_replace('#<tr class="h">(.*)<\/tr>#', '<thead><tr class="h">$1</tr></thead><tbody>', $output);
-    		$output = str_replace('</table>', '</tbody></table>', $output);
-    		$output = str_replace('</div>', '', $output);
-    		$this->phpInfo = $output;
+            ob_start();
+            date_default_timezone_set('UTC');
+            phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES);
+            $phpInfo = ob_get_contents();
+            ob_end_clean();
+            preg_match_all('#<body[^>]*>(.*)</body>#siU', $phpInfo, $output);
+            $output        = preg_replace('#<table[^>]*>#', '<table class="table table-striped">', $output[1][0]);
+            $output        = preg_replace('#(\w),(\w)#', '\1, \2', $output);
+            $output        = preg_replace('#<hr />#', '', $output);
+            $output        = str_replace('<div class="center">', '', $output);
+            $output        = preg_replace('#<tr class="h">(.*)<\/tr>#', '<thead><tr class="h">$1</tr></thead><tbody>', $output);
+            $output        = str_replace('</table>', '</tbody></table>', $output);
+            $output        = str_replace('</div>', '', $output);
+            $this->phpInfo = $output;
         } elseif (function_exists('phpversion')) {
-             $this->phpInfo = $this->translator->trans('mautic.sysinfo.phpinfo.phpversion', array('%phpversion%' => phpversion()));
+            $this->phpInfo = $this->translator->trans('mautic.sysinfo.phpinfo.phpversion', ['%phpversion%' => phpversion()]);
         } else {
-             $this->phpInfo = $this->translator->trans('mautic.sysinfo.phpinfo.missing');
+            $this->phpInfo = $this->translator->trans('mautic.sysinfo.phpinfo.missing');
         }
 
-		return $this->phpInfo;
-	}
+        return $this->phpInfo;
+    }
 
     /**
-	 * Method to get important folders with a writable flag
-	 *
-	 * @return array
-	 */
-	public function getFolders()
-	{
-		if (!is_null($this->folders))
-		{
-			return $this->folders;
-		}
-
-        $importantFolders = array(
+     * Method to get important folders with a writable flag.
+     *
+     * @return array
+     */
+    public function getFolders()
+    {
+        if (!is_null($this->folders)) {
+            return $this->folders;
+        }
+
+        $importantFolders = [
             $this->pathsHelper->getSystemPath('local_config'),
             $this->coreParametersHelper->getParameter('cache_path'),
             $this->coreParametersHelper->getParameter('log_path'),
             $this->coreParametersHelper->getParameter('upload_dir'),
             $this->pathsHelper->getSystemPath('images', true),
             $this->pathsHelper->getSystemPath('translations', true),
-        );
+        ];
 
         // Show the spool folder only if the email queue is configured
         if ($this->coreParametersHelper->getParameter('mailer_spool_type') == 'file') {
@@ -113,11 +112,11 @@ public function getFolders()
             $this->folders[$folderKey] = $isWritable;
         }
 
-		return $this->folders;
-	}
+        return $this->folders;
+    }
 
     /**
-     * Method to tail (a few last rows) of a file
+     * Method to tail (a few last rows) of a file.
      *
      * @param int $lines
      *
@@ -125,7 +124,7 @@ public function getFolders()
      */
     public function getLogTail($lines = 10)
     {
-        $log = $this->coreParametersHelper->getParameter('log_path') . '/mautic_' . MAUTIC_ENV . '-' . date('Y-m-d') . '.php';
+        $log = $this->coreParametersHelper->getParameter('log_path').'/mautic_'.MAUTIC_ENV.'-'.date('Y-m-d').'.php';
 
         if (!file_exists($log)) {
             return null;
@@ -135,7 +134,7 @@ public function getLogTail($lines = 10)
     }
 
     /**
-     * Method to tail (a few last rows) of a file
+     * Method to tail (a few last rows) of a file.
      *
      * @param     $filename
      * @param int $lines
@@ -145,9 +144,9 @@ public function getLogTail($lines = 10)
      */
     public function tail($filename, $lines = 10, $buffer = 4096)
     {
-        $f = fopen($filename, "rb");
+        $f      = fopen($filename, 'rb');
         $output = '';
-        $chunk = '';
+        $chunk  = '';
 
         fseek($f, -1, SEEK_END);
 
@@ -168,6 +167,7 @@ public function tail($filename, $lines = 10, $buffer = 4096)
         }
 
         fclose($f);
+
         return $output;
     }
 }
diff --git a/app/bundles/ConfigBundle/Views/Config/form.html.php b/app/bundles/ConfigBundle/Views/Config/form.html.php
index 2303fc2a998..032134c33f8 100644
--- a/app/bundles/ConfigBundle/Views/Config/form.html.php
+++ b/app/bundles/ConfigBundle/Views/Config/form.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
     $view->extend('MauticCoreBundle:Default:content.html.php');
 }
 $view['slots']->set('mauticContent', 'config');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.config.header.index'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.config.header.index'));
 
 $configKeys = array_keys($form->children);
 ?>
@@ -26,11 +27,13 @@
             <!-- Nav tabs -->
             <ul class="list-group list-group-tabs" role="tablist">
             <?php foreach ($configKeys as $i => $key) : ?>
-                <?php if (!isset($formConfigs[$key]) || !count($form[$key]->children)) continue; ?>
+                <?php if (!isset($formConfigs[$key]) || !count($form[$key]->children)) {
+    continue;
+} ?>
                 <li role="presentation" class="list-group-item <?php echo $i === 0 ? 'in active' : ''; ?>">
                     <?php $containsErrors = ($view['form']->containsErrors($form[$key])) ? ' text-danger' : ''; ?>
                     <a href="#<?php echo $key; ?>" aria-controls="<?php echo $key; ?>" role="tab" data-toggle="tab" class="steps<?php echo $containsErrors; ?>">
-                        <?php echo $view['translator']->trans('mautic.config.tab.' . $key); ?>
+                        <?php echo $view['translator']->trans('mautic.config.tab.'.$key); ?>
                         <?php if ($containsErrors): ?>
                             <i class="fa fa-warning"></i>
                         <?php endif; ?>
@@ -48,7 +51,9 @@
         <div class="tab-content">
             <?php foreach ($configKeys as $i => $key) : ?>
             <?php
-                if (!isset($formConfigs[$key])) continue;
+                if (!isset($formConfigs[$key])) {
+                    continue;
+                }
                 if (!count($form[$key]->children)):
                     $form[$key]->setRendered();
                     continue;
diff --git a/app/bundles/ConfigBundle/Views/Sysinfo/index.html.php b/app/bundles/ConfigBundle/Views/Sysinfo/index.html.php
index ef2451e0093..7c25fb2729f 100644
--- a/app/bundles/ConfigBundle/Views/Sysinfo/index.html.php
+++ b/app/bundles/ConfigBundle/Views/Sysinfo/index.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'sysinfo');
-$view['slots']->set("headerTitle", $view['translator']->trans('System Info'));
+$view['slots']->set('headerTitle', $view['translator']->trans('System Info'));
 ?>
 
 <!-- start: box layout -->
@@ -59,10 +59,10 @@
                                 <th><?php echo $view['translator']->trans('mautic.sysinfo.is.writable'); ?></th>
                             </tr>
                         </thead>
-                        <?php foreach($folders as $folder => $isWritable) : ?>
+                        <?php foreach ($folders as $folder => $isWritable) : ?>
                             <tr class="<?php echo ($isWritable) ? 'success' : 'danger'; ?>">
                                 <td><?php echo $folder; ?></td>
-                                <td><?php echo ($isWritable) ? $view['translator']->trans('mautic.sysinfo.writable') : $view['translator']->trans('mautic.sysinfo.unwritable');?></td>
+                                <td><?php echo ($isWritable) ? $view['translator']->trans('mautic.sysinfo.writable') : $view['translator']->trans('mautic.sysinfo.unwritable'); ?></td>
                             </tr>
                         <?php endforeach; ?>
                     </table>
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/default.config.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/default.config.php
index 7fd3406f441..283c753a481 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/default.config.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/default.config.php
@@ -1,9 +1,9 @@
 <?php
 /**
  *	Filemanager PHP connector
- *  This file should at least declare auth() function 
- *  and instantiate the Filemanager as '$fm'
- *  
+ *  This file should at least declare auth() function
+ *  and instantiate the Filemanager as '$fm'.
+ *
  *  IMPORTANT : by default Read and Write access is granted to everyone
  *  Copy/paste this file to 'user.config.php' file to implement your own auth() function
  *  to grant access to wanted users only
@@ -16,21 +16,19 @@
  *	@copyright	Authors
  */
 
-
-
 /**
- *	Check if user is authorized
- *	
+ *	Check if user is authorized.
+ *
  *
- *	@return boolean true if access granted, false if no access
+ *	@return bool true if access granted, false if no access
  */
-function auth() {
-  // You can insert your own code over here to check if the user is authorized.
+function auth()
+{
+    // You can insert your own code over here to check if the user is authorized.
   // If you use a session variable, you've got to start the session first (session_start())
   return true;
 }
 
-
 // @todo Work on plugins registration
 // if (isset($config['plugin']) && !empty($config['plugin'])) {
 // 	$pluginPath = 'plugins' . DIRECTORY_SEPARATOR . $config['plugin'] . DIRECTORY_SEPARATOR;
@@ -42,8 +40,5 @@ function auth() {
 // 	$fm = new Filemanager($config);
 // }
 
-
 // we instantiate the Filemanager
 $fm = new Filemanager();
-
-?>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.class.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.class.php
index f84af55fa54..8ea6e37282c 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.class.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.class.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- *    Filemanager PHP class
+ *    Filemanager PHP class.
  *
  *    filemanager.class.php
  *    class for the filemanager.php connector
@@ -13,39 +13,38 @@
  */
 class Filemanager
 {
-
-    protected $config = array();
-    protected $language = array();
-    protected $get = array();
-    protected $post = array();
-    protected $properties = array();
-    protected $item = array();
-    protected $languages = array();
-    protected $allowed_actions = array();
-    protected $root = '';                // Filemanager root folder
-    protected $doc_root = '';        // root folder known by JS : $this->config['options']['fileRoot'] (filepath or '/') or $_SERVER['DOCUMENT_ROOT'] - overwritten by setFileRoot() method
+    protected $config           = [];
+    protected $language         = [];
+    protected $get              = [];
+    protected $post             = [];
+    protected $properties       = [];
+    protected $item             = [];
+    protected $languages        = [];
+    protected $allowed_actions  = [];
+    protected $root             = '';                // Filemanager root folder
+    protected $doc_root         = '';        // root folder known by JS : $this->config['options']['fileRoot'] (filepath or '/') or $_SERVER['DOCUMENT_ROOT'] - overwritten by setFileRoot() method
     protected $dynamic_fileroot = ''; // Only set if setFileRoot() is called. Second part of the path : '/Filemanager/assets/' ( doc_root - $_SERVER['DOCUMENT_ROOT'])
-    protected $path_to_files = ''; // path to FM userfiles folder - automatically computed by the PHP class, something like '/var/www/Filemanager/userfiles'
-    protected $logger = false;
-    protected $logfile = '';
-    protected $cachefolder = '_thumbs/';
-    protected $thumbnail_width = 64;
+    protected $path_to_files    = ''; // path to FM userfiles folder - automatically computed by the PHP class, something like '/var/www/Filemanager/userfiles'
+    protected $logger           = false;
+    protected $logfile          = '';
+    protected $cachefolder      = '_thumbs/';
+    protected $thumbnail_width  = 64;
     protected $thumbnail_height = 64;
-    protected $separator = 'userfiles'; // @todo fix keep it or not?
+    protected $separator        = 'userfiles'; // @todo fix keep it or not?
 
     public function __construct($extraConfig = '')
     {
 
         // getting default config file
-        $content        = file_get_contents("../../scripts/filemanager.config.js.default");
+        $content        = file_get_contents('../../scripts/filemanager.config.js.default');
         $config_default = json_decode($content, true);
 
         // getting user config file
-        $content = file_get_contents("../../scripts/filemanager.config.js");
+        $content = file_get_contents('../../scripts/filemanager.config.js');
         $config  = json_decode($content, true);
 
         if (!$config) {
-            $this->error("Error parsing the settings file! Please check your JSON syntax.");
+            $this->error('Error parsing the settings file! Please check your JSON syntax.');
         }
         $this->config = array_replace_recursive($config_default, $config);
 
@@ -60,13 +59,13 @@ public function __construct($extraConfig = '')
         }
 
         $this->root       = dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR;
-        $this->properties = array(
+        $this->properties = [
             'Date Created'  => null,
             'Date Modified' => null,
             'Height'        => null,
             'Width'         => null,
-            'Size'          => null
-        );
+            'Size'          => null,
+        ];
 
         // Log actions or not?
         if ($this->config['options']['logger'] == true) {
@@ -108,7 +107,6 @@ public function __construct($extraConfig = '')
     // $extraconfig should be formatted as json config array.
     public function setup($extraconfig)
     {
-
         $this->config = array_replace_recursive($this->config, $extraconfig);
     }
 
@@ -144,11 +142,11 @@ public function setFileRoot($path, $documentRoot = null)
 
     public function error($string, $textarea = false)
     {
-        $array = array(
+        $array = [
             'Error'      => $string,
             'Code'       => '-1',
-            'Properties' => $this->properties
-        );
+            'Properties' => $this->properties,
+        ];
 
         $this->__log(__METHOD__.' - error message : '.$string);
 
@@ -201,7 +199,7 @@ public function postvar($var, $sanitize = true)
 
     public function getinfo()
     {
-        $this->item               = array();
+        $this->item               = [];
         $this->item['properties'] = $this->properties;
         $this->get_file_info('', false);
 
@@ -214,29 +212,29 @@ public function getinfo()
             $path = $this->get['path'];
         }
 
-        $array = array(
+        $array = [
             'Path'       => $path,
             'Filename'   => $this->item['filename'],
             'File Type'  => $this->item['filetype'],
             'Protected'  => $this->item['protected'],
             'Preview'    => $this->item['preview'],
             'Properties' => $this->item['properties'],
-            'Error'      => "",
-            'Code'       => 0
-        );
+            'Error'      => '',
+            'Code'       => 0,
+        ];
 
         return $array;
     }
 
     public function getfolder()
     {
-        $array    = array();
-        $filesDir = array();
+        $array    = [];
+        $filesDir = [];
 
         $current_path = $this->getFullPath();
 
         if (!$this->is_valid_path($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         if (!is_dir($current_path)) {
@@ -244,7 +242,7 @@ public function getfolder()
         }
 
         // check if file is readable
-        if (!$this->has_system_permission($current_path, array('r'))) {
+        if (!$this->has_system_permission($current_path, ['r'])) {
             $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
         }
 
@@ -252,7 +250,7 @@ public function getfolder()
             $this->error(sprintf($this->lang('UNABLE_TO_OPEN_DIRECTORY'), $this->get['path']));
         } else {
             while (false !== ($file = readdir($handle))) {
-                if ($file != "." && $file != "..") {
+                if ($file != '.' && $file != '..') {
                     array_push($filesDir, $file);
                 }
             }
@@ -263,7 +261,6 @@ public function getfolder()
             natcasesort($filesDir);
 
             foreach ($filesDir as $file) {
-
                 if (is_dir($current_path.$file)) {
                     if (!in_array($file, $this->config['exclude']['unallowed_dirs'])
                         && !preg_match(
@@ -273,7 +270,7 @@ public function getfolder()
                     ) {
 
                         // check if file is writable and readable
-                        if (!$this->has_system_permission($current_path.$file, array('w', 'r'))) {
+                        if (!$this->has_system_permission($current_path.$file, ['w', 'r'])) {
                             $protected   = 1;
                             $previewPath = $this->config['icons']['path'].'locked_'.$this->config['icons']['directory'];
                         } else {
@@ -281,14 +278,14 @@ public function getfolder()
                             $previewPath = $this->config['icons']['path'].$this->config['icons']['directory'];
                         }
 
-                        $array[$this->get['path'].$file.'/'] = array(
+                        $array[$this->get['path'].$file.'/'] = [
                             'Path'       => $this->get['path'].$file.'/',
                             'Filename'   => $file,
                             'File Type'  => 'dir',
                             'Protected'  => $protected,
                             'Preview'    => $previewPath,
-                            'Properties' => array(
-                                'Date Created'  => date(
+                            'Properties' => [
+                                'Date Created' => date(
                                     $this->config['options']['dateFormat'],
                                     filectime($this->getFullPath($this->get['path'].$file.'/'))
                                 ),
@@ -296,26 +293,25 @@ public function getfolder()
                                     $this->config['options']['dateFormat'],
                                     filemtime($this->getFullPath($this->get['path'].$file.'/'))
                                 ),
-                                'filemtime'     => filemtime($this->getFullPath($this->get['path'].$file.'/')),
-                                'Height'        => null,
-                                'Width'         => null,
-                                'Size'          => null
-                            ),
-                            'Error'      => "",
-                            'Code'       => 0
-                        );
+                                'filemtime' => filemtime($this->getFullPath($this->get['path'].$file.'/')),
+                                'Height'    => null,
+                                'Width'     => null,
+                                'Size'      => null,
+                            ],
+                            'Error' => '',
+                            'Code'  => 0,
+                        ];
                     }
-                } else if (!in_array($file, $this->config['exclude']['unallowed_files'])
+                } elseif (!in_array($file, $this->config['exclude']['unallowed_files'])
                     && !preg_match(
                         $this->config['exclude']['unallowed_files_REGEXP'],
                         $file
                     )
                 ) {
-                    $this->item               = array();
+                    $this->item               = [];
                     $this->item['properties'] = $this->properties;
                     $this->get_file_info($this->get['path'].$file, true);
 
-
                     if (!isset($this->params['type'])
                         || (isset($this->params['type']) && strtolower($this->params['type']) == 'images'
                             && in_array(
@@ -330,16 +326,16 @@ public function getfolder()
                                     array_map('strtolower', $this->config['images']['imagesExt'])
                                 ))
                         ) {
-                            $array[$this->get['path'].$file] = array(
+                            $array[$this->get['path'].$file] = [
                                 'Path'       => $this->get['path'].$file,
                                 'Filename'   => $this->item['filename'],
                                 'File Type'  => $this->item['filetype'],
                                 'Protected'  => $this->item['protected'],
                                 'Preview'    => $this->item['preview'],
                                 'Properties' => $this->item['properties'],
-                                'Error'      => "",
-                                'Code'       => 0
-                            );
+                                'Error'      => '',
+                                'Code'       => 0,
+                            ];
                         }
                     }
                 }
@@ -351,19 +347,17 @@ public function getfolder()
         return $array;
     }
 
-
     public function editfile()
     {
-
         $current_path = $this->getFullPath();
 
         // check if file is writable
-        if (!$this->has_system_permission($current_path, array('w'))) {
+        if (!$this->has_system_permission($current_path, ['w'])) {
             $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
         }
 
         if (!$this->has_permission('edit') || !$this->is_valid_path($current_path) || !$this->is_editable($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         $this->__log(__METHOD__.' - editing file '.$current_path);
@@ -375,26 +369,25 @@ public function editfile()
             $this->error(sprintf($this->lang('ERROR_OPENING_FILE')));
         }
 
-        $array = array(
-            'Error'   => "",
+        $array = [
+            'Error'   => '',
             'Code'    => 0,
             'Path'    => $this->get['path'],
-            'Content' => $this->formatPath($content)
-        );
+            'Content' => $this->formatPath($content),
+        ];
 
         return $array;
     }
 
     public function savefile()
     {
-
         $current_path = $this->getFullPath($this->post['path']);
 
         if (!$this->has_permission('edit') || !$this->is_valid_path($current_path) || !$this->is_editable($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
-        if (!$this->has_system_permission($current_path, array('w'))) {
+        if (!$this->has_system_permission($current_path, ['w'])) {
             $this->error(sprintf($this->lang('ERROR_WRITING_PERM')));
         }
 
@@ -407,18 +400,17 @@ public function savefile()
             $this->error(sprintf($this->lang('ERROR_SAVING_FILE')));
         }
 
-        $array = array(
-            'Error' => "",
+        $array = [
+            'Error' => '',
             'Code'  => 0,
-            'Path'  => $this->formatPath($this->post['path'])
-        );
+            'Path'  => $this->formatPath($this->post['path']),
+        ];
 
         return $array;
     }
 
     public function rename()
     {
-
         $suffix = '';
 
         if (substr($this->get['old'], -1, 1) == '/') {
@@ -433,11 +425,11 @@ public function rename()
         $old_file = $this->getFullPath($this->get['old']).$suffix;
 
         if (!$this->has_permission('rename') || !$this->is_valid_path($old_file)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         // check if file is writable
-        if (!$this->has_system_permission($old_file, array('w'))) {
+        if (!$this->has_system_permission($old_file, ['w'])) {
             $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
         }
 
@@ -469,14 +461,14 @@ public function rename()
                 $this->error(sprintf($this->lang('ERROR_RENAMING_FILE'), $filename, $this->get['new']));
             }
         }
-        $array = array(
-            'Error'    => "",
+        $array = [
+            'Error'    => '',
             'Code'     => 0,
             'Old Path' => $this->formatPath($this->get['old'].$suffix),
             'Old Name' => $filename,
             'New Path' => $this->formatPath($path.'/'.$this->get['new'].$suffix),
-            'New Name' => $this->get['new']
-        );
+            'New Name' => $this->get['new'],
+        ];
 
         return $array;
     }
@@ -496,11 +488,10 @@ public function move()
         $oldPath = $this->getFullPath($this->get['old']);
 
         // check if file is writable
-        if (!$this->has_system_permission($oldPath, array('w'))) {
+        if (!$this->has_system_permission($oldPath, ['w'])) {
             $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')), true);
         }
 
-
         // check if not requesting main FM userfiles folder
         if ($this->is_root_folder($oldPath)) {
             $this->error(sprintf($this->lang('NOT_ALLOWED')), true);
@@ -512,7 +503,7 @@ public function move()
         $path     = '/'.implode('/', $tmp).'/';
 
         // new path
-        if (substr($this->get['new'], 0, 1) != "/") {
+        if (substr($this->get['new'], 0, 1) != '/') {
             // make path relative from old dir
             $newPath = $path.'/'.$this->get['new'].'/';
         } else {
@@ -526,7 +517,7 @@ public function move()
         $newPath         = $this->getFullPath($newPath);
 
         if (!$this->has_permission('move') || !$this->is_valid_path($oldPath) || !$this->is_valid_path($newPath)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         // check if file already exists
@@ -556,31 +547,29 @@ public function move()
             }
         }
 
-        $array = array(
-            'Error'    => "",
+        $array = [
+            'Error'    => '',
             'Code'     => 0,
             'Old Path' => $path,
             'Old Name' => $fileName,
             'New Path' => $this->formatPath($newRelativePath),
             'New Name' => $fileName,
-        );
+        ];
 
         return $array;
     }
 
     public function delete()
     {
-
         $current_path   = $this->getFullPath();
         $thumbnail_path = $this->get_thumbnail_path($current_path);
 
-
         if (!$this->has_permission('delete') || !$this->is_valid_path($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         // check if file is writable
-        if (!$this->has_system_permission($current_path, array('w'))) {
+        if (!$this->has_system_permission($current_path, ['w'])) {
             $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')));
         }
 
@@ -590,25 +579,22 @@ public function delete()
         }
 
         if (is_dir($current_path)) {
-
             $this->unlinkRecursive($current_path);
 
             // we remove thumbnails if needed
             $this->__log(__METHOD__.' - deleting thumbnails folder '.$thumbnail_path);
             $this->unlinkRecursive($thumbnail_path);
 
-            $array = array(
-                'Error' => "",
+            $array = [
+                'Error' => '',
                 'Code'  => 0,
-                'Path'  => $this->formatPath($this->get['path'])
-            );
+                'Path'  => $this->formatPath($this->get['path']),
+            ];
 
             $this->__log(__METHOD__.' - deleting folder '.$current_path);
 
             return $array;
-
-        } else if (file_exists($current_path)) {
-
+        } elseif (file_exists($current_path)) {
             unlink($current_path);
 
             // delete thumbail if exists
@@ -617,16 +603,15 @@ public function delete()
                 unlink($thumbnail_path);
             }
 
-            $array = array(
-                'Error' => "",
+            $array = [
+                'Error' => '',
                 'Code'  => 0,
-                'Path'  => $this->formatPath($this->get['path'])
-            );
+                'Path'  => $this->formatPath($this->get['path']),
+            ];
 
             $this->__log(__METHOD__.' - deleting file '.$current_path);
 
             return $array;
-
         } else {
             $this->error(sprintf($this->lang('INVALID_DIRECTORY_OR_FILE')));
         }
@@ -634,7 +619,6 @@ public function delete()
 
     public function replace()
     {
-
         $this->setParams();
 
         if (!isset($_FILES['fileR']) || !is_uploaded_file($_FILES['fileR']['tmp_name'])) {
@@ -691,7 +675,7 @@ public function replace()
             if (!($size = @getimagesize($_FILES['fileR']['tmp_name']))) {
                 $this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')), true);
             }
-            if (!in_array($size[2], array(1, 2, 3, 7, 8))) {
+            if (!in_array($size[2], [1, 2, 3, 7, 8])) {
                 $this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')), true);
             }
         }
@@ -699,12 +683,12 @@ public function replace()
         $current_path = $this->getFullPath($this->post['newfilepath']);
 
         // check if file is writable
-        if (!$this->has_system_permission($current_path, array('w'))) {
+        if (!$this->has_system_permission($current_path, ['w'])) {
             $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')), true);
         }
 
         if (!$this->has_permission('replace') || !$this->is_valid_path($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         move_uploaded_file($_FILES['fileR']['tmp_name'], $current_path);
@@ -719,7 +703,7 @@ public function replace()
         if ($this->is_image($imagePath) && $this->config['images']['resize']['enabled']) {
             if ($size = @getimagesize($imagePath)) {
                 if ($size[0] > $this->config['images']['resize']['maxWidth'] || $size[1] > $this->config['images']['resize']['maxHeight']) {
-                    require_once('./inc/wideimage/lib/WideImage.php');
+                    require_once './inc/wideimage/lib/WideImage.php';
 
                     $image   = WideImage::load($imagePath);
                     $resized = $image->resize(
@@ -736,12 +720,12 @@ public function replace()
 
         chmod($current_path, 0644);
 
-        $response = array(
+        $response = [
             'Path'  => dirname($this->post['newfilepath']),
             'Name'  => basename($this->post['newfilepath']),
-            'Error' => "",
-            'Code'  => 0
-        );
+            'Error' => '',
+            'Code'  => 0,
+        ];
 
         $this->__log(__METHOD__.' - replacing file '.$current_path);
 
@@ -751,7 +735,6 @@ public function replace()
 
     public function add()
     {
-
         $this->setParams();
 
         if (!isset($_FILES['newfile']) || !is_uploaded_file($_FILES['newfile']['tmp_name'])) {
@@ -796,16 +779,16 @@ public function add()
             if (!($size = @getimagesize($_FILES['newfile']['tmp_name']))) {
                 $this->error(sprintf($this->lang('UPLOAD_IMAGES_ONLY')), true);
             }
-            if (!in_array($size[2], array(1, 2, 3, 7, 8))) {
+            if (!in_array($size[2], [1, 2, 3, 7, 8])) {
                 $this->error(sprintf($this->lang('UPLOAD_IMAGES_TYPE_JPEG_GIF_PNG')), true);
             }
         }
-        $_FILES['newfile']['name'] = $this->cleanString($_FILES['newfile']['name'], array('.', '-'));
+        $_FILES['newfile']['name'] = $this->cleanString($_FILES['newfile']['name'], ['.', '-']);
 
         $current_path = $this->getFullPath($this->post['currentpath']);
 
         if (!$this->is_valid_path($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         if (!$this->config['upload']['overwrite']) {
@@ -818,7 +801,7 @@ public function add()
         if ($this->is_image($imagePath) && $this->config['images']['resize']['enabled']) {
             if ($size = @getimagesize($imagePath)) {
                 if ($size[0] > $this->config['images']['resize']['maxWidth'] || $size[1] > $this->config['images']['resize']['maxHeight']) {
-                    require_once('./inc/wideimage/lib/WideImage.php');
+                    require_once './inc/wideimage/lib/WideImage.php';
 
                     $image   = WideImage::load($imagePath);
                     $resized = $image->resize(
@@ -835,12 +818,12 @@ public function add()
 
         chmod($current_path.$_FILES['newfile']['name'], 0644);
 
-        $response = array(
+        $response = [
             'Path'  => $this->post['currentpath'],
             'Name'  => $_FILES['newfile']['name'],
-            'Error' => "",
-            'Code'  => 0
-        );
+            'Error' => '',
+            'Code'  => 0,
+        ];
 
         $this->__log(__METHOD__.' - adding file '.$_FILES['newfile']['name'].' into '.$current_path);
 
@@ -850,39 +833,38 @@ public function add()
 
     public function addfolder()
     {
-
         $current_path = $this->getFullPath();
 
         if (!$this->is_valid_path($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
         if (is_dir($current_path.$this->get['name'])) {
             $this->error(sprintf($this->lang('DIRECTORY_ALREADY_EXISTS'), $this->get['name']));
-
         }
         $newdir = $this->cleanString($this->get['name']);
         if (!mkdir($current_path.$newdir, 0755)) {
             $this->error(sprintf($this->lang('UNABLE_TO_CREATE_DIRECTORY'), $newdir));
         }
-        $array = array(
+        $array = [
             'Parent' => $this->get['path'],
             'Name'   => $this->get['name'],
-            'Error'  => "",
-            'Code'   => 0
-        );
+            'Error'  => '',
+            'Code'   => 0,
+        ];
         $this->__log(__METHOD__.' - adding folder '.$current_path.$newdir);
 
         return $array;
     }
 
     /**
-     * function zipFile.  Creates a zip file from source to destination
+     * function zipFile.  Creates a zip file from source to destination.
+     *
+     * @param string      $source      Source path for zip
+     * @param string      $destination Destination path for zip
+     * @param string|bool $flag        OPTIONAL If true includes the folder also
      *
-     * @param  string         $source      Source path for zip
-     * @param  string         $destination Destination path for zip
-     * @param  string|boolean $flag        OPTIONAL If true includes the folder also
+     * @return bool
      *
-     * @return boolean
      * @link     http://stackoverflow.com/questions/17584869/zip-main-folder-with-sub-folder-inside
      */
     public function zipFile($source, $destination, $flag = '')
@@ -912,11 +894,11 @@ public function zipFile($source, $destination, $flag = '')
 
                 if (is_dir($file) === true) {
                     $zip->addEmptyDir(str_replace($source.'/', '', $flag.$file.'/'));
-                } else if (is_file($file) === true) {
+                } elseif (is_file($file) === true) {
                     $zip->addFromString(str_replace($source.'/', '', $flag.$file), file_get_contents($file));
                 }
             }
-        } else if (is_file($source) === true) {
+        } elseif (is_file($source) === true) {
             $zip->addFromString($flag.basename($source), file_get_contents($source));
         }
 
@@ -925,15 +907,14 @@ public function zipFile($source, $destination, $flag = '')
 
     public function download()
     {
-
         $current_path = $this->getFullPath();
 
         if (!$this->has_permission('download') || !$this->is_valid_path($current_path)) {
-            $this->error("No way.");
+            $this->error('No way.');
         }
 
         // check if file is writable
-        if (!$this->has_system_permission($current_path, array('w'))) {
+        if (!$this->has_system_permission($current_path, ['w'])) {
             $this->error(sprintf($this->lang('NOT_ALLOWED_SYSTEM')), true);
         }
 
@@ -942,7 +923,6 @@ public function download()
             if (!$this->is_allowed_file_type(basename($current_path))) {
                 $this->error(sprintf($this->lang('INVALID_FILE_TYPE')), true);
             }
-
         } else {
 
             // check if permission is granted
@@ -963,14 +943,13 @@ public function download()
             } else {
                 $this->error($this->lang('ERROR_CREATING_ZIP'));
             }
-
         }
 
         if (isset($this->get['path']) && file_exists($current_path)) {
-            header("Content-type: application/force-download");
+            header('Content-type: application/force-download');
             header('Content-Disposition: inline; filename="'.basename($current_path).'"');
-            header("Content-Transfer-Encoding: Binary");
-            header("Content-length: ".filesize($current_path));
+            header('Content-Transfer-Encoding: Binary');
+            header('Content-length: '.filesize($current_path));
             header('Content-Type: application/octet-stream');
             header('Content-Disposition: attachment; filename="'.basename($current_path).'"');
             readfile($current_path);
@@ -983,7 +962,6 @@ public function download()
 
     public function preview($thumbnail)
     {
-
         $current_path = $this->getFullPath();
 
         if (isset($this->get['path']) && file_exists($current_path)) {
@@ -996,15 +974,14 @@ public function preview($thumbnail)
                 $returned_path = $current_path;
             }
 
-            header("Content-type: image/".strtolower(pathinfo($returned_path, PATHINFO_EXTENSION)));
-            header("Content-Transfer-Encoding: Binary");
-            header("Content-length: ".filesize($returned_path));
+            header('Content-type: image/'.strtolower(pathinfo($returned_path, PATHINFO_EXTENSION)));
+            header('Content-Transfer-Encoding: Binary');
+            header('Content-length: '.filesize($returned_path));
             header('Content-Disposition: inline; filename="'.basename($returned_path).'"');
 
             readfile($returned_path);
 
             exit();
-
         } else {
             $this->error(sprintf($this->lang('FILE_DOES_NOT_EXIST'), $current_path));
         }
@@ -1016,7 +993,7 @@ public function getMaxUploadFileSize()
         $max_post     = \Mautic\AssetBundle\Entity\Asset::getIniValue('post_max_size');
         $memory_limit = \Mautic\AssetBundle\Entity\Asset::getIniValue('memory_limit');
 
-        $upload_mb =  min(array_filter(array($max_upload, $max_post, $memory_limit)));
+        $upload_mb = min(array_filter([$max_upload, $max_post, $memory_limit]));
 
         $this->__log(__METHOD__.' - max upload file size is '.$upload_mb.'Mb');
 
@@ -1027,7 +1004,7 @@ private function setParams()
     {
         $tmp    = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/');
         $tmp    = explode('?', $tmp);
-        $params = array();
+        $params = [];
         if (isset($tmp[1]) && $tmp[1] != '') {
             $params_tmp = explode('&', $tmp[1]);
             if (is_array($params_tmp)) {
@@ -1044,19 +1021,16 @@ private function setParams()
 
     private function setPermissions()
     {
-
         $this->allowed_actions = $this->config['options']['capabilities'];
 
         if ($this->config['edit']['enabled']) {
             array_push($this->allowed_actions, 'edit');
         }
-
     }
 
     // check if system permission is granted
     private function has_system_permission($filepath, $perms)
     {
-
         if (in_array('r', $perms)) {
             if (!is_readable($filepath)) {
                 return false;
@@ -1069,10 +1043,8 @@ private function has_system_permission($filepath, $perms)
         }
 
         return true;
-
     }
 
-
     private function get_file_info($path = '', $thumbnail = false)
     {
 
@@ -1092,23 +1064,20 @@ private function get_file_info($path = '', $thumbnail = false)
         $this->item['filectime'] = filectime($this->getFullPath($current_path));
 
         // check if file is writable and readable
-        if (!$this->has_system_permission($this->getFullPath($current_path), array('w', 'r'))) {
+        if (!$this->has_system_permission($this->getFullPath($current_path), ['w', 'r'])) {
             $this->item['protected'] = 1;
             $this->item['preview']   = $this->config['icons']['path'].'locked_'.$this->config['icons']['default'];
             // prevent Internal Server Error HTTP_CODE 500 on non readable files/folders
             // without returning errors
             return;
-
         } else {
             $this->item['protected'] = 0;
             $this->item['preview']   = $this->config['icons']['path'].$this->config['icons']['default'];
         }
 
         if (is_dir($current_path)) {
-
             $this->item['preview'] = $this->config['icons']['path'].$this->config['icons']['directory'];
-
-        } else if (in_array(strtolower($this->item['filetype']), array_map('strtolower', $this->config['images']['imagesExt']))) {
+        } elseif (in_array(strtolower($this->item['filetype']), array_map('strtolower', $this->config['images']['imagesExt']))) {
 
             // svg should not be previewed as raster formats images
             if ($this->item['filetype'] == 'svg') {
@@ -1125,21 +1094,18 @@ private function get_file_info($path = '', $thumbnail = false)
                 list($width, $height, $type, $attr) = getimagesize($this->getFullPath($current_path));
             } else {
                 $this->item['properties']['Size'] = 0;
-                list($width, $height) = array(0, 0);
+                list($width, $height)             = [0, 0];
             }
             $this->item['properties']['Height'] = $height;
             $this->item['properties']['Width']  = $width;
             $this->item['properties']['Size']   = filesize($this->getFullPath($current_path));
             //}
-
-        } else if (file_exists($this->root.$this->config['icons']['path'].strtolower($this->item['filetype']).'.png')) {
-
+        } elseif (file_exists($this->root.$this->config['icons']['path'].strtolower($this->item['filetype']).'.png')) {
             $this->item['preview']            = $this->config['icons']['path'].strtolower($this->item['filetype']).'.png';
             $this->item['properties']['Size'] = filesize($this->getFullPath($current_path));
             if (!$this->item['properties']['Size']) {
                 $this->item['properties']['Size'] = 0;
             }
-
         }
 
         $this->item['properties']['Date Modified'] = date($this->config['options']['dateFormat'], $this->item['filemtime']);
@@ -1149,7 +1115,6 @@ private function get_file_info($path = '', $thumbnail = false)
 
     private function getFullPath($path = '')
     {
-
         if ($path == '') {
             if (isset($this->get['path'])) {
                 $path = $this->get['path'];
@@ -1167,34 +1132,27 @@ private function getFullPath($path = '')
             $full_path = $this->doc_root.rawurldecode($path);
         }
 
-        $full_path = str_replace("//", "/", $full_path);
+        $full_path = str_replace('//', '/', $full_path);
 
         // $this->__log("getFullPath() returned path : " . $full_path);
 
         return $full_path;
-
     }
 
     /**
-     * format path regarding the initial configuration
+     * format path regarding the initial configuration.
      *
      * @param string $path
      */
     private function formatPath($path)
     {
-
         if ($this->dynamic_fileroot != '') {
-
             $a = explode($this->separator, $path);
 
             return end($a);
-
         } else {
-
             return $path;
-
         }
-
     }
 
     private function sortFiles($array)
@@ -1207,12 +1165,11 @@ private function sortFiles($array)
 
         // handle 'TYPE_ASC' and 'TYPE_DESC'
         if (strpos($this->config['options']['fileSorting'], 'TYPE_') !== false || $this->config['options']['fileSorting'] == 'default') {
-
-            $a = array();
-            $b = array();
+            $a = [];
+            $b = [];
 
             foreach ($array as $key => $item) {
-                if (strcmp($item["File Type"], "dir") == 0) {
+                if (strcmp($item['File Type'], 'dir') == 0) {
                     $a[$key] = $item;
                 } else {
                     $b[$key] = $item;
@@ -1230,8 +1187,7 @@ private function sortFiles($array)
 
         // handle 'MODIFIED_ASC' and 'MODIFIED_DESC'
         if (strpos($this->config['options']['fileSorting'], 'MODIFIED_') !== false) {
-
-            $modified_order_array = array();  // new array as a column to sort collector
+            $modified_order_array = [];  // new array as a column to sort collector
 
             foreach ($array as $item) {
                 $modified_order_array[] = $item['Properties']['filemtime'];
@@ -1245,11 +1201,9 @@ private function sortFiles($array)
             }
 
             return $array;
-
         }
 
         return $array;
-
     }
 
 // @todo to remove
@@ -1260,7 +1214,7 @@ private function sortFiles($array)
 
     private function is_valid_path($path)
     {
-       return file_exists($path);
+        return file_exists($path);
     }
 
     private function unlinkRecursive($dir, $deleteRootToo = true)
@@ -1289,17 +1243,16 @@ private function unlinkRecursive($dir, $deleteRootToo = true)
 
     /**
      * is_allowed_file_type()
-     * check if extension is allowed regarding the security Policy / Restrictions settings
+     * check if extension is allowed regarding the security Policy / Restrictions settings.
      *
      * @param string $file
      */
     private function is_allowed_file_type($file)
     {
-
         $path_parts = pathinfo($file);
 
         // if there is no extension
-        if (!isset ($path_parts ['extension'])) {
+        if (!isset($path_parts ['extension'])) {
             // we check if no extension file are allowed
             return (bool) $this->config['security']['allowNoExtension'];
         }
@@ -1307,23 +1260,20 @@ private function is_allowed_file_type($file)
         $exts = array_map('strtolower', $this->config['security']['uploadRestrictions']);
 
         if ($this->config['security']['uploadPolicy'] == 'DISALLOW_ALL') {
-
             if (!in_array(strtolower($path_parts['extension']), $exts)) {
                 return false;
             }
         }
         if ($this->config['security']['uploadPolicy'] == 'ALLOW_ALL') {
-
             if (in_array(strtolower($path_parts['extension']), $exts)) {
                 return false;
             }
         }
 
         return true;
-
     }
 
-    private function cleanString($string, $allowed = array())
+    private function cleanString($string, $allowed = [])
     {
         $allow = null;
 
@@ -1333,7 +1283,7 @@ private function cleanString($string, $allowed = array())
             }
         }
 
-        $mapping = array(
+        $mapping = [
             'Š' => 'S',
             'š' => 's',
             'Đ' => 'Dj',
@@ -1414,12 +1364,11 @@ private function cleanString($string, $allowed = array())
             'ŕ' => 'r',
             ' ' => '_',
             "'" => '_',
-            '/' => ''
-        );
+            '/' => '',
+        ];
 
         if (is_array($string)) {
-
-            $cleaned = array();
+            $cleaned = [];
 
             foreach ($string as $key => $clean) {
                 $clean = strtr($clean, $mapping);
@@ -1437,18 +1386,17 @@ private function cleanString($string, $allowed = array())
                 // $clean = preg_replace("/[^{$allow}_a-zA-Z0-9\x{0430}-\x{044F}\x{0410}-\x{042F}]/u", '', $string); // allow only latin alphabet with cyrillic
             }
             $cleaned = preg_replace('/[_]+/', '_', $clean); // remove double underscore
-
         }
 
         return $cleaned;
     }
 
     /**
-     * Checking if permission is set or not for a given action
+     * Checking if permission is set or not for a given action.
      *
      * @param string $action
      *
-     * @return boolean
+     * @return bool
      */
     private function has_permission($action)
     {
@@ -1457,13 +1405,12 @@ private function has_permission($action)
 
     /**
      * Return Thumbnail path from given path
-     * works for both file and dir path
+     * works for both file and dir path.
      *
      * @param string $path
      */
     private function get_thumbnail_path($path)
     {
-
         $pos  = strrpos($path, $this->separator);
         $a[0] = substr($path, 0, $pos);
         $a[1] = substr($path, $pos + strlen($this->separator));
@@ -1482,20 +1429,18 @@ private function get_thumbnail_path($path)
         }
 
         return $thumbnail_fullpath;
-
     }
 
     /**
      * For debugging just call
      * the direct URL http://localhost/Filemanager/connectors/php/filemanager.php?mode=preview&path=%2FFilemanager%2Fuserfiles%2FMy%20folder3%2Fblanches_neiges.jPg&thumbnail=true
-     * and echo vars below
+     * and echo vars below.
      *
      * @param string $path
      */
     private function get_thumbnail($path)
     {
-
-        require_once('./inc/wideimage/lib/WideImage.php');
+        require_once './inc/wideimage/lib/WideImage.php';
 
         $thumbnail_fullpath = $this->get_thumbnail_path($path);
 
@@ -1518,7 +1463,6 @@ private function get_thumbnail($path)
             $resized->saveToFile($thumbnail_fullpath);
 
             $this->__log(__METHOD__.' - generating thumbnail :  '.$thumbnail_fullpath);
-
         }
 
         return $thumbnail_fullpath;
@@ -1526,7 +1470,6 @@ private function get_thumbnail($path)
 
     private function sanitize($var)
     {
-
         $sanitized = strip_tags($var);
         $sanitized = str_replace('http://', '', $sanitized);
         $sanitized = str_replace('https://', '', $sanitized);
@@ -1548,7 +1491,7 @@ private function checkFilename($path, $filename, $i = '')
             if ($i == '') {
                 $i = 1;
             } else {
-                $i++;
+                ++$i;
             }
             $filename = str_replace($_i.'.'.$tmp[(sizeof($tmp) - 1)], $i.'.'.$tmp[(sizeof($tmp) - 1)], $filename);
 
@@ -1577,10 +1520,9 @@ private function loadLanguageFile()
 
     private function availableLanguages()
     {
-
         if ($handle = opendir($this->root.'/scripts/languages/')) {
             while (false !== ($file = readdir($handle))) {
-                if ($file != "." && $file != "..") {
+                if ($file != '.' && $file != '..') {
                     array_push($this->languages, pathinfo($file, PATHINFO_FILENAME));
                 }
             }
@@ -1590,21 +1532,19 @@ private function availableLanguages()
 
     private function is_image($path)
     {
-
         $a          = getimagesize($path);
         $image_type = $a[2];
 
-        return in_array($image_type, array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP));
+        return in_array($image_type, [IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP]);
     }
 
     private function is_root_folder($path)
     {
-        return rtrim($this->path_to_files, "/") == rtrim($path, "/");
+        return rtrim($this->path_to_files, '/') == rtrim($path, '/');
     }
 
     private function is_editable($file)
     {
-
         $path_parts = pathinfo($file);
 
         $exts = array_map('strtolower', $this->config['edit']['editExt']);
@@ -1612,7 +1552,6 @@ private function is_editable($file)
         return in_array($path_parts['extension'], $exts);
     }
 
-
     private function get_user_ip()
     {
         $client  = @$_SERVER['HTTP_CLIENT_IP'];
@@ -1630,23 +1569,18 @@ private function get_user_ip()
         return $ip;
     }
 
-
     private function __log($msg)
     {
-
         if ($this->logger == true) {
-
-            $fp  = fopen($this->logfile, "a");
-            $str = "[".date("d/m/Y h:i:s", time())."]#".$this->get_user_ip()."#".$msg;
+            $fp  = fopen($this->logfile, 'a');
+            $str = '['.date('d/m/Y h:i:s', time()).']#'.$this->get_user_ip().'#'.$msg;
             fwrite($fp, $str.PHP_EOL);
             fclose($fp);
         }
-
     }
 
     public function enableLog($logfile = '')
     {
-
         $this->logger = true;
 
         if ($logfile != '') {
@@ -1654,19 +1588,17 @@ public function enableLog($logfile = '')
         }
 
         $this->__log(__METHOD__.' - Log enabled (in '.$this->logfile.' file)');
-
     }
 
     public function disableLog()
     {
-
         $this->logger = false;
 
         $this->__log(__METHOD__.' - Log disabled');
     }
 
     /**
-     * Remove "../" from path
+     * Remove "../" from path.
      *
      * @param string path to be converted
      * @param bool   if dir names should be cleaned
@@ -1676,7 +1608,7 @@ public function disableLog()
     public function expandPath($path, $clean = false)
     {
         $todo     = explode('/', $path);
-        $fullPath = array();
+        $fullPath = [];
 
         foreach ($todo as $dir) {
             if ($dir == '..') {
@@ -1695,5 +1627,3 @@ public function expandPath($path, $clean = false)
         return implode('/', $fullPath);
     }
 }
-
-?>
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.php
index 4fa6c0dd20d..98330151b66 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/filemanager.php
@@ -3,7 +3,7 @@
 // error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
 // ini_set('display_errors', '1');
 /**
- *	Filemanager PHP connector
+ *	Filemanager PHP connector.
  *
  *	filemanager.php
  *	use for ckeditor filemanager plug-in by Core Five - http://labs.corefive.com/Projects/FileManager/
@@ -13,28 +13,25 @@
  *  @author		Simon Georget <simon (at) linea21 (dot) com>
  *	@copyright	Authors
  */
-
-require_once('filemanager.class.php');
+require_once 'filemanager.class.php';
 
 // if user file is defined we include it, else we include the default file
-(file_exists('user.config.php')) ? include_once('user.config.php') : include_once('default.config.php');
+(file_exists('user.config.php')) ? include_once('user.config.php') : include_once 'default.config.php';
 
 // auth() function is already defined
 // and Filemanager is instantiated as $fm
 
 $response = '';
 
-if(!auth()) {
+if (!auth()) {
     $fm->error($fm->lang('AUTHORIZATION_REQUIRED'));
 }
 
-if(!isset($_GET)) {
+if (!isset($_GET)) {
     $fm->error($fm->lang('INVALID_ACTION'));
 } else {
-
-    if(isset($_GET['mode']) && $_GET['mode']!='') {
-
-        switch($_GET['mode']) {
+    if (isset($_GET['mode']) && $_GET['mode'] != '') {
+        switch ($_GET['mode']) {
 
             default:
 
@@ -43,62 +40,62 @@
 
             case 'getinfo':
 
-                if($fm->getvar('path')) {
+                if ($fm->getvar('path')) {
                     $response = $fm->getinfo();
                 }
                 break;
 
             case 'getfolder':
 
-                if($fm->getvar('path')) {
+                if ($fm->getvar('path')) {
                     $response = $fm->getfolder();
                 }
                 break;
 
             case 'rename':
 
-                if($fm->getvar('old') && $fm->getvar('new')) {
+                if ($fm->getvar('old') && $fm->getvar('new')) {
                     $response = $fm->rename();
                 }
                 break;
 
             case 'move':
                 // allow "../"
-                if($fm->getvar('old') && $fm->getvar('new') && $fm->getvar('root')) {
+                if ($fm->getvar('old') && $fm->getvar('new') && $fm->getvar('root')) {
                     $response = $fm->move();
                 }
                 break;
 
             case 'editfile':
 
-                if($fm->getvar('path')) {
+                if ($fm->getvar('path')) {
                     $response = $fm->editfile();
                 }
                 break;
 
             case 'delete':
 
-                if($fm->getvar('path')) {
+                if ($fm->getvar('path')) {
                     $response = $fm->delete();
                 }
                 break;
 
             case 'addfolder':
 
-                if($fm->getvar('path') && $fm->getvar('name')) {
+                if ($fm->getvar('path') && $fm->getvar('name')) {
                     $response = $fm->addfolder();
                 }
                 break;
 
             case 'download':
-                if($fm->getvar('path')) {
+                if ($fm->getvar('path')) {
                     $fm->download();
                 }
                 break;
 
             case 'preview':
-                if($fm->getvar('path')) {
-                    if(isset($_GET['thumbnail'])) {
+                if ($fm->getvar('path')) {
+                    if (isset($_GET['thumbnail'])) {
                         $thumbnail = true;
                     } else {
                         $thumbnail = false;
@@ -107,10 +104,8 @@
                 }
                 break;
         }
-
-    } else if(isset($_POST['mode']) && $_POST['mode']!='') {
-
-        switch($_POST['mode']) {
+    } elseif (isset($_POST['mode']) && $_POST['mode'] != '') {
+        switch ($_POST['mode']) {
 
             default:
 
@@ -119,29 +114,27 @@
 
             case 'add':
 
-                if($fm->postvar('currentpath')) {
+                if ($fm->postvar('currentpath')) {
                     $fm->add();
                 }
                 break;
 
             case 'replace':
 
-                if($fm->postvar('newfilepath')) {
+                if ($fm->postvar('newfilepath')) {
                     $fm->replace();
                 }
                 break;
 
             case 'savefile':
 
-                if($fm->postvar('content', false) && $fm->postvar('path')) {
+                if ($fm->postvar('content', false) && $fm->postvar('path')) {
                     $response = $fm->savefile();
                 }
                 break;
         }
-
     }
 }
 
 echo json_encode($response);
 die();
-?>
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Canvas.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Canvas.php
index 359ef51bc67..60a39f2f6ac 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Canvas.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Canvas.php
@@ -1,167 +1,148 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_NoFontException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidFontFileException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidCanvasMethodException extends WideImage_Exception {}
-	
-	/**
-	 * @package WideImage
-	 */
-	class WideImage_Canvas
-	{
-		protected $handle = 0;
-		protected $image = null;
-		protected $font = null;
-		
-		/**
-		 * Creates a canvas object that writes to the image passed as a parameter
-		 *
-		 * Shouldn't be used directly, use WideImage_Image::getCanvas() instead.
-		 *
-		 * @param WideImage_Image $img Image object
-		 */
-		function __construct($img)
-		{
-			$this->handle = $img->getHandle();
-			$this->image = $img;
-		}
-		
-		/**
-		 * Sets the active font. Can be an instance of 
-		 * WideImage_Font_TTF, WideImage_Font_PS, or WideImage_Font_GDF.
-		 *
-		 *
-		 *
-		 *
-		 * @param object $font Font object to set for writeText()
-		 */
-		function setFont($font)
-		{
-			$this->font = $font;
-		}
-		
-		/**
-		 * Creates and sets the current font
-		 * 
-		 * The supported font types are: TTF/OTF, PS, and GDF.
-		 * Font type is detected from the extension. If the $file parameter doesn't have an extension, TTF font is presumed.
-		 * 
-		 * Note: not all parameters are supported by all fonts.
-		 * 
-		 * @param string $file Font file name (string)
-		 * @param int $size Font size (supported for TTF/OTF and PS fonts, ignored for GDF)
-		 * @param int $color Text color
-		 * @param int $bgcolor Background color (supported only for PS font, ignored for TTF and PS)
-		 * @return mixed One of the WideImage_Font_* objects
-		 */
-		function useFont($file, $size = 12, $color = 0, $bgcolor = null)
-		{
-			$p = strrpos($file, '.');
-			if ($p === false || $p < strlen($file) - 4)
-				$ext = 'ttf';
-			else
-				$ext = strtolower(substr($file, $p + 1));
-			
-			if ($ext == 'ttf' || $ext == 'otf')
-				$font = new WideImage_Font_TTF($file, $size, $color);
-			elseif ($ext == 'ps')
-				$font = new WideImage_Font_PS($file, $size, $color, $bgcolor);
-			elseif ($ext == 'gdf')
-				$font = new WideImage_Font_GDF($file, $color);
-			else
-				throw new WideImage_InvalidFontFileException("'$file' appears to be an invalid font file.");
-			
-			$this->setFont($font);
-			return $font;
-		}
-		
-		/**
-		 * Write text on the image at specified position
-		 * 
-		 * You must set a font with a call to WideImage_Canvas::setFont() prior to writing text to the image.
-		 * 
-		 * Smart coordinates are supported for $x and $y arguments, but currently only for TTF/OTF fonts.
-		 * 
-		 * Example:
-		 * <code>
-		 * $img = WideImage::load('pic.jpg');
-		 * $canvas = $img->getCanvas();
-		 * $canvas->useFont('Verdana.ttf', 16, $img->allocateColor(255, 0, 0));
-		 * $canvas->writeText('right', 'bottom', 'www.website.com');
-		 * </code>
-		 * 
-		 * @param int $x Left
-		 * @param int $y Top
-		 * @param string $text Text to write
-		 * @param int $angle The angle, defaults to 0
-		 */
-		function writeText($x, $y, $text, $angle = 0)
-		{
-			if ($this->font === null)
-				throw new WideImage_NoFontException("Can't write text without a font.");
-			
-			$angle = - floatval($angle);
-			if ($angle < 0)
-				$angle = 360 + $angle;
-			$angle = $angle % 360;
-			
-			$this->font->writeText($this->image, $x, $y, $text, $angle);
-		}
-		
-		/**
-		 * A magic method that allows you to call any PHP function that starts with "image".
-		 * 
-		 * This is a shortcut to call custom functions on the image handle.
-		 * 
-		 * Example:
-		 * <code>
-		 * $img = WideImage::load('pic.jpg');
-		 * $canvas = $img->getCanvas();
-		 * $canvas->filledRect(10, 10, 20, 30, $img->allocateColor(0, 0, 0));
-		 * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
-		 * </code>
-		 */
-		function __call($method, $params)
-		{
-			if (function_exists('image' . $method))
-			{
-				array_unshift($params, $this->handle);
-				call_user_func_array('image' . $method, $params);
-			}
-			else
-				throw new WideImage_InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
-		}
-	}
+     **/
+    class WideImage_NoFontException extends WideImage_Exception
+    {
+    }
+
+    class WideImage_InvalidFontFileException extends WideImage_Exception
+    {
+    }
+
+    class WideImage_InvalidCanvasMethodException extends WideImage_Exception
+    {
+    }
+
+    class WideImage_Canvas
+    {
+        protected $handle = 0;
+        protected $image  = null;
+        protected $font   = null;
+
+        /**
+         * Creates a canvas object that writes to the image passed as a parameter.
+         *
+         * Shouldn't be used directly, use WideImage_Image::getCanvas() instead.
+         *
+         * @param WideImage_Image $img Image object
+         */
+        public function __construct($img)
+        {
+            $this->handle = $img->getHandle();
+            $this->image  = $img;
+        }
+
+        /**
+         * Sets the active font. Can be an instance of
+         * WideImage_Font_TTF, WideImage_Font_PS, or WideImage_Font_GDF.
+         *
+         *
+         *
+         *
+         * @param object $font Font object to set for writeText()
+         */
+        public function setFont($font)
+        {
+            $this->font = $font;
+        }
+
+        /**
+         * Creates and sets the current font.
+         *
+         * The supported font types are: TTF/OTF, PS, and GDF.
+         * Font type is detected from the extension. If the $file parameter doesn't have an extension, TTF font is presumed.
+         *
+         * Note: not all parameters are supported by all fonts.
+         *
+         * @param string $file    Font file name (string)
+         * @param int    $size    Font size (supported for TTF/OTF and PS fonts, ignored for GDF)
+         * @param int    $color   Text color
+         * @param int    $bgcolor Background color (supported only for PS font, ignored for TTF and PS)
+         *
+         * @return mixed One of the WideImage_Font_* objects
+         */
+        public function useFont($file, $size = 12, $color = 0, $bgcolor = null)
+        {
+            $p = strrpos($file, '.');
+            if ($p === false || $p < strlen($file) - 4) {
+                $ext = 'ttf';
+            } else {
+                $ext = strtolower(substr($file, $p + 1));
+            }
+
+            if ($ext == 'ttf' || $ext == 'otf') {
+                $font = new WideImage_Font_TTF($file, $size, $color);
+            } elseif ($ext == 'ps') {
+                $font = new WideImage_Font_PS($file, $size, $color, $bgcolor);
+            } elseif ($ext == 'gdf') {
+                $font = new WideImage_Font_GDF($file, $color);
+            } else {
+                throw new WideImage_InvalidFontFileException("'$file' appears to be an invalid font file.");
+            }
+
+            $this->setFont($font);
+
+            return $font;
+        }
+
+        /**
+         * Write text on the image at specified position.
+         *
+         * You must set a font with a call to WideImage_Canvas::setFont() prior to writing text to the image.
+         *
+         * Smart coordinates are supported for $x and $y arguments, but currently only for TTF/OTF fonts.
+         *
+         * Example:
+         * <code>
+         * $img = WideImage::load('pic.jpg');
+         * $canvas = $img->getCanvas();
+         * $canvas->useFont('Verdana.ttf', 16, $img->allocateColor(255, 0, 0));
+         * $canvas->writeText('right', 'bottom', 'www.website.com');
+         * </code>
+         *
+         * @param int    $x     Left
+         * @param int    $y     Top
+         * @param string $text  Text to write
+         * @param int    $angle The angle, defaults to 0
+         */
+        public function writeText($x, $y, $text, $angle = 0)
+        {
+            if ($this->font === null) {
+                throw new WideImage_NoFontException("Can't write text without a font.");
+            }
+
+            $angle = -floatval($angle);
+            if ($angle < 0) {
+                $angle = 360 + $angle;
+            }
+            $angle = $angle % 360;
+
+            $this->font->writeText($this->image, $x, $y, $text, $angle);
+        }
+
+        /**
+         * A magic method that allows you to call any PHP function that starts with "image".
+         *
+         * This is a shortcut to call custom functions on the image handle.
+         *
+         * Example:
+         * <code>
+         * $img = WideImage::load('pic.jpg');
+         * $canvas = $img->getCanvas();
+         * $canvas->filledRect(10, 10, 20, 30, $img->allocateColor(0, 0, 0));
+         * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
+         * </code>
+         */
+        public function __call($method, $params)
+        {
+            if (function_exists('image'.$method)) {
+                array_unshift($params, $this->handle);
+                call_user_func_array('image'.$method, $params);
+            } else {
+                throw new WideImage_InvalidCanvasMethodException("Function doesn't exist: image{$method}.");
+            }
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
index a3f6f63732e..907bcf912ff 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
@@ -1,208 +1,177 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-	* @package Internals
-  **/
-	
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidCoordinateException extends WideImage_Exception {}
-	
-	/**
-	 * A utility class for smart coordinates
-	 *  
-	 * @package Internals
-	 **/
-	class WideImage_Coordinate
-	{
-		static protected $coord_align = array("left", "center", "right", "top", "middle", "bottom");
-		static protected $coord_numeric = array("[0-9]+", "[0-9]+\.[0-9]+", "[0-9]+%", "[0-9]+\.[0-9]+%");
-		
-		/**
-		 * Parses a numeric or string representation of a corrdinate into a structure
-		 * 
-		 * @param string $coord Smart coordinate
-		 * @return array Parsed smart coordinate
-		 */
-		static function parse($c)
-		{
-			$tokens = array();
-			$operators = array('+', '-');
-			
-			$flush_operand = false;
-			$flush_operator = false;
-			$current_operand = '';
-			$current_operator = '';
-			$coordinate = strval($c);
-			$expr_len = strlen($coordinate);
-			
-			for ($i = 0; $i < $expr_len; $i++)
-			{
-				$char = $coordinate[$i];
-				
-				if (in_array($char, $operators))
-				{
-					$flush_operand = true;
-					$flush_operator = true;
-					$current_operator = $char;
-				}
-				else
-				{
-					$current_operand .= $char;
-					if ($i == $expr_len - 1)
-						$flush_operand = true;
-				}
-				
-				if ($flush_operand)
-				{
-					if (trim($current_operand) != '')
-						$tokens[] = array('type' => 'operand', 'value' => trim($current_operand));
-					
-					$current_operand = '';
-					$flush_operand = false;
-				}
-				
-				if ($flush_operator)
-				{
-					$tokens[] = array('type' => 'operator', 'value' => $char);
-					$flush_operator = false;
-				}
-			}
-			return $tokens;
-		}
-		
-		/**
-		 * Evaluates the $coord relatively to $dim
-		 * 
-		 * @param string $coord A numeric value or percent string
-		 * @param int $dim Dimension
-		 * @param int $sec_dim Secondary dimension (for align)
-		 * @return int Calculated value
-		 */
-		static function evaluate($coord, $dim, $sec_dim = null)
-		{
-			$comp_regex = implode('|', self::$coord_align) . '|' . implode('|', self::$coord_numeric);
-			if (preg_match("/^([+-])?({$comp_regex})$/", $coord, $matches))
-			{
-				$sign = intval($matches[1] . "1");
-				$val = $matches[2];
-				if (in_array($val, self::$coord_align))
-				{
-					if ($sec_dim === null)
-					{
-						switch ($val)
-						{
-							case 'left':
-							case 'top':
-								return 0;
-								break;
-							case 'center':
-							case 'middle':
-								return $sign * intval($dim / 2);
-								break;
-							case 'right':
-							case 'bottom':
-								return $sign * $dim;
-								break;
-							default:
-								return null;
-						}
-					}
-					else
-					{
-						switch ($val)
-						{
-							case 'left':
-							case 'top':
-								return 0;
-								break;
-							case 'center':
-							case 'middle':
-								return $sign * intval($dim / 2 - $sec_dim / 2);
-								break;
-							case 'right':
-							case 'bottom':
-								return $sign * ($dim - $sec_dim);
-								break;
-							default:
-								return null;
-						}
-					}
-				}
-				elseif (substr($val, -1) === '%')
-					return intval(round($sign * $dim * floatval(str_replace('%', '', $val)) / 100));
-				else
-					return $sign * intval(round($val));
-			}
-		}
-		
-		/**
-		 * Calculates and fixes a smart coordinate into a numeric value
-		 * 
-		 * @param mixed $value Smart coordinate, relative to $dim
-		 * @param int $dim Coordinate to which $value is relative
-		 * @param int $sec_dim Secondary dimension (for align)
-		 * @return int Calculated value
-		 */
-		static function fix($value, $dim, $sec_dim = null)
-		{
-			$coord_tokens = self::parse($value);
-			
-			if (count($coord_tokens) == 0 || $coord_tokens[count($coord_tokens) - 1]['type'] != 'operand')
-				throw new WideImage_InvalidCoordinateException("Couldn't parse coordinate '$value' properly.");
-			
-			$value = 0;
-			$operation = 1;
-			foreach ($coord_tokens as $token)
-			{
-				if ($token['type'] == 'operand')
-				{
-					$operand_value = self::evaluate($token['value'], $dim, $sec_dim);
-					if ($operation == 1)
-						$value = $value + $operand_value;
-					elseif ($operation == -1)
-						$value = $value - $operand_value;
-					else
-						throw new WideImage_InvalidCoordinateException("Invalid coordinate syntax.");
-					
-					$operation = 0;
-				}
-				elseif ($token['type'] == 'operator')
-				{
-					if ($token['value'] == '-')
-					{
-						if ($operation == 0)
-							$operation = -1;
-						else
-							$operation = $operation * -1;
-					}
-					elseif ($token['value'] == '+')
-					{
-						if ($operation == 0)
-							$operation = '1';
-					}
-				}
-			}
-			return $value;
-		}
-	}
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+    class WideImage_InvalidCoordinateException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * A utility class for smart coordinates.
+     **/
+    class WideImage_Coordinate
+    {
+        protected static $coord_align   = ['left', 'center', 'right', 'top', 'middle', 'bottom'];
+        protected static $coord_numeric = ['[0-9]+', "[0-9]+\.[0-9]+", '[0-9]+%', "[0-9]+\.[0-9]+%"];
+
+        /**
+         * Parses a numeric or string representation of a corrdinate into a structure.
+         *
+         * @param string $coord Smart coordinate
+         *
+         * @return array Parsed smart coordinate
+         */
+        public static function parse($c)
+        {
+            $tokens    = [];
+            $operators = ['+', '-'];
+
+            $flush_operand    = false;
+            $flush_operator   = false;
+            $current_operand  = '';
+            $current_operator = '';
+            $coordinate       = strval($c);
+            $expr_len         = strlen($coordinate);
+
+            for ($i = 0; $i < $expr_len; ++$i) {
+                $char = $coordinate[$i];
+
+                if (in_array($char, $operators)) {
+                    $flush_operand    = true;
+                    $flush_operator   = true;
+                    $current_operator = $char;
+                } else {
+                    $current_operand .= $char;
+                    if ($i == $expr_len - 1) {
+                        $flush_operand = true;
+                    }
+                }
+
+                if ($flush_operand) {
+                    if (trim($current_operand) != '') {
+                        $tokens[] = ['type' => 'operand', 'value' => trim($current_operand)];
+                    }
+
+                    $current_operand = '';
+                    $flush_operand   = false;
+                }
+
+                if ($flush_operator) {
+                    $tokens[]       = ['type' => 'operator', 'value' => $char];
+                    $flush_operator = false;
+                }
+            }
+
+            return $tokens;
+        }
+
+        /**
+         * Evaluates the $coord relatively to $dim.
+         *
+         * @param string $coord   A numeric value or percent string
+         * @param int    $dim     Dimension
+         * @param int    $sec_dim Secondary dimension (for align)
+         *
+         * @return int Calculated value
+         */
+        public static function evaluate($coord, $dim, $sec_dim = null)
+        {
+            $comp_regex = implode('|', self::$coord_align).'|'.implode('|', self::$coord_numeric);
+            if (preg_match("/^([+-])?({$comp_regex})$/", $coord, $matches)) {
+                $sign = intval($matches[1].'1');
+                $val  = $matches[2];
+                if (in_array($val, self::$coord_align)) {
+                    if ($sec_dim === null) {
+                        switch ($val) {
+                            case 'left':
+                            case 'top':
+                                return 0;
+                                break;
+                            case 'center':
+                            case 'middle':
+                                return $sign * intval($dim / 2);
+                                break;
+                            case 'right':
+                            case 'bottom':
+                                return $sign * $dim;
+                                break;
+                            default:
+                                return null;
+                        }
+                    } else {
+                        switch ($val) {
+                            case 'left':
+                            case 'top':
+                                return 0;
+                                break;
+                            case 'center':
+                            case 'middle':
+                                return $sign * intval($dim / 2 - $sec_dim / 2);
+                                break;
+                            case 'right':
+                            case 'bottom':
+                                return $sign * ($dim - $sec_dim);
+                                break;
+                            default:
+                                return null;
+                        }
+                    }
+                } elseif (substr($val, -1) === '%') {
+                    return intval(round($sign * $dim * floatval(str_replace('%', '', $val)) / 100));
+                } else {
+                    return $sign * intval(round($val));
+                }
+            }
+        }
+
+        /**
+         * Calculates and fixes a smart coordinate into a numeric value.
+         *
+         * @param mixed $value   Smart coordinate, relative to $dim
+         * @param int   $dim     Coordinate to which $value is relative
+         * @param int   $sec_dim Secondary dimension (for align)
+         *
+         * @return int Calculated value
+         */
+        public static function fix($value, $dim, $sec_dim = null)
+        {
+            $coord_tokens = self::parse($value);
+
+            if (count($coord_tokens) == 0 || $coord_tokens[count($coord_tokens) - 1]['type'] != 'operand') {
+                throw new WideImage_InvalidCoordinateException("Couldn't parse coordinate '$value' properly.");
+            }
+
+            $value     = 0;
+            $operation = 1;
+            foreach ($coord_tokens as $token) {
+                if ($token['type'] == 'operand') {
+                    $operand_value = self::evaluate($token['value'], $dim, $sec_dim);
+                    if ($operation == 1) {
+                        $value = $value + $operand_value;
+                    } elseif ($operation == -1) {
+                        $value = $value - $operand_value;
+                    } else {
+                        throw new WideImage_InvalidCoordinateException('Invalid coordinate syntax.');
+                    }
+
+                    $operation = 0;
+                } elseif ($token['type'] == 'operator') {
+                    if ($token['value'] == '-') {
+                        if ($operation == 0) {
+                            $operation = -1;
+                        } else {
+                            $operation = $operation * -1;
+                        }
+                    } elseif ($token['value'] == '+') {
+                        if ($operation == 0) {
+                            $operation = '1';
+                        }
+                    }
+                }
+            }
+
+            return $value;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Exception.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Exception.php
index 0aae4f0f90e..a23653e9c37 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Exception.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Exception.php
@@ -1,31 +1,13 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
+     **/
 
-	/**
-	 * Base Exception class
-	 * 
-	 * @package Exceptions
-	 **/
-	class WideImage_Exception extends RuntimeException {}
-	
\ No newline at end of file
+    /**
+     * Base Exception class.
+     **/
+    class WideImage_Exception extends RuntimeException
+    {
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php
index c83122e6c1c..bc46b3e9421 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/GDF.php
@@ -1,48 +1,30 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * GDF font support class
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_Font_GDF
-	{
-		protected $font;
-		protected $color;
-		
-		function __construct($face, $color)
-		{
-			if (is_int($face) && $face >= 1 && $face <= 5)
-				$this->font = $face;
-			else
-				$this->font = imageloadfont($face);
-			$this->color = $color;
-		}
-		
-		function writeText($image, $x, $y, $text)
-		{
-			imagestring($image->getHandle(), $this->font, $x, $y, $text, $this->color);
-		}
-	}
+     **/
+
+    /**
+     * GDF font support class.
+     */
+    class WideImage_Font_GDF
+    {
+        protected $font;
+        protected $color;
+
+        public function __construct($face, $color)
+        {
+            if (is_int($face) && $face >= 1 && $face <= 5) {
+                $this->font = $face;
+            } else {
+                $this->font = imageloadfont($face);
+            }
+            $this->color = $color;
+        }
+
+        public function writeText($image, $x, $y, $text)
+        {
+            imagestring($image->getHandle(), $this->font, $x, $y, $text, $this->color);
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php
index 9359e2e5c7a..54039033684 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/PS.php
@@ -1,60 +1,43 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package WideImage
-  **/
-	
-	/**
-	 * PS font support class
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_Font_PS
-	{
-		public $size;
-		public $color;
-		public $handle;
-		
-		function __construct($file, $size, $color, $bgcolor = null)
-		{
-			$this->handle = imagepsloadfont($file);
-			$this->size = $size;
-			$this->color = $color;
-			if ($bgcolor === null)
-				$this->bgcolor = $color;
-			else
-				$this->color = $color;
-		}
-		
-		function writeText($image, $x, $y, $text, $angle = 0)
-		{
-			if ($image->isTrueColor())
-				$image->alphaBlending(true);
-			
-			imagepstext($image->getHandle(), $text, $this->handle, $this->size, $this->color, $this->bgcolor, $x, $y, 0, 0, $angle, 4);
-		}
-		
-		function __destruct()
-		{
-			imagepsfreefont($this->handle);
-			$this->handle = null;
-		}
-	}
+    /**
+     * PS font support class.
+     */
+    class WideImage_Font_PS
+    {
+        public $size;
+        public $color;
+        public $handle;
+
+        public function __construct($file, $size, $color, $bgcolor = null)
+        {
+            $this->handle = imagepsloadfont($file);
+            $this->size   = $size;
+            $this->color  = $color;
+            if ($bgcolor === null) {
+                $this->bgcolor = $color;
+            } else {
+                $this->color = $color;
+            }
+        }
+
+        public function writeText($image, $x, $y, $text, $angle = 0)
+        {
+            if ($image->isTrueColor()) {
+                $image->alphaBlending(true);
+            }
+
+            imagepstext($image->getHandle(), $text, $this->handle, $this->size, $this->color, $this->bgcolor, $x, $y, 0, 0, $angle, 4);
+        }
+
+        public function __destruct()
+        {
+            imagepsfreefont($this->handle);
+            $this->handle = null;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
index 10877117f2c..524e39bd0cb 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
@@ -1,75 +1,57 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package WideImage
-  **/
-	
-	/**
-	 * TTF font support class
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_Font_TTF
-	{
-		public $face;
-		public $size;
-		public $color;
-		
-		function __construct($face, $size, $color)
-		{
-			$this->face = $face;
-			$this->size = $size;
-			$this->color = $color;
-		}
-		
-		/**
-		 * Writes text onto an image
-		 * 
-		 * @param WideImage_Image $image
-		 * @param mixed $x smart coordinate
-		 * @param mixed $y smart coordinate
-		 * @param string $text
-		 * @param int $angle Angle in degrees clockwise
-		 */
-		function writeText($image, $x, $y, $text, $angle = 0)
-		{
-			if ($image->isTrueColor())
-				$image->alphaBlending(true);
-			
-			$box = imageftbbox($this->size, $angle, $this->face, $text);
-			$obox = array(
-				'left' => min($box[0], $box[2], $box[4], $box[6]),
-				'top' => min($box[1], $box[3], $box[5], $box[7]),
-				'right' => max($box[0], $box[2], $box[4], $box[6]) - 1,
-				'bottom' => max($box[1], $box[3], $box[5], $box[7]) - 1
-			);
-			$obox['width'] = abs($obox['left']) + abs($obox['right']);
-			$obox['height'] = abs($obox['top']) + abs($obox['bottom']);
-			
-			$x = WideImage_Coordinate::fix($x, $image->getWidth(), $obox['width']);
-			$y = WideImage_Coordinate::fix($y, $image->getHeight(), $obox['height']);
-			
-			$fixed_x = $x - $obox['left'];
-			$fixed_y = $y - $obox['top'];
-			
-			imagettftext($image->getHandle(), $this->size, $angle, $fixed_x, $fixed_y, $this->color, $this->face, $text);
-		}
-	}
+    /**
+     * TTF font support class.
+     */
+    class WideImage_Font_TTF
+    {
+        public $face;
+        public $size;
+        public $color;
+
+        public function __construct($face, $size, $color)
+        {
+            $this->face  = $face;
+            $this->size  = $size;
+            $this->color = $color;
+        }
+
+        /**
+         * Writes text onto an image.
+         *
+         * @param WideImage_Image $image
+         * @param mixed           $x     smart coordinate
+         * @param mixed           $y     smart coordinate
+         * @param string          $text
+         * @param int             $angle Angle in degrees clockwise
+         */
+        public function writeText($image, $x, $y, $text, $angle = 0)
+        {
+            if ($image->isTrueColor()) {
+                $image->alphaBlending(true);
+            }
+
+            $box  = imageftbbox($this->size, $angle, $this->face, $text);
+            $obox = [
+                'left'   => min($box[0], $box[2], $box[4], $box[6]),
+                'top'    => min($box[1], $box[3], $box[5], $box[7]),
+                'right'  => max($box[0], $box[2], $box[4], $box[6]) - 1,
+                'bottom' => max($box[1], $box[3], $box[5], $box[7]) - 1,
+            ];
+            $obox['width']  = abs($obox['left']) + abs($obox['right']);
+            $obox['height'] = abs($obox['top']) + abs($obox['bottom']);
+
+            $x = WideImage_Coordinate::fix($x, $image->getWidth(), $obox['width']);
+            $y = WideImage_Coordinate::fix($y, $image->getHeight(), $obox['height']);
+
+            $fixed_x = $x - $obox['left'];
+            $fixed_y = $y - $obox['top'];
+
+            imagettftext($image->getHandle(), $this->size, $angle, $fixed_x, $fixed_y, $this->color, $this->face, $text);
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Image.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Image.php
index 3a99280008f..29f00061386 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Image.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Image.php
@@ -1,964 +1,987 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-	* @package WideImage
-  **/
-	
-	/**
-	 * Thrown when an invalid dimension is passed for some operations
-	 * 
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidImageDimensionException extends WideImage_Exception {}
-	
-	/**
-	 * Thrown when an image can't be saved (returns false by the mapper)
-	 * 
-	 * @package Exceptions
-	 */
-	class WideImage_UnknownErrorWhileMappingException extends WideImage_Exception {}
-	
-	/**
-	 * Base class for images
-	 * 
-	 * @package WideImage
-	 */
-	abstract class WideImage_Image
-	{
-		/**
-		 * Holds the image resource
-		 * @var resource
-		 */
-		protected $handle = null;
-		
-		/**
-		 * Flag that determines if WideImage should call imagedestroy() upon object destruction
-		 * @var bool
-		 */
-		protected $handleReleased = false;
-		
-		/**
-		 * Canvas object
-		 * @var WideImage_Canvas
-		 */
-		protected $canvas = null;
-		
-		/**
-		 * @var string
-		 */
-		protected $sdata = null;
-		
-		/**
-		 * The base class constructor
-		 *
-		 * @param resource $handle Image handle (GD2 resource)
-		 */
-		function __construct($handle)
-		{
-			WideImage::assertValidImageHandle($handle);
-			$this->handle = $handle;
-		}
-		
-		/**
-		 * Cleanup
-		 * 
-		 * Destroys the handle via WideImage_Image::destroy() when called by the GC.
-		 */
-		function __destruct()
-		{
-			$this->destroy();
-		}
-		
-		/**
-		 * This method destroy the image handle, and releases the image resource.
-		 * 
-		 * After this is called, the object doesn't hold a valid image any more.
-		 * No operation should be called after that.
-		 */
-		function destroy()
-		{
-			if ($this->isValid() && !$this->handleReleased)
-				imagedestroy($this->handle);
-			
-			$this->handle = null;
-		}
-		
-		/**
-		 * Returns the GD image resource
-		 * 
-		 * @return resource GD image resource
-		 */
-		function getHandle()
-		{
-			return $this->handle;
-		}
-		
-		/**
-		 * @return bool True, if the image object holds a valid GD image, false otherwise
-		 */
-		function isValid()
-		{
-			return WideImage::isValidImageHandle($this->handle);
-		}
-		
-		/**
-		 * Releases the handle
-		 */
-		function releaseHandle()
-		{
-			$this->handleReleased = true;
-		}
-		
-		/**
-		 * Saves an image to a file
-		 * 
-		 * The file type is recognized from the $uri. If you save to a GIF8, truecolor images
-		 * are automatically converted to palette.
-		 * 
-		 * This method supports additional parameters: quality (for jpeg images) and 
-		 * compression quality and filters (for png images). See http://www.php.net/imagejpeg and
-		 * http://www.php.net/imagepng for details.
-		 * 
-		 * Examples:
-		 * <code>
-		 * // save to a GIF
-		 * $image->saveToFile('image.gif');
-		 * 
-		 * // save to a PNG with compression=7 and no filters
-		 * $image->saveToFile('image.png', 7, PNG_NO_FILTER);
-		 * 
-		 * // save to a JPEG with quality=80
-		 * $image->saveToFile('image.jpg', 80);
-		 * 
-		 * // save to a JPEG with default quality=100
-		 * $image->saveToFile('image.jpg');
-		 * </code>
-		 * 
-		 * @param string $uri File location
-		 */
-		function saveToFile($uri)
-		{
-			$mapper = WideImage_MapperFactory::selectMapper($uri, null);
-			$args = func_get_args();
-			array_unshift($args, $this->getHandle());
-			$res = call_user_func_array(array($mapper, 'save'), $args);
-			if (!$res)
-				throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper) . " returned an invalid result while saving to $uri");
-		}
-		
-		/**
-		 * Returns binary string with image data in format specified by $format
-		 * 
-		 * Additional parameters may be passed to the function. See WideImage_Image::saveToFile() for more details.
-		 * 
-		 * @param string $format The format of the image
-		 * @return string The binary image data in specified format
-		 */
-		function asString($format)
-		{
-			ob_start();
-			$args = func_get_args();
-			$args[0] = null;
-			array_unshift($args, $this->getHandle());
-			
-			$mapper = WideImage_MapperFactory::selectMapper(null, $format);
-			$res = call_user_func_array(array($mapper, 'save'), $args);
-			if (!$res)
-				throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper) . " returned an invalid result while writing the image data");
-			
-			return ob_get_clean();
-		}
-		
-		/**
-		 * Output a header to browser.
-		 * 
-		 * @param $name Name of the header
-		 * @param $data Data
-		 */
-		protected function writeHeader($name, $data)
-		{
-			header($name . ": " . $data);
-		}
-		
-		/**
-		 * Outputs the image to browser
-		 * 
-		 * Sets headers Content-length and Content-type, and echoes the image in the specified format.
-		 * All other headers (such as Content-disposition) must be added manually. 
-		 * 
-		 * Example:
-		 * <code>
-		 * WideImage::load('image1.png')->resize(100, 100)->output('gif');
-		 * </code>
-		 * 
-		 * @param string $format Image format
-		 */
-		function output($format)
-		{
-			$args = func_get_args();
-			$data = call_user_func_array(array($this, 'asString'), $args);
-			
-			$this->writeHeader('Content-length', strlen($data));
-			$this->writeHeader('Content-type', WideImage_MapperFactory::mimeType($format));
-			echo $data;
-		}
-		
-		/**
-		 * @return int Image width
-		 */
-		function getWidth()
-		{
-			return imagesx($this->handle);
-		}
-		
-		/**
-		 * @return int Image height
-		 */
-		function getHeight()
-		{
-			return imagesy($this->handle);
-		}
-		
-		/**
-		 * Allocate a color by RGB values.
-		 * 
-		 * @param mixed $R Red-component value or an RGB array (with red, green, blue keys)
-		 * @param int $G If $R is int, this is the green component
-		 * @param int $B If $R is int, this is the blue component
-		 * @return int Image color index
-		 */
-		function allocateColor($R, $G = null, $B = null)
-		{
-			if (is_array($R))
-				return imageColorAllocate($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imageColorAllocate($this->handle, $R, $G, $B);
-		}
-		
-		/**
-		 * @return bool True if the image is transparent, false otherwise
-		 */
-		function isTransparent()
-		{
-			return $this->getTransparentColor() >= 0;
-		}
-		
-		/**
-		 * @return int Transparent color index
-		 */
-		function getTransparentColor()
-		{
-			return imagecolortransparent($this->handle);
-		}
-		
-		/**
-		 * Sets the current transparent color index. Only makes sense for palette images (8-bit).
-		 * 
-		 * @param int $color Transparent color index
-		 */
-		function setTransparentColor($color)
-		{
-			return imagecolortransparent($this->handle, $color);
-		}
-		
-		/**
-		 * Returns a RGB array of the transparent color or null if none.
-		 * 
-		 * @return mixed Transparent color RGBA array
-		 */
-		function getTransparentColorRGB()
-		{
-			$total = imagecolorstotal($this->handle);
-			$tc = $this->getTransparentColor();
-			
-			if ($tc >= $total && $total > 0)
-				return null;
-			else
-				return $this->getColorRGB($tc);
-		}
-		
-		/**
-		 * Returns a RGBA array for pixel at $x, $y
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @return array RGB array 
-		 */
-		function getRGBAt($x, $y)
-		{
-			return $this->getColorRGB($this->getColorAt($x, $y));
-		}
-		
-		/**
-		 * Writes a pixel at the designated coordinates
-		 * 
-		 * Takes an associative array of colours and uses getExactColor() to
-		 * retrieve the exact index color to write to the image with.
-		 *
-		 * @param int $x
-		 * @param int $y
-		 * @param array $color
-		 */
-		function setRGBAt($x, $y, $color)
-		{
-			$this->setColorAt($x, $y, $this->getExactColor($color));
-		}
-		
-		/**
-		 * Returns a color's RGB
-		 * 
-		 * @param int $colorIndex Color index
-		 * @return mixed RGBA array for a color with index $colorIndex
-		 */
-		function getColorRGB($colorIndex)
-		{
-			return imageColorsForIndex($this->handle, $colorIndex);
-		}
-		
-		/**
-		 * Returns an index of the color at $x, $y
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @return int Color index for a pixel at $x, $y
-		 */
-		function getColorAt($x, $y)
-		{
-			return imagecolorat($this->handle, $x, $y);
-		}
-		
-		/**
-		 * Set the color index $color to a pixel at $x, $y
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @param int $color Color index
-		 */
-		function setColorAt($x, $y, $color)
-		{
-			return imagesetpixel($this->handle, $x, $y, $color);
-		}
-		
-		/**
-		 * Returns closest color index that matches the given RGB value. Uses
-		 * PHP's imagecolorclosest()
-		 * 
-		 * @param mixed $R Red or RGBA array
-		 * @param int $G Green component (or null if $R is an RGB array)
-		 * @param int $B Blue component (or null if $R is an RGB array)
-		 * @return int Color index
-		 */
-		function getClosestColor($R, $G = null, $B = null)
-		{
-			if (is_array($R))
-				return imagecolorclosest($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imagecolorclosest($this->handle, $R, $G, $B);
-		}
-		
-		/**
-		 * Returns the color index that exactly matches the given RGB value. Uses
-		 * PHP's imagecolorexact()
-		 * 
-		 * @param mixed $R Red or RGBA array
-		 * @param int $G Green component (or null if $R is an RGB array)
-		 * @param int $B Blue component (or null if $R is an RGB array)
-		 * @return int Color index
-		 */
-		function getExactColor($R, $G = null, $B = null)
-		{
-			if (is_array($R))
-				return imagecolorexact($this->handle, $R['red'], $R['green'], $R['blue']);
-			else
-				return imagecolorexact($this->handle, $R, $G, $B);
-		}
-		
-		/**
-		 * Copies transparency information from $sourceImage. Optionally fills
-		 * the image with the transparent color at (0, 0).
-		 * 
-		 * @param object $sourceImage
-		 * @param bool $fill True if you want to fill the image with transparent color
-		 */
-		function copyTransparencyFrom($sourceImage, $fill = true)
-		{
-			if ($sourceImage->isTransparent())
-			{
-				$rgba = $sourceImage->getTransparentColorRGB();
-				if ($rgba === null)
-					return;
-				
-				if ($this->isTrueColor())
-				{
-					$rgba['alpha'] = 127;
-					$color = $this->allocateColorAlpha($rgba);
-				}
-				else
-					$color = $this->allocateColor($rgba);
-				
-				$this->setTransparentColor($color);
-				if ($fill)
-					$this->fill(0, 0, $color);
-			}
-		}
-		
-		/**
-		 * Fill the image at ($x, $y) with color index $color
-		 * 
-		 * @param int $x
-		 * @param int $y
-		 * @param int $color
-		 */
-		function fill($x, $y, $color)
-		{
-			return imagefill($this->handle, $x, $y, $color);
-		}
-		
-		/**
-		 * Used internally to create Operation objects
-		 *
-		 * @param string $name
-		 * @return object
-		 */
-		protected function getOperation($name)
-		{
-			return WideImage_OperationFactory::get($name);
-		}
-		
-		/**
-		 * Returns the image's mask
-		 * 
-		 * Mask is a greyscale image where the shade defines the alpha channel (black = transparent, white = opaque).
-		 * 
-		 * For opaque images (JPEG), the result will be white. For images with single-color transparency (GIF, 8-bit PNG), 
-		 * the areas with the transparent color will be black. For images with alpha channel transparenct, 
-		 * the result will be alpha channel.
-		 * 
-		 * @return WideImage_Image An image mask
-		 **/
-		function getMask()
-		{
-			return $this->getOperation('GetMask')->execute($this);
-		}
-		
-		/**
-		 * Resize the image to given dimensions.
-		 * 
-		 * $width and $height are both smart coordinates. This means that you can pass any of these values in:
-		 *   - positive or negative integer (100, -20, ...)
-		 *   - positive or negative percent string (30%, -15%, ...)
-		 *   - complex coordinate (50% - 20, 15 + 30%, ...)
-		 * 
-		 * If $width is null, it's calculated proportionally from $height, and vice versa.
-		 * 
-		 * Example (resize to half-size):
-		 * <code>
-		 * $smaller = $image->resize('50%');
-		 * 
-		 * $smaller = $image->resize('100', '100', 'inside', 'down');
-		 * is the same as
-		 * $smaller = $image->resizeDown(100, 100, 'inside');
-		 * </code>
-		 * 
-		 * @param mixed $width The new width (smart coordinate), or null.
-		 * @param mixed $height The new height (smart coordinate), or null.
-		 * @param string $fit 'inside', 'outside', 'fill'
-		 * @param string $scale 'down', 'up', 'any'
-		 * @return WideImage_Image The resized image
-		 */
-		function resize($width = null, $height = null, $fit = 'inside', $scale = 'any')
-		{
-			return $this->getOperation('Resize')->execute($this, $width, $height, $fit, $scale);
-		}
-		
-		/**
-		 * Same as WideImage_Image::resize(), but the image is only applied if it is larger then the given dimensions.
-		 * Otherwise, the resulting image retains the source's dimensions.
-		 * 
-		 * @param int $width New width, smart coordinate
-		 * @param int $height New height, smart coordinate
-		 * @param string $fit 'inside', 'outside', 'fill'
-		 * @return WideImage_Image resized image
-		 */
-		function resizeDown($width = null, $height = null, $fit = 'inside')
-		{
-			return $this->resize($width, $height, $fit, 'down');
-		}
-		
-		/**
-		 * Same as WideImage_Image::resize(), but the image is only applied if it is smaller then the given dimensions.
-		 * Otherwise, the resulting image retains the source's dimensions.
-		 * 
-		 * @param int $width New width, smart coordinate
-		 * @param int $height New height, smart coordinate
-		 * @param string $fit 'inside', 'outside', 'fill'
-		 * @return WideImage_Image resized image
-		 */
-		function resizeUp($width = null, $height = null, $fit = 'inside')
-		{
-			return $this->resize($width, $height, $fit, 'up');
-		}
-		
-		/**
-		 * Rotate the image for angle $angle clockwise.
-		 * 
-		 * Preserves transparency. Has issues when saving to a BMP.
-		 * 
-		 * @param int $angle Angle in degrees, clock-wise
-		 * @param int $bgColor color of the new background
-		 * @param bool $ignoreTransparent
-		 * @return WideImage_Image The rotated image
-		 */
-		function rotate($angle, $bgColor = null, $ignoreTransparent = true)
-		{
-			return $this->getOperation('Rotate')->execute($this, $angle, $bgColor, $ignoreTransparent);
-		}
-		
-		/**
-		 * This method lays the overlay (watermark) on the image.
-		 * 
-		 * Hint: if the overlay is a truecolor image with alpha channel, you should leave $pct at 100.
-		 * 
-		 * This operation supports alignment notation in coordinates:
-		 * <code>
-		 * $watermark = WideImage::load('logo.gif');
-		 * $base = WideImage::load('picture.jpg');
-		 * $result = $base->merge($watermark, "right - 10", "bottom - 10", 50);
-		 * // applies a logo aligned to bottom-right corner with a 10 pixel margin
-		 * </code>
-		 * 
-		 * @param WideImage_Image $overlay The overlay image
-		 * @param mixed $left Left position of the overlay, smart coordinate
-		 * @param mixed $top Top position of the overlay, smart coordinate
-		 * @param int $pct The opacity of the overlay
-		 * @return WideImage_Image The merged image
-		 */
-		function merge($overlay, $left = 0, $top = 0, $pct = 100)
-		{
-			return $this->getOperation('Merge')->execute($this, $overlay, $left, $top, $pct);
-		}
-		
-		/**
-		 * Resizes the canvas of the image, but doesn't scale the content of the image
-		 * 
-		 * This operation creates an empty canvas with dimensions $width x $height, filled with 
-		 * background color $bg_color and draws the original image onto it at position [$pos_x, $pos_y].
-		 * 
-		 * Arguments $width, $height, $pos_x and $pos_y are all smart coordinates. $width and $height are 
-		 * relative to the current image size, $pos_x and $pos_y are relative to the newly calculated
-		 * canvas size. This can be confusing, but it makes sense. See the example below.
-		 * 
-		 * The example below loads a 100x150 image and then resizes its canvas to 200% x 100%+20 
-		 * (which evaluates to 200x170). The image is placed at position [10, center+20], which evaluates to [10, 30].
-		 * <code>
-		 * $image = WideImage::load('someimage.jpg'); // 100x150
-		 * $white = $image->allocateColor(255, 255, 255);
-		 * $image->resizeCanvas('200%', '100% + 20', 10, 'center+20', $white);
-		 * </code>
-		 * 
-		 * The parameter $merge defines whether the original image should be merged onto the new canvas.
-		 * This means it blends transparent color and alpha colors into the background color. If set to false,
-		 * the original image is just copied over, preserving the transparency/alpha information.
-		 * 
-		 * You can set the $scale parameter to limit when to resize the canvas. For example, if you want 
-		 * to resize the canvas only if the image is smaller than the new size, but leave the image intact 
-		 * if it's larger, set it to 'up'. Likewise, if you want to shrink the canvas, but don't want to 
-		 * change images that are already smaller, set it to 'down'. 
-		 * 
-		 * @param mixed $width Width of the new canvas (smart coordinate, relative to current image width)
-		 * @param mixed $height Height of the new canvas (smart coordinate, relative to current image height)
-		 * @param mixed $pos_x x-position of the image (smart coordinate, relative to the new width)
-		 * @param mixed $pos_y y-position of the image (smart coordinate, relative to the new height)
-		 * @param int $bg_color Background color (created with allocateColor or allocateColorAlpha), defaults to null (tries to use a transparent color)
-		 * @param string $scale Possible values: 'up' (enlarge only), 'down' (downsize only), 'any' (resize precisely to $width x $height). Defaults to 'any'.
-		 * @param bool $merge Merge the original image (flatten alpha channel and transparency) or copy it over (preserve). Defaults to false.
-		 * @return WideImage_Image The resulting image with resized canvas
-		 */
-		function resizeCanvas($width, $height, $pos_x, $pos_y, $bg_color = null, $scale = 'any', $merge = false)
-		{
-			return $this->getOperation('ResizeCanvas')->execute($this, $width, $height, $pos_x, $pos_y, $bg_color, $scale, $merge);
-		}
-		
-		/**
-		 * Returns an image with round corners
-		 * 
-		 * You can either set the corners' color or set them transparent.
-		 * 
-		 * Note on $smoothness: 1 means jagged edges, 2 is much better, more than 4 doesn't noticeably improve the quality.
-		 * Rendering becomes increasingly slower if you increase smoothness.
-		 * 
-		 * Example:
-		 * <code>
-		 * $nice = $ugly->roundCorners(20, $ugly->allocateColor(255, 0, 0), 2);
-		 * </code>
-		 * 
-		 * Use $corners parameter to specify which corners to draw rounded. Possible values are
-		 * WideImage::SIDE_TOP_LEFT, WideImage::SIDE_TOP,
-		 * WideImage::SIDE_TOP_RIGHT, WideImage::SIDE_RIGHT,
-		 * WideImage::SIDE_BOTTOM_RIGHT, WideImage::SIDE_BOTTOM, 
-		 * WideImage::SIDE_BOTTOM_LEFT, WideImage::SIDE_LEFT, and WideImage::SIDE_ALL.
-		 * You can specify any combination of corners with a + operation, see example below.
-		 * 
-		 * Example:
-		 * <code>
-		 * $white = $image->allocateColor(255, 255, 255);
-		 * $diagonal_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_TOP_LEFT + WideImage::SIDE_BOTTOM_RIGHT);
-		 * $right_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_RIGHT);
-		 * </code>
-		 * 
-		 * @param int $radius Radius of the corners
-		 * @param int $color The color of corners. If null, corners are rendered transparent (slower than using a solid color).
-		 * @param int $smoothness Specify the level of smoothness. Suggested values from 1 to 4.
-		 * @param int $corners Specify which corners to draw (defaults to WideImage::SIDE_ALL = all corners)
-		 * @return WideImage_Image The resulting image with round corners
-		 */
-		function roundCorners($radius, $color = null, $smoothness = 2, $corners = 255)
-		{
-			return $this->getOperation('RoundCorners')->execute($this, $radius, $color, $smoothness, $corners);
-		}
-		
-		/**
-		 * Returns an image with applied mask
-		 * 
-		 * A mask is a grayscale image, where the shade determines the alpha channel. Black is fully transparent
-		 * and white is fully opaque.
-		 * 
-		 * @param WideImage_Image $mask The mask image, greyscale
-		 * @param mixed $left Left coordinate, smart coordinate
-		 * @param mixed $top Top coordinate, smart coordinate
-		 * @return WideImage_Image The resulting image
-		 **/
-		function applyMask($mask, $left = 0, $top = 0)
-		{
-			return $this->getOperation('ApplyMask')->execute($this, $mask, $left, $top);
-		}
-		
-		/**
-		 * Applies a filter
-		 *
-		 * @param int $filter One of the IMG_FILTER_* constants
-		 * @param int $arg1
-		 * @param int $arg2
-		 * @param int $arg3
-		 * @param int $arg4
-		 * @return WideImage_Image
-		 */
-		function applyFilter($filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
-		{
-			return $this->getOperation('ApplyFilter')->execute($this, $filter, $arg1, $arg2, $arg3, $arg4);
-		}
-		
-		/**
-		 * Applies convolution matrix with imageconvolution()
-		 *
-		 * @param array $matrix
-		 * @param float $div
-		 * @param float $offset
-		 * @return WideImage_Image
-		 */
-		function applyConvolution($matrix, $div, $offset)
-		{
-			return $this->getOperation('ApplyConvolution')->execute($this, $matrix, $div, $offset);
-		}
-		
-		/**
-		 * Returns a cropped rectangular portion of the image
-		 * 
-		 * If the rectangle specifies area that is out of bounds, it's limited to the current image bounds.
-		 * 
-		 * Examples:
-		 * <code>
-		 * $cropped = $img->crop(10, 10, 150, 200); // crops a 150x200 rect at (10, 10)
-		 * $cropped = $img->crop(-100, -50, 100, 50); // crops a 100x50 rect at the right-bottom of the image
-		 * $cropped = $img->crop('25%', '25%', '50%', '50%'); // crops a 50%x50% rect from the center of the image
-		 * </code>
-		 * 
-		 * This operation supports alignment notation in left/top coordinates.
-		 * Example:
-		 * <code>
-		 * $cropped = $img->crop("right", "bottom", 100, 200); // crops a 100x200 rect from right bottom
-		 * $cropped = $img->crop("center", "middle", 50, 30); // crops a 50x30 from the center of the image
-		 * </code>
-		 * 
-		 * @param mixed $left Left-coordinate of the crop rect, smart coordinate
-		 * @param mixed $top Top-coordinate of the crop rect, smart coordinate
-		 * @param mixed $width Width of the crop rect, smart coordinate
-		 * @param mixed $height Height of the crop rect, smart coordinate
-		 * @return WideImage_Image The cropped image
-		 **/
-		function crop($left = 0, $top = 0, $width = '100%', $height = '100%')
-		{
-			return $this->getOperation('Crop')->execute($this, $left, $top, $width, $height);
-		}
-		
-		/**
-		 * Performs an auto-crop on the image
-		 *
-		 * The image is auto-cropped from each of four sides. All sides are 
-		 * scanned for pixels that differ from $base_color for more than 
-		 * $rgb_threshold in absolute RGB difference. If more than $pixel_cutoff 
-		 * differentiating pixels are found, that line is considered to be the crop line for the side.
-		 * If the line isn't different enough, the algorithm procedes to the next line 
-		 * towards the other edge of the image.
-		 * 
-		 * When the crop rectangle is found, it's enlarged by the $margin value on each of the four sides.
-		 *
-		 * @param int $margin Margin for the crop rectangle, can be negative.
-		 * @param int $rgb_threshold RGB difference which still counts as "same color".
-		 * @param int $pixel_cutoff How many pixels need to be different to mark a cut line.
-		 * @param int $base_color The base color index. If none specified (or null given), left-top pixel is used.
-		 * @return WideImage_Image The cropped image
-		 */
-		function autoCrop($margin = 0, $rgb_threshold = 0, $pixel_cutoff = 1, $base_color = null)
-		{
-			return $this->getOperation('AutoCrop')->execute($this, $margin, $rgb_threshold, $pixel_cutoff, $base_color);
-		}
-		
-		/**
-		 * Returns a negative of the image
-		 *
-		 * This operation differs from calling WideImage_Image::applyFilter(IMG_FILTER_NEGATIVE), because it's 8-bit and transparency safe.
-		 * This means it will return an 8-bit image, if the source image is 8-bit. If that 8-bit image has a palette transparency,
-		 * the resulting image will keep transparency.
-		 *
-		 * @return WideImage_Image negative of the image
-		 */
-		function asNegative()
-		{
-			return $this->getOperation('AsNegative')->execute($this);
-		}
-		
-		/**
-		 * Returns a grayscale copy of the image
-		 * 
-		 * @return WideImage_Image grayscale copy
-		 **/
-		function asGrayscale()
-		{
-			return $this->getOperation('AsGrayscale')->execute($this);
-		}
-		
-		/**
-		 * Returns a mirrored copy of the image
-		 * 
-		 * @return WideImage_Image Mirrored copy
-		 **/
-		function mirror()
-		{
-			return $this->getOperation('Mirror')->execute($this);
-		}
-		
-		/**
-		 * Applies the unsharp filter
-		 * 
-		 * @param float $amount
-		 * @param float $radius
-		 * @param float $threshold
-		 * @return WideImage_Image Unsharpened copy of the image
-		 **/
-		function unsharp($amount, $radius, $threshold)
-		{
-			return $this->getOperation('Unsharp')->execute($this, $amount, $radius, $threshold);
-		}
-		
-		/**
-		 * Returns a flipped (mirrored over horizontal line) copy of the image
-		 * 
-		 * @return WideImage_Image Flipped copy
-		 **/
-		function flip()
-		{
-			return $this->getOperation('Flip')->execute($this);
-		}
-		
-		/**
-		 * Corrects gamma on the image
-		 * 
-		 * @param float $inputGamma
-		 * @param float $outputGamma
-		 * @return WideImage_Image Image with corrected gamma
-		 **/
-		function correctGamma($inputGamma, $outputGamma)
-		{
-			return $this->getOperation('CorrectGamma')->execute($this, $inputGamma, $outputGamma);
-		}
-		
-		/**
-		 * Adds noise to the image
-		 * 
-		 * @author Tomasz Kapusta
-		 * 
-		 * @param int $amount Number of noise pixels to add
-		 * @param string $type Type of noise 'salt&pepper', 'color' or 'mono'
-		 * @return WideImage_Image Image with noise added
-		 **/
-		function addNoise($amount, $type)
-		{
-			return $this->getOperation('AddNoise')->execute($this, $amount, $type);
-		}
-		
-		/**
-		 * Used internally to execute operations
-		 *
-		 * @param string $name
-		 * @param array $args
-		 * @return WideImage_Image
-		 */
-		function __call($name, $args)
-		{
-			$op = $this->getOperation($name);
-			array_unshift($args, $this);
-			return call_user_func_array(array($op, 'execute'), $args);
-		}
-		
-		/**
-		 * Returns an image in GIF or PNG format
-		 *
-		 * @return string
-		 */
-		function __toString()
-		{
-			if ($this->isTransparent())
-				return $this->asString('gif');
-			else
-				return $this->asString('png');
-		}
-		
-		/**
-		 * Returns a copy of the image object
-		 * 
-		 * @return WideImage_Image The copy
-		 **/
-		function copy()
-		{
-			$dest = $this->doCreate($this->getWidth(), $this->getHeight());
-			$dest->copyTransparencyFrom($this, true);
-			$this->copyTo($dest, 0, 0);
-			return $dest;
-		}
-		
-		/**
-		 * Copies this image onto another image
-		 * 
-		 * @param WideImage_Image $dest
-		 * @param int $left
-		 * @param int $top
-		 **/
-		function copyTo($dest, $left = 0, $top = 0)
-		{
-			if (!imagecopy($dest->getHandle(), $this->handle, $left, $top, 0, 0, $this->getWidth(), $this->getHeight()))
-				throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-		}
-		
-		/**
-		 * Returns the canvas object
-		 * 
-		 * The Canvas object can be used to draw text and shapes on the image
-		 * 
-		 * Examples:
-		 * <code>
-		 * $img = WideImage::load('pic.jpg);
-		 * $canvas = $img->getCanvas();
-		 * $canvas->useFont('arial.ttf', 15, $img->allocateColor(200, 220, 255));
-		 * $canvas->writeText(10, 50, "Hello world!");
-		 * 
-		 * $canvas->filledRectangle(10, 10, 80, 40, $img->allocateColor(255, 127, 255));
-		 * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
-		 * $img->saveToFile('new.png');
-		 * </code>
-		 * 
-		 * @return WideImage_Canvas The Canvas object
-		 **/
-		function getCanvas()
-		{
-			if ($this->canvas == null)
-				$this->canvas = new WideImage_Canvas($this);
-			return $this->canvas;
-		}
-		
-		/**
-		 * Returns true if the image is true-color, false otherwise
-		 * 
-		 * @return bool
-		 **/
-		abstract function isTrueColor();
-		
-		/**
-		 * Returns a true-color copy of the image
-		 * 
-		 * @return WideImage_TrueColorImage
-		 **/
-		abstract function asTrueColor();
-		
-		/**
-		 * Returns a palette copy (8bit) of the image
-		 *
-		 * @param int $nColors Number of colors in the resulting image, more than 0, less or equal to 255
-		 * @param bool $dither Use dithering or not
-		 * @param bool $matchPalette Set to true to use imagecolormatch() to match the resulting palette more closely to the original image 
-		 * @return WideImage_Image
-		 **/
-		abstract function asPalette($nColors = 255, $dither = null, $matchPalette = true);
-		
-		/**
-		 * Retrieve an image with selected channels
-		 * 
-		 * Examples:
-		 * <code>
-		 * $channels = $img->getChannels('red', 'blue');
-		 * $channels = $img->getChannels('alpha', 'green');
-		 * $channels = $img->getChannels(array('green', 'blue'));
-		 * </code>
-		 * 
-		 * @return WideImage_Image
-		 **/
-		abstract function getChannels();
-		
-		/**
-		 * Returns an image without an alpha channel
-		 * 
-		 * @return WideImage_Image
-		 **/
-		abstract function copyNoAlpha();
-		
-		/**
-		 * Returns an array of serializable protected variables. Called automatically upon serialize().
-		 * 
-		 * @return array
-		 */
-		function __sleep()
-		{
-			$this->sdata = $this->asString('png');
-			return array('sdata', 'handleReleased');
-		}
-		
-		/**
-		 * Restores an image from serialization. Called automatically upon unserialize().
-		 */
-		function __wakeup()
-		{
-			$temp_image = WideImage::loadFromString($this->sdata);
-			$temp_image->releaseHandle();
-			$this->handle = $temp_image->handle;
-			$temp_image = null;
-			$this->sdata = null;
-		}
-	}
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+
+    /**
+     * Thrown when an invalid dimension is passed for some operations.
+     */
+    class WideImage_InvalidImageDimensionException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * Thrown when an image can't be saved (returns false by the mapper).
+     */
+    class WideImage_UnknownErrorWhileMappingException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * Base class for images.
+     */
+    abstract class WideImage_Image
+    {
+        /**
+         * Holds the image resource.
+         *
+         * @var resource
+         */
+        protected $handle = null;
+
+        /**
+         * Flag that determines if WideImage should call imagedestroy() upon object destruction.
+         *
+         * @var bool
+         */
+        protected $handleReleased = false;
+
+        /**
+         * Canvas object.
+         *
+         * @var WideImage_Canvas
+         */
+        protected $canvas = null;
+
+        /**
+         * @var string
+         */
+        protected $sdata = null;
+
+        /**
+         * The base class constructor.
+         *
+         * @param resource $handle Image handle (GD2 resource)
+         */
+        public function __construct($handle)
+        {
+            WideImage::assertValidImageHandle($handle);
+            $this->handle = $handle;
+        }
+
+        /**
+         * Cleanup.
+         *
+         * Destroys the handle via WideImage_Image::destroy() when called by the GC.
+         */
+        public function __destruct()
+        {
+            $this->destroy();
+        }
+
+        /**
+         * This method destroy the image handle, and releases the image resource.
+         *
+         * After this is called, the object doesn't hold a valid image any more.
+         * No operation should be called after that.
+         */
+        public function destroy()
+        {
+            if ($this->isValid() && !$this->handleReleased) {
+                imagedestroy($this->handle);
+            }
+
+            $this->handle = null;
+        }
+
+        /**
+         * Returns the GD image resource.
+         *
+         * @return resource GD image resource
+         */
+        public function getHandle()
+        {
+            return $this->handle;
+        }
+
+        /**
+         * @return bool True, if the image object holds a valid GD image, false otherwise
+         */
+        public function isValid()
+        {
+            return WideImage::isValidImageHandle($this->handle);
+        }
+
+        /**
+         * Releases the handle.
+         */
+        public function releaseHandle()
+        {
+            $this->handleReleased = true;
+        }
+
+        /**
+         * Saves an image to a file.
+         *
+         * The file type is recognized from the $uri. If you save to a GIF8, truecolor images
+         * are automatically converted to palette.
+         *
+         * This method supports additional parameters: quality (for jpeg images) and
+         * compression quality and filters (for png images). See http://www.php.net/imagejpeg and
+         * http://www.php.net/imagepng for details.
+         *
+         * Examples:
+         * <code>
+         * // save to a GIF
+         * $image->saveToFile('image.gif');
+         *
+         * // save to a PNG with compression=7 and no filters
+         * $image->saveToFile('image.png', 7, PNG_NO_FILTER);
+         *
+         * // save to a JPEG with quality=80
+         * $image->saveToFile('image.jpg', 80);
+         *
+         * // save to a JPEG with default quality=100
+         * $image->saveToFile('image.jpg');
+         * </code>
+         *
+         * @param string $uri File location
+         */
+        public function saveToFile($uri)
+        {
+            $mapper = WideImage_MapperFactory::selectMapper($uri, null);
+            $args   = func_get_args();
+            array_unshift($args, $this->getHandle());
+            $res = call_user_func_array([$mapper, 'save'], $args);
+            if (!$res) {
+                throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper)." returned an invalid result while saving to $uri");
+            }
+        }
+
+        /**
+         * Returns binary string with image data in format specified by $format.
+         *
+         * Additional parameters may be passed to the function. See WideImage_Image::saveToFile() for more details.
+         *
+         * @param string $format The format of the image
+         *
+         * @return string The binary image data in specified format
+         */
+        public function asString($format)
+        {
+            ob_start();
+            $args    = func_get_args();
+            $args[0] = null;
+            array_unshift($args, $this->getHandle());
+
+            $mapper = WideImage_MapperFactory::selectMapper(null, $format);
+            $res    = call_user_func_array([$mapper, 'save'], $args);
+            if (!$res) {
+                throw new WideImage_UnknownErrorWhileMappingException(get_class($mapper).' returned an invalid result while writing the image data');
+            }
+
+            return ob_get_clean();
+        }
+
+        /**
+         * Output a header to browser.
+         *
+         * @param $name Name of the header
+         * @param $data Data
+         */
+        protected function writeHeader($name, $data)
+        {
+            header($name.': '.$data);
+        }
+
+        /**
+         * Outputs the image to browser.
+         *
+         * Sets headers Content-length and Content-type, and echoes the image in the specified format.
+         * All other headers (such as Content-disposition) must be added manually.
+         *
+         * Example:
+         * <code>
+         * WideImage::load('image1.png')->resize(100, 100)->output('gif');
+         * </code>
+         *
+         * @param string $format Image format
+         */
+        public function output($format)
+        {
+            $args = func_get_args();
+            $data = call_user_func_array([$this, 'asString'], $args);
+
+            $this->writeHeader('Content-length', strlen($data));
+            $this->writeHeader('Content-type', WideImage_MapperFactory::mimeType($format));
+            echo $data;
+        }
+
+        /**
+         * @return int Image width
+         */
+        public function getWidth()
+        {
+            return imagesx($this->handle);
+        }
+
+        /**
+         * @return int Image height
+         */
+        public function getHeight()
+        {
+            return imagesy($this->handle);
+        }
+
+        /**
+         * Allocate a color by RGB values.
+         *
+         * @param mixed $R Red-component value or an RGB array (with red, green, blue keys)
+         * @param int   $G If $R is int, this is the green component
+         * @param int   $B If $R is int, this is the blue component
+         *
+         * @return int Image color index
+         */
+        public function allocateColor($R, $G = null, $B = null)
+        {
+            if (is_array($R)) {
+                return imagecolorallocate($this->handle, $R['red'], $R['green'], $R['blue']);
+            } else {
+                return imagecolorallocate($this->handle, $R, $G, $B);
+            }
+        }
+
+        /**
+         * @return bool True if the image is transparent, false otherwise
+         */
+        public function isTransparent()
+        {
+            return $this->getTransparentColor() >= 0;
+        }
+
+        /**
+         * @return int Transparent color index
+         */
+        public function getTransparentColor()
+        {
+            return imagecolortransparent($this->handle);
+        }
+
+        /**
+         * Sets the current transparent color index. Only makes sense for palette images (8-bit).
+         *
+         * @param int $color Transparent color index
+         */
+        public function setTransparentColor($color)
+        {
+            return imagecolortransparent($this->handle, $color);
+        }
+
+        /**
+         * Returns a RGB array of the transparent color or null if none.
+         *
+         * @return mixed Transparent color RGBA array
+         */
+        public function getTransparentColorRGB()
+        {
+            $total = imagecolorstotal($this->handle);
+            $tc    = $this->getTransparentColor();
+
+            if ($tc >= $total && $total > 0) {
+                return null;
+            } else {
+                return $this->getColorRGB($tc);
+            }
+        }
+
+        /**
+         * Returns a RGBA array for pixel at $x, $y.
+         *
+         * @param int $x
+         * @param int $y
+         *
+         * @return array RGB array
+         */
+        public function getRGBAt($x, $y)
+        {
+            return $this->getColorRGB($this->getColorAt($x, $y));
+        }
+
+        /**
+         * Writes a pixel at the designated coordinates.
+         *
+         * Takes an associative array of colours and uses getExactColor() to
+         * retrieve the exact index color to write to the image with.
+         *
+         * @param int   $x
+         * @param int   $y
+         * @param array $color
+         */
+        public function setRGBAt($x, $y, $color)
+        {
+            $this->setColorAt($x, $y, $this->getExactColor($color));
+        }
+
+        /**
+         * Returns a color's RGB.
+         *
+         * @param int $colorIndex Color index
+         *
+         * @return mixed RGBA array for a color with index $colorIndex
+         */
+        public function getColorRGB($colorIndex)
+        {
+            return imagecolorsforindex($this->handle, $colorIndex);
+        }
+
+        /**
+         * Returns an index of the color at $x, $y.
+         *
+         * @param int $x
+         * @param int $y
+         *
+         * @return int Color index for a pixel at $x, $y
+         */
+        public function getColorAt($x, $y)
+        {
+            return imagecolorat($this->handle, $x, $y);
+        }
+
+        /**
+         * Set the color index $color to a pixel at $x, $y.
+         *
+         * @param int $x
+         * @param int $y
+         * @param int $color Color index
+         */
+        public function setColorAt($x, $y, $color)
+        {
+            return imagesetpixel($this->handle, $x, $y, $color);
+        }
+
+        /**
+         * Returns closest color index that matches the given RGB value. Uses
+         * PHP's imagecolorclosest().
+         *
+         * @param mixed $R Red or RGBA array
+         * @param int   $G Green component (or null if $R is an RGB array)
+         * @param int   $B Blue component (or null if $R is an RGB array)
+         *
+         * @return int Color index
+         */
+        public function getClosestColor($R, $G = null, $B = null)
+        {
+            if (is_array($R)) {
+                return imagecolorclosest($this->handle, $R['red'], $R['green'], $R['blue']);
+            } else {
+                return imagecolorclosest($this->handle, $R, $G, $B);
+            }
+        }
+
+        /**
+         * Returns the color index that exactly matches the given RGB value. Uses
+         * PHP's imagecolorexact().
+         *
+         * @param mixed $R Red or RGBA array
+         * @param int   $G Green component (or null if $R is an RGB array)
+         * @param int   $B Blue component (or null if $R is an RGB array)
+         *
+         * @return int Color index
+         */
+        public function getExactColor($R, $G = null, $B = null)
+        {
+            if (is_array($R)) {
+                return imagecolorexact($this->handle, $R['red'], $R['green'], $R['blue']);
+            } else {
+                return imagecolorexact($this->handle, $R, $G, $B);
+            }
+        }
+
+        /**
+         * Copies transparency information from $sourceImage. Optionally fills
+         * the image with the transparent color at (0, 0).
+         *
+         * @param object $sourceImage
+         * @param bool   $fill        True if you want to fill the image with transparent color
+         */
+        public function copyTransparencyFrom($sourceImage, $fill = true)
+        {
+            if ($sourceImage->isTransparent()) {
+                $rgba = $sourceImage->getTransparentColorRGB();
+                if ($rgba === null) {
+                    return;
+                }
+
+                if ($this->isTrueColor()) {
+                    $rgba['alpha'] = 127;
+                    $color         = $this->allocateColorAlpha($rgba);
+                } else {
+                    $color = $this->allocateColor($rgba);
+                }
+
+                $this->setTransparentColor($color);
+                if ($fill) {
+                    $this->fill(0, 0, $color);
+                }
+            }
+        }
+
+        /**
+         * Fill the image at ($x, $y) with color index $color.
+         *
+         * @param int $x
+         * @param int $y
+         * @param int $color
+         */
+        public function fill($x, $y, $color)
+        {
+            return imagefill($this->handle, $x, $y, $color);
+        }
+
+        /**
+         * Used internally to create Operation objects.
+         *
+         * @param string $name
+         *
+         * @return object
+         */
+        protected function getOperation($name)
+        {
+            return WideImage_OperationFactory::get($name);
+        }
+
+        /**
+         * Returns the image's mask.
+         *
+         * Mask is a greyscale image where the shade defines the alpha channel (black = transparent, white = opaque).
+         *
+         * For opaque images (JPEG), the result will be white. For images with single-color transparency (GIF, 8-bit PNG),
+         * the areas with the transparent color will be black. For images with alpha channel transparenct,
+         * the result will be alpha channel.
+         *
+         * @return WideImage_Image An image mask
+         **/
+        public function getMask()
+        {
+            return $this->getOperation('GetMask')->execute($this);
+        }
+
+        /**
+         * Resize the image to given dimensions.
+         *
+         * $width and $height are both smart coordinates. This means that you can pass any of these values in:
+         *   - positive or negative integer (100, -20, ...)
+         *   - positive or negative percent string (30%, -15%, ...)
+         *   - complex coordinate (50% - 20, 15 + 30%, ...)
+         *
+         * If $width is null, it's calculated proportionally from $height, and vice versa.
+         *
+         * Example (resize to half-size):
+         * <code>
+         * $smaller = $image->resize('50%');
+         *
+         * $smaller = $image->resize('100', '100', 'inside', 'down');
+         * is the same as
+         * $smaller = $image->resizeDown(100, 100, 'inside');
+         * </code>
+         *
+         * @param mixed  $width  The new width (smart coordinate), or null
+         * @param mixed  $height The new height (smart coordinate), or null
+         * @param string $fit    'inside', 'outside', 'fill'
+         * @param string $scale  'down', 'up', 'any'
+         *
+         * @return WideImage_Image The resized image
+         */
+        public function resize($width = null, $height = null, $fit = 'inside', $scale = 'any')
+        {
+            return $this->getOperation('Resize')->execute($this, $width, $height, $fit, $scale);
+        }
+
+        /**
+         * Same as WideImage_Image::resize(), but the image is only applied if it is larger then the given dimensions.
+         * Otherwise, the resulting image retains the source's dimensions.
+         *
+         * @param int    $width  New width, smart coordinate
+         * @param int    $height New height, smart coordinate
+         * @param string $fit    'inside', 'outside', 'fill'
+         *
+         * @return WideImage_Image resized image
+         */
+        public function resizeDown($width = null, $height = null, $fit = 'inside')
+        {
+            return $this->resize($width, $height, $fit, 'down');
+        }
+
+        /**
+         * Same as WideImage_Image::resize(), but the image is only applied if it is smaller then the given dimensions.
+         * Otherwise, the resulting image retains the source's dimensions.
+         *
+         * @param int    $width  New width, smart coordinate
+         * @param int    $height New height, smart coordinate
+         * @param string $fit    'inside', 'outside', 'fill'
+         *
+         * @return WideImage_Image resized image
+         */
+        public function resizeUp($width = null, $height = null, $fit = 'inside')
+        {
+            return $this->resize($width, $height, $fit, 'up');
+        }
+
+        /**
+         * Rotate the image for angle $angle clockwise.
+         *
+         * Preserves transparency. Has issues when saving to a BMP.
+         *
+         * @param int  $angle             Angle in degrees, clock-wise
+         * @param int  $bgColor           color of the new background
+         * @param bool $ignoreTransparent
+         *
+         * @return WideImage_Image The rotated image
+         */
+        public function rotate($angle, $bgColor = null, $ignoreTransparent = true)
+        {
+            return $this->getOperation('Rotate')->execute($this, $angle, $bgColor, $ignoreTransparent);
+        }
+
+        /**
+         * This method lays the overlay (watermark) on the image.
+         *
+         * Hint: if the overlay is a truecolor image with alpha channel, you should leave $pct at 100.
+         *
+         * This operation supports alignment notation in coordinates:
+         * <code>
+         * $watermark = WideImage::load('logo.gif');
+         * $base = WideImage::load('picture.jpg');
+         * $result = $base->merge($watermark, "right - 10", "bottom - 10", 50);
+         * // applies a logo aligned to bottom-right corner with a 10 pixel margin
+         * </code>
+         *
+         * @param WideImage_Image $overlay The overlay image
+         * @param mixed           $left    Left position of the overlay, smart coordinate
+         * @param mixed           $top     Top position of the overlay, smart coordinate
+         * @param int             $pct     The opacity of the overlay
+         *
+         * @return WideImage_Image The merged image
+         */
+        public function merge($overlay, $left = 0, $top = 0, $pct = 100)
+        {
+            return $this->getOperation('Merge')->execute($this, $overlay, $left, $top, $pct);
+        }
+
+        /**
+         * Resizes the canvas of the image, but doesn't scale the content of the image.
+         *
+         * This operation creates an empty canvas with dimensions $width x $height, filled with
+         * background color $bg_color and draws the original image onto it at position [$pos_x, $pos_y].
+         *
+         * Arguments $width, $height, $pos_x and $pos_y are all smart coordinates. $width and $height are
+         * relative to the current image size, $pos_x and $pos_y are relative to the newly calculated
+         * canvas size. This can be confusing, but it makes sense. See the example below.
+         *
+         * The example below loads a 100x150 image and then resizes its canvas to 200% x 100%+20
+         * (which evaluates to 200x170). The image is placed at position [10, center+20], which evaluates to [10, 30].
+         * <code>
+         * $image = WideImage::load('someimage.jpg'); // 100x150
+         * $white = $image->allocateColor(255, 255, 255);
+         * $image->resizeCanvas('200%', '100% + 20', 10, 'center+20', $white);
+         * </code>
+         *
+         * The parameter $merge defines whether the original image should be merged onto the new canvas.
+         * This means it blends transparent color and alpha colors into the background color. If set to false,
+         * the original image is just copied over, preserving the transparency/alpha information.
+         *
+         * You can set the $scale parameter to limit when to resize the canvas. For example, if you want
+         * to resize the canvas only if the image is smaller than the new size, but leave the image intact
+         * if it's larger, set it to 'up'. Likewise, if you want to shrink the canvas, but don't want to
+         * change images that are already smaller, set it to 'down'.
+         *
+         * @param mixed  $width    Width of the new canvas (smart coordinate, relative to current image width)
+         * @param mixed  $height   Height of the new canvas (smart coordinate, relative to current image height)
+         * @param mixed  $pos_x    x-position of the image (smart coordinate, relative to the new width)
+         * @param mixed  $pos_y    y-position of the image (smart coordinate, relative to the new height)
+         * @param int    $bg_color Background color (created with allocateColor or allocateColorAlpha), defaults to null (tries to use a transparent color)
+         * @param string $scale    Possible values: 'up' (enlarge only), 'down' (downsize only), 'any' (resize precisely to $width x $height). Defaults to 'any'
+         * @param bool   $merge    Merge the original image (flatten alpha channel and transparency) or copy it over (preserve). Defaults to false
+         *
+         * @return WideImage_Image The resulting image with resized canvas
+         */
+        public function resizeCanvas($width, $height, $pos_x, $pos_y, $bg_color = null, $scale = 'any', $merge = false)
+        {
+            return $this->getOperation('ResizeCanvas')->execute($this, $width, $height, $pos_x, $pos_y, $bg_color, $scale, $merge);
+        }
+
+        /**
+         * Returns an image with round corners.
+         *
+         * You can either set the corners' color or set them transparent.
+         *
+         * Note on $smoothness: 1 means jagged edges, 2 is much better, more than 4 doesn't noticeably improve the quality.
+         * Rendering becomes increasingly slower if you increase smoothness.
+         *
+         * Example:
+         * <code>
+         * $nice = $ugly->roundCorners(20, $ugly->allocateColor(255, 0, 0), 2);
+         * </code>
+         *
+         * Use $corners parameter to specify which corners to draw rounded. Possible values are
+         * WideImage::SIDE_TOP_LEFT, WideImage::SIDE_TOP,
+         * WideImage::SIDE_TOP_RIGHT, WideImage::SIDE_RIGHT,
+         * WideImage::SIDE_BOTTOM_RIGHT, WideImage::SIDE_BOTTOM,
+         * WideImage::SIDE_BOTTOM_LEFT, WideImage::SIDE_LEFT, and WideImage::SIDE_ALL.
+         * You can specify any combination of corners with a + operation, see example below.
+         *
+         * Example:
+         * <code>
+         * $white = $image->allocateColor(255, 255, 255);
+         * $diagonal_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_TOP_LEFT + WideImage::SIDE_BOTTOM_RIGHT);
+         * $right_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_RIGHT);
+         * </code>
+         *
+         * @param int $radius     Radius of the corners
+         * @param int $color      The color of corners. If null, corners are rendered transparent (slower than using a solid color)
+         * @param int $smoothness Specify the level of smoothness. Suggested values from 1 to 4
+         * @param int $corners    Specify which corners to draw (defaults to WideImage::SIDE_ALL = all corners)
+         *
+         * @return WideImage_Image The resulting image with round corners
+         */
+        public function roundCorners($radius, $color = null, $smoothness = 2, $corners = 255)
+        {
+            return $this->getOperation('RoundCorners')->execute($this, $radius, $color, $smoothness, $corners);
+        }
+
+        /**
+         * Returns an image with applied mask.
+         *
+         * A mask is a grayscale image, where the shade determines the alpha channel. Black is fully transparent
+         * and white is fully opaque.
+         *
+         * @param WideImage_Image $mask The mask image, greyscale
+         * @param mixed           $left Left coordinate, smart coordinate
+         * @param mixed           $top  Top coordinate, smart coordinate
+         *
+         * @return WideImage_Image The resulting image
+         **/
+        public function applyMask($mask, $left = 0, $top = 0)
+        {
+            return $this->getOperation('ApplyMask')->execute($this, $mask, $left, $top);
+        }
+
+        /**
+         * Applies a filter.
+         *
+         * @param int $filter One of the IMG_FILTER_* constants
+         * @param int $arg1
+         * @param int $arg2
+         * @param int $arg3
+         * @param int $arg4
+         *
+         * @return WideImage_Image
+         */
+        public function applyFilter($filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
+        {
+            return $this->getOperation('ApplyFilter')->execute($this, $filter, $arg1, $arg2, $arg3, $arg4);
+        }
+
+        /**
+         * Applies convolution matrix with imageconvolution().
+         *
+         * @param array $matrix
+         * @param float $div
+         * @param float $offset
+         *
+         * @return WideImage_Image
+         */
+        public function applyConvolution($matrix, $div, $offset)
+        {
+            return $this->getOperation('ApplyConvolution')->execute($this, $matrix, $div, $offset);
+        }
+
+        /**
+         * Returns a cropped rectangular portion of the image.
+         *
+         * If the rectangle specifies area that is out of bounds, it's limited to the current image bounds.
+         *
+         * Examples:
+         * <code>
+         * $cropped = $img->crop(10, 10, 150, 200); // crops a 150x200 rect at (10, 10)
+         * $cropped = $img->crop(-100, -50, 100, 50); // crops a 100x50 rect at the right-bottom of the image
+         * $cropped = $img->crop('25%', '25%', '50%', '50%'); // crops a 50%x50% rect from the center of the image
+         * </code>
+         *
+         * This operation supports alignment notation in left/top coordinates.
+         * Example:
+         * <code>
+         * $cropped = $img->crop("right", "bottom", 100, 200); // crops a 100x200 rect from right bottom
+         * $cropped = $img->crop("center", "middle", 50, 30); // crops a 50x30 from the center of the image
+         * </code>
+         *
+         * @param mixed $left   Left-coordinate of the crop rect, smart coordinate
+         * @param mixed $top    Top-coordinate of the crop rect, smart coordinate
+         * @param mixed $width  Width of the crop rect, smart coordinate
+         * @param mixed $height Height of the crop rect, smart coordinate
+         *
+         * @return WideImage_Image The cropped image
+         **/
+        public function crop($left = 0, $top = 0, $width = '100%', $height = '100%')
+        {
+            return $this->getOperation('Crop')->execute($this, $left, $top, $width, $height);
+        }
+
+        /**
+         * Performs an auto-crop on the image.
+         *
+         * The image is auto-cropped from each of four sides. All sides are
+         * scanned for pixels that differ from $base_color for more than
+         * $rgb_threshold in absolute RGB difference. If more than $pixel_cutoff
+         * differentiating pixels are found, that line is considered to be the crop line for the side.
+         * If the line isn't different enough, the algorithm procedes to the next line
+         * towards the other edge of the image.
+         *
+         * When the crop rectangle is found, it's enlarged by the $margin value on each of the four sides.
+         *
+         * @param int $margin        Margin for the crop rectangle, can be negative
+         * @param int $rgb_threshold RGB difference which still counts as "same color"
+         * @param int $pixel_cutoff  How many pixels need to be different to mark a cut line
+         * @param int $base_color    The base color index. If none specified (or null given), left-top pixel is used
+         *
+         * @return WideImage_Image The cropped image
+         */
+        public function autoCrop($margin = 0, $rgb_threshold = 0, $pixel_cutoff = 1, $base_color = null)
+        {
+            return $this->getOperation('AutoCrop')->execute($this, $margin, $rgb_threshold, $pixel_cutoff, $base_color);
+        }
+
+        /**
+         * Returns a negative of the image.
+         *
+         * This operation differs from calling WideImage_Image::applyFilter(IMG_FILTER_NEGATIVE), because it's 8-bit and transparency safe.
+         * This means it will return an 8-bit image, if the source image is 8-bit. If that 8-bit image has a palette transparency,
+         * the resulting image will keep transparency.
+         *
+         * @return WideImage_Image negative of the image
+         */
+        public function asNegative()
+        {
+            return $this->getOperation('AsNegative')->execute($this);
+        }
+
+        /**
+         * Returns a grayscale copy of the image.
+         *
+         * @return WideImage_Image grayscale copy
+         **/
+        public function asGrayscale()
+        {
+            return $this->getOperation('AsGrayscale')->execute($this);
+        }
+
+        /**
+         * Returns a mirrored copy of the image.
+         *
+         * @return WideImage_Image Mirrored copy
+         **/
+        public function mirror()
+        {
+            return $this->getOperation('Mirror')->execute($this);
+        }
+
+        /**
+         * Applies the unsharp filter.
+         *
+         * @param float $amount
+         * @param float $radius
+         * @param float $threshold
+         *
+         * @return WideImage_Image Unsharpened copy of the image
+         **/
+        public function unsharp($amount, $radius, $threshold)
+        {
+            return $this->getOperation('Unsharp')->execute($this, $amount, $radius, $threshold);
+        }
+
+        /**
+         * Returns a flipped (mirrored over horizontal line) copy of the image.
+         *
+         * @return WideImage_Image Flipped copy
+         **/
+        public function flip()
+        {
+            return $this->getOperation('Flip')->execute($this);
+        }
+
+        /**
+         * Corrects gamma on the image.
+         *
+         * @param float $inputGamma
+         * @param float $outputGamma
+         *
+         * @return WideImage_Image Image with corrected gamma
+         **/
+        public function correctGamma($inputGamma, $outputGamma)
+        {
+            return $this->getOperation('CorrectGamma')->execute($this, $inputGamma, $outputGamma);
+        }
+
+        /**
+         * Adds noise to the image.
+         *
+         * @author Tomasz Kapusta
+         *
+         * @param int    $amount Number of noise pixels to add
+         * @param string $type   Type of noise 'salt&pepper', 'color' or 'mono'
+         *
+         * @return WideImage_Image Image with noise added
+         **/
+        public function addNoise($amount, $type)
+        {
+            return $this->getOperation('AddNoise')->execute($this, $amount, $type);
+        }
+
+        /**
+         * Used internally to execute operations.
+         *
+         * @param string $name
+         * @param array  $args
+         *
+         * @return WideImage_Image
+         */
+        public function __call($name, $args)
+        {
+            $op = $this->getOperation($name);
+            array_unshift($args, $this);
+
+            return call_user_func_array([$op, 'execute'], $args);
+        }
+
+        /**
+         * Returns an image in GIF or PNG format.
+         *
+         * @return string
+         */
+        public function __toString()
+        {
+            if ($this->isTransparent()) {
+                return $this->asString('gif');
+            } else {
+                return $this->asString('png');
+            }
+        }
+
+        /**
+         * Returns a copy of the image object.
+         *
+         * @return WideImage_Image The copy
+         **/
+        public function copy()
+        {
+            $dest = $this->doCreate($this->getWidth(), $this->getHeight());
+            $dest->copyTransparencyFrom($this, true);
+            $this->copyTo($dest, 0, 0);
+
+            return $dest;
+        }
+
+        /**
+         * Copies this image onto another image.
+         *
+         * @param WideImage_Image $dest
+         * @param int             $left
+         * @param int             $top
+         **/
+        public function copyTo($dest, $left = 0, $top = 0)
+        {
+            if (!imagecopy($dest->getHandle(), $this->handle, $left, $top, 0, 0, $this->getWidth(), $this->getHeight())) {
+                throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+            }
+        }
+
+        /**
+         * Returns the canvas object.
+         *
+         * The Canvas object can be used to draw text and shapes on the image
+         *
+         * Examples:
+         * <code>
+         * $img = WideImage::load('pic.jpg);
+         * $canvas = $img->getCanvas();
+         * $canvas->useFont('arial.ttf', 15, $img->allocateColor(200, 220, 255));
+         * $canvas->writeText(10, 50, "Hello world!");
+         *
+         * $canvas->filledRectangle(10, 10, 80, 40, $img->allocateColor(255, 127, 255));
+         * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
+         * $img->saveToFile('new.png');
+         * </code>
+         *
+         * @return WideImage_Canvas The Canvas object
+         **/
+        public function getCanvas()
+        {
+            if ($this->canvas == null) {
+                $this->canvas = new WideImage_Canvas($this);
+            }
+
+            return $this->canvas;
+        }
+
+        /**
+         * Returns true if the image is true-color, false otherwise.
+         *
+         * @return bool
+         **/
+        abstract public function isTrueColor();
+
+        /**
+         * Returns a true-color copy of the image.
+         *
+         * @return WideImage_TrueColorImage
+         **/
+        abstract public function asTrueColor();
+
+        /**
+         * Returns a palette copy (8bit) of the image.
+         *
+         * @param int  $nColors      Number of colors in the resulting image, more than 0, less or equal to 255
+         * @param bool $dither       Use dithering or not
+         * @param bool $matchPalette Set to true to use imagecolormatch() to match the resulting palette more closely to the original image
+         *
+         * @return WideImage_Image
+         **/
+        abstract public function asPalette($nColors = 255, $dither = null, $matchPalette = true);
+
+        /**
+         * Retrieve an image with selected channels.
+         *
+         * Examples:
+         * <code>
+         * $channels = $img->getChannels('red', 'blue');
+         * $channels = $img->getChannels('alpha', 'green');
+         * $channels = $img->getChannels(array('green', 'blue'));
+         * </code>
+         *
+         * @return WideImage_Image
+         **/
+        abstract public function getChannels();
+
+        /**
+         * Returns an image without an alpha channel.
+         *
+         * @return WideImage_Image
+         **/
+        abstract public function copyNoAlpha();
+
+        /**
+         * Returns an array of serializable protected variables. Called automatically upon serialize().
+         *
+         * @return array
+         */
+        public function __sleep()
+        {
+            $this->sdata = $this->asString('png');
+
+            return ['sdata', 'handleReleased'];
+        }
+
+        /**
+         * Restores an image from serialization. Called automatically upon unserialize().
+         */
+        public function __wakeup()
+        {
+            $temp_image = WideImage::loadFromString($this->sdata);
+            $temp_image->releaseHandle();
+            $this->handle = $temp_image->handle;
+            $temp_image   = null;
+            $this->sdata  = null;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php
index 0620f0590f6..d13c3cea2da 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/BMP.php
@@ -1,51 +1,32 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
+    include_once WideImage::path().'/vendor/de77/BMP.php';
 
-    * @package Internal/Mappers
-  **/
-	
-	include_once WideImage::path() . '/vendor/de77/BMP.php';
-	
-	/**
-	 * Mapper support for BMP
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_BMP
-	{
-		function load($uri)
-		{
-			return WideImage_vendor_de77_BMP::imagecreatefrombmp($uri);
-		}
-		
-		function loadFromString($data)
-		{
-			return WideImage_vendor_de77_BMP::imagecreatefromstring($data);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			if ($uri == null)
-				return WideImage_vendor_de77_BMP::imagebmp($handle);
-			else
-				return WideImage_vendor_de77_BMP::imagebmp($handle, $uri);
-		}
-	}
+    /**
+     * Mapper support for BMP.
+     */
+    class WideImage_Mapper_BMP
+    {
+        public function load($uri)
+        {
+            return WideImage_vendor_de77_BMP::imagecreatefrombmp($uri);
+        }
+
+        public function loadFromString($data)
+        {
+            return WideImage_vendor_de77_BMP::imagecreatefromstring($data);
+        }
+
+        public function save($handle, $uri = null)
+        {
+            if ($uri == null) {
+                return WideImage_vendor_de77_BMP::imagebmp($handle);
+            } else {
+                return WideImage_vendor_de77_BMP::imagebmp($handle, $uri);
+            }
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php
index 03372ebd926..cc0c4279bbf 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD.php
@@ -1,44 +1,26 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for GD files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_GD
-	{
-		function load($uri)
-		{
-			return @imagecreatefromgd($uri);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			if ($uri == null)
-				return imagegd($handle);
-			else
-				return imagegd($handle, $uri);
-		}
-	}
+    /**
+     * Mapper class for GD files.
+     */
+    class WideImage_Mapper_GD
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromgd($uri);
+        }
+
+        public function save($handle, $uri = null)
+        {
+            if ($uri == null) {
+                return imagegd($handle);
+            } else {
+                return imagegd($handle, $uri);
+            }
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php
index 7bbc5a60c29..cf010e0e373 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GD2.php
@@ -1,41 +1,22 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for GD2 files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_GD2
-	{
-		function load($uri)
-		{
-			return @imagecreatefromgd2($uri);
-		}
-		
-		function save($handle, $uri = null, $chunk_size = null, $type = null)
-		{
-			return imagegd2($handle, $uri, $chunk_size, $type);
-		}
-	}
+    /**
+     * Mapper class for GD2 files.
+     */
+    class WideImage_Mapper_GD2
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromgd2($uri);
+        }
+
+        public function save($handle, $uri = null, $chunk_size = null, $type = null)
+        {
+            return imagegd2($handle, $uri, $chunk_size, $type);
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php
index f69ec6915de..777c7bec756 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/GIF.php
@@ -1,50 +1,32 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for GIF files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_GIF
-	{
-		function load($uri)
-		{
-			return @imagecreatefromgif($uri);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			// This is a workaround for a bug, for which PHP devs claim it's not 
-			// really a bug. Well, it IS.
-			// You can't pass null as the second parameter, because php is
-			// then trying to save an image to a '' location (which results in an
-			// error, of course). And the same thing works fine for imagepng() and 
-			// imagejpeg(). It's a bug! ;)
-			if ($uri)
-				return imagegif($handle, $uri);
-			else
-				return imagegif($handle);
-		}
-	}
+    /**
+     * Mapper class for GIF files.
+     */
+    class WideImage_Mapper_GIF
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromgif($uri);
+        }
+
+        public function save($handle, $uri = null)
+        {
+            // This is a workaround for a bug, for which PHP devs claim it's not
+            // really a bug. Well, it IS.
+            // You can't pass null as the second parameter, because php is
+            // then trying to save an image to a '' location (which results in an
+            // error, of course). And the same thing works fine for imagepng() and
+            // imagejpeg(). It's a bug! ;)
+            if ($uri) {
+                return imagegif($handle, $uri);
+            } else {
+                return imagegif($handle);
+            }
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php
index a24a6cb2586..63b7bec3a3e 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/JPEG.php
@@ -1,41 +1,22 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for JPEG files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_JPEG
-	{
-		function load($uri)
-		{
-			return @imagecreatefromjpeg($uri);
-		}
-		
-		function save($handle, $uri = null, $quality = 100)
-		{
-			return imagejpeg($handle, $uri, $quality);
-		}
-	}
+    /**
+     * Mapper class for JPEG files.
+     */
+    class WideImage_Mapper_JPEG
+    {
+        public function load($uri)
+        {
+            return @imagecreatefromjpeg($uri);
+        }
+
+        public function save($handle, $uri = null, $quality = 100)
+        {
+            return imagejpeg($handle, $uri, $quality);
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php
index 30b59d175c0..6ceb724c1ef 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/PNG.php
@@ -1,41 +1,22 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Mappers
-  **/
-	
-	/**
-	 * Mapper class for PNG files
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_PNG
-	{
-		function load($uri)
-		{
-			return @imagecreatefrompng($uri);
-		}
-		
-		function save($handle, $uri = null, $compression = 9, $filters = PNG_ALL_FILTERS)
-		{
-			return imagepng($handle, $uri, $compression, $filters);
-		}
-	}
+    /**
+     * Mapper class for PNG files.
+     */
+    class WideImage_Mapper_PNG
+    {
+        public function load($uri)
+        {
+            return @imagecreatefrompng($uri);
+        }
+
+        public function save($handle, $uri = null, $compression = 9, $filters = PNG_ALL_FILTERS)
+        {
+            return imagepng($handle, $uri, $compression, $filters);
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php
index a1027a575ed..620c6501212 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Mapper/TGA.php
@@ -1,48 +1,28 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
+    include_once WideImage::path().'/vendor/de77/TGA.php';
 
-    * @package Internal/Mappers
-  **/
-	
-	include_once WideImage::path() . '/vendor/de77/TGA.php';
-	
-	/**
-	 * Mapper support for TGA
-	 * 
-	 * @package Internal/Mappers
-	 */
-	class WideImage_Mapper_TGA
-	{
-		function load($uri)
-		{
-			return WideImage_vendor_de77_TGA::imagecreatefromtga($uri);
-		}
-		
-		function loadFromString($data)
-		{
-			return WideImage_vendor_de77_TGA::imagecreatefromstring($data);
-		}
-		
-		function save($handle, $uri = null)
-		{
-			throw new WideImage_Exception("Saving to TGA isn't supported.");
-		}
-	}
+    /**
+     * Mapper support for TGA.
+     */
+    class WideImage_Mapper_TGA
+    {
+        public function load($uri)
+        {
+            return WideImage_vendor_de77_TGA::imagecreatefromtga($uri);
+        }
+
+        public function loadFromString($data)
+        {
+            return WideImage_vendor_de77_TGA::imagecreatefromstring($data);
+        }
+
+        public function save($handle, $uri = null)
+        {
+            throw new WideImage_Exception("Saving to TGA isn't supported.");
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
index 4f453df2245..b845536ef92 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
@@ -1,126 +1,112 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * Thrown when image format isn't supported
-	 * 
-	 * @package Exceptions
-	 */
-	class WideImage_UnsupportedFormatException extends WideImage_Exception {}
-	
-	/**
-	 * Mapper factory
-	 * 
-	 * @package Internals
-	 **/
-	abstract class WideImage_MapperFactory
-	{
-		static protected $mappers = array();
-		static protected $customMappers = array();
-		
-		static protected $mimeTable = array(
-			'image/jpg' => 'JPEG', 
-			'image/jpeg' => 'JPEG', 
-			'image/pjpeg' => 'JPEG', 
-			'image/gif' => 'GIF', 
-			'image/png' => 'PNG'
-			);
-		
-		/**
-		 * Returns a mapper, based on the $uri and $format
-		 * 
-		 * @param string $uri File URI
-		 * @param string $format File format (extension or mime-type) or null
-		 * @return WideImage_Mapper
-		 **/
-		static function selectMapper($uri, $format = null)
-		{
-			$format = self::determineFormat($uri, $format);
-			
-			if (array_key_exists($format, self::$mappers))
-				return self::$mappers[$format];
-			
-			$mapperClassName = 'WideImage_Mapper_' . $format;
-			
-			if (!class_exists($mapperClassName, false))
-			{
-				$mapperFileName = WideImage::path() . 'Mapper/' . $format . '.php';
-				if (file_exists($mapperFileName))
-					require_once $mapperFileName;
-			}
-			
-			if (class_exists($mapperClassName))
-			{
-				self::$mappers[$format] = new $mapperClassName();
-				return self::$mappers[$format];
-			}
-			
-			throw new WideImage_UnsupportedFormatException("Format '{$format}' is not supported.");
-		}
-		
-		static function registerMapper($mapper_class_name, $mime_type, $extension)
-		{
-			self::$customMappers[$mime_type] = $mapper_class_name;
-			self::$mimeTable[$mime_type] = $extension;
-		}
-		
-		static function getCustomMappers()
-		{
-			return self::$customMappers;
-		}
-		
-		static function determineFormat($uri, $format = null)
-		{
-			if ($format == null)
-				$format = self::extractExtension($uri);
-			
-			// mime-type match
-			if (preg_match('~[a-z]*/[a-z-]*~i', $format))
-				if (isset(self::$mimeTable[strtolower($format)]))
-				{
-					return self::$mimeTable[strtolower($format)];
-				}
-			
-			// clean the string
-			$format = strtoupper(preg_replace('/[^a-z0-9_-]/i', '', $format));
-			if ($format == 'JPG')
-				$format = 'JPEG';
-			
-			return $format;
-		}
-		
-		static function mimeType($format)
-		{
-			return array_search(strtoupper($format), self::$mimeTable);
-		}
-		
-		static function extractExtension($uri)
-		{
-			$p = strrpos($uri, '.');
-			if ($p === false)
-				return '';
-			else
-				return substr($uri, $p + 1);
-		}
-	}
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+
+    /**
+     * Thrown when image format isn't supported.
+     */
+    class WideImage_UnsupportedFormatException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * Mapper factory.
+     **/
+    abstract class WideImage_MapperFactory
+    {
+        protected static $mappers       = [];
+        protected static $customMappers = [];
+
+        protected static $mimeTable = [
+            'image/jpg'   => 'JPEG',
+            'image/jpeg'  => 'JPEG',
+            'image/pjpeg' => 'JPEG',
+            'image/gif'   => 'GIF',
+            'image/png'   => 'PNG',
+            ];
+
+        /**
+         * Returns a mapper, based on the $uri and $format.
+         *
+         * @param string $uri    File URI
+         * @param string $format File format (extension or mime-type) or null
+         *
+         * @return WideImage_Mapper
+         **/
+        public static function selectMapper($uri, $format = null)
+        {
+            $format = self::determineFormat($uri, $format);
+
+            if (array_key_exists($format, self::$mappers)) {
+                return self::$mappers[$format];
+            }
+
+            $mapperClassName = 'WideImage_Mapper_'.$format;
+
+            if (!class_exists($mapperClassName, false)) {
+                $mapperFileName = WideImage::path().'Mapper/'.$format.'.php';
+                if (file_exists($mapperFileName)) {
+                    require_once $mapperFileName;
+                }
+            }
+
+            if (class_exists($mapperClassName)) {
+                self::$mappers[$format] = new $mapperClassName();
+
+                return self::$mappers[$format];
+            }
+
+            throw new WideImage_UnsupportedFormatException("Format '{$format}' is not supported.");
+        }
+
+        public static function registerMapper($mapper_class_name, $mime_type, $extension)
+        {
+            self::$customMappers[$mime_type] = $mapper_class_name;
+            self::$mimeTable[$mime_type]     = $extension;
+        }
+
+        public static function getCustomMappers()
+        {
+            return self::$customMappers;
+        }
+
+        public static function determineFormat($uri, $format = null)
+        {
+            if ($format == null) {
+                $format = self::extractExtension($uri);
+            }
+
+            // mime-type match
+            if (preg_match('~[a-z]*/[a-z-]*~i', $format)) {
+                if (isset(self::$mimeTable[strtolower($format)])) {
+                    return self::$mimeTable[strtolower($format)];
+                }
+            }
+
+            // clean the string
+            $format = strtoupper(preg_replace('/[^a-z0-9_-]/i', '', $format));
+            if ($format == 'JPG') {
+                $format = 'JPEG';
+            }
+
+            return $format;
+        }
+
+        public static function mimeType($format)
+        {
+            return array_search(strtoupper($format), self::$mimeTable);
+        }
+
+        public static function extractExtension($uri)
+        {
+            $p = strrpos($uri, '.');
+            if ($p === false) {
+                return '';
+            } else {
+                return substr($uri, $p + 1);
+            }
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php
index 5206c3ef390..d678242bc4e 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AddNoise.php
@@ -1,153 +1,136 @@
 <?php
-	/**
-	* @author Tomasz Kapusta
-	* @copyright 2010
-	
-	This file is part of WideImage.
-		
-		WideImage is free software; you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation; either version 2.1 of the License, or
-	(at your option) any later version.
-		
-	WideImage is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
-		
-	You should have received a copy of the GNU Lesser General Public License
-	along with WideImage; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	
-	* @package Internal/Operations
-	**/
-	
-	/**
-	 * Noise filter
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AddNoise {
-		/**
-		 * Returns image with noise added
-		 *
-		 * @param WideImage_Image $image
-		 * @param float $amount
-		 * @param const $type
-		 * @param float $threshold
-		 * @return WideImage_Image
-		 */
-		 		 
-		function execute($image, $amount, $type) {
-			
-			switch ($type)
-			{
-				case 'salt&pepper'	:	$fun = 'saltPepperNoise_fun'; 
-										break;
-				case 'color'		:	$fun = 'colorNoise_fun';
-										break;	
-				default				:	$fun = 'monoNoise_fun';
-										break; 			
-			}
-			
-			return self::filter($image->asTrueColor(), $fun, $amount);			
-		}
-		
-		/**
-		 * Returns image with every pixel changed by specififed function
-		 *
-		 * @param WideImage_Image $image
-		 * @param str $function
-		 * @param int $value
-		 * @return WideImage_Image
-		 */
-		function filter($image, $function, $value)
-		{
-			for ($y = 0; $y < $image->getHeight(); $y++)
-			{
-		    	for ($x = 0; $x< $image->getWidth(); $x++)
-				{	     
-					$rgb = imagecolorat($image->getHandle(), $x, $y);				
-					
-					$a = ($rgb >> 24) & 0xFF;
-					$r = ($rgb >> 16) & 0xFF;
-					$g = ($rgb >> 8) & 0xFF;
-					$b = $rgb & 0xFF;
-					
-					
-					self::$function($r, $g, $b, $value);
-					
-					$color = imagecolorallocatealpha($image->getHandle(), $r, $g, $b, $a);				
-					imagesetpixel($image->getHandle(), $x, $y, $color); 
-		      	}
-		    }
-		    return $image;
-		}
-		/**
-		 * Adds color noise by altering given R,G,B values using specififed amount
-		 *
-		 * @param int $r
-		 * @param int $g
-		 * @param int $b
-		 * @param int $value		 
-		 * @return void
-		 */
-		function colorNoise_fun(&$r, &$g, &$b, $amount)
-		{				
-			$r = self::byte($r + mt_rand(0, $amount) - ($amount >> 1) );
-			$g = self::byte($g + mt_rand(0, $amount) - ($amount >> 1) );
-			$b = self::byte($b + mt_rand(0, $amount) - ($amount >> 1) );
-		}
-		/**
-		 * Adds mono noise by altering given R,G,B values using specififed amount
-		 *
-		 * @param int $r
-		 * @param int $g
-		 * @param int $b
-		 * @param int $value		 
-		 * @return void
-		 */
-		function monoNoise_fun(&$r, &$g, &$b, $amount)
-		{				
-			$rand = mt_rand(0, $amount) - ($amount >> 1);
-			
-			$r = self::byte($r + $rand);
-			$g = self::byte($g + $rand);
-			$b = self::byte($b + $rand);
-		}
-		/**
-		 * Adds salt&pepper noise by altering given R,G,B values using specififed amount
-		 *
-		 * @param int $r
-		 * @param int $g
-		 * @param int $b
-		 * @param int $value		 
-		 * @return void
-		 */
-		function saltPepperNoise_fun(&$r, &$g, &$b, $amount)
-		{
-			if (mt_rand(0, 255 - $amount) != 0) return;
-			
-			$rand = mt_rand(0, 1);
-			switch ($rand)
-			{
-				case 0 :	$r = $g = $b = 0;
-							break; 
-				case 1 :	$r = $g = $b = 255;
-							break; 
-			}
-		}
-		/**
-		 * Returns value within (0,255)
-		 *
-		 * @param int $b		 
-		 * @return int
-		 */		
-		function byte($b)
-		{
-			if ($b > 255) return 255;
-			if ($b < 0) return 0;
-			return (int) $b;
-		}
-		
-	}
+    /**
+     * @author Tomasz Kapusta
+     * @copyright 2010
+
+     **/
+
+    /**
+     * Noise filter.
+     */
+    class WideImage_Operation_AddNoise
+    {
+        /**
+         * Returns image with noise added.
+         *
+         * @param WideImage_Image $image
+         * @param float           $amount
+         * @param const           $type
+         * @param float           $threshold
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $amount, $type)
+        {
+            switch ($type) {
+                case 'salt&pepper':    $fun = 'saltPepperNoise_fun';
+                                        break;
+                case 'color':    $fun = 'colorNoise_fun';
+                                        break;
+                default:    $fun = 'monoNoise_fun';
+                                        break;
+            }
+
+            return self::filter($image->asTrueColor(), $fun, $amount);
+        }
+
+        /**
+         * Returns image with every pixel changed by specififed function.
+         *
+         * @param WideImage_Image $image
+         * @param str             $function
+         * @param int             $value
+         *
+         * @return WideImage_Image
+         */
+        public function filter($image, $function, $value)
+        {
+            for ($y = 0; $y < $image->getHeight(); ++$y) {
+                for ($x = 0; $x < $image->getWidth(); ++$x) {
+                    $rgb = imagecolorat($image->getHandle(), $x, $y);
+
+                    $a = ($rgb >> 24) & 0xFF;
+                    $r = ($rgb >> 16) & 0xFF;
+                    $g = ($rgb >> 8) & 0xFF;
+                    $b = $rgb & 0xFF;
+
+                    self::$function($r, $g, $b, $value);
+
+                    $color = imagecolorallocatealpha($image->getHandle(), $r, $g, $b, $a);
+                    imagesetpixel($image->getHandle(), $x, $y, $color);
+                }
+            }
+
+            return $image;
+        }
+        /**
+         * Adds color noise by altering given R,G,B values using specififed amount.
+         *
+         * @param int $r
+         * @param int $g
+         * @param int $b
+         * @param int $value
+         */
+        public function colorNoise_fun(&$r, &$g, &$b, $amount)
+        {
+            $r = self::byte($r + mt_rand(0, $amount) - ($amount >> 1));
+            $g = self::byte($g + mt_rand(0, $amount) - ($amount >> 1));
+            $b = self::byte($b + mt_rand(0, $amount) - ($amount >> 1));
+        }
+        /**
+         * Adds mono noise by altering given R,G,B values using specififed amount.
+         *
+         * @param int $r
+         * @param int $g
+         * @param int $b
+         * @param int $value
+         */
+        public function monoNoise_fun(&$r, &$g, &$b, $amount)
+        {
+            $rand = mt_rand(0, $amount) - ($amount >> 1);
+
+            $r = self::byte($r + $rand);
+            $g = self::byte($g + $rand);
+            $b = self::byte($b + $rand);
+        }
+        /**
+         * Adds salt&pepper noise by altering given R,G,B values using specififed amount.
+         *
+         * @param int $r
+         * @param int $g
+         * @param int $b
+         * @param int $value
+         */
+        public function saltPepperNoise_fun(&$r, &$g, &$b, $amount)
+        {
+            if (mt_rand(0, 255 - $amount) != 0) {
+                return;
+            }
+
+            $rand = mt_rand(0, 1);
+            switch ($rand) {
+                case 0:    $r = $g = $b = 0;
+                            break;
+                case 1:    $r = $g = $b = 255;
+                            break;
+            }
+        }
+        /**
+         * Returns value within (0,255).
+         *
+         * @param int $b
+         *
+         * @return int
+         */
+        public function byte($b)
+        {
+            if ($b > 255) {
+                return 255;
+            }
+            if ($b < 0) {
+                return 0;
+            }
+
+            return (int) $b;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php
index 9a1c5f74c40..03026455a64 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyConvolution.php
@@ -1,48 +1,32 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyConvolution operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ApplyConvolution
-	{
-		/**
-		 * Executes imageconvolution() filter
-		 *
-		 * @param WideImage_Image $image
-		 * @param array $matrix
-		 * @param numeric $div
-		 * @param numeric $offset
-		 * @return WideImage_Image
-		 */
-		function execute($image, $matrix, $div, $offset)
-		{
-			$new = $image->asTrueColor();
-			if (!imageconvolution($new->getHandle(), $matrix, $div, $offset))
-				throw new WideImage_GDFunctionResultException("imageconvolution() returned false");
-			return $new;
-		}
-	}
+    /**
+     * ApplyConvolution operation class.
+     */
+    class WideImage_Operation_ApplyConvolution
+    {
+        /**
+         * Executes imageconvolution() filter.
+         *
+         * @param WideImage_Image $image
+         * @param array           $matrix
+         * @param numeric         $div
+         * @param numeric         $offset
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $matrix, $div, $offset)
+        {
+            $new = $image->asTrueColor();
+            if (!imageconvolution($new->getHandle(), $matrix, $div, $offset)) {
+                throw new WideImage_GDFunctionResultException('imageconvolution() returned false');
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php
index ec6d210b213..93f9f13a5b1 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyFilter.php
@@ -1,67 +1,51 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyFilter operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ApplyFilter
-	{
-		/**
-		 * A list of filters that only accept one arguments for imagefilter()
-		 *
-		 * @var array
-		 */
-		static protected $one_arg_filters = array(IMG_FILTER_SMOOTH, IMG_FILTER_CONTRAST, IMG_FILTER_BRIGHTNESS);
-		
-		/**
-		 * Executes imagefilter
-		 *
-		 * @param WideImage_Image $image
-		 * @param int $filter 
-		 * @param numeric $arg1
-		 * @param numeric $arg2
-		 * @param numeric $arg3
-		 * @return WideImage_TrueColorImage
-		 */
-		function execute($image, $filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
-		{
-			$new = $image->asTrueColor();
-			
-			if (in_array($filter, self::$one_arg_filters))
-				$res = imagefilter($new->getHandle(), $filter, $arg1);
-			elseif (defined('IMG_FILTER_PIXELATE') && $filter == IMG_FILTER_PIXELATE)
-				$res = imagefilter($new->getHandle(), $filter, $arg1, $arg2);
-			elseif ($filter == IMG_FILTER_COLORIZE)
-				$res = imagefilter($new->getHandle(), $filter, $arg1, $arg2, $arg3, $arg4);
-			else
-				$res = imagefilter($new->getHandle(), $filter);
-			
-			if (!$res)
-				throw new WideImage_GDFunctionResultException("imagefilter() returned false");
-			
-			return $new;
-		}
-	}
+    /**
+     * ApplyFilter operation class.
+     */
+    class WideImage_Operation_ApplyFilter
+    {
+        /**
+         * A list of filters that only accept one arguments for imagefilter().
+         *
+         * @var array
+         */
+        protected static $one_arg_filters = [IMG_FILTER_SMOOTH, IMG_FILTER_CONTRAST, IMG_FILTER_BRIGHTNESS];
+
+        /**
+         * Executes imagefilter.
+         *
+         * @param WideImage_Image $image
+         * @param int             $filter
+         * @param numeric         $arg1
+         * @param numeric         $arg2
+         * @param numeric         $arg3
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public function execute($image, $filter, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null)
+        {
+            $new = $image->asTrueColor();
+
+            if (in_array($filter, self::$one_arg_filters)) {
+                $res = imagefilter($new->getHandle(), $filter, $arg1);
+            } elseif (defined('IMG_FILTER_PIXELATE') && $filter == IMG_FILTER_PIXELATE) {
+                $res = imagefilter($new->getHandle(), $filter, $arg1, $arg2);
+            } elseif ($filter == IMG_FILTER_COLORIZE) {
+                $res = imagefilter($new->getHandle(), $filter, $arg1, $arg2, $arg3, $arg4);
+            } else {
+                $res = imagefilter($new->getHandle(), $filter);
+            }
+
+            if (!$res) {
+                throw new WideImage_GDFunctionResultException('imagefilter() returned false');
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php
index 949213f0c19..7f937e7a4f9 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ApplyMask.php
@@ -1,105 +1,83 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyMask operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ApplyMask
-	{
-		/**
-		 * Applies a mask on the copy of source image
-		 *
-		 * @param WideImage_Image $image
-		 * @param WideImage_Image $mask
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @return WideImage_Image
-		 */
-		function execute($image, $mask, $left = 0, $top = 0)
-		{
-			$left = WideImage_Coordinate::fix($left, $image->getWidth(), $mask->getWidth());
-			$top = WideImage_Coordinate::fix($top, $image->getHeight(), $mask->getHeight());
-			
-			$width = $image->getWidth();
-			$mask_width = $mask->getWidth();
-			
-			$height = $image->getHeight();
-			$mask_height = $mask->getHeight();
-			
-			$result = $image->asTrueColor();
-			
-			$result->alphaBlending(false);
-			$result->saveAlpha(true);
-			
-			$srcTransparentColor = $result->getTransparentColor();
-			if ($srcTransparentColor >= 0)
-			{
-				# this was here. works without.
-				#$trgb = $image->getColorRGB($srcTransparentColor);
-				#$trgb['alpha'] = 127;
-				#$destTransparentColor = $result->allocateColorAlpha($trgb);
-				#$result->setTransparentColor($destTransparentColor);
-				$destTransparentColor = $srcTransparentColor;
-			}
-			else
-			{
-				$destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
-			}
-			
-			for ($x = 0; $x < $width; $x++)
-				for ($y = 0; $y < $height; $y++)
-				{
-					$mx = $x - $left;
-					$my = $y - $top;
-					if ($mx >= 0 && $mx < $mask_width && $my >= 0 && $my < $mask_height)
-					{
-						$srcColor = $image->getColorAt($x, $y);
-						if ($srcColor == $srcTransparentColor)
-							$destColor = $destTransparentColor;
-						else
-						{
-							$maskRGB = $mask->getRGBAt($mx, $my);
-							if ($maskRGB['red'] == 0)
-								$destColor = $destTransparentColor;
-							elseif ($srcColor >= 0)
-							{
-								$imageRGB = $image->getRGBAt($x, $y);
-								$level = ($maskRGB['red'] / 255) * (1 - $imageRGB['alpha'] / 127);
-								$imageRGB['alpha'] = 127 - round($level * 127);
-								if ($imageRGB['alpha'] == 127)
-									$destColor = $destTransparentColor;
-								else
-									$destColor = $result->allocateColorAlpha($imageRGB);
-							}
-							else
-								$destColor = $destTransparentColor;
-						}
-						$result->setColorAt($x, $y, $destColor);
-					}
-				}
-			return $result;
-		}
-	}
+    /**
+     * ApplyMask operation class.
+     */
+    class WideImage_Operation_ApplyMask
+    {
+        /**
+         * Applies a mask on the copy of source image.
+         *
+         * @param WideImage_Image  $image
+         * @param WideImage_Image  $mask
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $mask, $left = 0, $top = 0)
+        {
+            $left = WideImage_Coordinate::fix($left, $image->getWidth(), $mask->getWidth());
+            $top  = WideImage_Coordinate::fix($top, $image->getHeight(), $mask->getHeight());
+
+            $width      = $image->getWidth();
+            $mask_width = $mask->getWidth();
+
+            $height      = $image->getHeight();
+            $mask_height = $mask->getHeight();
+
+            $result = $image->asTrueColor();
+
+            $result->alphaBlending(false);
+            $result->saveAlpha(true);
+
+            $srcTransparentColor = $result->getTransparentColor();
+            if ($srcTransparentColor >= 0) {
+                // this was here. works without.
+                //$trgb = $image->getColorRGB($srcTransparentColor);
+                //$trgb['alpha'] = 127;
+                //$destTransparentColor = $result->allocateColorAlpha($trgb);
+                //$result->setTransparentColor($destTransparentColor);
+                $destTransparentColor = $srcTransparentColor;
+            } else {
+                $destTransparentColor = $result->allocateColorAlpha(255, 255, 255, 127);
+            }
+
+            for ($x = 0; $x < $width; ++$x) {
+                for ($y = 0; $y < $height; ++$y) {
+                    $mx = $x - $left;
+                    $my = $y - $top;
+                    if ($mx >= 0 && $mx < $mask_width && $my >= 0 && $my < $mask_height) {
+                        $srcColor = $image->getColorAt($x, $y);
+                        if ($srcColor == $srcTransparentColor) {
+                            $destColor = $destTransparentColor;
+                        } else {
+                            $maskRGB = $mask->getRGBAt($mx, $my);
+                            if ($maskRGB['red'] == 0) {
+                                $destColor = $destTransparentColor;
+                            } elseif ($srcColor >= 0) {
+                                $imageRGB          = $image->getRGBAt($x, $y);
+                                $level             = ($maskRGB['red'] / 255) * (1 - $imageRGB['alpha'] / 127);
+                                $imageRGB['alpha'] = 127 - round($level * 127);
+                                if ($imageRGB['alpha'] == 127) {
+                                    $destColor = $destTransparentColor;
+                                } else {
+                                    $destColor = $result->allocateColorAlpha($imageRGB);
+                                }
+                            } else {
+                                $destColor = $destTransparentColor;
+                            }
+                        }
+                        $result->setColorAt($x, $y, $destColor);
+                    }
+                }
+            }
+
+            return $result;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php
index dc72f8554c3..3bccb9b642d 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsGrayscale.php
@@ -1,49 +1,33 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * AsGrayscale operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AsGrayscale
-	{
-		/**
-		 * Returns a greyscale copy of an image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$new = $image->asTrueColor();
-			if (!imagefilter($new->getHandle(), IMG_FILTER_GRAYSCALE))
-				throw new WideImage_GDFunctionResultException("imagefilter() returned false");
-			
-			if (!$image->isTrueColor())
-				$new = $new->asPalette();
-			
-			return $new;
-		}
-	}
+    /**
+     * AsGrayscale operation class.
+     */
+    class WideImage_Operation_AsGrayscale
+    {
+        /**
+         * Returns a greyscale copy of an image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $new = $image->asTrueColor();
+            if (!imagefilter($new->getHandle(), IMG_FILTER_GRAYSCALE)) {
+                throw new WideImage_GDFunctionResultException('imagefilter() returned false');
+            }
+
+            if (!$image->isTrueColor()) {
+                $new = $new->asPalette();
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php
index 9a13c42973c..234570bc04e 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AsNegative.php
@@ -1,63 +1,46 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * AsNegative operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AsNegative
-	{
-		/**
-		 * Returns a greyscale copy of an image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$palette = !$image->isTrueColor();
-			$transparent = $image->isTransparent();
-			
-			if ($palette && $transparent)
-				$tcrgb = $image->getTransparentColorRGB();
-			
-			$new = $image->asTrueColor();
-			if (!imagefilter($new->getHandle(), IMG_FILTER_NEGATE))
-				throw new WideImage_GDFunctionResultException("imagefilter() returned false");
-			
-			if ($palette)
-			{
-				$new = $new->asPalette();
-				if ($transparent)
-				{
-					$irgb = array('red' => 255 - $tcrgb['red'], 'green' => 255 - $tcrgb['green'], 'blue' => 255 - $tcrgb['blue'], 'alpha' => 127);
-					// needs imagecolorexactalpha instead of imagecolorexact, otherwise doesn't work on some transparent GIF images
-					$new_tci = imagecolorexactalpha($new->getHandle(), $irgb['red'], $irgb['green'], $irgb['blue'], 127);
-					$new->setTransparentColor($new_tci);
-				}
-			}
-			return $new;
-		}
-	}
+    /**
+     * AsNegative operation class.
+     */
+    class WideImage_Operation_AsNegative
+    {
+        /**
+         * Returns a greyscale copy of an image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $palette     = !$image->isTrueColor();
+            $transparent = $image->isTransparent();
+
+            if ($palette && $transparent) {
+                $tcrgb = $image->getTransparentColorRGB();
+            }
+
+            $new = $image->asTrueColor();
+            if (!imagefilter($new->getHandle(), IMG_FILTER_NEGATE)) {
+                throw new WideImage_GDFunctionResultException('imagefilter() returned false');
+            }
+
+            if ($palette) {
+                $new = $new->asPalette();
+                if ($transparent) {
+                    $irgb = ['red' => 255 - $tcrgb['red'], 'green' => 255 - $tcrgb['green'], 'blue' => 255 - $tcrgb['blue'], 'alpha' => 127];
+                    // needs imagecolorexactalpha instead of imagecolorexact, otherwise doesn't work on some transparent GIF images
+                    $new_tci = imagecolorexactalpha($new->getHandle(), $irgb['red'], $irgb['green'], $irgb['blue'], 127);
+                    $new->setTransparentColor($new_tci);
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
index 2fd0909e6e8..b9236965c01 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
@@ -1,162 +1,134 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * AutoCrop operation
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_AutoCrop
-	{
-		/**
-		 * Executes the auto-crop operation on the $img
-		 * 
-		 * @param WideImage_Image $img 
-		 * @param int $rgb_threshold The difference in RGB from $base_color
-		 * @param int $pixel_cutoff The number of pixels on each border that must be over $rgb_threshold
-		 * @param int $base_color The color that will get cropped
-		 * @return WideImage_Image resulting auto-cropped image
-		 */
-		function execute($img, $margin, $rgb_threshold, $pixel_cutoff, $base_color)
-		{
-			$margin = intval($margin);
-			
-			$rgb_threshold = intval($rgb_threshold);
-			if ($rgb_threshold < 0)
-				$rgb_threshold = 0;
-			
-			$pixel_cutoff = intval($pixel_cutoff);
-			if ($pixel_cutoff <= 1)
-				$pixel_cutoff = 1;
-			
-			if ($base_color === null)
-				$rgb_base = $img->getRGBAt(0, 0);
-			else
-			{
-				if ($base_color < 0)
-					return $img->copy();
-				
-				$rgb_base = $img->getColorRGB($base_color);
-			}
-			
-			$cut_rect = array('left' => 0, 'top' => 0, 'right' => $img->getWidth() - 1, 'bottom' => $img->getHeight() - 1);
-			
-			for ($y = 0; $y <= $cut_rect['bottom']; $y++)
-			{
-				$count = 0;
-				for ($x = 0; $x <= $cut_rect['right']; $x++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['top'] = $y;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			for ($y = $img->getHeight() - 1; $y >= $cut_rect['top']; $y--)
-			{
-				$count = 0;
-				for ($x = 0; $x <= $cut_rect['right']; $x++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['bottom'] = $y;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			for ($x = 0; $x <= $cut_rect['right']; $x++)
-			{
-				$count = 0;
-				for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['left'] = $x;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			for ($x = $cut_rect['right']; $x >= $cut_rect['left']; $x--)
-			{
-				$count = 0;
-				for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; $y++)
-				{
-					$rgb = $img->getRGBAt($x, $y);
-					$diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
-					if ($diff > $rgb_threshold)
-					{
-						$count++;
-						if ($count >= $pixel_cutoff)
-						{
-							$cut_rect['right'] = $x;
-							break 2;
-						}
-					}
-				}
-			}
-			
-			$cut_rect = array(
-					'left' => $cut_rect['left'] - $margin,
-					'top' => $cut_rect['top'] - $margin,
-					'right' => $cut_rect['right'] + $margin,
-					'bottom' => $cut_rect['bottom'] + $margin
-				);
-			
-			if ($cut_rect['left'] < 0)
-				$cut_rect['left'] = 0;
-			
-			if ($cut_rect['top'] < 0)
-				$cut_rect['top'] = 0;
-			
-			if ($cut_rect['right'] >= $img->getWidth())
-				$cut_rect['right'] = $img->getWidth() - 1;
-			
-			if ($cut_rect['bottom'] >= $img->getHeight())
-				$cut_rect['bottom'] = $img->getHeight() - 1;
-			
-			return $img->crop($cut_rect['left'], $cut_rect['top'], $cut_rect['right'] - $cut_rect['left'] + 1, $cut_rect['bottom'] - $cut_rect['top'] + 1);
-		}
-	}
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+
+    /**
+     * AutoCrop operation.
+     */
+    class WideImage_Operation_AutoCrop
+    {
+        /**
+         * Executes the auto-crop operation on the $img.
+         *
+         * @param WideImage_Image $img
+         * @param int             $rgb_threshold The difference in RGB from $base_color
+         * @param int             $pixel_cutoff  The number of pixels on each border that must be over $rgb_threshold
+         * @param int             $base_color    The color that will get cropped
+         *
+         * @return WideImage_Image resulting auto-cropped image
+         */
+        public function execute($img, $margin, $rgb_threshold, $pixel_cutoff, $base_color)
+        {
+            $margin = intval($margin);
+
+            $rgb_threshold = intval($rgb_threshold);
+            if ($rgb_threshold < 0) {
+                $rgb_threshold = 0;
+            }
+
+            $pixel_cutoff = intval($pixel_cutoff);
+            if ($pixel_cutoff <= 1) {
+                $pixel_cutoff = 1;
+            }
+
+            if ($base_color === null) {
+                $rgb_base = $img->getRGBAt(0, 0);
+            } else {
+                if ($base_color < 0) {
+                    return $img->copy();
+                }
+
+                $rgb_base = $img->getColorRGB($base_color);
+            }
+
+            $cut_rect = ['left' => 0, 'top' => 0, 'right' => $img->getWidth() - 1, 'bottom' => $img->getHeight() - 1];
+
+            for ($y = 0; $y <= $cut_rect['bottom']; ++$y) {
+                $count = 0;
+                for ($x = 0; $x <= $cut_rect['right']; ++$x) {
+                    $rgb  = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        ++$count;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['top'] = $y;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            for ($y = $img->getHeight() - 1; $y >= $cut_rect['top']; --$y) {
+                $count = 0;
+                for ($x = 0; $x <= $cut_rect['right']; ++$x) {
+                    $rgb  = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        ++$count;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['bottom'] = $y;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            for ($x = 0; $x <= $cut_rect['right']; ++$x) {
+                $count = 0;
+                for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; ++$y) {
+                    $rgb  = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        ++$count;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['left'] = $x;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            for ($x = $cut_rect['right']; $x >= $cut_rect['left']; --$x) {
+                $count = 0;
+                for ($y = $cut_rect['top']; $y <= $cut_rect['bottom']; ++$y) {
+                    $rgb  = $img->getRGBAt($x, $y);
+                    $diff = abs($rgb['red'] - $rgb_base['red']) + abs($rgb['green'] - $rgb_base['green']) + abs($rgb['blue'] - $rgb_base['blue']);
+                    if ($diff > $rgb_threshold) {
+                        ++$count;
+                        if ($count >= $pixel_cutoff) {
+                            $cut_rect['right'] = $x;
+                            break 2;
+                        }
+                    }
+                }
+            }
+
+            $cut_rect = [
+                    'left'   => $cut_rect['left'] - $margin,
+                    'top'    => $cut_rect['top'] - $margin,
+                    'right'  => $cut_rect['right'] + $margin,
+                    'bottom' => $cut_rect['bottom'] + $margin,
+                ];
+
+            if ($cut_rect['left'] < 0) {
+                $cut_rect['left'] = 0;
+            }
+
+            if ($cut_rect['top'] < 0) {
+                $cut_rect['top'] = 0;
+            }
+
+            if ($cut_rect['right'] >= $img->getWidth()) {
+                $cut_rect['right'] = $img->getWidth() - 1;
+            }
+
+            if ($cut_rect['bottom'] >= $img->getHeight()) {
+                $cut_rect['bottom'] = $img->getHeight() - 1;
+            }
+
+            return $img->crop($cut_rect['left'], $cut_rect['top'], $cut_rect['right'] - $cut_rect['left'] + 1, $cut_rect['bottom'] - $cut_rect['top'] + 1);
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
index 04897500578..994c9ab3217 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
@@ -1,90 +1,72 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * CopyChannelsPalette operation class
-	 * 
-	 * This operation is intended to be used on palette images
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_CopyChannelsPalette
-	{
-		/**
-		 * Returns an image with only specified channels copied
-		 *
-		 * @param WideImage_PaletteImage $img
-		 * @param array $channels
-		 * @return WideImage_PaletteImage
-		 */
-		function execute($img, $channels)
-		{
-			$blank = array('red' => 0, 'green' => 0, 'blue' => 0);
-			if (isset($channels['alpha']))
-				unset($channels['alpha']);
-			
-			$width = $img->getWidth();
-			$height = $img->getHeight();
-			$copy = WideImage_PaletteImage::create($width, $height);
-			
-			if ($img->isTransparent())
-			{
-				$otci = $img->getTransparentColor();
-				$TRGB = $img->getColorRGB($otci);
-				$tci = $copy->allocateColor($TRGB);
-			}
-			else
-			{
-				$otci = null;
-				$tci = null;
-			}
-			
-			for ($x = 0; $x < $width; $x++)
-				for ($y = 0; $y < $height; $y++)
-				{
-					$ci = $img->getColorAt($x, $y);
-					if ($ci === $otci)
-					{
-						$copy->setColorAt($x, $y, $tci);
-						continue;
-					}
-					$RGB = $img->getColorRGB($ci);
-					
-					$newRGB = $blank;
-					foreach ($channels as $channel)
-						$newRGB[$channel] = $RGB[$channel];
-					
-					$color = $copy->getExactColor($newRGB);
-					if ($color == -1)
-						$color = $copy->allocateColor($newRGB);
-					
-					$copy->setColorAt($x, $y, $color);
-				}
-			
-			if ($img->isTransparent())
-				$copy->setTransparentColor($tci);
-			
-			return $copy;
-		}
-	}
+    /**
+     * CopyChannelsPalette operation class.
+     *
+     * This operation is intended to be used on palette images
+     */
+    class WideImage_Operation_CopyChannelsPalette
+    {
+        /**
+         * Returns an image with only specified channels copied.
+         *
+         * @param WideImage_PaletteImage $img
+         * @param array                  $channels
+         *
+         * @return WideImage_PaletteImage
+         */
+        public function execute($img, $channels)
+        {
+            $blank = ['red' => 0, 'green' => 0, 'blue' => 0];
+            if (isset($channels['alpha'])) {
+                unset($channels['alpha']);
+            }
+
+            $width  = $img->getWidth();
+            $height = $img->getHeight();
+            $copy   = WideImage_PaletteImage::create($width, $height);
+
+            if ($img->isTransparent()) {
+                $otci = $img->getTransparentColor();
+                $TRGB = $img->getColorRGB($otci);
+                $tci  = $copy->allocateColor($TRGB);
+            } else {
+                $otci = null;
+                $tci  = null;
+            }
+
+            for ($x = 0; $x < $width; ++$x) {
+                for ($y = 0; $y < $height; ++$y) {
+                    $ci = $img->getColorAt($x, $y);
+                    if ($ci === $otci) {
+                        $copy->setColorAt($x, $y, $tci);
+                        continue;
+                    }
+                    $RGB = $img->getColorRGB($ci);
+
+                    $newRGB = $blank;
+                    foreach ($channels as $channel) {
+                        $newRGB[$channel] = $RGB[$channel];
+                    }
+
+                    $color = $copy->getExactColor($newRGB);
+                    if ($color == -1) {
+                        $color = $copy->allocateColor($newRGB);
+                    }
+
+                    $copy->setColorAt($x, $y, $color);
+                }
+            }
+
+            if ($img->isTransparent()) {
+                $copy->setTransparentColor($tci);
+            }
+
+            return $copy;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
index bf39520cd10..d76ee8957cc 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
@@ -1,67 +1,52 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * CopyChannelsTrueColor operation class
-	 * 
-	 * Used to perform CopyChannels operation on truecolor images
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_CopyChannelsTrueColor
-	{
-		/**
-		 * Returns an image with only specified channels copied
-		 * 
-		 * @param WideImage_Image $img
-		 * @param array $channels
-		 * @return WideImage_Image
-		 */
-		function execute($img, $channels)
-		{
-			$blank = array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0);
-			
-			$width = $img->getWidth();
-			$height = $img->getHeight();
-			$copy = WideImage_TrueColorImage::create($width, $height);
-			
-			if (count($channels) > 0)
-				for ($x = 0; $x < $width; $x++)
-					for ($y = 0; $y < $height; $y++)
-					{
-						$RGBA = $img->getRGBAt($x, $y);
-						$newRGBA = $blank;
-						foreach ($channels as $channel)
-							$newRGBA[$channel] = $RGBA[$channel];
-						
-						$color = $copy->getExactColorAlpha($newRGBA);
-						if ($color == -1)
-							$color = $copy->allocateColorAlpha($newRGBA);
-						
-						$copy->setColorAt($x, $y, $color);
-					}
-			
-			return $copy;
-		}
-	}
+    /**
+     * CopyChannelsTrueColor operation class.
+     *
+     * Used to perform CopyChannels operation on truecolor images
+     */
+    class WideImage_Operation_CopyChannelsTrueColor
+    {
+        /**
+         * Returns an image with only specified channels copied.
+         *
+         * @param WideImage_Image $img
+         * @param array           $channels
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $channels)
+        {
+            $blank = ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0];
+
+            $width  = $img->getWidth();
+            $height = $img->getHeight();
+            $copy   = WideImage_TrueColorImage::create($width, $height);
+
+            if (count($channels) > 0) {
+                for ($x = 0; $x < $width; ++$x) {
+                    for ($y = 0; $y < $height; ++$y) {
+                        $RGBA    = $img->getRGBAt($x, $y);
+                        $newRGBA = $blank;
+                        foreach ($channels as $channel) {
+                            $newRGBA[$channel] = $RGBA[$channel];
+                        }
+
+                        $color = $copy->getExactColorAlpha($newRGBA);
+                        if ($color == -1) {
+                            $color = $copy->allocateColorAlpha($newRGBA);
+                        }
+
+                        $copy->setColorAt($x, $y, $color);
+                    }
+                }
+            }
+
+            return $copy;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php
index 49562f1d3c2..c6456f73da1 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/CorrectGamma.php
@@ -1,48 +1,31 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * CorrectGamma operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_CorrectGamma
-	{
-		/**
-		 * Executes imagegammacorrect()
-		 *
-		 * @param WideImage_Image $image
-		 * @param numeric $input_gamma
-		 * @param numeric $output_gamma
-		 * @return WideImage_TrueColorImage
-		 */
-		function execute($image, $input_gamma, $output_gamma)
-		{
-			$new = $image->copy();
-			if (!imagegammacorrect($new->getHandle(), $input_gamma, $output_gamma))
-				throw new WideImage_GDFunctionResultException("imagegammacorrect() returned false");
-			
-			return $new;
-		}
-	}
+    /**
+     * CorrectGamma operation class.
+     */
+    class WideImage_Operation_CorrectGamma
+    {
+        /**
+         * Executes imagegammacorrect().
+         *
+         * @param WideImage_Image $image
+         * @param numeric         $input_gamma
+         * @param numeric         $output_gamma
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public function execute($image, $input_gamma, $output_gamma)
+        {
+            $new = $image->copy();
+            if (!imagegammacorrect($new->getHandle(), $input_gamma, $output_gamma)) {
+                throw new WideImage_GDFunctionResultException('imagegammacorrect() returned false');
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php
index 6a9d4f5b303..8d2bf085155 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Crop.php
@@ -1,86 +1,69 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Crop operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Crop
-	{
-		/**
-		 * Returns a cropped image
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @return WideImage_Image
-		 */
-		function execute($img, $left, $top, $width, $height)
-		{
-			$width = WideImage_Coordinate::fix($width, $img->getWidth(), $width);
-			$height = WideImage_Coordinate::fix($height, $img->getHeight(), $height);
-			$left = WideImage_Coordinate::fix($left, $img->getWidth(), $width);
-			$top = WideImage_Coordinate::fix($top, $img->getHeight(), $height);
-			if ($left < 0)
-			{
-				$width = $left + $width;
-				$left = 0;
-			}
-			
-			if ($width > $img->getWidth() - $left)
-				$width = $img->getWidth() - $left;
-			
-			if ($top < 0)
-			{
-				$height = $top + $height;
-				$top = 0;
-			}
-			
-			if ($height > $img->getHeight() - $top)
-				$height = $img->getHeight() - $top;
-			
-			if ($width <= 0 || $height <= 0)
-				throw new WideImage_Exception("Can't crop outside of an image.");
-			
-			$new = $img->doCreate($width, $height);
-			
-			if ($img->isTransparent() || $img instanceof WideImage_PaletteImage)
-			{
-				$new->copyTransparencyFrom($img);
-				if (!imagecopyresized($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height))
-					throw new WideImage_GDFunctionResultException("imagecopyresized() returned false");
-			}
-			else
-			{
-				$new->alphaBlending(false);
-				$new->saveAlpha(true);
-				if (!imagecopyresampled($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height))
-					throw new WideImage_GDFunctionResultException("imagecopyresampled() returned false");
-			}
-			return $new;
-		}
-	}
+    /**
+     * Crop operation class.
+     */
+    class WideImage_Operation_Crop
+    {
+        /**
+         * Returns a cropped image.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $left, $top, $width, $height)
+        {
+            $width  = WideImage_Coordinate::fix($width, $img->getWidth(), $width);
+            $height = WideImage_Coordinate::fix($height, $img->getHeight(), $height);
+            $left   = WideImage_Coordinate::fix($left, $img->getWidth(), $width);
+            $top    = WideImage_Coordinate::fix($top, $img->getHeight(), $height);
+            if ($left < 0) {
+                $width = $left + $width;
+                $left  = 0;
+            }
+
+            if ($width > $img->getWidth() - $left) {
+                $width = $img->getWidth() - $left;
+            }
+
+            if ($top < 0) {
+                $height = $top + $height;
+                $top    = 0;
+            }
+
+            if ($height > $img->getHeight() - $top) {
+                $height = $img->getHeight() - $top;
+            }
+
+            if ($width <= 0 || $height <= 0) {
+                throw new WideImage_Exception("Can't crop outside of an image.");
+            }
+
+            $new = $img->doCreate($width, $height);
+
+            if ($img->isTransparent() || $img instanceof WideImage_PaletteImage) {
+                $new->copyTransparencyFrom($img);
+                if (!imagecopyresized($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresized() returned false');
+                }
+            } else {
+                $new->alphaBlending(false);
+                $new->saveAlpha(true);
+                if (!imagecopyresampled($new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height)) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresampled() returned false');
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php
index d2f189c7b81..693f2e6e860 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Flip.php
@@ -1,54 +1,39 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Flip operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Flip
-	{
-		/**
-		 * Returns a flipped image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$new = $image->copy();
-			
-			$width = $image->getWidth();
-			$height = $image->getHeight();
-			
-			if ($new->isTransparent())
-				imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
-			
-			for ($y = 0; $y < $height; $y++)
-				if (!imagecopy($new->getHandle(), $image->getHandle(), 0, $y, 0, $height - $y - 1, $width, 1))
-					throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			
-			return $new;
-		}
-	}
+    /**
+     * Flip operation class.
+     */
+    class WideImage_Operation_Flip
+    {
+        /**
+         * Returns a flipped image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $new = $image->copy();
+
+            $width  = $image->getWidth();
+            $height = $image->getHeight();
+
+            if ($new->isTransparent()) {
+                imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
+            }
+
+            for ($y = 0; $y < $height; ++$y) {
+                if (!imagecopy($new->getHandle(), $image->getHandle(), 0, $y, 0, $height - $y - 1, $width, 1)) {
+                    throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php
index f203a91d644..fe792fb5192 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/GetMask.php
@@ -1,67 +1,52 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-	
-	* @package Internal/Operations
-  **/
-	
-	/**
-	 * GetMask operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_GetMask
-	{
-		/**
-		 * Returns a mask
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$width = $image->getWidth();
-			$height = $image->getHeight();
-			
-			$mask = WideImage_TrueColorImage::create($width, $height);
-			$mask->setTransparentColor(-1);
-			$mask->alphaBlending(false);
-			$mask->saveAlpha(false);
-			
-			for ($i = 0; $i <= 255; $i++)
-				$greyscale[$i] = ImageColorAllocate($mask->getHandle(), $i, $i, $i);
-			
-			imagefilledrectangle($mask->getHandle(), 0, 0, $width, $height, $greyscale[255]);
-			
-			$transparentColor = $image->getTransparentColor();
-			$alphaToGreyRatio = 255 / 127;
-			for ($x = 0; $x < $width; $x++)
-				for ($y = 0; $y < $height; $y++)
-				{
-					$color = $image->getColorAt($x, $y);
-					if ($color == $transparentColor)
-						$rgba['alpha'] = 127;
-					else
-						$rgba = $image->getColorRGB($color);
-					imagesetpixel($mask->getHandle(), $x, $y, $greyscale[255 - round($rgba['alpha'] * $alphaToGreyRatio)]);
-				}
-			return $mask;
-		}
-	}
+     **/
+
+    /**
+     * GetMask operation class.
+     */
+    class WideImage_Operation_GetMask
+    {
+        /**
+         * Returns a mask.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $width  = $image->getWidth();
+            $height = $image->getHeight();
+
+            $mask = WideImage_TrueColorImage::create($width, $height);
+            $mask->setTransparentColor(-1);
+            $mask->alphaBlending(false);
+            $mask->saveAlpha(false);
+
+            for ($i = 0; $i <= 255; ++$i) {
+                $greyscale[$i] = imagecolorallocate($mask->getHandle(), $i, $i, $i);
+            }
+
+            imagefilledrectangle($mask->getHandle(), 0, 0, $width, $height, $greyscale[255]);
+
+            $transparentColor = $image->getTransparentColor();
+            $alphaToGreyRatio = 255 / 127;
+            for ($x = 0; $x < $width; ++$x) {
+                for ($y = 0; $y < $height; ++$y) {
+                    $color = $image->getColorAt($x, $y);
+                    if ($color == $transparentColor) {
+                        $rgba['alpha'] = 127;
+                    } else {
+                        $rgba = $image->getColorRGB($color);
+                    }
+                    imagesetpixel($mask->getHandle(), $x, $y, $greyscale[255 - round($rgba['alpha'] * $alphaToGreyRatio)]);
+                }
+            }
+
+            return $mask;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php
index ee897119b6e..2edca3f3a01 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Merge.php
@@ -1,78 +1,60 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Merge operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Merge
-	{
-		/**
-		 * Returns a merged image
-		 *
-		 * @param WideImage_Image $base
-		 * @param WideImage_Image $overlay
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @param numeric $pct
-		 * @return WideImage_Image
-		 */
-		function execute($base, $overlay, $left, $top, $pct)
-		{
-			$x = WideImage_Coordinate::fix($left, $base->getWidth(), $overlay->getWidth());
-			$y = WideImage_Coordinate::fix($top, $base->getHeight(), $overlay->getHeight());
-			
-			$result = $base->asTrueColor();
-			$result->alphaBlending(true);
-			$result->saveAlpha(true);
-			
-			if ($pct <= 0)
-				return $result;
-			
-			if ($pct < 100)
-			{
-				if (!imagecopymerge(
-					$result->getHandle(), 
-					$overlay->getHandle(), 
-					$x, $y, 0, 0, 
-					$overlay->getWidth(), 
-					$overlay->getHeight(), 
-					$pct))
-				throw new WideImage_GDFunctionResultException("imagecopymerge() returned false");
-			}
-			else
-			{
-				if (!imagecopy(
-					$result->getHandle(), 
-					$overlay->getHandle(), 
-					$x, $y, 0, 0, 
-					$overlay->getWidth(), 
-					$overlay->getHeight()))
-				throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			}
-			
-			return $result;
-		}
-	}
+    /**
+     * Merge operation class.
+     */
+    class WideImage_Operation_Merge
+    {
+        /**
+         * Returns a merged image.
+         *
+         * @param WideImage_Image  $base
+         * @param WideImage_Image  $overlay
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         * @param numeric          $pct
+         *
+         * @return WideImage_Image
+         */
+        public function execute($base, $overlay, $left, $top, $pct)
+        {
+            $x = WideImage_Coordinate::fix($left, $base->getWidth(), $overlay->getWidth());
+            $y = WideImage_Coordinate::fix($top, $base->getHeight(), $overlay->getHeight());
+
+            $result = $base->asTrueColor();
+            $result->alphaBlending(true);
+            $result->saveAlpha(true);
+
+            if ($pct <= 0) {
+                return $result;
+            }
+
+            if ($pct < 100) {
+                if (!imagecopymerge(
+                    $result->getHandle(),
+                    $overlay->getHandle(),
+                    $x, $y, 0, 0,
+                    $overlay->getWidth(),
+                    $overlay->getHeight(),
+                    $pct)) {
+                    throw new WideImage_GDFunctionResultException('imagecopymerge() returned false');
+                }
+            } else {
+                if (!imagecopy(
+                    $result->getHandle(),
+                    $overlay->getHandle(),
+                    $x, $y, 0, 0,
+                    $overlay->getWidth(),
+                    $overlay->getHeight())) {
+                    throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+                }
+            }
+
+            return $result;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php
index ebefbfc4fd4..669af5449c9 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Mirror.php
@@ -1,55 +1,39 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Mirror operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Mirror
-	{
-		/**
-		 * Returns a mirrored image
-		 *
-		 * @param WideImage_Image $image
-		 * @return WideImage_Image
-		 */
-		function execute($image)
-		{
-			$new = $image->copy();
-			
-			$width = $image->getWidth();
-			$height = $image->getHeight();
-			
-			if ($new->isTransparent())
-				imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
-			
-			for ($x = 0; $x < $width; $x++)
-			{
-				if (!imagecopy($new->getHandle(), $image->getHandle(), $x, 0, $width - $x - 1, 0, 1, $height)) 
-					throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			}
-			return $new;
-		}
-	}
+    /**
+     * Mirror operation class.
+     */
+    class WideImage_Operation_Mirror
+    {
+        /**
+         * Returns a mirrored image.
+         *
+         * @param WideImage_Image $image
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image)
+        {
+            $new = $image->copy();
+
+            $width  = $image->getWidth();
+            $height = $image->getHeight();
+
+            if ($new->isTransparent()) {
+                imagefilledrectangle($new->getHandle(), 0, 0, $width, $height, $new->getTransparentColor());
+            }
+
+            for ($x = 0; $x < $width; ++$x) {
+                if (!imagecopy($new->getHandle(), $image->getHandle(), $x, 0, $width - $x - 1, 0, 1, $height)) {
+                    throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+                }
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php
index c495b7cd395..7655013d787 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Resize.php
@@ -1,157 +1,145 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * An Exception for when an invalid fit method is passed
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_InvalidFitMethodException extends WideImage_Exception {}
-	/**
-	 * An Exception for when an invalid resize dimensions are passed
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_InvalidResizeDimensionException extends WideImage_Exception {}
-	
-	/**
-	 * Resize operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Resize
-	{
-		/**
-		 * Prepares and corrects smart coordinates
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @param string $fit
-		 * @return array
-		 */
-		protected function prepareDimensions($img, $width, $height, $fit)
-		{
-			if ($width === null && $height === null)
-			{
-				$width = $img->getWidth();
-				$height = $img->getHeight();
-			}
-			
-			if ($width !== null)
-				$width = WideImage_Coordinate::fix($width, $img->getWidth());
-			
-			if ($height !== null)
-				$height = WideImage_Coordinate::fix($height, $img->getHeight());
-			
-			if ($width === null)
-				$width = floor($img->getWidth() * $height / $img->getHeight());
-			
-			if ($height === null)
-				$height = floor($img->getHeight() * $width / $img->getWidth());
-			
-			if ($width === 0 || $height === 0)
-				return array('width' => 0, 'height' => 0);
-			
-			if ($fit == null)
-				$fit = 'inside';
-			
-			$dim = array();
-			if ($fit == 'fill')
-			{
-				$dim['width'] = $width;
-				$dim['height'] = $height;
-			}
-			elseif ($fit == 'inside' || $fit == 'outside')
-			{
-				$rx = $img->getWidth() / $width;
-				$ry = $img->getHeight() / $height;
-				
-				if ($fit == 'inside')
-					$ratio = ($rx > $ry) ? $rx : $ry;
-				else
-					$ratio = ($rx < $ry) ? $rx : $ry;
-				
-				$dim['width'] = round($img->getWidth() / $ratio);
-				$dim['height'] = round($img->getHeight() / $ratio);
-			}
-			else
-				throw new WideImage_Operation_InvalidFitMethodException("{$fit} is not a valid resize-fit method.");
-			
-			return $dim;
-		}
-		
-		/**
-		 * Returns a resized image
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @param string $fit
-		 * @param string $scale
-		 * @return WideImage_Image
-		 */
-		function execute($img, $width, $height, $fit, $scale)
-		{
-			$dim = $this->prepareDimensions($img, $width, $height, $fit);
-			if (($scale === 'down' && ($dim['width'] >= $img->getWidth() && $dim['height'] >= $img->getHeight())) ||
-				($scale === 'up' && ($dim['width'] <= $img->getWidth() && $dim['height'] <= $img->getHeight())))
-				$dim = array('width' => $img->getWidth(), 'height' => $img->getHeight());
-			
-			if ($dim['width'] <= 0 || $dim['height'] <= 0)
-				throw new WideImage_Operation_InvalidResizeDimensionException("Both dimensions must be larger than 0.");
-			
-			if ($img->isTransparent() || $img instanceof WideImage_PaletteImage)
-			{
-				$new = WideImage_PaletteImage::create($dim['width'], $dim['height']);
-				$new->copyTransparencyFrom($img);
-				if (!imagecopyresized(
-						$new->getHandle(), 
-						$img->getHandle(), 
-						0, 0, 0, 0, 
-						$new->getWidth(), 
-						$new->getHeight(), 
-						$img->getWidth(), 
-						$img->getHeight()))
-					throw new WideImage_GDFunctionResultException("imagecopyresized() returned false");
-			}
-			else
-			{
-				$new = WideImage_TrueColorImage::create($dim['width'], $dim['height']);
-				$new->alphaBlending(false);
-				$new->saveAlpha(true);
-				if (!imagecopyresampled(
-						$new->getHandle(), 
-						$img->getHandle(), 
-						0, 0, 0, 0, 
-						$new->getWidth(), 
-						$new->getHeight(), 
-						$img->getWidth(), 
-						$img->getHeight()))
-					throw new WideImage_GDFunctionResultException("imagecopyresampled() returned false");
-				$new->alphaBlending(true);
-			}
-			return $new;
-		}
-	}
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+
+    /**
+     * An Exception for when an invalid fit method is passed.
+     */
+    class WideImage_Operation_InvalidFitMethodException extends WideImage_Exception
+    {
+    }
+    /**
+     * An Exception for when an invalid resize dimensions are passed.
+     */
+    class WideImage_Operation_InvalidResizeDimensionException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * Resize operation class.
+     */
+    class WideImage_Operation_Resize
+    {
+        /**
+         * Prepares and corrects smart coordinates.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         * @param string           $fit
+         *
+         * @return array
+         */
+        protected function prepareDimensions($img, $width, $height, $fit)
+        {
+            if ($width === null && $height === null) {
+                $width  = $img->getWidth();
+                $height = $img->getHeight();
+            }
+
+            if ($width !== null) {
+                $width = WideImage_Coordinate::fix($width, $img->getWidth());
+            }
+
+            if ($height !== null) {
+                $height = WideImage_Coordinate::fix($height, $img->getHeight());
+            }
+
+            if ($width === null) {
+                $width = floor($img->getWidth() * $height / $img->getHeight());
+            }
+
+            if ($height === null) {
+                $height = floor($img->getHeight() * $width / $img->getWidth());
+            }
+
+            if ($width === 0 || $height === 0) {
+                return ['width' => 0, 'height' => 0];
+            }
+
+            if ($fit == null) {
+                $fit = 'inside';
+            }
+
+            $dim = [];
+            if ($fit == 'fill') {
+                $dim['width']  = $width;
+                $dim['height'] = $height;
+            } elseif ($fit == 'inside' || $fit == 'outside') {
+                $rx = $img->getWidth() / $width;
+                $ry = $img->getHeight() / $height;
+
+                if ($fit == 'inside') {
+                    $ratio = ($rx > $ry) ? $rx : $ry;
+                } else {
+                    $ratio = ($rx < $ry) ? $rx : $ry;
+                }
+
+                $dim['width']  = round($img->getWidth() / $ratio);
+                $dim['height'] = round($img->getHeight() / $ratio);
+            } else {
+                throw new WideImage_Operation_InvalidFitMethodException("{$fit} is not a valid resize-fit method.");
+            }
+
+            return $dim;
+        }
+
+        /**
+         * Returns a resized image.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         * @param string           $fit
+         * @param string           $scale
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $width, $height, $fit, $scale)
+        {
+            $dim = $this->prepareDimensions($img, $width, $height, $fit);
+            if (($scale === 'down' && ($dim['width'] >= $img->getWidth() && $dim['height'] >= $img->getHeight())) ||
+                ($scale === 'up' && ($dim['width'] <= $img->getWidth() && $dim['height'] <= $img->getHeight()))) {
+                $dim = ['width' => $img->getWidth(), 'height' => $img->getHeight()];
+            }
+
+            if ($dim['width'] <= 0 || $dim['height'] <= 0) {
+                throw new WideImage_Operation_InvalidResizeDimensionException('Both dimensions must be larger than 0.');
+            }
+
+            if ($img->isTransparent() || $img instanceof WideImage_PaletteImage) {
+                $new = WideImage_PaletteImage::create($dim['width'], $dim['height']);
+                $new->copyTransparencyFrom($img);
+                if (!imagecopyresized(
+                        $new->getHandle(),
+                        $img->getHandle(),
+                        0, 0, 0, 0,
+                        $new->getWidth(),
+                        $new->getHeight(),
+                        $img->getWidth(),
+                        $img->getHeight())) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresized() returned false');
+                }
+            } else {
+                $new = WideImage_TrueColorImage::create($dim['width'], $dim['height']);
+                $new->alphaBlending(false);
+                $new->saveAlpha(true);
+                if (!imagecopyresampled(
+                        $new->getHandle(),
+                        $img->getHandle(),
+                        0, 0, 0, 0,
+                        $new->getWidth(),
+                        $new->getHeight(),
+                        $img->getWidth(),
+                        $img->getHeight())) {
+                    throw new WideImage_GDFunctionResultException('imagecopyresampled() returned false');
+                }
+                $new->alphaBlending(true);
+            }
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
index 8262b15ae33..7eba27d1de2 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
@@ -1,107 +1,85 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ResizeCanvas operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_ResizeCanvas
-	{
-		/**
-		 * Returns an image with a resized canvas
-		 * 
-		 * The image is filled with $color. Use $scale to determine, when to resize.
-		 *
-		 * @param WideImage_Image $img
-		 * @param smart_coordinate $width
-		 * @param smart_coordinate $height
-		 * @param smart_coordinate $left
-		 * @param smart_coordinate $top
-		 * @param int $color
-		 * @param string $scale 'up', 'down', 'any'
-		 * @param boolean $merge
-		 * @return WideImage_Image
-		 */
-		function execute($img, $width, $height, $left, $top, $color, $scale, $merge)
-		{
-			$new_width = WideImage_Coordinate::fix($width, $img->getWidth());
-			$new_height = WideImage_Coordinate::fix($height, $img->getHeight());
-			
-			if ($scale == 'down')
-			{
-				$new_width = min($new_width, $img->getWidth());
-				$new_height = min($new_height, $img->getHeight());
-			}
-			elseif ($scale == 'up')
-			{
-				$new_width = max($new_width, $img->getWidth());
-				$new_height = max($new_height, $img->getHeight());
-			}
-			
-			$new = WideImage::createTrueColorImage($new_width, $new_height);
-			if ($img->isTrueColor())
-			{
-				if ($color === null)
-					$color = $new->allocateColorAlpha(0, 0, 0, 127);
-			}
-			else
-			{
-				imagepalettecopy($new->getHandle(), $img->getHandle());
-				
-				if ($img->isTransparent())
-				{
-					$new->copyTransparencyFrom($img);
-					$tc_rgb = $img->getTransparentColorRGB();
-					$t_color = $new->allocateColorAlpha($tc_rgb);
-				}
-				
-				if ($color === null)
-				{
-					if ($img->isTransparent())
-						$color = $t_color;
-					else
-						$color = $new->allocateColorAlpha(255, 0, 127, 127);
-					
-					imagecolortransparent($new->getHandle(), $color);
-				}
-			}
-			$new->fill(0, 0, $color);
-			
-			
-			$x = WideImage_Coordinate::fix($left, $new->getWidth(), $img->getWidth());
-			$y = WideImage_Coordinate::fix($top, $new->getHeight(), $img->getHeight());
-			
-			// blending for truecolor images
-			if ($img->isTrueColor())
-				$new->alphaBlending($merge);
-			
-			// not-blending for palette images
-			if (!$merge && !$img->isTrueColor() && isset($t_color))
-				$new->getCanvas()->filledRectangle($x, $y, $x + $img->getWidth(), $y + $img->getHeight(), $t_color);
-			
-			$img->copyTo($new, $x, $y);
-			return $new;
-		}
-	}
+    /**
+     * ResizeCanvas operation class.
+     */
+    class WideImage_Operation_ResizeCanvas
+    {
+        /**
+         * Returns an image with a resized canvas.
+         *
+         * The image is filled with $color. Use $scale to determine, when to resize.
+         *
+         * @param WideImage_Image  $img
+         * @param smart_coordinate $width
+         * @param smart_coordinate $height
+         * @param smart_coordinate $left
+         * @param smart_coordinate $top
+         * @param int              $color
+         * @param string           $scale  'up', 'down', 'any'
+         * @param bool             $merge
+         *
+         * @return WideImage_Image
+         */
+        public function execute($img, $width, $height, $left, $top, $color, $scale, $merge)
+        {
+            $new_width  = WideImage_Coordinate::fix($width, $img->getWidth());
+            $new_height = WideImage_Coordinate::fix($height, $img->getHeight());
+
+            if ($scale == 'down') {
+                $new_width  = min($new_width, $img->getWidth());
+                $new_height = min($new_height, $img->getHeight());
+            } elseif ($scale == 'up') {
+                $new_width  = max($new_width, $img->getWidth());
+                $new_height = max($new_height, $img->getHeight());
+            }
+
+            $new = WideImage::createTrueColorImage($new_width, $new_height);
+            if ($img->isTrueColor()) {
+                if ($color === null) {
+                    $color = $new->allocateColorAlpha(0, 0, 0, 127);
+                }
+            } else {
+                imagepalettecopy($new->getHandle(), $img->getHandle());
+
+                if ($img->isTransparent()) {
+                    $new->copyTransparencyFrom($img);
+                    $tc_rgb  = $img->getTransparentColorRGB();
+                    $t_color = $new->allocateColorAlpha($tc_rgb);
+                }
+
+                if ($color === null) {
+                    if ($img->isTransparent()) {
+                        $color = $t_color;
+                    } else {
+                        $color = $new->allocateColorAlpha(255, 0, 127, 127);
+                    }
+
+                    imagecolortransparent($new->getHandle(), $color);
+                }
+            }
+            $new->fill(0, 0, $color);
+
+            $x = WideImage_Coordinate::fix($left, $new->getWidth(), $img->getWidth());
+            $y = WideImage_Coordinate::fix($top, $new->getHeight(), $img->getHeight());
+
+            // blending for truecolor images
+            if ($img->isTrueColor()) {
+                $new->alphaBlending($merge);
+            }
+
+            // not-blending for palette images
+            if (!$merge && !$img->isTrueColor() && isset($t_color)) {
+                $new->getCanvas()->filledRectangle($x, $y, $x + $img->getWidth(), $y + $img->getHeight(), $t_color);
+            }
+
+            $img->copyTo($new, $x, $y);
+
+            return $new;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php
index 690b04f521c..a90dc20e0f0 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Rotate.php
@@ -1,64 +1,47 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Rotate operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Rotate
-	{
-		/**
-		 * Returns rotated image
-		 *
-		 * @param WideImage_Image $image
-		 * @param numeric $angle
-		 * @param int $bgColor
-		 * @param bool $ignoreTransparent
-		 * @return WideImage_Image
-		 */
-		function execute($image, $angle, $bgColor, $ignoreTransparent)
-		{
-			$angle = -floatval($angle);
-			if ($angle < 0)
-				$angle = 360 + $angle;
-			$angle = $angle % 360;
-			
-			if ($angle == 0)
-				return $image->copy();
-			
-			$image = $image->asTrueColor();
-			
-			if ($bgColor === null)
-			{
-				$bgColor = $image->getTransparentColor();
-				if ($bgColor == -1)
-				{
-					$bgColor = $image->allocateColorAlpha(255, 255, 255, 127);
-					imagecolortransparent($image->getHandle(), $bgColor);
-				}
-			}
-			return new WideImage_TrueColorImage(imagerotate($image->getHandle(), $angle, $bgColor, $ignoreTransparent));
-		}
-	}
+    /**
+     * Rotate operation class.
+     */
+    class WideImage_Operation_Rotate
+    {
+        /**
+         * Returns rotated image.
+         *
+         * @param WideImage_Image $image
+         * @param numeric         $angle
+         * @param int             $bgColor
+         * @param bool            $ignoreTransparent
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $angle, $bgColor, $ignoreTransparent)
+        {
+            $angle = -floatval($angle);
+            if ($angle < 0) {
+                $angle = 360 + $angle;
+            }
+            $angle = $angle % 360;
+
+            if ($angle == 0) {
+                return $image->copy();
+            }
+
+            $image = $image->asTrueColor();
+
+            if ($bgColor === null) {
+                $bgColor = $image->getTransparentColor();
+                if ($bgColor == -1) {
+                    $bgColor = $image->allocateColorAlpha(255, 255, 255, 127);
+                    imagecolortransparent($image->getHandle(), $bgColor);
+                }
+            }
+
+            return new WideImage_TrueColorImage(imagerotate($image->getHandle(), $angle, $bgColor, $ignoreTransparent));
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php
index 22eb84991b6..29df5dbaba7 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/RoundCorners.php
@@ -1,114 +1,101 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * ApplyMask operation class
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_RoundCorners
-	{
-		/**
-		 * @param WideImage_Image $image
-		 * @param int $radius
-		 * @param int $color
-		 * @param int $smoothness
-		 * @return WideImage_Image
-		 */
-		function execute($image, $radius, $color, $smoothness, $corners)
-		{
-			if ($smoothness < 1)
-				$sample_ratio = 1;
-			elseif ($smoothness > 16)
-				$sample_ratio = 16;
-			else
-				$sample_ratio = $smoothness;
-			
-			$corner = WideImage::createTrueColorImage($radius * $sample_ratio, $radius * $sample_ratio);
-			if ($color === null)
-			{
-				imagepalettecopy($corner->getHandle(), $image->getHandle());
-				$bg_color = $corner->allocateColor(0, 0, 0);
-				
-				$corner->fill(0, 0, $bg_color);
-				$fg_color = $corner->allocateColor(255, 255, 255);
-				$corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
-				$corner = $corner->resize($radius, $radius);
-				
-				$result = $image->asTrueColor();
-				
-				$tc = $result->getTransparentColor();
-				if ($tc == -1)
-				{
-					$tc = $result->allocateColorAlpha(255, 255, 255, 127);
-					imagecolortransparent($result->getHandle(), $tc);
-					$result->setTransparentColor($tc);
-				}
-				
-				if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP)
-					$result = $result->applyMask($corner, -1, -1);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT)
-					$result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->applyMask($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				return $result;
-			}
-			else
-			{
-				$bg_color = $color;
-				
-				$corner->fill(0, 0, $bg_color);
-				$fg_color = $corner->allocateColorAlpha(127, 127, 127, 127);
-				$corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
-				$corner = $corner->resize($radius, $radius);
-				
-				$result = $image->copy();
-				if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP)
-					$result = $result->merge($corner, -1, -1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT)
-					$result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				$corner = $corner->rotate(90);
-				if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM)
-					$result = $result->merge($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
-				
-				return $result;
-			}
-		}
-	}
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+
+    /**
+     * ApplyMask operation class.
+     */
+    class WideImage_Operation_RoundCorners
+    {
+        /**
+         * @param WideImage_Image $image
+         * @param int             $radius
+         * @param int             $color
+         * @param int             $smoothness
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $radius, $color, $smoothness, $corners)
+        {
+            if ($smoothness < 1) {
+                $sample_ratio = 1;
+            } elseif ($smoothness > 16) {
+                $sample_ratio = 16;
+            } else {
+                $sample_ratio = $smoothness;
+            }
+
+            $corner = WideImage::createTrueColorImage($radius * $sample_ratio, $radius * $sample_ratio);
+            if ($color === null) {
+                imagepalettecopy($corner->getHandle(), $image->getHandle());
+                $bg_color = $corner->allocateColor(0, 0, 0);
+
+                $corner->fill(0, 0, $bg_color);
+                $fg_color = $corner->allocateColor(255, 255, 255);
+                $corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
+                $corner = $corner->resize($radius, $radius);
+
+                $result = $image->asTrueColor();
+
+                $tc = $result->getTransparentColor();
+                if ($tc == -1) {
+                    $tc = $result->allocateColorAlpha(255, 255, 255, 127);
+                    imagecolortransparent($result->getHandle(), $tc);
+                    $result->setTransparentColor($tc);
+                }
+
+                if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP) {
+                    $result = $result->applyMask($corner, -1, -1);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT) {
+                    $result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->applyMask($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->applyMask($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                return $result;
+            } else {
+                $bg_color = $color;
+
+                $corner->fill(0, 0, $bg_color);
+                $fg_color = $corner->allocateColorAlpha(127, 127, 127, 127);
+                $corner->getCanvas()->filledEllipse($radius * $sample_ratio, $radius * $sample_ratio, $radius * 2 * $sample_ratio, $radius * 2 * $sample_ratio, $fg_color);
+                $corner = $corner->resize($radius, $radius);
+
+                $result = $image->copy();
+                if ($corners & WideImage::SIDE_TOP_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_TOP) {
+                    $result = $result->merge($corner, -1, -1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_TOP_RIGHT || $corners & WideImage::SIDE_TOP || $corners & WideImage::SIDE_RIGHT) {
+                    $result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, -1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_RIGHT || $corners & WideImage::SIDE_RIGHT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->merge($corner, $result->getWidth() - $corner->getWidth() + 1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                $corner = $corner->rotate(90);
+                if ($corners & WideImage::SIDE_BOTTOM_LEFT || $corners & WideImage::SIDE_LEFT || $corners & WideImage::SIDE_BOTTOM) {
+                    $result = $result->merge($corner, -1, $result->getHeight() - $corner->getHeight() + 1, 100);
+                }
+
+                return $result;
+            }
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
index 4c5087e390f..12c28c3726c 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
@@ -1,135 +1,133 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
 
-    * @package Internal/Operations
-  **/
-	
-	/**
-	 * Unsharp filter
-	 * 
-	 * This filter was taken from http://vikjavev.no/computing/ump.php,
-	 * the original author Torstein Hønsi. Adapted to fit better within
-	 * the Wideimage package.
-	 * 
-	 * @package Internal/Operations
-	 */
-	class WideImage_Operation_Unsharp {
-		/**
-		 * Returns sharpened image
-		 *
-		 * @param WideImage_Image $image
-		 * @param float $amount
-		 * @param int $radius
-		 * @param float $threshold
-		 * @return WideImage_Image
-		 */
-		function execute($image, $amount, $radius, $threshold) {
-			
-			// Attempt to calibrate the parameters to Photoshop:
-			if ($amount > 500)    $amount = 500;
-			$amount = $amount * 0.016;
-			if ($radius > 50)    $radius = 50;
-			$radius = $radius * 2;
-			if ($threshold > 255)    $threshold = 255;
-			
-			$radius = abs(round($radius));     // Only integers make sense.
-			if ($radius == 0) {
-				return $image;
-			}
-					
-			// Gaussian blur matrix
-	
-			$matrix = array(
-				array(1, 2, 1),
-				array(2, 4, 2),
-				array(1, 2, 1)
-			);
-			
-			$blurred = $image->applyConvolution($matrix, 16, 0);
-			
-			if($threshold > 0) {
-				// Calculate the difference between the blurred pixels and the original
-				// and set the pixels
-				for ($x = 0; $x < $image->getWidth(); $x++) {
-					for ($y = 0; $y < $image->getHeight(); $y++) {
-						$rgbOrig = $image->getRGBAt($x, $y);
-						$rOrig = $rgbOrig["red"];
-						$gOrig = $rgbOrig["green"];
-						$bOrig = $rgbOrig["blue"];
-						 
-						$rgbBlur = $blurred->getRGBAt($x, $y);
-						$rBlur = $rgbBlur["red"];
-						$gBlur = $rgbBlur["green"];
-						$bBlur = $rgbBlur["blue"];
-						
-						// When the masked pixels differ less from the original
-						// than the threshold specifies, they are set to their original value.
-						$rNew = (abs($rOrig - $rBlur) >= $threshold)  
-							? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig))  
-							: $rOrig;
-						$gNew = (abs($gOrig - $gBlur) >= $threshold)  
-							? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig))  
-							: $gOrig;
-						$bNew = (abs($bOrig - $bBlur) >= $threshold)  
-							? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig))  
-							: $bOrig;
-						$rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
-							
-						if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
-							$image->setRGBAt($x, $y, $rgbNew);
-						}
-					}
-				}
-			}
-			else {
-				$w = $image->getWidth();
-				$h = $image->getHeight();
-				for ($x = 0; $x < $w; $x++) {
-					for ($y = 0; $y < $h; $y++) {
-						$rgbOrig = $image->getRGBAt($x, $y);
-						$rOrig = $rgbOrig["red"];
-						$gOrig = $rgbOrig["green"];
-						$bOrig = $rgbOrig["blue"];
-						
-						$rgbBlur = $blurred->getRGBAt($x, $y);
-						$rBlur = $rgbBlur["red"];
-						$gBlur = $rgbBlur["green"];
-						$bBlur = $rgbBlur["blue"];
-						
-						$rNew = ($amount * ($rOrig - $rBlur)) + $rOrig;
-							if($rNew>255){$rNew=255;}
-							elseif($rNew<0){$rNew=0;}
-						$gNew = ($amount * ($gOrig - $gBlur)) + $gOrig;
-							if($gNew>255){$gNew=255;}
-							elseif($gNew<0){$gNew=0;}
-						$bNew = ($amount * ($bOrig - $bBlur)) + $bOrig;
-							if($bNew>255){$bNew=255;}
-							elseif($bNew<0){$bNew=0;}
-						$rgbNew = array("red" => $rNew, "green" => $gNew, "blue" => $bNew, "alpha" => 0);
-						
-						$image->setRGBAt($x, $y, $rgbNew);
-					}
-				}
-			}
-			
-			return $image;
-		}
-	}
+    /**
+     * Unsharp filter.
+     *
+     * This filter was taken from http://vikjavev.no/computing/ump.php,
+     * the original author Torstein Hønsi. Adapted to fit better within
+     * the Wideimage package.
+     */
+    class WideImage_Operation_Unsharp
+    {
+        /**
+         * Returns sharpened image.
+         *
+         * @param WideImage_Image $image
+         * @param float           $amount
+         * @param int             $radius
+         * @param float           $threshold
+         *
+         * @return WideImage_Image
+         */
+        public function execute($image, $amount, $radius, $threshold)
+        {
+
+            // Attempt to calibrate the parameters to Photoshop:
+            if ($amount > 500) {
+                $amount = 500;
+            }
+            $amount = $amount * 0.016;
+            if ($radius > 50) {
+                $radius = 50;
+            }
+            $radius = $radius * 2;
+            if ($threshold > 255) {
+                $threshold = 255;
+            }
+
+            $radius = abs(round($radius));     // Only integers make sense.
+            if ($radius == 0) {
+                return $image;
+            }
+
+            // Gaussian blur matrix
+
+            $matrix = [
+                [1, 2, 1],
+                [2, 4, 2],
+                [1, 2, 1],
+            ];
+
+            $blurred = $image->applyConvolution($matrix, 16, 0);
+
+            if ($threshold > 0) {
+                // Calculate the difference between the blurred pixels and the original
+                // and set the pixels
+                for ($x = 0; $x < $image->getWidth(); ++$x) {
+                    for ($y = 0; $y < $image->getHeight(); ++$y) {
+                        $rgbOrig = $image->getRGBAt($x, $y);
+                        $rOrig   = $rgbOrig['red'];
+                        $gOrig   = $rgbOrig['green'];
+                        $bOrig   = $rgbOrig['blue'];
+
+                        $rgbBlur = $blurred->getRGBAt($x, $y);
+                        $rBlur   = $rgbBlur['red'];
+                        $gBlur   = $rgbBlur['green'];
+                        $bBlur   = $rgbBlur['blue'];
+
+                        // When the masked pixels differ less from the original
+                        // than the threshold specifies, they are set to their original value.
+                        $rNew = (abs($rOrig - $rBlur) >= $threshold)
+                            ? max(0, min(255, ($amount * ($rOrig - $rBlur)) + $rOrig))
+                            : $rOrig;
+                        $gNew = (abs($gOrig - $gBlur) >= $threshold)
+                            ? max(0, min(255, ($amount * ($gOrig - $gBlur)) + $gOrig))
+                            : $gOrig;
+                        $bNew = (abs($bOrig - $bBlur) >= $threshold)
+                            ? max(0, min(255, ($amount * ($bOrig - $bBlur)) + $bOrig))
+                            : $bOrig;
+                        $rgbNew = ['red' => $rNew, 'green' => $gNew, 'blue' => $bNew, 'alpha' => 0];
+
+                        if (($rOrig != $rNew) || ($gOrig != $gNew) || ($bOrig != $bNew)) {
+                            $image->setRGBAt($x, $y, $rgbNew);
+                        }
+                    }
+                }
+            } else {
+                $w = $image->getWidth();
+                $h = $image->getHeight();
+                for ($x = 0; $x < $w; ++$x) {
+                    for ($y = 0; $y < $h; ++$y) {
+                        $rgbOrig = $image->getRGBAt($x, $y);
+                        $rOrig   = $rgbOrig['red'];
+                        $gOrig   = $rgbOrig['green'];
+                        $bOrig   = $rgbOrig['blue'];
+
+                        $rgbBlur = $blurred->getRGBAt($x, $y);
+                        $rBlur   = $rgbBlur['red'];
+                        $gBlur   = $rgbBlur['green'];
+                        $bBlur   = $rgbBlur['blue'];
+
+                        $rNew = ($amount * ($rOrig - $rBlur)) + $rOrig;
+                        if ($rNew > 255) {
+                            $rNew = 255;
+                        } elseif ($rNew < 0) {
+                            $rNew = 0;
+                        }
+                        $gNew = ($amount * ($gOrig - $gBlur)) + $gOrig;
+                        if ($gNew > 255) {
+                            $gNew = 255;
+                        } elseif ($gNew < 0) {
+                            $gNew = 0;
+                        }
+                        $bNew = ($amount * ($bOrig - $bBlur)) + $bOrig;
+                        if ($bNew > 255) {
+                            $bNew = 255;
+                        } elseif ($bNew < 0) {
+                            $bNew = 0;
+                        }
+                        $rgbNew = ['red' => $rNew, 'green' => $gNew, 'blue' => $bNew, 'alpha' => 0];
+
+                        $image->setRGBAt($x, $y, $rgbNew);
+                    }
+                }
+            }
+
+            return $image;
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
index 3a5f36c4916..803728030d5 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
@@ -1,57 +1,36 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     **/
+    class WideImage_UnknownImageOperationException extends WideImage_Exception
+    {
+    }
 
-	* @package Internals
-  **/
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_UnknownImageOperationException extends WideImage_Exception {}
-	
-	/**
-	 * Operation factory
-	 * 
-	 * @package Internals
-	 **/
-	class WideImage_OperationFactory
-	{
-		static protected $cache = array();
-		
-		static function get($operationName)
-		{
-			$lcname = strtolower($operationName);
-			if (!isset(self::$cache[$lcname]))
-			{
-				$opClassName = "WideImage_Operation_" . ucfirst($operationName);
-				if (!class_exists($opClassName, false))
-				{
-					$fileName = WideImage::path() . 'Operation/' . ucfirst($operationName) . '.php';
-					if (file_exists($fileName))
-						require_once $fileName;
-					elseif (!class_exists($opClassName))
-						throw new WideImage_UnknownImageOperationException("Can't load '{$operationName}' operation.");
-				}
-				self::$cache[$lcname] = new $opClassName();
-			}
-			return self::$cache[$lcname];
-		}
-	}
+    /**
+     * Operation factory.
+     **/
+    class WideImage_OperationFactory
+    {
+        protected static $cache = [];
+
+        public static function get($operationName)
+        {
+            $lcname = strtolower($operationName);
+            if (!isset(self::$cache[$lcname])) {
+                $opClassName = 'WideImage_Operation_'.ucfirst($operationName);
+                if (!class_exists($opClassName, false)) {
+                    $fileName = WideImage::path().'Operation/'.ucfirst($operationName).'.php';
+                    if (file_exists($fileName)) {
+                        require_once $fileName;
+                    } elseif (!class_exists($opClassName)) {
+                        throw new WideImage_UnknownImageOperationException("Can't load '{$operationName}' operation.");
+                    }
+                }
+                self::$cache[$lcname] = new $opClassName();
+            }
+
+            return self::$cache[$lcname];
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
index c1e28715647..0ae8e250b12 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
@@ -1,136 +1,128 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
 
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	/**
-	 * @package WideImage
-	 */
-	class WideImage_PaletteImage extends WideImage_Image
-	{
-		/**
-		 * Create a palette image
-		 *
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_PaletteImage
-		 */
-		static function create($width, $height)
-		{
-			if ($width * $height <= 0 || $width < 0)
-				throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
-			
-			return new WideImage_PaletteImage(imagecreate($width, $height));
-		}
-		
-		function doCreate($width, $height)
-		{
-			return self::create($width, $height);
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#isTrueColor()
-		 */
-		function isTrueColor()
-		{
-			return false;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
-		 */
-		function asPalette($nColors = 255, $dither = null, $matchPalette = true)
-		{
-			return $this->copy();
-		}
-		
-		/**
-		 * Returns a copy of the image
-		 * 
-		 * @param $trueColor True if the new image should be truecolor
-		 * @return WideImage_Image
-		 */
-		protected function copyAsNew($trueColor = false)
-		{
-			$width = $this->getWidth();
-			$height = $this->getHeight();
-			
-			if ($trueColor)
-				$new = WideImage_TrueColorImage::create($width, $height);
-			else
-				$new = WideImage_PaletteImage::create($width, $height);
-			
-			// copy transparency of source to target
-			if ($this->isTransparent())
-			{
-				$rgb = $this->getTransparentColorRGB();
-				if (is_array($rgb))
-				{
-					$tci = $new->allocateColor($rgb['red'], $rgb['green'], $rgb['blue']);
-					$new->fill(0, 0, $tci);
-					$new->setTransparentColor($tci);
-				}
-			}
-			
-			imageCopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height);
-			return $new;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#asTrueColor()
-		 */
-		function asTrueColor()
-		{
-			$width = $this->getWidth();
-			$height = $this->getHeight();
-			$new = WideImage::createTrueColorImage($width, $height);
-			if ($this->isTransparent())
-				$new->copyTransparencyFrom($this);
-			if (!imageCopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height))
-				throw new WideImage_GDFunctionResultException("imagecopy() returned false");
-			return $new;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#getChannels()
-		 */
-		function getChannels()
-		{
-			$args = func_get_args();
-			if (count($args) == 1 && is_array($args[0]))
-				$args = $args[0];
-			return WideImage_OperationFactory::get('CopyChannelsPalette')->execute($this, $args);
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#copyNoAlpha()
-		 */
-		function copyNoAlpha()
-		{
-			return WideImage_Image::loadFromString($this->asString('png'));
-		}
-	}
+     **/
+    class WideImage_PaletteImage extends WideImage_Image
+    {
+        /**
+         * Create a palette image.
+         *
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_PaletteImage
+         */
+        public static function create($width, $height)
+        {
+            if ($width * $height <= 0 || $width < 0) {
+                throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
+            }
+
+            return new self(imagecreate($width, $height));
+        }
+
+        public function doCreate($width, $height)
+        {
+            return self::create($width, $height);
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#isTrueColor()
+         */
+        public function isTrueColor()
+        {
+            return false;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
+         */
+        public function asPalette($nColors = 255, $dither = null, $matchPalette = true)
+        {
+            return $this->copy();
+        }
+
+        /**
+         * Returns a copy of the image.
+         *
+         * @param $trueColor True if the new image should be truecolor
+         *
+         * @return WideImage_Image
+         */
+        protected function copyAsNew($trueColor = false)
+        {
+            $width  = $this->getWidth();
+            $height = $this->getHeight();
+
+            if ($trueColor) {
+                $new = WideImage_TrueColorImage::create($width, $height);
+            } else {
+                $new = self::create($width, $height);
+            }
+
+            // copy transparency of source to target
+            if ($this->isTransparent()) {
+                $rgb = $this->getTransparentColorRGB();
+                if (is_array($rgb)) {
+                    $tci = $new->allocateColor($rgb['red'], $rgb['green'], $rgb['blue']);
+                    $new->fill(0, 0, $tci);
+                    $new->setTransparentColor($tci);
+                }
+            }
+
+            imagecopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height);
+
+            return $new;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#asTrueColor()
+         */
+        public function asTrueColor()
+        {
+            $width  = $this->getWidth();
+            $height = $this->getHeight();
+            $new    = WideImage::createTrueColorImage($width, $height);
+            if ($this->isTransparent()) {
+                $new->copyTransparencyFrom($this);
+            }
+            if (!imagecopy($new->getHandle(), $this->handle, 0, 0, 0, 0, $width, $height)) {
+                throw new WideImage_GDFunctionResultException('imagecopy() returned false');
+            }
+
+            return $new;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#getChannels()
+         */
+        public function getChannels()
+        {
+            $args = func_get_args();
+            if (count($args) == 1 && is_array($args[0])) {
+                $args = $args[0];
+            }
+
+            return WideImage_OperationFactory::get('CopyChannelsPalette')->execute($this, $args);
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#copyNoAlpha()
+         */
+        public function copyNoAlpha()
+        {
+            return WideImage_Image::loadFromString($this->asString('png'));
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
index a4addcdfa73..d3a2034708a 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
@@ -1,218 +1,219 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  **/
-	
-	/**
-	 * A class for truecolor image objects
-	 * 
-	 * @package WideImage
-	 */
-	class WideImage_TrueColorImage extends WideImage_Image
-	{
-		/**
-		 * Creates the object
-		 *
-		 * @param resource $handle
-		 */
-		function __construct($handle)
-		{
-			parent::__construct($handle);
-			$this->alphaBlending(false);
-			$this->saveAlpha(true);
-		}
-		
-		/**
-		 * Factory method that creates a true-color image object
-		 *
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_TrueColorImage
-		 */
-		static function create($width, $height)
-		{
-			if ($width * $height <= 0 || $width < 0)
-				throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
-			
-			return new WideImage_TrueColorImage(imagecreatetruecolor($width, $height));
-		}
-		
-		function doCreate($width, $height)
-		{
-			return self::create($width, $height);
-		}
-		
-		function isTrueColor()
-		{
-			return true;
-		}
-		
-		/**
-		 * Sets alpha blending mode via imagealphablending()
-		 *
-		 * @param bool $mode
-		 * @return bool
-		 */
-		function alphaBlending($mode)
-		{
-			return imagealphablending($this->handle, $mode);
-		}
-		
-		/**
-		 * Toggle if alpha channel should be saved with the image via imagesavealpha()
-		 *
-		 * @param bool $on
-		 * @return bool
-		 */
-		function saveAlpha($on)
-		{
-			return imagesavealpha($this->handle, $on);
-		}
-		
-		/**
-		 * Allocates a color and returns its index
-		 * 
-		 * This method accepts either each component as an integer value,
-		 * or an associative array that holds the color's components in keys
-		 * 'red', 'green', 'blue', 'alpha'.
-		 *
-		 * @param mixed $R
-		 * @param int $G
-		 * @param int $B
-		 * @param int $A
-		 * @return int
-		 */
-		function allocateColorAlpha($R, $G = null, $B = null, $A = null)
-		{
-			if (is_array($R))
-				return imageColorAllocateAlpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imageColorAllocateAlpha($this->handle, $R, $G, $B, $A);
-		}
-		
-		/**
-		 * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
-		 */
-		function asPalette($nColors = 255, $dither = null, $matchPalette = true)
-		{
-			$nColors = intval($nColors);
-			if ($nColors < 1)
-				$nColors = 1;
-			elseif ($nColors > 255)
-				$nColors = 255;
-			
-			if ($dither === null)
-				$dither = $this->isTransparent();
-			
-			$temp = $this->copy();
-			imagetruecolortopalette($temp->handle, $dither, $nColors);
-			if ($matchPalette == true && function_exists('imagecolormatch'))
-				imagecolormatch($this->handle, $temp->handle);
-			
-			// The code below isn't working properly; it corrupts transparency on some palette->tc->palette conversions.
-			// Why is this code here?
-			/*
-			if ($this->isTransparent())
-			{
-				$trgb = $this->getTransparentColorRGB();
-				$tci = $temp->getClosestColor($trgb);
-				$temp->setTransparentColor($tci);
-			}
-			/**/
-			
-			$temp->releaseHandle();
-			return new WideImage_PaletteImage($temp->handle);
-		}
-		
-		/**
-		 * Returns the index of the color that best match the given color components
-		 *
-		 * This method accepts either each component as an integer value,
-		 * or an associative array that holds the color's components in keys
-		 * 'red', 'green', 'blue', 'alpha'.
-		 *
-		 * @param mixed $R Red component value or an associative array
-		 * @param int $G Green component
-		 * @param int $B Blue component
-		 * @param int $A Alpha component
-		 * @return int The color index
-		 */
-		function getClosestColorAlpha($R, $G = null, $B = null, $A = null)
-		{
-			if (is_array($R))
-				return imagecolorclosestalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imagecolorclosestalpha($this->handle, $R, $G, $B, $A);
-		}
-		
-		/**
-		 * Returns the index of the color that exactly match the given color components
-		 *
-		 * This method accepts either each component as an integer value,
-		 * or an associative array that holds the color's components in keys
-		 * 'red', 'green', 'blue', 'alpha'.
-		 *
-		 * @param mixed $R Red component value or an associative array
-		 * @param int $G Green component
-		 * @param int $B Blue component
-		 * @param int $A Alpha component
-		 * @return int The color index
-		 */
-		function getExactColorAlpha($R, $G = null, $B = null, $A = null)
-		{
-			if (is_array($R))
-				return imagecolorexactalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
-			else
-				return imagecolorexactalpha($this->handle, $R, $G, $B, $A);
-		}
-		
-		/**
-		 * @see WideImage_Image#getChannels()
-		 */
-		function getChannels()
-		{
-			$args = func_get_args();
-			if (count($args) == 1 && is_array($args[0]))
-				$args = $args[0];
-			return WideImage_OperationFactory::get('CopyChannelsTrueColor')->execute($this, $args);
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#copyNoAlpha()
-		 */
-		function copyNoAlpha()
-		{
-			$prev = $this->saveAlpha(false);
-			$result = WideImage_Image::loadFromString($this->asString('png'));
-			$this->saveAlpha($prev);
-			//$result->releaseHandle();
-			return $result;
-		}
-		
-		/**
-		 * (non-PHPdoc)
-		 * @see WideImage_Image#asTrueColor()
-		 */
-		function asTrueColor()
-		{
-			return $this->copy();
-		}
-	}
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+
+    /**
+     * A class for truecolor image objects.
+     */
+    class WideImage_TrueColorImage extends WideImage_Image
+    {
+        /**
+         * Creates the object.
+         *
+         * @param resource $handle
+         */
+        public function __construct($handle)
+        {
+            parent::__construct($handle);
+            $this->alphaBlending(false);
+            $this->saveAlpha(true);
+        }
+
+        /**
+         * Factory method that creates a true-color image object.
+         *
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public static function create($width, $height)
+        {
+            if ($width * $height <= 0 || $width < 0) {
+                throw new WideImage_InvalidImageDimensionException("Can't create an image with dimensions [$width, $height].");
+            }
+
+            return new self(imagecreatetruecolor($width, $height));
+        }
+
+        public function doCreate($width, $height)
+        {
+            return self::create($width, $height);
+        }
+
+        public function isTrueColor()
+        {
+            return true;
+        }
+
+        /**
+         * Sets alpha blending mode via imagealphablending().
+         *
+         * @param bool $mode
+         *
+         * @return bool
+         */
+        public function alphaBlending($mode)
+        {
+            return imagealphablending($this->handle, $mode);
+        }
+
+        /**
+         * Toggle if alpha channel should be saved with the image via imagesavealpha().
+         *
+         * @param bool $on
+         *
+         * @return bool
+         */
+        public function saveAlpha($on)
+        {
+            return imagesavealpha($this->handle, $on);
+        }
+
+        /**
+         * Allocates a color and returns its index.
+         *
+         * This method accepts either each component as an integer value,
+         * or an associative array that holds the color's components in keys
+         * 'red', 'green', 'blue', 'alpha'.
+         *
+         * @param mixed $R
+         * @param int   $G
+         * @param int   $B
+         * @param int   $A
+         *
+         * @return int
+         */
+        public function allocateColorAlpha($R, $G = null, $B = null, $A = null)
+        {
+            if (is_array($R)) {
+                return imagecolorallocatealpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+            } else {
+                return imagecolorallocatealpha($this->handle, $R, $G, $B, $A);
+            }
+        }
+
+        /**
+         * @see WideImage_Image#asPalette($nColors, $dither, $matchPalette)
+         */
+        public function asPalette($nColors = 255, $dither = null, $matchPalette = true)
+        {
+            $nColors = intval($nColors);
+            if ($nColors < 1) {
+                $nColors = 1;
+            } elseif ($nColors > 255) {
+                $nColors = 255;
+            }
+
+            if ($dither === null) {
+                $dither = $this->isTransparent();
+            }
+
+            $temp = $this->copy();
+            imagetruecolortopalette($temp->handle, $dither, $nColors);
+            if ($matchPalette == true && function_exists('imagecolormatch')) {
+                imagecolormatch($this->handle, $temp->handle);
+            }
+
+            // The code below isn't working properly; it corrupts transparency on some palette->tc->palette conversions.
+            // Why is this code here?
+            /*
+            if ($this->isTransparent())
+            {
+                $trgb = $this->getTransparentColorRGB();
+                $tci = $temp->getClosestColor($trgb);
+                $temp->setTransparentColor($tci);
+            }
+            /**/
+
+            $temp->releaseHandle();
+
+            return new WideImage_PaletteImage($temp->handle);
+        }
+
+        /**
+         * Returns the index of the color that best match the given color components.
+         *
+         * This method accepts either each component as an integer value,
+         * or an associative array that holds the color's components in keys
+         * 'red', 'green', 'blue', 'alpha'.
+         *
+         * @param mixed $R Red component value or an associative array
+         * @param int   $G Green component
+         * @param int   $B Blue component
+         * @param int   $A Alpha component
+         *
+         * @return int The color index
+         */
+        public function getClosestColorAlpha($R, $G = null, $B = null, $A = null)
+        {
+            if (is_array($R)) {
+                return imagecolorclosestalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+            } else {
+                return imagecolorclosestalpha($this->handle, $R, $G, $B, $A);
+            }
+        }
+
+        /**
+         * Returns the index of the color that exactly match the given color components.
+         *
+         * This method accepts either each component as an integer value,
+         * or an associative array that holds the color's components in keys
+         * 'red', 'green', 'blue', 'alpha'.
+         *
+         * @param mixed $R Red component value or an associative array
+         * @param int   $G Green component
+         * @param int   $B Blue component
+         * @param int   $A Alpha component
+         *
+         * @return int The color index
+         */
+        public function getExactColorAlpha($R, $G = null, $B = null, $A = null)
+        {
+            if (is_array($R)) {
+                return imagecolorexactalpha($this->handle, $R['red'], $R['green'], $R['blue'], $R['alpha']);
+            } else {
+                return imagecolorexactalpha($this->handle, $R, $G, $B, $A);
+            }
+        }
+
+        /**
+         * @see WideImage_Image#getChannels()
+         */
+        public function getChannels()
+        {
+            $args = func_get_args();
+            if (count($args) == 1 && is_array($args[0])) {
+                $args = $args[0];
+            }
+
+            return WideImage_OperationFactory::get('CopyChannelsTrueColor')->execute($this, $args);
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#copyNoAlpha()
+         */
+        public function copyNoAlpha()
+        {
+            $prev   = $this->saveAlpha(false);
+            $result = WideImage_Image::loadFromString($this->asString('png'));
+            $this->saveAlpha($prev);
+            //$result->releaseHandle();
+            return $result;
+        }
+
+        /**
+         * (non-PHPdoc).
+         *
+         * @see WideImage_Image#asTrueColor()
+         */
+        public function asTrueColor()
+        {
+            return $this->copy();
+        }
+    }
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/WideImage.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
index fd5419f5d2f..5d19e40498d 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
@@ -1,377 +1,371 @@
 <?php
-	/**
- * @author Gasper Kozak
- * @copyright 2007-2011
-
-    This file is part of WideImage.
-		
-    WideImage is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-		
-    WideImage is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-		
-    You should have received a copy of the GNU Lesser General Public License
-    along with WideImage; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-    
-    * @package WideImage
-  **/
-	
-	require_once WideImage::path() . 'Exception.php';
-	
-	require_once WideImage::path() . 'Image.php';
-	require_once WideImage::path() . 'TrueColorImage.php';
-	require_once WideImage::path() . 'PaletteImage.php';
-	
-	require_once WideImage::path() . 'Coordinate.php';
-	require_once WideImage::path() . 'Canvas.php';
-	require_once WideImage::path() . 'MapperFactory.php';
-	require_once WideImage::path() . 'OperationFactory.php';
-	
-	require_once WideImage::path() . 'Font/TTF.php';
-	require_once WideImage::path() . 'Font/GDF.php';
-	require_once WideImage::path() . 'Font/PS.php';
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidImageHandleException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 */
-	class WideImage_InvalidImageSourceException extends WideImage_Exception {}
-	
-	/**
-	 * @package Exceptions
-	 * 
-	 * Class for invalid GD function calls result (for example those that return bool)
-	 */
-	class WideImage_GDFunctionResultException extends WideImage_Exception {}
-	
-	/**
-	 * The gateway class for loading images and core library functions
-	 *
-	 * @package WideImage
-	 */
-	class WideImage
-	{
-		const SIDE_TOP_LEFT = 1;
-		const SIDE_TOP = 2;
-		const SIDE_TOP_RIGHT = 4;
-		const SIDE_RIGHT = 8;
-		const SIDE_BOTTOM_RIGHT = 16;
-		const SIDE_BOTTOM = 32;
-		const SIDE_BOTTOM_LEFT = 64;
-		const SIDE_LEFT = 128;
-		const SIDE_ALL = 255;
-		
-		/**
-		 * @var string Path to the library base directory
-		 */
-		protected static $path = null;
-		
-		/**
-		 * Returns the library version
-		 * @return string The library version
-		 */
-		static function version()
-		{
-			return '11.02.19';
-		}
-		
-		/**
-		 * Returns the path to the library
-		 * @return string
-		 */
-		static function path()
-		{
-			if (self::$path === null)
-				self::$path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
-			return self::$path;
-		}
-		
-		/**
-		 * Checks whether the gd library is loaded, and throws an exception otherwise
-		 */
-		static function checkGD()
-		{
-			if (!extension_loaded('gd'))
-				throw new WideImage_Exception("WideImage requires the GD extension, but it's apparently not loaded.");
-		}
-		
-		/**
-		 * Registers a custom mapper for image loading and saving
-		 * 
-		 * Example:
-		 * <code>
-		 * 	WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
-		 * </code>
-		 * 
-		 * @param string $mapper_class_name
-		 * @param string $mime_type
-		 * @param string $extension
-		 */
-		static function registerCustomMapper($mapper_class_name, $mime_type, $extension)
-		{
-			WideImage_MapperFactory::registerMapper($mapper_class_name, $mime_type, strtoupper($extension));
-		}
-		
-		/**
-		 * Loads an image from a file, URL, HTML input file field, binary string, or a valid image handle.
-		 * The image format is auto-detected. 
-		 * 
-		 * Currently supported formats: PNG, GIF, JPG, BMP, TGA, GD, GD2.
-		 * 
-		 * This function analyzes the input and decides whether to use WideImage::loadFromHandle(),
-		 * WideImage::loadFromFile(), WideImage::loadFromUpload() or WideImage::loadFromString(),
-		 * all of which you can also call directly to spare WideImage some guessing.
-		 * 
-		 * Arrays are supported for upload fields; it returns an array of loaded images. 
-		 * To load only a single image from an array field, use WideImage::loadFromUpload('img', $i), 
-		 * where $i is the index of the image you want to load.
-		 * 
-		 * <code>
-		 * $img = WideImage::load('http://url/image.png'); // image URL
-		 * $img = WideImage::load('/path/to/image.png'); // local file path
-		 * $img = WideImage::load('img'); // upload field name
-		 * $img = WideImage::load(imagecreatetruecolor(10, 10)); // a GD resource
-		 * $img = WideImage::load($image_data); // binary string containing image data
-		 * </code>
-		 * 
-		 * @param mixed $source File name, url, HTML file input field name, binary string, or a GD image resource
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function load($source)
-		{
-			$predictedSourceType = '';
-			
-			if ($source == '')
-				$predictedSourceType = 'String';
-			
-			// Creating image via a valid resource
-			if (!$predictedSourceType && self::isValidImageHandle($source))
-				$predictedSourceType = 'Handle';
-			
-			// Check for binary string
-			if (!$predictedSourceType)
-			{
-				// search first $binLength bytes (at a maximum) for ord<32 characters (binary image data)
-				$binLength = 64;
-				$sourceLength = strlen($source);
-				$maxlen = ($sourceLength > $binLength) ? $binLength : $sourceLength;
-				for ($i = 0; $i < $maxlen; $i++)
-					if (ord($source[$i]) < 32)
-					{
-						$predictedSourceType = 'String';
-						break;
-					}
-			}
-			
-			// Uploaded image (array uploads not supported)
-			if (isset($_FILES[$source]) && isset($_FILES[$source]['tmp_name']))
-				$predictedSourceType = 'Upload';
-			
-			// Otherwise, must be a file or an URL
-			if (!$predictedSourceType)
-				$predictedSourceType = 'File';
-			
-			return call_user_func(array('WideImage', 'loadFrom' . $predictedSourceType), $source);
-		}
-		
-		/**
-		 * Create and load an image from a file or URL. The image format is auto-detected.
-		 * 
-		 * @param string $uri File or url
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function loadFromFile($uri)
-		{
-			$data = file_get_contents($uri);
-			$handle = @imagecreatefromstring($data);
-			if (!self::isValidImageHandle($handle))
-			{
-				try
-				{
-					// try to find a mapper first
-					$mapper = WideImage_MapperFactory::selectMapper($uri);
-					if ($mapper)
-						$handle = $mapper->load($uri);
-				}
-				catch (WideImage_UnsupportedFormatException $e)
-				{
-					// mapper not found
-				}
-				
-				// try all custom mappers
-				if (!self::isValidImageHandle($handle))
-				{
-					$custom_mappers = WideImage_MapperFactory::getCustomMappers();
-					foreach ($custom_mappers as $mime_type => $mapper_class)
-					{
-						$mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
-						$handle = $mapper->loadFromString($data);
-						if (self::isValidImageHandle($handle))
-							break;
-					}
-				}
-			}
-			
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("File '{$uri}' appears to be an invalid image source.");
-			
-			return self::loadFromHandle($handle);
-		}
-		
-		/**
-		 * Create and load an image from a string. Format is auto-detected.
-		 * 
-		 * @param string $string Binary data, i.e. from BLOB field in the database
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function loadFromString($string)
-		{
-			if (strlen($string) < 128)
-				throw new WideImage_InvalidImageSourceException("String doesn't contain image data.");
-			
-			$handle = @imagecreatefromstring($string);
-			if (!self::isValidImageHandle($handle))
-			{
-				$custom_mappers = WideImage_MapperFactory::getCustomMappers();
-				foreach ($custom_mappers as $mime_type => $mapper_class)
-				{
-					$mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
-					$handle = $mapper->loadFromString($string);
-					if (self::isValidImageHandle($handle))
-						break;
-				}
-			}
-			
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("String doesn't contain valid image data.");
-			
-			return self::loadFromHandle($handle);
-		}
-		
-		/**
-		 * Create and load an image from an image handle.
-		 * 
-		 * <b>Note:</b> the resulting image object takes ownership of the passed 
-		 * handle. When the newly-created image object is destroyed, the handle is 
-		 * destroyed too, so it's not a valid image handle anymore. In order to 
-		 * preserve the handle for use after object destruction, you have to call 
-		 * WideImage_Image::releaseHandle() on the created image instance prior to its
-		 * destruction.
-		 * 
-		 * <code>
-		 * $handle = imagecreatefrompng('file.png');
-		 * $image = WideImage::loadFromHandle($handle);
-		 * </code>
-		 * 
-		 * @param resource $handle A valid GD image resource
-		 * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
-		 */
-		static function loadFromHandle($handle)
-		{
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageSourceException("Handle is not a valid GD image resource.");
-			
-			if (imageistruecolor($handle))
-				return new WideImage_TrueColorImage($handle);
-			else
-				return new WideImage_PaletteImage($handle);
-		}
-		
-		/**
-		 * This method loads a file from the $_FILES array. The image format is auto-detected.
-		 * 
-		 * You only have to pass the field name as the parameter. For array fields, this function will
-		 * return an array of image objects, unless you specify the $index parameter, which will
-		 * load the desired image.
-		 * 
-		 * @param $field_name Name of the key in $_FILES array
-		 * @param int $index The index of the file to load (if the input field is an array)
-		 * @return WideImage_Image The loaded image
-		 */
-		static function loadFromUpload($field_name, $index = null)
-		{
-			if (!array_key_exists($field_name, $_FILES))
-				throw new WideImage_InvalidImageSourceException("Upload field '{$field_name}' doesn't exist.");
-			
-			if (is_array($_FILES[$field_name]['tmp_name']))
-			{
-				if (isset($_FILES[$field_name]['tmp_name'][$index]))
-					$filename = $_FILES[$field_name]['tmp_name'][$index];
-				else
-				{
-					$result = array();
-					foreach ($_FILES[$field_name]['tmp_name'] as $idx => $tmp_name)
-						$result[$idx] = self::loadFromFile($tmp_name);
-					return $result;
-				}
-			}
-			else
-				$filename = $_FILES[$field_name]['tmp_name'];
-			
-			if (!file_exists($filename))
-				throw new WideImage_InvalidImageSourceException("Uploaded file doesn't exist.");
-			return self::loadFromFile($filename);
-		}
-		
-		/**
-		 * Factory method for creating a palette image
-		 * 
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_PaletteImage
-		 */
-		static function createPaletteImage($width, $height)
-		{
-			return WideImage_PaletteImage::create($width, $height);
-		}
-		
-		/**
-		 * Factory method for creating a true-color image
-		 * 
-		 * @param int $width
-		 * @param int $height
-		 * @return WideImage_TrueColorImage
-		 */
-		static function createTrueColorImage($width, $height)
-		{
-			return WideImage_TrueColorImage::create($width, $height);
-		}
-		
-		/**
-		 * Check whether the given handle is a valid GD resource
-		 * 
-		 * @param mixed $handle The variable to check
-		 * @return bool
-		 */
-		static function isValidImageHandle($handle)
-		{
-			return (is_resource($handle) && get_resource_type($handle) == 'gd');
-		}
-		
-		/**
-		 * Throws exception if the handle isn't a valid GD resource
-		 * 
-		 * @param mixed $handle The variable to check
-		 */
-		static function assertValidImageHandle($handle)
-		{
-			if (!self::isValidImageHandle($handle))
-				throw new WideImage_InvalidImageHandleException("{$handle} is not a valid image handle.");
-		}
-	}
-	
-	WideImage::checkGD();
-	
-	WideImage::registerCustomMapper('WideImage_Mapper_BMP', 'image/bmp', 'bmp');
-	WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
-	
\ No newline at end of file
+    /**
+     * @author Gasper Kozak
+     * @copyright 2007-2011
+
+     **/
+    require_once WideImage::path().'Exception.php';
+
+    require_once WideImage::path().'Image.php';
+    require_once WideImage::path().'TrueColorImage.php';
+    require_once WideImage::path().'PaletteImage.php';
+
+    require_once WideImage::path().'Coordinate.php';
+    require_once WideImage::path().'Canvas.php';
+    require_once WideImage::path().'MapperFactory.php';
+    require_once WideImage::path().'OperationFactory.php';
+
+    require_once WideImage::path().'Font/TTF.php';
+    require_once WideImage::path().'Font/GDF.php';
+    require_once WideImage::path().'Font/PS.php';
+
+    class WideImage_InvalidImageHandleException extends WideImage_Exception
+    {
+    }
+
+    class WideImage_InvalidImageSourceException extends WideImage_Exception
+    {
+    }
+
+    class WideImage_GDFunctionResultException extends WideImage_Exception
+    {
+    }
+
+    /**
+     * The gateway class for loading images and core library functions.
+     */
+    class WideImage
+    {
+        const SIDE_TOP_LEFT     = 1;
+        const SIDE_TOP          = 2;
+        const SIDE_TOP_RIGHT    = 4;
+        const SIDE_RIGHT        = 8;
+        const SIDE_BOTTOM_RIGHT = 16;
+        const SIDE_BOTTOM       = 32;
+        const SIDE_BOTTOM_LEFT  = 64;
+        const SIDE_LEFT         = 128;
+        const SIDE_ALL          = 255;
+
+        /**
+         * @var string Path to the library base directory
+         */
+        protected static $path = null;
+
+        /**
+         * Returns the library version.
+         *
+         * @return string The library version
+         */
+        public static function version()
+        {
+            return '11.02.19';
+        }
+
+        /**
+         * Returns the path to the library.
+         *
+         * @return string
+         */
+        public static function path()
+        {
+            if (self::$path === null) {
+                self::$path = dirname(__FILE__).DIRECTORY_SEPARATOR;
+            }
+
+            return self::$path;
+        }
+
+        /**
+         * Checks whether the gd library is loaded, and throws an exception otherwise.
+         */
+        public static function checkGD()
+        {
+            if (!extension_loaded('gd')) {
+                throw new WideImage_Exception("WideImage requires the GD extension, but it's apparently not loaded.");
+            }
+        }
+
+        /**
+         * Registers a custom mapper for image loading and saving.
+         *
+         * Example:
+         * <code>
+         * 	WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
+         * </code>
+         *
+         * @param string $mapper_class_name
+         * @param string $mime_type
+         * @param string $extension
+         */
+        public static function registerCustomMapper($mapper_class_name, $mime_type, $extension)
+        {
+            WideImage_MapperFactory::registerMapper($mapper_class_name, $mime_type, strtoupper($extension));
+        }
+
+        /**
+         * Loads an image from a file, URL, HTML input file field, binary string, or a valid image handle.
+         * The image format is auto-detected.
+         *
+         * Currently supported formats: PNG, GIF, JPG, BMP, TGA, GD, GD2.
+         *
+         * This function analyzes the input and decides whether to use WideImage::loadFromHandle(),
+         * WideImage::loadFromFile(), WideImage::loadFromUpload() or WideImage::loadFromString(),
+         * all of which you can also call directly to spare WideImage some guessing.
+         *
+         * Arrays are supported for upload fields; it returns an array of loaded images.
+         * To load only a single image from an array field, use WideImage::loadFromUpload('img', $i),
+         * where $i is the index of the image you want to load.
+         *
+         * <code>
+         * $img = WideImage::load('http://url/image.png'); // image URL
+         * $img = WideImage::load('/path/to/image.png'); // local file path
+         * $img = WideImage::load('img'); // upload field name
+         * $img = WideImage::load(imagecreatetruecolor(10, 10)); // a GD resource
+         * $img = WideImage::load($image_data); // binary string containing image data
+         * </code>
+         *
+         * @param mixed $source File name, url, HTML file input field name, binary string, or a GD image resource
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function load($source)
+        {
+            $predictedSourceType = '';
+
+            if ($source == '') {
+                $predictedSourceType = 'String';
+            }
+
+            // Creating image via a valid resource
+            if (!$predictedSourceType && self::isValidImageHandle($source)) {
+                $predictedSourceType = 'Handle';
+            }
+
+            // Check for binary string
+            if (!$predictedSourceType) {
+                // search first $binLength bytes (at a maximum) for ord<32 characters (binary image data)
+                $binLength    = 64;
+                $sourceLength = strlen($source);
+                $maxlen       = ($sourceLength > $binLength) ? $binLength : $sourceLength;
+                for ($i = 0; $i < $maxlen; ++$i) {
+                    if (ord($source[$i]) < 32) {
+                        $predictedSourceType = 'String';
+                        break;
+                    }
+                }
+            }
+
+            // Uploaded image (array uploads not supported)
+            if (isset($_FILES[$source]) && isset($_FILES[$source]['tmp_name'])) {
+                $predictedSourceType = 'Upload';
+            }
+
+            // Otherwise, must be a file or an URL
+            if (!$predictedSourceType) {
+                $predictedSourceType = 'File';
+            }
+
+            return call_user_func(['WideImage', 'loadFrom'.$predictedSourceType], $source);
+        }
+
+        /**
+         * Create and load an image from a file or URL. The image format is auto-detected.
+         *
+         * @param string $uri File or url
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function loadFromFile($uri)
+        {
+            $data   = file_get_contents($uri);
+            $handle = @imagecreatefromstring($data);
+            if (!self::isValidImageHandle($handle)) {
+                try {
+                    // try to find a mapper first
+                    $mapper = WideImage_MapperFactory::selectMapper($uri);
+                    if ($mapper) {
+                        $handle = $mapper->load($uri);
+                    }
+                } catch (WideImage_UnsupportedFormatException $e) {
+                    // mapper not found
+                }
+
+                // try all custom mappers
+                if (!self::isValidImageHandle($handle)) {
+                    $custom_mappers = WideImage_MapperFactory::getCustomMappers();
+                    foreach ($custom_mappers as $mime_type => $mapper_class) {
+                        $mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
+                        $handle = $mapper->loadFromString($data);
+                        if (self::isValidImageHandle($handle)) {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageSourceException("File '{$uri}' appears to be an invalid image source.");
+            }
+
+            return self::loadFromHandle($handle);
+        }
+
+        /**
+         * Create and load an image from a string. Format is auto-detected.
+         *
+         * @param string $string Binary data, i.e. from BLOB field in the database
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function loadFromString($string)
+        {
+            if (strlen($string) < 128) {
+                throw new WideImage_InvalidImageSourceException("String doesn't contain image data.");
+            }
+
+            $handle = @imagecreatefromstring($string);
+            if (!self::isValidImageHandle($handle)) {
+                $custom_mappers = WideImage_MapperFactory::getCustomMappers();
+                foreach ($custom_mappers as $mime_type => $mapper_class) {
+                    $mapper = WideImage_MapperFactory::selectMapper(null, $mime_type);
+                    $handle = $mapper->loadFromString($string);
+                    if (self::isValidImageHandle($handle)) {
+                        break;
+                    }
+                }
+            }
+
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageSourceException("String doesn't contain valid image data.");
+            }
+
+            return self::loadFromHandle($handle);
+        }
+
+        /**
+         * Create and load an image from an image handle.
+         *
+         * <b>Note:</b> the resulting image object takes ownership of the passed
+         * handle. When the newly-created image object is destroyed, the handle is
+         * destroyed too, so it's not a valid image handle anymore. In order to
+         * preserve the handle for use after object destruction, you have to call
+         * WideImage_Image::releaseHandle() on the created image instance prior to its
+         * destruction.
+         *
+         * <code>
+         * $handle = imagecreatefrompng('file.png');
+         * $image = WideImage::loadFromHandle($handle);
+         * </code>
+         *
+         * @param resource $handle A valid GD image resource
+         *
+         * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
+         */
+        public static function loadFromHandle($handle)
+        {
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageSourceException('Handle is not a valid GD image resource.');
+            }
+
+            if (imageistruecolor($handle)) {
+                return new WideImage_TrueColorImage($handle);
+            } else {
+                return new WideImage_PaletteImage($handle);
+            }
+        }
+
+        /**
+         * This method loads a file from the $_FILES array. The image format is auto-detected.
+         *
+         * You only have to pass the field name as the parameter. For array fields, this function will
+         * return an array of image objects, unless you specify the $index parameter, which will
+         * load the desired image.
+         *
+         * @param $field_name Name of the key in $_FILES array
+         * @param int $index The index of the file to load (if the input field is an array)
+         *
+         * @return WideImage_Image The loaded image
+         */
+        public static function loadFromUpload($field_name, $index = null)
+        {
+            if (!array_key_exists($field_name, $_FILES)) {
+                throw new WideImage_InvalidImageSourceException("Upload field '{$field_name}' doesn't exist.");
+            }
+
+            if (is_array($_FILES[$field_name]['tmp_name'])) {
+                if (isset($_FILES[$field_name]['tmp_name'][$index])) {
+                    $filename = $_FILES[$field_name]['tmp_name'][$index];
+                } else {
+                    $result = [];
+                    foreach ($_FILES[$field_name]['tmp_name'] as $idx => $tmp_name) {
+                        $result[$idx] = self::loadFromFile($tmp_name);
+                    }
+
+                    return $result;
+                }
+            } else {
+                $filename = $_FILES[$field_name]['tmp_name'];
+            }
+
+            if (!file_exists($filename)) {
+                throw new WideImage_InvalidImageSourceException("Uploaded file doesn't exist.");
+            }
+
+            return self::loadFromFile($filename);
+        }
+
+        /**
+         * Factory method for creating a palette image.
+         *
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_PaletteImage
+         */
+        public static function createPaletteImage($width, $height)
+        {
+            return WideImage_PaletteImage::create($width, $height);
+        }
+
+        /**
+         * Factory method for creating a true-color image.
+         *
+         * @param int $width
+         * @param int $height
+         *
+         * @return WideImage_TrueColorImage
+         */
+        public static function createTrueColorImage($width, $height)
+        {
+            return WideImage_TrueColorImage::create($width, $height);
+        }
+
+        /**
+         * Check whether the given handle is a valid GD resource.
+         *
+         * @param mixed $handle The variable to check
+         *
+         * @return bool
+         */
+        public static function isValidImageHandle($handle)
+        {
+            return is_resource($handle) && get_resource_type($handle) == 'gd';
+        }
+
+        /**
+         * Throws exception if the handle isn't a valid GD resource.
+         *
+         * @param mixed $handle The variable to check
+         */
+        public static function assertValidImageHandle($handle)
+        {
+            if (!self::isValidImageHandle($handle)) {
+                throw new WideImage_InvalidImageHandleException("{$handle} is not a valid image handle.");
+            }
+        }
+    }
+
+    WideImage::checkGD();
+
+    WideImage::registerCustomMapper('WideImage_Mapper_BMP', 'image/bmp', 'bmp');
+    WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles.php
index 6b2db1457c4..2b21a2ff7c5 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles.php
@@ -65,20 +65,16 @@
  * See COPYING for license information.
  *
  * @author Eric "EJ" Johnson <ej@racklabs.com>
- * @copyright Copyright (c) 2008, Rackspace US, Inc.
- * @package php-cloudfiles
+ * @copyright Copyright (c) 2008, Rackspace US, Inc
  */
-
-/**
- */
-require_once("cloudfiles_exceptions.php");
-require("cloudfiles_http.php");
-define("DEFAULT_CF_API_VERSION", 1);
-define("MAX_CONTAINER_NAME_LEN", 256);
-define("MAX_OBJECT_NAME_LEN", 1024);
-define("MAX_OBJECT_SIZE", 5*1024*1024*1024+1);
-define("US_AUTHURL", "https://auth.api.rackspacecloud.com");
-define("UK_AUTHURL", "https://lon.auth.api.rackspacecloud.com");
+require_once 'cloudfiles_exceptions.php';
+require 'cloudfiles_http.php';
+define('DEFAULT_CF_API_VERSION', 1);
+define('MAX_CONTAINER_NAME_LEN', 256);
+define('MAX_OBJECT_NAME_LEN', 1024);
+define('MAX_OBJECT_SIZE', 5 * 1024 * 1024 * 1024 + 1);
+define('US_AUTHURL', 'https://auth.api.rackspacecloud.com');
+define('UK_AUTHURL', 'https://lon.auth.api.rackspacecloud.com');
 /**
  * Class for handling Cloud Files Authentication, call it's {@link authenticate()}
  * method to obtain authorized service urls and an authentication token.
@@ -108,8 +104,6 @@
  * #
  * $auth->authenticate();
  * </code>
- *
- * @package php-cloudfiles
  */
 class CF_Authentication
 {
@@ -120,38 +114,37 @@ class CF_Authentication
     public $account;
 
     /**
-     * Instance variables that are set after successful authentication
+     * Instance variables that are set after successful authentication.
      */
     public $storage_url;
     public $cdnm_url;
     public $auth_token;
 
     /**
-     * Class constructor (PHP 5 syntax)
+     * Class constructor (PHP 5 syntax).
      *
-     * @param string $username Mosso username
-     * @param string $api_key Mosso API Access Key
-     * @param string $account  <i>Account name</i>
-     * @param string $auth_host  <i>Authentication service URI</i>
+     * @param string $username  Mosso username
+     * @param string $api_key   Mosso API Access Key
+     * @param string $account   <i>Account name</i>
+     * @param string $auth_host <i>Authentication service URI</i>
      */
-    function __construct($username=NULL, $api_key=NULL, $account=NULL, $auth_host=US_AUTHURL)
+    public function __construct($username = null, $api_key = null, $account = null, $auth_host = US_AUTHURL)
     {
-
-        $this->dbug = False;
-        $this->username = $username;
-        $this->api_key = $api_key;
+        $this->dbug         = false;
+        $this->username     = $username;
+        $this->api_key      = $api_key;
         $this->account_name = $account;
-        $this->auth_host = $auth_host;
+        $this->auth_host    = $auth_host;
 
-        $this->storage_url = NULL;
-        $this->cdnm_url = NULL;
-        $this->auth_token = NULL;
+        $this->storage_url = null;
+        $this->cdnm_url    = null;
+        $this->auth_token  = null;
 
         $this->cfs_http = new CF_Http(DEFAULT_CF_API_VERSION);
     }
 
     /**
-     * Use the Certificate Authority bundle included with this API
+     * Use the Certificate Authority bundle included with this API.
      *
      * Most versions of PHP with cURL support include an outdated Certificate
      * Authority (CA) bundle (the file that lists all valid certificate
@@ -171,13 +164,13 @@ function __construct($username=NULL, $api_key=NULL, $account=NULL, $auth_host=US
      *
      * @param string $path Specify path to CA bundle (default to included)
      */
-    function ssl_use_cabundle($path=NULL)
+    public function ssl_use_cabundle($path = null)
     {
         $this->cfs_http->ssl_use_cabundle($path);
     }
 
     /**
-     * Attempt to validate Username/API Access Key
+     * Attempt to validate Username/API Access Key.
      *
      * Attempts to validate credentials with the authentication service.  It
      * either returns <kbd>True</kbd> or throws an Exception.  Accepts a single
@@ -195,82 +188,86 @@ function ssl_use_cabundle($path=NULL)
      * </code>
      *
      * @param string $version API version for Auth service (optional)
-     * @return boolean <kbd>True</kbd> if successfully authenticated
-     * @throws AuthenticationException invalid credentials
+     *
+     * @return bool <kbd>True</kbd> if successfully authenticated
+     *
+     * @throws AuthenticationException  invalid credentials
      * @throws InvalidResponseException invalid response
      */
-    function authenticate($version=DEFAULT_CF_API_VERSION)
+    public function authenticate($version = DEFAULT_CF_API_VERSION)
     {
-        list($status,$reason,$surl,$curl,$atoken) = 
+        list($status, $reason, $surl, $curl, $atoken) =
                 $this->cfs_http->authenticate($this->username, $this->api_key,
                 $this->account_name, $this->auth_host);
 
         if ($status == 401) {
-            throw new AuthenticationException("Invalid username or access key.");
+            throw new AuthenticationException('Invalid username or access key.');
         }
         if ($status != 204) {
             throw new InvalidResponseException(
-                "Unexpected response (".$status."): ".$reason);
+                'Unexpected response ('.$status.'): '.$reason);
         }
 
         if (!($surl || $curl) || !$atoken) {
             throw new InvalidResponseException(
-                "Expected headers missing from auth service.");
+                'Expected headers missing from auth service.');
         }
         $this->storage_url = $surl;
-        $this->cdnm_url = $curl;
-        $this->auth_token = $atoken;
-        return True;
+        $this->cdnm_url    = $curl;
+        $this->auth_token  = $atoken;
+
+        return true;
     }
-	/**
-	 * Use Cached Token and Storage URL's rather then grabbing from the Auth System
-         *
-         * Example:
- 	 * <code>
-         * #Create an Auth instance
-         * $auth = new CF_Authentication();
-         * #Pass Cached URL's and Token as Args
-	 * $auth->load_cached_credentials("auth_token", "storage_url", "cdn_management_url");
-         * </code>
-	 * 
-	 * @param string $auth_token A Cloud Files Auth Token (Required)
-         * @param string $storage_url The Cloud Files Storage URL (Required)
-         * @param string $cdnm_url CDN Management URL (Required)
-         * @return boolean <kbd>True</kbd> if successful 
-	 * @throws SyntaxException If any of the Required Arguments are missing
-         */
-	function load_cached_credentials($auth_token, $storage_url, $cdnm_url)
+    /**
+     * Use Cached Token and Storage URL's rather then grabbing from the Auth System.
+     *
+     * Example:
+     * <code>
+     * #Create an Auth instance
+     * $auth = new CF_Authentication();
+     * #Pass Cached URL's and Token as Args
+     * $auth->load_cached_credentials("auth_token", "storage_url", "cdn_management_url");
+     * </code>
+     *
+     * @param string $auth_token  A Cloud Files Auth Token (Required)
+     * @param string $storage_url The Cloud Files Storage URL (Required)
+     * @param string $cdnm_url    CDN Management URL (Required)
+     *
+     * @return bool <kbd>True</kbd> if successful
+     *
+     * @throws SyntaxException If any of the Required Arguments are missing
+     */
+    public function load_cached_credentials($auth_token, $storage_url, $cdnm_url)
     {
-        if(!$storage_url || !$cdnm_url)
-        {
-                throw new SyntaxException("Missing Required Interface URL's!");
+        if (!$storage_url || !$cdnm_url) {
+            throw new SyntaxException("Missing Required Interface URL's!");
         }
-        if(!$auth_token)
-        {
-                throw new SyntaxException("Missing Auth Token!");
+        if (!$auth_token) {
+            throw new SyntaxException('Missing Auth Token!');
         }
 
         $this->storage_url = $storage_url;
         $this->cdnm_url    = $cdnm_url;
         $this->auth_token  = $auth_token;
-        return True;
+
+        return true;
     }
-	/**
-         * Grab Cloud Files info to be Cached for later use with the load_cached_credentials method.
-         *
-	 * Example:
-         * <code>
-         * #Create an Auth instance
-         * $auth = new CF_Authentication("UserName","API_Key");
-         * $auth->authenticate();
-         * $array = $auth->export_credentials();
-         * </code>
-         * 
-	 * @return array of url's and an auth token.
-         */
-    function export_credentials()
+    /**
+     * Grab Cloud Files info to be Cached for later use with the load_cached_credentials method.
+     *
+     * Example:
+     * <code>
+     * #Create an Auth instance
+     * $auth = new CF_Authentication("UserName","API_Key");
+     * $auth->authenticate();
+     * $array = $auth->export_credentials();
+     * </code>
+     *
+     * @return array of url's and an auth token
+     */
+    public function export_credentials()
     {
-        $arr = array();
+        $arr                = [];
         $arr['storage_url'] = $this->storage_url;
         $arr['cdnm_url']    = $this->cdnm_url;
         $arr['auth_token']  = $this->auth_token;
@@ -278,27 +275,27 @@ function export_credentials()
         return $arr;
     }
 
-
     /**
      * Make sure the CF_Authentication instance has authenticated.
      *
      * Ensures that the instance variables necessary to communicate with
      * Cloud Files have been set from a previous authenticate() call.
      *
-     * @return boolean <kbd>True</kbd> if successfully authenticated
+     * @return bool <kbd>True</kbd> if successfully authenticated
      */
-    function authenticated()
+    public function authenticated()
     {
         if (!($this->storage_url || $this->cdnm_url) || !$this->auth_token) {
-            return False;
+            return false;
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Toggle debugging - set cURL verbose flag
+     * Toggle debugging - set cURL verbose flag.
      */
-    function setDebug($bool)
+    public function setDebug($bool)
     {
         $this->dbug = $bool;
         $this->cfs_http->setDebug($bool);
@@ -333,8 +330,6 @@ function setDebug($bool)
  * #
  * # $conn->ssl_use_cabundle(); # bypass cURL's old CA bundle
  * </code>
- *
- * @package php-cloudfiles
  */
 class CF_Connection
 {
@@ -371,56 +366,57 @@ class CF_Connection
      * If the environement variable RACKSPACE_SERVICENET is defined it will
      * force to connect via the servicenet.
      *
-     * @param obj $cfs_auth previously authenticated CF_Authentication instance
-     * @param boolean $servicenet enable/disable access via Rackspace servicenet.
+     * @param obj  $cfs_auth   previously authenticated CF_Authentication instance
+     * @param bool $servicenet enable/disable access via Rackspace servicenet
+     *
      * @throws AuthenticationException not authenticated
      */
-    function __construct($cfs_auth, $servicenet=False)
+    public function __construct($cfs_auth, $servicenet = false)
     {
-        if (isset($_ENV['RACKSPACE_SERVICENET']))
-            $servicenet=True;
+        if (isset($_ENV['RACKSPACE_SERVICENET'])) {
+            $servicenet = true;
+        }
         $this->cfs_http = new CF_Http(DEFAULT_CF_API_VERSION);
         $this->cfs_auth = $cfs_auth;
         if (!$this->cfs_auth->authenticated()) {
-            $e = "Need to pass in a previously authenticated ";
-            $e .= "CF_Authentication instance.";
+            $e = 'Need to pass in a previously authenticated ';
+            $e .= 'CF_Authentication instance.';
             throw new AuthenticationException($e);
         }
-        $this->cfs_http->setCFAuth($this->cfs_auth, $servicenet=$servicenet);
-        $this->dbug = False;
+        $this->cfs_http->setCFAuth($this->cfs_auth, $servicenet = $servicenet);
+        $this->dbug = false;
     }
 
     /**
-     * Toggle debugging of instance and back-end HTTP module
+     * Toggle debugging of instance and back-end HTTP module.
      *
-     * @param boolean $bool enable/disable cURL debugging
+     * @param bool $bool enable/disable cURL debugging
      */
-    function setDebug($bool)
+    public function setDebug($bool)
     {
-        $this->dbug = (boolean) $bool;
+        $this->dbug = (bool) $bool;
         $this->cfs_http->setDebug($this->dbug);
     }
 
     /**
-     * Close a connection
+     * Close a connection.
      *
      * Example:
      * <code>
-     *  
+     *
      * $conn->close();
-     * 
+     *
      * </code>
      *
      * Will close all current cUrl active connections.
-     * 
      */
     public function close()
     {
         $this->cfs_http->close();
     }
-    
+
     /**
-     * Cloud Files account information
+     * Cloud Files account information.
      *
      * Return an array of two floats (since PHP only supports 32-bit integers);
      * number of containers on the account and total bytes used for the account.
@@ -437,24 +433,26 @@ public function close()
      * </code>
      *
      * @return array (number of containers, total bytes stored)
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function get_info()
+    public function get_info()
     {
         list($status, $reason, $container_count, $total_bytes) =
                 $this->cfs_http->head_account();
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_info();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_info();
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        return array($container_count, $total_bytes);
+
+        return [$container_count, $total_bytes];
     }
 
     /**
-     * Create a Container
+     * Create a Container.
      *
      * Given a Container name, return a Container instance, creating a new
      * remote Container if it does not exit.
@@ -469,47 +467,52 @@ function get_info()
      * </code>
      *
      * @param string $container_name container name
+     *
      * @return CF_Container
-     * @throws SyntaxException invalid name
+     *
+     * @throws SyntaxException          invalid name
      * @throws InvalidResponseException unexpected response
      */
-    function create_container($container_name=NULL)
+    public function create_container($container_name = null)
     {
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        if (!isset($container_name) or $container_name == "") 
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        if (!isset($container_name) or $container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if (strpos($container_name, "/") !== False) {
+        if (strpos($container_name, '/') !== false) {
             $r = "Container name '".$container_name;
             $r .= "' cannot contain a '/' character.";
             throw new SyntaxException($r);
         }
         if (strlen($container_name) > MAX_CONTAINER_NAME_LEN) {
             throw new SyntaxException(sprintf(
-                "Container name exeeds %d bytes.",
+                'Container name exeeds %d bytes.',
                 MAX_CONTAINER_NAME_LEN));
         }
 
         $return_code = $this->cfs_http->create_container($container_name);
         if (!$return_code) {
-            throw new InvalidResponseException("Invalid response ("
-                . $return_code. "): " . $this->cfs_http->get_error());
+            throw new InvalidResponseException('Invalid response ('
+                .$return_code.'): '.$this->cfs_http->get_error());
         }
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->create_container($container_name);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->create_container($container_name);
+        //}
         if ($return_code != 201 && $return_code != 202) {
             throw new InvalidResponseException(
-                "Invalid response (".$return_code."): "
-                    . $this->cfs_http->get_error());
+                'Invalid response ('.$return_code.'): '
+                    .$this->cfs_http->get_error());
         }
+
         return new CF_Container($this->cfs_auth, $this->cfs_http, $container_name);
     }
 
     /**
-     * Delete a Container
+     * Delete a Container.
      *
      * Given either a Container instance or name, remove the remote Container.
      * The Container must be empty prior to removing it.
@@ -524,18 +527,20 @@ function create_container($container_name=NULL)
      * </code>
      *
      * @param string|obj $container container name or instance
-     * @return boolean <kbd>True</kbd> if successfully deleted
-     * @throws SyntaxException missing proper argument
-     * @throws InvalidResponseException invalid response
+     *
+     * @return bool <kbd>True</kbd> if successfully deleted
+     *
+     * @throws SyntaxException            missing proper argument
+     * @throws InvalidResponseException   invalid response
      * @throws NonEmptyContainerException container not empty
-     * @throws NoSuchContainerException remote container does not exist
+     * @throws NoSuchContainerException   remote container does not exist
      */
-    function delete_container($container=NULL)
+    public function delete_container($container = null)
     {
-        $container_name = NULL;
-        
+        $container_name = null;
+
         if (is_object($container)) {
-            if (get_class($container) == "CF_Container") {
+            if (get_class($container) == 'CF_Container') {
                 $container_name = $container->name;
             }
         }
@@ -543,35 +548,37 @@ function delete_container($container=NULL)
             $container_name = $container;
         }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Must specify container object or name.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Must specify container object or name.');
+        }
 
         $return_code = $this->cfs_http->delete_container($container_name);
 
         if (!$return_code) {
-            throw new InvalidResponseException("Failed to obtain http response");
+            throw new InvalidResponseException('Failed to obtain http response');
         }
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->delete_container($container);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->delete_container($container);
+        //}
         if ($return_code == 409) {
             throw new NonEmptyContainerException(
-                "Container must be empty prior to removing it.");
+                'Container must be empty prior to removing it.');
         }
         if ($return_code == 404) {
             throw new NoSuchContainerException(
-                "Specified container did not exist to delete.");
+                'Specified container did not exist to delete.');
         }
         if ($return_code != 204) {
             throw new InvalidResponseException(
-                "Invalid response (".$return_code."): "
-                . $this->cfs_http->get_error());
+                'Invalid response ('.$return_code.'): '
+                .$this->cfs_http->get_error());
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Return a Container instance
+     * Return a Container instance.
      *
      * For the given name, return a Container instance if the remote Container
      * exists, otherwise throw a Not Found exception.
@@ -588,30 +595,33 @@ function delete_container($container=NULL)
      * </code>
      *
      * @param string $container_name name of the remote Container
+     *
      * @return container CF_Container instance
+     *
      * @throws NoSuchContainerException thrown if no remote Container
      * @throws InvalidResponseException unexpected response
      */
-    function get_container($container_name=NULL)
+    public function get_container($container_name = null)
     {
         list($status, $reason, $count, $bytes) =
                 $this->cfs_http->head_container($container_name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_container($container_name);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_container($container_name);
+        //}
         if ($status == 404) {
-            throw new NoSuchContainerException("Container not found.");
+            throw new NoSuchContainerException('Container not found.');
         }
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response: ".$this->cfs_http->get_error());
+                'Invalid response: '.$this->cfs_http->get_error());
         }
+
         return new CF_Container($this->cfs_auth, $this->cfs_http,
             $container_name, $count, $bytes);
     }
 
     /**
-     * Return array of Container instances
+     * Return array of Container instances.
      *
      * Return an array of CF_Container instances on the account.  The instances
      * will be fully populated with Container attributes (bytes stored and
@@ -632,29 +642,31 @@ function get_container($container_name=NULL)
      * </code>
      *
      * @return array An array of CF_Container instances
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function get_containers($limit=0, $marker=NULL)
+    public function get_containers($limit = 0, $marker = null)
     {
         list($status, $reason, $container_info) =
                 $this->cfs_http->list_containers_info($limit, $marker);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_containers();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_containers();
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response: ".$this->cfs_http->get_error());
+                'Invalid response: '.$this->cfs_http->get_error());
         }
-        $containers = array();
+        $containers = [];
         foreach ($container_info as $name => $info) {
             $containers[] = new CF_Container($this->cfs_auth, $this->cfs_http,
-                $info['name'], $info["count"], $info["bytes"], False);
+                $info['name'], $info['count'], $info['bytes'], false);
         }
+
         return $containers;
     }
 
     /**
-     * Return list of remote Containers
+     * Return list of remote Containers.
      *
      * Return an array of strings containing the names of all remote Containers.
      *
@@ -673,27 +685,30 @@ function get_containers($limit=0, $marker=NULL)
      * )
      * </code>
      *
-     * @param integer $limit restrict results to $limit Containers
+     * @param int    $limit  restrict results to $limit Containers
      * @param string $marker return results greater than $marker
+     *
      * @return array list of remote Containers
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function list_containers($limit=0, $marker=NULL)
+    public function list_containers($limit = 0, $marker = null)
     {
         list($status, $reason, $containers) =
             $this->cfs_http->list_containers($limit, $marker);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_containers($limit, $marker);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_containers($limit, $marker);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $containers;
     }
 
     /**
-     * Return array of information about remote Containers
+     * Return array of information about remote Containers.
      *
      * Return a nested array structure of Container info.
      *
@@ -721,22 +736,25 @@ function list_containers($limit=0, $marker=NULL)
      * )
      * </code>
      *
-     * @param integer $limit restrict results to $limit Containers
+     * @param int    $limit  restrict results to $limit Containers
      * @param string $marker return results greater than $marker
+     *
      * @return array nested array structure of Container info
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function list_containers_info($limit=0, $marker=NULL)
+    public function list_containers_info($limit = 0, $marker = null)
     {
-        list($status, $reason, $container_info) = 
+        list($status, $reason, $container_info) =
                 $this->cfs_http->list_containers_info($limit, $marker);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_containers_info($limit, $marker);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_containers_info($limit, $marker);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $container_info;
     }
 
@@ -764,26 +782,29 @@ function list_containers_info($limit=0, $marker=NULL)
      * )
      * </code>
      *
-     * @param bool $enabled_only Will list all containers ever CDN enabled if     * set to false or only currently enabled CDN containers if set to true.      * Defaults to false.
+     * @param bool $enabled_only Will list all containers ever CDN enabled if     * set to false or only currently enabled CDN containers if set to true.      * Defaults to false
+     *
      * @return array list of published Container names
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function list_public_containers($enabled_only=False)
+    public function list_public_containers($enabled_only = false)
     {
         list($status, $reason, $containers) =
                 $this->cfs_http->list_cdn_containers($enabled_only);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_public_containers();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_public_containers();
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $containers;
     }
 
     /**
-     * Set a user-supplied callback function to report download progress
+     * Set a user-supplied callback function to report download progress.
      *
      * The callback function is used to report incremental progress of a data
      * download functions (e.g. $container->list_objects(), $obj->read(), etc).
@@ -818,13 +839,13 @@ function list_public_containers($enabled_only=False)
      *
      * @param string $func_name the name of the user callback function
      */
-    function set_read_progress_function($func_name)
+    public function set_read_progress_function($func_name)
     {
         $this->cfs_http->setReadProgressFunc($func_name);
     }
 
     /**
-     * Set a user-supplied callback function to report upload progress
+     * Set a user-supplied callback function to report upload progress.
      *
      * The callback function is used to report incremental progress of a data
      * upload functions (e.g. $obj->write() call).  The specified function will
@@ -854,13 +875,13 @@ function set_read_progress_function($func_name)
      *
      * @param string $func_name the name of the user callback function
      */
-    function set_write_progress_function($func_name)
+    public function set_write_progress_function($func_name)
     {
         $this->cfs_http->setWriteProgressFunc($func_name);
     }
 
     /**
-     * Use the Certificate Authority bundle included with this API
+     * Use the Certificate Authority bundle included with this API.
      *
      * Most versions of PHP with cURL support include an outdated Certificate
      * Authority (CA) bundle (the file that lists all valid certificate
@@ -880,27 +901,27 @@ function set_write_progress_function($func_name)
      *
      * @param string $path Specify path to CA bundle (default to included)
      */
-    function ssl_use_cabundle($path=NULL)
+    public function ssl_use_cabundle($path = null)
     {
         $this->cfs_http->ssl_use_cabundle($path);
     }
 
-    #private function _re_auth()
-    #{
-    #    $new_auth = new CF_Authentication(
-    #        $this->cfs_auth->username,
-    #        $this->cfs_auth->api_key,
-    #        $this->cfs_auth->auth_host,
-    #        $this->cfs_auth->account);
-    #    $new_auth->authenticate();
-    #    $this->cfs_auth = $new_auth;
-    #    $this->cfs_http->setCFAuth($this->cfs_auth);
-    #    return True;
-    #}
+    //private function _re_auth()
+    //{
+    //    $new_auth = new CF_Authentication(
+    //        $this->cfs_auth->username,
+    //        $this->cfs_auth->api_key,
+    //        $this->cfs_auth->auth_host,
+    //        $this->cfs_auth->account);
+    //    $new_auth->authenticate();
+    //    $this->cfs_auth = $new_auth;
+    //    $this->cfs_http->setCFAuth($this->cfs_auth);
+    //    return True;
+    //}
 }
 
 /**
- * Container operations
+ * Container operations.
  *
  * Containers are storage compartments where you put your data (objects).
  * A container is similar to a directory or folder on a conventional filesystem
@@ -909,8 +930,6 @@ function ssl_use_cabundle($path=NULL)
  *
  * You also have the option of marking a Container as "public" so that the
  * Objects stored in the Container are publicly available via the CDN.
- *
- * @package php-cloudfiles
  */
 class CF_Container
 {
@@ -928,77 +947,77 @@ class CF_Container
     public $cdn_acl_referrer;
 
     /**
-     * Class constructor
+     * Class constructor.
      *
      * Constructor for Container
      *
-     * @param obj $cfs_auth CF_Authentication instance
-     * @param obj $cfs_http HTTP connection manager
-     * @param string $name name of Container
-     * @param int $count number of Objects stored in this Container
-     * @param int $bytes number of bytes stored in this Container
+     * @param obj    $cfs_auth CF_Authentication instance
+     * @param obj    $cfs_http HTTP connection manager
+     * @param string $name     name of Container
+     * @param int    $count    number of Objects stored in this Container
+     * @param int    $bytes    number of bytes stored in this Container
+     *
      * @throws SyntaxException invalid Container name
      */
-    function __construct(&$cfs_auth, &$cfs_http, $name, $count=0,
-        $bytes=0, $docdn=True)
+    public function __construct(&$cfs_auth, &$cfs_http, $name, $count = 0,
+        $bytes = 0, $docdn = true)
     {
         if (strlen($name) > MAX_CONTAINER_NAME_LEN) {
-            throw new SyntaxException("Container name exceeds "
-                . "maximum allowed length.");
+            throw new SyntaxException('Container name exceeds '
+                .'maximum allowed length.');
         }
-        if (strpos($name, "/") !== False) {
+        if (strpos($name, '/') !== false) {
             throw new SyntaxException(
                 "Container names cannot contain a '/' character.");
         }
-        $this->cfs_auth = $cfs_auth;
-        $this->cfs_http = $cfs_http;
-        $this->name = $name;
-        $this->object_count = $count;
-        $this->bytes_used = $bytes;
-        $this->cdn_enabled = NULL;
-        $this->cdn_uri = NULL;
-        $this->cdn_ttl = NULL;
-        $this->cdn_log_retention = NULL;
-        $this->cdn_acl_user_agent = NULL;
-        $this->cdn_acl_referrer = NULL;
-        if ($this->cfs_http->getCDNMUrl() != NULL && $docdn) {
+        $this->cfs_auth           = $cfs_auth;
+        $this->cfs_http           = $cfs_http;
+        $this->name               = $name;
+        $this->object_count       = $count;
+        $this->bytes_used         = $bytes;
+        $this->cdn_enabled        = null;
+        $this->cdn_uri            = null;
+        $this->cdn_ttl            = null;
+        $this->cdn_log_retention  = null;
+        $this->cdn_acl_user_agent = null;
+        $this->cdn_acl_referrer   = null;
+        if ($this->cfs_http->getCDNMUrl() != null && $docdn) {
             $this->_cdn_initialize();
         }
     }
 
     /**
-     * String representation of Container
+     * String representation of Container.
      *
      * Pretty print the Container instance.
      *
      * @return string Container details
      */
-    function __toString()
+    public function __toString()
     {
-        $me = sprintf("name: %s, count: %.0f, bytes: %.0f",
+        $me = sprintf('name: %s, count: %.0f, bytes: %.0f',
             $this->name, $this->object_count, $this->bytes_used);
-        if ($this->cfs_http->getCDNMUrl() != NULL) {
-            $me .= sprintf(", cdn: %s, cdn uri: %s, cdn ttl: %.0f, logs retention: %s",
-                $this->is_public() ? "Yes" : "No",
+        if ($this->cfs_http->getCDNMUrl() != null) {
+            $me .= sprintf(', cdn: %s, cdn uri: %s, cdn ttl: %.0f, logs retention: %s',
+                $this->is_public() ? 'Yes' : 'No',
                 $this->cdn_uri, $this->cdn_ttl,
-                $this->cdn_log_retention ? "Yes" : "No"
+                $this->cdn_log_retention ? 'Yes' : 'No'
                 );
 
-            if ($this->cdn_acl_user_agent != NULL) {
-                $me .= ", cdn acl user agent: " . $this->cdn_acl_user_agent;
+            if ($this->cdn_acl_user_agent != null) {
+                $me .= ', cdn acl user agent: '.$this->cdn_acl_user_agent;
             }
 
-            if ($this->cdn_acl_referrer != NULL) {
-                $me .= ", cdn acl referrer: " . $this->cdn_acl_referrer;
+            if ($this->cdn_acl_referrer != null) {
+                $me .= ', cdn acl referrer: '.$this->cdn_acl_referrer;
             }
-            
-            
         }
+
         return $me;
     }
 
     /**
-     * Enable Container content to be served via CDN or modify CDN attributes
+     * Enable Container content to be served via CDN or modify CDN attributes.
      *
      * Either enable this Container's content to be served via CDN or
      * adjust its CDN attributes.  This Container will always return the
@@ -1019,51 +1038,52 @@ function __toString()
      *
      * @param int $ttl the time in seconds content will be cached in the CDN
      * @returns string the CDN enabled Container's URI
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function make_public($ttl=86400)
+    public function make_public($ttl = 86400)
     {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        if ($this->cdn_uri != NULL) {
-            # previously published, assume we're setting new attributes
+        if ($this->cdn_uri != null) {
+            // previously published, assume we're setting new attributes
             list($status, $reason, $cdn_uri) =
-                $this->cfs_http->update_cdn_container($this->name,$ttl,
+                $this->cfs_http->update_cdn_container($this->name, $ttl,
                                                       $this->cdn_log_retention,
                                                       $this->cdn_acl_user_agent,
                                                       $this->cdn_acl_referrer);
-            #if ($status == 401 && $this->_re_auth()) {
-            #    return $this->make_public($ttl);
-            #}
+            //if ($status == 401 && $this->_re_auth()) {
+            //    return $this->make_public($ttl);
+            //}
             if ($status == 404) {
-                # this instance _thinks_ the container was published, but the
-                # cdn management system thinks otherwise - try again with a PUT
+                // this instance _thinks_ the container was published, but the
+                // cdn management system thinks otherwise - try again with a PUT
                 list($status, $reason, $cdn_uri) =
-                    $this->cfs_http->add_cdn_container($this->name,$ttl);
-
+                    $this->cfs_http->add_cdn_container($this->name, $ttl);
             }
         } else {
-            # publish it for first time
+            // publish it for first time
             list($status, $reason, $cdn_uri) =
-                $this->cfs_http->add_cdn_container($this->name,$ttl);
+                $this->cfs_http->add_cdn_container($this->name, $ttl);
         }
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->make_public($ttl);
-        #}
-        if (!in_array($status, array(201,202))) {
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->make_public($ttl);
+        //}
+        if (!in_array($status, [201, 202])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
-        }
-        $this->cdn_enabled = True;
-        $this->cdn_ttl = $ttl;
-        $this->cdn_uri = $cdn_uri;
-        $this->cdn_log_retention = False;
-        $this->cdn_acl_user_agent = "";
-        $this->cdn_acl_referrer = "";
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
+        }
+        $this->cdn_enabled        = true;
+        $this->cdn_ttl            = $ttl;
+        $this->cdn_uri            = $cdn_uri;
+        $this->cdn_log_retention  = false;
+        $this->cdn_acl_user_agent = '';
+        $this->cdn_acl_referrer   = '';
+
         return $this->cdn_uri;
     }
     /**
@@ -1077,25 +1097,27 @@ function make_public($ttl=86400)
      * $container->purge_from_cdn("user@domain.com");
      * # or
      * $container->purge_from_cdn();
-     * # or 
-     * $container->purge_from_cdn("user1@domain.com,user2@domain.com");
+     * # or
+     * $container->purge_from_cdn("user1@domain.com,user2@domain.com");.
+     *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException if CDN Is not enabled on this connection
+     *
+     * @throws CDNNotEnabledException   if CDN Is not enabled on this connection
      * @throws InvalidResponseException if the response expected is not returned
      */
-    function purge_from_cdn($email=null)
+    public function purge_from_cdn($email = null)
     {
-        if (!$this->cfs_http->getCDNMUrl()) 
-        {
+        if (!$this->cfs_http->getCDNMUrl()) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
         $status = $this->cfs_http->purge_from_cdn($this->name, $email);
         if ($status < 199 or $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
-        } 
-        return True;
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
+        }
+
+        return true;
     }
     /**
      * Enable ACL restriction by User Agent for this container.
@@ -1113,28 +1135,31 @@ function purge_from_cdn($email=null)
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function acl_user_agent($cdn_acl_user_agent="") {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+    public function acl_user_agent($cdn_acl_user_agent = '')
+    {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) =
+        list($status, $reason) =
             $this->cfs_http->update_cdn_container($this->name,
                                                   $this->cdn_ttl,
                                                   $this->cdn_log_retention,
                                                   $cdn_acl_user_agent,
                                                   $this->cdn_acl_referrer
                 );
-        if (!in_array($status, array(202,404))) {
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
         $this->cdn_acl_user_agent = $cdn_acl_user_agent;
-        return True;
+
+        return true;
     }
 
     /**
@@ -1153,30 +1178,33 @@ function acl_user_agent($cdn_acl_user_agent="") {
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function acl_referrer($cdn_acl_referrer="") {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+    public function acl_referrer($cdn_acl_referrer = '')
+    {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) =
+        list($status, $reason) =
             $this->cfs_http->update_cdn_container($this->name,
                                                   $this->cdn_ttl,
                                                   $this->cdn_log_retention,
                                                   $this->cdn_acl_user_agent,
                                                   $cdn_acl_referrer
                 );
-        if (!in_array($status, array(202,404))) {
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
         $this->cdn_acl_referrer = $cdn_acl_referrer;
-        return True;
+
+        return true;
     }
-    
+
     /**
      * Enable log retention for this CDN container.
      *
@@ -1185,7 +1213,7 @@ function acl_referrer($cdn_acl_referrer="") {
      * uploaded to a ".CDN_ACCESS_LOGS" container in the form of
      * "container_name.YYYYMMDDHH-XXXX.gz". Requires CDN be enabled on
      * the account.
-     * 
+     *
      * Example:
      * <code>
      * # ... authentication code excluded (see previous examples) ...
@@ -1199,32 +1227,35 @@ function acl_referrer($cdn_acl_referrer="") {
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function log_retention($cdn_log_retention=False) {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+    public function log_retention($cdn_log_retention = false)
+    {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) =
+        list($status, $reason) =
             $this->cfs_http->update_cdn_container($this->name,
                                                   $this->cdn_ttl,
                                                   $cdn_log_retention,
                                                   $this->cdn_acl_user_agent,
                                                   $this->cdn_acl_referrer
                 );
-        if (!in_array($status, array(202,404))) {
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
         $this->cdn_log_retention = $cdn_log_retention;
-        return True;
+
+        return true;
     }
-    
+
     /**
-     * Disable the CDN sharing for this container
+     * Disable the CDN sharing for this container.
      *
      * Use this method to disallow distribution into the CDN of this Container's
      * content.
@@ -1249,35 +1280,37 @@ function log_retention($cdn_log_retention=False) {
      * </code>
      *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException CDN functionality not returned during auth
-     * @throws AuthenticationException if auth token is not valid/expired
+     *
+     * @throws CDNNotEnabledException   CDN functionality not returned during auth
+     * @throws AuthenticationException  if auth token is not valid/expired
      * @throws InvalidResponseException unexpected response
      */
-    function make_private()
+    public function make_private()
     {
-        if ($this->cfs_http->getCDNMUrl() == NULL) {
+        if ($this->cfs_http->getCDNMUrl() == null) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        list($status,$reason) = $this->cfs_http->remove_cdn_container($this->name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->make_private();
-        #}
-        if (!in_array($status, array(202,404))) {
+        list($status, $reason) = $this->cfs_http->remove_cdn_container($this->name);
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->make_private();
+        //}
+        if (!in_array($status, [202, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
-        }
-        $this->cdn_enabled = False;
-        $this->cdn_ttl = NULL;
-        $this->cdn_uri = NULL;
-        $this->cdn_log_retention = NULL;
-        $this->cdn_acl_user_agent = NULL;
-        $this->cdn_acl_referrer = NULL;
-        return True;
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
+        }
+        $this->cdn_enabled        = false;
+        $this->cdn_ttl            = null;
+        $this->cdn_uri            = null;
+        $this->cdn_log_retention  = null;
+        $this->cdn_acl_user_agent = null;
+        $this->cdn_acl_referrer   = null;
+
+        return true;
     }
 
     /**
-     * Check if this Container is being publicly served via CDN
+     * Check if this Container is being publicly served via CDN.
      *
      * Use this method to determine if the Container's content is currently
      * available through the CDN.
@@ -1297,13 +1330,13 @@ function make_private()
      *
      * @returns boolean True if enabled, False otherwise
      */
-    function is_public()
+    public function is_public()
     {
-        return $this->cdn_enabled == True ? True : False;
+        return $this->cdn_enabled == true ? true : false;
     }
 
     /**
-     * Create a new remote storage Object
+     * Create a new remote storage Object.
      *
      * Return a new Object instance.  If the remote storage Object exists,
      * the instance's attributes are populated.
@@ -1323,15 +1356,16 @@ function is_public()
      * </code>
      *
      * @param string $obj_name name of storage Object
+     *
      * @return obj CF_Object instance
      */
-    function create_object($obj_name=NULL)
+    public function create_object($obj_name = null)
     {
         return new CF_Object($this, $obj_name);
     }
 
     /**
-     * Return an Object instance for the remote storage Object
+     * Return an Object instance for the remote storage Object.
      *
      * Given a name, return a Object instance representing the
      * remote storage object.
@@ -1352,15 +1386,16 @@ function create_object($obj_name=NULL)
      * </code>
      *
      * @param string $obj_name name of storage Object
+     *
      * @return obj CF_Object instance
      */
-    function get_object($obj_name=NULL)
+    public function get_object($obj_name = null)
     {
-        return new CF_Object($this, $obj_name, True);
+        return new CF_Object($this, $obj_name, true);
     }
 
     /**
-     * Return a list of Objects
+     * Return a list of Objects.
      *
      * Return an array of strings listing the Object names in this Container.
      *
@@ -1377,7 +1412,7 @@ function get_object($obj_name=NULL)
      * # Grab subsets of all storage objects
      * #
      * $first_ten = $images->list_objects(10);
-     * 
+     *
      * # Note the use of the previous result's last object name being
      * # used as the 'marker' parameter to fetch the next 10 objects
      * #
@@ -1396,30 +1431,33 @@ function get_object($obj_name=NULL)
      * $dogs = $images->list_objects(0,NULL,NULL,"pictures/animals/dogs");
      * </code>
      *
-     * @param int $limit <i>optional</i> only return $limit names
-     * @param int $marker <i>optional</i> subset of names starting at $marker
+     * @param int    $limit  <i>optional</i> only return $limit names
+     * @param int    $marker <i>optional</i> subset of names starting at $marker
      * @param string $prefix <i>optional</i> Objects whose names begin with $prefix
-     * @param string $path <i>optional</i> only return results under "pathname"
+     * @param string $path   <i>optional</i> only return results under "pathname"
+     *
      * @return array array of strings
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function list_objects($limit=0, $marker=NULL, $prefix=NULL, $path=NULL)
+    public function list_objects($limit = 0, $marker = null, $prefix = null, $path = null)
     {
         list($status, $reason, $obj_list) =
             $this->cfs_http->list_objects($this->name, $limit,
                 $marker, $prefix, $path);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->list_objects($limit, $marker, $prefix, $path);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->list_objects($limit, $marker, $prefix, $path);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
+
         return $obj_list;
     }
 
     /**
-     * Return an array of Objects
+     * Return an array of Objects.
      *
      * Return an array of Object instances in this Container.
      *
@@ -1455,39 +1493,42 @@ function list_objects($limit=0, $marker=NULL, $prefix=NULL, $path=NULL)
      * $dogs = $images->get_objects(0,NULL,NULL,"pictures/animals/dogs");
      * </code>
      *
-     * @param int $limit <i>optional</i> only return $limit names
-     * @param int $marker <i>optional</i> subset of names starting at $marker
+     * @param int    $limit  <i>optional</i> only return $limit names
+     * @param int    $marker <i>optional</i> subset of names starting at $marker
      * @param string $prefix <i>optional</i> Objects whose names begin with $prefix
-     * @param string $path <i>optional</i> only return results under "pathname"
+     * @param string $path   <i>optional</i> only return results under "pathname"
+     *
      * @return array array of strings
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function get_objects($limit=0, $marker=NULL, $prefix=NULL, $path=NULL)
+    public function get_objects($limit = 0, $marker = null, $prefix = null, $path = null)
     {
         list($status, $reason, $obj_array) =
             $this->cfs_http->get_objects($this->name, $limit,
                 $marker, $prefix, $path);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->get_objects($limit, $marker, $prefix, $path);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->get_objects($limit, $marker, $prefix, $path);
+        //}
         if ($status < 200 || $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        $objects = array();
+        $objects = [];
         foreach ($obj_array as $obj) {
-            $tmp = new CF_Object($this, $obj["name"], False, False);
-            $tmp->content_type = $obj["content_type"];
-            $tmp->content_length = (float) $obj["bytes"];
-            $tmp->set_etag($obj["hash"]);
-            $tmp->last_modified = $obj["last_modified"];
-            $objects[] = $tmp;
+            $tmp                 = new CF_Object($this, $obj['name'], false, false);
+            $tmp->content_type   = $obj['content_type'];
+            $tmp->content_length = (float) $obj['bytes'];
+            $tmp->set_etag($obj['hash']);
+            $tmp->last_modified = $obj['last_modified'];
+            $objects[]          = $tmp;
         }
+
         return $objects;
     }
 
     /**
-     * Delete a remote storage Object
+     * Delete a remote storage Object.
      *
      * Given an Object instance or name, permanently remove the remote Object
      * and all associated metadata.
@@ -1506,16 +1547,18 @@ function get_objects($limit=0, $marker=NULL, $prefix=NULL, $path=NULL)
      * </code>
      *
      * @param obj $obj name or instance of Object to delete
-     * @return boolean <kbd>True</kbd> if successfully removed
-     * @throws SyntaxException invalid Object name
-     * @throws NoSuchObjectException remote Object does not exist
+     *
+     * @return bool <kbd>True</kbd> if successfully removed
+     *
+     * @throws SyntaxException          invalid Object name
+     * @throws NoSuchObjectException    remote Object does not exist
      * @throws InvalidResponseException unexpected response
      */
-    function delete_object($obj)
+    public function delete_object($obj)
     {
-        $obj_name = NULL;
+        $obj_name = null;
         if (is_object($obj)) {
-            if (get_class($obj) == "CF_Object") {
+            if (get_class($obj) == 'CF_Object') {
                 $obj_name = $obj->name;
             }
         }
@@ -1523,26 +1566,27 @@ function delete_object($obj)
             $obj_name = $obj;
         }
         if (!$obj_name) {
-            throw new SyntaxException("Object name not set.");
+            throw new SyntaxException('Object name not set.');
         }
         $status = $this->cfs_http->delete_object($this->name, $obj_name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->delete_object($obj);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->delete_object($obj);
+        //}
         if ($status == 404) {
-            $m = "Specified object '".$this->name."/".$obj_name;
-            $m.= "' did not exist to delete.";
+            $m = "Specified object '".$this->name.'/'.$obj_name;
+            $m .= "' did not exist to delete.";
             throw new NoSuchObjectException($m);
         }
         if ($status != 204) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Helper function to create "path" elements for a given Object name
+     * Helper function to create "path" elements for a given Object name.
      *
      * Given an Object whos name contains '/' path separators, this function
      * will create the "directory marker" Objects of one byte with the
@@ -1551,27 +1595,27 @@ function delete_object($obj)
      * It assumes the last element of the full path is the "real" Object
      * and does NOT create a remote storage Object for that last element.
      */
-    function create_paths($path_name)
+    public function create_paths($path_name)
     {
         if ($path_name[0] == '/') {
             $path_name = mb_substr($path_name, 0, 1);
         }
-        $elements = explode('/', $path_name, -1);
-        $build_path = "";
+        $elements   = explode('/', $path_name, -1);
+        $build_path = '';
         foreach ($elements as $idx => $val) {
             if (!$build_path) {
                 $build_path = $val;
             } else {
-                $build_path .= "/" . $val;
+                $build_path .= '/'.$val;
             }
-            $obj = new CF_Object($this, $build_path);
-            $obj->content_type = "application/directory";
-            $obj->write(".", 1);
+            $obj               = new CF_Object($this, $build_path);
+            $obj->content_type = 'application/directory';
+            $obj->write('.', 1);
         }
     }
 
     /**
-     * Internal method to grab CDN/Container info if appropriate to do so
+     * Internal method to grab CDN/Container info if appropriate to do so.
      *
      * @throws InvalidResponseException unexpected response
      */
@@ -1580,44 +1624,41 @@ private function _cdn_initialize()
         list($status, $reason, $cdn_enabled, $cdn_uri, $cdn_ttl,
              $cdn_log_retention, $cdn_acl_user_agent, $cdn_acl_referrer) =
             $this->cfs_http->head_cdn_container($this->name);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->_cdn_initialize();
-        #}
-        if (!in_array($status, array(204,404))) {
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->_cdn_initialize();
+        //}
+        if (!in_array($status, [204, 404])) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->cfs_http->get_error());
         }
-        $this->cdn_enabled = $cdn_enabled;
-        $this->cdn_uri = $cdn_uri;
-        $this->cdn_ttl = $cdn_ttl;
-        $this->cdn_log_retention = $cdn_log_retention;
+        $this->cdn_enabled        = $cdn_enabled;
+        $this->cdn_uri            = $cdn_uri;
+        $this->cdn_ttl            = $cdn_ttl;
+        $this->cdn_log_retention  = $cdn_log_retention;
         $this->cdn_acl_user_agent = $cdn_acl_user_agent;
-        $this->cdn_acl_referrer = $cdn_acl_referrer;
+        $this->cdn_acl_referrer   = $cdn_acl_referrer;
     }
 
-    #private function _re_auth()
-    #{
-    #    $new_auth = new CF_Authentication(
-    #        $this->cfs_auth->username,
-    #        $this->cfs_auth->api_key,
-    #        $this->cfs_auth->auth_host,
-    #        $this->cfs_auth->account);
-    #    $new_auth->authenticate();
-    #    $this->cfs_auth = $new_auth;
-    #    $this->cfs_http->setCFAuth($this->cfs_auth);
-    #    return True;
-    #}
+    //private function _re_auth()
+    //{
+    //    $new_auth = new CF_Authentication(
+    //        $this->cfs_auth->username,
+    //        $this->cfs_auth->api_key,
+    //        $this->cfs_auth->auth_host,
+    //        $this->cfs_auth->account);
+    //    $new_auth->authenticate();
+    //    $this->cfs_auth = $new_auth;
+    //    $this->cfs_http->setCFAuth($this->cfs_auth);
+    //    return True;
+    //}
 }
 
-
 /**
- * Object operations
+ * Object operations.
  *
  * An Object is analogous to a file on a conventional filesystem. You can
- * read data from, or write data to your Objects. You can also associate 
+ * read data from, or write data to your Objects. You can also associate
  * arbitrary metadata with them.
- *
- * @package php-cloudfiles
  */
 class CF_Object
 {
@@ -1630,31 +1671,31 @@ class CF_Object
     private $etag;
 
     /**
-     * Class constructor
+     * Class constructor.
      *
-     * @param obj $container CF_Container instance
-     * @param string $name name of Object
-     * @param boolean $force_exists if set, throw an error if Object doesn't exist
+     * @param obj    $container    CF_Container instance
+     * @param string $name         name of Object
+     * @param bool   $force_exists if set, throw an error if Object doesn't exist
      */
-    function __construct(&$container, $name, $force_exists=False, $dohead=True)
+    public function __construct(&$container, $name, $force_exists = false, $dohead = true)
     {
-        if ($name[0] == "/") {
+        if ($name[0] == '/') {
             $r = "Object name '".$name;
             $r .= "' cannot contain begin with a '/' character.";
             throw new SyntaxException($r);
         }
         if (strlen($name) > MAX_OBJECT_NAME_LEN) {
-            throw new SyntaxException("Object name exceeds "
-                . "maximum allowed length.");
-        }
-        $this->container = $container;
-        $this->name = $name;
-        $this->etag = NULL;
-        $this->_etag_override = False;
-        $this->last_modified = NULL;
-        $this->content_type = NULL;
+            throw new SyntaxException('Object name exceeds '
+                .'maximum allowed length.');
+        }
+        $this->container      = $container;
+        $this->name           = $name;
+        $this->etag           = null;
+        $this->_etag_override = false;
+        $this->last_modified  = null;
+        $this->content_type   = null;
         $this->content_length = 0;
-        $this->metadata = array();
+        $this->metadata       = [];
         if ($dohead) {
             if (!$this->_initialize() && $force_exists) {
                 throw new NoSuchObjectException("No such object '".$name."'");
@@ -1663,15 +1704,15 @@ function __construct(&$container, $name, $force_exists=False, $dohead=True)
     }
 
     /**
-     * String representation of Object
+     * String representation of Object.
      *
      * Pretty print the Object's location and name
      *
      * @return string Object information
      */
-    function __toString()
+    public function __toString()
     {
-        return $this->container->name . "/" . $this->name;
+        return $this->container->name.'/'.$this->name;
     }
 
     /**
@@ -1691,57 +1732,65 @@ function __toString()
      *
      * if fileinfo is not available it will try to use the internal
      * mime_content_type function.
-     * 
+     *
      * @param string $handle name of file or buffer to guess the type from
-     * @return boolean <kbd>True</kbd> if successful
+     *
+     * @return bool <kbd>True</kbd> if successful
+     *
      * @throws BadContentTypeException
      */
-    function _guess_content_type($handle) {
-        if ($this->content_type)
+    public function _guess_content_type($handle)
+    {
+        if ($this->content_type) {
             return true;
-            
-        if (function_exists("finfo_open")) {
-            $local_magic = dirname(__FILE__) . "/share/magic";
-            $finfo = @finfo_open(FILEINFO_MIME, $local_magic);
+        }
+
+        if (function_exists('finfo_open')) {
+            $local_magic = dirname(__FILE__).'/share/magic';
+            $finfo       = @finfo_open(FILEINFO_MIME, $local_magic);
 
-            if (!$finfo) 
+            if (!$finfo) {
                 $finfo = @finfo_open(FILEINFO_MIME);
-                
-            if ($finfo) {
+            }
 
-                if (is_file((string)$handle))
+            if ($finfo) {
+                if (is_file((string) $handle)) {
                     $ct = @finfo_file($finfo, $handle);
-                else 
+                } else {
                     $ct = @finfo_buffer($finfo, $handle);
+                }
 
                 /* PHP 5.3 fileinfo display extra information like
                    charset so we remove everything after the ; since
                    we are not into that stuff */
                 if ($ct) {
-                    $extra_content_type_info = strpos($ct, "; ");
-                    if ($extra_content_type_info)
+                    $extra_content_type_info = strpos($ct, '; ');
+                    if ($extra_content_type_info) {
                         $ct = substr($ct, 0, $extra_content_type_info);
+                    }
                 }
 
-                if ($ct && $ct != 'application/octet-stream')
+                if ($ct && $ct != 'application/octet-stream') {
                     $this->content_type = $ct;
+                }
 
                 @finfo_close($finfo);
             }
         }
 
-        if (!$this->content_type && (string)is_file($handle) && function_exists("mime_content_type")) {
+        if (!$this->content_type && (string) is_file($handle) && function_exists('mime_content_type')) {
             $this->content_type = @mime_content_type($handle);
         }
 
         if (!$this->content_type) {
-            throw new BadContentTypeException("Required Content-Type not set");
+            throw new BadContentTypeException('Required Content-Type not set');
         }
-        return True;
+
+        return true;
     }
-    
+
     /**
-     * String representation of the Object's public URI
+     * String representation of the Object's public URI.
      *
      * A string representing the Object's public URI assuming that it's
      * parent Container is CDN-enabled.
@@ -1758,16 +1807,17 @@ function _guess_content_type($handle) {
      *
      * @return string Object's public URI or NULL
      */
-    function public_uri()
+    public function public_uri()
     {
         if ($this->container->cdn_enabled) {
-            return $this->container->cdn_uri . "/" . $this->name;
+            return $this->container->cdn_uri.'/'.$this->name;
         }
-        return NULL;
+
+        return null;
     }
 
     /**
-     * Read the remote Object's data
+     * Read the remote Object's data.
      *
      * Returns the Object's data.  This is useful for smaller Objects such
      * as images or office documents.  Object's with larger content should use
@@ -1791,26 +1841,29 @@ function public_uri()
      * </code>
      *
      * @param array $hdrs user-defined headers (Range, If-Match, etc.)
+     *
      * @return string Object's data
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function read($hdrs=array())
+    public function read($hdrs = [])
     {
         list($status, $reason, $data) =
             $this->container->cfs_http->get_object_to_string($this, $hdrs);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->read($hdrs);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->read($hdrs);
+        //}
         if (($status < 200) || ($status > 299
                 && $status != 412 && $status != 304)) {
-            throw new InvalidResponseException("Invalid response (".$status."): "
-                . $this->container->cfs_http->get_error());
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
+                .$this->container->cfs_http->get_error());
         }
+
         return $data;
     }
 
     /**
-     * Streaming read of Object's data
+     * Streaming read of Object's data.
      *
      * Given an open PHP resource (see PHP's fopen() method), fetch the Object's
      * data and write it to the open resource handle.  This is useful for
@@ -1846,28 +1899,31 @@ function read($hdrs=array())
      * #
      * </code>
      *
-     * @param resource $fp open resource for writing data to
-     * @param array $hdrs user-defined headers (Range, If-Match, etc.)
+     * @param resource $fp   open resource for writing data to
+     * @param array    $hdrs user-defined headers (Range, If-Match, etc.)
+     *
      * @return string Object's data
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function stream(&$fp, $hdrs=array())
+    public function stream(&$fp, $hdrs = [])
     {
-        list($status, $reason) = 
-                $this->container->cfs_http->get_object_to_stream($this,$fp,$hdrs);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->stream($fp, $hdrs);
-        #}
+        list($status, $reason) =
+                $this->container->cfs_http->get_object_to_stream($this, $fp, $hdrs);
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->stream($fp, $hdrs);
+        //}
         if (($status < 200) || ($status > 299
                 && $status != 412 && $status != 304)) {
-            throw new InvalidResponseException("Invalid response (".$status."): "
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
                 .$reason);
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Store new Object metadata
+     * Store new Object metadata.
      *
      * Write's an Object's metadata to the remote Object.  This will overwrite
      * an prior Object metadata.
@@ -1893,27 +1949,30 @@ function stream(&$fp, $hdrs=array())
      * $doc->sync_metadata();
      * </code>
      *
-     * @return boolean <kbd>True</kbd> if successful, <kbd>False</kbd> otherwise
+     * @return bool <kbd>True</kbd> if successful, <kbd>False</kbd> otherwise
+     *
      * @throws InvalidResponseException unexpected response
      */
-    function sync_metadata()
+    public function sync_metadata()
     {
         if (!empty($this->metadata)) {
             $status = $this->container->cfs_http->update_object($this);
-            #if ($status == 401 && $this->_re_auth()) {
-            #    return $this->sync_metadata();
-            #}
+            //if ($status == 401 && $this->_re_auth()) {
+            //    return $this->sync_metadata();
+            //}
             if ($status != 202) {
-                throw new InvalidResponseException("Invalid response ("
-                    .$status."): ".$this->container->cfs_http->get_error());
+                throw new InvalidResponseException('Invalid response ('
+                    .$status.'): '.$this->container->cfs_http->get_error());
             }
-            return True;
+
+            return true;
         }
-        return False;
+
+        return false;
     }
 
     /**
-     * Upload Object's data to Cloud Files
+     * Upload Object's data to Cloud Files.
      *
      * Write data to the remote Object.  The $data argument can either be a
      * PHP resource open for reading (see PHP's fopen() method) or an in-memory
@@ -1933,51 +1992,53 @@ function sync_metadata()
      * $doc->write("This is just placeholder text for now...");
      * </code>
      *
-     * @param string|resource $data string or open resource
-     * @param float $bytes amount of data to upload (required for resources)
-     * @param boolean $verify generate, send, and compare MD5 checksums
-     * @return boolean <kbd>True</kbd> when data uploaded successfully
-     * @throws SyntaxException missing required parameters
-     * @throws BadContentTypeException if no Content-Type was/could be set
+     * @param string|resource $data   string or open resource
+     * @param float           $bytes  amount of data to upload (required for resources)
+     * @param bool            $verify generate, send, and compare MD5 checksums
+     *
+     * @return bool <kbd>True</kbd> when data uploaded successfully
+     *
+     * @throws SyntaxException             missing required parameters
+     * @throws BadContentTypeException     if no Content-Type was/could be set
      * @throws MisMatchedChecksumException $verify is set and checksums unequal
-     * @throws InvalidResponseException unexpected response
+     * @throws InvalidResponseException    unexpected response
      */
-    function write($data=NULL, $bytes=0, $verify=True)
+    public function write($data = null, $bytes = 0, $verify = true)
     {
         if (!$data) {
-            throw new SyntaxException("Missing data source.");
+            throw new SyntaxException('Missing data source.');
         }
         if ($bytes > MAX_OBJECT_SIZE) {
-            throw new SyntaxException("Bytes exceeds maximum object size.");
+            throw new SyntaxException('Bytes exceeds maximum object size.');
         }
         if ($verify) {
             if (!$this->_etag_override) {
                 $this->etag = $this->compute_md5sum($data);
             }
         } else {
-            $this->etag = NULL;
+            $this->etag = null;
         }
 
-        $close_fh = False;
+        $close_fh = false;
         if (!is_resource($data)) {
-            # A hack to treat string data as a file handle.  php://memory feels
-            # like a better option, but it seems to break on Windows so use
-            # a temporary file instead.
-            #
-            $fp = fopen("php://temp", "wb+");
-            #$fp = fopen("php://memory", "wb+");
+            // A hack to treat string data as a file handle.  php://memory feels
+            // like a better option, but it seems to break on Windows so use
+            // a temporary file instead.
+
+            $fp = fopen('php://temp', 'wb+');
+            //$fp = fopen("php://memory", "wb+");
             fwrite($fp, $data, strlen($data));
             rewind($fp);
-            $close_fh = True;
+            $close_fh             = true;
             $this->content_length = (float) strlen($data);
             if ($this->content_length > MAX_OBJECT_SIZE) {
-                throw new SyntaxException("Data exceeds maximum object size");
+                throw new SyntaxException('Data exceeds maximum object size');
             }
             $ct_data = substr($data, 0, 64);
         } else {
             $this->content_length = $bytes;
-            $fp = $data;
-            $ct_data = fread($data, 64);
+            $fp                   = $data;
+            $ct_data              = fread($data, 64);
             rewind($data);
         }
 
@@ -1985,32 +2046,41 @@ function write($data=NULL, $bytes=0, $verify=True)
 
         list($status, $reason, $etag) =
                 $this->container->cfs_http->put_object($this, $fp);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->write($data, $bytes, $verify);
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->write($data, $bytes, $verify);
+        //}
         if ($status == 412) {
-            if ($close_fh) { fclose($fp); }
-            throw new SyntaxException("Missing Content-Type header");
+            if ($close_fh) {
+                fclose($fp);
+            }
+            throw new SyntaxException('Missing Content-Type header');
         }
         if ($status == 422) {
-            if ($close_fh) { fclose($fp); }
+            if ($close_fh) {
+                fclose($fp);
+            }
             throw new MisMatchedChecksumException(
-                "Supplied and computed checksums do not match.");
+                'Supplied and computed checksums do not match.');
         }
         if ($status != 201) {
-            if ($close_fh) { fclose($fp); }
-            throw new InvalidResponseException("Invalid response (".$status."): "
-                . $this->container->cfs_http->get_error());
+            if ($close_fh) {
+                fclose($fp);
+            }
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
+                .$this->container->cfs_http->get_error());
         }
         if (!$verify) {
             $this->etag = $etag;
         }
-        if ($close_fh) { fclose($fp); }
-        return True;
+        if ($close_fh) {
+            fclose($fp);
+        }
+
+        return true;
     }
 
     /**
-     * Upload Object data from local filename
+     * Upload Object data from local filename.
      *
      * This is a convenience function to upload the data from a local file.  A
      * True value for $verify will cause the method to compute the Object's MD5
@@ -2030,37 +2100,40 @@ function write($data=NULL, $bytes=0, $verify=True)
      * </code>
      *
      * @param string $filename full path to local file
-     * @param boolean $verify enable local/remote MD5 checksum validation
-     * @return boolean <kbd>True</kbd> if data uploaded successfully
-     * @throws SyntaxException missing required parameters
-     * @throws BadContentTypeException if no Content-Type was/could be set
+     * @param bool   $verify   enable local/remote MD5 checksum validation
+     *
+     * @return bool <kbd>True</kbd> if data uploaded successfully
+     *
+     * @throws SyntaxException             missing required parameters
+     * @throws BadContentTypeException     if no Content-Type was/could be set
      * @throws MisMatchedChecksumException $verify is set and checksums unequal
-     * @throws InvalidResponseException unexpected response
-     * @throws IOException error opening file
+     * @throws InvalidResponseException    unexpected response
+     * @throws IOException                 error opening file
      */
-    function load_from_filename($filename, $verify=True)
+    public function load_from_filename($filename, $verify = true)
     {
-        $fp = @fopen($filename, "r");
+        $fp = @fopen($filename, 'r');
         if (!$fp) {
-            throw new IOException("Could not open file for reading: ".$filename);
+            throw new IOException('Could not open file for reading: '.$filename);
         }
 
         clearstatcache();
-        
-        $size = (float) sprintf("%u", filesize($filename));
+
+        $size = (float) sprintf('%u', filesize($filename));
         if ($size > MAX_OBJECT_SIZE) {
-            throw new SyntaxException("File size exceeds maximum object size.");
+            throw new SyntaxException('File size exceeds maximum object size.');
         }
 
         $this->_guess_content_type($filename);
-        
+
         $this->write($fp, $size, $verify);
         fclose($fp);
-        return True;
+
+        return true;
     }
 
     /**
-     * Save Object's data to local filename
+     * Save Object's data to local filename.
      *
      * Given a local filename, the Object's data will be written to the newly
      * created file.
@@ -2079,21 +2152,24 @@ function load_from_filename($filename, $verify=True)
      * </code>
      *
      * @param string $filename name of local file to write data to
-     * @return boolean <kbd>True</kbd> if successful
-     * @throws IOException error opening file
+     *
+     * @return bool <kbd>True</kbd> if successful
+     *
+     * @throws IOException              error opening file
      * @throws InvalidResponseException unexpected response
      */
-    function save_to_filename($filename)
+    public function save_to_filename($filename)
     {
-        $fp = @fopen($filename, "wb");
+        $fp = @fopen($filename, 'wb');
         if (!$fp) {
-            throw new IOException("Could not open file for writing: ".$filename);
+            throw new IOException('Could not open file for writing: '.$filename);
         }
         $result = $this->stream($fp);
         fclose($fp);
+
         return $result;
     }
-       /**
+    /**
      * Purge this Object from CDN Cache.
      * Example:
      * <code>
@@ -2105,29 +2181,31 @@ function save_to_filename($filename)
      * $obj->purge_from_cdn("user@domain.com");
      * # or
      * $obj->purge_from_cdn();
-     * # or 
-     * $obj->purge_from_cdn("user1@domain.com,user2@domain.com");
+     * # or
+     * $obj->purge_from_cdn("user1@domain.com,user2@domain.com");.
+     *
      * @returns boolean True if successful
-     * @throws CDNNotEnabledException if CDN Is not enabled on this connection
+     *
+     * @throws CDNNotEnabledException   if CDN Is not enabled on this connection
      * @throws InvalidResponseException if the response expected is not returned
      */
-    function purge_from_cdn($email=null)
+    public function purge_from_cdn($email = null)
     {
-        if (!$this->container->cfs_http->getCDNMUrl())
-        {
+        if (!$this->container->cfs_http->getCDNMUrl()) {
             throw new CDNNotEnabledException(
-                "Authentication response did not indicate CDN availability");
+                'Authentication response did not indicate CDN availability');
         }
-        $status = $this->container->cfs_http->purge_from_cdn($this->container->name . "/" . $this->name, $email);
+        $status = $this->container->cfs_http->purge_from_cdn($this->container->name.'/'.$this->name, $email);
         if ($status < 199 or $status > 299) {
             throw new InvalidResponseException(
-                "Invalid response (".$status."): ".$this->container->cfs_http->get_error());
+                'Invalid response ('.$status.'): '.$this->container->cfs_http->get_error());
         }
-        return True;
+
+        return true;
     }
 
     /**
-     * Set Object's MD5 checksum
+     * Set Object's MD5 checksum.
      *
      * Manually set the Object's ETag.  Including the ETag is mandatory for
      * Cloud Files to perform end-to-end verification.  Omitting the ETag forces
@@ -2135,26 +2213,26 @@ function purge_from_cdn($email=null)
      *
      * @param string $etag MD5 checksum hexidecimal string
      */
-    function set_etag($etag)
+    public function set_etag($etag)
     {
-        $this->etag = $etag;
-        $this->_etag_override = True;
+        $this->etag           = $etag;
+        $this->_etag_override = true;
     }
 
     /**
-     * Object's MD5 checksum
+     * Object's MD5 checksum.
      *
      * Accessor method for reading Object's private ETag attribute.
      *
      * @return string MD5 checksum hexidecimal string
      */
-    function getETag()
+    public function getETag()
     {
         return $this->etag;
     }
 
     /**
-     * Compute the MD5 checksum
+     * Compute the MD5 checksum.
      *
      * Calculate the MD5 checksum on either a PHP resource or data.  The argument
      * may either be a local filename, open resource for reading, or a string.
@@ -2165,12 +2243,12 @@ function getETag()
      * compute yourself the md5 before if you have it.
      *
      * @param filename|obj|string $data filename, open resource, or string
+     *
      * @return string MD5 checksum hexidecimal string
      */
-    function compute_md5sum(&$data)
+    public function compute_md5sum(&$data)
     {
-
-        if (function_exists("hash_init") && is_resource($data)) {
+        if (function_exists('hash_init') && is_resource($data)) {
             $ctx = hash_init('md5');
             while (!feof($data)) {
                 $buffer = fgets($data, 65536);
@@ -2178,52 +2256,54 @@ function compute_md5sum(&$data)
             }
             $md5 = hash_final($ctx, false);
             rewind($data);
-        } elseif ((string)is_file($data)) {
+        } elseif ((string) is_file($data)) {
             $md5 = md5_file($data);
         } else {
             $md5 = md5($data);
         }
+
         return $md5;
     }
 
     /**
-     * PRIVATE: fetch information about the remote Object if it exists
+     * PRIVATE: fetch information about the remote Object if it exists.
      */
     private function _initialize()
     {
         list($status, $reason, $etag, $last_modified, $content_type,
             $content_length, $metadata) =
                 $this->container->cfs_http->head_object($this);
-        #if ($status == 401 && $this->_re_auth()) {
-        #    return $this->_initialize();
-        #}
+        //if ($status == 401 && $this->_re_auth()) {
+        //    return $this->_initialize();
+        //}
         if ($status == 404) {
-            return False;
+            return false;
         }
         if ($status < 200 || $status > 299) {
-            throw new InvalidResponseException("Invalid response (".$status."): "
-                . $this->container->cfs_http->get_error());
+            throw new InvalidResponseException('Invalid response ('.$status.'): '
+                .$this->container->cfs_http->get_error());
         }
-        $this->etag = $etag;
-        $this->last_modified = $last_modified;
-        $this->content_type = $content_type;
+        $this->etag           = $etag;
+        $this->last_modified  = $last_modified;
+        $this->content_type   = $content_type;
         $this->content_length = $content_length;
-        $this->metadata = $metadata;
-        return True;
+        $this->metadata       = $metadata;
+
+        return true;
     }
 
-    #private function _re_auth()
-    #{
-    #    $new_auth = new CF_Authentication(
-    #        $this->cfs_auth->username,
-    #        $this->cfs_auth->api_key,
-    #        $this->cfs_auth->auth_host,
-    #        $this->cfs_auth->account);
-    #    $new_auth->authenticate();
-    #    $this->container->cfs_auth = $new_auth;
-    #    $this->container->cfs_http->setCFAuth($this->cfs_auth);
-    #    return True;
-    #}
+    //private function _re_auth()
+    //{
+    //    $new_auth = new CF_Authentication(
+    //        $this->cfs_auth->username,
+    //        $this->cfs_auth->api_key,
+    //        $this->cfs_auth->auth_host,
+    //        $this->cfs_auth->account);
+    //    $new_auth->authenticate();
+    //    $this->container->cfs_auth = $new_auth;
+    //    $this->container->cfs_http->setCFAuth($this->cfs_auth);
+    //    return True;
+    //}
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
@@ -2235,4 +2315,3 @@ private function _initialize()
  * c-hanging-comment-ender-p: nil
  * End:
  */
-?>
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php
index 5624d6b8634..ad478aad489 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_exceptions.php
@@ -1,33 +1,57 @@
 <?php
 /**
- * Custom Exceptions for the CloudFiles API
+ * Custom Exceptions for the CloudFiles API.
  *
  * Requres PHP 5.x (for Exceptions and OO syntax)
  *
  * See COPYING for license information.
  *
  * @author Eric "EJ" Johnson <ej@racklabs.com>
- * @copyright Copyright (c) 2008, Rackspace US, Inc.
- * @package php-cloudfiles-exceptions
+ * @copyright Copyright (c) 2008, Rackspace US, Inc
  */
 
 /**
- * Custom Exceptions for the CloudFiles API
- * @package php-cloudfiles-exceptions
+ * Custom Exceptions for the CloudFiles API.
  */
-class SyntaxException extends Exception { }
-class AuthenticationException extends Exception { }
-class InvalidResponseException extends Exception { }
-class NonEmptyContainerException extends Exception { }
-class NoSuchObjectException extends Exception { }
-class NoSuchContainerException extends Exception { }
-class NoSuchAccountException extends Exception { }
-class MisMatchedChecksumException extends Exception { }
-class IOException extends Exception { }
-class CDNNotEnabledException extends Exception { }
-class BadContentTypeException extends Exception { }
-class InvalidUTF8Exception extends Exception { }
-class ConnectionNotOpenException extends Exception { }
+class SyntaxException extends Exception
+{
+}
+class AuthenticationException extends Exception
+{
+}
+class InvalidResponseException extends Exception
+{
+}
+class NonEmptyContainerException extends Exception
+{
+}
+class NoSuchObjectException extends Exception
+{
+}
+class NoSuchContainerException extends Exception
+{
+}
+class NoSuchAccountException extends Exception
+{
+}
+class MisMatchedChecksumException extends Exception
+{
+}
+class IOException extends Exception
+{
+}
+class CDNNotEnabledException extends Exception
+{
+}
+class BadContentTypeException extends Exception
+{
+}
+class InvalidUTF8Exception extends Exception
+{
+}
+class ConnectionNotOpenException extends Exception
+{
+}
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
@@ -38,4 +62,3 @@ class ConnectionNotOpenException extends Exception { }
  * c-hanging-comment-ender-p: nil
  * End:
  */
-?>
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
index 24896f14651..06c662e4f95 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
@@ -21,43 +21,37 @@
  * See COPYING for license information.
  *
  * @author Eric "EJ" Johnson <ej@racklabs.com>
- * @copyright Copyright (c) 2008, Rackspace US, Inc.
- * @package php-cloudfiles-http
+ * @copyright Copyright (c) 2008, Rackspace US, Inc
  */
-
-/**
- */
-require_once("cloudfiles_exceptions.php");
-
-define("PHP_CF_VERSION", "1.7.7");
-define("USER_AGENT", sprintf("PHP-CloudFiles/%s", PHP_CF_VERSION));
-define("ACCOUNT_CONTAINER_COUNT", "X-Account-Container-Count");
-define("ACCOUNT_BYTES_USED", "X-Account-Bytes-Used");
-define("CONTAINER_OBJ_COUNT", "X-Container-Object-Count");
-define("CONTAINER_BYTES_USED", "X-Container-Bytes-Used");
-define("METADATA_HEADER", "X-Object-Meta-");
-define("CDN_URI", "X-CDN-URI");
-define("CDN_ENABLED", "X-CDN-Enabled");
-define("CDN_LOG_RETENTION", "X-Log-Retention");
-define("CDN_ACL_USER_AGENT", "X-User-Agent-ACL");
-define("CDN_ACL_REFERRER", "X-Referrer-ACL");
-define("CDN_TTL", "X-TTL");
-define("CDNM_URL", "X-CDN-Management-Url");
-define("STORAGE_URL", "X-Storage-Url");
-define("AUTH_TOKEN", "X-Auth-Token");
-define("AUTH_USER_HEADER", "X-Auth-User");
-define("AUTH_KEY_HEADER", "X-Auth-Key");
-define("AUTH_USER_HEADER_LEGACY", "X-Storage-User");
-define("AUTH_KEY_HEADER_LEGACY", "X-Storage-Pass");
-define("AUTH_TOKEN_LEGACY", "X-Storage-Token");
-define("CDN_EMAIL", "X-Purge-Email");
+require_once 'cloudfiles_exceptions.php';
+
+define('PHP_CF_VERSION', '1.7.7');
+define('USER_AGENT', sprintf('PHP-CloudFiles/%s', PHP_CF_VERSION));
+define('ACCOUNT_CONTAINER_COUNT', 'X-Account-Container-Count');
+define('ACCOUNT_BYTES_USED', 'X-Account-Bytes-Used');
+define('CONTAINER_OBJ_COUNT', 'X-Container-Object-Count');
+define('CONTAINER_BYTES_USED', 'X-Container-Bytes-Used');
+define('METADATA_HEADER', 'X-Object-Meta-');
+define('CDN_URI', 'X-CDN-URI');
+define('CDN_ENABLED', 'X-CDN-Enabled');
+define('CDN_LOG_RETENTION', 'X-Log-Retention');
+define('CDN_ACL_USER_AGENT', 'X-User-Agent-ACL');
+define('CDN_ACL_REFERRER', 'X-Referrer-ACL');
+define('CDN_TTL', 'X-TTL');
+define('CDNM_URL', 'X-CDN-Management-Url');
+define('STORAGE_URL', 'X-Storage-Url');
+define('AUTH_TOKEN', 'X-Auth-Token');
+define('AUTH_USER_HEADER', 'X-Auth-User');
+define('AUTH_KEY_HEADER', 'X-Auth-Key');
+define('AUTH_USER_HEADER_LEGACY', 'X-Storage-User');
+define('AUTH_KEY_HEADER_LEGACY', 'X-Storage-Pass');
+define('AUTH_TOKEN_LEGACY', 'X-Storage-Token');
+define('CDN_EMAIL', 'X-Purge-Email');
 /**
- * HTTP/cURL wrapper for Cloud Files
+ * HTTP/cURL wrapper for Cloud Files.
  *
  * This class should not be used directly.  It's only purpose is to abstract
  * out the HTTP communication from the main API.
- *
- * @package php-cloudfiles-http
  */
 class CF_Http
 {
@@ -66,20 +60,20 @@ class CF_Http
     private $cabundle_path;
     private $api_version;
 
-    # Authentication instance variables
-    #
+    // Authentication instance variables
+
     private $storage_url;
     private $cdnm_url;
     private $auth_token;
 
-    # Request/response variables
-    #
+    // Request/response variables
+
     private $response_status;
     private $response_reason;
     private $connections;
 
-    # Variables used for content/header callbacks
-    #
+    // Variables used for content/header callbacks
+
     private $_user_read_progress_callback_func;
     private $_user_write_progress_callback_func;
     private $_write_callback_type;
@@ -102,108 +96,109 @@ class CF_Http
     private $_cdn_acl_user_agent;
     private $_cdn_acl_referrer;
 
-    function __construct($api_version)
+    public function __construct($api_version)
     {
-        $this->dbug = False;
-        $this->cabundle_path = NULL;
-        $this->api_version = $api_version;
-        $this->error_str = NULL;
-
-        $this->storage_url = NULL;
-        $this->cdnm_url = NULL;
-        $this->auth_token = NULL;
-
-        $this->response_status = NULL;
-        $this->response_reason = NULL;
-
-        # Curl connections array - since there is no way to "re-set" the
-        # connection paramaters for a cURL handle, we keep an array of
-        # the unique use-cases and funnel all of those same type
-        # requests through the appropriate curl connection.
-        #
-        $this->connections = array(
-            "GET_CALL"  => NULL, # GET objects/containers/lists
-            "PUT_OBJ"   => NULL, # PUT object
-            "HEAD"      => NULL, # HEAD requests
-            "PUT_CONT"  => NULL, # PUT container
-            "DEL_POST"  => NULL, # DELETE containers/objects, POST objects
-        );
-
-        $this->_user_read_progress_callback_func = NULL;
-        $this->_user_write_progress_callback_func = NULL;
-        $this->_write_callback_type = NULL;
-        $this->_text_list = array();
-	$this->_return_list = NULL;
-        $this->_account_container_count = 0;
-        $this->_account_bytes_used = 0;
-        $this->_container_object_count = 0;
-        $this->_container_bytes_used = 0;
-        $this->_obj_write_resource = NULL;
-        $this->_obj_write_string = "";
-        $this->_obj_etag = NULL;
-        $this->_obj_last_modified = NULL;
-        $this->_obj_content_type = NULL;
-        $this->_obj_content_length = NULL;
-        $this->_obj_metadata = array();
-        $this->_cdn_enabled = NULL;
-        $this->_cdn_uri = NULL;
-        $this->_cdn_ttl = NULL;
-        $this->_cdn_log_retention = NULL;
-        $this->_cdn_acl_user_agent = NULL;
-        $this->_cdn_acl_referrer = NULL;
-
-        # The OS list with a PHP without an updated CA File for CURL to
-        # connect to SSL Websites. It is the first 3 letters of the PHP_OS
-        # variable.
-        $OS_CAFILE_NONUPDATED=array(
-            "win","dar"
-        ); 
-
-        if (in_array((strtolower (substr(PHP_OS, 0,3))), $OS_CAFILE_NONUPDATED))
+        $this->dbug          = false;
+        $this->cabundle_path = null;
+        $this->api_version   = $api_version;
+        $this->error_str     = null;
+
+        $this->storage_url = null;
+        $this->cdnm_url    = null;
+        $this->auth_token  = null;
+
+        $this->response_status = null;
+        $this->response_reason = null;
+
+        // Curl connections array - since there is no way to "re-set" the
+        // connection paramaters for a cURL handle, we keep an array of
+        // the unique use-cases and funnel all of those same type
+        // requests through the appropriate curl connection.
+
+        $this->connections = [
+            'GET_CALL' => null, // GET objects/containers/lists
+            'PUT_OBJ'  => null, // PUT object
+            'HEAD'     => null, // HEAD requests
+            'PUT_CONT' => null, // PUT container
+            'DEL_POST' => null, // DELETE containers/objects, POST objects
+        ];
+
+        $this->_user_read_progress_callback_func  = null;
+        $this->_user_write_progress_callback_func = null;
+        $this->_write_callback_type               = null;
+        $this->_text_list                         = [];
+        $this->_return_list                       = null;
+        $this->_account_container_count           = 0;
+        $this->_account_bytes_used                = 0;
+        $this->_container_object_count            = 0;
+        $this->_container_bytes_used              = 0;
+        $this->_obj_write_resource                = null;
+        $this->_obj_write_string                  = '';
+        $this->_obj_etag                          = null;
+        $this->_obj_last_modified                 = null;
+        $this->_obj_content_type                  = null;
+        $this->_obj_content_length                = null;
+        $this->_obj_metadata                      = [];
+        $this->_cdn_enabled                       = null;
+        $this->_cdn_uri                           = null;
+        $this->_cdn_ttl                           = null;
+        $this->_cdn_log_retention                 = null;
+        $this->_cdn_acl_user_agent                = null;
+        $this->_cdn_acl_referrer                  = null;
+
+        // The OS list with a PHP without an updated CA File for CURL to
+        // connect to SSL Websites. It is the first 3 letters of the PHP_OS
+        // variable.
+        $OS_CAFILE_NONUPDATED = [
+            'win', 'dar',
+        ];
+
+        if (in_array((strtolower(substr(PHP_OS, 0, 3))), $OS_CAFILE_NONUPDATED)) {
             $this->ssl_use_cabundle();
-        
+        }
     }
 
-    function ssl_use_cabundle($path=NULL)
+    public function ssl_use_cabundle($path = null)
     {
         if ($path) {
             $this->cabundle_path = $path;
         } else {
-            $this->cabundle_path = dirname(__FILE__) . "/share/cacert.pem";
+            $this->cabundle_path = dirname(__FILE__).'/share/cacert.pem';
         }
         if (!file_exists($this->cabundle_path)) {
-            throw new IOException("Could not use CA bundle: "
-                . $this->cabundle_path);
+            throw new IOException('Could not use CA bundle: '
+                .$this->cabundle_path);
         }
+
         return;
     }
 
-    # Uses separate cURL connection to authenticate
-    #
-    function authenticate($user, $pass, $acct=NULL, $host=NULL)
+    // Uses separate cURL connection to authenticate
+
+    public function authenticate($user, $pass, $acct = null, $host = null)
     {
-        $path = array();
-        if (isset($acct)){
-            $headers = array(
-                sprintf("%s: %s", AUTH_USER_HEADER_LEGACY, $user),
-                sprintf("%s: %s", AUTH_KEY_HEADER_LEGACY, $pass),
-                );
+        $path = [];
+        if (isset($acct)) {
+            $headers = [
+                sprintf('%s: %s', AUTH_USER_HEADER_LEGACY, $user),
+                sprintf('%s: %s', AUTH_KEY_HEADER_LEGACY, $pass),
+                ];
             $path[] = $host;
-            $path[] = rawurlencode(sprintf("v%d",$this->api_version));
+            $path[] = rawurlencode(sprintf('v%d', $this->api_version));
             $path[] = rawurlencode($acct);
         } else {
-            $headers = array(
-                sprintf("%s: %s", AUTH_USER_HEADER, $user),
-                sprintf("%s: %s", AUTH_KEY_HEADER, $pass),
-                );
-	    $path[] = $host;
+            $headers = [
+                sprintf('%s: %s', AUTH_USER_HEADER, $user),
+                sprintf('%s: %s', AUTH_KEY_HEADER, $pass),
+                ];
+            $path[] = $host;
         }
-	$path[] = "v1.0";
-        $url = implode("/", $path);
+        $path[] = 'v1.0';
+        $url    = implode('/', $path);
 
         $curl_ch = curl_init();
         if (!is_null($this->cabundle_path)) {
-            curl_setopt($curl_ch, CURLOPT_SSL_VERIFYPEER, True);
+            curl_setopt($curl_ch, CURLOPT_SSL_VERIFYPEER, true);
             curl_setopt($curl_ch, CURLOPT_CAINFO, $this->cabundle_path);
         }
         curl_setopt($curl_ch, CURLOPT_VERBOSE, $this->dbug);
@@ -212,736 +207,808 @@ function authenticate($user, $pass, $acct=NULL, $host=NULL)
         curl_setopt($curl_ch, CURLOPT_HEADER, 0);
         curl_setopt($curl_ch, CURLOPT_HTTPHEADER, $headers);
         curl_setopt($curl_ch, CURLOPT_USERAGENT, USER_AGENT);
-        curl_setopt($curl_ch, CURLOPT_RETURNTRANSFER, TRUE);
-        curl_setopt($curl_ch, CURLOPT_HEADERFUNCTION,array(&$this,'_auth_hdr_cb'));
+        curl_setopt($curl_ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl_ch, CURLOPT_HEADERFUNCTION, [&$this, '_auth_hdr_cb']);
         curl_setopt($curl_ch, CURLOPT_CONNECTTIMEOUT, 10);
         curl_setopt($curl_ch, CURLOPT_URL, $url);
         curl_exec($curl_ch);
         curl_close($curl_ch);
 
-        return array($this->response_status, $this->response_reason,
-            $this->storage_url, $this->cdnm_url, $this->auth_token);
+        return [$this->response_status, $this->response_reason,
+            $this->storage_url, $this->cdnm_url, $this->auth_token, ];
     }
 
-    # (CDN) GET /v1/Account
-    #
-    function list_cdn_containers($enabled_only)
+    // (CDN) GET /v1/Account
+
+    public function list_cdn_containers($enabled_only)
     {
-        $conn_type = "GET_CALL";
-        $url_path = $this->_make_path("CDN");
+        $conn_type = 'GET_CALL';
+        $url_path  = $this->_make_path('CDN');
 
-        $this->_write_callback_type = "TEXT_LIST";
-        if ($enabled_only)
-        {
-            $return_code = $this->_send_request($conn_type, $url_path . 
+        $this->_write_callback_type = 'TEXT_LIST';
+        if ($enabled_only) {
+            $return_code = $this->_send_request($conn_type, $url_path.
             '/?enabled_only=true');
-        }
-        else
-        {
+        } else {
             $return_code = $this->_send_request($conn_type, $url_path);
         }
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+            [0, $this->error_str, []];
         }
         if ($return_code == 401) {
-            return array($return_code,"Unauthorized",array());
+            return [$return_code, 'Unauthorized', []];
         }
         if ($return_code == 404) {
-            return array($return_code,"Account not found.",array());
+            return [$return_code, 'Account not found.', []];
         }
         if ($return_code == 204) {
-            return array($return_code,"Account has no CDN enabled Containers.",
-                array());
+            return [$return_code, 'Account has no CDN enabled Containers.',
+                [], ];
         }
         if ($return_code == 200) {
-	    $this->create_array();
-            return array($return_code,$this->response_reason,$this->_text_list);
+            $this->create_array();
+
+            return [$return_code, $this->response_reason, $this->_text_list];
         }
-        $this->error_str = "Unexpected HTTP response: ".$this->response_reason;
-        return array($return_code,$this->error_str,array());
+        $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+        return [$return_code, $this->error_str, []];
     }
 
-    # (CDN) DELETE /v1/Account/Container or /v1/Account/Container/Object
-    #
-    function purge_from_cdn($path, $email=null)
+    // (CDN) DELETE /v1/Account/Container or /v1/Account/Container/Object
+
+    public function purge_from_cdn($path, $email = null)
     {
-        if(!$path)
-            throw new SyntaxException("Path not set");
-        $url_path = $this->_make_path("CDN", NULL, $path);
-        if($email)
-        {
-            $hdrs = array(CDN_EMAIL => $email);
-            $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"DELETE");
-        }
-        else
-            $return_code = $this->_send_request("DEL_POST",$url_path,null,"DELETE");
+        if (!$path) {
+            throw new SyntaxException('Path not set');
+        }
+        $url_path = $this->_make_path('CDN', null, $path);
+        if ($email) {
+            $hdrs        = [CDN_EMAIL => $email];
+            $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'DELETE');
+        } else {
+            $return_code = $this->_send_request('DEL_POST', $url_path, null, 'DELETE');
+        }
+
         return $return_code;
     }
 
-    # (CDN) POST /v1/Account/Container
-    function update_cdn_container($container_name, $ttl=86400, $cdn_log_retention=False,
-                                  $cdn_acl_user_agent="", $cdn_acl_referrer)
+    // (CDN) POST /v1/Account/Container
+    public function update_cdn_container($container_name, $ttl, $cdn_log_retention,
+                                  $cdn_acl_user_agent, $cdn_acl_referrer)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        $url_path = $this->_make_path("CDN", $container_name);
-        $hdrs = array(
-            CDN_ENABLED => "True",
-            CDN_TTL => $ttl,
-            CDN_LOG_RETENTION => $cdn_log_retention ?  "True" : "False",
+        $url_path = $this->_make_path('CDN', $container_name);
+        $hdrs     = [
+            CDN_ENABLED        => 'True',
+            CDN_TTL            => $ttl,
+            CDN_LOG_RETENTION  => $cdn_log_retention ? 'True' : 'False',
             CDN_ACL_USER_AGENT => $cdn_acl_user_agent,
-            CDN_ACL_REFERRER => $cdn_acl_referrer,
-            );
-        $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"POST");
+            CDN_ACL_REFERRER   => $cdn_acl_referrer,
+            ];
+        $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'POST');
         if ($return_code == 401) {
-            $this->error_str = "Unauthorized";
-            return array($return_code, $this->error_str, NULL);
+            $this->error_str = 'Unauthorized';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container not found.";
-            return array($return_code, $this->error_str, NULL);
+            $this->error_str = 'Container not found.';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code != 202) {
-            $this->error_str="Unexpected HTTP response: ".$this->response_reason;
-            return array($return_code, $this->error_str, NULL);
+            $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+            return [$return_code, $this->error_str, null];
         }
-        return array($return_code, "Accepted", $this->_cdn_uri);
 
+        return [$return_code, 'Accepted', $this->_cdn_uri];
     }
 
-    # (CDN) PUT /v1/Account/Container
-    #
-    function add_cdn_container($container_name, $ttl=86400)
+    // (CDN) PUT /v1/Account/Container
+
+    public function add_cdn_container($container_name, $ttl = 86400)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
-
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        $url_path = $this->_make_path("CDN", $container_name);
-        $hdrs = array(
-            CDN_ENABLED => "True",
-            CDN_TTL => $ttl,
-            );
-        $return_code = $this->_send_request("PUT_CONT", $url_path, $hdrs);
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        $url_path = $this->_make_path('CDN', $container_name);
+        $hdrs     = [
+            CDN_ENABLED => 'True',
+            CDN_TTL     => $ttl,
+            ];
+        $return_code = $this->_send_request('PUT_CONT', $url_path, $hdrs);
         if ($return_code == 401) {
-            $this->error_str = "Unauthorized";
-            return array($return_code,$this->response_reason,False);
+            $this->error_str = 'Unauthorized';
+
+            return [$return_code, $this->response_reason, false];
         }
-        if (!in_array($return_code, array(201,202))) {
-            $this->error_str="Unexpected HTTP response: ".$this->response_reason;
-            return array($return_code,$this->response_reason,False);
+        if (!in_array($return_code, [201, 202])) {
+            $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+            return [$return_code, $this->response_reason, false];
         }
-        return array($return_code,$this->response_reason,$this->_cdn_uri);
+
+        return [$return_code, $this->response_reason, $this->_cdn_uri];
     }
 
-    # (CDN) POST /v1/Account/Container
-    #
-    function remove_cdn_container($container_name)
+    // (CDN) POST /v1/Account/Container
+
+    public function remove_cdn_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
-
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        $url_path = $this->_make_path("CDN", $container_name);
-        $hdrs = array(CDN_ENABLED => "False");
-        $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"POST");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        $url_path    = $this->_make_path('CDN', $container_name);
+        $hdrs        = [CDN_ENABLED => 'False'];
+        $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'POST');
         if ($return_code == 401) {
-            $this->error_str = "Unauthorized";
-            return array($return_code, $this->error_str);
+            $this->error_str = 'Unauthorized';
+
+            return [$return_code, $this->error_str];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container not found.";
-            return array($return_code, $this->error_str);
+            $this->error_str = 'Container not found.';
+
+            return [$return_code, $this->error_str];
         }
         if ($return_code != 202) {
-            $this->error_str="Unexpected HTTP response: ".$this->response_reason;
-            return array($return_code, $this->error_str);
+            $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+            return [$return_code, $this->error_str];
         }
-        return array($return_code, "Accepted");
+
+        return [$return_code, 'Accepted'];
     }
 
-    # (CDN) HEAD /v1/Account
-    #
-    function head_cdn_container($container_name)
+    // (CDN) HEAD /v1/Account
+
+    public function head_cdn_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
+
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
-        
-        $conn_type = "HEAD";
-        $url_path = $this->_make_path("CDN", $container_name);
-        $return_code = $this->_send_request($conn_type, $url_path, NULL, "GET", True);
+        $conn_type   = 'HEAD';
+        $url_path    = $this->_make_path('CDN', $container_name);
+        $return_code = $this->_send_request($conn_type, $url_path, null, 'GET', true);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,NULL,NULL,NULL,NULL,NULL,NULL);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, null, null, null, null, null, null];
         }
         if ($return_code == 401) {
-            return array($return_code,"Unauthorized",NULL,NULL,NULL,NULL,NULL,NULL);
+            return [$return_code, 'Unauthorized', null, null, null, null, null, null];
         }
         if ($return_code == 404) {
-            return array($return_code,"Account not found.",NULL,NULL,NULL,NULL,NULL,NULL);
+            return [$return_code, 'Account not found.', null, null, null, null, null, null];
         }
         if ($return_code == 204) {
-            return array($return_code,$this->response_reason,
+            return [$return_code, $this->response_reason,
                 $this->_cdn_enabled, $this->_cdn_uri, $this->_cdn_ttl,
                 $this->_cdn_log_retention,
                 $this->_cdn_acl_user_agent,
-                $this->_cdn_acl_referrer
-                );
+                $this->_cdn_acl_referrer,
+                ];
         }
-        return array($return_code,$this->response_reason,
-                     NULL,NULL,NULL,
+
+        return [$return_code, $this->response_reason,
+                     null, null, null,
                      $this->_cdn_log_retention,
                      $this->_cdn_acl_user_agent,
-                     $this->_cdn_acl_referrer
-            );
+                     $this->_cdn_acl_referrer,
+            ];
     }
 
-    # GET /v1/Account
-    #
-    function list_containers($limit=0, $marker=NULL)
+    // GET /v1/Account
+
+    public function list_containers($limit = 0, $marker = null)
     {
-        $conn_type = "GET_CALL";
-        $url_path = $this->_make_path();
+        $conn_type = 'GET_CALL';
+        $url_path  = $this->_make_path();
 
-        $limit = intval($limit);
-        $params = array();
+        $limit  = intval($limit);
+        $params = [];
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if (!empty($params)) {
-            $url_path .= "?" . implode("&", $params);
+            $url_path .= '?'.implode('&', $params);
         }
 
-        $this->_write_callback_type = "TEXT_LIST";
-        $return_code = $this->_send_request($conn_type, $url_path);
+        $this->_write_callback_type = 'TEXT_LIST';
+        $return_code                = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            return array($return_code, "Account has no containers.", array());
+            return [$return_code, 'Account has no containers.', []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Invalid account name for authentication token.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Invalid account name for authentication token.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-	    $this->create_array();
-            return array($return_code, $this->response_reason, $this->_text_list);
+            $this->create_array();
+
+            return [$return_code, $this->response_reason, $this->_text_list];
         }
-        $this->error_str = "Unexpected HTTP response: ".$this->response_reason;
-        return array($return_code,$this->error_str,array());
+        $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+        return [$return_code, $this->error_str, []];
     }
 
-    # GET /v1/Account?format=json
-    #
-    function list_containers_info($limit=0, $marker=NULL)
+    // GET /v1/Account?format=json
+
+    public function list_containers_info($limit = 0, $marker = null)
     {
-        $conn_type = "GET_CALL";
-        $url_path = $this->_make_path() . "?format=json";
+        $conn_type = 'GET_CALL';
+        $url_path  = $this->_make_path().'?format=json';
 
-        $limit = intval($limit);
-        $params = array();
+        $limit  = intval($limit);
+        $params = [];
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if (!empty($params)) {
-            $url_path .= "&" . implode("&", $params);
+            $url_path .= '&'.implode('&', $params);
         }
 
-        $this->_write_callback_type = "OBJECT_STRING";
-        $return_code = $this->_send_request($conn_type, $url_path);
+        $this->_write_callback_type = 'OBJECT_STRING';
+        $return_code                = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            return array($return_code, "Account has no containers.", array());
+            return [$return_code, 'Account has no containers.', []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Invalid account name for authentication token.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Invalid account name for authentication token.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-            $json_body = json_decode($this->_obj_write_string, True);
-            return array($return_code, $this->response_reason, $json_body);
+            $json_body = json_decode($this->_obj_write_string, true);
+
+            return [$return_code, $this->response_reason, $json_body];
         }
-        $this->error_str = "Unexpected HTTP response: ".$this->response_reason;
-        return array($return_code,$this->error_str,array());
+        $this->error_str = 'Unexpected HTTP response: '.$this->response_reason;
+
+        return [$return_code, $this->error_str, []];
     }
 
-    # HEAD /v1/Account
-    #
-    function head_account()
+    // HEAD /v1/Account
+
+    public function head_account()
     {
-        $conn_type = "HEAD";
+        $conn_type = 'HEAD';
 
-        $url_path = $this->_make_path();
-        $return_code = $this->_send_request($conn_type,$url_path);
+        $url_path    = $this->_make_path();
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            array(0,$this->error_str,0,0);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+            [0, $this->error_str, 0, 0];
         }
         if ($return_code == 404) {
-            return array($return_code,"Account not found.",0,0);
+            return [$return_code, 'Account not found.', 0, 0];
         }
         if ($return_code == 204) {
-            return array($return_code,$this->response_reason,
-                $this->_account_container_count, $this->_account_bytes_used);
+            return [$return_code, $this->response_reason,
+                $this->_account_container_count, $this->_account_bytes_used, ];
         }
-        return array($return_code,$this->response_reason,0,0);
+
+        return [$return_code, $this->response_reason, 0, 0];
     }
 
-    # PUT /v1/Account/Container
-    #
-    function create_container($container_name)
+    // PUT /v1/Account/Container
+
+    public function create_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        $url_path = $this->_make_path("STORAGE", $container_name);
-        $return_code = $this->_send_request("PUT_CONT",$url_path);
+        $url_path    = $this->_make_path('STORAGE', $container_name);
+        $return_code = $this->_send_request('PUT_CONT', $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return False;
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return false;
         }
+
         return $return_code;
     }
 
-    # DELETE /v1/Account/Container
-    #
-    function delete_container($container_name)
+    // DELETE /v1/Account/Container
+
+    public function delete_container($container_name)
     {
-        if ($container_name == "")
-            throw new SyntaxException("Container name not set.");
+        if ($container_name == '') {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        if ($container_name != "0" and !isset($container_name))
-            throw new SyntaxException("Container name not set.");
+        if ($container_name != '0' and !isset($container_name)) {
+            throw new SyntaxException('Container name not set.');
+        }
 
-        $url_path = $this->_make_path("STORAGE", $container_name);
-        $return_code = $this->_send_request("DEL_POST",$url_path,array(),"DELETE");
+        $url_path    = $this->_make_path('STORAGE', $container_name);
+        $return_code = $this->_send_request('DEL_POST', $url_path, [], 'DELETE');
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
         }
         if ($return_code == 409) {
-            $this->error_str = "Container must be empty prior to removing it.";
+            $this->error_str = 'Container must be empty prior to removing it.';
         }
         if ($return_code == 404) {
-            $this->error_str = "Specified container did not exist to delete.";
+            $this->error_str = 'Specified container did not exist to delete.';
         }
         if ($return_code != 204) {
             $this->error_str = "Unexpected HTTP return code: $return_code.";
         }
+
         return $return_code;
     }
 
-    # GET /v1/Account/Container
-    #
-    function list_objects($cname,$limit=0,$marker=NULL,$prefix=NULL,$path=NULL)
+    // GET /v1/Account/Container
+
+    public function list_objects($cname, $limit = 0, $marker = null, $prefix = null, $path = null)
     {
         if (!$cname) {
-            $this->error_str = "Container name not set.";
-            return array(0, $this->error_str, array());
+            $this->error_str = 'Container name not set.';
+
+            return [0, $this->error_str, []];
         }
 
-        $url_path = $this->_make_path("STORAGE", $cname);
+        $url_path = $this->_make_path('STORAGE', $cname);
 
-        $limit = intval($limit);
-        $params = array();
+        $limit  = intval($limit);
+        $params = [];
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if ($prefix) {
-            $params[] = "prefix=".rawurlencode($prefix);
+            $params[] = 'prefix='.rawurlencode($prefix);
         }
         if ($path) {
-            $params[] = "path=".rawurlencode($path);
+            $params[] = 'path='.rawurlencode($path);
         }
         if (!empty($params)) {
-            $url_path .= "?" . implode("&", $params);
+            $url_path .= '?'.implode('&', $params);
         }
- 
-        $conn_type = "GET_CALL";
-        $this->_write_callback_type = "TEXT_LIST";
-        $return_code = $this->_send_request($conn_type,$url_path);
+
+        $conn_type                  = 'GET_CALL';
+        $this->_write_callback_type = 'TEXT_LIST';
+        $return_code                = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-	    $this->create_array();	
-            return array($return_code,$this->response_reason, $this->_text_list);
+            $this->create_array();
+
+            return [$return_code, $this->response_reason, $this->_text_list];
         }
         $this->error_str = "Unexpected HTTP response code: $return_code";
-        return array(0,$this->error_str,array());
+
+        return [0, $this->error_str, []];
     }
 
-    # GET /v1/Account/Container?format=json
-    #
-    function get_objects($cname,$limit=0,$marker=NULL,$prefix=NULL,$path=NULL)
+    // GET /v1/Account/Container?format=json
+
+    public function get_objects($cname, $limit = 0, $marker = null, $prefix = null, $path = null)
     {
         if (!$cname) {
-            $this->error_str = "Container name not set.";
-            return array(0, $this->error_str, array());
+            $this->error_str = 'Container name not set.';
+
+            return [0, $this->error_str, []];
         }
 
-        $url_path = $this->_make_path("STORAGE", $cname);
+        $url_path = $this->_make_path('STORAGE', $cname);
 
-        $limit = intval($limit);
-        $params = array();
-        $params[] = "format=json";
+        $limit    = intval($limit);
+        $params   = [];
+        $params[] = 'format=json';
         if ($limit > 0) {
             $params[] = "limit=$limit";
         }
         if ($marker) {
-            $params[] = "marker=".rawurlencode($marker);
+            $params[] = 'marker='.rawurlencode($marker);
         }
         if ($prefix) {
-            $params[] = "prefix=".rawurlencode($prefix);
+            $params[] = 'prefix='.rawurlencode($prefix);
         }
         if ($path) {
-            $params[] = "path=".rawurlencode($path);
+            $params[] = 'path='.rawurlencode($path);
         }
         if (!empty($params)) {
-            $url_path .= "?" . implode("&", $params);
+            $url_path .= '?'.implode('&', $params);
         }
- 
-        $conn_type = "GET_CALL";
-        $this->_write_callback_type = "OBJECT_STRING";
-        $return_code = $this->_send_request($conn_type,$url_path);
+
+        $conn_type                  = 'GET_CALL';
+        $this->_write_callback_type = 'OBJECT_STRING';
+        $return_code                = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, []];
         }
         if ($return_code == 204) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 404) {
-            $this->error_str = "Container has no Objects.";
-            return array($return_code,$this->error_str,array());
+            $this->error_str = 'Container has no Objects.';
+
+            return [$return_code, $this->error_str, []];
         }
         if ($return_code == 200) {
-            $json_body = json_decode($this->_obj_write_string, True);
-            return array($return_code,$this->response_reason, $json_body);
+            $json_body = json_decode($this->_obj_write_string, true);
+
+            return [$return_code, $this->response_reason, $json_body];
         }
         $this->error_str = "Unexpected HTTP response code: $return_code";
-        return array(0,$this->error_str,array());
+
+        return [0, $this->error_str, []];
     }
 
+    // HEAD /v1/Account/Container
 
-    # HEAD /v1/Account/Container
-    #
-    function head_container($container_name)
+    public function head_container($container_name)
     {
+        if ($container_name == '') {
+            $this->error_str = 'Container name not set.';
 
-        if ($container_name == "") {
-            $this->error_str = "Container name not set.";
-            return False;
+            return false;
         }
-        
-        if ($container_name != "0" and !isset($container_name)) {
-            $this->error_str = "Container name not set.";
-            return False;
+
+        if ($container_name != '0' and !isset($container_name)) {
+            $this->error_str = 'Container name not set.';
+
+            return false;
         }
-    
-        $conn_type = "HEAD";
 
-        $url_path = $this->_make_path("STORAGE", $container_name);
-        $return_code = $this->_send_request($conn_type,$url_path);
+        $conn_type = 'HEAD';
+
+        $url_path    = $this->_make_path('STORAGE', $container_name);
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            array(0,$this->error_str,0,0);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+            [0, $this->error_str, 0, 0];
         }
         if ($return_code == 404) {
-            return array($return_code,"Container not found.",0,0);
+            return [$return_code, 'Container not found.', 0, 0];
         }
         if ($return_code == 204 || $return_code == 200) {
-            return array($return_code,$this->response_reason,
-                $this->_container_object_count, $this->_container_bytes_used);
+            return [$return_code, $this->response_reason,
+                $this->_container_object_count, $this->_container_bytes_used, ];
         }
-        return array($return_code,$this->response_reason,0,0);
+
+        return [$return_code, $this->response_reason, 0, 0];
     }
 
-    # GET /v1/Account/Container/Object
-    #
-    function get_object_to_string(&$obj, $hdrs=array())
+    // GET /v1/Account/Container/Object
+
+    public function get_object_to_string(&$obj, $hdrs = [])
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
 
-        $conn_type = "GET_CALL";
+        $conn_type = 'GET_CALL';
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
-        $this->_write_callback_type = "OBJECT_STRING";
-        $return_code = $this->_send_request($conn_type,$url_path,$hdrs);
+        $url_path                   = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
+        $this->_write_callback_type = 'OBJECT_STRING';
+        $return_code                = $this->_send_request($conn_type, $url_path, $hdrs);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array($return_code0,$this->error_str,NULL);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [$return_code0, $this->error_str, null];
         }
         if ($return_code == 404) {
-            $this->error_str = "Object not found.";
-            return array($return_code0,$this->error_str,NULL);
+            $this->error_str = 'Object not found.';
+
+            return [$return_code0, $this->error_str, null];
         }
         if (($return_code < 200) || ($return_code > 299
                 && $return_code != 412 && $return_code != 304)) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
-            return array($return_code,$this->error_str,NULL);
+
+            return [$return_code, $this->error_str, null];
         }
-        return array($return_code,$this->response_reason, $this->_obj_write_string);
+
+        return [$return_code, $this->response_reason, $this->_obj_write_string];
     }
 
-    # GET /v1/Account/Container/Object
-    #
-    function get_object_to_stream(&$obj, &$resource=NULL, $hdrs=array())
+    // GET /v1/Account/Container/Object
+
+    public function get_object_to_stream(&$obj, &$resource = null, $hdrs = [])
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
         if (!is_resource($resource)) {
             throw new SyntaxException(
-                "Resource argument not a valid PHP resource.");
+                'Resource argument not a valid PHP resource.');
         }
 
-        $conn_type = "GET_CALL";
+        $conn_type = 'GET_CALL';
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
-        $this->_obj_write_resource = $resource;
-        $this->_write_callback_type = "OBJECT_STREAM";
-        $return_code = $this->_send_request($conn_type,$url_path,$hdrs);
+        $url_path                   = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
+        $this->_obj_write_resource  = $resource;
+        $this->_write_callback_type = 'OBJECT_STREAM';
+        $return_code                = $this->_send_request($conn_type, $url_path, $hdrs);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array($return_code,$this->error_str);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [$return_code, $this->error_str];
         }
         if ($return_code == 404) {
-            $this->error_str = "Object not found.";
-            return array($return_code,$this->error_str);
+            $this->error_str = 'Object not found.';
+
+            return [$return_code, $this->error_str];
         }
         if (($return_code < 200) || ($return_code > 299
                 && $return_code != 412 && $return_code != 304)) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
-            return array($return_code,$this->error_str);
+
+            return [$return_code, $this->error_str];
         }
-        return array($return_code,$this->response_reason);
+
+        return [$return_code, $this->response_reason];
     }
 
-    # PUT /v1/Account/Container/Object
-    #
-    function put_object(&$obj, &$fp)
+    // PUT /v1/Account/Container/Object
+
+    public function put_object(&$obj, &$fp)
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
         if (!is_resource($fp)) {
             throw new SyntaxException(
-                "File pointer argument is not a valid resource.");
+                'File pointer argument is not a valid resource.');
         }
 
-        $conn_type = "PUT_OBJ";
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
+        $conn_type = 'PUT_OBJ';
+        $url_path  = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
 
         $hdrs = $this->_metadata_headers($obj);
 
         $etag = $obj->getETag();
         if (isset($etag)) {
-            $hdrs[] = "ETag: " . $etag;
+            $hdrs[] = 'ETag: '.$etag;
         }
         if (!$obj->content_type) {
-            $hdrs[] = "Content-Type: application/octet-stream";
+            $hdrs[] = 'Content-Type: application/octet-stream';
         } else {
-            $hdrs[] = "Content-Type: " . $obj->content_type;
+            $hdrs[] = 'Content-Type: '.$obj->content_type;
         }
 
         $this->_init($conn_type);
         curl_setopt($this->connections[$conn_type],
                 CURLOPT_INFILE, $fp);
         if (!$obj->content_length) {
-            # We don''t know the Content-Length, so assumed "chunked" PUT
-            #
-            curl_setopt($this->connections[$conn_type], CURLOPT_UPLOAD, True);
+            // We don''t know the Content-Length, so assumed "chunked" PUT
+
+            curl_setopt($this->connections[$conn_type], CURLOPT_UPLOAD, true);
             $hdrs[] = 'Transfer-Encoding: chunked';
         } else {
-            # We know the Content-Length, so use regular transfer
-            #
+            // We know the Content-Length, so use regular transfer
+
             curl_setopt($this->connections[$conn_type],
                     CURLOPT_INFILESIZE, $obj->content_length);
         }
-        $return_code = $this->_send_request($conn_type,$url_path,$hdrs);
+        $return_code = $this->_send_request($conn_type, $url_path, $hdrs);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0,$this->error_str,NULL);
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str, null];
         }
         if ($return_code == 412) {
-            $this->error_str = "Missing Content-Type header";
-            return array($return_code,$this->error_str,NULL);
+            $this->error_str = 'Missing Content-Type header';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code == 422) {
-            $this->error_str = "Derived and computed checksums do not match.";
-            return array($return_code,$this->error_str,NULL);
+            $this->error_str = 'Derived and computed checksums do not match.';
+
+            return [$return_code, $this->error_str, null];
         }
         if ($return_code != 201) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
-            return array($return_code,$this->error_str,NULL);
+
+            return [$return_code, $this->error_str, null];
         }
-        return array($return_code,$this->response_reason,$this->_obj_etag);
+
+        return [$return_code, $this->response_reason, $this->_obj_etag];
     }
 
-    # POST /v1/Account/Container/Object
-    #
-    function update_object(&$obj)
+    // POST /v1/Account/Container/Object
+
+    public function update_object(&$obj)
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
 
         if (!is_array($obj->metadata) || empty($obj->metadata)) {
-            $this->error_str = "Metadata array is empty.";
+            $this->error_str = 'Metadata array is empty.';
+
             return 0;
         }
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
+        $url_path = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
 
-        $hdrs = $this->_metadata_headers($obj);
-        $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"POST");
+        $hdrs        = $this->_metadata_headers($obj);
+        $return_code = $this->_send_request('DEL_POST', $url_path, $hdrs, 'POST');
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
             return 0;
         }
         if ($return_code == 404) {
-            $this->error_str = "Account, Container, or Object not found.";
+            $this->error_str = 'Account, Container, or Object not found.';
         }
         if ($return_code != 202) {
             $this->error_str = "Unexpected HTTP return code: $return_code";
         }
+
         return $return_code;
     }
 
-    # HEAD /v1/Account/Container/Object
-    #
-    function head_object(&$obj)
+    // HEAD /v1/Account/Container/Object
+
+    public function head_object(&$obj)
     {
-        if (!is_object($obj) || get_class($obj) != "CF_Object") {
+        if (!is_object($obj) || get_class($obj) != 'CF_Object') {
             throw new SyntaxException(
-                "Method argument is not a valid CF_Object.");
+                'Method argument is not a valid CF_Object.');
         }
 
-        $conn_type = "HEAD";
+        $conn_type = 'HEAD';
 
-        $url_path = $this->_make_path("STORAGE", $obj->container->name,$obj->name);
-        $return_code = $this->_send_request($conn_type,$url_path);
+        $url_path    = $this->_make_path('STORAGE', $obj->container->name, $obj->name);
+        $return_code = $this->_send_request($conn_type, $url_path);
 
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
-            return array(0, $this->error_str." ".$this->response_reason,
-                NULL, NULL, NULL, NULL, array());
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
+            return [0, $this->error_str.' '.$this->response_reason,
+                null, null, null, null, [], ];
         }
 
         if ($return_code == 404) {
-            return array($return_code, $this->response_reason,
-                NULL, NULL, NULL, NULL, array());
+            return [$return_code, $this->response_reason,
+                null, null, null, null, [], ];
         }
         if ($return_code == 204 || $return_code == 200) {
-            return array($return_code,$this->response_reason,
+            return [$return_code, $this->response_reason,
                 $this->_obj_etag,
                 $this->_obj_last_modified,
                 $this->_obj_content_type,
                 $this->_obj_content_length,
-                $this->_obj_metadata);
+                $this->_obj_metadata, ];
         }
         $this->error_str = "Unexpected HTTP return code: $return_code";
-        return array($return_code, $this->error_str." ".$this->response_reason,
-                NULL, NULL, NULL, NULL, array());
+
+        return [$return_code, $this->error_str.' '.$this->response_reason,
+                null, null, null, null, [], ];
     }
 
-    # DELETE /v1/Account/Container/Object
-    #
-    function delete_object($container_name, $object_name)
+    // DELETE /v1/Account/Container/Object
+
+    public function delete_object($container_name, $object_name)
     {
-        if ($container_name == "") {
-            $this->error_str = "Container name not set.";
+        if ($container_name == '') {
+            $this->error_str = 'Container name not set.';
+
             return 0;
         }
-        
-        if ($container_name != "0" and !isset($container_name)) {
-            $this->error_str = "Container name not set.";
+
+        if ($container_name != '0' and !isset($container_name)) {
+            $this->error_str = 'Container name not set.';
+
             return 0;
         }
-        
+
         if (!$object_name) {
-            $this->error_str = "Object name not set.";
+            $this->error_str = 'Object name not set.';
+
             return 0;
         }
 
-        $url_path = $this->_make_path("STORAGE", $container_name,$object_name);
-        $return_code = $this->_send_request("DEL_POST",$url_path,NULL,"DELETE");
+        $url_path    = $this->_make_path('STORAGE', $container_name, $object_name);
+        $return_code = $this->_send_request('DEL_POST', $url_path, null, 'DELETE');
         if (!$return_code) {
-            $this->error_str .= ": Failed to obtain valid HTTP response.";
+            $this->error_str .= ': Failed to obtain valid HTTP response.';
+
             return 0;
         }
         if ($return_code == 404) {
-            $this->error_str = "Specified container did not exist to delete.";
+            $this->error_str = 'Specified container did not exist to delete.';
         }
         if ($return_code != 204) {
             $this->error_str = "Unexpected HTTP return code: $return_code.";
         }
+
         return $return_code;
     }
 
-    function get_error()
+    public function get_error()
     {
         return $this->error_str;
     }
 
-    function setDebug($bool)
+    public function setDebug($bool)
     {
         $this->dbug = $bool;
         foreach ($this->connections as $k => $v) {
@@ -951,38 +1018,38 @@ function setDebug($bool)
         }
     }
 
-    function getCDNMUrl()
+    public function getCDNMUrl()
     {
         return $this->cdnm_url;
     }
 
-    function getStorageUrl()
+    public function getStorageUrl()
     {
         return $this->storage_url;
     }
 
-    function getAuthToken()
+    public function getAuthToken()
     {
         return $this->auth_token;
     }
 
-    function setCFAuth($cfs_auth, $servicenet=False)
+    public function setCFAuth($cfs_auth, $servicenet = false)
     {
         if ($servicenet) {
-            $this->storage_url = "https://snet-" . substr($cfs_auth->storage_url, 8);
+            $this->storage_url = 'https://snet-'.substr($cfs_auth->storage_url, 8);
         } else {
             $this->storage_url = $cfs_auth->storage_url;
         }
         $this->auth_token = $cfs_auth->auth_token;
-        $this->cdnm_url = $cfs_auth->cdnm_url;
+        $this->cdnm_url   = $cfs_auth->cdnm_url;
     }
 
-    function setReadProgressFunc($func_name)
+    public function setReadProgressFunc($func_name)
     {
         $this->_user_read_progress_callback_func = $func_name;
     }
 
-    function setWriteProgressFunc($func_name)
+    public function setWriteProgressFunc($func_name)
     {
         $this->_user_write_progress_callback_func = $func_name;
     }
@@ -997,105 +1064,122 @@ private function _header_cb($ch, $header)
             $this->response_reason = $matches[2];
         }
         if (stripos($header, CDN_ENABLED) === 0) {
-            $val = trim(substr($header, strlen(CDN_ENABLED)+1));
-            if (strtolower($val) == "true") {
-                $this->_cdn_enabled = True;
-            } elseif (strtolower($val) == "false") {
-                $this->_cdn_enabled = False;
+            $val = trim(substr($header, strlen(CDN_ENABLED) + 1));
+            if (strtolower($val) == 'true') {
+                $this->_cdn_enabled = true;
+            } elseif (strtolower($val) == 'false') {
+                $this->_cdn_enabled = false;
             } else {
-                $this->_cdn_enabled = NULL;
+                $this->_cdn_enabled = null;
             }
+
             return strlen($header);
         }
         if (stripos($header, CDN_URI) === 0) {
-            $this->_cdn_uri = trim(substr($header, strlen(CDN_URI)+1));
+            $this->_cdn_uri = trim(substr($header, strlen(CDN_URI) + 1));
+
             return strlen($header);
         }
         if (stripos($header, CDN_TTL) === 0) {
-            $this->_cdn_ttl = trim(substr($header, strlen(CDN_TTL)+1))+0;
+            $this->_cdn_ttl = trim(substr($header, strlen(CDN_TTL) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, CDN_LOG_RETENTION) === 0) {
             $this->_cdn_log_retention =
-                trim(substr($header, strlen(CDN_LOG_RETENTION)+1)) == "True" ? True : False;
+                trim(substr($header, strlen(CDN_LOG_RETENTION) + 1)) == 'True' ? true : false;
+
             return strlen($header);
         }
 
         if (stripos($header, CDN_ACL_USER_AGENT) === 0) {
             $this->_cdn_acl_user_agent =
-                trim(substr($header, strlen(CDN_ACL_USER_AGENT)+1));
+                trim(substr($header, strlen(CDN_ACL_USER_AGENT) + 1));
+
             return strlen($header);
         }
 
         if (stripos($header, CDN_ACL_REFERRER) === 0) {
             $this->_cdn_acl_referrer =
-                trim(substr($header, strlen(CDN_ACL_REFERRER)+1));
+                trim(substr($header, strlen(CDN_ACL_REFERRER) + 1));
+
             return strlen($header);
         }
-        
+
         if (stripos($header, ACCOUNT_CONTAINER_COUNT) === 0) {
             $this->_account_container_count = (float) trim(substr($header,
-                    strlen(ACCOUNT_CONTAINER_COUNT)+1))+0;
+                    strlen(ACCOUNT_CONTAINER_COUNT) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, ACCOUNT_BYTES_USED) === 0) {
             $this->_account_bytes_used = (float) trim(substr($header,
-                    strlen(ACCOUNT_BYTES_USED)+1))+0;
+                    strlen(ACCOUNT_BYTES_USED) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, CONTAINER_OBJ_COUNT) === 0) {
             $this->_container_object_count = (float) trim(substr($header,
-                    strlen(CONTAINER_OBJ_COUNT)+1))+0;
+                    strlen(CONTAINER_OBJ_COUNT) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, CONTAINER_BYTES_USED) === 0) {
             $this->_container_bytes_used = (float) trim(substr($header,
-                    strlen(CONTAINER_BYTES_USED)+1))+0;
+                    strlen(CONTAINER_BYTES_USED) + 1)) + 0;
+
             return strlen($header);
         }
         if (stripos($header, METADATA_HEADER) === 0) {
-            # $header => X-Object-Meta-Foo: bar baz
+            // $header => X-Object-Meta-Foo: bar baz
             $temp = substr($header, strlen(METADATA_HEADER));
-            # $temp => Foo: bar baz
-            $parts = explode(":", $temp);
-            # $parts[0] => Foo
-            $val = substr(strstr($temp, ":"), 1);
-            # $val => bar baz
+            // $temp => Foo: bar baz
+            $parts = explode(':', $temp);
+            // $parts[0] => Foo
+            $val = substr(strstr($temp, ':'), 1);
+            // $val => bar baz
             $this->_obj_metadata[$parts[0]] = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "ETag:") === 0) {
-            # $header => ETag: abc123def456...
-            $val = substr(strstr($header, ":"), 1);
-            # $val => abc123def456...
+        if (stripos($header, 'ETag:') === 0) {
+            // $header => ETag: abc123def456...
+            $val = substr(strstr($header, ':'), 1);
+            // $val => abc123def456...
             $this->_obj_etag = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "Last-Modified:") === 0) {
-            $val = substr(strstr($header, ":"), 1);
+        if (stripos($header, 'Last-Modified:') === 0) {
+            $val                      = substr(strstr($header, ':'), 1);
             $this->_obj_last_modified = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "Content-Type:") === 0) {
-            $val = substr(strstr($header, ":"), 1);
+        if (stripos($header, 'Content-Type:') === 0) {
+            $val                     = substr(strstr($header, ':'), 1);
             $this->_obj_content_type = trim($val);
+
             return strlen($header);
         }
-        if (stripos($header, "Content-Length:") === 0) {
-            $val = substr(strstr($header, ":"), 1);
-            $this->_obj_content_length = (float) trim($val)+0;
+        if (stripos($header, 'Content-Length:') === 0) {
+            $val                       = substr(strstr($header, ':'), 1);
+            $this->_obj_content_length = (float) trim($val) + 0;
+
             return strlen($header);
         }
+
         return strlen($header);
     }
 
     private function _read_cb($ch, $fd, $length)
     {
         $data = fread($fd, $length);
-        $len = strlen($data);
+        $len  = strlen($data);
         if (isset($this->_user_write_progress_callback_func)) {
             call_user_func($this->_user_write_progress_callback_func, $len);
         }
+
         return $data;
     }
 
@@ -1103,21 +1187,22 @@ private function _write_cb($ch, $data)
     {
         $dlen = strlen($data);
         switch ($this->_write_callback_type) {
-        case "TEXT_LIST":
-	     $this->_return_list = $this->_return_list . $data;
-	     //= explode("\n",$data); # keep tab,space
-	     //his->_text_list[] = rtrim($data,"\n\r\x0B"); # keep tab,space
+        case 'TEXT_LIST':
+         $this->_return_list = $this->_return_list.$data;
+         //= explode("\n",$data); # keep tab,space
+         //his->_text_list[] = rtrim($data,"\n\r\x0B"); # keep tab,space
             break;
-        case "OBJECT_STREAM":
+        case 'OBJECT_STREAM':
             fwrite($this->_obj_write_resource, $data, $dlen);
             break;
-        case "OBJECT_STRING":
+        case 'OBJECT_STRING':
             $this->_obj_write_string .= $data;
             break;
         }
         if (isset($this->_user_read_progress_callback_func)) {
             call_user_func($this->_user_read_progress_callback_func, $dlen);
         }
+
         return $dlen;
     }
 
@@ -1131,59 +1216,62 @@ private function _auth_hdr_cb($ch, $header)
             $this->response_reason = $matches[2];
         }
         if (stripos($header, STORAGE_URL) === 0) {
-            $this->storage_url = trim(substr($header, strlen(STORAGE_URL)+1));
+            $this->storage_url = trim(substr($header, strlen(STORAGE_URL) + 1));
         }
         if (stripos($header, CDNM_URL) === 0) {
-            $this->cdnm_url = trim(substr($header, strlen(CDNM_URL)+1));
+            $this->cdnm_url = trim(substr($header, strlen(CDNM_URL) + 1));
         }
         if (stripos($header, AUTH_TOKEN) === 0) {
-            $this->auth_token = trim(substr($header, strlen(AUTH_TOKEN)+1));
+            $this->auth_token = trim(substr($header, strlen(AUTH_TOKEN) + 1));
         }
         if (stripos($header, AUTH_TOKEN_LEGACY) === 0) {
-            $this->auth_token = trim(substr($header,strlen(AUTH_TOKEN_LEGACY)+1));
+            $this->auth_token = trim(substr($header, strlen(AUTH_TOKEN_LEGACY) + 1));
         }
+
         return strlen($header);
     }
 
-    private function _make_headers($hdrs=NULL)
+    private function _make_headers($hdrs = null)
     {
-        $new_headers = array();
-        $has_stoken = False;
-        $has_uagent = False;
+        $new_headers = [];
+        $has_stoken  = false;
+        $has_uagent  = false;
         if (is_array($hdrs)) {
             foreach ($hdrs as $h => $v) {
                 if (is_int($h)) {
-                    $parts = explode(":", $v);
+                    $parts  = explode(':', $v);
                     $header = $parts[0];
-                    $value = trim(substr(strstr($v, ":"), 1));
+                    $value  = trim(substr(strstr($v, ':'), 1));
                 } else {
                     $header = $h;
-                    $value = trim($v);
+                    $value  = trim($v);
                 }
 
                 if (stripos($header, AUTH_TOKEN) === 0) {
-                    $has_stoken = True;
+                    $has_stoken = true;
                 }
-                if (stripos($header, "user-agent") === 0) {
-                    $has_uagent = True;
+                if (stripos($header, 'user-agent') === 0) {
+                    $has_uagent = true;
                 }
-                $new_headers[] = $header . ": " . $value;
+                $new_headers[] = $header.': '.$value;
             }
         }
         if (!$has_stoken) {
-            $new_headers[] = AUTH_TOKEN . ": " . $this->auth_token;
+            $new_headers[] = AUTH_TOKEN.': '.$this->auth_token;
         }
         if (!$has_uagent) {
-            $new_headers[] = "User-Agent: " . USER_AGENT;
+            $new_headers[] = 'User-Agent: '.USER_AGENT;
         }
+
         return $new_headers;
     }
 
-    private function _init($conn_type, $force_new=False)
+    private function _init($conn_type, $force_new = false)
     {
         if (!array_key_exists($conn_type, $this->connections)) {
-            $this->error_str = "Invalid CURL_XXX connection type";
-            return False;
+            $this->error_str = 'Invalid CURL_XXX connection type';
+
+            return false;
         }
 
         if (is_null($this->connections[$conn_type]) || $force_new) {
@@ -1192,132 +1280,140 @@ private function _init($conn_type, $force_new=False)
             return;
         }
 
-        if ($this->dbug) { curl_setopt($ch, CURLOPT_VERBOSE, 1); }
+        if ($this->dbug) {
+            curl_setopt($ch, CURLOPT_VERBOSE, 1);
+        }
 
         if (!is_null($this->cabundle_path)) {
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, True);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
             curl_setopt($ch, CURLOPT_CAINFO, $this->cabundle_path);
         }
-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, True);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
         curl_setopt($ch, CURLOPT_MAXREDIRS, 4);
         curl_setopt($ch, CURLOPT_HEADER, 0);
-        curl_setopt($ch, CURLOPT_HEADERFUNCTION, array(&$this, '_header_cb'));
+        curl_setopt($ch, CURLOPT_HEADERFUNCTION, [&$this, '_header_cb']);
 
-        if ($conn_type == "GET_CALL") {
-            curl_setopt($ch, CURLOPT_WRITEFUNCTION, array(&$this, '_write_cb'));
+        if ($conn_type == 'GET_CALL') {
+            curl_setopt($ch, CURLOPT_WRITEFUNCTION, [&$this, '_write_cb']);
         }
 
-        if ($conn_type == "PUT_OBJ") {
+        if ($conn_type == 'PUT_OBJ') {
             curl_setopt($ch, CURLOPT_PUT, 1);
-            curl_setopt($ch, CURLOPT_READFUNCTION, array(&$this, '_read_cb'));
-	    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_READFUNCTION, [&$this, '_read_cb']);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         }
-        if ($conn_type == "HEAD") {
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "HEAD");
+        if ($conn_type == 'HEAD') {
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD');
             curl_setopt($ch, CURLOPT_NOBODY, 1);
         }
-        if ($conn_type == "PUT_CONT") {
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+        if ($conn_type == 'PUT_CONT') {
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
             curl_setopt($ch, CURLOPT_INFILESIZE, 0);
-	    curl_setopt($ch, CURLOPT_NOBODY, 1);
+            curl_setopt($ch, CURLOPT_NOBODY, 1);
+        }
+        if ($conn_type == 'DEL_POST') {
+            curl_setopt($ch, CURLOPT_NOBODY, 1);
         }
-        if ($conn_type == "DEL_POST") {
-        	curl_setopt($ch, CURLOPT_NOBODY, 1);
-	}
         $this->connections[$conn_type] = $ch;
+
         return;
     }
 
     private function _reset_callback_vars()
     {
-        $this->_text_list = array();
-	$this->_return_list = NULL;
+        $this->_text_list               = [];
+        $this->_return_list             = null;
         $this->_account_container_count = 0;
-        $this->_account_bytes_used = 0;
-        $this->_container_object_count = 0;
-        $this->_container_bytes_used = 0;
-        $this->_obj_etag = NULL;
-        $this->_obj_last_modified = NULL;
-        $this->_obj_content_type = NULL;
-        $this->_obj_content_length = NULL;
-        $this->_obj_metadata = array();
-        $this->_obj_write_string = "";
-        $this->_cdn_enabled = NULL;
-        $this->_cdn_uri = NULL;
-        $this->_cdn_ttl = NULL;
-        $this->response_status = 0;
-        $this->response_reason = "";
+        $this->_account_bytes_used      = 0;
+        $this->_container_object_count  = 0;
+        $this->_container_bytes_used    = 0;
+        $this->_obj_etag                = null;
+        $this->_obj_last_modified       = null;
+        $this->_obj_content_type        = null;
+        $this->_obj_content_length      = null;
+        $this->_obj_metadata            = [];
+        $this->_obj_write_string        = '';
+        $this->_cdn_enabled             = null;
+        $this->_cdn_uri                 = null;
+        $this->_cdn_ttl                 = null;
+        $this->response_status          = 0;
+        $this->response_reason          = '';
     }
 
-    private function _make_path($t="STORAGE",$c=NULL,$o=NULL)
+    private function _make_path($t = 'STORAGE', $c = null, $o = null)
     {
-        $path = array();
+        $path = [];
         switch ($t) {
-        case "STORAGE":
+        case 'STORAGE':
             $path[] = $this->storage_url; break;
-        case "CDN":
+        case 'CDN':
             $path[] = $this->cdnm_url; break;
         }
-        if ($c == "0")
+        if ($c == '0') {
             $path[] = rawurlencode($c);
+        }
 
         if ($c) {
             $path[] = rawurlencode($c);
         }
         if ($o) {
-            # mimic Python''s urllib.quote() feature of a "safe" '/' character
-            #
-            $path[] = str_replace("%2F","/",rawurlencode($o));
+            // mimic Python''s urllib.quote() feature of a "safe" '/' character
+
+            $path[] = str_replace('%2F', '/', rawurlencode($o));
         }
-        return implode("/",$path);
+
+        return implode('/', $path);
     }
 
     private function _metadata_headers(&$obj)
     {
-        $hdrs = array();
+        $hdrs = [];
         foreach ($obj->metadata as $k => $v) {
-            if (strpos($k,":") !== False) {
+            if (strpos($k, ':') !== false) {
                 throw new SyntaxException(
                     "Metadata keys cannot contain a ':' character.");
             }
-            $k = trim($k);
-            $key = sprintf("%s%s", METADATA_HEADER, $k);
+            $k   = trim($k);
+            $key = sprintf('%s%s', METADATA_HEADER, $k);
             if (!array_key_exists($key, $hdrs)) {
                 if (strlen($k) > 128 || strlen($v) > 256) {
-                    $this->error_str = "Metadata key or value exceeds ";
+                    $this->error_str = 'Metadata key or value exceeds ';
                     $this->error_str .= "maximum length: ($k: $v)";
+
                     return 0;
                 }
-                $hdrs[] = sprintf("%s%s: %s", METADATA_HEADER, $k, trim($v));
+                $hdrs[] = sprintf('%s%s: %s', METADATA_HEADER, $k, trim($v));
             }
         }
+
         return $hdrs;
     }
 
-    private function _send_request($conn_type, $url_path, $hdrs=NULL, $method="GET", $force_new=False)
+    private function _send_request($conn_type, $url_path, $hdrs = null, $method = 'GET', $force_new = false)
     {
         $this->_init($conn_type, $force_new);
         $this->_reset_callback_vars();
         $headers = $this->_make_headers($hdrs);
 
-        if (gettype($this->connections[$conn_type]) == "unknown type")
-            throw new ConnectionNotOpenException (
-                "Connection is not open."
+        if (gettype($this->connections[$conn_type]) == 'unknown type') {
+            throw new ConnectionNotOpenException(
+                'Connection is not open.'
                 );
-        
+        }
+
         switch ($method) {
-        case "DELETE":
+        case 'DELETE':
             curl_setopt($this->connections[$conn_type],
-                CURLOPT_CUSTOMREQUEST, "DELETE");
+                CURLOPT_CUSTOMREQUEST, 'DELETE');
             break;
-        case "POST":
+        case 'POST':
             curl_setopt($this->connections[$conn_type],
-                CURLOPT_CUSTOMREQUEST, "POST");
+                CURLOPT_CUSTOMREQUEST, 'POST');
         default:
             break;
-        }        
+        }
 
         curl_setopt($this->connections[$conn_type],
                     CURLOPT_HTTPHEADER, $headers);
@@ -1326,29 +1422,31 @@ private function _send_request($conn_type, $url_path, $hdrs=NULL, $method="GET",
             CURLOPT_URL, $url_path);
 
         if (!curl_exec($this->connections[$conn_type]) && curl_errno($this->connections[$conn_type]) !== 0) {
-            $this->error_str = "(curl error: "
-                . curl_errno($this->connections[$conn_type]) . ") ";
+            $this->error_str = '(curl error: '
+                .curl_errno($this->connections[$conn_type]).') ';
             $this->error_str .= curl_error($this->connections[$conn_type]);
-            return False;
+
+            return false;
         }
+
         return curl_getinfo($this->connections[$conn_type], CURLINFO_HTTP_CODE);
     }
-    
-    function close()
+
+    public function close()
     {
         foreach ($this->connections as $cnx) {
             if (isset($cnx)) {
                 curl_close($cnx);
-                $this->connections[$cnx] = NULL;
+                $this->connections[$cnx] = null;
             }
         }
     }
     private function create_array()
     {
-	$this->_text_list = explode("\n",rtrim($this->_return_list,"\n\x0B"));
-	return True;
-    }
+        $this->_text_list = explode("\n", rtrim($this->_return_list, "\n\x0B"));
 
+        return true;
+    }
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
@@ -1360,4 +1458,3 @@ private function create_array()
  * c-hanging-comment-ender-p: nil
  * End:
  */
-?>
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php
index 22a290f365b..c513b896ec1 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/plugins/rsc/filemanager.rsc.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
-*	Filemanager PHP RSC plugin configuration
+*	Filemanager PHP RSC plugin configuration.
 *
 *	filemanager.rsc.class.php
 *	This is a separate config file for the parameters needed for the RSC plugin
@@ -9,48 +9,45 @@
 *	@license	MIT License
 *	@author		Alan Blount <alan (at) zeroasterisk (dot) com>
 *	@copyright	Authors
-*/	
+*/
 
 /**
- *	Language settings
+ *	Language settings.
  */
 $config['rsc-verbose'] = false;
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-username'] = 'your_username';
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-apikey'] = 'your_api_key_hash';
 
-/**
+/*
  *	RSC Account (optional)
  */
 $config['rsc-account'] = null;
 
-/**
+/*
  *	RSC Account (optionally limit container to this, better accomplished by limiting the base path)
  */
 $config['rsc-container'] = null;
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-ssl_use_cabundle'] = true;
 
-/**
+/*
  *	Language settings
  */
 $config['rsc-getsize'] = true;
 
-/**
+/*
  *	Extension of the unallowed Dirs
  */
 $config['unallowed_dirs'][] = '.CDN_ACCESS_LOGS';
 $config['unallowed_dirs'][] = 'cloudservers';
-
-
-?>
diff --git a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/user.config.php b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/user.config.php
index 8ed7ec6fdec..39710eadffa 100644
--- a/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/user.config.php
+++ b/app/bundles/CoreBundle/Assets/js/libraries/ckeditor/filemanager/connectors/php/user.config.php
@@ -2,7 +2,7 @@
 /**
  *	Filemanager PHP connector
  *  This file should at least declare auth() function
- *  and instantiate the Filemanager as '$fm'
+ *  and instantiate the Filemanager as '$fm'.
  *
  *  IMPORTANT : by default Read and Write access is granted to everyone
  *  Copy/paste this file to 'user.config.php' file to implement your own auth() function
@@ -15,10 +15,9 @@
  *  @author		Simon Georget <simon (at) linea21 (dot) com>
  *	@copyright	Authors
  */
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
@@ -33,7 +32,7 @@
     $request   = Request::createFromGlobals();
     $container->enterScope('request');
     $container->set('request', $request, 'request');
-    
+
     // Dispatch REQUEST event to setup authentication
     $httpKernel = $container->get('http_kernel');
     $event      = new GetResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST);
@@ -49,12 +48,13 @@
 }
 
 /**
- *	Check if user is authorized
+ *	Check if user is authorized.
  *
  *
- *	@return boolean true if access granted, false if no access
+ *	@return bool true if access granted, false if no access
  */
-function auth() {
+function auth()
+{
     global $authenticated;
     // You can insert your own code over here to check if the user is authorized.
     // If you use a session variable, you've got to start the session first (session_start())
@@ -103,4 +103,4 @@ function auth() {
     }
 
     $fm->setFileRoot($userDir, $docRoot);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Command/ApplyUpdatesCommand.php b/app/bundles/CoreBundle/Command/ApplyUpdatesCommand.php
index 900ee5d5d1a..192ac526c31 100644
--- a/app/bundles/CoreBundle/Command/ApplyUpdatesCommand.php
+++ b/app/bundles/CoreBundle/Command/ApplyUpdatesCommand.php
@@ -1,30 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
+use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 /**
- * CLI Command to update the application
+ * CLI Command to update the application.
  */
 class ApplyUpdatesCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -42,7 +42,7 @@ protected function configure()
                 ]
             )
             ->setHelp(
-                <<<EOT
+                <<<'EOT'
                 The <info>%command.name%</info> command updates the Mautic application.
 
 <info>php %command.full_name%</info>
@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!$force) {
             /** @var \Symfony\Component\Console\Helper\SymfonyQuestionHelper $helper */
             $helper   = $this->getHelperSet()->get('question');
-            $question = new ConfirmationQuestion($translator->trans('mautic.core.update.confirm_application_update'). " ", false);
+            $question = new ConfirmationQuestion($translator->trans('mautic.core.update.confirm_application_update').' ', false);
 
             if (!$helper->ask($input, $output, $question)) {
                 $output->writeln($translator->trans('mautic.core.update.aborted'));
@@ -99,12 +99,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $progressBar->setFormat('Step %current% [%bar%] <info>%message%</info>');
 
         if ($package) {
-            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.loading_package')."                  ");
+            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.loading_package').'                  ');
             $progressBar->advance();
             $zipFile = $package;
             $version = basename($package);
         } else {
-            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.loading_update_information')."                  ");
+            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.loading_update_information').'                  ');
             $progressBar->advance();
 
             $updateHelper = $this->getContainer()->get('mautic.helper.update');
@@ -116,7 +116,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 return 1;
             }
 
-            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.download_update_package')."                  ");
+            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.download_update_package').'                  ');
             $progressBar->advance();
 
             // Fetch the update package
@@ -132,7 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $version = $update['version'];
         }
 
-        $progressBar->setMessage($translator->trans('mautic.core.command.update.step.validate_update_package')."                  ");
+        $progressBar->setMessage($translator->trans('mautic.core.command.update.step.validate_update_package').'                  ');
         $progressBar->advance();
 
         $zipper  = new \ZipArchive();
@@ -169,7 +169,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         // Extract the archive file now in place
-        $progressBar->setMessage($translator->trans('mautic.core.update.step.extracting.package')."                  ");
+        $progressBar->setMessage($translator->trans('mautic.core.update.step.extracting.package').'                  ');
         $progressBar->advance();
 
         if (!$zipper->extractTo($appRoot)) {
@@ -190,7 +190,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Make sure we have a deleted_files list otherwise we can't process this step
         if (file_exists($appRoot.'/deleted_files.txt')) {
-            $progressBar->setMessage($translator->trans('mautic.core.update.remove.deleted.files')."                  ");
+            $progressBar->setMessage($translator->trans('mautic.core.update.remove.deleted.files').'                  ');
             $progressBar->advance();
 
             $deletedFiles = json_decode(file_get_contents($appRoot.'/deleted_files.txt'), true);
@@ -231,7 +231,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         // Clear the dev and prod cache instances to reset the system
-        $progressBar->setMessage($translator->trans('mautic.core.update.clear.cache')."                  ");
+        $progressBar->setMessage($translator->trans('mautic.core.update.clear.cache').'                  ');
         $progressBar->advance();
 
         $cacheHelper = $this->getContainer()->get('mautic.helper.cache');
@@ -242,7 +242,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // If there is only one language, assume it is 'en_US' and skip this
         if (count($supportedLanguages) > 1) {
-            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.update_languages'."                  "));
+            $progressBar->setMessage($translator->trans('mautic.core.command.update.step.update_languages'.'                  '));
             $progressBar->advance();
 
             /** @var \Mautic\CoreBundle\Helper\LanguageHelper $languageHelper */
@@ -272,7 +272,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         // Migrate the database to the current version
-        $progressBar->setMessage($translator->trans('mautic.core.update.migrating.database.schema'."                  "));
+        $progressBar->setMessage($translator->trans('mautic.core.update.migrating.database.schema'.'                  '));
         $progressBar->advance();
 
         $migrationApplication = new Application($this->getContainer()->get('kernel'));
@@ -282,7 +282,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $migrateExitCode = $migrationApplication->run($migrationCommandArgs, new NullOutput());
         unset($migrationApplication);
 
-        $progressBar->setMessage($translator->trans('mautic.core.update.step.wrapping_up'."                  "));
+        $progressBar->setMessage($translator->trans('mautic.core.update.step.wrapping_up'.'                  '));
         $progressBar->advance();
 
         // Clear the cached update data and the download package now that we've updated
@@ -295,7 +295,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         @unlink($appRoot.'/upgrade.php');
 
         // Update successful
-        $progressBar->setMessage($translator->trans('mautic.core.update.update_successful', ['%version%' => $version])."                  ");
+        $progressBar->setMessage($translator->trans('mautic.core.update.update_successful', ['%version%' => $version]).'                  ');
         $progressBar->finish();
 
         // Check for a post install message
@@ -312,4 +312,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Command/CleanupMaintenanceCommand.php b/app/bundles/CoreBundle/Command/CleanupMaintenanceCommand.php
index a49d8bbc91f..11eda3c306f 100644
--- a/app/bundles/CoreBundle/Command/CleanupMaintenanceCommand.php
+++ b/app/bundles/CoreBundle/Command/CleanupMaintenanceCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,17 +14,16 @@
 use Mautic\CoreBundle\Event\MaintenanceEvent;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 /**
- * CLI Command to purge old data per settings
+ * CLI Command to purge old data per settings.
  */
 class CleanupMaintenanceCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -44,7 +44,7 @@ protected function configure()
                 ]
             )
             ->setHelp(
-                <<<EOT
+                <<<'EOT'
                 The <info>%command.name%</info> command dispatches the CoreEvents::MAINTENANCE_CLEANUP_DATA event in order to purge old data (data must be supported by event listeners as not all data is applicable to be purged).
 
 <info>php %command.full_name%</info>
@@ -83,11 +83,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             /** @var \Symfony\Component\Console\Helper\SymfonyQuestionHelper $helper */
             $helper   = $this->getHelperSet()->get('question');
             $question = new ConfirmationQuestion(
-                '<info>'.$translator->trans('mautic.maintenance.confirm_data_purge', ['%days%' => $daysOld])."</info> ", false
+                '<info>'.$translator->trans('mautic.maintenance.confirm_data_purge', ['%days%' => $daysOld]).'</info> ', false
             );
 
             if (!$helper->ask($input, $output, $question)) {
-
                 return 0;
             }
         }
@@ -120,4 +119,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Command/ConvertConfigCommand.php b/app/bundles/CoreBundle/Command/ConvertConfigCommand.php
index 93e049ab7cf..12ac7870c4b 100644
--- a/app/bundles/CoreBundle/Command/ConvertConfigCommand.php
+++ b/app/bundles/CoreBundle/Command/ConvertConfigCommand.php
@@ -1,29 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
-use Camspiers\JsonPretty\JsonPretty;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 /**
- * CLI Command to convert PHP theme config to JSON
+ * CLI Command to convert PHP theme config to JSON.
  */
 class ConvertConfigCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -31,7 +27,7 @@ protected function configure()
     {
         $this->setName('mautic:theme:json-config')
             ->setDescription('Converts theme config to JSON from PHP')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption(
                     'theme', null, InputOption::VALUE_REQUIRED,
                     'The name of the theme whose config you are converting.'
@@ -39,9 +35,9 @@ protected function configure()
                 new InputOption(
                     'save-php-config', null, InputOption::VALUE_NONE,
                     'When used, the theme\'s PHP config file will be saved.'
-                )
-            ))
-            ->setHelp(<<<EOT
+                ),
+            ])
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command converts a PHP theme config file to JSON.
 
 <info>php %command.full_name%</info>
@@ -62,48 +58,53 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $options = $input->getOptions();
-        $theme   = $options['theme'];
+        $options       = $input->getOptions();
+        $theme         = $options['theme'];
         $savePhpConfig = $options['save-php-config'];
 
-        $themePath = realpath($this->getContainer()->get('mautic.factory')->getSystemPath('themes') . '/' . $theme);
+        $themePath = realpath($this->getContainer()->get('mautic.factory')->getSystemPath('themes').'/'.$theme);
 
         if (empty($themePath)) {
             $output->writeln("\n\n<error>The specified theme ($theme) does not exist.</error>");
+
             return 1;
         }
 
-        $jsonConfigPath = $themePath . '/config.json';
+        $jsonConfigPath = $themePath.'/config.json';
 
         if (file_exists($jsonConfigPath)) {
             $output->writeln("\n\n<error>The specified theme ($theme) already has a JSON config file.");
+
             return 1;
         }
 
-        $configPath = $themePath . '/config.php';
+        $configPath = $themePath.'/config.php';
 
-        if (! file_exists($configPath)) {
+        if (!file_exists($configPath)) {
             $output->writeln("\n\n<error>The php config file for the specified theme ($theme) could not be found.</error>");
+
             return 1;
         }
 
         $config = include $configPath;
 
-        if (! is_array($config) || ! array_key_exists('name', $config)) {
+        if (!is_array($config) || !array_key_exists('name', $config)) {
             $output->writeln("\n\n<error>The php config file for the specified theme ($theme) is not a valid config file.</error>");
+
             return 1;
         }
 
         $jsonConfig = json_encode($config, JSON_PRETTY_PRINT);
 
-        if (! file_put_contents($jsonConfigPath, $jsonConfig)) {
+        if (!file_put_contents($jsonConfigPath, $jsonConfig)) {
             $output->writeln("\n\n<error>Error writing json config file for the specified theme ($theme).</error>");
+
             return 1;
         } else {
             $output->writeln("\n\n<info>Successfully wrote json config file for the specified theme ($theme).</info>");
         }
 
-        if (! $savePhpConfig) {
+        if (!$savePhpConfig) {
             if (!unlink($configPath)) {
                 $output->writeln("\n\n<error>Error deleting php config file for the specified theme ($theme).</error>");
             } else {
diff --git a/app/bundles/CoreBundle/Command/FindUpdatesCommand.php b/app/bundles/CoreBundle/Command/FindUpdatesCommand.php
index 9cb91025521..ae72cc8834e 100644
--- a/app/bundles/CoreBundle/Command/FindUpdatesCommand.php
+++ b/app/bundles/CoreBundle/Command/FindUpdatesCommand.php
@@ -1,29 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Process\Exception\RuntimeException;
 
 /**
- * CLI Command to fetch application updates
+ * CLI Command to fetch application updates.
  */
 class FindUpdatesCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -31,7 +26,7 @@ protected function configure()
     {
         $this->setName('mautic:update:find')
             ->setDescription('Fetches updates for Mautic')
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command checks for updates for the Mautic application.
 
 <info>php %command.full_name%</info>
@@ -52,11 +47,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $updateData   = $updateHelper->fetchData(true);
 
         if ($updateData['error']) {
-            $output->writeln('<error>' . $translator->trans($updateData['message']) . '</error>');
+            $output->writeln('<error>'.$translator->trans($updateData['message']).'</error>');
         } elseif ($updateData['message'] == 'mautic.core.updater.running.latest.version') {
-            $output->writeln('<info>' . $translator->trans($updateData['message']) . '</info>');
+            $output->writeln('<info>'.$translator->trans($updateData['message']).'</info>');
         } else {
-            $output->writeln($translator->trans($updateData['message'], array('%version%' => $updateData['version'], '%announcement%' => $updateData['announcement'])));
+            $output->writeln($translator->trans($updateData['message'], ['%version%' => $updateData['version'], '%announcement%' => $updateData['announcement']]));
             $output->writeln($translator->trans('mautic.core.updater.cli.update'));
         }
 
diff --git a/app/bundles/CoreBundle/Command/GenerateMigrationsCommand.php b/app/bundles/CoreBundle/Command/GenerateMigrationsCommand.php
index 5b25cae6fa3..65b7ba6ddc7 100644
--- a/app/bundles/CoreBundle/Command/GenerateMigrationsCommand.php
+++ b/app/bundles/CoreBundle/Command/GenerateMigrationsCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -28,23 +29,22 @@
 namespace Mautic\CoreBundle\Command;
 
 use Doctrine\DBAL\Migrations\Tools\Console\Command\AbstractCommand;
-use Doctrine\DBAL\Migrations\Configuration\Configuration;
-use Doctrine\DBAL\Migrations\Tools\Console\Helper\MigrationDirectoryHelper;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Command for generating new blank migration classes
+ * Command for generating new blank migration classes.
  *
  * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ *
  * @link    www.doctrine-project.org
  * @since   2.0
+ *
  * @author  Jonathan Wage <jonwage@gmail.com>
  */
 class GenerateMigrationsCommand extends AbstractCommand
 {
-
     private static $_template =
             '<?php
 /**
@@ -98,7 +98,7 @@ protected function configure()
                 ->setName('mautic:migrations:generate')
                 ->setDescription('Generate a blank migration class.')
                 ->addOption('editor-cmd', null, InputOption::VALUE_OPTIONAL, 'Open file with this command upon creation.')
-                ->setHelp(<<<EOT
+                ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command generates a blank migration class:
 
     <info>%command.full_name%</info>
@@ -115,7 +115,7 @@ protected function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $version = date('YmdHis');
-        $path = $this->generateMigration($input, $version);
+        $path    = $this->generateMigration($input, $version);
 
         $output->writeln(sprintf('Generated new migration class to "<info>%s</info>"', $path));
     }
@@ -124,13 +124,13 @@ protected function generateMigration(InputInterface $input, $version, $up = null
     {
         $code = str_replace(['<version>', '<year>'], [$version, date('Y')], self::$_template);
         $code = preg_replace('/^ +$/m', '', $code);
-        $dir = MAUTIC_ROOT_DIR.'/app/migrations';
-        $path = $dir . '/Version' . $version . '.php';
+        $dir  = MAUTIC_ROOT_DIR.'/app/migrations';
+        $path = $dir.'/Version'.$version.'.php';
 
         file_put_contents($path, $code);
 
         if ($editorCmd = $input->getOption('editor-cmd')) {
-            proc_open($editorCmd . ' ' . escapeshellarg($path), [], $pipes);
+            proc_open($editorCmd.' '.escapeshellarg($path), [], $pipes);
         }
 
         return $path;
diff --git a/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php b/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php
index c1d6ab903c2..b8bc6e5771c 100644
--- a/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php
+++ b/app/bundles/CoreBundle/Command/GenerateProductionAssetsCommand.php
@@ -1,29 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Finder\Finder;
 
 /**
- * CLI Command to generate production assets
+ * CLI Command to generate production assets.
  */
 class GenerateProductionAssetsCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -31,7 +26,7 @@ protected function configure()
     {
         $this->setName('mautic:assets:generate')
             ->setDescription('Combines and minifies asset files from each bundle into single production files')
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command Combines and minifies files from each bundle's Assets/css/* and Assets/js/* folders into single production files stored in root/media/css and root/media/js respectively.
 
 <info>php %command.full_name%</info>
@@ -44,7 +39,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $container = $this->getContainer();
+        $container   = $this->getContainer();
         $assetHelper = $container->get('mautic.helper.assetgeneration');
 
         $factory = $container->get('mautic.factory');
@@ -55,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Minify Mautic Form SDK
         file_put_contents(
             $factory->getSystemPath('assets').'/js/mautic-form.js',
-            \Minify::combine(array($factory->getSystemPath('assets').'/js/mautic-form-src.js'))
+            \Minify::combine([$factory->getSystemPath('assets').'/js/mautic-form-src.js'])
         );
 
         /** @var \Symfony\Bundle\FrameworkBundle\Translation\Translator $translator */
diff --git a/app/bundles/CoreBundle/Command/InstallDataCommand.php b/app/bundles/CoreBundle/Command/InstallDataCommand.php
index d164a60284b..c205a00b147 100644
--- a/app/bundles/CoreBundle/Command/InstallDataCommand.php
+++ b/app/bundles/CoreBundle/Command/InstallDataCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,19 +12,16 @@
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Finder\Finder;
 
 /**
- * CLI Command to install Mautic sample data
+ * CLI Command to install Mautic sample data.
  */
 class InstallDataCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -31,12 +29,12 @@ protected function configure()
     {
         $this->setName('mautic:install:data')
             ->setDescription('Installs Mautic with sample data')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption(
                     'force', null, InputOption::VALUE_NONE, 'Bypasses the verification check.'
-                )
-            ))
-            ->setHelp(<<<EOT
+                ),
+            ])
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command re-installs Mautic with sample data.
 
 <info>php %command.full_name%</info>
@@ -63,10 +61,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $confirm = $dialog->select(
                 $output,
                 $translator->trans('mautic.core.command.install_data_confirm'),
-                array(
+                [
                     $translator->trans('mautic.core.form.no'),
                     $translator->trans('mautic.core.form.yes'),
-                ),
+                ],
                 0
             );
 
@@ -83,12 +81,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         //due to foreign restraint and truncate issues with doctrine, the whole schema must be dropped and recreated
         $command = $this->getApplication()->find('doctrine:schema:drop');
-        $input = new ArrayInput(array(
+        $input   = new ArrayInput([
             'command' => 'doctrine:schema:drop',
             '--force' => true,
             '--env'   => $env,
-            '--quiet'  => true
-        ));
+            '--quiet' => true,
+        ]);
         $returnCode = $command->run($input, $output);
 
         if ($returnCode !== 0) {
@@ -97,11 +95,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         //recreate the database
         $command = $this->getApplication()->find('doctrine:schema:create');
-        $input = new ArrayInput(array(
+        $input   = new ArrayInput([
             'command' => 'doctrine:schema:create',
             '--env'   => $env,
-            '--quiet'  => true
-        ));
+            '--quiet' => true,
+        ]);
         $returnCode = $command->run($input, $output);
         if ($returnCode !== 0) {
             return $returnCode;
@@ -109,18 +107,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         //now populate the tables with fixture
         $command = $this->getApplication()->find('doctrine:fixtures:load');
-        $args = array(
+        $args    = [
             '--append' => true,
             'command'  => 'doctrine:fixtures:load',
             '--env'    => $env,
-            '--quiet'  => true
-        );
+            '--quiet'  => true,
+        ];
 
         $fixtures = $this->getMauticFixtures();
         foreach ($fixtures as $fixture) {
             $args['--fixtures'][] = $fixture;
         }
-        $input = new ArrayInput($args);
+        $input      = new ArrayInput($args);
         $returnCode = $command->run($input, $output);
         if ($returnCode !== 0) {
             return $returnCode;
@@ -135,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * Returns Mautic fixtures
+     * Returns Mautic fixtures.
      *
      * @param bool $returnClassNames
      *
@@ -143,11 +141,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     public function getMauticFixtures($returnClassNames = false)
     {
-        $fixtures = array();
+        $fixtures      = [];
         $mauticBundles = $this->getContainer()->getParameter('mautic.bundles');
         foreach ($mauticBundles as $bundle) {
             //parse the namespace into a filepath
-            $fixturesDir    = $bundle['directory'] . '/DataFixtures/ORM';
+            $fixturesDir = $bundle['directory'].'/DataFixtures/ORM';
 
             if (file_exists($fixturesDir)) {
                 if ($returnClassNames) {
@@ -156,14 +154,15 @@ public function getMauticFixtures($returnClassNames = false)
                     $finder->files()->in($fixturesDir)->name('*.php');
                     foreach ($finder as $file) {
                         //add the file to be loaded
-                        $class      = str_replace(".php", "", $file->getFilename());
-                        $fixtures[] = 'Mautic\\' . $bundle['bundle'] . '\\DataFixtures\\ORM\\' . $class;
+                        $class      = str_replace('.php', '', $file->getFilename());
+                        $fixtures[] = 'Mautic\\'.$bundle['bundle'].'\\DataFixtures\\ORM\\'.$class;
                     }
                 } else {
                     $fixtures[] = $fixturesDir;
                 }
             }
         }
+
         return $fixtures;
     }
 }
diff --git a/app/bundles/CoreBundle/Command/LanguageConfigCommand.php b/app/bundles/CoreBundle/Command/LanguageConfigCommand.php
index da1c8c11cd4..29090b16744 100644
--- a/app/bundles/CoreBundle/Command/LanguageConfigCommand.php
+++ b/app/bundles/CoreBundle/Command/LanguageConfigCommand.php
@@ -1,29 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Finder\Finder;
 
 /**
- * CLI Command to create language configuration files
+ * CLI Command to create language configuration files.
  */
 class LanguageConfigCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -31,7 +27,7 @@ protected function configure()
     {
         $this->setName('mautic:translation:createconfig')
             ->setDescription('Create config.php files for translations')
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command is used to create config.php files for translations
 
 <info>php %command.full_name%</info>
@@ -56,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 0;
         }
 
-        $translationDir = dirname($this->getContainer()->getParameter('kernel.root_dir')) . '/translations/';
+        $translationDir = dirname($this->getContainer()->getParameter('kernel.root_dir')).'/translations/';
 
         $installedLocales = new Finder();
         $installedLocales->directories()->in($translationDir)->ignoreDotFiles(true)->depth('== 0');
@@ -67,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /** @var \Symfony\Component\Finder\SplFileInfo $dir */
         foreach ($installedLocales as $dir) {
             // If a config.php file exists, we don't need to do anything
-            $configFile = $dir->getRealPath() . '/config.php';
+            $configFile = $dir->getRealPath().'/config.php';
 
             if (file_exists($configFile)) {
                 continue;
@@ -79,12 +75,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $langInfo = $transifex->languageinfo->getLanguage($lang);
 
             // TODO - Don't hardcode the author data
-            $configData = $this->render(array('name' => $langInfo->name, 'locale' => $langInfo->code, 'author' => 'Mautic Translators'));
+            $configData = $this->render(['name' => $langInfo->name, 'locale' => $langInfo->code, 'author' => 'Mautic Translators']);
 
             if (!@file_put_contents($configFile, $configData)) {
-                $output->writeln($translator->trans('mautic.core.command.language_config.could_not_create', array('%file%' => $configFile)));
+                $output->writeln($translator->trans('mautic.core.command.language_config.could_not_create', ['%file%' => $configFile]));
             } else {
-                $output->writeln($translator->trans('mautic.core.command.language_config.config_written', array('%lang%' => $lang)));
+                $output->writeln($translator->trans('mautic.core.command.language_config.config_written', ['%lang%' => $lang]));
             }
         }
 
@@ -149,12 +145,12 @@ protected function renderArray($array, $level = 1)
                 $string .= '"'.addcslashes($value, '\\"').'"';
             }
 
-            $counter--;
+            --$counter;
             if ($counter > 0) {
-                $string .= ", \n" . str_repeat("\t", $level + 1);
+                $string .= ", \n".str_repeat("\t", $level + 1);
             }
         }
-        $string .= "\n" . str_repeat("\t", $level) . ")";
+        $string .= "\n".str_repeat("\t", $level).')';
 
         return $string;
     }
diff --git a/app/bundles/CoreBundle/Command/ModeratedCommand.php b/app/bundles/CoreBundle/Command/ModeratedCommand.php
index 0c27702b27d..cc492514c8b 100644
--- a/app/bundles/CoreBundle/Command/ModeratedCommand.php
+++ b/app/bundles/CoreBundle/Command/ModeratedCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,7 +23,7 @@ abstract class ModeratedCommand extends ContainerAwareCommand
     protected $output;
 
     /**
-     * Set moderation options
+     * Set moderation options.
      */
     protected function configure()
     {
@@ -42,9 +43,9 @@ protected function checkRunStatus(InputInterface $input, OutputInterface $output
         $force        = $input->getOption('force');
         $timeout      = $this->getContainer()->hasParameter('mautic.command_timeout') ?
             $this->getContainer()->getParameter('mautic.command_timeout') : 1800;
-        $checkFile    = $this->checkfile = $this->getContainer()->getParameter('kernel.cache_dir').'/../script_executions.json';
-        $command      = $this->getName();
-        $this->key    = $key;
+        $checkFile = $this->checkfile = $this->getContainer()->getParameter('kernel.cache_dir').'/../script_executions.json';
+        $command   = $this->getName();
+        $this->key = $key;
 
         $fp = fopen($checkFile, 'c+');
 
@@ -89,7 +90,7 @@ protected function checkRunStatus(InputInterface $input, OutputInterface $output
     }
 
     /**
-     * Complete this run
+     * Complete this run.
      */
     protected function completeRun()
     {
@@ -121,4 +122,4 @@ protected function completeRun()
         flock($fp, LOCK_UN);
         fclose($fp);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Command/PullTransifexCommand.php b/app/bundles/CoreBundle/Command/PullTransifexCommand.php
index 0711468024d..444abe78459 100644
--- a/app/bundles/CoreBundle/Command/PullTransifexCommand.php
+++ b/app/bundles/CoreBundle/Command/PullTransifexCommand.php
@@ -1,29 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Finder\Finder;
 
 /**
- * CLI Command to pull language resources from Transifex
+ * CLI Command to pull language resources from Transifex.
  */
 class PullTransifexCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -32,7 +29,7 @@ protected function configure()
         $this->setName('mautic:transifex:pull')
             ->setDescription('Fetches translations for Mautic from Transifex')
             ->addOption('language', null, InputOption::VALUE_OPTIONAL, 'Optional language to pull', null)
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command is used to retrieve updated Mautic translations from Transifex and writes them to the filesystem.
 
 <info>php %command.full_name%</info>
@@ -64,16 +61,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $options        = $input->getOptions();
         $languageFilter = $options['language'];
         $files          = $this->getLanguageFiles();
-        $translationDir = dirname($this->getContainer()->getParameter('kernel.root_dir')) . '/translations/';
+        $translationDir = dirname($this->getContainer()->getParameter('kernel.root_dir')).'/translations/';
 
         /** @var \BabDev\Transifex\Transifex $transifex */
         $transifex = $this->getContainer()->get('transifex');
 
         foreach ($files as $bundle => $stringFiles) {
             foreach ($stringFiles as $file) {
-                $name  = $bundle . ' ' . str_replace('.ini', '', basename($file));
+                $name  = $bundle.' '.str_replace('.ini', '', basename($file));
                 $alias = $this->stringURLUnicodeSlug($name);
-                $output->writeln($translator->trans('mautic.core.command.transifex_processing_resource', array('%resource%' => $name)));
+                $output->writeln($translator->trans('mautic.core.command.transifex_processing_resource', ['%resource%' => $name]));
 
                 try {
                     $languageStats = $transifex->statistics->getStatistics('mautic', $alias);
@@ -88,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                             continue;
                         }
 
-                        $output->writeln($translator->trans('mautic.core.command.transifex_processing_language', array('%language%' => $language)));
+                        $output->writeln($translator->trans('mautic.core.command.transifex_processing_language', ['%language%' => $language]));
 
                         $completed = str_replace('%', '', $stats->completed);
 
@@ -96,28 +93,28 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         if ($completed >= 80) {
                             $translation = $transifex->translations->getTranslation('mautic', $alias, $language);
 
-                            $path = $translationDir . $language . '/' . $bundle . '/' . basename($file);
+                            $path = $translationDir.$language.'/'.$bundle.'/'.basename($file);
 
                             // Verify the directories exist
-                            if (!is_dir($translationDir . $language)) {
-                                if (!mkdir($translationDir . $language)) {
+                            if (!is_dir($translationDir.$language)) {
+                                if (!mkdir($translationDir.$language)) {
                                     $output->writeln(
-                                        $translator->trans('mautic.core.command.transifex_error_creating_directory', array(
-                                            '%directory%' => $translationDir . $language,
-                                            '%language%' => $language
-                                        )));
+                                        $translator->trans('mautic.core.command.transifex_error_creating_directory', [
+                                            '%directory%' => $translationDir.$language,
+                                            '%language%'  => $language,
+                                        ]));
 
                                     continue;
                                 }
                             }
 
-                            if (!is_dir($translationDir . $language . '/' . $bundle)) {
-                                if (!mkdir($translationDir . $language . '/' . $bundle)) {
+                            if (!is_dir($translationDir.$language.'/'.$bundle)) {
+                                if (!mkdir($translationDir.$language.'/'.$bundle)) {
                                     $output->writeln(
-                                        $translator->trans('mautic.core.command.transifex_error_creating_directory', array(
-                                            '%directory%' => $translationDir . $language . '/' . $bundle,
-                                            '%language%' => $language
-                                        )));
+                                        $translator->trans('mautic.core.command.transifex_error_creating_directory', [
+                                            '%directory%' => $translationDir.$language.'/'.$bundle,
+                                            '%language%'  => $language,
+                                        ]));
 
                                     continue;
                                 }
@@ -127,7 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                             if (!file_put_contents($path, $translation->content)) {
                                 $output->writeln(
                                     $translator->trans('mautic.core.command.transifex_error_creating_file',
-                                        array('%file%' => $path, '%language%' => $language)
+                                        ['%file%' => $path, '%language%' => $language]
                                     )
                                 );
 
@@ -138,7 +135,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         }
                     }
                 } catch (\Exception $exception) {
-                    $output->writeln($translator->trans('mautic.core.command.transifex_error_pulling_data', array('%message%' => $exception->getMessage())));
+                    $output->writeln($translator->trans('mautic.core.command.transifex_error_pulling_data', ['%message%' => $exception->getMessage()]));
                 }
             }
         }
@@ -147,22 +144,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * Returns Mautic translation files
+     * Returns Mautic translation files.
      *
      * @return array
      */
     private function getLanguageFiles()
     {
-        $files = array();
+        $files         = [];
         $mauticBundles = $this->getContainer()->getParameter('mautic.bundles');
-        $pluginBundles  = $this->getContainer()->getParameter('mautic.plugin.bundles');
+        $pluginBundles = $this->getContainer()->getParameter('mautic.plugin.bundles');
 
         foreach ($mauticBundles as $bundle) {
             // Parse the namespace into a filepath
-            $translationsDir = $bundle['directory'] . '/Translations/en_US';
+            $translationsDir = $bundle['directory'].'/Translations/en_US';
 
             if (is_dir($translationsDir)) {
-                $files[$bundle['bundle']] = array();
+                $files[$bundle['bundle']] = [];
 
                 // Get files within the directory
                 $finder = new Finder();
@@ -177,10 +174,10 @@ private function getLanguageFiles()
 
         foreach ($pluginBundles as $bundle) {
             // Parse the namespace into a filepath
-            $translationsDir = $bundle['directory'] . '/Translations/en_US';
+            $translationsDir = $bundle['directory'].'/Translations/en_US';
 
             if (is_dir($translationsDir)) {
-                $files[$bundle['bundle']] = array();
+                $files[$bundle['bundle']] = [];
 
                 // Get files within the directory
                 $finder = new Finder();
diff --git a/app/bundles/CoreBundle/Command/PushTransifexCommand.php b/app/bundles/CoreBundle/Command/PushTransifexCommand.php
index 690d252eaeb..288364aaeba 100644
--- a/app/bundles/CoreBundle/Command/PushTransifexCommand.php
+++ b/app/bundles/CoreBundle/Command/PushTransifexCommand.php
@@ -1,29 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Finder\Finder;
 
 /**
- * CLI Command to push language resources to Transifex
+ * CLI Command to push language resources to Transifex.
  */
 class PushTransifexCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -31,13 +28,13 @@ protected function configure()
     {
         $this->setName('mautic:transifex:push')
             ->setDescription('Pushes Mautic translation resources to Transifex')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption(
                     'create', null, InputOption::VALUE_NONE,
                     'Flag to create new resources.'
-                )
-            ))
-            ->setHelp(<<<EOT
+                ),
+            ])
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command is used to push translation resources to Transifex
 
 <info>php %command.full_name%</info>
@@ -75,20 +72,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         foreach ($files as $bundle => $stringFiles) {
             foreach ($stringFiles as $file) {
-                $name  = $bundle . ' ' . str_replace('.ini', '', basename($file));
+                $name  = $bundle.' '.str_replace('.ini', '', basename($file));
                 $alias = $this->stringURLUnicodeSlug($name);
-                $output->writeln($translator->trans('mautic.core.command.transifex_processing_resource', array('%resource%' => $name)));
+                $output->writeln($translator->trans('mautic.core.command.transifex_processing_resource', ['%resource%' => $name]));
 
                 try {
                     if ($create) {
-                        $transifex->resources->createResource('mautic', $name, $alias, 'PHP_INI', array('file' => $file));
+                        $transifex->resources->createResource('mautic', $name, $alias, 'PHP_INI', ['file' => $file]);
                         $output->writeln($translator->trans('mautic.core.command.transifex_resource_created'));
                     } else {
                         $transifex->resources->updateResourceContent('mautic', $alias, $file, 'file');
                         $output->writeln($translator->trans('mautic.core.command.transifex_resource_updated'));
                     }
                 } catch (\Exception $exception) {
-                    $output->writeln($translator->trans('mautic.core.command.transifex_error_pushing_data', array('%message%' => $exception->getMessage())));
+                    $output->writeln($translator->trans('mautic.core.command.transifex_error_pushing_data', ['%message%' => $exception->getMessage()]));
                 }
             }
         }
@@ -97,22 +94,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * Returns Mautic translation files
+     * Returns Mautic translation files.
      *
      * @return array
      */
     private function getLanguageFiles()
     {
-        $files = array();
+        $files         = [];
         $mauticBundles = $this->getContainer()->getParameter('mautic.bundles');
-        $pluginBundles  = $this->getContainer()->getParameter('mautic.plugin.bundles');
+        $pluginBundles = $this->getContainer()->getParameter('mautic.plugin.bundles');
 
         foreach ($mauticBundles as $bundle) {
             // Parse the namespace into a filepath
-            $translationsDir = $bundle['directory'] . '/Translations/en_US';
+            $translationsDir = $bundle['directory'].'/Translations/en_US';
 
             if (is_dir($translationsDir)) {
-                $files[$bundle['bundle']] = array();
+                $files[$bundle['bundle']] = [];
 
                 // Get files within the directory
                 $finder = new Finder();
@@ -127,10 +124,10 @@ private function getLanguageFiles()
 
         foreach ($pluginBundles as $bundle) {
             // Parse the namespace into a filepath
-            $translationsDir = $bundle['directory'] . '/Translations/en_US';
+            $translationsDir = $bundle['directory'].'/Translations/en_US';
 
             if (is_dir($translationsDir)) {
-                $files[$bundle['bundle']] = array();
+                $files[$bundle['bundle']] = [];
 
                 // Get files within the directory
                 $finder = new Finder();
diff --git a/app/bundles/CoreBundle/Command/SendChannelBroadcastCommand.php b/app/bundles/CoreBundle/Command/SendChannelBroadcastCommand.php
index dfdf70add0a..307e907c252 100644
--- a/app/bundles/CoreBundle/Command/SendChannelBroadcastCommand.php
+++ b/app/bundles/CoreBundle/Command/SendChannelBroadcastCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,11 +18,10 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * CLI Command to send a scheduled broadcast
+ * CLI Command to send a scheduled broadcast.
  */
 class SendChannelBroadcastCommand extends ModeratedCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -30,7 +30,7 @@ protected function configure()
         $this->setName('mautic:broadcasts:send')
             ->setDescription('Process contacts pending to receive a channel broadcast.')
             ->setHelp(
-                <<<EOT
+                <<<'EOT'
                 The <info>%command.name%</info> command is send a channel broadcast to pending contacts.
 
 <info>php %command.full_name% --channel=email --id=3</info>
@@ -62,7 +62,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $channelId = $input->getOption('id');
         if (!$this->checkRunStatus($input, $output, ($channelId) ? $channelId : 'all')) {
-
             return 0;
         }
 
@@ -96,4 +95,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Command/TranslationDebugCommand.php b/app/bundles/CoreBundle/Command/TranslationDebugCommand.php
index dab0a579e61..2f002edda82 100644
--- a/app/bundles/CoreBundle/Command/TranslationDebugCommand.php
+++ b/app/bundles/CoreBundle/Command/TranslationDebugCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -23,14 +24,12 @@
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor;
 use Symfony\Component\Console\Formatter\OutputFormatter;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
-use Symfony\Component\Console\Output\StreamOutput;
-use Symfony\Component\Translation\Catalogue\MergeOperation;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Translation\Catalogue\MergeOperation;
 use Symfony\Component\Translation\MessageCatalogue;
 
 /**
@@ -41,18 +40,18 @@
  */
 class TranslationDebugCommand extends ContainerAwareCommand
 {
-    const MESSAGE_MISSING = 0;
-    const MESSAGE_UNUSED = 1;
+    const MESSAGE_MISSING         = 0;
+    const MESSAGE_UNUSED          = 1;
     const MESSAGE_EQUALS_FALLBACK = 2;
 
     /**
      * {@inheritdoc}
      */
-    protected function configure ()
+    protected function configure()
     {
         $this
             ->setName('mautic:translation:debug')
-            ->setDefinition(array(
+            ->setDefinition([
                 new InputOption('locale', 'l', InputOption::VALUE_OPTIONAL, 'The locale'),
                 new InputOption('bundle', 'b', InputOption::VALUE_OPTIONAL, 'The bundle name'),
                 new InputOption('logfile', 'log', InputOption::VALUE_OPTIONAL, 'Optional log file'),
@@ -61,9 +60,9 @@ protected function configure ()
                 new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'The messages domain'),
                 new InputOption('only-missing', null, InputOption::VALUE_NONE, 'Displays only missing messages'),
                 new InputOption('only-unused', null, InputOption::VALUE_NONE, 'Displays only unused messages'),
-            ))
+            ])
             ->setDescription('Displays translation messages informations')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command helps finding unused or missing translation
 messages and comparing them with the fallback ones by inspecting the
 templates and translation files of a given bundle.
@@ -91,9 +90,9 @@ protected function configure ()
     /**
      * {@inheritdoc}
      */
-    protected function execute (InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $locale    = $input->getOption('locale');
+        $locale = $input->getOption('locale');
         if (empty($locale)) {
             $locale = 'en_US';
         }
@@ -118,7 +117,7 @@ protected function execute (InputInterface $input, OutputInterface $output)
                 return;
             }
 
-            $bundles = array($bundles[$bundle]);
+            $bundles = [$bundles[$bundle]];
         }
 
         // Load defined messages
@@ -131,29 +130,29 @@ protected function execute (InputInterface $input, OutputInterface $output)
 
         foreach ($bundles as $bundle) {
             if (!$dupsOnly) {
-                if (file_exists($bundle['directory'] . '/Views')) {
-                    $phpFormExtractor->extract($bundle['directory'] . '/Views', $extractedCatalogue);
-                    $this->getContainer()->get('translation.extractor')->extract($bundle['directory'] . '/Views', $extractedCatalogue);
+                if (file_exists($bundle['directory'].'/Views')) {
+                    $phpFormExtractor->extract($bundle['directory'].'/Views', $extractedCatalogue);
+                    $this->getContainer()->get('translation.extractor')->extract($bundle['directory'].'/Views', $extractedCatalogue);
                 }
 
                 if (!$viewsOnly) {
-                    $directories = array(
+                    $directories = [
                         '/Form/Type',
                         '/EventListener',
                         '/Model',
                         '/EventListener',
-                        '/Controller'
-                    );
+                        '/Controller',
+                    ];
                     foreach ($directories as $d) {
-                        if (file_exists($bundle['directory'] . $d)) {
-                            $phpFormExtractor->extract($bundle['directory'] . $d, $extractedCatalogue);
-                            $this->getContainer()->get('translation.extractor')->extract($bundle['directory'] . $d, $extractedCatalogue);
+                        if (file_exists($bundle['directory'].$d)) {
+                            $phpFormExtractor->extract($bundle['directory'].$d, $extractedCatalogue);
+                            $this->getContainer()->get('translation.extractor')->extract($bundle['directory'].$d, $extractedCatalogue);
                         }
                     }
                 }
             }
 
-            if (is_dir($bundle['directory'] . '/Translations')) {
+            if (is_dir($bundle['directory'].'/Translations')) {
                 $currentCatalogue = $loader->load(null, $locale, $domain);
             }
         }
@@ -162,7 +161,7 @@ protected function execute (InputInterface $input, OutputInterface $output)
         $mergeOperation = new MergeOperation($extractedCatalogue, $currentCatalogue);
         $allMessages    = $mergeOperation->getResult()->all($domain);
         if (null !== $domain) {
-            $allMessages = array($domain => $allMessages);
+            $allMessages = [$domain => $allMessages];
         }
 
         // No defined or extracted messages
@@ -182,10 +181,10 @@ protected function execute (InputInterface $input, OutputInterface $output)
         $table = new Table($output);
 
         // Display header line
-        $headers = array('State(s)', 'Id', sprintf('Message Preview (%s)', $locale));
+        $headers = ['State(s)', 'Id', sprintf('Message Preview (%s)', $locale)];
         $table->setHeaders($headers);
 
-        $duplicateCheck = array();
+        $duplicateCheck = [];
 
         // Iterate all message ids and determine their state
         foreach ($allMessages as $domain => $messages) {
@@ -194,14 +193,14 @@ protected function execute (InputInterface $input, OutputInterface $output)
 
                 $duplicateKey = strtolower($value);
                 if (!isset($duplicateCheck[$duplicateKey])) {
-                    $duplicateCheck[$duplicateKey] = array();
+                    $duplicateCheck[$duplicateKey] = [];
                 }
-                $duplicateCheck[$duplicateKey][] = array(
+                $duplicateCheck[$duplicateKey][] = [
                     'id'     => $messageId,
-                    'domain' => $domain
-                );
+                    'domain' => $domain,
+                ];
 
-                $states = array();
+                $states = [];
 
                 if ($extractedCatalogue->defines($messageId, $domain)) {
                     if (!$currentCatalogue->defines($messageId, $domain)) {
@@ -217,7 +216,7 @@ protected function execute (InputInterface $input, OutputInterface $output)
                     continue;
                 }
 
-                $row = array($this->formatStates($states), $this->formatId($messageId), $this->sanitizeString($value));
+                $row = [$this->formatStates($states), $this->formatId($messageId), $this->sanitizeString($value)];
 
                 $table->addRow($row);
             }
@@ -240,7 +239,7 @@ protected function execute (InputInterface $input, OutputInterface $output)
         $table = new Table($output);
 
         // Display header line
-        $headers = array('Value', 'Domain', 'Message ID');
+        $headers = ['Value', 'Domain', 'Message ID'];
         $table->setHeaders($headers);
 
         //Check for duplicates
@@ -248,11 +247,11 @@ protected function execute (InputInterface $input, OutputInterface $output)
         foreach ($duplicateCheck as $value => $dups) {
             $count = count($dups);
             if ($count > 1) {
-                $totalDuplicateCount++;
-                $table->addRow(array('', '', ''));
-                $table->addRow(array($this->sanitizeString($value), $count, ''));
+                ++$totalDuplicateCount;
+                $table->addRow(['', '', '']);
+                $table->addRow([$this->sanitizeString($value), $count, '']);
                 foreach ($dups as $dup) {
-                    $table->addRow(array('', $dup['domain'], $dup['id']));
+                    $table->addRow(['', $dup['domain'], $dup['id']]);
                 }
             }
         }
@@ -260,11 +259,10 @@ protected function execute (InputInterface $input, OutputInterface $output)
         $table->render();
 
         $output->writeln('');
-        $output->writeln('<info>Total number of duplicates: ' . $totalDuplicateCount . '</info>');
-
+        $output->writeln('<info>Total number of duplicates: '.$totalDuplicateCount.'</info>');
     }
 
-    private function formatState ($state)
+    private function formatState($state)
     {
         if (self::MESSAGE_MISSING === $state) {
             return '<fg=red>x</>';
@@ -281,9 +279,9 @@ private function formatState ($state)
         return $state;
     }
 
-    private function formatStates (array $states)
+    private function formatStates(array $states)
     {
-        $result = array();
+        $result = [];
         foreach ($states as $state) {
             $result[] = $this->formatState($state);
         }
@@ -291,21 +289,21 @@ private function formatStates (array $states)
         return implode(' ', $result);
     }
 
-    private function formatId ($id)
+    private function formatId($id)
     {
         return sprintf('<fg=cyan;options=bold>%s</fg=cyan;options=bold>', $id);
     }
 
-    private function sanitizeString ($string, $length = 40)
+    private function sanitizeString($string, $length = 40)
     {
         $string = trim(preg_replace('/\s+/', ' ', $string));
 
         if (function_exists('mb_strlen') && false !== $encoding = mb_detect_encoding($string)) {
             if (mb_strlen($string, $encoding) > $length) {
-                return mb_substr($string, 0, $length - 3, $encoding) . '...';
+                return mb_substr($string, 0, $length - 3, $encoding).'...';
             }
         } elseif (strlen($string) > $length) {
-            return substr($string, 0, $length - 3) . '...';
+            return substr($string, 0, $length - 3).'...';
         }
 
         return $string;
@@ -319,22 +317,22 @@ class PhpFormTranslationExtractor extends PhpExtractor
      *
      * @var array
      */
-    protected $sequences = array(
-        array(
+    protected $sequences = [
+        [
             "'label'",
             '=>',
             self::MESSAGE_TOKEN,
-        ),
-        array(
+        ],
+        [
             "placeholder'",
             '=>',
             self::MESSAGE_TOKEN,
-        ),
-        array(
+        ],
+        [
             "'tooltip'",
             '=>',
             self::MESSAGE_TOKEN,
-        )
+        ],
 
-    );
-}
\ No newline at end of file
+    ];
+}
diff --git a/app/bundles/CoreBundle/Command/UpdateIpDataStoreCommand.php b/app/bundles/CoreBundle/Command/UpdateIpDataStoreCommand.php
index bb3ddd144df..f17d2e828dc 100644
--- a/app/bundles/CoreBundle/Command/UpdateIpDataStoreCommand.php
+++ b/app/bundles/CoreBundle/Command/UpdateIpDataStoreCommand.php
@@ -1,26 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Command;
 
-use Joomla\Http\HttpFactory;
 use Mautic\CoreBundle\IpLookup\AbstractLocalDataLookup;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * CLI Command to fetch updated Maxmind database
+ * CLI Command to fetch updated Maxmind database.
  */
 class UpdateIpDataStoreCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -29,7 +28,7 @@ protected function configure()
         $this->setName('mautic:iplookup:download')
             ->setDescription('Fetch remote datastores for IP lookup services that leverage local lookups')
             ->setHelp(
-                <<<EOT
+                <<<'EOT'
                 The <info>%command.name%</info> command is used to update local IP lookup data if applicable.
 
 <info>php %command.full_name%</info>
@@ -56,10 +55,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 if ($remoteUrl && $localPath) {
                     $output->writeln('<error>'.$translator->trans(
                         'mautic.core.ip_lookup.remote_fetch_error',
-                        array(
+                        [
                             '%remoteUrl%' => $remoteUrl,
-                            '%localPath%' => $localPath
-                        )
+                            '%localPath%' => $localPath,
+                        ]
                     ).'</error>');
                 } else {
                     $output->writeln('<error>'.$translator->trans(
@@ -71,4 +70,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Config/config.php b/app/bundles/CoreBundle/Config/config.php
index e6c6f84a90a..062636c5572 100644
--- a/app/bundles/CoreBundle/Config/config.php
+++ b/app/bundles/CoreBundle/Config/config.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
-    'routes'   => [
-        'main'   => [
-            'mautic_core_ajax'          => [
+    'routes' => [
+        'main' => [
+            'mautic_core_ajax' => [
                 'path'       => '/ajax',
                 'controller' => 'MauticCoreBundle:Ajax:delegateAjax',
             ],
-            'mautic_core_update'        => [
+            'mautic_core_update' => [
                 'path'       => '/update',
                 'controller' => 'MauticCoreBundle:Update:index',
             ],
@@ -22,40 +23,40 @@
                 'path'       => '/update/schema',
                 'controller' => 'MauticCoreBundle:Update:schema',
             ],
-            'mautic_core_form_action'   => [
+            'mautic_core_form_action' => [
                 'path'       => '/action/{objectAction}/{objectModel}/{objectId}',
                 'controller' => 'MauticCoreBundle:Form:execute',
                 'defaults'   => [
-                    'objectModel' => ''
-                ]
+                    'objectModel' => '',
+                ],
             ],
-            'mautic_core_file_action'   => [
+            'mautic_core_file_action' => [
                 'path'       => '/file/{objectAction}/{objectId}',
-                'controller' => 'MauticCoreBundle:File:execute'
+                'controller' => 'MauticCoreBundle:File:execute',
             ],
-            'mautic_themes_index'       => [
+            'mautic_themes_index' => [
                 'path'       => '/themes',
                 'controller' => 'MauticCoreBundle:Theme:index',
             ],
-            'mautic_themes_action'      => [
+            'mautic_themes_action' => [
                 'path'       => '/themes/{objectAction}/{objectId}',
                 'controller' => 'MauticCoreBundle:Theme:execute',
-            ]
+            ],
         ],
         'public' => [
-            'mautic_js'                    => [
+            'mautic_js' => [
                 'path'       => '/mtc.js',
                 'controller' => 'MauticCoreBundle:Js:index',
             ],
-            'mautic_base_index'            => [
+            'mautic_base_index' => [
                 'path'       => '/',
                 'controller' => 'MauticCoreBundle:Default:index',
             ],
-            'mautic_secure_root'           => [
+            'mautic_secure_root' => [
                 'path'       => '/s',
                 'controller' => 'MauticCoreBundle:Default:redirectSecureRoot',
             ],
-            'mautic_secure_root_slash'     => [
+            'mautic_secure_root_slash' => [
                 'path'       => '/s/',
                 'controller' => 'MauticCoreBundle:Default:redirectSecureRoot',
             ],
@@ -69,28 +70,28 @@
             ],
         ],
     ],
-    'menu'     => [
-        'main'    => [
+    'menu' => [
+        'main' => [
             'mautic.core.components' => [
                 'id'        => 'mautic_components_root',
                 'iconClass' => 'fa-puzzle-piece',
                 'priority'  => 60,
             ],
-            'mautic.core.channels'   => [
+            'mautic.core.channels' => [
                 'id'        => 'mautic_channels_root',
                 'iconClass' => 'fa-rss',
                 'priority'  => 40,
             ],
         ],
-        'admin'   => [
+        'admin' => [
             'mautic.theme.menu.index' => [
-                'route'           => 'mautic_themes_index',
-                'iconClass'       => 'fa-newspaper-o',
-                'id'              => 'mautic_themes_index',
-                'access'          => 'admin'
-            ]
+                'route'     => 'mautic_themes_index',
+                'iconClass' => 'fa-newspaper-o',
+                'id'        => 'mautic_themes_index',
+                'access'    => 'admin',
+            ],
         ],
-        'extra'   => [
+        'extra' => [
             'priority' => -1000,
             'items'    => [
                 'name'     => 'extra',
@@ -106,9 +107,9 @@
         ],
     ],
     'services' => [
-        'events'  => [
-            'mautic.core.subscriber'              => [
-                'class' => 'Mautic\CoreBundle\EventListener\CoreSubscriber',
+        'events' => [
+            'mautic.core.subscriber' => [
+                'class'     => 'Mautic\CoreBundle\EventListener\CoreSubscriber',
                 'arguments' => [
                     'mautic.helper.bundle',
                     'mautic.helper.menu',
@@ -116,77 +117,77 @@
                     'templating.helper.assets',
                     'mautic.helper.core_parameters',
                     'security.context',
-                    'mautic.user.model.user'
-                ]
+                    'mautic.user.model.user',
+                ],
             ],
             'mautic.core.environment.subscriber' => [
-                'class' => 'Mautic\CoreBundle\EventListener\EnvironmentSubscriber',
+                'class'     => 'Mautic\CoreBundle\EventListener\EnvironmentSubscriber',
                 'arguments' => [
                     'mautic.helper.cookie',
-                ]
+                ],
             ],
             'mautic.core.configbundle.subscriber' => [
-                'class' => 'Mautic\CoreBundle\EventListener\ConfigSubscriber',
+                'class'     => 'Mautic\CoreBundle\EventListener\ConfigSubscriber',
                 'arguments' => [
                     'mautic.helper.language',
-                    'mautic.helper.core_parameters'
-                ]
+                    'mautic.helper.core_parameters',
+                ],
             ],
-            'mautic.webpush.js.subscriber'        => [
+            'mautic.webpush.js.subscriber' => [
                 'class' => 'Mautic\CoreBundle\EventListener\BuildJsSubscriber',
             ],
-            'mautic.core.dashboard.subscriber'    => [
-                'class' => 'Mautic\CoreBundle\EventListener\DashboardSubscriber',
+            'mautic.core.dashboard.subscriber' => [
+                'class'     => 'Mautic\CoreBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
-                    'mautic.core.model.auditlog'
-                ]
+                    'mautic.core.model.auditlog',
+                ],
             ],
-            'mautic.core.maintenance.subscriber'    => [
-                'class' => 'Mautic\CoreBundle\EventListener\MaintenanceSubscriber',
+            'mautic.core.maintenance.subscriber' => [
+                'class'     => 'Mautic\CoreBundle\EventListener\MaintenanceSubscriber',
                 'arguments' => [
-                    'doctrine.dbal.default_connection'
-                ]
+                    'doctrine.dbal.default_connection',
+                ],
             ],
         ],
-        'forms'   => [
-            'mautic.form.type.spacer'                                         => [
+        'forms' => [
+            'mautic.form.type.spacer' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\SpacerType',
                 'alias' => 'spacer',
             ],
-            'mautic.form.type.tel'                                            => [
+            'mautic.form.type.tel' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\TelType',
                 'alias' => 'tel',
             ],
-            'mautic.form.type.button_group'                                   => [
+            'mautic.form.type.button_group' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\ButtonGroupType',
                 'alias' => 'button_group',
             ],
-            'mautic.form.type.yesno_button_group'                             => [
+            'mautic.form.type.yesno_button_group' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\YesNoButtonGroupType',
                 'alias' => 'yesno_button_group',
             ],
-            'mautic.form.type.standalone_button'                              => [
+            'mautic.form.type.standalone_button' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\StandAloneButtonType',
                 'alias' => 'standalone_button',
             ],
-            'mautic.form.type.form_buttons'                                   => [
+            'mautic.form.type.form_buttons' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\FormButtonsType',
                 'alias' => 'form_buttons',
             ],
-            'mautic.form.type.hidden_entity'                                  => [
+            'mautic.form.type.hidden_entity' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\HiddenEntityType',
                 'alias'     => 'hidden_entity',
                 'arguments' => 'doctrine.orm.entity_manager',
             ],
-            'mautic.form.type.sortablelist'                                   => [
+            'mautic.form.type.sortablelist' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\SortableListType',
                 'alias' => 'sortablelist',
             ],
-            'mautic.form.type.dynamiclist'                                    => [
+            'mautic.form.type.dynamiclist' => [
                 'class' => 'Mautic\CoreBundle\Form\Type\DynamicListType',
                 'alias' => 'dynamiclist',
             ],
-            'mautic.form.type.coreconfig'                                     => [
+            'mautic.form.type.coreconfig' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\ConfigType',
                 'arguments' => [
                     'translator',
@@ -196,7 +197,7 @@
                     '%mautic.ip_lookup_services%',
                     'mautic.ip_lookup',
                 ],
-                'alias'     => 'coreconfig',
+                'alias' => 'coreconfig',
             ],
             'mautic.form.type.coreconfig.iplookup_download_data_store_button' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\IpLookupDownloadDataStoreButtonType',
@@ -206,63 +207,63 @@
                     'translator',
                 ],
             ],
-            'mautic.form.type.theme_list'                                     => [
+            'mautic.form.type.theme_list' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\ThemeListType',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'theme_list',
             ],
-            'mautic.form.type.daterange'                                      => [
+            'mautic.form.type.daterange' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\DateRangeType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'daterange'
+                'alias'     => 'daterange',
             ],
-            'mautic.form.type.builder.section'        => [
+            'mautic.form.type.builder.section' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\BuilderSectionType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'builder_section'
+                'alias'     => 'builder_section',
             ],
-            'mautic.form.type.slot'               => [
+            'mautic.form.type.slot' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\SlotType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'slot'
+                'alias'     => 'slot',
             ],
-            'mautic.form.type.slot.button'        => [
+            'mautic.form.type.slot.button' => [
                 'class'     => 'Mautic\CoreBundle\Form\Type\SlotButtonType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'slot_button'
+                'alias'     => 'slot_button',
             ],
-            'mautic.form.type.theme.upload'        => [
-                'class'     => 'Mautic\CoreBundle\Form\Type\ThemeUploadType',
-                'alias'     => 'theme_upload'
+            'mautic.form.type.theme.upload' => [
+                'class' => 'Mautic\CoreBundle\Form\Type\ThemeUploadType',
+                'alias' => 'theme_upload',
             ],
             'mautic.form.type.dynamic_content_filter' => [
-                'class'     => \Mautic\CoreBundle\Form\Type\DynamicContentFilterType::class,
-                'alias'     => 'dynamic_content_filter'
+                'class' => \Mautic\CoreBundle\Form\Type\DynamicContentFilterType::class,
+                'alias' => 'dynamic_content_filter',
             ],
             'mautic.form.type.dynamic_content_filter_entry' => [
                 'class'     => \Mautic\CoreBundle\Form\Type\DynamicContentFilterEntryType::class,
                 'alias'     => 'dynamic_content_filter_entry',
                 'arguments' => [
                     'mautic.lead.model.list',
-                    'mautic.stage.model.stage'
-                ]
+                    'mautic.stage.model.stage',
+                ],
             ],
             'mautic.form.type.dynamic_content_filter_entry_filters' => [
                 'class'     => \Mautic\CoreBundle\Form\Type\DynamicContentFilterEntryFiltersType::class,
                 'alias'     => 'dynamic_content_filter_entry_filters',
                 'arguments' => [
                     'mautic.factory',
-                    'mautic.lead.model.list'
-                ]
-            ]
+                    'mautic.lead.model.list',
+                ],
+            ],
         ],
         'helpers' => [
-            'mautic.helper.template.menu'      => [
+            'mautic.helper.template.menu' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Helper\MenuHelper',
                 'arguments' => ['knp_menu.helper'],
                 'alias'     => 'menu',
             ],
-            'mautic.helper.template.date'      => [
+            'mautic.helper.template.date' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Helper\DateHelper',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'date',
@@ -272,7 +273,7 @@
                 'arguments' => '%kernel.root_dir%',
                 'alias'     => 'exception',
             ],
-            'mautic.helper.template.gravatar'  => [
+            'mautic.helper.template.gravatar' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Helper\GravatarHelper',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'gravatar',
@@ -282,16 +283,16 @@
                 'arguments' => 'mautic.factory',
                 'alias'     => 'analytics',
             ],
-            'mautic.helper.template.mautibot'  => [
+            'mautic.helper.template.mautibot' => [
                 'class' => 'Mautic\CoreBundle\Templating\Helper\MautibotHelper',
                 'alias' => 'mautibot',
             ],
-            'mautic.helper.template.canvas'    => [
+            'mautic.helper.template.canvas' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Helper\SidebarCanvasHelper',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'canvas',
             ],
-            'mautic.helper.template.button'    => [
+            'mautic.helper.template.button' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Helper\ButtonHelper',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'buttons',
@@ -301,23 +302,23 @@
                 'arguments' => 'mautic.factory',
                 'alias'     => 'formatter',
             ],
-            'mautic.helper.template.security'  => [
+            'mautic.helper.template.security' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Helper\SecurityHelper',
                 'arguments' => [
                     'mautic.security',
                     'request_stack',
-                    'event_dispatcher'
+                    'event_dispatcher',
                 ],
-                'alias'     => 'security'
+                'alias' => 'security',
             ],
-            'mautic.helper.paths'              => [
+            'mautic.helper.paths' => [
                 'class'     => 'Mautic\CoreBundle\Helper\PathsHelper',
                 'arguments' => [
                     'mautic.helper.user',
                     'mautic.helper.core_parameters',
                 ],
             ],
-            'mautic.helper.ip_lookup'          => [
+            'mautic.helper.ip_lookup' => [
                 'class'     => 'Mautic\CoreBundle\Helper\IpLookupHelper',
                 'arguments' => [
                     'request_stack',
@@ -326,40 +327,40 @@
                     'mautic.ip_lookup',
                 ],
             ],
-            'mautic.helper.user'               => [
+            'mautic.helper.user' => [
                 'class'     => 'Mautic\CoreBundle\Helper\UserHelper',
                 'arguments' => [
-                    'security.token_storage'
-                ]
+                    'security.token_storage',
+                ],
             ],
-            'mautic.helper.core_parameters'    => [
+            'mautic.helper.core_parameters' => [
                 'class'     => 'Mautic\CoreBundle\Helper\CoreParametersHelper',
                 'arguments' => [
                     'kernel',
                 ],
             ],
-            'mautic.helper.bundle'             => [
+            'mautic.helper.bundle' => [
                 'class'     => 'Mautic\CoreBundle\Helper\BundleHelper',
                 'arguments' => [
                     'mautic.helper.core_parameters',
                     'kernel',
                 ],
             ],
-            'mautic.helper.phone_number'       => [
+            'mautic.helper.phone_number' => [
                 'class' => 'Mautic\CoreBundle\Helper\PhoneNumberHelper',
             ],
         ],
-        'menus'   => [
-            'mautic.menu.main'    => [
+        'menus' => [
+            'mautic.menu.main' => [
                 'alias' => 'main',
             ],
-            'mautic.menu.admin'   => [
+            'mautic.menu.admin' => [
                 'alias'   => 'admin',
                 'options' => [
                     'template' => 'MauticCoreBundle:Menu:admin.html.php',
                 ],
             ],
-            'mautic.menu.extra'   => [
+            'mautic.menu.extra' => [
                 'alias'   => 'extra',
                 'options' => [
                     'template' => 'MauticCoreBundle:Menu:extra.html.php',
@@ -372,7 +373,7 @@
                 ],
             ],
         ],
-        'other'   => [
+        'other' => [
             // Error handler
             'mautic.core.errorhandler.subscriber' => [
                 'class'     => 'Mautic\CoreBundle\EventListener\ErrorHandlingListener',
@@ -380,7 +381,7 @@
                     '%kernel.environment%',
                     'monolog.logger.mautic',
                 ],
-                'tag'       => 'kernel.event_subscriber',
+                'tag' => 'kernel.event_subscriber',
             ],
 
             // Configurator (used in installer and managing global config]
@@ -388,59 +389,59 @@
                 'class'     => 'Mautic\CoreBundle\Configurator\Configurator',
                 'arguments' => [
                     'mautic.helper.paths',
-                ]
+                ],
             ],
 
             // Template helper overrides
-            'templating.helper.assets.class'      => 'Mautic\CoreBundle\Templating\Helper\AssetsHelper',
-            'templating.helper.slots.class'       => 'Mautic\CoreBundle\Templating\Helper\SlotsHelper',
-            'templating.name_parser.class'        => 'Mautic\CoreBundle\Templating\TemplateNameParser',
-            'templating.helper.form.class'        => 'Mautic\CoreBundle\Templating\Helper\FormHelper',
+            'templating.helper.assets.class' => 'Mautic\CoreBundle\Templating\Helper\AssetsHelper',
+            'templating.helper.slots.class'  => 'Mautic\CoreBundle\Templating\Helper\SlotsHelper',
+            'templating.name_parser.class'   => 'Mautic\CoreBundle\Templating\TemplateNameParser',
+            'templating.helper.form.class'   => 'Mautic\CoreBundle\Templating\Helper\FormHelper',
             // Translator overrides
-            'translator.class'                    => 'Mautic\CoreBundle\Translation\Translator',
-            'templating.helper.translator.class'  => 'Mautic\CoreBundle\Templating\Helper\TranslatorHelper',
+            'translator.class'                   => 'Mautic\CoreBundle\Translation\Translator',
+            'templating.helper.translator.class' => 'Mautic\CoreBundle\Templating\Helper\TranslatorHelper',
             // System uses
-            'mautic.factory'                      => [
+            'mautic.factory' => [
                 'class'     => 'Mautic\CoreBundle\Factory\MauticFactory',
                 'arguments' => 'service_container',
             ],
-            'mautic.model.factory'                      => [
+            'mautic.model.factory' => [
                 'class'     => 'Mautic\CoreBundle\Factory\ModelFactory',
                 'arguments' => 'service_container',
             ],
-            'mautic.templating.name_parser'       => [
+            'mautic.templating.name_parser' => [
                 'class'     => 'Mautic\CoreBundle\Templating\TemplateNameParser',
                 'arguments' => 'kernel',
             ],
-            'mautic.route_loader'                 => [
+            'mautic.route_loader' => [
                 'class'     => 'Mautic\CoreBundle\Loader\RouteLoader',
                 'arguments' => 'mautic.factory',
                 'tag'       => 'routing.loader',
             ],
-            'mautic.security'                     => [
+            'mautic.security' => [
                 'class'     => 'Mautic\CoreBundle\Security\Permissions\CorePermissions',
                 'arguments' => [
                     'mautic.helper.user',
                     'translator',
                     '%mautic.parameters%',
                     '%mautic.bundles%',
-                    '%mautic.plugin.bundles%'
-                ]
+                    '%mautic.plugin.bundles%',
+                ],
             ],
-            'mautic.translation.loader'           => [
+            'mautic.translation.loader' => [
                 'class'     => 'Mautic\CoreBundle\Loader\TranslationLoader',
                 'arguments' => 'mautic.factory',
                 'tag'       => 'translation.loader',
                 'alias'     => 'mautic',
             ],
-            'mautic.tblprefix_subscriber'        => [
+            'mautic.tblprefix_subscriber' => [
                 'class'     => 'Mautic\CoreBundle\EventListener\DoctrineEventsSubscriber',
                 'tag'       => 'doctrine.event_subscriber',
                 'arguments' => '%mautic.db_table_prefix%',
             ],
-            'mautic.exception.listener'           => [
-                'class'        => 'Mautic\CoreBundle\EventListener\ExceptionListener',
-                'arguments'    => [
+            'mautic.exception.listener' => [
+                'class'     => 'Mautic\CoreBundle\EventListener\ExceptionListener',
+                'arguments' => [
                     '"MauticCoreBundle:Exception:show"',
                     'monolog.logger.mautic',
                 ],
@@ -451,7 +452,7 @@
                     'priority' => 255,
                 ],
             ],
-            'transifex'                           => [
+            'transifex' => [
                 'class'     => 'BabDev\Transifex\Transifex',
                 'arguments' => [
                     [
@@ -461,11 +462,11 @@
                 ],
             ],
             // Helpers
-            'mautic.helper.assetgeneration'       => [
+            'mautic.helper.assetgeneration' => [
                 'class'     => 'Mautic\CoreBundle\Helper\AssetGenerationHelper',
                 'arguments' => 'mautic.factory',
             ],
-            'mautic.helper.cookie'                => [
+            'mautic.helper.cookie' => [
                 'class'     => 'Mautic\CoreBundle\Helper\CookieHelper',
                 'arguments' => [
                     '%mautic.cookie_path%',
@@ -473,25 +474,25 @@
                     '%mautic.cookie_secure%',
                     '%mautic.cookie_httponly%',
                     'request_stack',
-                ]
+                ],
             ],
-            'mautic.helper.update'                => [
+            'mautic.helper.update' => [
                 'class'     => 'Mautic\CoreBundle\Helper\UpdateHelper',
                 'arguments' => 'mautic.factory',
             ],
-            'mautic.helper.cache'                 => [
+            'mautic.helper.cache' => [
                 'class'     => 'Mautic\CoreBundle\Helper\CacheHelper',
                 'arguments' => 'mautic.factory',
             ],
-            'mautic.helper.templating'            => [
+            'mautic.helper.templating' => [
                 'class'     => 'Mautic\CoreBundle\Helper\TemplatingHelper',
                 'arguments' => [
                     'kernel',
                 ],
             ],
-            'mautic.helper.theme'                 => [
-                'class'       => 'Mautic\CoreBundle\Helper\ThemeHelper',
-                'arguments'   => [
+            'mautic.helper.theme' => [
+                'class'     => 'Mautic\CoreBundle\Helper\ThemeHelper',
+                'arguments' => [
                     'mautic.helper.paths',
                     'mautic.helper.templating',
                 ],
@@ -501,15 +502,15 @@
                     ],
                 ],
             ],
-            'mautic.helper.encryption'            => [
+            'mautic.helper.encryption' => [
                 'class'     => 'Mautic\CoreBundle\Helper\EncryptionHelper',
                 'arguments' => 'mautic.factory',
             ],
-            'mautic.helper.language'              => [
+            'mautic.helper.language' => [
                 'class'     => 'Mautic\CoreBundle\Helper\LanguageHelper',
                 'arguments' => 'mautic.factory',
             ],
-            'mautic.helper.url'                   => [
+            'mautic.helper.url' => [
                 'class'     => 'Mautic\CoreBundle\Helper\UrlHelper',
                 'arguments' => [
                     'mautic.http.connector',
@@ -518,7 +519,7 @@
                 ],
             ],
             // Menu
-            'mautic.helper.menu'                  => [
+            'mautic.helper.menu' => [
                 'class'     => 'Mautic\CoreBundle\Menu\MenuHelper',
                 'arguments' => [
                     'mautic.security',
@@ -527,17 +528,17 @@
                     '%mautic.parameters%',
                 ],
             ],
-            'mautic.menu_renderer'                => [
+            'mautic.menu_renderer' => [
                 'class'     => 'Mautic\CoreBundle\Menu\MenuRenderer',
                 'arguments' => [
                     'knp_menu.matcher',
                     'mautic.factory',
                     '%kernel.charset%',
                 ],
-                'tag'       => 'knp_menu.renderer',
-                'alias'     => 'mautic',
+                'tag'   => 'knp_menu.renderer',
+                'alias' => 'mautic',
             ],
-            'mautic.menu.builder'                 => [
+            'mautic.menu.builder' => [
                 'class'     => 'Mautic\CoreBundle\Menu\MenuBuilder',
                 'arguments' => [
                     'knp_menu.factory',
@@ -547,7 +548,7 @@
                 ],
             ],
             // IP Lookup
-            'mautic.ip_lookup.factory'            => [
+            'mautic.ip_lookup.factory' => [
                 'class'     => 'Mautic\CoreBundle\Factory\IpLookupFactory',
                 'arguments' => [
                     '%mautic.ip_lookup_services%',
@@ -556,7 +557,7 @@
                     '%kernel.cache_dir%',
                 ],
             ],
-            'mautic.ip_lookup'                    => [
+            'mautic.ip_lookup' => [
                 'class'     => 'Mautic\CoreBundle\IpLookup\AbstractLookup', // bogus just to make cache compilation happy
                 'factory'   => ['@mautic.ip_lookup.factory', 'getService'],
                 'arguments' => [
@@ -567,7 +568,7 @@
                 ],
             ],
             // Other
-            'mautic.http.connector'               => [
+            'mautic.http.connector' => [
                 'class'   => 'Joomla\Http\Http',
                 'factory' => ['Joomla\Http\HttpFactory', 'getHttp'],
             ],
@@ -576,22 +577,22 @@
             'monolog.handler.stream.class'    => 'Mautic\CoreBundle\Monolog\Handler\PhpHandler',
 
             // Twig
-            'templating.twig.extension.slot'  => [
+            'templating.twig.extension.slot' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Twig\Extension\SlotExtension',
                 'arguments' => [
                     'mautic.factory',
                 ],
-                'tag'       => 'twig.extension',
+                'tag' => 'twig.extension',
             ],
             'templating.twig.extension.asset' => [
                 'class'     => 'Mautic\CoreBundle\Templating\Twig\Extension\AssetExtension',
                 'arguments' => [
                     'templating.helper.assets',
                 ],
-                'tag'       => 'twig.extension',
+                'tag' => 'twig.extension',
             ],
             // Schema
-            'mautic.schema.helper.factory'    => [
+            'mautic.schema.helper.factory' => [
                 'class'     => 'Mautic\CoreBundle\Doctrine\Helper\SchemaHelperFactory',
                 'arguments' => [
                     'mautic.schema.helper.table',
@@ -599,21 +600,21 @@
                     'mautic.schema.helper.column',
                 ],
             ],
-            'mautic.schema.helper.column'     => [
+            'mautic.schema.helper.column' => [
                 'class'     => 'Mautic\CoreBundle\Doctrine\Helper\ColumnSchemaHelper',
                 'arguments' => [
                     'database_connection',
                     '%mautic.db_table_prefix%',
                 ],
             ],
-            'mautic.schema.helper.index'      => [
+            'mautic.schema.helper.index' => [
                 'class'     => 'Mautic\CoreBundle\Doctrine\Helper\IndexSchemaHelper',
                 'arguments' => [
                     'database_connection',
                     '%mautic.db_table_prefix%',
                 ],
             ],
-            'mautic.schema.helper.table'      => [
+            'mautic.schema.helper.table' => [
                 'class'     => 'Mautic\CoreBundle\Doctrine\Helper\TableSchemaHelper',
                 'arguments' => [
                     'database_connection',
@@ -622,17 +623,17 @@
                 ],
             ],
         ],
-        'models'  => [
-            'mautic.core.model.auditlog'     => [
+        'models' => [
+            'mautic.core.model.auditlog' => [
                 'class' => 'Mautic\CoreBundle\Model\AuditLogModel',
             ],
             'mautic.core.model.notification' => [
-                'class'       => 'Mautic\CoreBundle\Model\NotificationModel',
-                'arguments'   => [
+                'class'     => 'Mautic\CoreBundle\Model\NotificationModel',
+                'arguments' => [
                     'mautic.helper.paths',
                     'mautic.helper.update',
                     'debril.reader',
-                    'mautic.helper.core_parameters'
+                    'mautic.helper.core_parameters',
                 ],
                 'methodCalls' => [
                     'setDisableUpdates' => [
@@ -640,41 +641,41 @@
                     ],
                 ],
             ],
-            'mautic.core.model.form'         => [
+            'mautic.core.model.form' => [
                 'class' => 'Mautic\CoreBundle\Model\FormModel',
             ],
             'mautic.core.model.messagequeue' => [
-                'class'       => 'Mautic\CoreBundle\Model\MessageQueueModel',
-                'arguments'   => [
+                'class'     => 'Mautic\CoreBundle\Model\MessageQueueModel',
+                'arguments' => [
                     'mautic.lead.model.lead',
-                    'mautic.lead.model.company'
-                ]
+                    'mautic.lead.model.company',
+                ],
             ],
         ],
     ],
 
     'ip_lookup_services' => [
-        'freegeoip'         => [
+        'freegeoip' => [
             'display_name' => 'Freegeoip.net',
             'class'        => 'Mautic\CoreBundle\IpLookup\FreegeoipLookup',
         ],
-        'geobytes'          => [
+        'geobytes' => [
             'display_name' => 'Geobytes',
             'class'        => 'Mautic\CoreBundle\IpLookup\GeobytesLookup',
         ],
-        'geoips'            => [
+        'geoips' => [
             'display_name' => 'GeoIPs',
             'class'        => 'Mautic\CoreBundle\IpLookup\GeoipsLookup',
         ],
-        'ipinfodb'          => [
+        'ipinfodb' => [
             'display_name' => 'IPInfoDB',
             'class'        => 'Mautic\CoreBundle\IpLookup\IpinfodbLookup',
         ],
-        'maxmind_country'   => [
+        'maxmind_country' => [
             'display_name' => 'MaxMind - Country Geolocation',
             'class'        => 'Mautic\CoreBundle\IpLookup\MaxmindCountryLookup',
         ],
-        'maxmind_omni'      => [
+        'maxmind_omni' => [
             'display_name' => 'MaxMind - Insights (formerly Omni]',
             'class'        => 'Mautic\CoreBundle\IpLookup\MaxmindOmniLookup',
         ],
@@ -682,72 +683,72 @@
             'display_name' => 'MaxMind - GeoIP2 Precision',
             'class'        => 'Mautic\CoreBundle\IpLookup\MaxmindPrecisionLookup',
         ],
-        'maxmind_download'  => [
+        'maxmind_download' => [
             'display_name' => 'MaxMind - GeoLite2 City Download',
             'class'        => 'Mautic\CoreBundle\IpLookup\MaxmindDownloadLookup',
         ],
-        'telize'            => [
+        'telize' => [
             'display_name' => 'Telize',
             'class'        => 'Mautic\CoreBundle\IpLookup\TelizeLookup',
         ],
-        'ip2loctionlocal'   => [
+        'ip2loctionlocal' => [
             'display_name' => 'IP2Location Local Bin File',
             'class'        => 'Mautic\CoreBundle\IpLookup\IP2LocationBinLookup',
         ],
-        'ip2loctionapi'     => [
+        'ip2loctionapi' => [
             'display_name' => 'IP2Location Web Service',
             'class'        => 'Mautic\CoreBundle\IpLookup\IP2LocationAPILookup',
         ],
     ],
 
     'parameters' => [
-        'site_url'                       => '',
-        'webroot'                        => '',
-        'cache_path'                     => '%kernel.root_dir%/cache',
-        'log_path'                       => '%kernel.root_dir%/logs',
-        'image_path'                     => 'media/images',
-        'theme'                          => 'Mauve',
-        'db_driver'                      => 'pdo_mysql',
-        'db_host'                        => '127.0.0.1',
-        'db_port'                        => 3306,
-        'db_name'                        => '',
-        'db_user'                        => '',
-        'db_password'                    => '',
-        'db_table_prefix'                => '',
-        'db_server_version'              => '5.5',
-        'locale'                         => 'en_US',
-        'secret_key'                     => '',
-        'dev_hosts'                      => null,
-        'trusted_hosts'                  => null,
-        'trusted_proxies'                => null,
-        'rememberme_key'                 => hash('sha1', uniqid(mt_rand())),
-        'rememberme_lifetime'            => 31536000, //365 days in seconds
-        'rememberme_path'                => '/',
-        'rememberme_domain'              => '',
-        'default_pagelimit'              => 30,
-        'default_timezone'               => 'UTC',
-        'date_format_full'               => 'F j, Y g:i a T',
-        'date_format_short'              => 'D, M d',
-        'date_format_dateonly'           => 'F j, Y',
-        'date_format_timeonly'           => 'g:i a',
-        'ip_lookup_service'              => 'maxmind_download',
-        'ip_lookup_auth'                 => '',
-        'ip_lookup_config'               => [],
-        'transifex_username'             => '',
-        'transifex_password'             => '',
-        'update_stability'               => 'stable',
-        'cookie_path'                    => '/',
-        'cookie_domain'                  => '',
-        'cookie_secure'                  => null,
-        'cookie_httponly'                => false,
-        'do_not_track_ips'               => [],
-        'do_not_track_internal_ips'      => [],
-        'link_shortener_url'             => null,
-        'cached_data_timeout'            => 10,
-        'batch_sleep_time'               => 1,
-        'batch_campaign_sleep_time'      => false,
-        'cors_restrict_domains'          => true,
-        'cors_valid_domains'             => [],
-        'rss_notification_url'           => 'https://mautic.com/?feed=rss2&tag=notification'
-    ]
+        'site_url'                  => '',
+        'webroot'                   => '',
+        'cache_path'                => '%kernel.root_dir%/cache',
+        'log_path'                  => '%kernel.root_dir%/logs',
+        'image_path'                => 'media/images',
+        'theme'                     => 'Mauve',
+        'db_driver'                 => 'pdo_mysql',
+        'db_host'                   => '127.0.0.1',
+        'db_port'                   => 3306,
+        'db_name'                   => '',
+        'db_user'                   => '',
+        'db_password'               => '',
+        'db_table_prefix'           => '',
+        'db_server_version'         => '5.5',
+        'locale'                    => 'en_US',
+        'secret_key'                => '',
+        'dev_hosts'                 => null,
+        'trusted_hosts'             => null,
+        'trusted_proxies'           => null,
+        'rememberme_key'            => hash('sha1', uniqid(mt_rand())),
+        'rememberme_lifetime'       => 31536000, //365 days in seconds
+        'rememberme_path'           => '/',
+        'rememberme_domain'         => '',
+        'default_pagelimit'         => 30,
+        'default_timezone'          => 'UTC',
+        'date_format_full'          => 'F j, Y g:i a T',
+        'date_format_short'         => 'D, M d',
+        'date_format_dateonly'      => 'F j, Y',
+        'date_format_timeonly'      => 'g:i a',
+        'ip_lookup_service'         => 'maxmind_download',
+        'ip_lookup_auth'            => '',
+        'ip_lookup_config'          => [],
+        'transifex_username'        => '',
+        'transifex_password'        => '',
+        'update_stability'          => 'stable',
+        'cookie_path'               => '/',
+        'cookie_domain'             => '',
+        'cookie_secure'             => null,
+        'cookie_httponly'           => false,
+        'do_not_track_ips'          => [],
+        'do_not_track_internal_ips' => [],
+        'link_shortener_url'        => null,
+        'cached_data_timeout'       => 10,
+        'batch_sleep_time'          => 1,
+        'batch_campaign_sleep_time' => false,
+        'cors_restrict_domains'     => true,
+        'cors_valid_domains'        => [],
+        'rss_notification_url'      => 'https://mautic.com/?feed=rss2&tag=notification',
+    ],
 ];
diff --git a/app/bundles/CoreBundle/Configurator/Configurator.php b/app/bundles/CoreBundle/Configurator/Configurator.php
index f878784d45d..94a3b7492e4 100644
--- a/app/bundles/CoreBundle/Configurator/Configurator.php
+++ b/app/bundles/CoreBundle/Configurator/Configurator.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -21,30 +22,29 @@
  */
 class Configurator
 {
-
     /**
-     * Configuration filename
+     * Configuration filename.
      *
      * @var string
      */
     protected $filename;
 
     /**
-     * Array containing the steps
+     * Array containing the steps.
      *
      * @var StepInterface[]
      */
-    protected $steps = array();
+    protected $steps = [];
 
     /**
-     * Array containing the sorted steps
+     * Array containing the sorted steps.
      *
      * @var StepInterface[]
      */
-    protected $sortedSteps = array();
+    protected $sortedSteps = [];
 
     /**
-     * Configuration parameters
+     * Configuration parameters.
      *
      * @var array
      */
@@ -86,19 +86,20 @@ public function isFileWritable()
     public function addStep(StepInterface $step, $priority = 0)
     {
         if (!isset($this->steps[$priority])) {
-            $this->steps[$priority] = array();
+            $this->steps[$priority] = [];
         }
 
         $this->steps[$priority][] = $step;
-        $this->sortedSteps        = array();
+        $this->sortedSteps        = [];
     }
 
     /**
      * Retrieves the specified step.
      *
-     * @param integer $index
+     * @param int $index
      *
      * @return StepInterface
+     *
      * @throws \InvalidArgumentException
      */
     public function getStep($index)
@@ -117,7 +118,7 @@ public function getStep($index)
      */
     public function getSteps()
     {
-        if ($this->sortedSteps === array()) {
+        if ($this->sortedSteps === []) {
             $this->sortedSteps = $this->getSortedSteps();
         }
 
@@ -132,7 +133,7 @@ public function getSteps()
      */
     private function getSortedSteps()
     {
-        $sortedSteps = array();
+        $sortedSteps = [];
         krsort($this->steps);
 
         foreach ($this->steps as $steps) {
@@ -155,7 +156,7 @@ public function getParameters()
     /**
      * Return the number of steps in the configurator.
      *
-     * @return integer
+     * @return int
      */
     public function getStepCount()
     {
@@ -179,7 +180,7 @@ public function mergeParameters($parameters)
      */
     public function getRequirements()
     {
-        $majors = array();
+        $majors = [];
 
         foreach ($this->getSteps() as $step) {
             foreach ($step->checkRequirements() as $major) {
@@ -197,7 +198,7 @@ public function getRequirements()
      */
     public function getOptionalSettings()
     {
-        $minors = array();
+        $minors = [];
 
         foreach ($this->getSteps() as $step) {
             foreach ($step->checkOptionalSettings() as $minor) {
@@ -221,7 +222,7 @@ public function render()
         foreach ($this->parameters as $key => $value) {
             if ($value !== '') {
                 if (is_string($value)) {
-                    $value = "'" . addcslashes($value, '\\\'') . "'";
+                    $value = "'".addcslashes($value, '\\\'')."'";
                 } elseif (is_bool($value)) {
                     $value = ($value) ? 'true' : 'false';
                 } elseif (is_null($value)) {
@@ -264,12 +265,12 @@ protected function renderArray($array, $level = 1)
                 $string .= '"'.addcslashes($value, '\\"').'"';
             }
 
-            $counter--;
+            --$counter;
             if ($counter > 0) {
-                $string .= ", \n" . str_repeat("\t", $level + 1);
+                $string .= ", \n".str_repeat("\t", $level + 1);
             }
         }
-        $string .= "\n" . str_repeat("\t", $level) . ")";
+        $string .= "\n".str_repeat("\t", $level).')';
 
         return $string;
     }
@@ -277,7 +278,8 @@ protected function renderArray($array, $level = 1)
     /**
      * Writes parameters to file.
      *
-     * @return integer
+     * @return int
+     *
      * @throws \Symfony\Component\Process\Exception\RuntimeException
      */
     public function write()
@@ -303,12 +305,12 @@ public function write()
     protected function read()
     {
         if (!file_exists($this->filename)) {
-            return array();
+            return [];
         }
 
         include $this->filename;
 
         // Return the $parameters array defined in the file
-        return isset($parameters) ? $parameters : array();
+        return isset($parameters) ? $parameters : [];
     }
 }
diff --git a/app/bundles/CoreBundle/Configurator/Step/StepInterface.php b/app/bundles/CoreBundle/Configurator/Step/StepInterface.php
index 646e7b9ca9a..bf4b0bfa4db 100644
--- a/app/bundles/CoreBundle/Configurator/Step/StepInterface.php
+++ b/app/bundles/CoreBundle/Configurator/Step/StepInterface.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
diff --git a/app/bundles/CoreBundle/Console/Output/ConsoleDatetimeOutput.php b/app/bundles/CoreBundle/Console/Output/ConsoleDatetimeOutput.php
index d520603189e..47b2f3d621a 100644
--- a/app/bundles/CoreBundle/Console/Output/ConsoleDatetimeOutput.php
+++ b/app/bundles/CoreBundle/Console/Output/ConsoleDatetimeOutput.php
@@ -1,33 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Console\Output;
 
-use Symfony\Component\Console\Output\ConsoleOutput,
-    Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
 
 /**
  * Custom console output to prefix all messages with the current datetime
- * Heavily inspired by https://github.com/8p/AssistBundle
+ * Heavily inspired by https://github.com/8p/AssistBundle.
  *
  * Class ConsoleDatetimeOutput
- *
- * @package Mautic\CoreBundle\Console\Output
  */
 class ConsoleDatetimeOutput extends ConsoleOutput implements ConsoleOutputInterface
 {
-
     /**
-     * Prefix message with current datetime
+     * Prefix message with current datetime.
      *
      * @param string $message
-     * @param bool $newline
+     * @param bool   $newline
      */
     protected function doWrite($message, $newline)
     {
@@ -39,5 +37,4 @@ protected function doWrite($message, $newline)
 
         parent::doWrite($message, $newline);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Controller/AjaxController.php b/app/bundles/CoreBundle/Controller/AjaxController.php
index 9f248933dba..3da2d27801d 100644
--- a/app/bundles/CoreBundle/Controller/AjaxController.php
+++ b/app/bundles/CoreBundle/Controller/AjaxController.php
@@ -1,18 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Controller;
 
 use Mautic\CoreBundle\CoreEvents;
-use Mautic\CoreBundle\Event\UpgradeEvent;
-use Mautic\CoreBundle\Event\GlobalSearchEvent;
 use Mautic\CoreBundle\Event\CommandListEvent;
+use Mautic\CoreBundle\Event\GlobalSearchEvent;
+use Mautic\CoreBundle\Event\UpgradeEvent;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\CoreBundle\IpLookup\AbstractLocalDataLookup;
 use Mautic\CoreBundle\IpLookup\AbstractLookup;
@@ -24,17 +25,17 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonController
 {
-
     /**
-     * @param array   $dataArray
-     * @param integer $statusCode
-     * @param boolean $addIgnoreWdt
+     * @param array $dataArray
+     * @param int   $statusCode
+     * @param bool  $addIgnoreWdt
      *
      * @return JsonResponse
+     *
      * @throws \Exception
      */
     protected function sendJsonResponse($dataArray, $statusCode = null, $addIgnoreWdt = true)
@@ -55,7 +56,7 @@ protected function sendJsonResponse($dataArray, $statusCode = null, $addIgnoreWd
     }
 
     /**
-     * Executes an action requested via ajax
+     * Executes an action requested via ajax.
      *
      * @return JsonResponse
      */
@@ -70,9 +71,9 @@ public function delegateAjaxAction()
         }
 
         if ($securityContext->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
-            if (strpos($action, ":") !== false) {
+            if (strpos($action, ':') !== false) {
                 //call the specified bundle's ajax action
-                $parts     = explode(":", $action);
+                $parts     = explode(':', $action);
                 $namespace = 'Mautic';
                 $isPlugin  = false;
 
@@ -97,9 +98,9 @@ public function delegateAjaxAction()
                         return $this->forward(
                             "{$bundle}Bundle:Ajax:executeAjax",
                             [
-                                'action'  => $action,
+                                'action' => $action,
                                 //forward the request as well as Symfony creates a subrequest without GET/POST
-                                'request' => $this->request
+                                'request' => $this->request,
                             ]
                         );
                     }
@@ -109,7 +110,7 @@ public function delegateAjaxAction()
             return $this->executeAjaxAction($action, $this->request);
         }
 
-        return $this->sendJsonResponse(array('success' => 0));
+        return $this->sendJsonResponse(['success' => 0]);
     }
 
     /**
@@ -124,7 +125,7 @@ public function executeAjaxAction($action, Request $request)
             return $this->{"{$action}Action"}($request);
         }
 
-        return $this->sendJsonResponse(array('success' => 0));
+        return $this->sendJsonResponse(['success' => 0]);
     }
 
     /**
@@ -134,8 +135,8 @@ public function executeAjaxAction($action, Request $request)
      */
     protected function globalSearchAction(Request $request)
     {
-        $dataArray = array('success' => 1);
-        $searchStr = InputHelper::clean($request->query->get("global_search", ""));
+        $dataArray = ['success' => 1];
+        $searchStr = InputHelper::clean($request->query->get('global_search', ''));
         $this->get('session')->set('mautic.global_search', $searchStr);
 
         $event = new GlobalSearchEvent($searchStr, $this->get('translator'));
@@ -143,7 +144,7 @@ protected function globalSearchAction(Request $request)
 
         $dataArray['newContent'] = $this->renderView(
             'MauticCoreBundle:GlobalSearch:results.html.php',
-            array('results' => $event->getResults())
+            ['results' => $event->getResults()]
         );
 
         return $this->sendJsonResponse($dataArray);
@@ -158,7 +159,7 @@ protected function commandListAction(Request $request)
     {
         $model      = InputHelper::clean($request->query->get('model'));
         $commands   = $this->getModel($model)->getCommandList();
-        $dataArray  = array();
+        $dataArray  = [];
         $translator = $this->get('translator');
         foreach ($commands as $k => $c) {
             if (is_array($c)) {
@@ -166,13 +167,13 @@ protected function commandListAction(Request $request)
                     $command = $translator->trans($k);
                     $command = (strpos($command, ':') === false) ? $command.':' : $command;
 
-                    $dataArray[] = array('value' => $command.$translator->trans($subc));
+                    $dataArray[] = ['value' => $command.$translator->trans($subc)];
                 }
             } else {
                 $command = $translator->trans($c);
                 $command = (strpos($command, ':') === false) ? $command.':' : $command;
 
-                $dataArray[] = array('value' => $command);
+                $dataArray[] = ['value' => $command];
             }
         }
         sort($dataArray);
@@ -192,8 +193,8 @@ protected function globalCommandListAction(Request $request)
         $dispatcher->dispatch(CoreEvents::BUILD_COMMAND_LIST, $event);
         $allCommands = $event->getCommands();
         $translator  = $this->get('translator');
-        $dataArray   = array();
-        $dupChecker  = array();
+        $dataArray   = [];
+        $dupChecker  = [];
         foreach ($allCommands as $header => $commands) {
             //@todo if/when figure out a way for typeahead dynamic headers
             //$header = $translator->trans($header);
@@ -206,7 +207,7 @@ protected function globalCommandListAction(Request $request)
                     foreach ($c as $subc) {
                         $subcommand = $command.$translator->trans($subc);
                         if (!in_array($subcommand, $dupChecker)) {
-                            $dataArray[]  = array('value' => $subcommand);
+                            $dataArray[]  = ['value' => $subcommand];
                             $dupChecker[] = $subcommand;
                         }
                     }
@@ -215,7 +216,7 @@ protected function globalCommandListAction(Request $request)
                     $command = (strpos($command, ':') === false) ? $command.':' : $command;
 
                     if (!in_array($command, $dupChecker)) {
-                        $dataArray[]  = array('value' => $command);
+                        $dataArray[]  = ['value' => $command];
                         $dupChecker[] = $command;
                     }
                 }
@@ -235,7 +236,7 @@ protected function globalCommandListAction(Request $request)
      */
     protected function togglePublishStatusAction(Request $request)
     {
-        $dataArray = array('success' => 0);
+        $dataArray = ['success' => 0];
         $name      = InputHelper::clean($request->request->get('model'));
         $id        = InputHelper::int($request->request->get('id'));
         $model     = $this->getModel($name);
@@ -279,14 +280,14 @@ protected function togglePublishStatusAction(Request $request)
                     $dataArray['reload'] = 1;
                 } else {
                     //get updated icon HTML
-                    $html                    = $this->renderView(
+                    $html = $this->renderView(
                         'MauticCoreBundle:Helper:publishstatus_icon.html.php',
-                        array(
+                        [
                             'item'  => $entity,
                             'model' => $name,
                             'query' => $extra,
-                            'size'  => (isset($post['size'])) ? $post['size'] : ''
-                        )
+                            'size'  => (isset($post['size'])) ? $post['size'] : '',
+                        ]
                     );
                     $dataArray['statusHtml'] = $html;
                 }
@@ -297,7 +298,7 @@ protected function togglePublishStatusAction(Request $request)
     }
 
     /**
-     * Unlock an entity locked by the current user
+     * Unlock an entity locked by the current user.
      *
      * @param Request $request
      *
@@ -305,7 +306,7 @@ protected function togglePublishStatusAction(Request $request)
      */
     protected function unlockEntityAction(Request $request)
     {
-        $dataArray   = array('success' => 0);
+        $dataArray   = ['success' => 0];
         $name        = InputHelper::clean($request->request->get('model'));
         $id          = InputHelper::int($request->request->get('id'));
         $extra       = InputHelper::clean($request->request->get('parameter'));
@@ -314,7 +315,6 @@ protected function unlockEntityAction(Request $request)
         $currentUser = $this->user;
 
         if (method_exists($entity, 'getCheckedOutBy')) {
-
             $checkedOut = $entity->getCheckedOutBy();
             if ($entity !== null && !empty($checkedOut) && $checkedOut === $currentUser->getId()) {
                 //entity exists, is checked out, and is checked out by the current user so go ahead and unlock
@@ -327,7 +327,7 @@ protected function unlockEntityAction(Request $request)
     }
 
     /**
-     * Sets the page layout to the update layout
+     * Sets the page layout to the update layout.
      *
      * @param Request $request
      *
@@ -335,10 +335,10 @@ protected function unlockEntityAction(Request $request)
      */
     protected function updateSetUpdateLayoutAction(Request $request)
     {
-        $dataArray = array(
+        $dataArray = [
             'success' => 1,
-            'content' => $this->renderView('MauticCoreBundle:Update:update.html.php')
-        );
+            'content' => $this->renderView('MauticCoreBundle:Update:update.html.php'),
+        ];
 
         // A way to keep the upgrade from failing if the session is lost after
         // the cache is cleared by upgrade.php
@@ -350,7 +350,7 @@ protected function updateSetUpdateLayoutAction(Request $request)
     }
 
     /**
-     * Downloads the update package
+     * Downloads the update package.
      *
      * @param Request $request
      *
@@ -358,7 +358,7 @@ protected function updateSetUpdateLayoutAction(Request $request)
      */
     protected function updateDownloadPackageAction(Request $request)
     {
-        $dataArray  = array('success' => 0);
+        $dataArray  = ['success' => 0];
         $translator = $this->translator;
 
         /** @var \Mautic\CoreBundle\Helper\UpdateHelper $updateHelper */
@@ -370,7 +370,7 @@ protected function updateDownloadPackageAction(Request $request)
 
         if ($package['error']) {
             $dataArray['stepStatus'] = $translator->trans('mautic.core.update.step.failed');
-            $dataArray['message']    = $translator->trans('mautic.core.update.error', array('%error%' => $translator->trans($package['message'])));
+            $dataArray['message']    = $translator->trans('mautic.core.update.error', ['%error%' => $translator->trans($package['message'])]);
 
             // A way to keep the upgrade from failing if the session is lost after
             // the cache is cleared by upgrade.php
@@ -388,14 +388,13 @@ protected function updateDownloadPackageAction(Request $request)
             /** @var \Mautic\CoreBundle\Helper\CookieHelper $cookieHelper */
             $cookieHelper = $this->factory->getHelper('cookie');
             $cookieHelper->setCookie('mautic_update', 'downloadPackage', 300);
-
         }
 
         return $this->sendJsonResponse($dataArray);
     }
 
     /**
-     * Extracts the update package
+     * Extracts the update package.
      *
      * @param Request $request
      *
@@ -403,7 +402,7 @@ protected function updateDownloadPackageAction(Request $request)
      */
     protected function updateExtractPackageAction(Request $request)
     {
-        $dataArray  = array('success' => 0);
+        $dataArray  = ['success' => 0];
         $translator = $this->translator;
 
         /** @var \Mautic\CoreBundle\Helper\UpdateHelper $updateHelper */
@@ -442,7 +441,7 @@ protected function updateExtractPackageAction(Request $request)
             }
 
             $dataArray['stepStatus'] = $translator->trans('mautic.core.update.step.failed');
-            $dataArray['message']    = $translator->trans('mautic.core.update.error', array('%error%' => $translator->trans($error)));
+            $dataArray['message']    = $translator->trans('mautic.core.update.error', ['%error%' => $translator->trans($error)]);
 
             // A way to keep the upgrade from failing if the session is lost after
             // the cache is cleared by upgrade.php
@@ -455,7 +454,7 @@ protected function updateExtractPackageAction(Request $request)
                 $dataArray['stepStatus'] = $translator->trans('mautic.core.update.step.failed');
                 $dataArray['message']    = $translator->trans(
                     'mautic.core.update.error',
-                    array('%error%' => $translator->trans('mautic.core.update.error_extracting_package'))
+                    ['%error%' => $translator->trans('mautic.core.update.error_extracting_package')]
                 );
             } else {
                 $zipper->close();
@@ -477,7 +476,7 @@ protected function updateExtractPackageAction(Request $request)
     }
 
     /**
-     * Migrate the database to the latest version
+     * Migrate the database to the latest version.
      *
      * @param Request $request
      *
@@ -485,7 +484,7 @@ protected function updateExtractPackageAction(Request $request)
      */
     public function updateDatabaseMigrationAction(Request $request)
     {
-        $dataArray  = array('success' => 0);
+        $dataArray  = ['success' => 0];
         $translator = $this->translator;
         $result     = 0;
 
@@ -551,7 +550,7 @@ public function updateDatabaseMigrationAction(Request $request)
 
         if (iterator_count($iterator)) {
             $env  = $this->factory->getEnvironment();
-            $args = array('console', 'doctrine:migrations:migrate', '--no-interaction', '--env='.$env);
+            $args = ['console', 'doctrine:migrations:migrate', '--no-interaction', '--env='.$env];
 
             if ($env == 'prod') {
                 $args[] = '--no-debug';
@@ -566,15 +565,15 @@ public function updateDatabaseMigrationAction(Request $request)
 
         if ($result !== 0) {
             // Log the output
-            $outputBuffer = trim(preg_replace('/\n\s*\n/s', " \\ ", $output->fetch()));
+            $outputBuffer = trim(preg_replace('/\n\s*\n/s', ' \\ ', $output->fetch()));
             $outputBuffer = preg_replace('/\s\s+/', ' ', trim($outputBuffer));
             $this->factory->getLogger()->log('error', '[UPGRADE ERROR] Exit code '.$result.'; '.$outputBuffer);
 
             $dataArray['stepStatus'] = $translator->trans('mautic.core.update.step.failed');
             $dataArray['message']    = $translator->trans(
                     'mautic.core.update.error',
-                    array('%error%' => $translator->trans('mautic.core.update.error_performing_migration'))
-                ).' <a href="'.$this->generateUrl('mautic_core_update_schema', array('update' => 1))
+                    ['%error%' => $translator->trans('mautic.core.update.error_performing_migration')]
+                ).' <a href="'.$this->generateUrl('mautic_core_update_schema', ['update' => 1])
                 .'" class="btn btn-primary btn-xs" data-toggle="ajax">'.$translator->trans('mautic.core.retry').'</a>';
 
             // A way to keep the upgrade from failing if the session is lost after
@@ -582,7 +581,6 @@ public function updateDatabaseMigrationAction(Request $request)
             /** @var \Mautic\CoreBundle\Helper\CookieHelper $cookieHelper */
             $cookieHelper = $this->factory->getHelper('cookie');
             $cookieHelper->deleteCookie('mautic_update');
-
         } else {
 
             // A way to keep the upgrade from failing if the session is lost after
@@ -608,7 +606,7 @@ public function updateDatabaseMigrationAction(Request $request)
     }
 
     /**
-     * Finalize update
+     * Finalize update.
      *
      * @param Request $request
      *
@@ -616,12 +614,12 @@ public function updateDatabaseMigrationAction(Request $request)
      */
     public function updateFinalizationAction(Request $request)
     {
-        $dataArray  = array('success' => 0);
+        $dataArray  = ['success' => 0];
         $translator = $this->translator;
 
         // Here as a just in case it's needed for a future upgrade
         $dataArray['success'] = 1;
-        $dataArray['message'] = $translator->trans('mautic.core.update.update_successful', array('%version%' => $this->factory->getVersion()));
+        $dataArray['message'] = $translator->trans('mautic.core.update.update_successful', ['%version%' => $this->factory->getVersion()]);
 
         // Check for a post install message
         if ($postMessage = $this->container->get('session')->get('post_upgrade_message', false)) {
@@ -629,7 +627,7 @@ public function updateFinalizationAction(Request $request)
             $postMessage = sprintf('<h4 class="mt-lg">%s</h4><p>%s</p>', $this->container->get('translator')->trans('mautic.core.update.post_message'), $postMessage);
             if ('1.2.3' == $this->container->get('kernel')->getVersion()) {
                 // @TODO - remove in 2.0
-                $dataArray['message']    .= $postMessage;
+                $dataArray['message'] .= $postMessage;
                 $dataArray['postmessage'] = false;
             } else {
                 $dataArray['postmessage'] = $postMessage;
@@ -664,7 +662,7 @@ protected function updateUserStatusAction(Request $request)
         $model = $this->getModel('user');
 
         $currentStatus = $this->user->getOnlineStatus();
-        if (!in_array($currentStatus, array('manualaway', 'dnd'))) {
+        if (!in_array($currentStatus, ['manualaway', 'dnd'])) {
             if ($status == 'back') {
                 $status = 'online';
             }
@@ -672,7 +670,7 @@ protected function updateUserStatusAction(Request $request)
             $model->setOnlineStatus($status);
         }
 
-        return $this->sendJsonResponse(array('success' => 1));
+        return $this->sendJsonResponse(['success' => 1]);
     }
 
     /**
@@ -688,7 +686,7 @@ protected function clearNotificationAction(Request $request)
         $model = $this->getModel('core.notification');
         $model->clearNotification($id);
 
-        return $this->sendJsonResponse(array('success' => 1));
+        return $this->sendJsonResponse(['success' => 1]);
     }
 
     /**
@@ -698,7 +696,7 @@ protected function clearNotificationAction(Request $request)
      */
     protected function getBuilderTokensAction(Request $request)
     {
-        $tokens = array();
+        $tokens = [];
 
         if (method_exists($this, 'getBuilderTokens')) {
             $query  = $request->get('query');
@@ -709,7 +707,7 @@ protected function getBuilderTokensAction(Request $request)
     }
 
     /**
-     * Fetch remote data store
+     * Fetch remote data store.
      *
      * @param Request $request
      *
@@ -717,11 +715,11 @@ protected function getBuilderTokensAction(Request $request)
      */
     protected function downloadIpLookupDataStoreAction(Request $request)
     {
-        $dataArray = array('success' => 0);
+        $dataArray = ['success' => 0];
 
         if ($request->request->has('service')) {
-            $serviceName   = $request->request->get('service');
-            $serviceAuth   = $request->request->get('auth');
+            $serviceName = $request->request->get('service');
+            $serviceAuth = $request->request->get('auth');
 
             /** @var \Mautic\CoreBundle\Factory\IpLookupFactory $ipServiceFactory */
             $ipServiceFactory = $this->container->get('mautic.ip_lookup.factory');
@@ -738,10 +736,10 @@ protected function downloadIpLookupDataStoreAction(Request $request)
                     if ($remoteUrl && $localPath) {
                         $dataArray['error'] = $this->container->get('translator')->trans(
                             'mautic.core.ip_lookup.remote_fetch_error',
-                            array(
+                            [
                                 '%remoteUrl%' => $remoteUrl,
-                                '%localPath%' => $localPath
-                            )
+                                '%localPath%' => $localPath,
+                            ]
                         );
                     } else {
                         $dataArray['error'] = $this->container->get('translator')->trans(
@@ -756,7 +754,7 @@ protected function downloadIpLookupDataStoreAction(Request $request)
     }
 
     /**
-     * Fetch IP Lookup form
+     * Fetch IP Lookup form.
      *
      * @param Request $request
      *
@@ -764,7 +762,7 @@ protected function downloadIpLookupDataStoreAction(Request $request)
      */
     protected function getIpLookupFormAction(Request $request)
     {
-        $dataArray = array('html' => '', 'attribution' => '');
+        $dataArray = ['html' => '', 'attribution' => ''];
 
         if ($request->request->has('service')) {
             $serviceName = $request->request->get('service');
@@ -780,12 +778,12 @@ protected function getIpLookupFormAction(Request $request)
                         $themes   = $ipService->getConfigFormThemes();
                         $themes[] = 'MauticCoreBundle:FormTheme\Config';
 
-                        $form = $this->get('form.factory')->create($formType, array(), array('ip_lookup_service' => $ipService));
+                        $form = $this->get('form.factory')->create($formType, [], ['ip_lookup_service' => $ipService]);
                         $html = $this->renderView(
                             'MauticCoreBundle:FormTheme\Config:ip_lookup_config_row.html.php',
-                            array(
-                                'form' => $this->setFormTheme($form, 'MauticCoreBundle:FormTheme\Config:ip_lookup_config_row.html.php', $themes)
-                            )
+                            [
+                                'form' => $this->setFormTheme($form, 'MauticCoreBundle:FormTheme\Config:ip_lookup_config_row.html.php', $themes),
+                            ]
                         );
 
                         $html              = str_replace($formType.'_', 'config_coreconfig_ip_lookup_config_', $html);
diff --git a/app/bundles/CoreBundle/Controller/CommonController.php b/app/bundles/CoreBundle/Controller/CommonController.php
index 6154407b045..89f8c7d6a9e 100644
--- a/app/bundles/CoreBundle/Controller/CommonController.php
+++ b/app/bundles/CoreBundle/Controller/CommonController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,9 +19,9 @@
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Form;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -29,7 +30,7 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class CommonController
+ * Class CommonController.
  */
 class CommonController extends Controller implements MauticController
 {
@@ -73,8 +74,6 @@ public function setRequest(Request $request)
 
     /**
      * @param MauticFactory $factory
-     *
-     * @return void
      */
     public function setFactory(MauticFactory $factory)
     {
@@ -115,15 +114,13 @@ public function setTranslator(TranslatorInterface $translator)
 
     /**
      * @param FilterControllerEvent $event
-     *
-     * @return void
      */
     public function initialize(FilterControllerEvent $event)
     {
     }
 
     /**
-     * Check if a security level is granted
+     * Check if a security level is granted.
      *
      * @param $level
      *
@@ -136,7 +133,7 @@ protected function accessGranted($level)
 
     /**
      * Override this method in your controller
-     * for easy access to the permissions
+     * for easy access to the permissions.
      *
      * @return array
      */
@@ -146,7 +143,7 @@ protected function getPermissions()
     }
 
     /**
-     * Get a model instance from the service container
+     * Get a model instance from the service container.
      *
      * @param $modelNameKey
      *
@@ -156,7 +153,7 @@ protected function getModel($modelNameKey)
     {
         return $this->container->get('mautic.model.factory')->getModel($modelNameKey);
     }
-    
+
     /**
      * Forwards the request to another controller and include the POST.
      *
@@ -170,13 +167,13 @@ protected function getModel($modelNameKey)
     public function forwardWithPost($controller, array $request = [], array $path = [], array $query = [])
     {
         $path['_controller'] = $controller;
-        $subRequest = $this->container->get('request_stack')->getCurrentRequest()->duplicate($query, $request, $path);
+        $subRequest          = $this->container->get('request_stack')->getCurrentRequest()->duplicate($query, $request, $path);
 
         return $this->container->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
     }
 
     /**
-     * Determines if ajax content should be returned or direct content (page refresh)
+     * Determines if ajax content should be returned or direct content (page refresh).
      *
      * @param array $args
      *
@@ -185,12 +182,12 @@ public function forwardWithPost($controller, array $request = [], array $path =
     public function delegateView($args)
     {
         if (!is_array($args)) {
-            $args = array(
+            $args = [
                 'contentTemplate' => $args,
-                'passthroughVars' => array(
-                    'mauticContent'   => strtolower($this->request->get('bundle'))
-                )
-            );
+                'passthroughVars' => [
+                    'mauticContent' => strtolower($this->request->get('bundle')),
+                ],
+            ];
         }
 
         if (!isset($args['viewParameters']['currentRoute']) && isset($args['passthroughVars']['route'])) {
@@ -201,7 +198,7 @@ public function delegateView($args)
             return $this->ajaxAction($args);
         }
 
-        $parameters = (isset($args['viewParameters'])) ? $args['viewParameters'] : array();
+        $parameters = (isset($args['viewParameters'])) ? $args['viewParameters'] : [];
         $template   = $args['contentTemplate'];
 
         return $this->render($template, $parameters);
@@ -209,7 +206,7 @@ public function delegateView($args)
 
     /**
      * Determines if a redirect response should be returned or a Json response directing the ajax call to force a page
-     * refresh
+     * refresh.
      *
      * @param $url
      *
@@ -218,14 +215,14 @@ public function delegateView($args)
     public function delegateRedirect($url)
     {
         if ($this->request->isXmlHttpRequest()) {
-            return new JsonResponse(array('redirect' => $url));
+            return new JsonResponse(['redirect' => $url]);
         } else {
             return $this->redirect($url);
         }
     }
 
     /**
-     * Redirects URLs with trailing slashes in order to prevent 404s
+     * Redirects URLs with trailing slashes in order to prevent 404s.
      *
      * @param Request $request
      *
@@ -242,7 +239,7 @@ public function removeTrailingSlashAction(Request $request)
     }
 
     /**
-     * Redirects /s and /s/ to /s/dashboard
+     * Redirects /s and /s/ to /s/dashboard.
      */
     public function redirectSecureRootAction()
     {
@@ -250,16 +247,16 @@ public function redirectSecureRootAction()
     }
 
     /**
-     * Redirects controller if not ajax or retrieves html output for ajax request
+     * Redirects controller if not ajax or retrieves html output for ajax request.
      *
      * @param array $args [returnUrl, viewParameters, contentTemplate, passthroughVars, flashes, forwardController]
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function postActionRedirect($args = array())
+    public function postActionRedirect($args = [])
     {
         $returnUrl = array_key_exists('returnUrl', $args) ? $args['returnUrl'] : $this->generateUrl('mautic_dashboard_index');
-        $flashes   = array_key_exists('flashes', $args) ? $args['flashes'] : array();
+        $flashes   = array_key_exists('flashes', $args) ? $args['flashes'] : [];
 
         //forward the controller by default
         $args['forwardController'] = (array_key_exists('forwardController', $args)) ? $args['forwardController'] : true;
@@ -269,7 +266,7 @@ public function postActionRedirect($args = array())
             foreach ($flashes as $flash) {
                 $this->addFlash(
                     $flash['msg'],
-                    !empty($flash['msgVars']) ? $flash['msgVars'] : array(),
+                    !empty($flash['msgVars']) ? $flash['msgVars'] : [],
                     !empty($flash['type']) ? $flash['type'] : 'notice',
                     !empty($flash['domain']) ? $flash['domain'] : 'flashes'
                 );
@@ -278,6 +275,7 @@ public function postActionRedirect($args = array())
 
         if (!$this->request->isXmlHttpRequest() || !empty($args['ignoreAjax'])) {
             $code = (isset($args['responseCode'])) ? $args['responseCode'] : 302;
+
             return $this->redirect($returnUrl, $code);
         }
 
@@ -286,22 +284,22 @@ public function postActionRedirect($args = array())
     }
 
     /**
-     * Generates html for ajax request
+     * Generates html for ajax request.
      *
      * @param array $args [parameters, contentTemplate, passthroughVars, forwardController]
      *
      * @return JsonResponse
      */
-    public function ajaxAction($args = array())
+    public function ajaxAction($args = [])
     {
-        $parameters      = array_key_exists('viewParameters', $args) ? $args['viewParameters'] : array();
+        $parameters      = array_key_exists('viewParameters', $args) ? $args['viewParameters'] : [];
         $contentTemplate = array_key_exists('contentTemplate', $args) ? $args['contentTemplate'] : '';
-        $passthrough     = array_key_exists('passthroughVars', $args) ? $args['passthroughVars'] : array();
+        $passthrough     = array_key_exists('passthroughVars', $args) ? $args['passthroughVars'] : [];
         $forward         = array_key_exists('forwardController', $args) ? $args['forwardController'] : false;
 
         //set the route to the returnUrl
-        if (empty($passthrough["route"]) && !empty($args["returnUrl"])) {
-            $passthrough["route"] = $args["returnUrl"];
+        if (empty($passthrough['route']) && !empty($args['returnUrl'])) {
+            $passthrough['route'] = $args['returnUrl'];
         }
 
         //Ajax call so respond with json
@@ -310,7 +308,7 @@ public function ajaxAction($args = array())
             if ($forward) {
                 //the content is from another controller action so we must retrieve the response from it instead of
                 //directly parsing the template
-                $query              = array("ignoreAjax" => true, 'request' => $this->request, 'subrequest' => true);
+                $query              = ['ignoreAjax' => true, 'request' => $this->request, 'subrequest' => true];
                 $newContentResponse = $this->forward($contentTemplate, $parameters, $query);
                 $newContent         = $newContentResponse->getContent();
             } else {
@@ -336,33 +334,33 @@ public function ajaxAction($args = array())
         }
 
         //render browser notifications
-        $passthrough['browserNotifications'] = $this->get('session')->get('mautic.browser.notifications', array());
-        $this->get('session')->set('mautic.browser.notifications', array());
+        $passthrough['browserNotifications'] = $this->get('session')->get('mautic.browser.notifications', []);
+        $this->get('session')->set('mautic.browser.notifications', []);
 
         $tmpl = (isset($parameters['tmpl'])) ? $parameters['tmpl'] : $this->request->get('tmpl', 'index');
         if ($tmpl == 'index') {
-            if (!empty($passthrough["route"])) {
+            if (!empty($passthrough['route'])) {
                 //breadcrumbs may fail as it will retrieve the crumb path for currently loaded URI so we must override
-                $this->request->query->set("overrideRouteUri", $passthrough["route"]);
+                $this->request->query->set('overrideRouteUri', $passthrough['route']);
 
                 //if the URL has a query built into it, breadcrumbs may fail matching
                 //so let's try to find it by the route name which will be the extras["routeName"] of the menu item
-                $baseUrl = $this->request->getBaseUrl();
-                $routePath = str_replace($baseUrl, '', $passthrough["route"]);
+                $baseUrl   = $this->request->getBaseUrl();
+                $routePath = str_replace($baseUrl, '', $passthrough['route']);
                 try {
                     $routeParams = $this->get('router')->match($routePath);
-                    $routeName   = $routeParams["_route"];
-                    if (isset($routeParams["objectAction"])) {
+                    $routeName   = $routeParams['_route'];
+                    if (isset($routeParams['objectAction'])) {
                         //action urls share same route name so tack on the action to differentiate
-                        $routeName .= "|{$routeParams["objectAction"]}";
+                        $routeName .= "|{$routeParams['objectAction']}";
                     }
-                    $this->request->query->set("overrideRouteName", $routeName);
+                    $this->request->query->set('overrideRouteName', $routeName);
                 } catch (\Exception $e) {
                     //do nothing
                 }
             }
 
-            $updatedContent = array();
+            $updatedContent = [];
             if (!empty($newContent)) {
                 $updatedContent['newContent'] = $newContent;
             }
@@ -375,7 +373,7 @@ public function ajaxAction($args = array())
             //just retrieve the content
             $dataArray = array_merge(
                 $passthrough,
-                array('newContent'  => $newContent)
+                ['newContent' => $newContent]
             );
         }
 
@@ -391,7 +389,7 @@ public function ajaxAction($args = array())
     }
 
     /**
-     * Get's the content of error page
+     * Get's the content of error page.
      *
      * @param \Exception $e
      *
@@ -399,15 +397,15 @@ public function ajaxAction($args = array())
      */
     public function renderException(\Exception $e)
     {
-        $exception   = FlattenException::create($e, $e->getCode(), $this->request->headers->all());
-        $parameters  = array('request' => $this->request, 'exception' => $exception);
-        $query       = array("ignoreAjax" => true, 'request' => $this->request, 'subrequest' => true);
+        $exception  = FlattenException::create($e, $e->getCode(), $this->request->headers->all());
+        $parameters = ['request' => $this->request, 'exception' => $exception];
+        $query      = ['ignoreAjax' => true, 'request' => $this->request, 'subrequest' => true];
 
         return $this->forward('MauticCoreBundle:Exception:show', $parameters, $query);
     }
 
     /**
-     * Executes an action defined in route
+     * Executes an action defined in route.
      *
      * @param string $objectAction
      * @param int    $objectId
@@ -426,12 +424,13 @@ public function executeAction($objectAction, $objectId = 0, $objectSubId = 0, $o
     }
 
     /**
-     * Generates access denied message
+     * Generates access denied message.
      *
      * @param bool   $batch Flag if a batch action is being performed
      * @param string $msg   Message that is logged
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|array
+     *
      * @throws AccessDeniedHttpException
      */
     public function accessDenied($batch = false, $msg = 'mautic.core.url.error.401')
@@ -441,23 +440,23 @@ public function accessDenied($batch = false, $msg = 'mautic.core.url.error.401')
         if ($anonymous || !$batch) {
             throw new AccessDeniedHttpException(
                 $this->translator->trans($msg,
-                    array(
-                        '%url%' => $this->request->getRequestUri()
-                    )
+                    [
+                        '%url%' => $this->request->getRequestUri(),
+                    ]
                 )
             );
         }
 
         if ($batch) {
-            return array(
+            return [
                 'type' => 'error',
-                'msg'  => $this->translator->trans('mautic.core.error.accessdenied', array(), 'flashes')
-            );
+                'msg'  => $this->translator->trans('mautic.core.error.accessdenied', [], 'flashes'),
+            ];
         }
     }
 
     /**
-     * Generate 404 not found message
+     * Generate 404 not found message.
      *
      * @param string $msg Message to log
      */
@@ -465,15 +464,15 @@ public function notFound($msg = 'mautic.core.url.error.404')
     {
         throw new NotFoundHttpException(
             $this->translator->trans($msg,
-                array(
-                    '%url%' => $this->request->getRequestUri()
-                )
+                [
+                    '%url%' => $this->request->getRequestUri(),
+                ]
             )
         );
     }
 
     /**
-     * Returns a json encoded access denied error for modal windows
+     * Returns a json encoded access denied error for modal windows.
      *
      * @param string $msg
      *
@@ -481,15 +480,13 @@ public function notFound($msg = 'mautic.core.url.error.404')
      */
     public function modalAccessDenied($msg = 'mautic.core.error.accessdenied')
     {
-        return new JsonResponse(array(
-            'error' => $this->translator->trans($msg, array(), 'flashes')
-        ));
+        return new JsonResponse([
+            'error' => $this->translator->trans($msg, [], 'flashes'),
+        ]);
     }
 
     /**
-     * Updates list filters, order, limit
-     *
-     * @return void
+     * Updates list filters, order, limit.
      */
     protected function setListFilters()
     {
@@ -511,21 +508,21 @@ protected function setListFilters()
             }
 
             if ($this->request->query->has('filterby')) {
-                $filter  = InputHelper::clean($this->request->query->get("filterby"), true);
-                $value   = InputHelper::clean($this->request->query->get("value"), true);
-                $filters = $session->get("mautic.$name.filters", array());
+                $filter  = InputHelper::clean($this->request->query->get('filterby'), true);
+                $value   = InputHelper::clean($this->request->query->get('value'), true);
+                $filters = $session->get("mautic.$name.filters", []);
 
                 if ($value == '') {
                     if (isset($filters[$filter])) {
                         unset($filters[$filter]);
                     }
                 } else {
-                    $filters[$filter] = array(
+                    $filters[$filter] = [
                         'column' => $filter,
                         'expr'   => 'like',
                         'value'  => $value,
-                        'strict' => false
-                    );
+                        'strict' => false,
+                    ];
                 }
 
                 $session->set("mautic.$name.filters", $filters);
@@ -534,7 +531,7 @@ protected function setListFilters()
     }
 
     /**
-     * Sets a specific theme for the form
+     * Sets a specific theme for the form.
      *
      * @param Form   $form
      * @param string $template
@@ -562,7 +559,7 @@ protected function setFormTheme(Form $form, $template, $theme = null)
     }
 
     /**
-     * Renders flashes' HTML
+     * Renders flashes' HTML.
      *
      * @return string
      */
@@ -572,7 +569,7 @@ protected function getFlashContent()
     }
 
     /**
-     * Renders notification info for ajax
+     * Renders notification info for ajax.
      *
      * @param Request $request
      *
@@ -593,15 +590,15 @@ protected function getNotificationContent(Request $request = null)
 
         $lastNotification = reset($notifications);
 
-        return array(
-            'content' => ($notifications || $updateMessage) ? $this->renderView('MauticCoreBundle:Notification:notification_messages.html.php', array(
+        return [
+            'content' => ($notifications || $updateMessage) ? $this->renderView('MauticCoreBundle:Notification:notification_messages.html.php', [
                 'notifications' => $notifications,
-                'updateMessage' => $updateMessage
-            )) : '',
+                'updateMessage' => $updateMessage,
+            ]) : '',
             'lastId'              => (!empty($lastNotification)) ? $lastNotification['id'] : $afterId,
             'hasNewNotifications' => $showNewIndicator,
-            'updateAvailable'     => (!empty($updateMessage))
-        );
+            'updateAvailable'     => (!empty($updateMessage)),
+        ];
     }
 
     /**
@@ -616,7 +613,7 @@ public function addNotification($message, $type = null, $isRead = true, $header
     {
         /** @var \Mautic\CoreBundle\Model\NotificationModel $notificationModel */
         $notificationModel = $this->getModel('core.notification');
-        $notificationModel->addNotification($message, $type, $isRead, $header, $iconClass, $datetime );
+        $notificationModel->addNotification($message, $type, $isRead, $header, $iconClass, $datetime);
     }
 
     /**
@@ -626,7 +623,7 @@ public function addNotification($message, $type = null, $isRead = true, $header
      * @param string $domain
      * @param bool   $addNotification
      */
-    public function addFlash($message, $messageVars = array(), $type = 'notice', $domain = 'flashes', $addNotification = false)
+    public function addFlash($message, $messageVars = [], $type = 'notice', $domain = 'flashes', $addNotification = false)
     {
         if ($domain == null) {
             $domain = 'flashes';
@@ -648,13 +645,13 @@ public function addFlash($message, $messageVars = array(), $type = 'notice', $do
         if (!defined('MAUTIC_INSTALLER') && $addNotification) {
             switch ($type) {
                 case 'warning':
-                    $iconClass = "text-warning fa-exclamation-triangle";
+                    $iconClass = 'text-warning fa-exclamation-triangle';
                     break;
                 case 'error':
-                    $iconClass = "text-danger fa-exclamation-circle";
+                    $iconClass = 'text-danger fa-exclamation-circle';
                     break;
                 case 'notice':
-                    $iconClass = "fa-info-circle";
+                    $iconClass = 'fa-info-circle';
                 default:
                     break;
             }
@@ -676,7 +673,7 @@ public function addFlash($message, $messageVars = array(), $type = 'notice', $do
      * @param bool   $addNotification
      * @param string $type
      */
-    public function addBrowserNotification($message, $messageVars = array(), $domain = 'flashes', $title = null, $icon = null, $addNotification = true, $type = 'notice')
+    public function addBrowserNotification($message, $messageVars = [], $domain = 'flashes', $title = null, $icon = null, $addNotification = true, $type = 'notice')
     {
         if ($domain == null) {
             $domain = 'flashes';
@@ -711,25 +708,25 @@ public function addBrowserNotification($message, $messageVars = array(), $domain
         }
 
         $session                = $this->get('session');
-        $browserNotifications   = $session->get('mautic.browser.notifications', array());
-        $browserNotifications[] = array(
+        $browserNotifications   = $session->get('mautic.browser.notifications', []);
+        $browserNotifications[] = [
             'message' => $translatedMessage,
             'title'   => $title,
-            'icon'    => $icon
-        );
+            'icon'    => $icon,
+        ];
 
         $session->set('mautic.browser.notifications', $browserNotifications);
 
         if (!defined('MAUTIC_INSTALLER') && $addNotification) {
             switch ($type) {
                 case 'warning':
-                    $iconClass = "text-warning fa-exclamation-triangle";
+                    $iconClass = 'text-warning fa-exclamation-triangle';
                     break;
                 case 'error':
-                    $iconClass = "text-danger fa-exclamation-circle";
+                    $iconClass = 'text-danger fa-exclamation-circle';
                     break;
                 case 'notice':
-                    $iconClass = "fa-info-circle";
+                    $iconClass = 'fa-info-circle';
                 default:
                     break;
             }
diff --git a/app/bundles/CoreBundle/Controller/DefaultController.php b/app/bundles/CoreBundle/Controller/DefaultController.php
index 90d55e5a6fd..de0b9b3ec44 100644
--- a/app/bundles/CoreBundle/Controller/DefaultController.php
+++ b/app/bundles/CoreBundle/Controller/DefaultController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,18 +12,17 @@
 
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\GlobalSearchEvent;
-use Mautic\CoreBundle\Helper\InputHelper;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class DefaultController
+ * Class DefaultController.
  *
  * Almost all other Mautic Bundle controllers extend this default controller
  */
 class DefaultController extends CommonController
 {
     /**
-     * Generates default index.php
+     * Generates default index.php.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -38,7 +38,6 @@ public function indexAction(Request $request)
             $page      = $pageModel->getEntity($root);
 
             if (empty($page)) {
-
                 $this->notFound();
             }
 
@@ -46,7 +45,7 @@ public function indexAction(Request $request)
 
             $request->attributes->set('ignore_mismatch', true);
 
-            return $this->forward('MauticPageBundle:Public:index', array('slug' => $slug));
+            return $this->forward('MauticPageBundle:Public:index', ['slug' => $slug]);
         }
     }
 
@@ -55,7 +54,7 @@ public function indexAction(Request $request)
      */
     public function globalSearchAction()
     {
-        $searchStr = $this->request->get("global_search", $this->get('session')->get('mautic.global_search', ''));
+        $searchStr = $this->request->get('global_search', $this->get('session')->get('mautic.global_search', ''));
         $this->get('session')->set('mautic.global_search', $searchStr);
 
         if (!empty($searchStr)) {
@@ -63,14 +62,14 @@ public function globalSearchAction()
             $this->get('event_dispatcher')->dispatch(CoreEvents::GLOBAL_SEARCH, $event);
             $results = $event->getResults();
         } else {
-            $results = array();
+            $results = [];
         }
 
         return $this->render('MauticCoreBundle:GlobalSearch:globalsearch.html.php',
-            array(
+            [
                 'results'      => $results,
-                'searchString' => $searchStr
-            )
+                'searchString' => $searchStr,
+            ]
         );
     }
 
@@ -84,13 +83,13 @@ public function notificationsAction()
 
         list($notifications, $showNewIndicator, $updateMessage) = $model->getNotificationContent();
 
-        return $this->delegateView(array(
+        return $this->delegateView([
             'contentTemplate' => 'MauticCoreBundle:Notification:notifications.html.php',
-            'viewParameters'  => array(
+            'viewParameters'  => [
                 'showNewIndicator' => $showNewIndicator,
                 'notifications'    => $notifications,
-                'updateMessage'    => $updateMessage
-            )
-        ));
+                'updateMessage'    => $updateMessage,
+            ],
+        ]);
     }
 }
diff --git a/app/bundles/CoreBundle/Controller/ExceptionController.php b/app/bundles/CoreBundle/Controller/ExceptionController.php
index 78f4831eb5b..70572b525b5 100644
--- a/app/bundles/CoreBundle/Controller/ExceptionController.php
+++ b/app/bundles/CoreBundle/Controller/ExceptionController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 
 /**
- * Class ExceptionController
+ * Class ExceptionController.
  */
 class ExceptionController extends CommonController
 {
@@ -40,12 +41,12 @@ public function showAction(Request $request, FlattenException $exception, DebugL
 
             // Special handling for oauth and api urls
             if ((strpos($request->getUri(), '/oauth') !== false && strpos($request->getUri(), 'authorize') === false) || strpos($request->getUri(), '/api') !== false) {
-                $dataArray = array(
-                    'error' => array(
+                $dataArray = [
+                    'error' => [
                         'message' => $exception->getMessage(),
-                        'code'    => $code
-                    )
-                );
+                        'code'    => $code,
+                    ],
+                ];
                 if ($env == 'dev') {
                     $dataArray['trace'] = $exception->getTrace();
                 }
@@ -77,33 +78,33 @@ public function showAction(Request $request, FlattenException $exception, DebugL
             $urlParts = parse_url($url);
 
             return $this->delegateView(
-                array(
-                    'viewParameters'  => array(
+                [
+                    'viewParameters' => [
                         'baseTemplate'   => $baseTemplate,
                         'status_code'    => $code,
                         'status_text'    => $statusText,
                         'exception'      => $exception,
                         'logger'         => $logger,
                         'currentContent' => $currentContent,
-                        'isPublicPage'   => $anonymous
-                    ),
+                        'isPublicPage'   => $anonymous,
+                    ],
                     'contentTemplate' => $template,
-                    'passthroughVars' => array(
-                        'error' => array(
+                    'passthroughVars' => [
+                        'error' => [
                             'code'      => $code,
                             'text'      => $statusText,
                             'exception' => ($env == 'dev') ? $exception->getMessage() : '',
-                            'trace'     => ($env == 'dev') ? $exception->getTrace() : ''
-                        ),
-                        'route' => $urlParts['path']
-                    )
-                )
+                            'trace'     => ($env == 'dev') ? $exception->getTrace() : '',
+                        ],
+                        'route' => $urlParts['path'],
+                    ],
+                ]
             );
         }
     }
 
     /**
-     * @param int     $startObLevel
+     * @param int $startObLevel
      *
      * @return string
      */
diff --git a/app/bundles/CoreBundle/Controller/FileController.php b/app/bundles/CoreBundle/Controller/FileController.php
index 19aa244b08b..372189336e7 100644
--- a/app/bundles/CoreBundle/Controller/FileController.php
+++ b/app/bundles/CoreBundle/Controller/FileController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,26 +14,26 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class FileController
+ * Class FileController.
  */
 class FileController extends AjaxController
 {
-    protected $imageMimes = array(
+    protected $imageMimes = [
         'image/gif',
         'image/jpeg',
         'image/pjpeg',
         'image/jpeg',
         'image/pjpeg',
         'image/png',
-        'image/x-png'
-    );
+        'image/x-png',
+    ];
 
-    protected $response = array();
+    protected $response = [];
 
     protected $statusCode = Response::HTTP_OK;
 
     /**
-     * Uploads a file
+     * Uploads a file.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
@@ -55,7 +56,7 @@ public function uploadAction()
     }
 
     /**
-     * List the files in /media directory
+     * List the files in /media directory.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
@@ -68,11 +69,11 @@ public function listAction()
                 $imagePath = $this->getMediaAbsolutePath().'/'.$name;
                 $imageUrl  = $this->getMediaUrl().'/'.$name;
                 if (!is_dir($name) && in_array(mime_content_type($imagePath), $this->imageMimes)) {
-                    $this->response[] = array(
+                    $this->response[] = [
                         'url'   => $imageUrl,
                         'thumb' => $imageUrl,
-                        'name'  => $name
-                    );
+                        'name'  => $name,
+                    ];
                 }
             }
         } else {
@@ -83,22 +84,22 @@ public function listAction()
     }
 
     /**
-     * Delete a file from /media directory
+     * Delete a file from /media directory.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     public function deleteAction()
     {
         $src       = InputHelper::clean($this->request->request->get('src'));
-        $response  = array('deleted' => false);
+        $response  = ['deleted' => false];
         $imagePath = $this->getMediaAbsolutePath().'/'.basename($src);
 
         if (!file_exists($imagePath)) {
             $this->response['error'] = 'File does not exist';
-            $this->statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
+            $this->statusCode        = Response::HTTP_INTERNAL_SERVER_ERROR;
         } elseif (!is_writable($imagePath)) {
             $this->response['error'] = 'File is not writable';
-            $this->statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
+            $this->statusCode        = Response::HTTP_INTERNAL_SERVER_ERROR;
         } else {
             unlink($imagePath);
             $this->response['deleted'] = true;
@@ -107,9 +108,8 @@ public function deleteAction()
         return $this->sendJsonResponse($this->response, $this->statusCode);
     }
 
-
     /**
-     * Get the Media directory full file system path
+     * Get the Media directory full file system path.
      *
      * @return string
      */
@@ -119,19 +119,19 @@ public function getMediaAbsolutePath()
 
         if ($mediaDir === false) {
             $this->response['error'] = 'Media dir does not exist';
-            $this->statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
+            $this->statusCode        = Response::HTTP_INTERNAL_SERVER_ERROR;
         }
 
         if (is_writable($mediaDir) === false) {
             $this->response['error'] = 'Media dir is not writable';
-            $this->statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
+            $this->statusCode        = Response::HTTP_INTERNAL_SERVER_ERROR;
         }
 
         return $mediaDir;
     }
 
     /**
-     * Get the Media directory full file system path
+     * Get the Media directory full file system path.
      *
      * @return string
      */
diff --git a/app/bundles/CoreBundle/Controller/FormController.php b/app/bundles/CoreBundle/Controller/FormController.php
index 2d91b35762c..0d97ad39a98 100644
--- a/app/bundles/CoreBundle/Controller/FormController.php
+++ b/app/bundles/CoreBundle/Controller/FormController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\Form\Form;
 
 /**
- * Class FormController
+ * Class FormController.
  */
 class FormController extends CommonController
 {
@@ -27,7 +28,7 @@ class FormController extends CommonController
     protected $templateBase;
 
     /**
-     * Checks to see if the form was cancelled
+     * Checks to see if the form was cancelled.
      *
      * @param Form $form
      *
@@ -41,7 +42,7 @@ protected function isFormCancelled(Form &$form)
     }
 
     /**
-     * Checks to see if the form was applied or saved
+     * Checks to see if the form was applied or saved.
      *
      * @param $form
      *
@@ -55,7 +56,7 @@ protected function isFormApplied($form)
     }
 
     /**
-     * Binds form data, checks validity, and determines cancel request
+     * Binds form data, checks validity, and determines cancel request.
      *
      * @param Form $form
      *
@@ -75,12 +76,12 @@ protected function isFormValid(Form &$form)
      *
      * @param object $entity
      *
-     * @return boolean
+     * @return bool
      */
     protected function canEdit($entity = null)
     {
         $security = $this->get('mautic.security');
-        
+
         if ($this->permissionBase) {
             if ($entity && $security->checkPermissionExists($this->permissionBase.':editown')) {
                 return $security->hasEntityAccess(
@@ -99,12 +100,12 @@ protected function canEdit($entity = null)
     }
 
     /**
-     * Returns view to index with a locked out message
+     * Returns view to index with a locked out message.
      *
      * @param array  $postActionVars
      * @param object $entity
      * @param string $model
-     * @param bool   $batch Flag if a batch action is being performed
+     * @param bool   $batch          Flag if a batch action is being performed
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|array
      */
@@ -116,53 +117,53 @@ protected function isLocked($postActionVars, $entity, $model, $batch = false)
             urlencode($postActionVars['returnUrl'])
             :
             urlencode($this->generateUrl('mautic_dashboard_index'));
-        $override  = '';
+        $override = '';
 
-        $modelClass   = $this->getModel($model);
-        $nameFunction = $modelClass->getNameGetter();
+        $modelClass           = $this->getModel($model);
+        $nameFunction         = $modelClass->getNameGetter();
         $this->permissionBase = $modelClass->getPermissionBase();
 
         if ($this->canEdit($entity)) {
-            $override     = $this->get('translator')->trans(
+            $override = $this->get('translator')->trans(
                 'mautic.core.override.lock',
-                array(
+                [
                     '%url%' => $this->generateUrl(
                         'mautic_core_form_action',
-                        array(
+                        [
                             'objectAction' => 'unlock',
                             'objectModel'  => $model,
                             'objectId'     => $entity->getId(),
                             'returnUrl'    => $returnUrl,
-                            'name'         => urlencode($entity->$nameFunction())
-                        )
-                    )
-                )
+                            'name'         => urlencode($entity->$nameFunction()),
+                        ]
+                    ),
+                ]
             );
         }
 
-        $flash = array(
+        $flash = [
             'type'    => 'error',
             'msg'     => 'mautic.core.error.locked',
-            'msgVars' => array(
-                "%name%"       => $entity->$nameFunction(),
-                "%user%"       => $entity->getCheckedOutByUser(),
+            'msgVars' => [
+                '%name%'       => $entity->$nameFunction(),
+                '%user%'       => $entity->getCheckedOutByUser(),
                 '%contactUrl%' => $this->generateUrl(
                     'mautic_user_action',
-                    array(
+                    [
                         'objectAction' => 'contact',
                         'objectId'     => $entity->getCheckedOutBy(),
                         'entity'       => $model,
                         'id'           => $entity->getId(),
                         'subject'      => 'locked',
-                        'returnUrl'    => $returnUrl
-                    )
+                        'returnUrl'    => $returnUrl,
+                    ]
                 ),
-                '%date%'       => $date->format($this->coreParametersHelper->getParameter('date_format_dateonly')),
-                '%time%'       => $date->format($this->coreParametersHelper->getParameter('date_format_timeonly')),
-                '%datetime%'   => $date->format($this->coreParametersHelper->getParameter('date_format_full')),
-                '%override%'   => $override
-            )
-        );
+                '%date%'     => $date->format($this->coreParametersHelper->getParameter('date_format_dateonly')),
+                '%time%'     => $date->format($this->coreParametersHelper->getParameter('date_format_timeonly')),
+                '%datetime%' => $date->format($this->coreParametersHelper->getParameter('date_format_full')),
+                '%override%' => $override,
+            ],
+        ];
         if ($batch) {
             return $flash;
         }
@@ -170,9 +171,9 @@ protected function isLocked($postActionVars, $entity, $model, $batch = false)
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => array($flash)
-                )
+                [
+                    'flashes' => [$flash],
+                ]
             )
         );
     }
@@ -185,12 +186,11 @@ protected function isLocked($postActionVars, $entity, $model, $batch = false)
      */
     public function unlockAction($id, $modelName)
     {
-        $model   = $this->getModel($modelName);
-        $entity  = $model->getEntity($id);
+        $model                = $this->getModel($modelName);
+        $entity               = $model->getEntity($id);
         $this->permissionBase = $model->getPermissionBase();
 
         if ($this->canEdit($entity)) {
-            
             if ($entity !== null && $entity->getCheckedOutBy() !== null) {
                 $model->unlockEntity($entity);
             }
@@ -201,9 +201,9 @@ public function unlockAction($id, $modelName)
 
             $this->addFlash(
                 'mautic.core.action.entity.unlocked',
-                array(
-                    '%name%' => urldecode($this->request->get('name'))
-                )
+                [
+                    '%name%' => urldecode($this->request->get('name')),
+                ]
             );
 
             return $this->redirect($returnUrl);
@@ -235,7 +235,7 @@ protected function setStandardParameters(
         $this->modelName      = $modelName;
         $this->permissionBase = $permissionBase;
         if (strpos($sessionBase, 'mautic.') !== 0) {
-            $sessionBase = 'mautic.' . $sessionBase;
+            $sessionBase = 'mautic.'.$sessionBase;
         }
         $this->sessionBase    = $sessionBase;
         $this->routeBase      = $routeBase;
@@ -254,7 +254,7 @@ protected function indexStandard($page = 1)
     {
         //set some permissions
         $permissions = $this->get('mautic.security')->isGranted(
-            array(
+            [
                 $this->permissionBase.':view',
                 $this->permissionBase.':viewown',
                 $this->permissionBase.':viewother',
@@ -267,9 +267,9 @@ protected function indexStandard($page = 1)
                 $this->permissionBase.':deleteother',
                 $this->permissionBase.':publish',
                 $this->permissionBase.':publishown',
-                $this->permissionBase.':publishother'
-            ),
-            "RETURN_ARRAY",
+                $this->permissionBase.':publishother',
+            ],
+            'RETURN_ARRAY',
             null,
             true
         );
@@ -294,26 +294,26 @@ protected function indexStandard($page = 1)
         $search = $this->request->get('search', $session->get($this->sessionBase.'.filter', ''));
         $session->set($this->sessionBase.'.filter', $search);
 
-        $filter = array('string' => $search, 'force' => array());
+        $filter = ['string' => $search, 'force' => []];
 
         $model = $this->getModel($this->modelName);
         $repo  = $model->getRepository();
 
         if (!$permissions[$this->permissionBase.':viewother']) {
-            $filter['force'] = array('column' => $repo->getTableAlias().'.createdBy', 'expr' => 'eq', 'value' => $this->user->getId());
+            $filter['force'] = ['column' => $repo->getTableAlias().'.createdBy', 'expr' => 'eq', 'value' => $this->user->getId()];
         }
 
         $orderBy    = $session->get($this->sessionBase.'.orderby', $repo->getTableAlias().'.name');
         $orderByDir = $session->get($this->sessionBase.'.orderbydir', 'ASC');
 
         $items = $model->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
-            )
+                'orderByDir' => $orderByDir,
+            ]
         );
 
         $count = count($items);
@@ -323,25 +323,25 @@ protected function indexStandard($page = 1)
             $lastPage = ($count === 1) ? 1 : ((ceil($count / $limit)) ?: 1) ?: 1;
 
             $session->set($this->sessionBase.'.page', $lastPage);
-            $returnUrl = $this->generateUrl($this->routeBase.'_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl($this->routeBase.'_index', ['page' => $lastPage]);
 
             return $this->postActionRedirect(
-                array(
+                [
                     'returnUrl'       => $returnUrl,
-                    'viewParameters'  => array('page' => $lastPage),
+                    'viewParameters'  => ['page' => $lastPage],
                     'contentTemplate' => $this->templateBase.':index',
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => $this->activeLink,
-                        'mauticContent' => $this->mauticContent
-                    )
-                )
+                        'mauticContent' => $this->mauticContent,
+                    ],
+                ]
             );
         }
 
         //set what page currently on so that we can return here after form submission/cancellation
         $session->set($this->sessionBase.'.page', $page);
 
-        $viewParameters = array(
+        $viewParameters = [
             'searchValue' => $search,
             'items'       => $items,
             'totalItems'  => $count,
@@ -349,18 +349,18 @@ protected function indexStandard($page = 1)
             'limit'       => $limit,
             'permissions' => $permissions,
             'security'    => $this->get('mautic.security'),
-            'tmpl'        => $this->request->get('tmpl', 'index')
-        );
+            'tmpl'        => $this->request->get('tmpl', 'index'),
+        ];
 
-        $delegateArgs = array(
+        $delegateArgs = [
             'viewParameters'  => $viewParameters,
             'contentTemplate' => $this->templateBase.':list.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => $this->activeLink,
                 'mauticContent' => $this->mauticContent,
-                'route'         => $this->generateUrl($this->routeBase.'_index', array('page' => $page))
-            )
-        );
+                'route'         => $this->generateUrl($this->routeBase.'_index', ['page' => $page]),
+            ],
+        ];
 
         // Allow inherited class to adjust
         if (method_exists($this, 'customizeViewArguments')) {
@@ -371,7 +371,7 @@ protected function indexStandard($page = 1)
     }
 
     /**
-     * Individual item's details page
+     * Individual item's details page.
      *
      * @param      $objectId
      * @param null $logObject
@@ -380,7 +380,7 @@ protected function indexStandard($page = 1)
      *
      * @return array|\Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    protected function viewStandard($objectId, $logObject= null, $logBundle =  null, $listPage = null)
+    protected function viewStandard($objectId, $logObject = null, $logBundle = null, $listPage = null)
     {
         $model    = $this->getModel($this->modelName);
         $entity   = $model->getEntity($objectId);
@@ -390,22 +390,22 @@ protected function viewStandard($objectId, $logObject= null, $logBundle =  null,
             $page = $this->get('session')->get($this->sessionBase.'.page', 1);
 
             return $this->postActionRedirect(
-                array(
-                    'returnUrl'       => $this->generateUrl($this->routeBase.'_index', array('page' => $page)),
-                    'viewParameters'  => array('page' => $page),
+                [
+                    'returnUrl'       => $this->generateUrl($this->routeBase.'_index', ['page' => $page]),
+                    'viewParameters'  => ['page' => $page],
                     'contentTemplate' => $this->templateBase.':index',
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => $this->activeLink,
-                        'mauticContent' => $this->mauticContent
-                    ),
-                    'flashes'         => array(
-                        array(
+                        'mauticContent' => $this->mauticContent,
+                    ],
+                    'flashes' => [
+                        [
                             'type'    => 'error',
                             'msg'     => $this->langStringBase.'.error.notfound',
-                            'msgVars' => array('%id%' => $objectId)
-                        )
-                    )
-                )
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ]
             );
         } elseif (!$security->hasEntityAccess($this->permissionBase.':viewown', $this->permissionBase.':viewother', $entity->getCreatedBy())) {
             return $this->accessDenied();
@@ -417,13 +417,13 @@ protected function viewStandard($objectId, $logObject= null, $logBundle =  null,
         }
 
         // Audit log entries
-        $logs = ($logObject) ? $this->getModel('core.auditLog')->getLogForObject($logObject, $objectId, $entity->getDateAdded(), 10, $logBundle) : array();
+        $logs = ($logObject) ? $this->getModel('core.auditLog')->getLogForObject($logObject, $objectId, $entity->getDateAdded(), 10, $logBundle) : [];
 
         // Generate route
-        $routeVars = array(
+        $routeVars = [
             'objectAction' => 'view',
-            'objectId'     => $entity->getId()
-        );
+            'objectId'     => $entity->getId(),
+        ];
         if ($listPage !== null) {
             $routeVars['listPage'] = $listPage;
         }
@@ -432,13 +432,13 @@ protected function viewStandard($objectId, $logObject= null, $logBundle =  null,
             $routeVars
         );
 
-        $delegateArgs = array(
-            'viewParameters'  => array(
+        $delegateArgs = [
+            'viewParameters' => [
                 'item'        => $entity,
                 'logs'        => $logs,
                 'tmpl'        => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                 'permissions' => $security->isGranted(
-                    array(
+                    [
                         $this->permissionBase.':view',
                         $this->permissionBase.':viewown',
                         $this->permissionBase.':viewother',
@@ -451,20 +451,20 @@ protected function viewStandard($objectId, $logObject= null, $logBundle =  null,
                         $this->permissionBase.':deleteother',
                         $this->permissionBase.':publish',
                         $this->permissionBase.':publishown',
-                        $this->permissionBase.':publishother'
-                    ),
-                    "RETURN_ARRAY",
+                        $this->permissionBase.':publishother',
+                    ],
+                    'RETURN_ARRAY',
                     null,
                     true
                 ),
-            ),
+            ],
             'contentTemplate' => $this->templateBase.':details.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => $this->activeLink,
                 'mauticContent' => $this->mauticContent,
-                'route'         => $route
-            )
-        );
+                'route'         => $route,
+            ],
+        ];
 
         // Allow inherited class to adjust
         if (method_exists($this, 'customizeViewArguments')) {
@@ -475,7 +475,7 @@ protected function viewStandard($objectId, $logObject= null, $logBundle =  null,
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|Response
      */
@@ -491,7 +491,7 @@ protected function newStandard()
         //set the page we came from
         $page = $this->get('session')->get($this->sessionBase.'.page', 1);
 
-        $action = $this->generateUrl($this->routeBase.'_action', array('objectAction' => 'new'));
+        $action = $this->generateUrl($this->routeBase.'_action', ['objectAction' => 'new']);
         $form   = $model->createForm($entity, $this->get('form.factory'), $action);
 
         ///Check for a submitted form and process it
@@ -513,58 +513,58 @@ protected function newStandard()
                         }
 
                         if (method_exists($this, 'viewAction')) {
-                            $viewParameters = array('objectId' => $entity->getId(), 'objectAction' => 'view');
+                            $viewParameters = ['objectId' => $entity->getId(), 'objectAction' => 'view'];
                             $returnUrl      = $this->generateUrl($this->routeBase.'_action', $viewParameters);
                             $template       = $this->templateBase.':view';
                         } else {
-                            $viewParameters = array('page' => $page);
+                            $viewParameters = ['page' => $page];
                             $returnUrl      = $this->generateUrl($this->routeBase.'_index', $viewParameters);
                             $template       = $this->templateBase.':index';
                         }
                     }
                 }
             } else {
-                $viewParameters = array('page' => $page);
+                $viewParameters = ['page' => $page];
                 $returnUrl      = $this->generateUrl($this->routeBase.'_index', $viewParameters);
                 $template       = $this->templateBase.':index';
             }
 
             if ($cancelled || ($valid && !$this->isFormApplied($form))) {
                 return $this->postActionRedirect(
-                    array(
+                    [
                         'returnUrl'       => $returnUrl,
                         'viewParameters'  => $viewParameters,
                         'contentTemplate' => $template,
-                        'passthroughVars' => array(
+                        'passthroughVars' => [
                             'activeLink'    => $this->activeLink,
-                            'mauticContent' => $this->mauticContent
-                        )
-                    )
+                            'mauticContent' => $this->mauticContent,
+                        ],
+                    ]
                 );
             } elseif ($valid && $this->isFormApplied($form)) {
                 return $this->editAction($entity->getId(), true);
             }
         }
 
-        $delegateArgs = array(
-            'viewParameters'  => array(
-                'tmpl'  => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
+        $delegateArgs = [
+            'viewParameters' => [
+                'tmpl'   => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                 'entity' => $entity,
-                'form'  => $form->createView()
-            ),
+                'form'   => $form->createView(),
+            ],
             'contentTemplate' => $this->templateBase.':form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => $this->activeLink,
                 'mauticContent' => $this->mauticContent,
                 'route'         => $this->generateUrl(
                     $this->routeBase.'_action',
-                    array(
+                    [
                         'objectAction' => (!empty($valid) ? 'edit' : 'new'), //valid means a new form was applied
-                        'objectId'     => $entity->getId()
-                    )
-                )
-            )
-        );
+                        'objectId'     => $entity->getId(),
+                    ]
+                ),
+            ],
+        ];
 
         // Allow inherited class to adjust
         if (method_exists($this, 'customizeViewArguments')) {
@@ -575,7 +575,7 @@ protected function newStandard()
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -585,14 +585,14 @@ protected function newStandard()
     protected function editStandard($objectId, $ignorePost = false)
     {
         $isClone = false;
-        $model  = $this->getModel($this->modelName);
+        $model   = $this->getModel($this->modelName);
         if (is_object($objectId)) {
             $entity   = $objectId;
             $isClone  = true;
             $objectId = 'mautic_'.sha1(uniqid(mt_rand(), true));
         } elseif (strpos($objectId, 'mautic_') !== false) {
             $isClone = true;
-            $entity = $model->getEntity();
+            $entity  = $model->getEntity();
         } else {
             $entity = $model->getEntity($objectId);
         }
@@ -601,34 +601,34 @@ protected function editStandard($objectId, $ignorePost = false)
         $page = $this->get('session')->get($this->sessionBase.'.page', 1);
 
         //set the return URL
-        $returnUrl = $this->generateUrl($this->routeBase.'_index', array('page' => $page));
+        $returnUrl = $this->generateUrl($this->routeBase.'_index', ['page' => $page]);
 
-        $viewParameters = array('page' => $page);
+        $viewParameters = ['page' => $page];
         $template       = $this->templateBase.':index';
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'viewParameters'  => $viewParameters,
             'contentTemplate' => $template,
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => $this->activeLink,
-                'mauticContent' => $this->mauticContent
-            )
-        );
+                'mauticContent' => $this->mauticContent,
+            ],
+        ];
 
         //form not found
         if ($entity === null) {
             return $this->postActionRedirect(
                 array_merge(
                     $postActionVars,
-                    array(
-                        'flashes' => array(
-                            array(
+                    [
+                        'flashes' => [
+                            [
                                 'type'    => 'error',
                                 'msg'     => $this->langStringBase.'.error.notfound',
-                                'msgVars' => array('%id%' => $objectId)
-                            )
-                        )
-                    )
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
+                    ]
                 )
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -643,7 +643,7 @@ protected function editStandard($objectId, $ignorePost = false)
             return $this->isLocked($postActionVars, $entity, $this->modelName);
         }
 
-        $action = $this->generateUrl($this->routeBase.'_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action = $this->generateUrl($this->routeBase.'_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $form   = $model->createForm($entity, $this->get('form.factory'), $action);
 
         ///Check for a submitted form and process it
@@ -666,21 +666,21 @@ protected function editStandard($objectId, $ignorePost = false)
 
                         $this->addFlash(
                             'mautic.core.notice.updated',
-                            array(
+                            [
                                 '%name%'      => $entity->getName(),
                                 '%menu_link%' => $this->routeBase.'_index',
                                 '%url%'       => $this->generateUrl(
                                     $this->routeBase.'_action',
-                                    array(
+                                    [
                                         'objectAction' => 'edit',
-                                        'objectId'     => $entity->getId()
-                                    )
-                                )
-                            )
+                                        'objectId'     => $entity->getId(),
+                                    ]
+                                ),
+                            ]
                         );
 
                         if (!$this->isFormApplied($form) && method_exists($this, 'viewAction')) {
-                            $viewParameters = array('objectId' => $entity->getId(), 'objectAction' => 'view');
+                            $viewParameters = ['objectId' => $entity->getId(), 'objectAction' => 'view'];
                             $returnUrl      = $this->generateUrl($this->routeBase.'_action', $viewParameters);
                             $template       = $this->templateBase.':view';
                         }
@@ -692,7 +692,7 @@ protected function editStandard($objectId, $ignorePost = false)
                     $model->unlockEntity($entity);
                 }
 
-                $viewParameters = array('page' => $page);
+                $viewParameters = ['page' => $page];
                 $returnUrl      = $this->generateUrl($this->routeBase.'_index', $viewParameters);
                 $template       = $this->templateBase.':index';
             }
@@ -701,11 +701,11 @@ protected function editStandard($objectId, $ignorePost = false)
                 return $this->postActionRedirect(
                     array_merge(
                         $postActionVars,
-                        array(
+                        [
                             'returnUrl'       => $returnUrl,
                             'viewParameters'  => $viewParameters,
-                            'contentTemplate' => $template
-                        )
+                            'contentTemplate' => $template,
+                        ]
                     )
                 );
             } elseif ($valid) {
@@ -717,25 +717,25 @@ protected function editStandard($objectId, $ignorePost = false)
             $model->lockEntity($entity);
         }
 
-        $delegateArgs = array(
-            'viewParameters'  => array(
-                'tmpl'  => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
-                'entity'  => $entity,
-                'form'  => $form->createView()
-            ),
+        $delegateArgs = [
+            'viewParameters' => [
+                'tmpl'   => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
+                'entity' => $entity,
+                'form'   => $form->createView(),
+            ],
             'contentTemplate' => $this->templateBase.':form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => $this->activeLink,
                 'mauticContent' => $this->mauticContent,
                 'route'         => $this->generateUrl(
                     $this->routeBase.'_action',
-                    array(
+                    [
                         'objectAction' => 'edit',
-                        'objectId'     => $entity->getId()
-                    )
-                )
-            )
-        );
+                        'objectId'     => $entity->getId(),
+                    ]
+                ),
+            ],
+        ];
 
         // Allow inherited class to adjust
         if (method_exists($this, 'customizeViewArguments')) {
@@ -746,7 +746,7 @@ protected function editStandard($objectId, $ignorePost = false)
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -785,7 +785,7 @@ protected function cloneStandard($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -794,29 +794,29 @@ protected function cloneStandard($objectId)
     protected function deleteStandard($objectId)
     {
         $page      = $this->get('session')->get($this->sessionBase.'.page', 1);
-        $returnUrl = $this->generateUrl($this->routeBase.'_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl($this->routeBase.'_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => $this->templateBase.':index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => $this->activeLink,
-                'mauticContent' => $this->mauticContent
-            )
-        );
+                'mauticContent' => $this->mauticContent,
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model  = $this->getModel($this->modelName);
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => $this->langStringBase.'.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 $this->permissionBase.':deleteown',
                 $this->permissionBase.':deleteother',
@@ -831,62 +831,62 @@ protected function deleteStandard($objectId)
             $model->deleteEntity($entity);
 
             $identifier = $this->get('translator')->trans($entity->getName());
-            $flashes[]  = array(
+            $flashes[]  = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $identifier,
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => $flashes
-                )
+                [
+                    'flashes' => $flashes,
+                ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     protected function batchDeleteStandard()
     {
         $page      = $this->get('session')->get($this->sessionBase.'.page', 1);
-        $returnUrl = $this->generateUrl($this->routeBase.'_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl($this->routeBase.'_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => $this->templateBase.':index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => $this->activeLink,
-                'mauticContent' => $this->mauticContent
-            )
-        );
+                'mauticContent' => $this->mauticContent,
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model     = $this->getModel($this->modelName);
             $ids       = json_decode($this->request->query->get('ids', ''));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => $this->langStringBase.'.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     $this->permissionBase.':deleteown',
                     $this->permissionBase.':deleteother',
@@ -905,23 +905,23 @@ protected function batchDeleteStandard()
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'notice',
                     'msg'     => $this->langStringBase.'.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => $flashes
-                )
+                [
+                    'flashes' => $flashes,
+                ]
             )
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Controller/JsController.php b/app/bundles/CoreBundle/Controller/JsController.php
index d8fb27e1d9a..a6f1eefcae4 100644
--- a/app/bundles/CoreBundle/Controller/JsController.php
+++ b/app/bundles/CoreBundle/Controller/JsController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class JsController
+ * Class JsController.
  */
 class JsController extends CommonController
 {
@@ -24,18 +25,18 @@ class JsController extends CommonController
     public function indexAction()
     {
         $dispatcher = $this->dispatcher;
-        $debug = $this->factory->getKernel()->isDebug();
-        $event = new BuildJsEvent($this->getJsHeader(), $debug);
+        $debug      = $this->factory->getKernel()->isDebug();
+        $event      = new BuildJsEvent($this->getJsHeader(), $debug);
 
         if ($dispatcher->hasListeners(CoreEvents::BUILD_MAUTIC_JS)) {
             $dispatcher->dispatch(CoreEvents::BUILD_MAUTIC_JS, $event);
         }
 
-        return new Response($event->getJs(), 200, array('Content-Type' => 'application/javascript'));
+        return new Response($event->getJs(), 200, ['Content-Type' => 'application/javascript']);
     }
 
     /**
-     * Build a JS header for the Mautic embedded JS
+     * Build a JS header for the Mautic embedded JS.
      *
      * @return string
      */
@@ -53,4 +54,4 @@ protected function getJsHeader()
  */
 JS;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Controller/MauticController.php b/app/bundles/CoreBundle/Controller/MauticController.php
index 1ae836645cb..a05deb5b32a 100644
--- a/app/bundles/CoreBundle/Controller/MauticController.php
+++ b/app/bundles/CoreBundle/Controller/MauticController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,14 +13,14 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Interface MauticController
+ * Interface MauticController.
  *
  * A dummy interface to ensure that only Mautic bundles are affected by Mautic onKernelController events
  */
 interface MauticController
 {
     /**
-     * Initialize the controller
+     * Initialize the controller.
      *
      * @param FilterControllerEvent $event
      *
diff --git a/app/bundles/CoreBundle/Controller/SubscribedEvents/BuilderTokenController.php b/app/bundles/CoreBundle/Controller/SubscribedEvents/BuilderTokenController.php
index b221256e7df..52ed85fc7d2 100644
--- a/app/bundles/CoreBundle/Controller/SubscribedEvents/BuilderTokenController.php
+++ b/app/bundles/CoreBundle/Controller/SubscribedEvents/BuilderTokenController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class BuilderTokenController
+ * Class BuilderTokenController.
  */
 abstract class BuilderTokenController extends FormController
 {
@@ -39,10 +40,10 @@ public function indexAction($page = 1)
 
         $arguments = $this->getEntityArguments();
 
-        $dataArray = array(
+        $dataArray = [
             'newContent'    => $tokenHelper->getTokenContent($page, $arguments),
-            'mauticContent' => 'builder'
-        );
+            'mauticContent' => 'builder',
+        ];
 
         $response = new JsonResponse($dataArray);
 
@@ -62,25 +63,16 @@ protected function getViewPermissionBase()
         return null;
     }
 
-    /**
-     * @return null
-     */
     protected function getBundleName()
     {
         return null;
     }
 
-    /**
-     * @return null
-     */
     protected function getLangVar()
     {
         return null;
     }
 
-    /**
-     * @return null
-     */
     protected function getPermissionSet()
     {
         return null;
@@ -91,6 +83,6 @@ protected function getPermissionSet()
      */
     protected function getEntityArguments()
     {
-        return array();
+        return [];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Controller/ThemeController.php b/app/bundles/CoreBundle/Controller/ThemeController.php
index 6d88d011002..913d218ec5e 100644
--- a/app/bundles/CoreBundle/Controller/ThemeController.php
+++ b/app/bundles/CoreBundle/Controller/ThemeController.php
@@ -1,27 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Controller;
 
-use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\InputHelper;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Form\FormError;
 
 /**
- * Class ThemeController
+ * Class ThemeController.
  */
 class ThemeController extends FormController
 {
     /**
-     * Default themes which cannot be deleted
+     * Default themes which cannot be deleted.
      *
      * @var array
      */
@@ -37,17 +37,17 @@ public function indexAction()
             'core:themes:view',
             'core:themes:create',
             'core:themes:edit',
-            'core:themes:delete'
-        ], "RETURN_ARRAY");
+            'core:themes:delete',
+        ], 'RETURN_ARRAY');
 
         if (!$permissions['core:themes:view']) {
             return $this->accessDenied();
         }
 
-        $themeHelper   = $this->container->get('mautic.helper.theme');
-        $dir           = $this->factory->getSystemPath('themes', true);
-        $action        = $this->generateUrl('mautic_themes_index');
-        $form          = $this->get('form.factory')->create('theme_upload', [], ['action' => $action]);
+        $themeHelper = $this->container->get('mautic.helper.theme');
+        $dir         = $this->factory->getSystemPath('themes', true);
+        $action      = $this->generateUrl('mautic_themes_index');
+        $form        = $this->get('form.factory')->create('theme_upload', [], ['action' => $action]);
 
         if ($this->request->getMethod() == 'POST') {
             if (isset($form) && !$cancelled = $this->isFormCancelled($form)) {
@@ -86,24 +86,24 @@ public function indexAction()
         }
 
         return $this->delegateView([
-            'viewParameters'  => [
+            'viewParameters' => [
                 'items'         => $themeHelper->getInstalledThemes('all', true, true),
                 'defaultThemes' => $this->defaultThemes,
                 'form'          => $form->createView(),
                 'permissions'   => $permissions,
-                'security'      => $this->get('mautic.security')
+                'security'      => $this->get('mautic.security'),
             ],
             'contentTemplate' => 'MauticCoreBundle:Theme:list.html.php',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_themes_index',
                 'mauticContent' => 'theme',
-                'route'         => $this->generateUrl('mautic_themes_index')
-            ]
+                'route'         => $this->generateUrl('mautic_themes_index'),
+            ],
         ]);
     }
 
     /**
-     * Download a theme
+     * Download a theme.
      *
      * @param string $themeName
      *
@@ -123,26 +123,25 @@ public function downloadAction($themeName)
             $flashes[] = [
                 'type'    => 'error',
                 'msg'     => 'mautic.core.theme.error.notfound',
-                'msgVars' => ['%theme%' => $themeName]
+                'msgVars' => ['%theme%' => $themeName],
             ];
             $error = true;
         }
 
-
         try {
             $zipPath = $themeHelper->zip($themeName);
         } catch (\Exception $e) {
             $flashes[] = [
-                'type'    => 'error',
-                'msg'     => $e->getMessage()
+                'type' => 'error',
+                'msg'  => $e->getMessage(),
             ];
             $error = true;
         }
 
         if (!$error && !$zipPath) {
             $flashes[] = [
-                'type'    => 'error',
-                'msg'     => 'mautic.core.permission.issue'
+                'type' => 'error',
+                'msg'  => 'mautic.core.permission.issue',
             ];
             $error = true;
         }
@@ -150,7 +149,7 @@ public function downloadAction($themeName)
         if ($error) {
             return $this->postActionRedirect(
                 array_merge($this->getIndexPostActionVars(), [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ])
             );
         }
@@ -171,13 +170,13 @@ public function downloadAction($themeName)
     }
 
     /**
-     * Deletes the theme
+     * Deletes the theme.
      *
      * @param string $themeName
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteAction ($themeName)
+    public function deleteAction($themeName)
     {
         $flashes = [];
 
@@ -187,17 +186,17 @@ public function deleteAction ($themeName)
 
         return $this->postActionRedirect(
             array_merge($this->getIndexPostActionVars(), [
-                'flashes' => $flashes
+                'flashes' => $flashes,
             ])
         );
     }
 
     /**
-     * Deletes a group of themes
+     * Deletes a group of themes.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function batchDeleteAction ()
+    public function batchDeleteAction()
     {
         $flashes = [];
 
@@ -211,17 +210,18 @@ public function batchDeleteAction ()
 
         return $this->postActionRedirect(
             array_merge($this->getIndexPostActionVars(), [
-                'flashes' => $flashes
+                'flashes' => $flashes,
             ])
         );
     }
 
     /**
-     * Deletes a theme
+     * Deletes a theme.
      *
      * @return array
      */
-    public function deleteTheme($themeName) {
+    public function deleteTheme($themeName)
+    {
         $flashes     = [];
         $themeHelper = $this->container->get('mautic.helper.theme');
 
@@ -229,7 +229,7 @@ public function deleteTheme($themeName) {
             $flashes[] = [
                 'type'    => 'error',
                 'msg'     => 'mautic.core.theme.error.notfound',
-                'msgVars' => ['%theme%' => $themeName]
+                'msgVars' => ['%theme%' => $themeName],
             ];
         } elseif (!$this->get('mautic.security')->isGranted('core:themes:delete')) {
             return $this->accessDenied();
@@ -237,10 +237,9 @@ public function deleteTheme($themeName) {
             $flashes[] = [
                 'type'    => 'error',
                 'msg'     => 'mautic.core.theme.cannot.be.removed',
-                'msgVars' => ['%theme%' => $themeName]
+                'msgVars' => ['%theme%' => $themeName],
             ];
         } else {
-
             try {
                 $theme = $themeHelper->getTheme($themeName);
                 $themeHelper->delete($themeName);
@@ -248,7 +247,7 @@ public function deleteTheme($themeName) {
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.core.error.delete.error',
-                    'msgVars' => ['%error%' => $e->getMessage()]
+                    'msgVars' => ['%error%' => $e->getMessage()],
                 ];
             }
 
@@ -257,8 +256,8 @@ public function deleteTheme($themeName) {
                 'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $theme->getName(),
-                    '%id%'   => $themeName
-                ]
+                    '%id%'   => $themeName,
+                ],
             ];
         }
 
@@ -266,7 +265,7 @@ public function deleteTheme($themeName) {
     }
 
     /**
-     * A helper method to keep the code DRY
+     * A helper method to keep the code DRY.
      *
      * @return array
      */
@@ -277,8 +276,8 @@ public function getIndexPostActionVars()
             'contentTemplate' => 'MauticCoreBundle:theme:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_themes_index',
-                'mauticContent' => 'theme'
-            ]
+                'mauticContent' => 'theme',
+            ],
         ];
     }
 }
diff --git a/app/bundles/CoreBundle/Controller/UpdateController.php b/app/bundles/CoreBundle/Controller/UpdateController.php
index 24ffce3b158..94c1d843bb3 100644
--- a/app/bundles/CoreBundle/Controller/UpdateController.php
+++ b/app/bundles/CoreBundle/Controller/UpdateController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,14 +14,13 @@
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 
-
 /**
- * Class UpdateController
+ * Class UpdateController.
  */
 class UpdateController extends CommonController
 {
     /**
-     * Generates the update view
+     * Generates the update view.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -34,17 +34,17 @@ public function indexAction()
         $updateHelper = $this->factory->getHelper('update');
         $updateData   = $updateHelper->fetchData();
 
-        return $this->delegateView(array(
-            'viewParameters'  =>  array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'updateData'     => $updateData,
-                'currentVersion' => $this->factory->getVersion()
-            ),
+                'currentVersion' => $this->factory->getVersion(),
+            ],
             'contentTemplate' => 'MauticCoreBundle:Update:index.html.php',
-            'passthroughVars' => array(
-                'mauticContent'  => 'update',
-                'route'          => $this->generateUrl('mautic_core_update')
-            )
-        ));
+            'passthroughVars' => [
+                'mauticContent' => 'update',
+                'route'         => $this->generateUrl('mautic_core_update'),
+            ],
+        ]);
     }
 
     /**
@@ -59,11 +59,11 @@ public function schemaAction()
         $result       = 0;
         $failed       = false;
         $noMigrations = true;
-        $iterator     = new \FilesystemIterator($this->container->getParameter('kernel.root_dir') . '/migrations', \FilesystemIterator::SKIP_DOTS);
+        $iterator     = new \FilesystemIterator($this->container->getParameter('kernel.root_dir').'/migrations', \FilesystemIterator::SKIP_DOTS);
 
         if (iterator_count($iterator)) {
             $env  = $this->factory->getEnvironment();
-            $args = array('console', 'doctrine:migrations:migrate', '--no-interaction', '--env='.$env);
+            $args = ['console', 'doctrine:migrations:migrate', '--no-interaction', '--env='.$env];
 
             if ($env == 'prod') {
                 $args[] = '--no-debug';
@@ -83,30 +83,30 @@ public function schemaAction()
 
         if ($result !== 0) {
             // Log the output
-            $outputBuffer = trim(preg_replace('/\n\s*\n/s', " \\ ", $outputBuffer));
+            $outputBuffer = trim(preg_replace('/\n\s*\n/s', ' \\ ', $outputBuffer));
             $outputBuffer = preg_replace('/\s\s+/', ' ', trim($outputBuffer));
-            $this->factory->getLogger()->log('error', '[UPGRADE ERROR] Exit code ' . $result . '; ' . $outputBuffer);
+            $this->factory->getLogger()->log('error', '[UPGRADE ERROR] Exit code '.$result.'; '.$outputBuffer);
 
             $failed = true;
         } elseif ($this->request->get('update', 0)) {
             // This was a retry from the update so call up the finalizeAction to finish the process
             $this->forward('MauticCoreBundle:Ajax:updateFinalization',
-                array(
-                    'request'  => $this->request
-                )
+                [
+                    'request' => $this->request,
+                ]
             );
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  =>  array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'failed'       => $failed,
-                'noMigrations' => $noMigrations
-            ),
+                'noMigrations' => $noMigrations,
+            ],
             'contentTemplate' => 'MauticCoreBundle:Update:schema.html.php',
-            'passthroughVars' => array(
-                'mauticContent'  => 'update',
-                'route'          => $this->generateUrl('mautic_core_update_schema')
-            )
-        ));
+            'passthroughVars' => [
+                'mauticContent' => 'update',
+                'route'         => $this->generateUrl('mautic_core_update_schema'),
+            ],
+        ]);
     }
 }
diff --git a/app/bundles/CoreBundle/Controller/VariantAjaxControllerTrait.php b/app/bundles/CoreBundle/Controller/VariantAjaxControllerTrait.php
index 9523a554c05..a29659d800b 100644
--- a/app/bundles/CoreBundle/Controller/VariantAjaxControllerTrait.php
+++ b/app/bundles/CoreBundle/Controller/VariantAjaxControllerTrait.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-namespace Mautic\CoreBundle\Controller;
 
+namespace Mautic\CoreBundle\Controller;
 
 use Mautic\CoreBundle\Helper\InputHelper;
 use Symfony\Component\HttpFoundation\Request;
@@ -26,16 +27,16 @@ trait VariantAjaxControllerTrait
      */
     private function getAbTestForm(Request $request, $modelName, $abSettingsFormName, $parentFormName, $abFormTemplate, $formThemes = [])
     {
-        $dataArray = array(
+        $dataArray = [
             'success' => 0,
-            'html'    => ''
-        );
-        $type      = InputHelper::clean($request->request->get('abKey'));
+            'html'    => '',
+        ];
+        $type = InputHelper::clean($request->request->get('abKey'));
         $id   = InputHelper::int($request->request->get('id'));
 
         if (!empty($type)) {
             //get the HTML for the form
-            $model = $this->getModel($modelName);
+            $model  = $this->getModel($modelName);
             $entity = $model->getEntity($id);
 
             $abTestComponents = $model->getBuilderComponents($entity, 'abTestWinnerCriteria');
@@ -45,31 +46,31 @@ private function getAbTestForm(Request $request, $modelName, $abSettingsFormName
                 $html     = '';
                 $formType = (!empty($abTestSettings[$type]['formType'])) ? $abTestSettings[$type]['formType'] : '';
                 if (!empty($formType)) {
-                    $formOptions = (!empty($abTestSettings[$type]['formTypeOptions'])) ? $abTestSettings[$type]['formTypeOptions'] : array();
+                    $formOptions = (!empty($abTestSettings[$type]['formTypeOptions'])) ? $abTestSettings[$type]['formTypeOptions'] : [];
                     $form        = $this->get('form.factory')->create(
                         $abSettingsFormName,
-                        array(),
-                        array('formType' => $formType, 'formTypeOptions' => $formOptions)
+                        [],
+                        ['formType' => $formType, 'formTypeOptions' => $formOptions]
                     );
-                    $html        = $this->renderView(
+                    $html = $this->renderView(
                         $abFormTemplate,
-                        array(
-                            'form' => $this->setFormTheme($form, $formThemes)
-                        )
+                        [
+                            'form' => $this->setFormTheme($form, $formThemes),
+                        ]
                     );
                 }
 
-                $html                 = str_replace(
-                    array(
+                $html = str_replace(
+                    [
                         "{$abSettingsFormName}[",
                         "{$abSettingsFormName}_",
-                        $abSettingsFormName
-                    ),
-                    array(
+                        $abSettingsFormName,
+                    ],
+                    [
                         "{$parentFormName}[variantSettings][",
                         "{$parentFormName}_variantSettings_",
-                        $parentFormName
-                    ),
+                        $parentFormName,
+                    ],
                     $html
                 );
                 $dataArray['html']    = $html;
@@ -79,4 +80,4 @@ private function getAbTestForm(Request $request, $modelName, $abSettingsFormName
 
         return $this->sendJsonResponse($dataArray);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/CoreEvents.php b/app/bundles/CoreBundle/CoreEvents.php
index a69aac45529..5faaa8387d5 100644
--- a/app/bundles/CoreBundle/CoreEvents.php
+++ b/app/bundles/CoreBundle/CoreEvents.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle;
 
 /**
- * Class CoreEvents
+ * Class CoreEvents.
  */
 final class CoreEvents
 {
@@ -24,7 +25,7 @@ final class CoreEvents
     const BUILD_MENU = 'mautic.build_menu';
 
     /**
-     * The mautic.build_route event is thrown to build Mautic bundle routes
+     * The mautic.build_route event is thrown to build Mautic bundle routes.
      *
      * The event listener receives a Mautic\CoreBundle\Event\RouteEvent instance.
      *
@@ -33,7 +34,7 @@ final class CoreEvents
     const BUILD_ROUTE = 'mautic.build_route';
 
     /**
-     * The mautic.global_search event is thrown to build global search results from applicable bundles
+     * The mautic.global_search event is thrown to build global search results from applicable bundles.
      *
      * The event listener receives a Mautic\CoreBundle\Event\GlobalSearchEvent instance.
      *
@@ -42,7 +43,7 @@ final class CoreEvents
     const GLOBAL_SEARCH = 'mautic.global_search';
 
     /**
-     * The mautic.build_command_list event is thrown to build global search's autocomplete list
+     * The mautic.build_command_list event is thrown to build global search's autocomplete list.
      *
      * The event listener receives a Mautic\CoreBundle\Event\CommandListEvent instance.
      *
@@ -60,7 +61,7 @@ final class CoreEvents
     const FETCH_ICONS = 'mautic.on_fetch_icons';
 
     /**
-     * The mautic.build_canvas_content event is dispatched to populate the content for the right panel
+     * The mautic.build_canvas_content event is dispatched to populate the content for the right panel.
      *
      * The event listener receives a Mautic\CoreBundle\Event\SidebarCanvasEvent instance.
      *
@@ -87,7 +88,7 @@ final class CoreEvents
     const POST_UPGRADE = 'mautic.post_upgrade';
 
     /**
-     * The mautic.build_embeddable_js event is dispatched to allow plugins to extend the mautic tracking js
+     * The mautic.build_embeddable_js event is dispatched to allow plugins to extend the mautic tracking js.
      *
      * The event listener receives a Mautic\CoreBundle\Event\BuildJsEvent instance.
      *
@@ -96,7 +97,7 @@ final class CoreEvents
     const BUILD_MAUTIC_JS = 'mautic.build_embeddable_js';
 
     /**
-     * The mautic.maintenance_cleanup_data event is dispatched to purge old data
+     * The mautic.maintenance_cleanup_data event is dispatched to purge old data.
      *
      * The event listener receives a Mautic\CoreBundle\Event\MaintenanceEvent instance.
      *
@@ -105,7 +106,7 @@ final class CoreEvents
     const MAINTENANCE_CLEANUP_DATA = 'mautic.maintenance_cleanup_data';
 
     /**
-     * The mautic.channel_broadcast event is dispatched by the mautic:send:broadcast command to process communication to pending contacts
+     * The mautic.channel_broadcast event is dispatched by the mautic:send:broadcast command to process communication to pending contacts.
      *
      * The event listener receives a Mautic\CoreBundle\Event\ChannelBroadcastEvent instance.
      *
@@ -114,7 +115,7 @@ final class CoreEvents
     const CHANNEL_BROADCAST = 'mautic.channel_broadcast';
 
     /**
-     * The mautic.message_queued event is dispatched to save a message to the queue
+     * The mautic.message_queued event is dispatched to save a message to the queue.
      *
      * The event listener receives a Mautic\CoreBundle\Event\MessageQueueEvent instance.
      *
@@ -132,7 +133,7 @@ final class CoreEvents
     const PROCESS_MESSAGE_QUEUE = 'mautic.process_message_queue';
 
     /**
-     * The mautic.process_message_queue_batch event is dispatched to process a batch of messages by channel and channel ID
+     * The mautic.process_message_queue_batch event is dispatched to process a batch of messages by channel and channel ID.
      *
      * The event listener receives a Mautic\CoreBundle\Event\MessageQueueBatchProcessEvent instance.
      *
diff --git a/app/bundles/CoreBundle/DependencyInjection/Compiler/ConfiguratorPass.php b/app/bundles/CoreBundle/DependencyInjection/Compiler/ConfiguratorPass.php
index 8b9c30441c8..6a020c796c8 100644
--- a/app/bundles/CoreBundle/DependencyInjection/Compiler/ConfiguratorPass.php
+++ b/app/bundles/CoreBundle/DependencyInjection/Compiler/ConfiguratorPass.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Class ConfiguratorPass
+ * Class ConfiguratorPass.
  */
 class ConfiguratorPass implements CompilerPassInterface
 {
@@ -31,7 +32,7 @@ public function process(ContainerBuilder $container)
 
         foreach ($container->findTaggedServiceIds('mautic.configurator.step') as $id => $tags) {
             $priority = isset($tags[0]['priority']) ? $tags[0]['priority'] : 0;
-            $configuratorDef->addMethodCall('addStep', array(new Reference($id), $priority));
+            $configuratorDef->addMethodCall('addStep', [new Reference($id), $priority]);
         }
     }
 }
diff --git a/app/bundles/CoreBundle/DependencyInjection/Compiler/EventPass.php b/app/bundles/CoreBundle/DependencyInjection/Compiler/EventPass.php
index a6569db81f4..dc284e7b6bc 100644
--- a/app/bundles/CoreBundle/DependencyInjection/Compiler/EventPass.php
+++ b/app/bundles/CoreBundle/DependencyInjection/Compiler/EventPass.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\DependencyInjection\Compiler;
 
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\WebhookBundle\EventListener\WebhookSubscriberBase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class EventPass
+ * Class EventPass.
  */
 class EventPass implements CompilerPassInterface
 {
@@ -34,30 +35,30 @@ public function process(ContainerBuilder $container)
                 continue;
             }
 
-            $definition->addMethodCall('setTemplating', array(new Reference('mautic.helper.templating')));
-            $definition->addMethodCall('setRequest', array(new Reference('request_stack')));
-            $definition->addMethodCall('setSecurity', array(new Reference('mautic.security')));
-            $definition->addMethodCall('setSerializer', array(new Reference('jms_serializer')));
-            $definition->addMethodCall('setSystemParameters', array(new Parameter('mautic.parameters')));
-            $definition->addMethodCall('setDispatcher', array(new Reference('event_dispatcher')));
-            $definition->addMethodCall('setTranslator', array(new Reference('translator')));
-            $definition->addMethodCall('setEntityManager', array(new Reference('doctrine.orm.entity_manager')));
-            $definition->addMethodCall('setRouter', array(new Reference('router')));
+            $definition->addMethodCall('setTemplating', [new Reference('mautic.helper.templating')]);
+            $definition->addMethodCall('setRequest', [new Reference('request_stack')]);
+            $definition->addMethodCall('setSecurity', [new Reference('mautic.security')]);
+            $definition->addMethodCall('setSerializer', [new Reference('jms_serializer')]);
+            $definition->addMethodCall('setSystemParameters', [new Parameter('mautic.parameters')]);
+            $definition->addMethodCall('setDispatcher', [new Reference('event_dispatcher')]);
+            $definition->addMethodCall('setTranslator', [new Reference('translator')]);
+            $definition->addMethodCall('setEntityManager', [new Reference('doctrine.orm.entity_manager')]);
+            $definition->addMethodCall('setRouter', [new Reference('router')]);
 
-            $class = $definition->getClass();
+            $class     = $definition->getClass();
             $reflected = new \ReflectionClass($class);
-            
+
             if ($reflected->hasProperty('logger')) {
-                $definition->addMethodCall('setLogger', array(new Reference('monolog.logger.mautic')));
+                $definition->addMethodCall('setLogger', [new Reference('monolog.logger.mautic')]);
             }
-            
+
             // Temporary, for development purposes
             if ($reflected->hasProperty('factory')) {
-                $definition->addMethodCall('setFactory', array(new Reference('mautic.factory')));
+                $definition->addMethodCall('setFactory', [new Reference('mautic.factory')]);
             }
 
             if (in_array(WebhookSubscriberBase::class, $classParents)) {
-                $definition->addMethodCall('setWebhookModel', array(new Reference('mautic.webhook.model.webhook')));
+                $definition->addMethodCall('setWebhookModel', [new Reference('mautic.webhook.model.webhook')]);
             }
 
             $definition->addMethodCall('init');
diff --git a/app/bundles/CoreBundle/DependencyInjection/Compiler/ModelPass.php b/app/bundles/CoreBundle/DependencyInjection/Compiler/ModelPass.php
index b37548df90b..6d680f2a1b6 100644
--- a/app/bundles/CoreBundle/DependencyInjection/Compiler/ModelPass.php
+++ b/app/bundles/CoreBundle/DependencyInjection/Compiler/ModelPass.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Class ModelPass
+ * Class ModelPass.
  */
 class ModelPass implements CompilerPassInterface
 {
@@ -25,30 +26,30 @@ public function process(ContainerBuilder $container)
     {
         foreach ($container->findTaggedServiceIds('mautic.model') as $id => $tags) {
             $definition = $container->findDefinition($id);
-            $definition->addMethodCall('setEntityManager', array(new Reference('doctrine.orm.entity_manager')));
-            $definition->addMethodCall('setSecurity', array(new Reference('mautic.security')));
-            $definition->addMethodCall('setDispatcher', array(new Reference('event_dispatcher')));
-            $definition->addMethodCall('setTranslator', array(new Reference('translator')));
-            $definition->addMethodCall('setUser', array(new Reference('mautic.helper.user')));
+            $definition->addMethodCall('setEntityManager', [new Reference('doctrine.orm.entity_manager')]);
+            $definition->addMethodCall('setSecurity', [new Reference('mautic.security')]);
+            $definition->addMethodCall('setDispatcher', [new Reference('event_dispatcher')]);
+            $definition->addMethodCall('setTranslator', [new Reference('translator')]);
+            $definition->addMethodCall('setUser', [new Reference('mautic.helper.user')]);
 
             $modelClass = $definition->getClass();
-            $reflected = new \ReflectionClass($modelClass);
-            
+            $reflected  = new \ReflectionClass($modelClass);
+
             if ($reflected->hasMethod('setRouter')) {
-                $definition->addMethodCall('setRouter', array(new Reference('router')));
+                $definition->addMethodCall('setRouter', [new Reference('router')]);
             }
-            
+
             if ($reflected->hasMethod('setLogger')) {
-                $definition->addMethodCall('setLogger', array(new Reference('monolog.logger.mautic')));
+                $definition->addMethodCall('setLogger', [new Reference('monolog.logger.mautic')]);
             }
-            
+
             if ($reflected->hasMethod('setSession')) {
-                $definition->addMethodCall('setSession', array(new Reference('session')));
+                $definition->addMethodCall('setSession', [new Reference('session')]);
             }
-            
+
             // Temporary, for development purposes
             if ($reflected->hasProperty('factory')) {
-                $definition->addMethodCall('setFactory', array(new Reference('mautic.factory')));
+                $definition->addMethodCall('setFactory', [new Reference('mautic.factory')]);
             }
         }
     }
diff --git a/app/bundles/CoreBundle/DependencyInjection/Compiler/TemplatingPass.php b/app/bundles/CoreBundle/DependencyInjection/Compiler/TemplatingPass.php
index cf40a119d39..586a9cb51df 100644
--- a/app/bundles/CoreBundle/DependencyInjection/Compiler/TemplatingPass.php
+++ b/app/bundles/CoreBundle/DependencyInjection/Compiler/TemplatingPass.php
@@ -18,12 +18,12 @@
 
 namespace Mautic\CoreBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Class TemplatingPass
+ * Class TemplatingPass.
  */
 class TemplatingPass implements CompilerPassInterface
 {
@@ -39,11 +39,11 @@ public function process(ContainerBuilder $container)
         if ($container->hasDefinition('templating.helper.assets')) {
             //Add a addMethodCall to set factory
             $container->getDefinition('templating.helper.assets')->addMethodCall(
-                'setFactory', array(new Reference('mautic.factory'))
+                'setFactory', [new Reference('mautic.factory')]
             )->addMethodCall(
-                'setAssetHelper', array(new Reference('mautic.helper.assetgeneration'))
+                'setAssetHelper', [new Reference('mautic.helper.assetgeneration')]
             )->addMethodCall(
-                'setParamsHelper', array(new Reference('mautic.helper.core_parameters'))
+                'setParamsHelper', [new Reference('mautic.helper.core_parameters')]
             );
         }
     }
diff --git a/app/bundles/CoreBundle/DependencyInjection/Compiler/TranslationsPass.php b/app/bundles/CoreBundle/DependencyInjection/Compiler/TranslationsPass.php
index 084b70744a4..644774b4cb9 100644
--- a/app/bundles/CoreBundle/DependencyInjection/Compiler/TranslationsPass.php
+++ b/app/bundles/CoreBundle/DependencyInjection/Compiler/TranslationsPass.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\Finder\Finder;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Class TranslationsPass
+ * Class TranslationsPass.
  */
 class TranslationsPass implements CompilerPassInterface
 {
@@ -28,7 +28,7 @@ public function process(ContainerBuilder $container)
         if ($translator !== null) {
             // Disable cache for dev environment
             if (MAUTIC_ENV === 'dev') {
-                $translatorOptions = $translator->getArgument(3);
+                $translatorOptions              = $translator->getArgument(3);
                 $translatorOptions['cache_dir'] = null;
                 $translator->replaceArgument(3, $translatorOptions);
             }
diff --git a/app/bundles/CoreBundle/DependencyInjection/MauticCoreExtension.php b/app/bundles/CoreBundle/DependencyInjection/MauticCoreExtension.php
index 0f870d2b9d7..9669b900dc5 100644
--- a/app/bundles/CoreBundle/DependencyInjection/MauticCoreExtension.php
+++ b/app/bundles/CoreBundle/DependencyInjection/MauticCoreExtension.php
@@ -1,31 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\DependencyInjection;
 
-use Mautic\CoreBundle\Helper\ServiceLoaderHelper;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
 
 /**
- * Class MauticCoreExtension
+ * Class MauticCoreExtension.
  *
  * This is the class that loads and manages your bundle configuration
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class MauticCoreExtension extends Extension
 {
-
     /**
      * {@inheritdoc}
      */
@@ -35,7 +33,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         // Store menu renderer options to create unique renderering classes per menu
         // since KNP menus doesn't seem to support a Renderer factory
-        $menus = array();
+        $menus = [];
 
         foreach ($bundles as $bundle) {
             if (!empty($bundle['config']['services'])) {
@@ -72,14 +70,14 @@ public function load(array $configs, ContainerBuilder $container)
                         // Setup default menu details
                         if ($type == 'menus') {
                             $details = array_merge(
-                                array(
+                                [
                                     'class'   => 'Knp\Menu\MenuItem',
-                                    'factory' => array('@mautic.menu.builder', $details['alias'].'Menu'),
-                                ),
+                                    'factory' => ['@mautic.menu.builder', $details['alias'].'Menu'],
+                                ],
                                 $details
                             );
 
-                            $menus[$details['alias']] = (isset($details['options'])) ? $details['options'] : array();
+                            $menus[$details['alias']] = (isset($details['options'])) ? $details['options'] : [];
                         }
 
                         // Set service alias
@@ -90,11 +88,11 @@ public function load(array $configs, ContainerBuilder $container)
                         }
 
                         // Generate definition arguments
-                        $definitionArguments = array();
+                        $definitionArguments = [];
                         if (!isset($details['arguments'])) {
-                            $details['arguments'] = array();
+                            $details['arguments'] = [];
                         } elseif (!is_array($details['arguments'])) {
-                            $details['arguments'] = array($details['arguments']);
+                            $details['arguments'] = [$details['arguments']];
                         }
 
                         foreach ($details['arguments'] as $argument) {
@@ -109,7 +107,7 @@ public function load(array $configs, ContainerBuilder $container)
                                     }
                                 }
                                 $definitionArguments[] = $argument;
-                            } elseif (strpos($argument, '%') === 0 ) {
+                            } elseif (strpos($argument, '%') === 0) {
                                 // Parameter
                                 $argument              = str_replace('%%', '%', $argument);
                                 $definitionArguments[] = $container->getParameter(substr($argument, 1, -1));
@@ -137,10 +135,10 @@ public function load(array $configs, ContainerBuilder $container)
 
                         // Generate tag and tag arguments
                         if (isset($details['tags'])) {
-                            $tagArguments = (!empty($details['tagArguments'])) ? $details['tagArguments'] : array();
+                            $tagArguments = (!empty($details['tagArguments'])) ? $details['tagArguments'] : [];
                             foreach ($details['tags'] as $k => $tag) {
                                 if (!isset($tagArguments[$k])) {
-                                    $tagArguments[$k] = array();
+                                    $tagArguments[$k] = [];
                                 }
 
                                 if (!empty($details['alias'])) {
@@ -151,7 +149,7 @@ public function load(array $configs, ContainerBuilder $container)
                             }
                         } else {
                             $tag          = (!empty($details['tag'])) ? $details['tag'] : $defaultTag;
-                            $tagArguments = (!empty($details['tagArguments'])) ? $details['tagArguments'] : array();
+                            $tagArguments = (!empty($details['tagArguments'])) ? $details['tagArguments'] : [];
 
                             if (!empty($tag)) {
                                 if (!empty($details['alias'])) {
@@ -249,7 +247,7 @@ public function load(array $configs, ContainerBuilder $container)
                         // Set method calls
                         if (!empty($details['methodCalls'])) {
                             foreach ($details['methodCalls'] as $method => $methodArguments) {
-                                $methodCallArguments = array();
+                                $methodCallArguments = [];
                                 foreach ($methodArguments as $argument) {
                                     if ($argument === '') {
                                         // To be added during compilation
@@ -262,7 +260,7 @@ public function load(array $configs, ContainerBuilder $container)
                                             }
                                         }
                                         $methodCallArguments[] = $argument;
-                                    } elseif (strpos($argument, '%') === 0 ) {
+                                    } elseif (strpos($argument, '%') === 0) {
                                         // Parameter
                                         $argument              = str_replace('%%', '%', $argument);
                                         $methodCallArguments[] = $container->getParameter(substr($argument, 1, -1));
@@ -304,17 +302,17 @@ public function load(array $configs, ContainerBuilder $container)
         foreach ($menus as $alias => $options) {
             $container->setDefinition('mautic.menu_renderer.'.$alias, new Definition(
                 'Mautic\CoreBundle\Menu\MenuRenderer',
-                array(
+                [
                     new Reference('knp_menu.matcher'),
                     new Reference('mautic.factory'),
                     '%kernel.charset%',
-                    $options
-                )
+                    $options,
+                ]
             ))
                 ->addTag('knp_menu.renderer',
-                    array(
-                        'alias' => $alias
-                    )
+                    [
+                        'alias' => $alias,
+                    ]
                 );
         }
 
diff --git a/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php b/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php
index fbff94fe585..3e64697bfbc 100644
--- a/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php
+++ b/app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,28 +17,27 @@
 
 abstract class AbstractMauticMigration extends AbstractMigration implements ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
     protected $container;
 
     /**
-     * Supported platforms
+     * Supported platforms.
      *
      * @var array
      */
     protected $supported = ['mysql'];
 
     /**
-     * Database prefix
+     * Database prefix.
      *
      * @var string
      */
     protected $prefix;
 
     /**
-     * Database platform
+     * Database platform.
      *
      * @var string
      */
@@ -51,7 +51,6 @@ abstract class AbstractMauticMigration extends AbstractMigration implements Cont
     /**
      * @param Schema $schema
      *
-     * @return void
      * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function up(Schema $schema)
@@ -61,7 +60,7 @@ public function up(Schema $schema)
         // Abort the migration if the platform is unsupported
         $this->abortIf(!in_array($platform, $this->supported), 'The database platform is unsupported for migrations');
 
-        $function = $this->platform."Up";
+        $function = $this->platform.'Up';
 
         if (method_exists($this, $function)) {
             $this->$function($schema);
@@ -71,7 +70,6 @@ public function up(Schema $schema)
     /**
      * @param Schema $schema
      *
-     * @return void
      * @throws \Doctrine\DBAL\Migrations\AbortMigrationException
      */
     public function down(Schema $schema)
@@ -91,7 +89,7 @@ public function setContainer(ContainerInterface $container = null)
     }
 
     /**
-     * Finds/creates the local name for constraints and indexes
+     * Finds/creates the local name for constraints and indexes.
      *
      * @param $table
      * @param $type
@@ -138,7 +136,7 @@ protected function findPropertyName($table, $type, $suffix)
                 if (!array_key_exists('idx', $tables[$table])) {
                     $tables[$table]['idx'] = [
                         'idx'  => [],
-                        'uniq' => []
+                        'uniq' => [],
                     ];
 
                     $indexes = $schemaManager->listTableIndexes($table);
@@ -169,7 +167,7 @@ protected function findPropertyName($table, $type, $suffix)
     }
 
     /**
-     * Generate the  name for the property
+     * Generate the  name for the property.
      *
      * @param       $table
      * @param       $type
@@ -181,7 +179,7 @@ protected function generatePropertyName($table, $type, array $columnNames)
     {
         $columnNames = array_merge([$this->prefix.$table], $columnNames);
         $hash        = implode(
-            "",
+            '',
             array_map(
                 function ($column) {
                     return dechex(crc32($column));
@@ -190,6 +188,6 @@ function ($column) {
             )
         );
 
-        return substr(strtoupper($type."_".$hash), 0, 63);
+        return substr(strtoupper($type.'_'.$hash), 0, 63);
     }
 }
diff --git a/app/bundles/CoreBundle/Doctrine/Helper/ColumnSchemaHelper.php b/app/bundles/CoreBundle/Doctrine/Helper/ColumnSchemaHelper.php
index 7a1fad3214a..7bcc977f8f5 100644
--- a/app/bundles/CoreBundle/Doctrine/Helper/ColumnSchemaHelper.php
+++ b/app/bundles/CoreBundle/Doctrine/Helper/ColumnSchemaHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,12 @@
 use Mautic\CoreBundle\Exception\SchemaException;
 
 /**
- * Class ColumnSchemaHelper
+ * Class ColumnSchemaHelper.
  *
  * Used to manipulate the schema of an existing table
  */
 class ColumnSchemaHelper
 {
-
     /**
      * @var Connection
      */
@@ -64,14 +64,14 @@ public function __construct(Connection $db, $prefix)
     }
 
     /**
-     * Set the table to be manipulated
+     * Set the table to be manipulated.
      *
      * @param string $table
      * @param bool   $addPrefix
      */
     public function setName($table, $addPrefix = true)
     {
-        $this->tableName = ($addPrefix) ? $this->prefix . $table : $table;
+        $this->tableName = ($addPrefix) ? $this->prefix.$table : $table;
 
         //make sure the table exists
         $this->checkTableExists($this->tableName, true);
@@ -82,7 +82,7 @@ public function setName($table, $addPrefix = true)
     }
 
     /**
-     * Get the SchemaManager
+     * Get the SchemaManager.
      *
      * @return \Doctrine\DBAL\Schema\AbstractSchemaManager
      */
@@ -92,7 +92,7 @@ public function getSchemaManager()
     }
 
     /**
-     * Get table details
+     * Get table details.
      *
      * @return \Doctrine\DBAL\Schema\Table
      */
@@ -102,7 +102,7 @@ public function getTable()
     }
 
     /**
-     * Get array of Doctrine\DBAL\Schema\Column instances for the table
+     * Get array of Doctrine\DBAL\Schema\Column instances for the table.
      *
      * @return array
      */
@@ -111,11 +111,12 @@ public function getColumns()
         if (empty($this->columns)) {
             $this->columns = $this->toTable->getColumns();
         }
+
         return $this->columns;
     }
 
     /**
-     * Add an array of columns to the table
+     * Add an array of columns to the table.
      *
      * @param array $columns
      *
@@ -139,15 +140,14 @@ public function addColumns(array $columns)
     }
 
     /**
-     * Add a column to the table
+     * Add a column to the table.
      *
      * @param array $column
-     *  ['name']    string (required) unique name of column; cannot already exist
-     *  ['type']    string (optional) Doctrine type for column; defaults to text
-     *  ['options'] array  (optional) Defining options for column
+     *                           ['name']    string (required) unique name of column; cannot already exist
+     *                           ['type']    string (optional) Doctrine type for column; defaults to text
+     *                           ['options'] array  (optional) Defining options for column
      * @param bool  $checkExists Check if table exists; pass false if this has already been done
      *
-     * @return void
      * @throws SchemaException
      */
     public function addColumn(array $column, $checkExists = true)
@@ -161,17 +161,15 @@ public function addColumn(array $column, $checkExists = true)
         }
 
         $type    = (isset($column['type'])) ? $column['type'] : 'text';
-        $options = (isset($column['options'])) ? $column['options'] : array();
+        $options = (isset($column['options'])) ? $column['options'] : [];
 
         $this->toTable->addColumn($column['name'], $type, $options);
     }
 
     /**
-     * Drops a column from table
+     * Drops a column from table.
      *
      * @param $columnName
-     *
-     * @return void
      */
     public function dropColumn($columnName)
     {
@@ -181,9 +179,7 @@ public function dropColumn($columnName)
     }
 
     /**
-     * Computes and executes the changes
-     *
-     * @return void
+     * Computes and executes the changes.
      */
     public function executeChanges()
     {
@@ -197,12 +193,13 @@ public function executeChanges()
     }
 
     /**
-     * Determine if a column already exists
+     * Determine if a column already exists.
      *
      * @param string $column
      * @param bool   $throwException
      *
      * @return bool
+     *
      * @throws SchemaException
      */
     public function checkColumnExists($column, $throwException = false)
@@ -220,12 +217,13 @@ public function checkColumnExists($column, $throwException = false)
     }
 
     /**
-     * Determine if a table exists
+     * Determine if a table exists.
      *
      * @param            $table
      * @param bool|false $throwException
      *
      * @return bool
+     *
      * @throws SchemaException
      */
     public function checkTableExists($table, $throwException = false)
diff --git a/app/bundles/CoreBundle/Doctrine/Helper/IndexSchemaHelper.php b/app/bundles/CoreBundle/Doctrine/Helper/IndexSchemaHelper.php
index da92ab098d2..8bb6572037c 100644
--- a/app/bundles/CoreBundle/Doctrine/Helper/IndexSchemaHelper.php
+++ b/app/bundles/CoreBundle/Doctrine/Helper/IndexSchemaHelper.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-namespace Mautic\CoreBundle\Doctrine\Helper;
 
+namespace Mautic\CoreBundle\Doctrine\Helper;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\Table;
-use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\StringType;
 use Mautic\CoreBundle\Exception\SchemaException;
 
@@ -46,22 +46,22 @@ class IndexSchemaHelper
     /**
      * @var array
      */
-    protected $allowedColumns = array();
+    protected $allowedColumns = [];
 
     /**
      * @var array
      */
-    protected $changedIndexes = array();
+    protected $changedIndexes = [];
 
     /**
      * @var array
      */
-    protected $addedIndexes = array();
+    protected $addedIndexes = [];
 
     /**
      * @var array
      */
-    protected $dropIndexes = array();
+    protected $dropIndexes = [];
 
     /**
      * @param Connection $db
@@ -97,7 +97,7 @@ public function allowColumn($name)
     }
 
     /**
-     * Add or update an index to the table
+     * Add or update an index to the table.
      *
      * @param       $columns
      * @param       $name
@@ -105,10 +105,10 @@ public function allowColumn($name)
      *
      * @throws SchemaException
      */
-    public function addIndex($columns, $name, $options = array())
+    public function addIndex($columns, $name, $options = [])
     {
         if (!is_array($columns)) {
-            $columns = array($columns);
+            $columns = [$columns];
         }
         foreach ($columns as $column) {
             if (!in_array($column, $this->allowedColumns)) {
@@ -125,7 +125,6 @@ public function addIndex($columns, $name, $options = array())
         $columns = array_intersect($columns, $this->allowedColumns);
 
         if (!empty($columns)) {
-
             $index = new Index($this->prefix.$name, $columns, false, false, $options);
 
             if ($this->table->hasIndex($this->prefix.$name)) {
@@ -137,7 +136,7 @@ public function addIndex($columns, $name, $options = array())
     }
 
     /**
-     * Execute changes
+     * Execute changes.
      */
     public function executeChanges()
     {
@@ -149,7 +148,6 @@ public function executeChanges()
                 $sql[] = $platform->getDropIndexSQL($index);
                 $sql[] = $platform->getCreateIndexSQL($index, $this->table);
             }
-
         }
 
         if (count($this->dropIndexes)) {
@@ -173,4 +171,4 @@ public function executeChanges()
             $this->addedIndexes   = [];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Doctrine/Helper/SchemaHelperFactory.php b/app/bundles/CoreBundle/Doctrine/Helper/SchemaHelperFactory.php
index 50c2235c598..2bc69ff898a 100644
--- a/app/bundles/CoreBundle/Doctrine/Helper/SchemaHelperFactory.php
+++ b/app/bundles/CoreBundle/Doctrine/Helper/SchemaHelperFactory.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Doctrine\Helper;
 
 /**
- * Class SchemaHelperFactory
+ * Class SchemaHelperFactory.
  */
 class SchemaHelperFactory
 {
@@ -22,8 +23,8 @@ class SchemaHelperFactory
     /**
      * SchemaHelperFactory constructor.
      *
-     * @param TableSchemaHelper $tableSchemaHelper
-     * @param IndexSchemaHelper $indexSchemaHelper
+     * @param TableSchemaHelper  $tableSchemaHelper
+     * @param IndexSchemaHelper  $indexSchemaHelper
      * @param ColumnSchemaHelper $columnSchemaHelper
      */
     public function __construct(TableSchemaHelper $tableSchemaHelper, IndexSchemaHelper $indexSchemaHelper, ColumnSchemaHelper $columnSchemaHelper)
@@ -34,7 +35,7 @@ public function __construct(TableSchemaHelper $tableSchemaHelper, IndexSchemaHel
     }
 
     /**
-     * Get a schema helper
+     * Get a schema helper.
      *
      * @param $type
      * @param null $name
@@ -43,10 +44,10 @@ public function __construct(TableSchemaHelper $tableSchemaHelper, IndexSchemaHel
      */
     public function getSchemaHelper($type, $name = null)
     {
-        if (! array_key_exists($type, $this->helpers)) {
+        if (!array_key_exists($type, $this->helpers)) {
             throw new \InvalidArgumentException(sprintf('The requested helper (%s) is not a valid schema helper.', $type));
         }
-        
+
         if ($name && method_exists($this->helpers[$type], 'setName')) {
             $this->helpers[$type]->setName($name);
         }
diff --git a/app/bundles/CoreBundle/Doctrine/Helper/TableSchemaHelper.php b/app/bundles/CoreBundle/Doctrine/Helper/TableSchemaHelper.php
index b790dd2ce4c..fdad5a7a77d 100644
--- a/app/bundles/CoreBundle/Doctrine/Helper/TableSchemaHelper.php
+++ b/app/bundles/CoreBundle/Doctrine/Helper/TableSchemaHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,12 @@
 use Mautic\CoreBundle\Exception\SchemaException;
 
 /**
- * Class TableSchemaHelper
+ * Class TableSchemaHelper.
  *
  * Used to manipulate creation/removal of tables
  */
 class TableSchemaHelper
 {
-
     /**
      * @var Connection
      */
@@ -63,15 +63,15 @@ class TableSchemaHelper
      */
     public function __construct(Connection $db, $prefix, ColumnSchemaHelper $columnHelper)
     {
-        $this->db            = $db;
-        $this->sm            = $db->getSchemaManager();
-        $this->prefix        = $prefix;
-        $this->columnHelper  = $columnHelper;
-        $this->schema        = new Schema(array(), array(), $this->sm->createSchemaConfig());
+        $this->db           = $db;
+        $this->sm           = $db->getSchemaManager();
+        $this->prefix       = $prefix;
+        $this->columnHelper = $columnHelper;
+        $this->schema       = new Schema([], [], $this->sm->createSchemaConfig());
     }
 
     /**
-     * Get the SchemaManager
+     * Get the SchemaManager.
      *
      * @return \Doctrine\DBAL\Schema\AbstractSchemaManager
      */
@@ -81,11 +81,10 @@ public function getSchemaManager()
     }
 
     /**
-     * Add an array of tables to db
+     * Add an array of tables to db.
      *
      * @param array $tables
      *
-     * @return void
      * @throws SchemaException
      */
     public function addTables(array $tables)
@@ -107,28 +106,27 @@ public function addTables(array $tables)
     }
 
     /**
-     * Add a table to the db
+     * Add a table to the db.
      *
      * @param array $table
-     *  ['name']    string (required) unique name of table; cannot already exist
-     *  ['columns'] array  (optional) Array of columns to add in the format of
-     *      array(
-     *          array(
-     *              'name'    => 'column_name', //required
-     *              'type'    => 'string',  //optional, defaults to text
-     *              'options' => array(...) //optional, column options
-     *          ),
-     *          ...
-     *      )
-     *  ['options'] array  (optional) Defining options for table
-     *      array(
-     *          'primaryKey' => array(),
-     *          'uniqueIndex' => array()
-     *      )
+     *                     ['name']    string (required) unique name of table; cannot already exist
+     *                     ['columns'] array  (optional) Array of columns to add in the format of
+     *                     array(
+     *                     array(
+     *                     'name'    => 'column_name', //required
+     *                     'type'    => 'string',  //optional, defaults to text
+     *                     'options' => array(...) //optional, column options
+     *                     ),
+     *                     ...
+     *                     )
+     *                     ['options'] array  (optional) Defining options for table
+     *                     array(
+     *                     'primaryKey' => array(),
+     *                     'uniqueIndex' => array()
+     *                     )
      * @param $checkExists
      * @param $dropExisting
      *
-     * @return void
      * @throws SchemaException
      */
     public function addTable(array $table, $checkExists = true, $dropExisting = false)
@@ -146,14 +144,14 @@ public function addTable(array $table, $checkExists = true, $dropExisting = fals
 
         $this->addTables[] = $table;
 
-        $options = (isset($table['options'])) ? $table['options'] : array();
-        $columns = (isset($table['columns'])) ? $table['columns'] : array();
+        $options = (isset($table['options'])) ? $table['options'] : [];
+        $columns = (isset($table['columns'])) ? $table['columns'] : [];
 
-        $newTable  = $this->schema->createTable($this->prefix . $table['name']);
+        $newTable = $this->schema->createTable($this->prefix.$table['name']);
 
         if (!empty($columns)) {
             //just to make sure a same name column is not added
-            $columnsAdded = array();
+            $columnsAdded = [];
             foreach ($columns as $column) {
                 if (empty($column['name'])) {
                     throw new SchemaException('A column is missing required name key.');
@@ -161,7 +159,7 @@ public function addTable(array $table, $checkExists = true, $dropExisting = fals
 
                 if (!isset($columns[$column['name']])) {
                     $type       = (isset($column['type'])) ? $column['type'] : 'text';
-                    $colOptions = (isset($column['options'])) ? $column['options'] : array();
+                    $colOptions = (isset($column['options'])) ? $column['options'] : [];
 
                     $newTable->addColumn($column['name'], $type, $colOptions);
                     $columnsAdded[] = $column['name'];
@@ -171,7 +169,7 @@ public function addTable(array $table, $checkExists = true, $dropExisting = fals
 
         if (!empty($options)) {
             foreach ($options as $option => $value) {
-                $func = ($option == 'uniqueIndex' ? "add" : "set") . ucfirst($option);
+                $func = ($option == 'uniqueIndex' ? 'add' : 'set').ucfirst($option);
                 $newTable->$func($value);
             }
         }
@@ -179,8 +177,6 @@ public function addTable(array $table, $checkExists = true, $dropExisting = fals
 
     /**
      * @param string $table
-     *
-     * @return void
      */
     public function deleteTable($table)
     {
@@ -190,9 +186,7 @@ public function deleteTable($table)
     }
 
     /**
-     * Executes the changes
-     *
-     * @return void
+     * Executes the changes.
      */
     public function executeChanges()
     {
@@ -200,7 +194,7 @@ public function executeChanges()
 
         if (!empty($this->dropTables)) {
             foreach ($this->dropTables as $t) {
-                $this->sm->dropTable($this->prefix . $t);
+                $this->sm->dropTable($this->prefix.$t);
             }
         }
 
@@ -213,24 +207,25 @@ public function executeChanges()
         }
 
         //reset schema
-        $this->schema     = new Schema(array(), array(), $this->sm->createSchemaConfig());
-        $this->dropTables = $this->addTables = array();
+        $this->schema     = new Schema([], [], $this->sm->createSchemaConfig());
+        $this->dropTables = $this->addTables = [];
     }
 
     /**
-     * Determine if a table exists
+     * Determine if a table exists.
      *
      * @param string $table
      * @param bool   $throwException
      *
      * @return bool
+     *
      * @throws SchemaException
      */
     public function checkTableExists($table, $throwException = false)
     {
-        if ($this->sm->tablesExist($this->prefix . $table)) {
+        if ($this->sm->tablesExist($this->prefix.$table)) {
             if ($throwException) {
-                throw new SchemaException($this->prefix . "$table already exists");
+                throw new SchemaException($this->prefix."$table already exists");
             }
 
             return true;
diff --git a/app/bundles/CoreBundle/Doctrine/Mapping/AssociationBuilder.php b/app/bundles/CoreBundle/Doctrine/Mapping/AssociationBuilder.php
index 60448afaab6..549946c8fd2 100644
--- a/app/bundles/CoreBundle/Doctrine/Mapping/AssociationBuilder.php
+++ b/app/bundles/CoreBundle/Doctrine/Mapping/AssociationBuilder.php
@@ -1,29 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Doctrine\Mapping;
 
 /**
- * Class AssociationBuilder
+ * Class AssociationBuilder.
  *
  * Override Doctrine's builder classes to add support to orphanRemoval until the fix is incorporated into Doctrine release
  * See @link https://github.com/doctrine/doctrine2/pull/1326/
  *
  * Also gives support for allowing a many-to-one to be the primary key
- *
- * @package Mautic\CoreBundle\Doctrine\Metadata
  */
 class AssociationBuilder extends \Doctrine\ORM\Mapping\Builder\AssociationBuilder
 {
-
     /**
-     * Set orphanRemoval
+     * Set orphanRemoval.
      *
      * @param bool $orphanRemoval
      *
@@ -37,7 +35,7 @@ public function orphanRemoval($orphanRemoval = true)
     }
 
     /**
-     * Allow a many-to-one to be the ID
+     * Allow a many-to-one to be the ID.
      *
      * @return $this
      */
@@ -47,4 +45,4 @@ public function isPrimaryKey()
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Doctrine/Mapping/ClassMetadataBuilder.php b/app/bundles/CoreBundle/Doctrine/Mapping/ClassMetadataBuilder.php
index 7d1585c6070..51eaaaf1bbc 100644
--- a/app/bundles/CoreBundle/Doctrine/Mapping/ClassMetadataBuilder.php
+++ b/app/bundles/CoreBundle/Doctrine/Mapping/ClassMetadataBuilder.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,12 +14,10 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 /**
- * Class ClassMetadataBuilder
+ * Class ClassMetadataBuilder.
  *
  * Override Doctrine's builder classes to add support to orphanRemoval until the fix is incorporated into Doctrine release
  * See @link https://github.com/doctrine/doctrine2/pull/1326/
- *
- * @package Mautic\CoreBundle\Doctrine\Metadata
  */
 class ClassMetadataBuilder extends \Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder
 {
@@ -47,10 +46,10 @@ public function createManyToOne($name, $targetEntity)
     {
         return new AssociationBuilder(
             $this,
-            array(
+            [
                 'fieldName'    => $name,
-                'targetEntity' => $targetEntity
-            ),
+                'targetEntity' => $targetEntity,
+            ],
             ClassMetadata::MANY_TO_ONE
         );
     }
@@ -67,10 +66,10 @@ public function createOneToOne($name, $targetEntity)
     {
         return new AssociationBuilder(
             $this,
-            array(
+            [
                 'fieldName'    => $name,
-                'targetEntity' => $targetEntity
-            ),
+                'targetEntity' => $targetEntity,
+            ],
             ClassMetadata::ONE_TO_ONE
         );
     }
@@ -87,10 +86,10 @@ public function createManyToMany($name, $targetEntity)
     {
         return new ManyToManyAssociationBuilder(
             $this,
-            array(
+            [
                 'fieldName'    => $name,
-                'targetEntity' => $targetEntity
-            ),
+                'targetEntity' => $targetEntity,
+            ],
             ClassMetadata::MANY_TO_MANY
         );
     }
@@ -107,16 +106,16 @@ public function createOneToMany($name, $targetEntity)
     {
         return new OneToManyAssociationBuilder(
             $this,
-            array(
+            [
                 'fieldName'    => $name,
-                'targetEntity' => $targetEntity
-            ),
+                'targetEntity' => $targetEntity,
+            ],
             ClassMetadata::ONE_TO_MANY
         );
     }
 
     /**
-     * Add Id column
+     * Add Id column.
      */
     public function addId()
     {
@@ -127,14 +126,13 @@ public function addId()
     }
 
     /**
-     * Add id, name, and description columns
+     * Add id, name, and description columns.
      *
      * @param string $nameColumn
      * @param string $descriptionColumn
      */
-    public function addIdColumns ($nameColumn = 'name', $descriptionColumn = 'description')
+    public function addIdColumns($nameColumn = 'name', $descriptionColumn = 'description')
     {
-
         $this->addId();
 
         if ($nameColumn) {
@@ -150,7 +148,7 @@ public function addIdColumns ($nameColumn = 'name', $descriptionColumn = 'descri
     }
 
     /**
-     * Add category to metadata
+     * Add category to metadata.
      */
     public function addCategory()
     {
@@ -160,7 +158,7 @@ public function addCategory()
     }
 
     /**
-     * Add publish up and down dates to metadata
+     * Add publish up and down dates to metadata.
      */
     public function addPublishDates()
     {
@@ -176,7 +174,7 @@ public function addPublishDates()
     }
 
     /**
-     * Added dateAdded column
+     * Added dateAdded column.
      *
      * @param bool|false $nullable
      */
@@ -193,7 +191,7 @@ public function addDateAdded($nullable = false)
     }
 
     /**
-     * Add a lead column
+     * Add a lead column.
      *
      * @param bool|false $nullable
      * @param string     $onDelete
@@ -218,7 +216,7 @@ public function addLead($nullable = false, $onDelete = 'CASCADE', $isPrimaryKey
     }
 
     /**
-     * Adds IP address
+     * Adds IP address.
      *
      * @param bool|false $nullable
      */
@@ -232,7 +230,7 @@ public function addIpAddress($nullable = false)
     }
 
     /**
-     * Add a nullable field
+     * Add a nullable field.
      *
      * @param        $name
      * @param string $type
@@ -251,7 +249,7 @@ public function addNullableField($name, $type = 'string', $columnName = null)
     }
 
     /**
-     * Add a field with a custom column name
+     * Add a field with a custom column name.
      *
      * @param            $name
      * @param            $type
@@ -271,7 +269,7 @@ public function addNamedField($name, $type, $columnName, $nullable = false)
     }
 
     /**
-     * Add partial index
+     * Add partial index.
      *
      * @param array $columns
      * @param       $name
@@ -284,15 +282,15 @@ public function addPartialIndex(array $columns, $name, $where)
         $cm = $this->getClassMetadata();
 
         if (!isset($cm->table['indexes'])) {
-            $cm->table['indexes'] = array();
+            $cm->table['indexes'] = [];
         }
 
-        $cm->table['indexes'][$name] = array('
+        $cm->table['indexes'][$name] = ['
             columns'  => $columns,
-            'options' => array(
-                'where' => $where
-            )
-        );
+            'options' => [
+                'where' => $where,
+            ],
+        ];
 
         return $this;
     }
diff --git a/app/bundles/CoreBundle/Doctrine/Mapping/ManyToManyAssociationBuilder.php b/app/bundles/CoreBundle/Doctrine/Mapping/ManyToManyAssociationBuilder.php
index 7f5609bca1e..e6173805615 100644
--- a/app/bundles/CoreBundle/Doctrine/Mapping/ManyToManyAssociationBuilder.php
+++ b/app/bundles/CoreBundle/Doctrine/Mapping/ManyToManyAssociationBuilder.php
@@ -1,27 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Doctrine\Mapping;
 
 /**
- * ManyToMany Association Builder
+ * ManyToMany Association Builder.
  *
  * Override Doctrine's builder classes to add support to orphanRemoval until the fix is incorporated into Doctrine release
  * See @link https://github.com/doctrine/doctrine2/pull/1326/
- *
- * @package Mautic\CoreBundle\Doctrine\Metadata
  */
 class ManyToManyAssociationBuilder extends \Doctrine\ORM\Mapping\Builder\ManyToManyAssociationBuilder
 {
-
     /**
-     * Set orphanRemoval
+     * Set orphanRemoval.
      *
      * @param bool $orphanRemoval
      *
diff --git a/app/bundles/CoreBundle/Doctrine/Mapping/OneToManyAssociationBuilder.php b/app/bundles/CoreBundle/Doctrine/Mapping/OneToManyAssociationBuilder.php
index 94bbaab4260..8ef0fc76953 100644
--- a/app/bundles/CoreBundle/Doctrine/Mapping/OneToManyAssociationBuilder.php
+++ b/app/bundles/CoreBundle/Doctrine/Mapping/OneToManyAssociationBuilder.php
@@ -1,27 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Doctrine\Mapping;
 
 /**
- * OneToMany Association Builder
+ * OneToMany Association Builder.
  *
  * Override Doctrine's builder classes to add support to orphanRemoval until the fix is incorporated into Doctrine release
  * See @link https://github.com/doctrine/doctrine2/pull/1326/
- *
- * @package Mautic\CoreBundle\Doctrine\Metadata
  */
 class OneToManyAssociationBuilder extends \Doctrine\ORM\Mapping\Builder\OneToManyAssociationBuilder
 {
-
     /**
-     * Set orphanRemoval
+     * Set orphanRemoval.
      *
      * @param bool $orphanRemoval
      *
diff --git a/app/bundles/CoreBundle/Doctrine/QueryFormatter/AbstractFormatter.php b/app/bundles/CoreBundle/Doctrine/QueryFormatter/AbstractFormatter.php
index 96e623d775c..438edf35d47 100644
--- a/app/bundles/CoreBundle/Doctrine/QueryFormatter/AbstractFormatter.php
+++ b/app/bundles/CoreBundle/Doctrine/QueryFormatter/AbstractFormatter.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Doctrine\QueryFormatter;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Query\QueryBuilder;
 
 /**
- * Help generate SQL statements to format column data
+ * Help generate SQL statements to format column data.
  *
  * Class AbstractFormat
  */
@@ -28,10 +28,10 @@ abstract class AbstractFormatter
      *
      * @return AbstractFormatter
      */
-    static function createFormatter(Connection $db)
+    public static function createFormatter(Connection $db)
     {
         $name  = $db->getDatabasePlatform()->getName();
-        $class = '\Mautic\CoreBundle\Doctrine\QueryFormatter\\' . ucfirst($name) . 'Formatter';
+        $class = '\Mautic\CoreBundle\Doctrine\QueryFormatter\\'.ucfirst($name).'Formatter';
 
         return new $class($db);
     }
@@ -47,41 +47,41 @@ public function __construct(Connection $db)
     }
 
     /**
-     * Format field to datetime
+     * Format field to datetime.
      *
      * @param        $field
      * @param string $format
      *
      * @return mixed
      */
-    abstract function toDateTime($field, $format = 'Y-m-d H:i:s');
+    abstract public function toDateTime($field, $format = 'Y-m-d H:i:s');
 
     /**
-     * Format field to date
+     * Format field to date.
      *
      * @param        $field
      * @param string $format
      *
      * @return mixed
      */
-    abstract function toDate($field, $format = 'Y-m-d');
+    abstract public function toDate($field, $format = 'Y-m-d');
 
     /**
-     * Format field to time
+     * Format field to time.
      *
      * @param        $field
      * @param string $format
      *
      * @return mixed
      */
-    abstract function toTime($field, $format = 'H:i:s');
+    abstract public function toTime($field, $format = 'H:i:s');
 
     /**
-     * Format field to a numeric
+     * Format field to a numeric.
      *
      * @param $field
      *
      * @return mixed
      */
-    abstract function toNumeric($field);
-}
\ No newline at end of file
+    abstract public function toNumeric($field);
+}
diff --git a/app/bundles/CoreBundle/Doctrine/QueryFormatter/MysqlFormatter.php b/app/bundles/CoreBundle/Doctrine/QueryFormatter/MysqlFormatter.php
index a9466f1ccf8..bfcdc237908 100644
--- a/app/bundles/CoreBundle/Doctrine/QueryFormatter/MysqlFormatter.php
+++ b/app/bundles/CoreBundle/Doctrine/QueryFormatter/MysqlFormatter.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Doctrine\QueryFormatter;
 
 /**
- * Help generate SQL statements to format column data
+ * Help generate SQL statements to format column data.
  *
  * Class AbstractFormat
  */
 class MysqlFormatter extends AbstractFormatter
 {
     /**
-     * Format field to datetime
+     * Format field to datetime.
      *
      * @param        $field
      * @param string $format
@@ -30,7 +31,7 @@ public function toDateTime($field, $format = '%Y-%m-%d %k:%i:%s')
     }
 
     /**
-     * Format field to date
+     * Format field to date.
      *
      * @param        $field
      * @param string $format
@@ -43,7 +44,7 @@ public function toDate($field, $format = '%Y-%m-%d')
     }
 
     /**
-     * Format field to time
+     * Format field to time.
      *
      * @param        $field
      * @param string $format
@@ -56,7 +57,7 @@ public function toTime($field, $format = '%k:%i:%s')
     }
 
     /**
-     * Format field to a numeric
+     * Format field to a numeric.
      *
      * @param $field
      *
@@ -66,4 +67,4 @@ public function toNumeric($field)
     {
         return $field;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Doctrine/TranslationMigrationTrait.php b/app/bundles/CoreBundle/Doctrine/TranslationMigrationTrait.php
index 0e28b729240..064871a8a52 100644
--- a/app/bundles/CoreBundle/Doctrine/TranslationMigrationTrait.php
+++ b/app/bundles/CoreBundle/Doctrine/TranslationMigrationTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,13 +13,12 @@
 use Doctrine\DBAL\Schema\Schema;
 
 /**
- * Class TranslationMigrationTrait
+ * Class TranslationMigrationTrait.
  */
 trait TranslationMigrationTrait
 {
-
     /**
-     * Add translation parent/child relationship columns
+     * Add translation parent/child relationship columns.
      *
      * @param Schema $schema
      */
@@ -55,4 +55,4 @@ protected function addTranslationSchema(Schema $schema, $tableName, $languageCol
             $this->addSql("ALTER TABLE $tableName ADD COLUMN `lang` varchar(255) NULL");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Doctrine/Type/ArrayType.php b/app/bundles/CoreBundle/Doctrine/Type/ArrayType.php
index 4a57f060676..5727cfd49e7 100644
--- a/app/bundles/CoreBundle/Doctrine/Type/ArrayType.php
+++ b/app/bundles/CoreBundle/Doctrine/Type/ArrayType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -21,7 +22,6 @@
  */
 class ArrayType extends \Doctrine\DBAL\Types\ArrayType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -43,7 +43,7 @@ function (&$entry) {
 
         if (strpos($serialized, chr(0)) !== false) {
             throw new \Doctrine\DBAL\Types\ConversionException(
-                "Serialized array includes null-byte. This cannot be saved as a text. Please check if you not provided object with protected or private members."
+                'Serialized array includes null-byte. This cannot be saved as a text. Please check if you not provided object with protected or private members.'
             );
         }
 
@@ -59,13 +59,10 @@ function (&$entry) {
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
         try {
-
             return parent::convertToPHPValue($value, $platform);
         } catch (ConversionException $exception) {
-
             return [];
         } catch (ContextErrorException $exeption) {
-
             return [];
         }
     }
diff --git a/app/bundles/CoreBundle/Doctrine/Type/UTCDateTimeType.php b/app/bundles/CoreBundle/Doctrine/Type/UTCDateTimeType.php
index d4fedaff935..2521ef0dcba 100644
--- a/app/bundles/CoreBundle/Doctrine/Type/UTCDateTimeType.php
+++ b/app/bundles/CoreBundle/Doctrine/Type/UTCDateTimeType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class UTCDateTimeType
+ * Class UTCDateTimeType.
  */
 class UTCDateTimeType extends DateTimeType
 {
-
     /**
      * @var \DateTimeZone
      */
@@ -37,15 +37,16 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
             return null;
         }
 
-        if (!self::$utc)
+        if (!self::$utc) {
             self::$utc = new \DateTimeZone('UTC');
+        }
 
         if (!is_object($value)) {
             $dateHelper = new DateTimeHelper($value);
             $value      = $dateHelper->getDateTime();
         }
 
-        $tz = $value->getTimeZone();
+        $tz          = $value->getTimeZone();
         $utcDatetime = new \DateTime($value->format($platform->getDateTimeFormatString()), $tz);
         $utcDatetime->setTimezone(self::$utc);
 
@@ -57,6 +58,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
      * @param AbstractPlatform $platform
      *
      * @return \DateTime|null
+     *
      * @throws ConversionException
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
@@ -65,8 +67,9 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             return null;
         }
 
-        if (!self::$utc)
+        if (!self::$utc) {
             self::$utc = new \DateTimeZone('UTC');
+        }
 
         $val = \DateTime::createFromFormat(
             $platform->getDateTimeFormatString(),
diff --git a/app/bundles/CoreBundle/Doctrine/VariantMigrationTrait.php b/app/bundles/CoreBundle/Doctrine/VariantMigrationTrait.php
index 66c2fb70427..9830aae294b 100644
--- a/app/bundles/CoreBundle/Doctrine/VariantMigrationTrait.php
+++ b/app/bundles/CoreBundle/Doctrine/VariantMigrationTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,13 +13,12 @@
 use Doctrine\DBAL\Schema\Schema;
 
 /**
- * Class VariantMigrationTrait
+ * Class VariantMigrationTrait.
  */
 trait VariantMigrationTrait
 {
-
     /**
-     * Add variant parent/child relationship schema
+     * Add variant parent/child relationship schema.
      *
      * @param Schema $schema
      * @param        $tableName
@@ -58,4 +58,4 @@ protected function addVariantSchema(Schema $schema, $tableName)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/AuditLog.php b/app/bundles/CoreBundle/Entity/AuditLog.php
index 7b73df3b108..a0ec0c02141 100644
--- a/app/bundles/CoreBundle/Entity/AuditLog.php
+++ b/app/bundles/CoreBundle/Entity/AuditLog.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class AuditLog
- *
- * @package Mautic\CoreBundle\Entity
+ * Class AuditLog.
  */
 class AuditLog
 {
-
     /**
      * @var int
      */
@@ -58,7 +56,7 @@ class AuditLog
     /**
      * @var array
      */
-    protected $details = array();
+    protected $details = [];
 
     /**
      * @var \DateTime
@@ -73,14 +71,14 @@ class AuditLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('audit_log')
             ->setCustomRepositoryClass('Mautic\CoreBundle\Entity\AuditLogRepository')
-            ->addIndex(array('object', 'object_id'), 'object_search')
-            ->addIndex(array('bundle', 'object', 'action', 'object_id'), 'timeline_search');
+            ->addIndex(['object', 'object_id'], 'object_search')
+            ->addIndex(['bundle', 'object', 'action', 'object_id'], 'timeline_search');
 
         $builder->addId();
 
@@ -121,23 +119,23 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set userId
+     * Set userId.
      *
-     * @param integer $userId
+     * @param int $userId
      *
      * @return AuditLog
      */
-    public function setUserId ($userId)
+    public function setUserId($userId)
     {
         $this->userId = $userId;
 
@@ -145,23 +143,23 @@ public function setUserId ($userId)
     }
 
     /**
-     * Get userId
+     * Get userId.
      *
-     * @return integer
+     * @return int
      */
-    public function getUserId ()
+    public function getUserId()
     {
         return $this->userId;
     }
 
     /**
-     * Set object
+     * Set object.
      *
      * @param string $object
      *
      * @return AuditLog
      */
-    public function setObject ($object)
+    public function setObject($object)
     {
         $this->object = $object;
 
@@ -169,23 +167,23 @@ public function setObject ($object)
     }
 
     /**
-     * Get object
+     * Get object.
      *
      * @return string
      */
-    public function getObject ()
+    public function getObject()
     {
         return $this->object;
     }
 
     /**
-     * Set objectId
+     * Set objectId.
      *
-     * @param integer $objectId
+     * @param int $objectId
      *
      * @return AuditLog
      */
-    public function setObjectId ($objectId)
+    public function setObjectId($objectId)
     {
         $this->objectId = $objectId;
 
@@ -193,23 +191,23 @@ public function setObjectId ($objectId)
     }
 
     /**
-     * Get objectId
+     * Get objectId.
      *
-     * @return integer
+     * @return int
      */
-    public function getObjectId ()
+    public function getObjectId()
     {
         return $this->objectId;
     }
 
     /**
-     * Set action
+     * Set action.
      *
      * @param string $action
      *
      * @return AuditLog
      */
-    public function setAction ($action)
+    public function setAction($action)
     {
         $this->action = $action;
 
@@ -217,23 +215,23 @@ public function setAction ($action)
     }
 
     /**
-     * Get action
+     * Get action.
      *
      * @return string
      */
-    public function getAction ()
+    public function getAction()
     {
         return $this->action;
     }
 
     /**
-     * Set details
+     * Set details.
      *
      * @param string $details
      *
      * @return AuditLog
      */
-    public function setDetails ($details)
+    public function setDetails($details)
     {
         $this->details = $details;
 
@@ -241,23 +239,23 @@ public function setDetails ($details)
     }
 
     /**
-     * Get details
+     * Get details.
      *
      * @return string
      */
-    public function getDetails ()
+    public function getDetails()
     {
         return $this->details;
     }
 
     /**
-     * Set dateAdded
+     * Set dateAdded.
      *
      * @param \DateTime $dateAdded
      *
      * @return AuditLog
      */
-    public function setDateAdded ($dateAdded)
+    public function setDateAdded($dateAdded)
     {
         $this->dateAdded = $dateAdded;
 
@@ -265,23 +263,23 @@ public function setDateAdded ($dateAdded)
     }
 
     /**
-     * Get dateAdded
+     * Get dateAdded.
      *
      * @return \DateTime
      */
-    public function getDateAdded ()
+    public function getDateAdded()
     {
         return $this->dateAdded;
     }
 
     /**
-     * Set ipAddress
+     * Set ipAddress.
      *
      * @param string $ipAddress
      *
      * @return AuditLog
      */
-    public function setIpAddress ($ipAddress)
+    public function setIpAddress($ipAddress)
     {
         $this->ipAddress = $ipAddress;
 
@@ -289,23 +287,23 @@ public function setIpAddress ($ipAddress)
     }
 
     /**
-     * Get ipAddress
+     * Get ipAddress.
      *
      * @return string
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
 
     /**
-     * Set bundle
+     * Set bundle.
      *
      * @param string $bundle
      *
      * @return AuditLog
      */
-    public function setBundle ($bundle)
+    public function setBundle($bundle)
     {
         $this->bundle = $bundle;
 
@@ -313,23 +311,23 @@ public function setBundle ($bundle)
     }
 
     /**
-     * Get bundle
+     * Get bundle.
      *
      * @return string
      */
-    public function getBundle ()
+    public function getBundle()
     {
         return $this->bundle;
     }
 
     /**
-     * Set userName
+     * Set userName.
      *
      * @param string $userName
      *
      * @return AuditLog
      */
-    public function setUserName ($userName)
+    public function setUserName($userName)
     {
         $this->userName = $userName;
 
@@ -337,11 +335,11 @@ public function setUserName ($userName)
     }
 
     /**
-     * Get userName
+     * Get userName.
      *
      * @return string
      */
-    public function getUserName ()
+    public function getUserName()
     {
         return $this->userName;
     }
diff --git a/app/bundles/CoreBundle/Entity/AuditLogRepository.php b/app/bundles/CoreBundle/Entity/AuditLogRepository.php
index f1ded98974a..2353135d50e 100644
--- a/app/bundles/CoreBundle/Entity/AuditLogRepository.php
+++ b/app/bundles/CoreBundle/Entity/AuditLogRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,14 +15,14 @@
 use Mautic\LeadBundle\Entity\TimelineTrait;
 
 /**
- * AuditLogRepository
+ * AuditLogRepository.
  */
 class AuditLogRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Get array of objects which belongs to the object
+     * Get array of objects which belongs to the object.
      *
      * @param null $object
      * @param null $id
diff --git a/app/bundles/CoreBundle/Entity/CommonEntity.php b/app/bundles/CoreBundle/Entity/CommonEntity.php
index 68e632874f7..20f1a0c38bd 100644
--- a/app/bundles/CoreBundle/Entity/CommonEntity.php
+++ b/app/bundles/CoreBundle/Entity/CommonEntity.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Entity;
 
-
 class CommonEntity
 {
     /**
@@ -18,7 +18,7 @@ class CommonEntity
     protected $changes = [];
 
     /**
-     * Wrapper function for isProperty methods
+     * Wrapper function for isProperty methods.
      *
      * @param string $name
      * @param        $arguments
@@ -43,7 +43,7 @@ public function __toString()
     {
         $string = get_called_class();
         if (method_exists($this, 'getId')) {
-            $string .= " with ID #".$this->getId();
+            $string .= ' with ID #'.$this->getId();
         }
 
         return $string;
@@ -55,7 +55,7 @@ public function __toString()
      */
     protected function isChanged($prop, $val)
     {
-        $getter  = "get".ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'category') {
             $currentId = ($current) ? $current->getId() : '';
@@ -77,10 +77,10 @@ public function getChanges()
     }
 
     /**
-     * Reset changes
+     * Reset changes.
      */
     public function resetChanges()
     {
         $this->changes = [];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/CommonRepository.php b/app/bundles/CoreBundle/Entity/CommonRepository.php
index 2ac8935d9c7..602258a64c5 100644
--- a/app/bundles/CoreBundle/Entity/CommonRepository.php
+++ b/app/bundles/CoreBundle/Entity/CommonRepository.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Entity;
 
-use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\DBAL\Query\Expression\CompositeExpression;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
@@ -22,11 +22,10 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class CommonRepository
+ * Class CommonRepository.
  */
 class CommonRepository extends EntityRepository
 {
-
     /**
      * @var TranslatorInterface
      */
@@ -44,8 +43,6 @@ class CommonRepository extends EntityRepository
 
     /**
      * @param TranslatorInterface $translator
-     *
-     * @return void
      */
     public function setTranslator(TranslatorInterface $translator)
     {
@@ -53,11 +50,9 @@ public function setTranslator(TranslatorInterface $translator)
     }
 
     /**
-     * Set the current user (i.e. from security context) for use within repositories
+     * Set the current user (i.e. from security context) for use within repositories.
      *
      * @param User $user
-     *
-     * @return void
      */
     public function setCurrentUser($user)
     {
@@ -70,8 +65,6 @@ public function setCurrentUser($user)
 
     /**
      * @param MauticFactory $factory
-     *
-     * @return void
      */
     public function setFactory(MauticFactory $factory)
     {
@@ -79,7 +72,7 @@ public function setFactory(MauticFactory $factory)
     }
 
     /**
-     * Get a single entity
+     * Get a single entity.
      *
      * @param int $id
      *
@@ -97,13 +90,13 @@ public function getEntity($id = 0)
     }
 
     /**
-     * Get a list of entities
+     * Get a list of entities.
      *
      * @param array $args
      *
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $alias = $this->getTableAlias();
 
@@ -120,7 +113,7 @@ public function getEntities($args = array())
         $query = $q->getQuery();
 
         if (isset($args['hydration_mode'])) {
-            $hydrationMode = constant("\\Doctrine\\ORM\\Query::".strtoupper($args['hydration_mode']));
+            $hydrationMode = constant('\\Doctrine\\ORM\\Query::'.strtoupper($args['hydration_mode']));
             $query->setHydrationMode($hydrationMode);
         } else {
             $hydrationMode = Query::HYDRATE_OBJECT;
@@ -162,10 +155,10 @@ public function checkUniqueAlias($alias, $entity = null)
     }
 
     /**
-     * Save an entity through the repository
+     * Save an entity through the repository.
      *
      * @param object $entity
-     * @param bool   $flush true by default; use false if persisting in batches
+     * @param bool   $flush  true by default; use false if persisting in batches
      *
      * @return int
      */
@@ -178,11 +171,9 @@ public function saveEntity($entity, $flush = true)
     }
 
     /**
-     * Persist an array of entities
+     * Persist an array of entities.
      *
      * @param array $entities
-     *
-     * @return void
      */
     public function saveEntities($entities)
     {
@@ -199,10 +190,10 @@ public function saveEntities($entities)
     }
 
     /**
-     * Delete an entity through the repository
+     * Delete an entity through the repository.
      *
      * @param object $entity
-     * @param bool   $flush true by default; use false if persisting in batches
+     * @param bool   $flush  true by default; use false if persisting in batches
      *
      * @return int
      */
@@ -217,11 +208,9 @@ public function deleteEntity($entity, $flush = true)
     }
 
     /**
-     * Delete an array of entities
+     * Delete an array of entities.
      *
      * @param array $entities
-     *
-     * @return void
      */
     public function deleteEntities($entities)
     {
@@ -255,8 +244,6 @@ protected function buildClauses(&$q, array $args)
     /**
      * @param \Doctrine\ORM\QueryBuilder $q
      * @param array                      $args
-     *
-     * @return void
      */
     protected function buildWhereClause(&$q, array $args)
     {
@@ -269,7 +256,7 @@ protected function buildWhereClause(&$q, array $args)
                 if (!empty($filter['force'])) {
                     if (is_array($filter['force'])) {
                         //defined columns with keys of column, expr, value
-                        $forceParameters  = array();
+                        $forceParameters  = [];
                         $forceExpressions = $q->expr()->andX();
                         foreach ($filter['force'] as $f) {
                             if ($f instanceof Query\Expr || $f instanceof CompositeExpression) {
@@ -280,14 +267,14 @@ protected function buildWhereClause(&$q, array $args)
                                     unset($expr->parameters);
                                 }
                             } elseif (is_array($f)) {
-                                list ($expr, $parameters) = $this->getFilterExpr($q, $f);
+                                list($expr, $parameters) = $this->getFilterExpr($q, $f);
                                 $forceExpressions->add($expr);
                                 if (!empty($parameters) && is_array($parameters)) {
                                     $forceParameters = array_merge($forceParameters, $parameters);
                                 }
                             } else {
                                 //string so parse as advanced search
-                                $parsed = $filterHelper->parseSearchString($f);
+                                $parsed                  = $filterHelper->parseSearchString($f);
                                 list($expr, $parameters) = $this->addAdvancedSearchWhereClause($q, $parsed);
                                 $forceExpressions->add($expr);
                                 if (!empty($parameters) && is_array($parameters)) {
@@ -297,7 +284,7 @@ protected function buildWhereClause(&$q, array $args)
                         }
                     } else {
                         //string so parse as advanced search
-                        $parsed = $filterHelper->parseSearchString($filter['force']);
+                        $parsed                                   = $filterHelper->parseSearchString($filter['force']);
                         list($forceExpressions, $forceParameters) = $this->addAdvancedSearchWhereClause($q, $parsed);
                     }
                 }
@@ -317,14 +304,14 @@ protected function buildWhereClause(&$q, array $args)
                         $string = str_replace('%', '', $string);
                     }
 
-                    $filter = $filterHelper->parseSearchString($string);
+                    $filter                         = $filterHelper->parseSearchString($string);
                     list($expressions, $parameters) = $this->addAdvancedSearchWhereClause($q, $filter);
 
                     if (!empty($forceExpressions)) {
                         $parameters = array_merge($parameters, $forceParameters);
                     }
                 } elseif (!empty($forceExpressions)) {
-                    $parameters  = $forceParameters;
+                    $parameters = $forceParameters;
                 }
 
                 $filterCount = 0;
@@ -332,7 +319,7 @@ protected function buildWhereClause(&$q, array $args)
                     $q->andWhere($expressions);
                 }
 
-                if (!empty($forceExpressions) &&  $forcedFilterCount = ($forceExpressions instanceof \Countable) ? count($forceExpressions) : count($forceExpressions->getParts())) {
+                if (!empty($forceExpressions) && $forcedFilterCount = ($forceExpressions instanceof \Countable) ? count($forceExpressions) : count($forceExpressions->getParts())) {
                     $q->andWhere($forceExpressions);
                 }
 
@@ -359,7 +346,7 @@ protected function buildWhereClause(&$q, array $args)
     public function getFilterExpr(&$q, $filter, $parameterName = null)
     {
         $unique    = ($parameterName) ? $parameterName : $this->generateRandomParameterName();
-        $parameter = array();
+        $parameter = [];
 
         if (isset($filter['group'])) {
             $expr = $q->expr()->orX();
@@ -392,16 +379,16 @@ public function getFilterExpr(&$q, $filter, $parameterName = null)
                 $expr->add($subExpr);
             }
             if ($setParameter) {
-                $parameter = array($unique => $filter['value']);
+                $parameter = [$unique => $filter['value']];
             }
         } else {
             $func = (!empty($filter['operator'])) ? $filter['operator'] : $filter['expr'];
 
-            if (in_array($func, array('isNull', 'isNotNull'))) {
+            if (in_array($func, ['isNull', 'isNotNull'])) {
                 $expr = $q->expr()->{$func}($filter['column']);
-            } elseif (in_array($func, array('in', 'notIn'))) {
+            } elseif (in_array($func, ['in', 'notIn'])) {
                 $expr = $q->expr()->{$func}($filter['column'], $filter['value']);
-            } elseif (in_array($func, array('like', 'notLike'))) {
+            } elseif (in_array($func, ['like', 'notLike'])) {
                 if (isset($filter['strict']) && !$filter['strict']) {
                     if (is_numeric($filter['value'])) {
                         // Postgres doesn't like using "LIKE" with numbers
@@ -411,20 +398,20 @@ public function getFilterExpr(&$q, $filter, $parameterName = null)
                     }
                 }
                 $expr      = $q->expr()->{$func}($filter['column'], ':'.$unique);
-                $parameter = array($unique => $filter['value']);
+                $parameter = [$unique => $filter['value']];
             } else {
                 if (isset($filter['strict']) && !$filter['strict']) {
                     $filter['value'] = "%{$filter['value']}%";
                 }
                 $expr      = $q->expr()->{$func}($filter['column'], ':'.$unique);
-                $parameter = array($unique => $filter['value']);
+                $parameter = [$unique => $filter['value']];
             }
             if (!empty($filter['not'])) {
                 $expr = $q->expr()->not($expr);
             }
         }
 
-        return array($expr, $parameter);
+        return [$expr, $parameter];
     }
 
     /**
@@ -435,10 +422,10 @@ public function getFilterExpr(&$q, $filter, $parameterName = null)
      */
     protected function addCatchAllWhereClause(&$qb, $filter)
     {
-        return array(
+        return [
             false,
-            array(),
-        );
+            [],
+        ];
     }
 
     /**
@@ -452,16 +439,16 @@ protected function addAdvancedSearchWhereClause(&$qb, $filters)
         if (isset($filters->root)) {
             //function is determined by the second clause type
             $type         = (isset($filters->root[1])) ? $filters->root[1]->type : $filters->root[0]->type;
-            $parseFilters =& $filters->root;
+            $parseFilters = &$filters->root;
         } elseif (isset($filters->children)) {
             $type         = (isset($filters->children[1])) ? $filters->children[1]->type : $filters->children[0]->type;
-            $parseFilters =& $filters->children;
+            $parseFilters = &$filters->children;
         } else {
             $type         = (isset($filters[1])) ? $filters[1]->type : $filters[0]->type;
-            $parseFilters =& $filters;
+            $parseFilters = &$filters;
         }
 
-        $parameters  = array();
+        $parameters  = [];
         $expressions = $qb->expr()->{"{$type}X"}();
 
         foreach ($parseFilters as $f) {
@@ -473,9 +460,9 @@ protected function addAdvancedSearchWhereClause(&$qb, $filters)
                         list($expr, $params) = $this->addSearchCommandWhereClause($qb, $f);
                     } else {
                         //treat the command:string as if its a single word
-                        $f->string = $f->command.":".$f->string;
-                        $f->not    = false;
-                        $f->strict = true;
+                        $f->string           = $f->command.':'.$f->string;
+                        $f->not              = false;
+                        $f->strict           = true;
                         list($expr, $params) = $this->addCatchAllWhereClause($qb, $f);
                     }
                 } else {
@@ -491,21 +478,21 @@ protected function addAdvancedSearchWhereClause(&$qb, $filters)
             }
         }
 
-        return array($expressions, $parameters);
+        return [$expressions, $parameters];
     }
 
     /**
-     * Array of search commands supported by the repository
+     * Array of search commands supported by the repository.
      *
      * @return array
      */
     public function getSearchCommands()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Test to see if a given command is supported by the repository
+     * Test to see if a given command is supported by the repository.
      *
      * @param string $command
      * @param string $subcommand
@@ -541,8 +528,6 @@ protected function isSupportedSearchCommand(&$command, &$subcommand)
     /**
      * @param \Doctrine\ORM\QueryBuilder $q
      * @param array                      $args
-     *
-     * @return void
      */
     protected function buildOrderByClause(&$q, array $args)
     {
@@ -568,7 +553,7 @@ protected function buildOrderByClause(&$q, array $args)
      */
     protected function getDefaultOrder()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -621,10 +606,10 @@ protected function addStandardCatchAllWhereClause(&$q, $filter, array $columns)
             $expr = $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string),
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -644,14 +629,14 @@ protected function addStandardSearchCommandWhereClause(&$q, $filter)
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
                 $expr            = $q->expr()->eq("$prefix.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
                 $expr            = $q->expr()->eq("$prefix.isPublished", ":$unique");
-                $forceParameters = array($unique => false);
+                $forceParameters = [$unique => false];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
-                $expr            = $q->expr()->orX(
+                $expr = $q->expr()->orX(
                     $q->expr()->isNull("$prefix.category"),
                     $q->expr()->eq("$prefix.category", $q->expr()->literal(''))
                 );
@@ -692,13 +677,13 @@ protected function addStandardSearchCommandWhereClause(&$q, $filter)
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif (!$returnParameter) {
-            $parameters = array();
+            $parameters = [];
         } else {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array($expr, $parameters);
+        return [$expr, $parameters];
     }
 
     /**
@@ -706,24 +691,24 @@ protected function addStandardSearchCommandWhereClause(&$q, $filter)
      */
     public function getStandardSearchCommands()
     {
-        return array(
+        return [
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isunpublished',
             'mautic.core.searchcommand.isuncategorized',
             'mautic.core.searchcommand.ismine',
             'mautic.core.searchcommand.category',
-        );
+        ];
     }
 
     /**
      * Returns a andX Expr() that takes into account isPublished, publishUp and publishDown dates
-     * The Expr() sets a :now and :true parameter that must be set in the calling function
+     * The Expr() sets a :now and :true parameter that must be set in the calling function.
      *
      * @param      $q
      * @param null $alias
      * @param bool $setNowParameter
      * @param bool $setTrueParameter
-     * @param bool $allowNullForPublishedUp  Allow entities without a published up date
+     * @param bool $allowNullForPublishedUp Allow entities without a published up date
      *
      * @return mixed
      */
@@ -739,7 +724,7 @@ public function getPublishedByDateExpression($q, $alias = null, $setNowParameter
             $now = new \DateTime();
             if (!$isORM) {
                 $dtHelper = new DateTimeHelper($now, 'Y-m-d H:i:s', 'local');
-                $now = $dtHelper->toUtcString();
+                $now      = $dtHelper->toUtcString();
             }
             $q->setParameter('now', $now);
         }
@@ -794,7 +779,7 @@ public function getTableAlias()
     }
 
     /**
-     * Gets the properties of an ORM entity
+     * Gets the properties of an ORM entity.
      *
      * @param string $entityClass
      * @param bool   $convertCamelCase
@@ -803,7 +788,7 @@ public function getTableAlias()
      */
     public function getBaseColumns($entityClass, $convertCamelCase = false)
     {
-        static $baseCols = array(true => array(), false => array());
+        static $baseCols = [true => [], false => []];
 
         if (empty($baseCols[$convertCamelCase][$entityClass])) {
             //get a list of properties from the Lead entity so that anything not listed is a custom field
@@ -816,13 +801,13 @@ public function getBaseColumns($entityClass, $convertCamelCase = false)
                 $props       = array_merge($parentProps, $props);
             }
 
-            $baseCols[$convertCamelCase][$entityClass] = array();
+            $baseCols[$convertCamelCase][$entityClass] = [];
             foreach ($props as $p) {
                 if (!in_array($p->name, $baseCols[$convertCamelCase][$entityClass])) {
                     $n = $p->name;
 
                     if ($convertCamelCase) {
-                        $n                                                   = preg_replace('/(?<=\\w)(?=[A-Z])/', "_$1", $n);
+                        $n                                                   = preg_replace('/(?<=\\w)(?=[A-Z])/', '_$1', $n);
                         $n                                                   = strtolower($n);
                         $baseCols[$convertCamelCase][$entityClass][$p->name] = $n;
                     } else {
@@ -836,7 +821,7 @@ public function getBaseColumns($entityClass, $convertCamelCase = false)
     }
 
     /**
-     * Examines the arguments passed to getEntities and converts ORM properties to dBAL column names
+     * Examines the arguments passed to getEntities and converts ORM properties to dBAL column names.
      *
      * @param string $entityClass
      * @param array  $args
@@ -857,7 +842,7 @@ public function convertOrmProperties($entityClass, array $args)
                 }
 
                 if (in_array($col, $properties)) {
-                    $col = preg_replace('/(?<=\\w)(?=[A-Z])/', "_$1", $col);
+                    $col = preg_replace('/(?<=\\w)(?=[A-Z])/', '_$1', $col);
                     $col = strtolower($col);
                 }
 
@@ -875,7 +860,7 @@ public function convertOrmProperties($entityClass, array $args)
                     }
 
                     if (in_array($o, $properties)) {
-                        $o = preg_replace('/(?<=\\w)(?=[A-Z])/', "_$1", $o);
+                        $o = preg_replace('/(?<=\\w)(?=[A-Z])/', '_$1', $o);
                         $o = strtolower($o);
                     }
 
@@ -892,6 +877,7 @@ public function convertOrmProperties($entityClass, array $args)
      * @param $data
      *
      * @return mixed
+     *
      * @throws \Doctrine\ORM\Mapping\MappingException
      * @throws \Exception
      */
@@ -913,7 +899,7 @@ public function createFromArray($className, &$data)
                     }
                 }
 
-                $method = "set".ucfirst($property);
+                $method = 'set'.ucfirst($property);
                 if (method_exists($entity, $method)) {
                     $entity->$method($v);
                 }
@@ -925,9 +911,8 @@ public function createFromArray($className, &$data)
         return $entity;
     }
 
-
     /**
-     * Gets a list of published entities as an array id => label
+     * Gets a list of published entities as an array id => label.
      *
      * @param CompositeExpression $expr        Use $factory->getDatabase()->getExpressionBuilder()->andX()
      * @param array               $parameters  Parameters used in $expr
@@ -936,7 +921,7 @@ public function createFromArray($className, &$data)
      *
      * @return array
      */
-    public function getSimpleList(CompositeExpression $expr = null, array $parameters = array(), $labelColumn = null, $valueColumn = 'id')
+    public function getSimpleList(CompositeExpression $expr = null, array $parameters = [], $labelColumn = null, $valueColumn = 'id')
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
 
@@ -947,7 +932,7 @@ public function getSimpleList(CompositeExpression $expr = null, array $parameter
 
         $tableName = $this->_em->getClassMetadata($this->getEntityName())->getTableName();
 
-        $class      = '\\' . $this->getClassName();
+        $class      = '\\'.$this->getClassName();
         $reflection = new \ReflectionClass(new $class());
 
         // Get the label column if necessary
@@ -959,7 +944,7 @@ public function getSimpleList(CompositeExpression $expr = null, array $parameter
             }
         }
 
-        $q->select($prefix.$valueColumn . ' as value, '.$prefix.$labelColumn.' as label')
+        $q->select($prefix.$valueColumn.' as value, '.$prefix.$labelColumn.' as label')
             ->from($tableName, $alias)
             ->orderBy($prefix.$labelColumn);
 
@@ -974,7 +959,7 @@ public function getSimpleList(CompositeExpression $expr = null, array $parameter
         // Published only
         if ($reflection->hasMethod('getIsPublished')) {
             $q->andWhere(
-                $q->expr()->eq($prefix . 'is_published', ':true')
+                $q->expr()->eq($prefix.'is_published', ':true')
             )
                 ->setParameter('true', true, 'boolean');
         }
@@ -986,8 +971,6 @@ public function getSimpleList(CompositeExpression $expr = null, array $parameter
      * @param      $alias
      * @param null $catAlias
      * @param null $lang
-     *
-     * @return null
      */
     public function findOneBySlugs($alias, $catAlias = null, $lang = null)
     {
@@ -1049,4 +1032,3 @@ public function findOneBySlugs($alias, $catAlias = null, $lang = null)
         return $entity;
     }
 }
-
diff --git a/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php b/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php
index d2af603f199..bb170581baf 100644
--- a/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php
+++ b/app/bundles/CoreBundle/Entity/DynamicContentEntityTrait.php
@@ -1,16 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\EventArgs;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 trait DynamicContentEntityTrait
@@ -33,18 +32,18 @@ trait DynamicContentEntityTrait
                             'type'     => null,
                             'operator' => null,
                             'display'  => null,
-                            'filter'   => null
-                        ]
-                    ]
-                ]
-            ]
-        ]
+                            'filter'   => null,
+                        ],
+                    ],
+                ],
+            ],
+        ],
     ];
 
     /**
      * @param ClassMetadataBuilder $builder
      */
-    static protected function addDynamicContentMetadata(ClassMetadataBuilder $builder)
+    protected static function addDynamicContentMetadata(ClassMetadataBuilder $builder)
     {
         $builder->createField('dynamicContent', 'array')
             ->columnName('dynamic_content')
@@ -67,4 +66,4 @@ public function setDynamicContent($dynamicContent)
     {
         $this->dynamicContent = $dynamicContent;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/FormEntity.php b/app/bundles/CoreBundle/Entity/FormEntity.php
index 84a9d5901df..9da551e512b 100644
--- a/app/bundles/CoreBundle/Entity/FormEntity.php
+++ b/app/bundles/CoreBundle/Entity/FormEntity.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,13 +17,10 @@
 use Mautic\UserBundle\Entity\User;
 
 /**
- * Class FormEntity
- *
- * @package Mautic\CoreBundle\Entity
+ * Class FormEntity.
  */
 class FormEntity extends CommonEntity
 {
-
     /**
      * @var bool
      */
@@ -49,7 +47,7 @@ class FormEntity extends CommonEntity
     private $dateModified;
 
     /**
-     * var null|int
+     * var null|int.
      */
     private $modifiedBy;
 
@@ -76,7 +74,7 @@ class FormEntity extends CommonEntity
     /**
      * @var array
      */
-    protected $changes = array();
+    protected $changes = [];
 
     /**
      * @var
@@ -140,7 +138,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -148,21 +146,21 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('publish')
             ->addProperties(
-                array(
+                [
                     'isPublished',
                     'dateAdded',
                     'createdBy',
                     'createdByUser',
                     'dateModified',
                     'modifiedBy',
-                    'modifiedByUser'
-                )
+                    'modifiedByUser',
+                ]
             )
             ->build();
     }
 
     /**
-     * Clear dates on clone
+     * Clear dates on clone.
      */
     public function __clone()
     {
@@ -170,11 +168,11 @@ public function __clone()
         $this->dateModified = null;
         $this->checkedOut   = null;
         $this->isPublished  = false;
-        $this->changes      = array();
+        $this->changes      = [];
     }
 
     /**
-     * Check publish status with option to check against category, publish up and down dates
+     * Check publish status with option to check against category, publish up and down dates.
      *
      * @param bool $checkPublishStatus
      * @param bool $checkCategoryStatus
@@ -202,7 +200,7 @@ public function isPublished($checkPublishStatus = true, $checkCategoryStatus = t
     }
 
     /**
-     * Set dateAdded
+     * Set dateAdded.
      *
      * @param \DateTime $dateAdded
      *
@@ -216,7 +214,7 @@ public function setDateAdded($dateAdded)
     }
 
     /**
-     * Get dateAdded
+     * Get dateAdded.
      *
      * @return \DateTime
      */
@@ -226,7 +224,7 @@ public function getDateAdded()
     }
 
     /**
-     * Set dateModified
+     * Set dateModified.
      *
      * @param \DateTime $dateModified
      *
@@ -240,7 +238,7 @@ public function setDateModified($dateModified)
     }
 
     /**
-     * Get dateModified
+     * Get dateModified.
      *
      * @return \DateTime
      */
@@ -250,7 +248,7 @@ public function getDateModified()
     }
 
     /**
-     * Set checkedOut
+     * Set checkedOut.
      *
      * @param \DateTime $checkedOut
      *
@@ -264,7 +262,7 @@ public function setCheckedOut($checkedOut)
     }
 
     /**
-     * Get checkedOut
+     * Get checkedOut.
      *
      * @return \DateTime
      */
@@ -274,7 +272,7 @@ public function getCheckedOut()
     }
 
     /**
-     * Set createdBy
+     * Set createdBy.
      *
      * @param User $createdBy
      *
@@ -282,7 +280,7 @@ public function getCheckedOut()
      */
     public function setCreatedBy($createdBy = null)
     {
-        if ($createdBy != null && !$createdBy instanceof User ) {
+        if ($createdBy != null && !$createdBy instanceof User) {
             $this->createdBy = $createdBy;
         } else {
             $this->createdBy = ($createdBy != null) ? $createdBy->getId() : null;
@@ -295,7 +293,7 @@ public function setCreatedBy($createdBy = null)
     }
 
     /**
-     * Get createdBy
+     * Get createdBy.
      *
      * @return User
      */
@@ -305,7 +303,7 @@ public function getCreatedBy()
     }
 
     /**
-     * Set modifiedBy
+     * Set modifiedBy.
      *
      * @param User $modifiedBy
      *
@@ -313,7 +311,7 @@ public function getCreatedBy()
      */
     public function setModifiedBy($modifiedBy = null)
     {
-        if ($modifiedBy != null && !$modifiedBy instanceof User ) {
+        if ($modifiedBy != null && !$modifiedBy instanceof User) {
             $this->modifiedBy = $modifiedBy;
         } else {
             $this->modifiedBy = ($modifiedBy != null) ? $modifiedBy->getId() : null;
@@ -327,7 +325,7 @@ public function setModifiedBy($modifiedBy = null)
     }
 
     /**
-     * Get modifiedBy
+     * Get modifiedBy.
      *
      * @return User
      */
@@ -337,7 +335,7 @@ public function getModifiedBy()
     }
 
     /**
-     * Set checkedOutBy
+     * Set checkedOutBy.
      *
      * @param User $checkedOutBy
      *
@@ -345,7 +343,7 @@ public function getModifiedBy()
      */
     public function setCheckedOutBy($checkedOutBy = null)
     {
-        if ($checkedOutBy != null && !$checkedOutBy instanceof User ) {
+        if ($checkedOutBy != null && !$checkedOutBy instanceof User) {
             $this->checkedOutBy = $checkedOutBy;
         } else {
             $this->checkedOutBy = ($checkedOutBy != null) ? $checkedOutBy->getId() : null;
@@ -359,7 +357,7 @@ public function setCheckedOutBy($checkedOutBy = null)
     }
 
     /**
-     * Get checkedOutBy
+     * Get checkedOutBy.
      *
      * @return User
      */
@@ -369,9 +367,9 @@ public function getCheckedOutBy()
     }
 
     /**
-     * Set isPublished
+     * Set isPublished.
      *
-     * @param boolean $isPublished
+     * @param bool $isPublished
      *
      * @return $this
      */
@@ -385,9 +383,9 @@ public function setIsPublished($isPublished)
     }
 
     /**
-     * Get isPublished
+     * Get isPublished.
      *
-     * @return boolean
+     * @return bool
      */
     public function getIsPublished()
     {
@@ -395,9 +393,10 @@ public function getIsPublished()
     }
 
     /**
-     * Check the publish status of an entity based on publish up and down datetimes
+     * Check the publish status of an entity based on publish up and down datetimes.
      *
      * @return string early|expired|published|unpublished
+     *
      * @throws \BadMethodCallException
      */
     public function getPublishStatus()
diff --git a/app/bundles/CoreBundle/Entity/IpAddress.php b/app/bundles/CoreBundle/Entity/IpAddress.php
index be3721ba4db..3816f3979c7 100644
--- a/app/bundles/CoreBundle/Entity/IpAddress.php
+++ b/app/bundles/CoreBundle/Entity/IpAddress.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,19 +15,16 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class IpAddress
- *
- * @package Mautic\CoreBundle\Entity
+ * Class IpAddress.
  */
 class IpAddress
 {
-
     /**
-     * Set by factory of configured IPs to not track
+     * Set by factory of configured IPs to not track.
      *
      * @var array
      */
-    private $doNotTrack = array();
+    private $doNotTrack = [];
 
     /**
      * @var int
@@ -46,13 +44,13 @@ class IpAddress
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('ip_addresses')
             ->setCustomRepositoryClass('Mautic\CoreBundle\Entity\IpAddressRepository')
-            ->addIndex(array('ip_address'), 'ip_search');
+            ->addIndex(['ip_address'], 'ip_search');
 
         $builder->addId();
 
@@ -68,27 +66,27 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
     public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->addProperties(
-                array(
+                [
                     'id',
                     'ipAddress',
-                    'ipDetails'
-                )
+                    'ipDetails',
+                ]
             )
             ->addGroup('ipAddress')
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -96,7 +94,7 @@ public function getId()
     }
 
     /**
-     * Set ipAddress
+     * Set ipAddress.
      *
      * @param $ipAddress
      *
@@ -110,7 +108,7 @@ public function setIpAddress($ipAddress)
     }
 
     /**
-     * Get ipAddress
+     * Get ipAddress.
      *
      * @return string
      */
@@ -120,7 +118,7 @@ public function getIpAddress()
     }
 
     /**
-     * Set ipDetails
+     * Set ipDetails.
      *
      * @param string $ipDetails
      *
@@ -134,7 +132,7 @@ public function setIpDetails($ipDetails)
     }
 
     /**
-     * Get ipDetails
+     * Get ipDetails.
      *
      * @return string
      */
@@ -144,7 +142,7 @@ public function getIpDetails()
     }
 
     /**
-     * Set list of IPs to not track
+     * Set list of IPs to not track.
      *
      * @param array $ips
      */
@@ -154,7 +152,7 @@ public function setDoNotTrackList(array $ips)
     }
 
     /**
-     * Get list of IPs to not track
+     * Get list of IPs to not track.
      *
      * @return array
      */
@@ -164,13 +162,13 @@ public function getDoNotTrackList()
     }
 
     /**
-     * Determine if this IP is trackable
+     * Determine if this IP is trackable.
      */
     public function isTrackable()
     {
         if (!empty($this->doNotTrack)) {
             foreach ($this->doNotTrack as $ip) {
-                if ( strpos( $ip, '/' ) == false ) {
+                if (strpos($ip, '/') == false) {
                     if (preg_match('/'.str_replace('.', '\\.', $ip).'/', $this->ipAddress)) {
                         return false;
                     }
@@ -178,10 +176,10 @@ public function isTrackable()
                     // has a netmask range
                     // https://gist.github.com/tott/7684443
                     list($range, $netmask) = explode('/', $ip, 2);
-                    $range_decimal    = ip2long($range);
-                    $ip_decimal       = ip2long($ip);
-                    $wildcard_decimal = pow(2, (32 - $netmask)) - 1;
-                    $netmask_decimal  = ~$wildcard_decimal;
+                    $range_decimal         = ip2long($range);
+                    $ip_decimal            = ip2long($ip);
+                    $wildcard_decimal      = pow(2, (32 - $netmask)) - 1;
+                    $netmask_decimal       = ~$wildcard_decimal;
 
                     if ((($ip_decimal & $netmask_decimal) == ($range_decimal & $netmask_decimal))) {
                         return false;
diff --git a/app/bundles/CoreBundle/Entity/IpAddressRepository.php b/app/bundles/CoreBundle/Entity/IpAddressRepository.php
index ad9b3f3d975..9a0a740de26 100644
--- a/app/bundles/CoreBundle/Entity/IpAddressRepository.php
+++ b/app/bundles/CoreBundle/Entity/IpAddressRepository.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Entity;
 
 /**
- * IpAddressRepository
+ * IpAddressRepository.
  */
 class IpAddressRepository extends CommonRepository
 {
     /**
-     * Count how many unique IP addresses is there
+     * Count how many unique IP addresses is there.
      *
      * @return int
      */
diff --git a/app/bundles/CoreBundle/Entity/MessageQueue.php b/app/bundles/CoreBundle/Entity/MessageQueue.php
index 70a2cbd9661..0a42f46ef72 100644
--- a/app/bundles/CoreBundle/Entity/MessageQueue.php
+++ b/app/bundles/CoreBundle/Entity/MessageQueue.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,9 +16,7 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class MessageQueue
- *
- * @package Mautic\CoreBundle\Entity
+ * Class MessageQueue.
  */
 class MessageQueue
 {
@@ -97,7 +96,7 @@ class MessageQueue
     private $options = [];
 
     /**
-     * Used by listeners to note if the message had been processed in bulk
+     * Used by listeners to note if the message had been processed in bulk.
      *
      * @var bool
      */
@@ -106,7 +105,7 @@ class MessageQueue
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -187,17 +186,17 @@ public function getId()
     }
 
     /**
-     * @return integer
+     * @return int
      */
-    public function getAttempts ()
+    public function getAttempts()
     {
         return $this->attempts;
     }
 
     /**
-     * @param integer $attempts
+     * @param int $attempts
      */
-    public function setAttempts ($attempts)
+    public function setAttempts($attempts)
     {
         $this->attempts = $attempts;
     }
@@ -205,7 +204,7 @@ public function setAttempts ($attempts)
     /**
      * @return array
      */
-    public function getOptions ()
+    public function getOptions()
     {
         return $this->options;
     }
@@ -213,7 +212,7 @@ public function getOptions ()
     /**
      * @param array $options
      */
-    public function setOptions ($options)
+    public function setOptions($options)
     {
         $this->options[] = $options;
     }
@@ -221,7 +220,7 @@ public function setOptions ($options)
     /**
      * @return string
      */
-    public function getChannel ()
+    public function getChannel()
     {
         return $this->channel;
     }
@@ -229,7 +228,7 @@ public function getChannel ()
     /**
      * @param string $channel
      */
-    public function setChannel ($channel)
+    public function setChannel($channel)
     {
         $this->channel = $channel;
     }
@@ -277,7 +276,7 @@ public function setEvent(Event $event)
     /**
      * @return \DateTime
      */
-    public function getDatePublished ()
+    public function getDatePublished()
     {
         return $this->datePublished;
     }
@@ -285,7 +284,7 @@ public function getDatePublished ()
     /**
      * @param \DateTime $datePublished
      */
-    public function setDatePublished ($datePublished)
+    public function setDatePublished($datePublished)
     {
         $this->datePublished = $datePublished;
     }
@@ -293,7 +292,7 @@ public function setDatePublished ($datePublished)
     /**
      * @return \DateTime
      */
-    public function getDateSent ()
+    public function getDateSent()
     {
         return $this->dateSent;
     }
@@ -301,7 +300,7 @@ public function getDateSent ()
     /**
      * @param \DateTime $dateSent
      */
-    public function setDateSent ($dateSent)
+    public function setDateSent($dateSent)
     {
         $this->dateSent = $dateSent;
     }
@@ -309,7 +308,7 @@ public function setDateSent ($dateSent)
     /**
      * @return \DateTime
      */
-    public function getLastAttempt ()
+    public function getLastAttempt()
     {
         return $this->lastAttempt;
     }
@@ -317,14 +316,14 @@ public function getLastAttempt ()
     /**
      * @param \DateTime $lastAttempt
      */
-    public function setLastAttempt ($lastAttempt)
+    public function setLastAttempt($lastAttempt)
     {
         $this->lastAttempt = $lastAttempt;
     }
     /**
      * @return Lead
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -332,39 +331,39 @@ public function getLead ()
     /**
      * @param Lead $lead
      */
-    public function setLead (Lead $lead)
+    public function setLead(Lead $lead)
     {
         $this->lead = $lead;
     }
 
     /**
-     * @return integer
+     * @return int
      */
-    public function getMaxAttempts ()
+    public function getMaxAttempts()
     {
         return $this->maxAttempts;
     }
 
     /**
-     * @param integer $maxAttempts
+     * @param int $maxAttempts
      */
-    public function setMaxAttempts ($maxAttempts)
+    public function setMaxAttempts($maxAttempts)
     {
         $this->maxAttempts = $maxAttempts;
     }
 
     /**
-     * @return integer
+     * @return int
      */
-    public function getPriority ()
+    public function getPriority()
     {
         return $this->priority;
     }
 
     /**
-     * @param integer $priority
+     * @param int $priority
      */
-    public function setPriority ($priority)
+    public function setPriority($priority)
     {
         $this->priority = $priority;
     }
@@ -372,7 +371,7 @@ public function setPriority ($priority)
     /**
      * @return mixed
      */
-    public function getScheduledDate ()
+    public function getScheduledDate()
     {
         return $this->scheduledDate;
     }
@@ -388,7 +387,7 @@ public function setScheduledDate($scheduledDate)
     /**
      * @return string
      */
-    public function getStatus ()
+    public function getStatus()
     {
         return $this->status;
     }
@@ -396,7 +395,7 @@ public function getStatus ()
     /**
      * @param string $status
      */
-    public function setStatus ($status)
+    public function setStatus($status)
     {
         $this->status = $status;
     }
@@ -404,7 +403,7 @@ public function setStatus ($status)
     /**
      * @return bool
      */
-    public function getSuccess ()
+    public function getSuccess()
     {
         return $this->success;
     }
@@ -412,7 +411,7 @@ public function getSuccess ()
     /**
      * @return bool
      */
-    public function isSuccess ()
+    public function isSuccess()
     {
         return $this->success;
     }
@@ -420,13 +419,13 @@ public function isSuccess ()
     /**
      * @param bool $success
      */
-    public function setSuccess ($success = true)
+    public function setSuccess($success = true)
     {
         $this->success = $success;
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isProcessed()
     {
@@ -434,7 +433,7 @@ public function isProcessed()
     }
 
     /**
-     * @param boolean $processed
+     * @param bool $processed
      *
      * @return MessageQueue
      */
@@ -444,4 +443,4 @@ public function setProcessed($processed = true)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/MessageQueueRepository.php b/app/bundles/CoreBundle/Entity/MessageQueueRepository.php
index b74582e8475..c60202d0fc2 100644
--- a/app/bundles/CoreBundle/Entity/MessageQueueRepository.php
+++ b/app/bundles/CoreBundle/Entity/MessageQueueRepository.php
@@ -1,23 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Entity;
 
-use Doctrine\ORM\EntityRepository;
-use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 /**
- * MessageQueueRepository
+ * MessageQueueRepository.
  */
 class MessageQueueRepository extends CommonRepository
 {
-    public function findMessage($channel,$channelId,$leadId)
+    public function findMessage($channel, $channelId, $leadId)
     {
         $results = $this->createQueryBuilder('mq')
             ->where('IDENTITY(mq.lead) = :leadId')
@@ -40,7 +38,7 @@ public function findMessage($channel,$channelId,$leadId)
      *
      * @return mixed
      */
-    public function getQueuedMessages($limit, $processStarted, $channel = null, $channelId =  null)
+    public function getQueuedMessages($limit, $processStarted, $channel = null, $channelId = null)
     {
         $q = $this->createQueryBuilder('mq');
 
@@ -71,4 +69,4 @@ public function getQueuedMessages($limit, $processStarted, $channel = null, $cha
 
         return $results;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/Notification.php b/app/bundles/CoreBundle/Entity/Notification.php
index 20eece44119..5f5fba30733 100644
--- a/app/bundles/CoreBundle/Entity/Notification.php
+++ b/app/bundles/CoreBundle/Entity/Notification.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,14 +15,11 @@
 use Mautic\UserBundle\Entity\User;
 
 /**
- * Class Notification
- *
- * @package Mautic\CoreBundle\Entity
+ * Class Notification.
  */
 class Notification
 {
-
-    /** @var  int */
+    /** @var int */
     protected $id;
 
     /**
@@ -62,7 +60,7 @@ class Notification
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -104,7 +102,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return mixed
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
@@ -112,7 +110,7 @@ public function getId ()
     /**
      * @return mixed
      */
-    public function getUser ()
+    public function getUser()
     {
         return $this->user;
     }
@@ -120,7 +118,7 @@ public function getUser ()
     /**
      * @param mixed $user
      */
-    public function setUser (User $user)
+    public function setUser(User $user)
     {
         $this->user = $user;
     }
@@ -128,7 +126,7 @@ public function setUser (User $user)
     /**
      * @return mixed
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
@@ -136,7 +134,7 @@ public function getType ()
     /**
      * @param mixed $type
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->type = $type;
     }
@@ -144,7 +142,7 @@ public function setType ($type)
     /**
      * @return mixed
      */
-    public function getMessage ()
+    public function getMessage()
     {
         return $this->message;
     }
@@ -152,7 +150,7 @@ public function getMessage ()
     /**
      * @param mixed $message
      */
-    public function setMessage ($message)
+    public function setMessage($message)
     {
         $this->message = $message;
     }
@@ -160,7 +158,7 @@ public function setMessage ($message)
     /**
      * @return mixed
      */
-    public function getDateAdded ()
+    public function getDateAdded()
     {
         return $this->dateAdded;
     }
@@ -168,7 +166,7 @@ public function getDateAdded ()
     /**
      * @param mixed $dateAdded
      */
-    public function setDateAdded ($dateAdded)
+    public function setDateAdded($dateAdded)
     {
         $this->dateAdded = $dateAdded;
     }
@@ -176,7 +174,7 @@ public function setDateAdded ($dateAdded)
     /**
      * @return mixed
      */
-    public function getIconClass ()
+    public function getIconClass()
     {
         return $this->iconClass;
     }
@@ -184,7 +182,7 @@ public function getIconClass ()
     /**
      * @param mixed $iconClass
      */
-    public function setIconClass ($iconClass)
+    public function setIconClass($iconClass)
     {
         $this->iconClass = $iconClass;
     }
@@ -192,7 +190,7 @@ public function setIconClass ($iconClass)
     /**
      * @return mixed
      */
-    public function getIsRead ()
+    public function getIsRead()
     {
         return $this->isRead;
     }
@@ -200,7 +198,7 @@ public function getIsRead ()
     /**
      * @param mixed $isRead
      */
-    public function setIsRead ($isRead)
+    public function setIsRead($isRead)
     {
         $this->isRead = (bool) $isRead;
     }
@@ -208,7 +206,7 @@ public function setIsRead ($isRead)
     /**
      * @return mixed
      */
-    public function getHeader ()
+    public function getHeader()
     {
         return $this->header;
     }
@@ -216,8 +214,8 @@ public function getHeader ()
     /**
      * @param mixed $header
      */
-    public function setHeader ($header)
+    public function setHeader($header)
     {
         $this->header = $header;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/NotificationRepository.php b/app/bundles/CoreBundle/Entity/NotificationRepository.php
index edb61554402..445d8d1f1bd 100644
--- a/app/bundles/CoreBundle/Entity/NotificationRepository.php
+++ b/app/bundles/CoreBundle/Entity/NotificationRepository.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Entity;
 
 /**
- * NotificationRepository
+ * NotificationRepository.
  */
 class NotificationRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      *
@@ -32,38 +32,38 @@ public function getTableAlias()
      */
     public function getDefaultOrder()
     {
-        return array(
-            array('n.dateAdded', 'DESC')
-        );
+        return [
+            ['n.dateAdded', 'DESC'],
+        ];
     }
 
     /**
-     * Mark user notifications as read
+     * Mark user notifications as read.
      *
      * @param $userId
      */
     public function markAllReadForUser($userId)
     {
-        $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX . 'notifications', array('is_read' => 1), array('user_id' => (int) $userId));
+        $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX.'notifications', ['is_read' => 1], ['user_id' => (int) $userId]);
     }
 
     /**
-     * Clear notifications for a user
+     * Clear notifications for a user.
      *
      * @param      $userId
-     * @param null $id      Clears all if empty
+     * @param null $id     Clears all if empty
      *
      * @throws \Doctrine\DBAL\Exception\InvalidArgumentException
      */
     public function clearNotificationsForUser($userId, $id = null)
     {
-        $filter = array('user_id' => (int) $userId);
+        $filter = ['user_id' => (int) $userId];
 
         if (!empty($id)) {
             $filter['id'] = (int) $id;
         }
 
-        $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX . 'notifications', ['is_read' => 1], $filter);
+        $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX.'notifications', ['is_read' => 1], $filter);
     }
 
     /**
@@ -84,7 +84,7 @@ public function getUpstreamLastDate()
     }
 
     /**
-     * Fetch notifications for this user
+     * Fetch notifications for this user.
      *
      * @param      $userId
      * @param null $afterId
@@ -124,4 +124,4 @@ public function getNotifications($userId, $afterId = null, $includeRead = false,
 
         return $qb->getQuery()->getArrayResult();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/TranslationEntityInterface.php b/app/bundles/CoreBundle/Entity/TranslationEntityInterface.php
index ef758fb86dd..3e575182495 100644
--- a/app/bundles/CoreBundle/Entity/TranslationEntityInterface.php
+++ b/app/bundles/CoreBundle/Entity/TranslationEntityInterface.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,54 +13,54 @@
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * Interface TranslationInterface
+ * Interface TranslationInterface.
  */
 interface TranslationEntityInterface
 {
     /**
-     * Get translation parent
+     * Get translation parent.
      *
      * @return TranslationEntityInterface
      */
     public function getTranslationParent();
 
     /**
-     * Set entity this is a translation of
+     * Set entity this is a translation of.
      *
      * @return mixed
      */
     public function setTranslationParent(TranslationEntityInterface $parent = null);
 
     /**
-     * Set this entity as a main content (remove translation parent)
+     * Set this entity as a main content (remove translation parent).
      *
      * @return mixed
      */
     public function removeTranslationParent();
 
     /**
-     * Get ArrayCollection of translated entities
+     * Get ArrayCollection of translated entities.
      *
      * @return ArrayCollection
      */
     public function getTranslationChildren();
 
     /**
-     * Add entity to $translationChildren
+     * Add entity to $translationChildren.
      *
      * @return mixed
      */
     public function addTranslationChild(TranslationEntityInterface $child);
 
     /**
-     * Remove entity from $translationChildren
+     * Remove entity from $translationChildren.
      *
      * @return mixed
      */
     public function removeTranslationChild(TranslationEntityInterface $child);
 
     /**
-     * Get array with entities for this translation
+     * Get array with entities for this translation.
      *
      * If $onlyChildren, then return just $children; otherwise [$parent, $children]
      *
@@ -75,9 +76,9 @@ public function getTranslations($onlyChildren = false);
     public function isTranslation($isChild = false);
 
     /**
-     * Get the language
+     * Get the language.
      *
      * @return mixed
      */
     public function getLanguage();
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/TranslationEntityTrait.php b/app/bundles/CoreBundle/Entity/TranslationEntityTrait.php
index 551245a690b..78f76e1e917 100644
--- a/app/bundles/CoreBundle/Entity/TranslationEntityTrait.php
+++ b/app/bundles/CoreBundle/Entity/TranslationEntityTrait.php
@@ -1,16 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Entity;
 
-
-
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
@@ -18,7 +17,7 @@
 trait TranslationEntityTrait
 {
     /**
-     * Set by AbstractCommonModel::getEntityBySlugs() if a language slug was used to fetch the entity
+     * Set by AbstractCommonModel::getEntityBySlugs() if a language slug was used to fetch the entity.
      *
      * @var string
      */
@@ -44,7 +43,7 @@ trait TranslationEntityTrait
      * @param               $entityClass
      * @param string        $languageColumnName
      */
-    static protected function addTranslationMetadata(ClassMetadataBuilder $builder, $entityClass, $languageColumnName = 'lang')
+    protected static function addTranslationMetadata(ClassMetadataBuilder $builder, $entityClass, $languageColumnName = 'lang')
     {
         $builder->createOneToMany('translationChildren', $entityClass)
             ->setIndexBy('id')
@@ -63,7 +62,7 @@ static protected function addTranslationMetadata(ClassMetadataBuilder $builder,
     }
 
     /**
-     * Add translation
+     * Add translation.
      *
      * @param TranslationEntityInterface $translationChildren
      *
@@ -79,7 +78,7 @@ public function addTranslationChild(TranslationEntityInterface $child)
     }
 
     /**
-     * Remove translation
+     * Remove translation.
      *
      * @param TranslationEntityInterface $child
      */
@@ -89,7 +88,7 @@ public function removeTranslationChild(TranslationEntityInterface $child)
     }
 
     /**
-     * Get translated items
+     * Get translated items.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
@@ -99,7 +98,7 @@ public function getTranslationChildren()
     }
 
     /**
-     * Set translation parent
+     * Set translation parent.
      *
      * @param TranslationEntityInterface $translationParent
      *
@@ -117,7 +116,7 @@ public function setTranslationParent(TranslationEntityInterface $parent = null)
     }
 
     /**
-     * Get translation parent
+     * Get translation parent.
      *
      * @return $this
      */
@@ -127,7 +126,7 @@ public function getTranslationParent()
     }
 
     /**
-     * Remove translation parent
+     * Remove translation parent.
      */
     public function removeTranslationParent()
     {
@@ -139,7 +138,7 @@ public function removeTranslationParent()
     }
 
     /**
-     * Set language
+     * Set language.
      *
      * @param string $language
      *
@@ -157,7 +156,7 @@ public function setLanguage($language)
     }
 
     /**
-     * Get language
+     * Get language.
      *
      * @return string
      */
@@ -177,16 +176,14 @@ public function isTranslation($isChild = false)
         $children = $this->getTranslationChildren();
 
         if ($isChild) {
-
             return ($parent === null) ? false : true;
         } else {
-
             return (!empty($parent) || count($children)) ? true : false;
         }
     }
 
     /**
-     * Check if this entity has translations
+     * Check if this entity has translations.
      *
      * @return int
      */
@@ -198,7 +195,7 @@ public function hasTranslations()
     }
 
     /**
-     * Clear translations
+     * Clear translations.
      */
     public function clearTranslations()
     {
@@ -207,7 +204,7 @@ public function clearTranslations()
     }
 
     /**
-     * Get translation parent/children
+     * Get translation parent/children.
      *
      * @param bool $onlyChildren
      *
@@ -232,7 +229,6 @@ public function getTranslations($onlyChildren = false)
         }
 
         if ($onlyChildren) {
-
             return $children;
         }
 
@@ -261,4 +257,4 @@ protected function getAccumulativeTranslationCount($getter, $variantParent = nul
 
         return $count;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/VariantEntityInterface.php b/app/bundles/CoreBundle/Entity/VariantEntityInterface.php
index 10fd908c7eb..b3594646c77 100644
--- a/app/bundles/CoreBundle/Entity/VariantEntityInterface.php
+++ b/app/bundles/CoreBundle/Entity/VariantEntityInterface.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,68 +13,68 @@
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * Interface VariantEntityInterface
+ * Interface VariantEntityInterface.
  */
 interface VariantEntityInterface
 {
     /**
-     * Get translation parent
+     * Get translation parent.
      *
      * @return VariantEntityInterface
      */
     public function getVariantParent();
 
     /**
-     * Set entity this is a translation of
+     * Set entity this is a translation of.
      *
      * @return mixed
      */
     public function setVariantParent(VariantEntityInterface $parent = null);
 
     /**
-     * Set this entity as a main content (remove translation parent)
+     * Set this entity as a main content (remove translation parent).
      *
      * @return mixed
      */
     public function removeVariantParent();
 
     /**
-     * Get ArrayCollection of translated entities
+     * Get ArrayCollection of translated entities.
      *
      * @return ArrayCollection
      */
     public function getVariantChildren();
 
     /**
-     * Add entity to $translationChildren
+     * Add entity to $translationChildren.
      *
      * @return mixed
      */
     public function addVariantChild(VariantEntityInterface $child);
 
     /**
-     * Remove entity from $translationChildren
+     * Remove entity from $translationChildren.
      *
      * @return mixed
      */
     public function removeVariantChild(VariantEntityInterface $child);
 
     /**
-     * Get settings array for the variant
+     * Get settings array for the variant.
      *
      * @return mixed
      */
     public function getVariantSettings();
 
     /**
-     * Get \DateTime when a/b test went into effect
+     * Get \DateTime when a/b test went into effect.
      *
      * @return \DateTime
      */
     public function getVariantStartDate();
 
     /**
-     * Get all entities for variant parent/children
+     * Get all entities for variant parent/children.
      *
      * @return array[$parent, $children]
      */
@@ -85,4 +86,4 @@ public function getVariants();
      * @return bool
      */
     public function isVariant($isChild = false);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Entity/VariantEntityTrait.php b/app/bundles/CoreBundle/Entity/VariantEntityTrait.php
index e528cd5f65b..ba84d86b76f 100644
--- a/app/bundles/CoreBundle/Entity/VariantEntityTrait.php
+++ b/app/bundles/CoreBundle/Entity/VariantEntityTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -28,7 +29,7 @@ trait VariantEntityTrait
     /**
      * @var array
      */
-    private $variantSettings = array();
+    private $variantSettings = [];
 
     /**
      * @var \DateTime
@@ -39,7 +40,7 @@ trait VariantEntityTrait
      * @param ClassMetadata $builder
      * @param               $entityClass
      */
-    static protected function addVariantMetadata(ClassMetadataBuilder $builder, $entityClass)
+    protected static function addVariantMetadata(ClassMetadataBuilder $builder, $entityClass)
     {
         $builder->createManyToOne('variantParent', $entityClass)
             ->inversedBy('variantChildren')
@@ -64,13 +65,13 @@ static protected function addVariantMetadata(ClassMetadataBuilder $builder, $ent
     }
 
     /**
-     * Add variant
+     * Add variant.
      *
      * @param VariantEntityInterface $child
      *
      * @return $this
      */
-    public function addVariantChild (VariantEntityInterface $child)
+    public function addVariantChild(VariantEntityInterface $child)
     {
         if (!$this->variantChildren->contains($child)) {
             $this->variantChildren[] = $child;
@@ -80,33 +81,33 @@ public function addVariantChild (VariantEntityInterface $child)
     }
 
     /**
-     * Remove variant
+     * Remove variant.
      *
      * @param VariantEntityInterface $child
      */
-    public function removeVariantChild (VariantEntityInterface $child)
+    public function removeVariantChild(VariantEntityInterface $child)
     {
         $this->variantChildren->removeElement($child);
     }
 
     /**
-     * Get variantChildren
+     * Get variantChildren.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getVariantChildren ()
+    public function getVariantChildren()
     {
         return $this->variantChildren;
     }
 
     /**
-     * Set variantParent
+     * Set variantParent.
      *
      * @param VarientEntityEnterface $parent
      *
-     * @return $This
+     * @return $this
      */
-    public function setVariantParent (VariantEntityInterface $parent = null)
+    public function setVariantParent(VariantEntityInterface $parent = null)
     {
         if (method_exists($this, 'isChanged')) {
             $this->isChanged('variantParent', $parent);
@@ -118,17 +119,17 @@ public function setVariantParent (VariantEntityInterface $parent = null)
     }
 
     /**
-     * Get variantParent
+     * Get variantParent.
      *
      * @return $this
      */
-    public function getVariantParent ()
+    public function getVariantParent()
     {
         return $this->variantParent;
     }
 
     /**
-     * Remove variant parent
+     * Remove variant parent.
      */
     public function removeVariantParent()
     {
@@ -136,13 +137,13 @@ public function removeVariantParent()
     }
 
     /**
-     * Set variantSettings
+     * Set variantSettings.
      *
      * @param array $variantSettings
      *
      * @return $this
      */
-    public function setVariantSettings ($variantSettings)
+    public function setVariantSettings($variantSettings)
     {
         if (method_exists($this, 'isChanged')) {
             $this->isChanged('variantSettings', $variantSettings);
@@ -154,11 +155,11 @@ public function setVariantSettings ($variantSettings)
     }
 
     /**
-     * Get variantSettings
+     * Get variantSettings.
      *
      * @return array
      */
-    public function getVariantSettings ()
+    public function getVariantSettings()
     {
         return $this->variantSettings;
     }
@@ -166,7 +167,7 @@ public function getVariantSettings ()
     /**
      * @return mixed
      */
-    public function getVariantStartDate ()
+    public function getVariantStartDate()
     {
         return $this->variantStartDate;
     }
@@ -176,7 +177,7 @@ public function getVariantStartDate ()
      *
      * @return $this
      */
-    public function setVariantStartDate ($variantStartDate)
+    public function setVariantStartDate($variantStartDate)
     {
         if (method_exists($this, 'isChanged')) {
             $this->isChanged('variantStartDate', $variantStartDate);
@@ -198,16 +199,14 @@ public function isVariant($isChild = false)
         $children = $this->getVariantChildren();
 
         if ($isChild) {
-
             return ($parent === null) ? false : true;
         } else {
-
             return (!empty($parent) || count($children)) ? true : false;
         }
     }
 
     /**
-     * Check if this entity has variants
+     * Check if this entity has variants.
      *
      * @return int
      */
@@ -219,7 +218,7 @@ public function hasVariants()
     }
 
     /**
-     * Clear variants
+     * Clear variants.
      */
     public function clearVariants()
     {
@@ -229,7 +228,8 @@ public function clearVariants()
 
     /**
      * Get the variant parent/children.
-     **
+     **.
+     *
      * @return array[$parent, $children]
      */
     public function getVariants()
@@ -253,7 +253,7 @@ public function getVariants()
     }
 
     /**
-     * Get an array of all IDs for parent/child variants and associated translations if applicable
+     * Get an array of all IDs for parent/child variants and associated translations if applicable.
      *
      * @param VariantEntityInterface $entity
      * @param bool                   $publishedOnly
@@ -264,7 +264,6 @@ public function getRelatedEntityIds($publishedOnly = false)
 
         // If parent is not published and only published has been requested, no need to proceed
         if ($parent && $publishedOnly && !$parent->isPublished()) {
-
             return [];
         }
 
@@ -294,7 +293,7 @@ public function getRelatedEntityIds($publishedOnly = false)
     protected function getAccumulativeVariantCount($getter)
     {
         list($parent, $children) = $this->getVariants();
-        $count = $parent->$getter();
+        $count                   = $parent->$getter();
 
         if ($checkTranslations = method_exists($parent, 'getAccumulativeTranslationCount')) {
             // Append translations for this variant if applicable
@@ -314,7 +313,7 @@ protected function getAccumulativeVariantCount($getter)
     }
 
     /**
-     * Finds and appends IDs for translations of a variant
+     * Finds and appends IDs for translations of a variant.
      *
      * @param $entity
      * @param $ids
@@ -323,7 +322,6 @@ protected function getAccumulativeVariantCount($getter)
     protected function appendTranslationEntityIds($entity, &$ids, $publishedOnly)
     {
         if (!($entity instanceof TranslationEntityInterface && method_exists($this, 'getTranslations'))) {
-
             return;
         }
 
@@ -332,7 +330,6 @@ protected function appendTranslationEntityIds($entity, &$ids, $publishedOnly)
         list($parentTranslation, $childrenTranslations) = $entity->getTranslations();
         if ($entity->getId() && $parentTranslation != $entity) {
             if (!$publishedOnly || $parentTranslation->isPublished()) {
-
                 $ids[] = $parentTranslation->getId();
             }
         }
@@ -351,4 +348,4 @@ protected function appendTranslationEntityIds($entity, &$ids, $publishedOnly)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Event/BuildJsEvent.php b/app/bundles/CoreBundle/Event/BuildJsEvent.php
index 7cfdd390d51..46764bf9ef8 100644
--- a/app/bundles/CoreBundle/Event/BuildJsEvent.php
+++ b/app/bundles/CoreBundle/Event/BuildJsEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,9 +13,7 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class BuildJsEvent
- *
- * @package Mautic\PageBundle\Event
+ * Class BuildJsEvent.
  */
 class BuildJsEvent extends Event
 {
@@ -33,7 +32,7 @@ class BuildJsEvent extends Event
      */
     public function __construct($js, $debugMode = false)
     {
-        $this->js = $js;
+        $this->js        = $js;
         $this->debugMode = $debugMode;
     }
 
@@ -46,10 +45,10 @@ public function getJs()
     }
 
     /**
-     * Append JS
+     * Append JS.
      *
      * @param string $js
-     * @param string $section The section name. Shows when in debug mode.
+     * @param string $section The section name. Shows when in debug mode
      *
      * @return $this
      */
@@ -79,4 +78,4 @@ public function appendJs($js, $section = '')
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Event/BuilderEvent.php b/app/bundles/CoreBundle/Event/BuilderEvent.php
index f8a76212923..635812fadbf 100644
--- a/app/bundles/CoreBundle/Event/BuilderEvent.php
+++ b/app/bundles/CoreBundle/Event/BuilderEvent.php
@@ -1,30 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Event;
 
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
-use Symfony\Component\Process\Exception\InvalidArgumentException;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\Process\Exception\InvalidArgumentException;
 
 /**
- * Class BuilderEvent
- *
- * @package Mautic\PageBundle\Event
+ * Class BuilderEvent.
  */
 class BuilderEvent extends Event
 {
-    protected $slotTypes = array();
-    protected $tokens = array();
-    protected $visualTokens = array();
-    protected $tokenSections = array();
-    protected $abTestWinnerCriteria = array();
+    protected $slotTypes            = [];
+    protected $tokens               = [];
+    protected $visualTokens         = [];
+    protected $tokenSections        = [];
+    protected $abTestWinnerCriteria = [];
     protected $translator;
     protected $entity = null;
     protected $requested;
@@ -38,7 +37,7 @@ public function __construct($translator, $entity = null, $requested = 'all', $to
         $this->entity            = $entity;
         $this->requested         = $requested;
         $this->tokenFilterTarget = (strpos($tokenFilter, '{@') === 0) ? 'label' : 'token';
-        $this->tokenFilterText   = str_replace(array('{@', '{', '}'), '', $tokenFilter);
+        $this->tokenFilterText   = str_replace(['{@', '{', '}'], '', $tokenFilter);
         $this->tokenFilter       = ($this->tokenFilterTarget == 'label') ? $this->tokenFilterText : str_replace('{@', '{', $tokenFilter);
     }
 
@@ -52,23 +51,23 @@ public function __construct($translator, $entity = null, $requested = 'all', $to
      */
     public function addSlotType($key, $header, $icon, $content, $form, $priority = 0)
     {
-        $this->slotTypes[$key] = array(
+        $this->slotTypes[$key] = [
             'header'   => $this->translator->trans($header),
             'icon'     => $icon,
             'content'  => $content,
             'form'     => $form,
-            'priority' => $priority
-        );
+            'priority' => $priority,
+        ];
     }
 
     /**
-     * Get slot types
+     * Get slot types.
      *
      * @return array
      */
     public function getSlotTypes()
     {
-        $sort = array('priority' => array(), 'header' => array());
+        $sort = ['priority' => [], 'header' => []];
         foreach ($this->slotTypes as $k => $v) {
             $sort['priority'][$k] = $v['priority'];
             $sort['header'][$k]   = $v['header'];
@@ -93,22 +92,22 @@ public function addTokenSection($key, $header, $content, $priority = 0)
 
         if (!empty($content)) {
             $header                    = $this->translator->trans($header);
-            $this->tokenSections[$key] = array(
+            $this->tokenSections[$key] = [
                 'header'   => $header,
                 'content'  => $content,
-                'priority' => $priority
-            );
+                'priority' => $priority,
+            ];
         }
     }
 
     /**
-     * Get tokenSections
+     * Get tokenSections.
      *
      * @return array
      */
     public function getTokenSections()
     {
-        $sort = array();
+        $sort = [];
         foreach ($this->tokenSections as $k => $v) {
             $sort['priority'][$k] = $v['priority'];
             $sort['header'][$k]   = $v['header'];
@@ -119,9 +118,8 @@ public function getTokenSections()
         return $this->tokenSections;
     }
 
-
     /**
-     * Get list of AB Test winner criteria
+     * Get list of AB Test winner criteria.
      *
      * @return array
      */
@@ -136,9 +134,9 @@ function ($a, $b) {
                 );
             }
         );
-        $array = array('criteria' => $this->abTestWinnerCriteria);
+        $array = ['criteria' => $this->abTestWinnerCriteria];
 
-        $choices = array();
+        $choices = [];
         foreach ($this->abTestWinnerCriteria as $k => $c) {
             $choices[$c['group']][$k] = $c['label'];
         }
@@ -148,7 +146,7 @@ function ($a, $b) {
     }
 
     /**
-     * Adds an A/B test winner criteria option
+     * Adds an A/B test winner criteria option.
      *
      * @param string $key      - a unique identifier; it is recommended that it be namespaced i.e. lead.points
      * @param array  $criteria - can contain the following keys:
@@ -173,8 +171,8 @@ public function addAbTestWinnerCriteria($key, array $criteria)
 
         //check for required keys and that given functions are callable
         $this->verifyCriteria(
-            array('group', 'label', 'callback'),
-            array('callback'),
+            ['group', 'label', 'callback'],
+            ['callback'],
             $criteria
         );
 
@@ -213,8 +211,8 @@ private function verifyCriteria(array $keys, array $methods, array $criteria)
     public function addTokens(array $tokens, $allowVisualPlaceholder = false, $convertToLinks = false)
     {
         if ($convertToLinks) {
-            array_walk($tokens, function(&$val, $key) {
-                $val = 'a:' . $val;
+            array_walk($tokens, function (&$val, $key) {
+                $val = 'a:'.$val;
             });
         }
 
@@ -240,7 +238,7 @@ public function addToken($key, $value, $allowVisualPlaceholder = false)
     }
 
     /**
-     * Get token array
+     * Get token array.
      *
      * @return array
      */
@@ -253,6 +251,7 @@ public function getTokens($withBC = true)
                     $tokens[$key] = $value;
                 }
             }
+
             return $tokens;
         }
 
@@ -277,10 +276,9 @@ public function getVisualTokens()
     public function tokensRequested($tokenKeys = null)
     {
         if ($requested = $this->getRequested('tokens')) {
-
             if (!empty($this->tokenFilter) && $this->tokenFilterTarget == 'token') {
                 if (!is_array($tokenKeys)) {
-                    $tokenKeys = array($tokenKeys);
+                    $tokenKeys = [$tokenKeys];
                 }
 
                 $found = false;
@@ -301,20 +299,20 @@ public function tokensRequested($tokenKeys = null)
     }
 
     /**
-     * Get text of the search filter
+     * Get text of the search filter.
      *
      * @return array
      */
     public function getTokenFilter()
     {
-        return array(
+        return [
             'target' => $this->tokenFilterTarget,
-            'filter' => $this->tokenFilterText
-        );
+            'filter' => $this->tokenFilterText,
+        ];
     }
 
     /**
-     * Simple token filtering
+     * Simple token filtering.
      *
      * @param array $tokens array('token' => 'label')
      *
@@ -333,7 +331,7 @@ public function filterTokens($tokens)
             $tokens = array_filter(
                 $tokens,
                 function ($v) use ($filter) {
-                    return (stripos($v, $filter) === 0);
+                    return stripos($v, $filter) === 0;
                 }
             );
         } else {
@@ -341,7 +339,7 @@ function ($v) use ($filter) {
             $found = array_filter(
                 array_keys($tokens),
                 function ($k) use ($filter) {
-                    return (stripos($k, $filter) === 0);
+                    return stripos($k, $filter) === 0;
                 }
             );
 
@@ -352,7 +350,7 @@ function ($k) use ($filter) {
     }
 
     /**
-     * Add tokens from a BuilderTokenHelper
+     * Add tokens from a BuilderTokenHelper.
      *
      * @param BuilderTokenHelper $tokenHelper
      * @param                    $tokens
@@ -360,7 +358,6 @@ function ($k) use ($filter) {
      * @param string             $valueColumn
      * @param bool               $allowVisualPlaceholder If set to true, the description will be displayed in the editor instead of the raw token
      * @param bool               $convertToLinks         If true, the tokens will be converted to links
-     *
      */
     public function addTokensFromHelper(
         BuilderTokenHelper $tokenHelper,
@@ -370,20 +367,20 @@ public function addTokensFromHelper(
         $allowVisualPlaceholder = false,
         $convertToLinks = false
     ) {
-    	$tokens = $this->getTokensFromHelper($tokenHelper, $tokens, $labelColumn, $valueColumn);
-		if ( $tokens == null ) {
-			$tokens = array();
-		}
-		
+        $tokens = $this->getTokensFromHelper($tokenHelper, $tokens, $labelColumn, $valueColumn);
+        if ($tokens == null) {
+            $tokens = [];
+        }
+
         $this->addTokens(
-        	$tokens,
+            $tokens,
             $allowVisualPlaceholder,
             $convertToLinks
         );
     }
 
     /**
-     * Get tokens from a BuilderTokenHelper
+     * Get tokens from a BuilderTokenHelper.
      *
      * @param BuilderTokenHelper $tokenHelper
      * @param                    $tokens
@@ -403,7 +400,7 @@ public function getTokensFromHelper(BuilderTokenHelper $tokenHelper, $tokens, $l
     }
 
     /**
-     * Check if token sections have been requested
+     * Check if token sections have been requested.
      *
      * @return bool
      */
@@ -413,7 +410,7 @@ public function tokenSectionsRequested()
     }
 
     /**
-     * Check if AB Test Winner Criteria has been requested
+     * Check if AB Test Winner Criteria has been requested.
      *
      * @return bool
      */
@@ -423,7 +420,7 @@ public function abTestWinnerCriteriaRequested()
     }
 
     /**
-     * Check if AB Test Winner Criteria has been requested
+     * Check if AB Test Winner Criteria has been requested.
      *
      * @return bool
      */
@@ -443,6 +440,6 @@ protected function getRequested($type)
             return in_array($type, $this->requested);
         }
 
-        return ($this->requested == $type || $this->requested == 'all');
+        return $this->requested == $type || $this->requested == 'all';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php b/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php
index 9100817f855..982fc892927 100644
--- a/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php
+++ b/app/bundles/CoreBundle/Event/ChannelBroadcastEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,26 +14,26 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class ChannelBroadcastEvent
+ * Class ChannelBroadcastEvent.
  */
 class ChannelBroadcastEvent extends Event
 {
     /**
-     * Specific channel
+     * Specific channel.
      *
      * @var null
      */
     protected $channel;
 
     /**
-     * Specific ID of a specific channel
+     * Specific ID of a specific channel.
      *
      * @var null
      */
     protected $id;
 
     /**
-     * Number of contacts successfully processed and/or failed per channel
+     * Number of contacts successfully processed and/or failed per channel.
      *
      * @var int
      */
@@ -49,7 +50,7 @@ class ChannelBroadcastEvent extends Event
      * @param int  $daysOld
      * @param bool $dryRun
      */
-    public function __construct($channel = null, $channelId = null, OutputInterface $output)
+    public function __construct($channel, $channelId, OutputInterface $output)
     {
         $this->channel = $channel;
         $this->id      = $channelId;
@@ -81,7 +82,7 @@ public function setResults($channelLabel, $successCount, $failedCount = 0)
     {
         $this->results[$channelLabel] = [
             'success' => (int) $successCount,
-            'failed'  => (int) $failedCount
+            'failed'  => (int) $failedCount,
         ];
     }
 
diff --git a/app/bundles/CoreBundle/Event/CommandListEvent.php b/app/bundles/CoreBundle/Event/CommandListEvent.php
index 22260633dd4..ded5770287a 100644
--- a/app/bundles/CoreBundle/Event/CommandListEvent.php
+++ b/app/bundles/CoreBundle/Event/CommandListEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,18 +13,17 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class CommandListEvent
+ * Class CommandListEvent.
  */
 class CommandListEvent extends Event
 {
-
     /**
      * @var array
      */
-    protected $commands = array();
+    protected $commands = [];
 
     /**
-     * Returns the list of currently stored commands
+     * Returns the list of currently stored commands.
      *
      * @return mixed
      */
@@ -33,7 +33,7 @@ public function getCommands()
     }
 
     /**
-     * Add an array of search commands
+     * Add an array of search commands.
      *
      * @param string $header   String name for section header
      * @param array  $commands Array of commands supported by the repository
diff --git a/app/bundles/CoreBundle/Event/CommonEvent.php b/app/bundles/CoreBundle/Event/CommonEvent.php
index 65c052893d8..3bf7b104c3b 100644
--- a/app/bundles/CoreBundle/Event/CommonEvent.php
+++ b/app/bundles/CoreBundle/Event/CommonEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class CommonEvent
+ * Class CommonEvent.
  */
 class CommonEvent extends Event
 {
-
     /**
      * @var \Doctrine\ORM\EntityManager
      */
@@ -39,7 +39,7 @@ class CommonEvent extends Event
     protected $changes;
 
     /**
-     * Sets the entity manager for the event to use
+     * Sets the entity manager for the event to use.
      *
      * @param \Doctrine\ORM\EntityManager $em
      */
@@ -49,7 +49,7 @@ public function setEntityManager($em)
     }
 
     /**
-     * Returns if a saved lead is new or not
+     * Returns if a saved lead is new or not.
      *
      * @return bool
      */
@@ -59,7 +59,7 @@ public function isNew()
     }
 
     /**
-     * Gets changes to original entity
+     * Gets changes to original entity.
      *
      * @return mixed
      */
@@ -85,7 +85,6 @@ public function getChanges()
     public function getLead()
     {
         if (method_exists($this->entity, 'getLead')) {
-
             return $this->entity->getLead();
         }
 
diff --git a/app/bundles/CoreBundle/Event/ComponentValidationTrait.php b/app/bundles/CoreBundle/Event/ComponentValidationTrait.php
index e7901af0c8c..a63ddbf0203 100644
--- a/app/bundles/CoreBundle/Event/ComponentValidationTrait.php
+++ b/app/bundles/CoreBundle/Event/ComponentValidationTrait.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Event;
 
 /**
- * Class ComponentValidationTrait
+ * Class ComponentValidationTrait.
  */
 trait ComponentValidationTrait
 {
@@ -35,9 +36,9 @@ private function verifyComponent(array $keys, array $component, array $callbacks
         if ($callbacks) {
             foreach ($callbacks as $m) {
                 if (isset($component[$m]) && !is_callable($component[$m])) {
-                    throw new InvalidArgumentException($component[$m] . ' is not callable.');
+                    throw new InvalidArgumentException($component[$m].' is not callable.');
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Event/GlobalSearchEvent.php b/app/bundles/CoreBundle/Event/GlobalSearchEvent.php
index f4a7ebed507..c13d5738bae 100644
--- a/app/bundles/CoreBundle/Event/GlobalSearchEvent.php
+++ b/app/bundles/CoreBundle/Event/GlobalSearchEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,15 +13,14 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class GlobalSearchEvent
+ * Class GlobalSearchEvent.
  */
 class GlobalSearchEvent extends Event
 {
-
     /**
      * @var array
      */
-    protected $results = array();
+    protected $results = [];
 
     /**
      * @var string
@@ -43,7 +43,7 @@ public function __construct($searchString, $translator)
     }
 
     /**
-     * Returns the string to be searched
+     * Returns the string to be searched.
      *
      * @return string
      */
@@ -54,25 +54,26 @@ public function getSearchString()
 
     /**
      * Add an array of results from a search query to be listed in right side panel
-     * Each result should be the ENTIRE html to be rendered
+     * Each result should be the ENTIRE html to be rendered.
      *
      * @param string $header  String name for section header
      * @param array  $results Array of HTML output that will be wrapped in <li /> elements
      */
     public function addResults($header, array $results)
     {
-        $header = $this->translator->trans($header);
+        $header                 = $this->translator->trans($header);
         $this->results[$header] = $results;
     }
 
     /**
-     * Returns the results
+     * Returns the results.
      *
      * @return array
      */
     public function getResults()
     {
-        uksort($this->results, "strnatcmp");
+        uksort($this->results, 'strnatcmp');
+
         return $this->results;
     }
 }
diff --git a/app/bundles/CoreBundle/Event/IconEvent.php b/app/bundles/CoreBundle/Event/IconEvent.php
index d4c2bf15dad..89e89b9fcbd 100644
--- a/app/bundles/CoreBundle/Event/IconEvent.php
+++ b/app/bundles/CoreBundle/Event/IconEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,14 +14,14 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class IconEvent
+ * Class IconEvent.
  */
 class IconEvent extends Event
 {
     /**
      * @var array
      */
-    protected $icons = array();
+    protected $icons = [];
 
     /**
      * @var CorePermissions
@@ -46,8 +47,6 @@ public function getSecurity()
     /**
      * @param string $type
      * @param string $icon
-     *
-     * @return void
      */
     public function addIcon($type, $icon)
     {
@@ -55,7 +54,7 @@ public function addIcon($type, $icon)
     }
 
     /**
-     * Return the icons
+     * Return the icons.
      *
      * @return array
      */
diff --git a/app/bundles/CoreBundle/Event/MaintenanceEvent.php b/app/bundles/CoreBundle/Event/MaintenanceEvent.php
index 85431427a9b..8c2f1db3378 100644
--- a/app/bundles/CoreBundle/Event/MaintenanceEvent.php
+++ b/app/bundles/CoreBundle/Event/MaintenanceEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class MaintenanceEvent
+ * Class MaintenanceEvent.
  */
 class MaintenanceEvent extends Event
 {
-
     /**
      * @var int
      */
@@ -56,7 +56,7 @@ public function __construct($daysOld, $dryRun)
     }
 
     /**
-     * Get integer for number of days ago to purge data
+     * Get integer for number of days ago to purge data.
      *
      * @return int
      */
@@ -66,7 +66,7 @@ public function getDays()
     }
 
     /**
-     * Returns a DateTime in UTC for the date to delete records older than the given date
+     * Returns a DateTime in UTC for the date to delete records older than the given date.
      *
      * @return \DateTime
      */
@@ -76,7 +76,7 @@ public function getDate()
     }
 
     /**
-     * Set the number of records purged by the listener
+     * Set the number of records purged by the listener.
      *
      * @param string $key
      * @param int    $recordCount
@@ -104,7 +104,7 @@ public function getStats()
     }
 
     /**
-     * Return if this is to be a dry run
+     * Return if this is to be a dry run.
      *
      * @return bool
      */
diff --git a/app/bundles/CoreBundle/Event/MenuEvent.php b/app/bundles/CoreBundle/Event/MenuEvent.php
index 2008fdc4f22..9d0b38929d0 100644
--- a/app/bundles/CoreBundle/Event/MenuEvent.php
+++ b/app/bundles/CoreBundle/Event/MenuEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class MenuEvent
+ * Class MenuEvent.
  */
 class MenuEvent extends Event
 {
-
     /**
      * @var array
      */
@@ -29,7 +29,7 @@ class MenuEvent extends Event
     protected $type;
 
     /**
-     * Menu helper
+     * Menu helper.
      *
      * @var MenuHelper
      */
@@ -56,11 +56,9 @@ public function setMenuItems(array $menuItems)
     }
 
     /**
-     * Add items to the menu
+     * Add items to the menu.
      *
      * @param array $menuItems
-     *
-     * @return void
      */
     public function addMenuItems(array $menuItems)
     {
@@ -87,7 +85,7 @@ public function addMenuItems(array $menuItems)
     }
 
     /**
-     * Return the menu items
+     * Return the menu items.
      *
      * @return array
      */
@@ -107,5 +105,4 @@ public function getType()
     {
         return $this->type;
     }
-
 }
diff --git a/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php b/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php
index b472e8804ca..c8d75cf72e5 100644
--- a/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php
+++ b/app/bundles/CoreBundle/Event/MessageQueueBatchProcessEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CoreBundle\Event;
 
 use Symfony\Component\EventDispatcher\Event;
@@ -40,7 +41,7 @@ public function __construct(array $messages, $channel, $channelId)
      */
     public function checkContext($channel)
     {
-        return ($channel === $this->channel);
+        return $channel === $this->channel;
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Event/MessageQueueEvent.php b/app/bundles/CoreBundle/Event/MessageQueueEvent.php
index 5f16621d9db..9ff61b7b198 100644
--- a/app/bundles/CoreBundle/Event/MessageQueueEvent.php
+++ b/app/bundles/CoreBundle/Event/MessageQueueEvent.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CoreBundle\Event;
 
-use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\CoreBundle\Entity\MessageQueue;
 
 class MessageQueueEvent extends CommonEvent
@@ -18,12 +18,12 @@ class MessageQueueEvent extends CommonEvent
      * MessageQueueEvent constructor.
      *
      * @param MessageQueue $entity
-     * @param bool           $isNew
+     * @param bool         $isNew
      */
     public function __construct(MessageQueue $entity, $isNew = false)
     {
         $this->entity = $entity;
-        $this->isNew = $isNew;
+        $this->isNew  = $isNew;
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php b/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php
index 0251133b4f2..ee559d1dc1a 100644
--- a/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php
+++ b/app/bundles/CoreBundle/Event/MessageQueueProcessEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CoreBundle\Event;
 
 use Mautic\CoreBundle\Entity\MessageQueue;
@@ -17,7 +18,7 @@ class MessageQueueProcessEvent extends CommonEvent
      * MessageQueueEvent constructor.
      *
      * @param MessageQueue $entity
-     * @param bool           $isNew
+     * @param bool         $isNew
      */
     public function __construct(MessageQueue $entity)
     {
@@ -39,6 +40,6 @@ public function getMessageQueue()
      */
     public function checkContext($channel)
     {
-        return ($channel === $this->entity->getChannel());
+        return $channel === $this->entity->getChannel();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Event/RouteEvent.php b/app/bundles/CoreBundle/Event/RouteEvent.php
index d3c9d591840..2bcfbce407b 100644
--- a/app/bundles/CoreBundle/Event/RouteEvent.php
+++ b/app/bundles/CoreBundle/Event/RouteEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Symfony\Component\Routing\RouteCollection;
 
 /**
- * Class RouteEvent
+ * Class RouteEvent.
  */
 class RouteEvent extends Event
 {
-
     /**
      * @var Loader
      */
@@ -37,7 +37,7 @@ class RouteEvent extends Event
     /**
      * @param Loader $loader
      */
-    public function __construct (Loader $loader, $type = 'main')
+    public function __construct(Loader $loader, $type = 'main')
     {
         $this->loader     = $loader;
         $this->collection = new RouteCollection();
@@ -46,10 +46,8 @@ public function __construct (Loader $loader, $type = 'main')
 
     /**
      * @param mixed $path
-     *
-     * @return void
      */
-    public function addRoutes ($path)
+    public function addRoutes($path)
     {
         $this->collection->addCollection($this->loader->import($path));
     }
@@ -57,7 +55,7 @@ public function addRoutes ($path)
     /**
      * @return RouteCollection
      */
-    public function getCollection ()
+    public function getCollection()
     {
         return $this->collection;
     }
@@ -65,8 +63,8 @@ public function getCollection ()
     /**
      * @return mixed
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Event/SidebarCanvasEvent.php b/app/bundles/CoreBundle/Event/SidebarCanvasEvent.php
index 31ff0f14987..3649748058f 100644
--- a/app/bundles/CoreBundle/Event/SidebarCanvasEvent.php
+++ b/app/bundles/CoreBundle/Event/SidebarCanvasEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,24 +13,24 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class SidebarCanvasEvent
+ * Class SidebarCanvasEvent.
  */
 class SidebarCanvasEvent extends Event
 {
     /**
      * @var array
      */
-    private $sections = array('header', 'footer', 'content');
+    private $sections = ['header', 'footer', 'content'];
 
     /**
      * @var array
      */
-    private $left  = array();
+    private $left = [];
 
     /**
      * @var array
      */
-    private $right = array();
+    private $right = [];
 
     /**
      * @var
@@ -39,7 +40,7 @@ class SidebarCanvasEvent extends Event
     /**
      * @var array
      */
-    private $main  = array();
+    private $main = [];
 
     public function __construct($templating)
     {
@@ -47,7 +48,7 @@ public function __construct($templating)
     }
 
     /**
-     * Insert content into left canvas
+     * Insert content into left canvas.
      *
      * @param array $sections
      */
@@ -57,7 +58,7 @@ public function pushToLeftCanvas(array $sections)
     }
 
     /**
-     * Insert content into right canvas
+     * Insert content into right canvas.
      *
      * @param array $sections
      */
@@ -67,7 +68,7 @@ public function pushToRightCanvas(array $sections)
     }
 
     /**
-     * Insert content into main canvas
+     * Insert content into main canvas.
      *
      * Note that header is not allowed for main
      *
@@ -84,7 +85,7 @@ public function pushToMainCanvas(array $sections)
      */
     private function setCanvasSection($canvas, $sections)
     {
-        $canvasSections = array();
+        $canvasSections = [];
         foreach ($this->sections as $section) {
             $canvasSections[$section] = (isset($sections[$section])) ? $sections[$section] : '';
         }
@@ -93,7 +94,7 @@ private function setCanvasSection($canvas, $sections)
     }
 
     /**
-     * Get the canvas sections
+     * Get the canvas sections.
      *
      * @param null $canvas
      *
@@ -104,11 +105,11 @@ public function getCanvasContent($canvas = null)
         if ($canvas) {
             return $this->$canvas;
         } else {
-            return array(
+            return [
                 'left'  => $this->left,
                 'right' => $this->right,
-                'main'  => $this->main
-            );
+                'main'  => $this->main,
+            ];
         }
     }
 
diff --git a/app/bundles/CoreBundle/Event/TokenReplacementEvent.php b/app/bundles/CoreBundle/Event/TokenReplacementEvent.php
index 64131e44db1..ea547daf38d 100644
--- a/app/bundles/CoreBundle/Event/TokenReplacementEvent.php
+++ b/app/bundles/CoreBundle/Event/TokenReplacementEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class CommonEvent
+ * Class CommonEvent.
  */
 class TokenReplacementEvent extends CommonEvent
 {
@@ -51,7 +52,7 @@ class TokenReplacementEvent extends CommonEvent
     public function __construct($content, $lead = null, array $clickthrough = [])
     {
         if ($content instanceof CommonEntity) {
-            $this->entity   = $content;
+            $this->entity = $content;
         }
 
         $this->content      = $content;
diff --git a/app/bundles/CoreBundle/Event/UpgradeEvent.php b/app/bundles/CoreBundle/Event/UpgradeEvent.php
index bbedd22e47b..7b58942d0e4 100644
--- a/app/bundles/CoreBundle/Event/UpgradeEvent.php
+++ b/app/bundles/CoreBundle/Event/UpgradeEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,16 +13,14 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class BuilderEvent
- *
- * @package Mautic\PageBundle\Event
+ * Class BuilderEvent.
  */
 class UpgradeEvent extends Event
 {
     /**
      * @var array
      */
-    protected $status = array();
+    protected $status = [];
 
     public function __construct(array $status)
     {
@@ -44,4 +43,4 @@ public function isSuccessful()
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php b/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php
index 79d6130520f..22023d16db3 100644
--- a/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/BuildJsSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,10 +12,9 @@
 
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\BuildJsEvent;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
- * Class BuildJsSubscriber
+ * Class BuildJsSubscriber.
  */
 class BuildJsSubscriber extends CommonSubscriber
 {
@@ -24,22 +24,20 @@ class BuildJsSubscriber extends CommonSubscriber
     public static function getSubscribedEvents()
     {
         return [
-            CoreEvents::BUILD_MAUTIC_JS => ['onBuildJs', 1000]
+            CoreEvents::BUILD_MAUTIC_JS => ['onBuildJs', 1000],
         ];
     }
 
     /**
      * Adds the MauticJS definition and core
      * JS functions for use in Bundles. This
-     * must retain top priority of 1000
+     * must retain top priority of 1000.
      *
      * @param BuildJsEvent $event
-     *
-     * @return void
      */
     public function onBuildJs(BuildJsEvent $event)
     {
-        $js = <<<JS
+        $js = <<<'JS'
 
 // Fingerprint2 library:
 !function(e,t,i){"use strict";"undefined"!=typeof module&&module.exports?module.exports=i():"function"==typeof define&&define.amd?define(i):t[e]=i()}("Fingerprint2",this,function(){"use strict";Array.prototype.indexOf||(Array.prototype.indexOf=function(e,t){var i;if(null==this)throw new TypeError("'this' is null or undefined");var a=Object(this),r=a.length>>>0;if(0===r)return-1;var n=+t||0;if(Math.abs(n)===1/0&&(n=0),n>=r)return-1;for(i=Math.max(n>=0?n:r-Math.abs(n),0);r>i;){if(i in a&&a[i]===e)return i;i++}return-1});var e=function(e){var t={swfContainerId:"fingerprintjs2",swfPath:"flash/compiled/FontList.swf",detectScreenOrientation:!0,sortPluginsFor:[/palemoon/i]};this.options=this.extend(e,t),this.nativeForEach=Array.prototype.forEach,this.nativeMap=Array.prototype.map};return e.prototype={extend:function(e,t){if(null==e)return t;for(var i in e)null!=e[i]&&t[i]!==e[i]&&(t[i]=e[i]);return t},log:function(e){window.console&&console.log(e)},get:function(e){var t=[];t=this.userAgentKey(t),t=this.languageKey(t),t=this.colorDepthKey(t),t=this.screenResolutionKey(t),t=this.availableScreenResolutionKey(t),t=this.timezoneOffsetKey(t),t=this.sessionStorageKey(t),t=this.localStorageKey(t),t=this.indexedDbKey(t),t=this.addBehaviorKey(t),t=this.openDatabaseKey(t),t=this.cpuClassKey(t),t=this.platformKey(t),t=this.doNotTrackKey(t),t=this.pluginsKey(t),t=this.canvasKey(t),t=this.webglKey(t),t=this.adBlockKey(t),t=this.hasLiedLanguagesKey(t),t=this.hasLiedResolutionKey(t),t=this.hasLiedOsKey(t),t=this.hasLiedBrowserKey(t),t=this.touchSupportKey(t);var i=this;this.fontsKey(t,function(t){var a=[];i.each(t,function(e){var t=e.value;"undefined"!=typeof e.value.join&&(t=e.value.join(";")),a.push(t)});var r=i.x64hash128(a.join("~~~"),31);return e(r,t)})},userAgentKey:function(e){return this.options.excludeUserAgent||e.push({key:"user_agent",value:this.getUserAgent()}),e},getUserAgent:function(){return navigator.userAgent},languageKey:function(e){return this.options.excludeLanguage||e.push({key:"language",value:navigator.language||navigator.userLanguage||navigator.browserLanguage||navigator.systemLanguage||""}),e},colorDepthKey:function(e){return this.options.excludeColorDepth||e.push({key:"color_depth",value:screen.colorDepth}),e},screenResolutionKey:function(e){return this.options.excludeScreenResolution?e:this.getScreenResolution(e)},getScreenResolution:function(e){var t;return t=this.options.detectScreenOrientation&&screen.height>screen.width?[screen.height,screen.width]:[screen.width,screen.height],"undefined"!=typeof t&&e.push({key:"resolution",value:t}),e},availableScreenResolutionKey:function(e){return this.options.excludeAvailableScreenResolution?e:this.getAvailableScreenResolution(e)},getAvailableScreenResolution:function(e){var t;return screen.availWidth&&screen.availHeight&&(t=this.options.detectScreenOrientation?screen.availHeight>screen.availWidth?[screen.availHeight,screen.availWidth]:[screen.availWidth,screen.availHeight]:[screen.availHeight,screen.availWidth]),"undefined"!=typeof t&&e.push({key:"available_resolution",value:t}),e},timezoneOffsetKey:function(e){return this.options.excludeTimezoneOffset||e.push({key:"timezone_offset",value:(new Date).getTimezoneOffset()}),e},sessionStorageKey:function(e){return!this.options.excludeSessionStorage&&this.hasSessionStorage()&&e.push({key:"session_storage",value:1}),e},localStorageKey:function(e){return!this.options.excludeSessionStorage&&this.hasLocalStorage()&&e.push({key:"local_storage",value:1}),e},indexedDbKey:function(e){return!this.options.excludeIndexedDB&&this.hasIndexedDB()&&e.push({key:"indexed_db",value:1}),e},addBehaviorKey:function(e){return document.body&&!this.options.excludeAddBehavior&&document.body.addBehavior&&e.push({key:"add_behavior",value:1}),e},openDatabaseKey:function(e){return!this.options.excludeOpenDatabase&&window.openDatabase&&e.push({key:"open_database",value:1}),e},cpuClassKey:function(e){return this.options.excludeCpuClass||e.push({key:"cpu_class",value:this.getNavigatorCpuClass()}),e},platformKey:function(e){return this.options.excludePlatform||e.push({key:"navigator_platform",value:this.getNavigatorPlatform()}),e},doNotTrackKey:function(e){return this.options.excludeDoNotTrack||e.push({key:"do_not_track",value:this.getDoNotTrack()}),e},canvasKey:function(e){return!this.options.excludeCanvas&&this.isCanvasSupported()&&e.push({key:"canvas",value:this.getCanvasFp()}),e},webglKey:function(e){return this.options.excludeWebGL?e:this.isWebGlSupported()?(e.push({key:"webgl",value:this.getWebglFp()}),e):e},adBlockKey:function(e){return this.options.excludeAdBlock||e.push({key:"adblock",value:this.getAdBlock()}),e},hasLiedLanguagesKey:function(e){return this.options.excludeHasLiedLanguages||e.push({key:"has_lied_languages",value:this.getHasLiedLanguages()}),e},hasLiedResolutionKey:function(e){return this.options.excludeHasLiedResolution||e.push({key:"has_lied_resolution",value:this.getHasLiedResolution()}),e},hasLiedOsKey:function(e){return this.options.excludeHasLiedOs||e.push({key:"has_lied_os",value:this.getHasLiedOs()}),e},hasLiedBrowserKey:function(e){return this.options.excludeHasLiedBrowser||e.push({key:"has_lied_browser",value:this.getHasLiedBrowser()}),e},fontsKey:function(e,t){return this.options.excludeJsFonts?this.flashFontsKey(e,t):this.jsFontsKey(e,t)},flashFontsKey:function(e,t){return this.options.excludeFlashFonts?t(e):this.hasSwfObjectLoaded()&&this.hasMinFlashInstalled()?"undefined"==typeof this.options.swfPath?t(e):void this.loadSwfAndDetectFonts(function(i){e.push({key:"swf_fonts",value:i.join(";")}),t(e)}):t(e)},jsFontsKey:function(e,t){var i=this;return setTimeout(function(){var a=["monospace","sans-serif","serif"],r="mmmmmmmmmmlli",n="72px",o=document.getElementsByTagName("body")[0],s=document.createElement("span");s.style.position="absolute",s.style.left="-9999px",s.style.fontSize=n,s.innerHTML=r;for(var l={},h={},u=0,d=a.length;d>u;u++)s.style.fontFamily=a[u],o.appendChild(s),l[a[u]]=s.offsetWidth,h[a[u]]=s.offsetHeight,o.removeChild(s);var c=function(e){for(var t=!1,i=0,r=a.length;r>i;i++){s.style.fontFamily=e+","+a[i],o.appendChild(s);var n=s.offsetWidth!==l[a[i]]||s.offsetHeight!==h[a[i]];o.removeChild(s),t=t||n}return t},g=["Andale Mono","Arial","Arial Black","Arial Hebrew","Arial MT","Arial Narrow","Arial Rounded MT Bold","Arial Unicode MS","Bitstream Vera Sans Mono","Book Antiqua","Bookman Old Style","Calibri","Cambria","Cambria Math","Century","Century Gothic","Century Schoolbook","Comic Sans","Comic Sans MS","Consolas","Courier","Courier New","Garamond","Geneva","Georgia","Helvetica","Helvetica Neue","Impact","Lucida Bright","Lucida Calligraphy","Lucida Console","Lucida Fax","LUCIDA GRANDE","Lucida Handwriting","Lucida Sans","Lucida Sans Typewriter","Lucida Sans Unicode","Microsoft Sans Serif","Monaco","Monotype Corsiva","MS Gothic","MS Outlook","MS PGothic","MS Reference Sans Serif","MS Sans Serif","MS Serif","MYRIAD","MYRIAD PRO","Palatino","Palatino Linotype","Segoe Print","Segoe Script","Segoe UI","Segoe UI Light","Segoe UI Semibold","Segoe UI Symbol","Tahoma","Times","Times New Roman","Times New Roman PS","Trebuchet MS","Verdana","Wingdings","Wingdings 2","Wingdings 3"],p=["Abadi MT Condensed Light","Academy Engraved LET","ADOBE CASLON PRO","Adobe Garamond","ADOBE GARAMOND PRO","Agency FB","Aharoni","Albertus Extra Bold","Albertus Medium","Algerian","Amazone BT","American Typewriter","American Typewriter Condensed","AmerType Md BT","Andalus","Angsana New","AngsanaUPC","Antique Olive","Aparajita","Apple Chancery","Apple Color Emoji","Apple SD Gothic Neo","Arabic Typesetting","ARCHER","ARNO PRO","Arrus BT","Aurora Cn BT","AvantGarde Bk BT","AvantGarde Md BT","AVENIR","Ayuthaya","Bandy","Bangla Sangam MN","Bank Gothic","BankGothic Md BT","Baskerville","Baskerville Old Face","Batang","BatangChe","Bauer Bodoni","Bauhaus 93","Bazooka","Bell MT","Bembo","Benguiat Bk BT","Berlin Sans FB","Berlin Sans FB Demi","Bernard MT Condensed","BernhardFashion BT","BernhardMod BT","Big Caslon","BinnerD","Blackadder ITC","BlairMdITC TT","Bodoni 72","Bodoni 72 Oldstyle","Bodoni 72 Smallcaps","Bodoni MT","Bodoni MT Black","Bodoni MT Condensed","Bodoni MT Poster Compressed","Bookshelf Symbol 7","Boulder","Bradley Hand","Bradley Hand ITC","Bremen Bd BT","Britannic Bold","Broadway","Browallia New","BrowalliaUPC","Brush Script MT","Californian FB","Calisto MT","Calligrapher","Candara","CaslonOpnface BT","Castellar","Centaur","Cezanne","CG Omega","CG Times","Chalkboard","Chalkboard SE","Chalkduster","Charlesworth","Charter Bd BT","Charter BT","Chaucer","ChelthmITC Bk BT","Chiller","Clarendon","Clarendon Condensed","CloisterBlack BT","Cochin","Colonna MT","Constantia","Cooper Black","Copperplate","Copperplate Gothic","Copperplate Gothic Bold","Copperplate Gothic Light","CopperplGoth Bd BT","Corbel","Cordia New","CordiaUPC","Cornerstone","Coronet","Cuckoo","Curlz MT","DaunPenh","Dauphin","David","DB LCD Temp","DELICIOUS","Denmark","DFKai-SB","Didot","DilleniaUPC","DIN","DokChampa","Dotum","DotumChe","Ebrima","Edwardian Script ITC","Elephant","English 111 Vivace BT","Engravers MT","EngraversGothic BT","Eras Bold ITC","Eras Demi ITC","Eras Light ITC","Eras Medium ITC","EucrosiaUPC","Euphemia","Euphemia UCAS","EUROSTILE","Exotc350 Bd BT","FangSong","Felix Titling","Fixedsys","FONTIN","Footlight MT Light","Forte","FrankRuehl","Fransiscan","Freefrm721 Blk BT","FreesiaUPC","Freestyle Script","French Script MT","FrnkGothITC Bk BT","Fruitger","FRUTIGER","Futura","Futura Bk BT","Futura Lt BT","Futura Md BT","Futura ZBlk BT","FuturaBlack BT","Gabriola","Galliard BT","Gautami","Geeza Pro","Geometr231 BT","Geometr231 Hv BT","Geometr231 Lt BT","GeoSlab 703 Lt BT","GeoSlab 703 XBd BT","Gigi","Gill Sans","Gill Sans MT","Gill Sans MT Condensed","Gill Sans MT Ext Condensed Bold","Gill Sans Ultra Bold","Gill Sans Ultra Bold Condensed","Gisha","Gloucester MT Extra Condensed","GOTHAM","GOTHAM BOLD","Goudy Old Style","Goudy Stout","GoudyHandtooled BT","GoudyOLSt BT","Gujarati Sangam MN","Gulim","GulimChe","Gungsuh","GungsuhChe","Gurmukhi MN","Haettenschweiler","Harlow Solid Italic","Harrington","Heather","Heiti SC","Heiti TC","HELV","Herald","High Tower Text","Hiragino Kaku Gothic ProN","Hiragino Mincho ProN","Hoefler Text","Humanst 521 Cn BT","Humanst521 BT","Humanst521 Lt BT","Imprint MT Shadow","Incised901 Bd BT","Incised901 BT","Incised901 Lt BT","INCONSOLATA","Informal Roman","Informal011 BT","INTERSTATE","IrisUPC","Iskoola Pota","JasmineUPC","Jazz LET","Jenson","Jester","Jokerman","Juice ITC","Kabel Bk BT","Kabel Ult BT","Kailasa","KaiTi","Kalinga","Kannada Sangam MN","Kartika","Kaufmann Bd BT","Kaufmann BT","Khmer UI","KodchiangUPC","Kokila","Korinna BT","Kristen ITC","Krungthep","Kunstler Script","Lao UI","Latha","Leelawadee","Letter Gothic","Levenim MT","LilyUPC","Lithograph","Lithograph Light","Long Island","Lydian BT","Magneto","Maiandra GD","Malayalam Sangam MN","Malgun Gothic","Mangal","Marigold","Marion","Marker Felt","Market","Marlett","Matisse ITC","Matura MT Script Capitals","Meiryo","Meiryo UI","Microsoft Himalaya","Microsoft JhengHei","Microsoft New Tai Lue","Microsoft PhagsPa","Microsoft Tai Le","Microsoft Uighur","Microsoft YaHei","Microsoft Yi Baiti","MingLiU","MingLiU_HKSCS","MingLiU_HKSCS-ExtB","MingLiU-ExtB","Minion","Minion Pro","Miriam","Miriam Fixed","Mistral","Modern","Modern No. 20","Mona Lisa Solid ITC TT","Mongolian Baiti","MONO","MoolBoran","Mrs Eaves","MS LineDraw","MS Mincho","MS PMincho","MS Reference Specialty","MS UI Gothic","MT Extra","MUSEO","MV Boli","Nadeem","Narkisim","NEVIS","News Gothic","News GothicMT","NewsGoth BT","Niagara Engraved","Niagara Solid","Noteworthy","NSimSun","Nyala","OCR A Extended","Old Century","Old English Text MT","Onyx","Onyx BT","OPTIMA","Oriya Sangam MN","OSAKA","OzHandicraft BT","Palace Script MT","Papyrus","Parchment","Party LET","Pegasus","Perpetua","Perpetua Titling MT","PetitaBold","Pickwick","Plantagenet Cherokee","Playbill","PMingLiU","PMingLiU-ExtB","Poor Richard","Poster","PosterBodoni BT","PRINCETOWN LET","Pristina","PTBarnum BT","Pythagoras","Raavi","Rage Italic","Ravie","Ribbon131 Bd BT","Rockwell","Rockwell Condensed","Rockwell Extra Bold","Rod","Roman","Sakkal Majalla","Santa Fe LET","Savoye LET","Sceptre","Script","Script MT Bold","SCRIPTINA","Serifa","Serifa BT","Serifa Th BT","ShelleyVolante BT","Sherwood","Shonar Bangla","Showcard Gothic","Shruti","Signboard","SILKSCREEN","SimHei","Simplified Arabic","Simplified Arabic Fixed","SimSun","SimSun-ExtB","Sinhala Sangam MN","Sketch Rockwell","Skia","Small Fonts","Snap ITC","Snell Roundhand","Socket","Souvenir Lt BT","Staccato222 BT","Steamer","Stencil","Storybook","Styllo","Subway","Swis721 BlkEx BT","Swiss911 XCm BT","Sylfaen","Synchro LET","System","Tamil Sangam MN","Technical","Teletype","Telugu Sangam MN","Tempus Sans ITC","Terminal","Thonburi","Traditional Arabic","Trajan","TRAJAN PRO","Tristan","Tubular","Tunga","Tw Cen MT","Tw Cen MT Condensed","Tw Cen MT Condensed Extra Bold","TypoUpright BT","Unicorn","Univers","Univers CE 55 Medium","Univers Condensed","Utsaah","Vagabond","Vani","Vijaya","Viner Hand ITC","VisualUI","Vivaldi","Vladimir Script","Vrinda","Westminster","WHITNEY","Wide Latin","ZapfEllipt BT","ZapfHumnst BT","ZapfHumnst Dm BT","Zapfino","Zurich BlkEx BT","Zurich Ex BT","ZWAdobeF"];i.options.extendedJsFonts&&(g=g.concat(p));for(var f=[],m=0,S=g.length;S>m;m++)c(g[m])&&f.push(g[m]);e.push({key:"js_fonts",value:f}),t(e)},1)},pluginsKey:function(e){return this.options.excludePlugins||(this.isIE()?this.options.excludeIEPlugins||e.push({key:"ie_plugins",value:this.getIEPlugins()}):e.push({key:"regular_plugins",value:this.getRegularPlugins()})),e},getRegularPlugins:function(){for(var e=[],t=0,i=navigator.plugins.length;i>t;t++)e.push(navigator.plugins[t]);return this.pluginsShouldBeSorted()&&(e=e.sort(function(e,t){return e.name>t.name?1:e.name<t.name?-1:0})),this.map(e,function(e){var t=this.map(e,function(e){return[e.type,e.suffixes].join("~")}).join(",");return[e.name,e.description,t].join("::")},this)},getIEPlugins:function(){var e=[];if(Object.getOwnPropertyDescriptor&&Object.getOwnPropertyDescriptor(window,"ActiveXObject")||"ActiveXObject"in window){var t=["AcroPDF.PDF","Adodb.Stream","AgControl.AgControl","DevalVRXCtrl.DevalVRXCtrl.1","MacromediaFlashPaper.MacromediaFlashPaper","Msxml2.DOMDocument","Msxml2.XMLHTTP","PDF.PdfCtrl","QuickTime.QuickTime","QuickTimeCheckObject.QuickTimeCheck.1","RealPlayer","RealPlayer.RealPlayer(tm) ActiveX Control (32-bit)","RealVideo.RealVideo(tm) ActiveX Control (32-bit)","Scripting.Dictionary","SWCtl.SWCtl","Shell.UIHelper","ShockwaveFlash.ShockwaveFlash","Skype.Detection","TDCCtl.TDCCtl","WMPlayer.OCX","rmocx.RealPlayer G2 Control","rmocx.RealPlayer G2 Control.1"];e=this.map(t,function(e){try{return new ActiveXObject(e),e}catch(t){return null}})}return navigator.plugins&&(e=e.concat(this.getRegularPlugins())),e},pluginsShouldBeSorted:function(){for(var e=!1,t=0,i=this.options.sortPluginsFor.length;i>t;t++){var a=this.options.sortPluginsFor[t];if(navigator.userAgent.match(a)){e=!0;break}}return e},touchSupportKey:function(e){return this.options.excludeTouchSupport||e.push({key:"touch_support",value:this.getTouchSupport()}),e},hasSessionStorage:function(){try{return!!window.sessionStorage}catch(e){return!0}},hasLocalStorage:function(){try{return!!window.localStorage}catch(e){return!0}},hasIndexedDB:function(){return!!window.indexedDB},getNavigatorCpuClass:function(){return navigator.cpuClass?navigator.cpuClass:"unknown"},getNavigatorPlatform:function(){return navigator.platform?navigator.platform:"unknown"},getDoNotTrack:function(){return navigator.doNotTrack?navigator.doNotTrack:"unknown"},getTouchSupport:function(){var e=0,t=!1;"undefined"!=typeof navigator.maxTouchPoints?e=navigator.maxTouchPoints:"undefined"!=typeof navigator.msMaxTouchPoints&&(e=navigator.msMaxTouchPoints);try{document.createEvent("TouchEvent"),t=!0}catch(i){}var a="ontouchstart"in window;return[e,t,a]},getCanvasFp:function(){var e=[],t=document.createElement("canvas");t.width=2e3,t.height=200,t.style.display="inline";var i=t.getContext("2d");return i.rect(0,0,10,10),i.rect(2,2,6,6),e.push("canvas winding:"+(i.isPointInPath(5,5,"evenodd")===!1?"yes":"no")),i.textBaseline="alphabetic",i.fillStyle="#f60",i.fillRect(125,1,62,20),i.fillStyle="#069",this.options.dontUseFakeFontInCanvas?i.font="11pt Arial":i.font="11pt no-real-font-123",i.fillText("Cwm fjordbank glyphs vext quiz, 😃",2,15),i.fillStyle="rgba(102, 204, 0, 0.7)",i.font="18pt Arial",i.fillText("Cwm fjordbank glyphs vext quiz, 😃",4,45),i.globalCompositeOperation="multiply",i.fillStyle="rgb(255,0,255)",i.beginPath(),i.arc(50,50,50,0,2*Math.PI,!0),i.closePath(),i.fill(),i.fillStyle="rgb(0,255,255)",i.beginPath(),i.arc(100,50,50,0,2*Math.PI,!0),i.closePath(),i.fill(),i.fillStyle="rgb(255,255,0)",i.beginPath(),i.arc(75,100,50,0,2*Math.PI,!0),i.closePath(),i.fill(),i.fillStyle="rgb(255,0,255)",i.arc(75,75,75,0,2*Math.PI,!0),i.arc(75,75,25,0,2*Math.PI,!0),i.fill("evenodd"),e.push("canvas fp:"+t.toDataURL()),e.join("~")},getWebglFp:function(){var e,t=function(t){return e.clearColor(0,0,0,1),e.enable(e.DEPTH_TEST),e.depthFunc(e.LEQUAL),e.clear(e.COLOR_BUFFER_BIT|e.DEPTH_BUFFER_BIT),"["+t[0]+", "+t[1]+"]"},i=function(e){var t,i=e.getExtension("EXT_texture_filter_anisotropic")||e.getExtension("WEBKIT_EXT_texture_filter_anisotropic")||e.getExtension("MOZ_EXT_texture_filter_anisotropic");return i?(t=e.getParameter(i.MAX_TEXTURE_MAX_ANISOTROPY_EXT),0===t&&(t=2),t):null};if(e=this.getWebglCanvas(),!e)return null;var a=[],r="attribute vec2 attrVertex;varying vec2 varyinTexCoordinate;uniform vec2 uniformOffset;void main(){varyinTexCoordinate=attrVertex+uniformOffset;gl_Position=vec4(attrVertex,0,1);}",n="precision mediump float;varying vec2 varyinTexCoordinate;void main() {gl_FragColor=vec4(varyinTexCoordinate,0,1);}",o=e.createBuffer();e.bindBuffer(e.ARRAY_BUFFER,o);var s=new Float32Array([-.2,-.9,0,.4,-.26,0,0,.732134444,0]);e.bufferData(e.ARRAY_BUFFER,s,e.STATIC_DRAW),o.itemSize=3,o.numItems=3;var l=e.createProgram(),h=e.createShader(e.VERTEX_SHADER);e.shaderSource(h,r),e.compileShader(h);var u=e.createShader(e.FRAGMENT_SHADER);return e.shaderSource(u,n),e.compileShader(u),e.attachShader(l,h),e.attachShader(l,u),e.linkProgram(l),e.useProgram(l),l.vertexPosAttrib=e.getAttribLocation(l,"attrVertex"),l.offsetUniform=e.getUniformLocation(l,"uniformOffset"),e.enableVertexAttribArray(l.vertexPosArray),e.vertexAttribPointer(l.vertexPosAttrib,o.itemSize,e.FLOAT,!1,0,0),e.uniform2f(l.offsetUniform,1,1),e.drawArrays(e.TRIANGLE_STRIP,0,o.numItems),null!=e.canvas&&a.push(e.canvas.toDataURL()),a.push("extensions:"+e.getSupportedExtensions().join(";")),a.push("webgl aliased line width range:"+t(e.getParameter(e.ALIASED_LINE_WIDTH_RANGE))),a.push("webgl aliased point size range:"+t(e.getParameter(e.ALIASED_POINT_SIZE_RANGE))),a.push("webgl alpha bits:"+e.getParameter(e.ALPHA_BITS)),a.push("webgl antialiasing:"+(e.getContextAttributes().antialias?"yes":"no")),a.push("webgl blue bits:"+e.getParameter(e.BLUE_BITS)),a.push("webgl depth bits:"+e.getParameter(e.DEPTH_BITS)),a.push("webgl green bits:"+e.getParameter(e.GREEN_BITS)),a.push("webgl max anisotropy:"+i(e)),a.push("webgl max combined texture image units:"+e.getParameter(e.MAX_COMBINED_TEXTURE_IMAGE_UNITS)),a.push("webgl max cube map texture size:"+e.getParameter(e.MAX_CUBE_MAP_TEXTURE_SIZE)),a.push("webgl max fragment uniform vectors:"+e.getParameter(e.MAX_FRAGMENT_UNIFORM_VECTORS)),a.push("webgl max render buffer size:"+e.getParameter(e.MAX_RENDERBUFFER_SIZE)),a.push("webgl max texture image units:"+e.getParameter(e.MAX_TEXTURE_IMAGE_UNITS)),a.push("webgl max texture size:"+e.getParameter(e.MAX_TEXTURE_SIZE)),a.push("webgl max varying vectors:"+e.getParameter(e.MAX_VARYING_VECTORS)),a.push("webgl max vertex attribs:"+e.getParameter(e.MAX_VERTEX_ATTRIBS)),a.push("webgl max vertex texture image units:"+e.getParameter(e.MAX_VERTEX_TEXTURE_IMAGE_UNITS)),a.push("webgl max vertex uniform vectors:"+e.getParameter(e.MAX_VERTEX_UNIFORM_VECTORS)),a.push("webgl max viewport dims:"+t(e.getParameter(e.MAX_VIEWPORT_DIMS))),a.push("webgl red bits:"+e.getParameter(e.RED_BITS)),a.push("webgl renderer:"+e.getParameter(e.RENDERER)),a.push("webgl shading language version:"+e.getParameter(e.SHADING_LANGUAGE_VERSION)),a.push("webgl stencil bits:"+e.getParameter(e.STENCIL_BITS)),a.push("webgl vendor:"+e.getParameter(e.VENDOR)),a.push("webgl version:"+e.getParameter(e.VERSION)),e.getShaderPrecisionFormat?(a.push("webgl vertex shader high float precision:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.HIGH_FLOAT).precision),a.push("webgl vertex shader high float precision rangeMin:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.HIGH_FLOAT).rangeMin),a.push("webgl vertex shader high float precision rangeMax:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.HIGH_FLOAT).rangeMax),a.push("webgl vertex shader medium float precision:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.MEDIUM_FLOAT).precision),a.push("webgl vertex shader medium float precision rangeMin:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.MEDIUM_FLOAT).rangeMin),a.push("webgl vertex shader medium float precision rangeMax:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.MEDIUM_FLOAT).rangeMax),a.push("webgl vertex shader low float precision:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.LOW_FLOAT).precision),a.push("webgl vertex shader low float precision rangeMin:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.LOW_FLOAT).rangeMin),a.push("webgl vertex shader low float precision rangeMax:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.LOW_FLOAT).rangeMax),a.push("webgl fragment shader high float precision:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.HIGH_FLOAT).precision),a.push("webgl fragment shader high float precision rangeMin:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.HIGH_FLOAT).rangeMin),a.push("webgl fragment shader high float precision rangeMax:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.HIGH_FLOAT).rangeMax),a.push("webgl fragment shader medium float precision:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.MEDIUM_FLOAT).precision),a.push("webgl fragment shader medium float precision rangeMin:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.MEDIUM_FLOAT).rangeMin),a.push("webgl fragment shader medium float precision rangeMax:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.MEDIUM_FLOAT).rangeMax),a.push("webgl fragment shader low float precision:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.LOW_FLOAT).precision),a.push("webgl fragment shader low float precision rangeMin:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.LOW_FLOAT).rangeMin),a.push("webgl fragment shader low float precision rangeMax:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.LOW_FLOAT).rangeMax),a.push("webgl vertex shader high int precision:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.HIGH_INT).precision),a.push("webgl vertex shader high int precision rangeMin:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.HIGH_INT).rangeMin),a.push("webgl vertex shader high int precision rangeMax:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.HIGH_INT).rangeMax),a.push("webgl vertex shader medium int precision:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.MEDIUM_INT).precision),a.push("webgl vertex shader medium int precision rangeMin:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.MEDIUM_INT).rangeMin),a.push("webgl vertex shader medium int precision rangeMax:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.MEDIUM_INT).rangeMax),a.push("webgl vertex shader low int precision:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.LOW_INT).precision),a.push("webgl vertex shader low int precision rangeMin:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.LOW_INT).rangeMin),a.push("webgl vertex shader low int precision rangeMax:"+e.getShaderPrecisionFormat(e.VERTEX_SHADER,e.LOW_INT).rangeMax),a.push("webgl fragment shader high int precision:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.HIGH_INT).precision),a.push("webgl fragment shader high int precision rangeMin:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.HIGH_INT).rangeMin),a.push("webgl fragment shader high int precision rangeMax:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.HIGH_INT).rangeMax),a.push("webgl fragment shader medium int precision:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.MEDIUM_INT).precision),a.push("webgl fragment shader medium int precision rangeMin:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.MEDIUM_INT).rangeMin),a.push("webgl fragment shader medium int precision rangeMax:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.MEDIUM_INT).rangeMax),a.push("webgl fragment shader low int precision:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.LOW_INT).precision),a.push("webgl fragment shader low int precision rangeMin:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.LOW_INT).rangeMin),a.push("webgl fragment shader low int precision rangeMax:"+e.getShaderPrecisionFormat(e.FRAGMENT_SHADER,e.LOW_INT).rangeMax),a.join("~")):a.join("~")},getAdBlock:function(){var e=document.createElement("div");e.setAttribute("id","ads");try{return document.body.appendChild(e),!document.getElementById("ads")}catch(t){return!1}},getHasLiedLanguages:function(){if("undefined"!=typeof navigator.languages)try{var e=navigator.languages[0].substr(0,2);if(e!==navigator.language.substr(0,2))return!0}catch(t){return!0}return!1},getHasLiedResolution:function(){return screen.width<screen.availWidth?!0:screen.height<screen.availHeight},getHasLiedOs:function(){var e,t=navigator.userAgent.toLowerCase(),i=navigator.oscpu,a=navigator.platform.toLowerCase();e=t.indexOf("windows phone")>=0?"Windows Phone":t.indexOf("win")>=0?"Windows":t.indexOf("android")>=0?"Android":t.indexOf("linux")>=0?"Linux":t.indexOf("iphone")>=0||t.indexOf("ipad")>=0?"iOS":t.indexOf("mac")>=0?"Mac":"Other";var r;if(r="ontouchstart"in window||navigator.maxTouchPoints>0||navigator.msMaxTouchPoints>0,r&&"Windows Phone"!==e&&"Android"!==e&&"iOS"!==e&&"Other"!==e)return!0;if("undefined"!=typeof i){if(i=i.toLowerCase(),i.indexOf("win")>=0&&"Windows"!==e&&"Windows Phone"!==e)return!0;if(i.indexOf("linux")>=0&&"Linux"!==e&&"Android"!==e)return!0;if(i.indexOf("mac")>=0&&"Mac"!==e&&"iOS"!==e)return!0;if(0===i.indexOf("win")&&0===i.indexOf("linux")&&i.indexOf("mac")>=0&&"other"!==e)return!0}return a.indexOf("win")>=0&&"Windows"!==e&&"Windows Phone"!==e?!0:(a.indexOf("linux")>=0||a.indexOf("android")>=0||a.indexOf("pike")>=0)&&"Linux"!==e&&"Android"!==e?!0:(a.indexOf("mac")>=0||a.indexOf("ipad")>=0||a.indexOf("ipod")>=0||a.indexOf("iphone")>=0)&&"Mac"!==e&&"iOS"!==e?!0:0===a.indexOf("win")&&0===a.indexOf("linux")&&a.indexOf("mac")>=0&&"other"!==e?!0:"undefined"==typeof navigator.plugins&&"Windows"!==e&&"Windows Phone"!==e},getHasLiedBrowser:function(){var e,t=navigator.userAgent.toLowerCase(),i=navigator.productSub;if(e=t.indexOf("firefox")>=0?"Firefox":t.indexOf("opera")>=0||t.indexOf("opr")>=0?"Opera":t.indexOf("chrome")>=0?"Chrome":t.indexOf("safari")>=0?"Safari":t.indexOf("trident")>=0?"Internet Explorer":"Other",("Chrome"===e||"Safari"===e||"Opera"===e)&&"20030107"!==i)return!0;var a=eval.toString().length;if(37===a&&"Safari"!==e&&"Firefox"!==e&&"Other"!==e)return!0;if(39===a&&"Internet Explorer"!==e&&"Other"!==e)return!0;if(33===a&&"Chrome"!==e&&"Opera"!==e&&"Other"!==e)return!0;var r;try{throw"a"}catch(n){try{n.toSource(),r=!0}catch(o){r=!1}}return!(!r||"Firefox"===e||"Other"===e)},isCanvasSupported:function(){var e=document.createElement("canvas");return!(!e.getContext||!e.getContext("2d"))},isWebGlSupported:function(){if(!this.isCanvasSupported())return!1;var e,t=document.createElement("canvas");try{e=t.getContext&&(t.getContext("webgl")||t.getContext("experimental-webgl"))}catch(i){e=!1}return!!window.WebGLRenderingContext&&!!e},isIE:function(){return"Microsoft Internet Explorer"===navigator.appName?!0:!("Netscape"!==navigator.appName||!/Trident/.test(navigator.userAgent))},hasSwfObjectLoaded:function(){return"undefined"!=typeof window.swfobject},hasMinFlashInstalled:function(){return swfobject.hasFlashPlayerVersion("9.0.0")},addFlashDivNode:function(){var e=document.createElement("div");e.setAttribute("id",this.options.swfContainerId),document.body.appendChild(e)},loadSwfAndDetectFonts:function(e){var t="___fp_swf_loaded";window[t]=function(t){e(t)};var i=this.options.swfContainerId;this.addFlashDivNode();var a={onReady:t},r={allowScriptAccess:"always",menu:"false"};swfobject.embedSWF(this.options.swfPath,i,"1","1","9.0.0",!1,a,r,{})},getWebglCanvas:function(){var e=document.createElement("canvas"),t=null;try{t=e.getContext("webgl")||e.getContext("experimental-webgl")}catch(i){}return t||(t=null),t},each:function(e,t,i){if(null!==e)if(this.nativeForEach&&e.forEach===this.nativeForEach)e.forEach(t,i);else if(e.length===+e.length){for(var a=0,r=e.length;r>a;a++)if(t.call(i,e[a],a,e)==={})return}else for(var n in e)if(e.hasOwnProperty(n)&&t.call(i,e[n],n,e)==={})return},map:function(e,t,i){var a=[];return null==e?a:this.nativeMap&&e.map===this.nativeMap?e.map(t,i):(this.each(e,function(e,r,n){a[a.length]=t.call(i,e,r,n)}),a)},x64Add:function(e,t){e=[e[0]>>>16,65535&e[0],e[1]>>>16,65535&e[1]],t=[t[0]>>>16,65535&t[0],t[1]>>>16,65535&t[1]];var i=[0,0,0,0];return i[3]+=e[3]+t[3],i[2]+=i[3]>>>16,i[3]&=65535,i[2]+=e[2]+t[2],i[1]+=i[2]>>>16,i[2]&=65535,i[1]+=e[1]+t[1],i[0]+=i[1]>>>16,i[1]&=65535,i[0]+=e[0]+t[0],i[0]&=65535,[i[0]<<16|i[1],i[2]<<16|i[3]]},x64Multiply:function(e,t){e=[e[0]>>>16,65535&e[0],e[1]>>>16,65535&e[1]],t=[t[0]>>>16,65535&t[0],t[1]>>>16,65535&t[1]];var i=[0,0,0,0];return i[3]+=e[3]*t[3],i[2]+=i[3]>>>16,i[3]&=65535,i[2]+=e[2]*t[3],i[1]+=i[2]>>>16,i[2]&=65535,i[2]+=e[3]*t[2],i[1]+=i[2]>>>16,i[2]&=65535,i[1]+=e[1]*t[3],i[0]+=i[1]>>>16,i[1]&=65535,i[1]+=e[2]*t[2],i[0]+=i[1]>>>16,i[1]&=65535,i[1]+=e[3]*t[1],i[0]+=i[1]>>>16,i[1]&=65535,i[0]+=e[0]*t[3]+e[1]*t[2]+e[2]*t[1]+e[3]*t[0],i[0]&=65535,[i[0]<<16|i[1],i[2]<<16|i[3]]},x64Rotl:function(e,t){return t%=64,32===t?[e[1],e[0]]:32>t?[e[0]<<t|e[1]>>>32-t,e[1]<<t|e[0]>>>32-t]:(t-=32,[e[1]<<t|e[0]>>>32-t,e[0]<<t|e[1]>>>32-t])},x64LeftShift:function(e,t){return t%=64,0===t?e:32>t?[e[0]<<t|e[1]>>>32-t,e[1]<<t]:[e[1]<<t-32,0]},x64Xor:function(e,t){return[e[0]^t[0],e[1]^t[1]]},x64Fmix:function(e){return e=this.x64Xor(e,[0,e[0]>>>1]),e=this.x64Multiply(e,[4283543511,3981806797]),e=this.x64Xor(e,[0,e[0]>>>1]),e=this.x64Multiply(e,[3301882366,444984403]),e=this.x64Xor(e,[0,e[0]>>>1])},x64hash128:function(e,t){e=e||"",t=t||0;for(var i=e.length%16,a=e.length-i,r=[0,t],n=[0,t],o=[0,0],s=[0,0],l=[2277735313,289559509],h=[1291169091,658871167],u=0;a>u;u+=16)o=[255&e.charCodeAt(u+4)|(255&e.charCodeAt(u+5))<<8|(255&e.charCodeAt(u+6))<<16|(255&e.charCodeAt(u+7))<<24,255&e.charCodeAt(u)|(255&e.charCodeAt(u+1))<<8|(255&e.charCodeAt(u+2))<<16|(255&e.charCodeAt(u+3))<<24],s=[255&e.charCodeAt(u+12)|(255&e.charCodeAt(u+13))<<8|(255&e.charCodeAt(u+14))<<16|(255&e.charCodeAt(u+15))<<24,255&e.charCodeAt(u+8)|(255&e.charCodeAt(u+9))<<8|(255&e.charCodeAt(u+10))<<16|(255&e.charCodeAt(u+11))<<24],o=this.x64Multiply(o,l),o=this.x64Rotl(o,31),o=this.x64Multiply(o,h),r=this.x64Xor(r,o),r=this.x64Rotl(r,27),r=this.x64Add(r,n),r=this.x64Add(this.x64Multiply(r,[0,5]),[0,1390208809]),s=this.x64Multiply(s,h),s=this.x64Rotl(s,33),s=this.x64Multiply(s,l),n=this.x64Xor(n,s),n=this.x64Rotl(n,31),n=this.x64Add(n,r),n=this.x64Add(this.x64Multiply(n,[0,5]),[0,944331445]);switch(o=[0,0],s=[0,0],i){case 15:s=this.x64Xor(s,this.x64LeftShift([0,e.charCodeAt(u+14)],48));case 14:s=this.x64Xor(s,this.x64LeftShift([0,e.charCodeAt(u+13)],40));case 13:s=this.x64Xor(s,this.x64LeftShift([0,e.charCodeAt(u+12)],32));case 12:s=this.x64Xor(s,this.x64LeftShift([0,e.charCodeAt(u+11)],24));case 11:s=this.x64Xor(s,this.x64LeftShift([0,e.charCodeAt(u+10)],16));case 10:s=this.x64Xor(s,this.x64LeftShift([0,e.charCodeAt(u+9)],8));case 9:s=this.x64Xor(s,[0,e.charCodeAt(u+8)]),s=this.x64Multiply(s,h),
diff --git a/app/bundles/CoreBundle/EventListener/ChannelTrait.php b/app/bundles/CoreBundle/EventListener/ChannelTrait.php
index e75e6124aae..bef655e6ff8 100644
--- a/app/bundles/CoreBundle/EventListener/ChannelTrait.php
+++ b/app/bundles/CoreBundle/EventListener/ChannelTrait.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-namespace Mautic\CoreBundle\EventListener;
 
+namespace Mautic\CoreBundle\EventListener;
 
 use Mautic\CoreBundle\Factory\ModelFactory;
 
@@ -27,7 +28,7 @@ public function setModelFactory(ModelFactory $modelFactory)
     }
 
     /**
-     * Get the model for a channel
+     * Get the model for a channel.
      *
      * @param $channel
      *
@@ -52,7 +53,7 @@ protected function getChannelModel($channel)
     }
 
     /**
-     * Get the entity for a channel item
+     * Get the entity for a channel item.
      *
      * @param $channel
      * @param $channelId
@@ -74,7 +75,7 @@ protected function getChannelEntity($channel, $channelId)
     }
 
     /**
-     * Get the name and/or view URL for a channel entity
+     * Get the name and/or view URL for a channel entity.
      *
      * @param      $channel
      * @param      $channelId
@@ -104,14 +105,14 @@ protected function getChannelEntityName($channel, $channelId, $returnWithViewUrl
                         $routeSourceName,
                         [
                             'objectAction' => 'view',
-                            'objectId'     => $channelId
+                            'objectId'     => $channelId,
                         ]
                     );
                 }
 
                 return [
                     'name' => $name,
-                    'url'  => $url
+                    'url'  => $url,
                 ];
             }
 
@@ -120,4 +121,4 @@ protected function getChannelEntityName($channel, $channelId, $returnWithViewUrl
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/EventListener/CommonSubscriber.php b/app/bundles/CoreBundle/EventListener/CommonSubscriber.php
index 0b72a8bf544..9b7608b1df0 100644
--- a/app/bundles/CoreBundle/EventListener/CommonSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/CommonSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,12 +19,11 @@
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class CoreSubscriber
+ * Class CoreSubscriber.
  */
 class CommonSubscriber implements EventSubscriberInterface
 {
@@ -34,7 +34,7 @@ class CommonSubscriber implements EventSubscriberInterface
      *
      * @param MauticFactory $factory
      *
-     * @deprecated Will be removed in 3.0. Use __construct to inject your dependencies.
+     * @deprecated Will be removed in 3.0. Use __construct to inject your dependencies
      */
     public function setFactory(MauticFactory $factory)
     {
@@ -44,7 +44,7 @@ public function setFactory(MauticFactory $factory)
     /**
      * @var MauticFactory
      *
-     * @deprecated Will be removed in 3.0. Use __construct to inject your dependencies.
+     * @deprecated Will be removed in 3.0. Use __construct to inject your dependencies
      */
     protected $factory;
 
@@ -177,15 +177,14 @@ public function setRouter(Router $router)
      */
     public function init()
     {
-
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/app/bundles/CoreBundle/EventListener/ConfigSubscriber.php b/app/bundles/CoreBundle/EventListener/ConfigSubscriber.php
index 227b1a29892..3037f81d982 100644
--- a/app/bundles/CoreBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/ConfigSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\EventListener;
 
 use Mautic\ConfigBundle\ConfigEvents;
-use Mautic\ConfigBundle\Event\ConfigEvent;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\ConfigBundle\Event\ConfigEvent;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\LanguageHelper;
 
 /**
- * Class ConfigSubscriber
- *
- * @package Mautic\CoreBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
@@ -40,29 +39,29 @@ class ConfigSubscriber extends CommonSubscriber
      */
     public function __construct(LanguageHelper $languageHelper, CoreParametersHelper $coreParametersHelper)
     {
-        $this->languageHelper = $languageHelper;
+        $this->languageHelper       = $languageHelper;
         $this->coreParametersHelper = $coreParametersHelper;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE    => array('onConfigGenerate', 0),
-            ConfigEvents::CONFIG_PRE_SAVE       => array('onConfigBeforeSave', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+            ConfigEvents::CONFIG_PRE_SAVE    => ['onConfigBeforeSave', 0],
+        ];
     }
 
     public function onConfigGenerate(ConfigBuilderEvent $event)
     {
-        $event->addForm(array(
-            'bundle'        => 'CoreBundle',
-            'formAlias'     => 'coreconfig',
-            'formTheme'     => 'MauticCoreBundle:FormTheme\Config',
-            'parameters'    => $event->getParametersFromConfig('MauticCoreBundle')
-        ));
+        $event->addForm([
+            'bundle'     => 'CoreBundle',
+            'formAlias'  => 'coreconfig',
+            'formTheme'  => 'MauticCoreBundle:FormTheme\Config',
+            'parameters' => $event->getParametersFromConfig('MauticCoreBundle'),
+        ]);
     }
 
     public function onConfigBeforeSave(ConfigEvent $event)
@@ -81,8 +80,8 @@ public function onConfigBeforeSave(ConfigEvent $event)
             // If there is an error, fall back to 'en_US' as it is our system default
             if ($fetchLanguage['error']) {
                 $values['coreconfig']['locale'] = 'en_US';
-                $message = 'mautic.core.could.not.set.language';
-                $messageVars = array();
+                $message                        = 'mautic.core.could.not.set.language';
+                $messageVars                    = [];
 
                 if (isset($fetchLanguage['message'])) {
                     $message = $fetchLanguage['message'];
diff --git a/app/bundles/CoreBundle/EventListener/ConsoleExceptionListener.php b/app/bundles/CoreBundle/EventListener/ConsoleExceptionListener.php
index 2ad7656032e..4a97458ff43 100644
--- a/app/bundles/CoreBundle/EventListener/ConsoleExceptionListener.php
+++ b/app/bundles/CoreBundle/EventListener/ConsoleExceptionListener.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\EventListener;
 
-use Symfony\Component\Console\Event\ConsoleExceptionEvent;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Event\ConsoleExceptionEvent;
 
 /**
- * Class ConsoleExceptionListener
+ * Class ConsoleExceptionListener.
  */
 class ConsoleExceptionListener
 {
-
     /**
      * @var LoggerInterface
      */
@@ -33,8 +33,6 @@ public function __construct(LoggerInterface $logger)
 
     /**
      * @param ConsoleExceptionEvent $event
-     *
-     * @return void
      */
     public function onConsoleException(ConsoleExceptionEvent $event)
     {
@@ -42,7 +40,7 @@ public function onConsoleException(ConsoleExceptionEvent $event)
         $exception = $event->getException();
 
         // Log error with trace
-        $trace = (MAUTIC_ENV == 'dev') ? "\n[stack trace]\n" . $exception->getTraceAsString() : '';
+        $trace = (MAUTIC_ENV == 'dev') ? "\n[stack trace]\n".$exception->getTraceAsString() : '';
 
         $message = sprintf(
             '%s: %s (uncaught exception) at %s line %s while running console command `%s`%s',
diff --git a/app/bundles/CoreBundle/EventListener/ConsoleTerminateListener.php b/app/bundles/CoreBundle/EventListener/ConsoleTerminateListener.php
index a1bf64d377b..9e9a1fa83e1 100644
--- a/app/bundles/CoreBundle/EventListener/ConsoleTerminateListener.php
+++ b/app/bundles/CoreBundle/EventListener/ConsoleTerminateListener.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\EventListener;
 
-use Symfony\Component\Console\Event\ConsoleTerminateEvent;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
 
 /**
- * Class ConsoleTerminateListener
+ * Class ConsoleTerminateListener.
  */
 class ConsoleTerminateListener
 {
-
     /**
      * @var LoggerInterface
      */
@@ -33,13 +33,11 @@ public function __construct(LoggerInterface $logger)
 
     /**
      * @param ConsoleTerminateEvent $event
-     *
-     * @return void
      */
     public function onConsoleTerminate(ConsoleTerminateEvent $event)
     {
         $statusCode = $event->getExitCode();
-        $command = $event->getCommand();
+        $command    = $event->getCommand();
 
         if ($statusCode === 0) {
             return;
diff --git a/app/bundles/CoreBundle/EventListener/CoreSubscriber.php b/app/bundles/CoreBundle/EventListener/CoreSubscriber.php
index 6471791af11..cdd37621f1a 100644
--- a/app/bundles/CoreBundle/EventListener/CoreSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/CoreSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,12 +12,10 @@
 
 use Mautic\CoreBundle\Controller\MauticController;
 use Mautic\CoreBundle\CoreEvents;
+use Mautic\CoreBundle\Event\IconEvent;
 use Mautic\CoreBundle\Event\MenuEvent;
 use Mautic\CoreBundle\Event\RouteEvent;
-use Mautic\CoreBundle\Event\IconEvent;
-use Mautic\ApiBundle\Event as ApiEvents;
 use Mautic\CoreBundle\Helper\BundleHelper;
-use Mautic\CoreBundle\Helper\CookieHelper;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\UserHelper;
 use Mautic\CoreBundle\Menu\MenuHelper;
@@ -27,7 +26,6 @@
 use Mautic\UserBundle\Model\UserModel;
 use Mautic\UserBundle\UserEvents;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Security\Core\SecurityContext;
@@ -35,7 +33,7 @@
 use Symfony\Component\Security\Http\SecurityEvents;
 
 /**
- * Class CoreSubscriber
+ * Class CoreSubscriber.
  */
 class CoreSubscriber extends CommonSubscriber
 {
@@ -82,8 +80,7 @@ public function __construct(
         CoreParametersHelper $coreParametersHelper,
         SecurityContext $securityContext,
         UserModel $userModel
-    )
-    {
+    ) {
         $this->bundleHelper         = $bundleHelper;
         $this->menuHelper           = $menuHelper;
         $this->userHelper           = $userHelper;
@@ -99,19 +96,19 @@ public function __construct(
     public static function getSubscribedEvents()
     {
         return [
-            KernelEvents::CONTROLLER          => [
+            KernelEvents::CONTROLLER => [
                 ['onKernelController', 0],
                 ['onKernelRequestAddGlobalJS', 0],
             ],
             CoreEvents::BUILD_MENU            => ['onBuildMenu', 9999],
             CoreEvents::BUILD_ROUTE           => ['onBuildRoute', 0],
             CoreEvents::FETCH_ICONS           => ['onFetchIcons', 9999],
-            SecurityEvents::INTERACTIVE_LOGIN => ['onSecurityInteractiveLogin', 0]
+            SecurityEvents::INTERACTIVE_LOGIN => ['onSecurityInteractiveLogin', 0],
         ];
     }
 
     /**
-     * Add mauticForms in js script tag for Froala
+     * Add mauticForms in js script tag for Froala.
      *
      * @param FilterControllerEvent $event
      */
@@ -129,11 +126,9 @@ public function onKernelRequestAddGlobalJS(FilterControllerEvent $event)
     }
 
     /**
-     * Set vars on login
+     * Set vars on login.
      *
      * @param InteractiveLoginEvent $event
-     *
-     * @return void
      */
     public function onSecurityInteractiveLogin(InteractiveLoginEvent $event)
     {
@@ -144,7 +139,6 @@ public function onSecurityInteractiveLogin(InteractiveLoginEvent $event)
         $session = $event->getRequest()->getSession();
 
         if ($this->securityContext->isGranted('IS_AUTHENTICATED_FULLY') || $this->securityContext->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
-
             $user = $event->getAuthenticationToken()->getUser();
 
             //set a session var for filemanager to know someone is logged in
@@ -188,11 +182,9 @@ public function onSecurityInteractiveLogin(InteractiveLoginEvent $event)
     }
 
     /**
-     * Populates namespace, bundle, controller, and action into request to be used throughout application
+     * Populates namespace, bundle, controller, and action into request to be used throughout application.
      *
      * @param FilterControllerEvent $event
-     *
-     * @return void
      */
     public function onKernelController(FilterControllerEvent $event)
     {
@@ -260,21 +252,19 @@ public function onKernelController(FilterControllerEvent $event)
 
     /**
      * @param MenuEvent $event
-     *
-     * @return void
      */
     public function onBuildMenu(MenuEvent $event)
     {
-        $name = $event->getType();
+        $name    = $event->getType();
         $bundles = $this->bundleHelper->getMauticBundles(true);
         foreach ($bundles as $bundle) {
             if (!empty($bundle['config']['menu'][$name])) {
                 $menu = $bundle['config']['menu'][$name];
                 $event->addMenuItems(
-                    array(
+                    [
                         'priority' => !isset($menu['priority']) ? 9999 : $menu['priority'],
-                        'items'    => !isset($menu['items']) ? $menu : $menu['items']
-                    )
+                        'items'    => !isset($menu['items']) ? $menu : $menu['items'],
+                    ]
                 );
             }
         }
@@ -282,8 +272,6 @@ public function onBuildMenu(MenuEvent $event)
 
     /**
      * @param RouteEvent $event
-     *
-     * @return void
      */
     public function onBuildRoute(RouteEvent $event)
     {
@@ -295,7 +283,7 @@ public function onBuildRoute(RouteEvent $event)
             if (!empty($bundle['config']['routes'][$type])) {
                 foreach ($bundle['config']['routes'][$type] as $name => $details) {
                     // Set defaults and controller
-                    $defaults = (!empty($details['defaults'])) ? $details['defaults'] : array();
+                    $defaults = (!empty($details['defaults'])) ? $details['defaults'] : [];
                     if (isset($details['controller'])) {
                         $defaults['_controller'] = $details['controller'];
                     }
@@ -315,7 +303,7 @@ public function onBuildRoute(RouteEvent $event)
                     }
 
                     // Set requirements
-                    $requirements = (!empty($details['requirements'])) ? $details['requirements'] : array();
+                    $requirements = (!empty($details['requirements'])) ? $details['requirements'] : [];
 
                     // Set some very commonly used defaults and requirements
                     if (strpos($details['path'], '{page}') !== false) {
@@ -333,7 +321,7 @@ public function onBuildRoute(RouteEvent $event)
                         }
                         if (!isset($requirements['objectId'])) {
                             // Only allow alphanumeric for objectId
-                            $requirements['objectId'] = "[a-zA-Z0-9_]+";
+                            $requirements['objectId'] = '[a-zA-Z0-9_]+';
                         }
                     }
                     if ($type == 'api' && strpos($details['path'], '{id}') !== false) {
@@ -351,13 +339,11 @@ public function onBuildRoute(RouteEvent $event)
 
     /**
      * @param IconEvent $event
-     *
-     * @return void
      */
     public function onFetchIcons(IconEvent $event)
     {
         $session = $this->request->getSession();
-        $icons   = $session->get('mautic.menu.icons', array());
+        $icons   = $session->get('mautic.menu.icons', []);
 
         if (empty($icons)) {
             $bundles = $this->bundleHelper->getMauticBundles(true);
diff --git a/app/bundles/CoreBundle/EventListener/DashboardSubscriber.php b/app/bundles/CoreBundle/EventListener/DashboardSubscriber.php
index ed05ea04256..948b52e07b2 100644
--- a/app/bundles/CoreBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/DashboardSubscriber.php
@@ -1,41 +1,41 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CoreBundle\EventListener;
 
+use Mautic\CoreBundle\CoreEvents;
+use Mautic\CoreBundle\Event\IconEvent;
 use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Event\IconEvent;
-use Mautic\CoreBundle\CoreEvents;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\CoreBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'core';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'recent.activity' => array()
-    );
+    protected $types = [
+        'recent.activity' => [],
+    ];
 
     /**
      * @var AuditLogModel
@@ -53,11 +53,9 @@ public function __construct(AuditLogModel $auditLogModel)
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
@@ -77,7 +75,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                                 $log['objectName'] = $item->{$model->getNameGetter()}();
 
                                 if ($log['bundle'] == 'lead' && $log['objectName'] == 'mautic.lead.lead.anonymous') {
-                                    $log['objectName'] = $this->translator ->trans('mautic.lead.lead.anonymous');
+                                    $log['objectName'] = $this->translator->trans('mautic.lead.lead.anonymous');
                                 }
                             } else {
                                 $log['objectName'] = '';
@@ -87,7 +85,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                             if ($this->router->getRouteCollection()->get($routeName) !== null) {
                                 $log['route'] = $this->router->generate(
                                     'mautic_'.$log['bundle'].'_action',
-                                    array('objectAction' => 'view', 'objectId' => $log['objectId'])
+                                    ['objectAction' => 'view', 'objectId' => $log['objectId']]
                                 );
                             } else {
                                 $log['route'] = false;
@@ -100,7 +98,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
 
                 $iconEvent = new IconEvent($this->security);
                 $this->dispatcher->dispatch(CoreEvents::FETCH_ICONS, $iconEvent);
-                $event->setTemplateData(array('logs' => $logs, 'icons' => $iconEvent->getIcons()));
+                $event->setTemplateData(['logs' => $logs, 'icons' => $iconEvent->getIcons()]);
             }
 
             $event->setTemplate('MauticDashboardBundle:Dashboard:recentactivity.html.php');
diff --git a/app/bundles/CoreBundle/EventListener/DoctrineEventsSubscriber.php b/app/bundles/CoreBundle/EventListener/DoctrineEventsSubscriber.php
index 41fd1b13855..5b6a60e16f5 100644
--- a/app/bundles/CoreBundle/EventListener/DoctrineEventsSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/DoctrineEventsSubscriber.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\EventListener;
 
-use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
 
 /**
- * Class DoctrineEventsSubscriber
+ * Class DoctrineEventsSubscriber.
  */
 class DoctrineEventsSubscriber implements EventSubscriber
 {
@@ -40,14 +40,11 @@ public function getSubscribedEvents()
 
     /**
      * @param LoadClassMetadataEventArgs $args
-     *
-     * @return void
      */
     public function loadClassMetadata(LoadClassMetadataEventArgs $args)
     {
         //in the installer
         if (!defined('MAUTIC_TABLE_PREFIX') && empty($this->tablePrefix)) {
-
             return;
         } elseif (empty($this->tablePrefix)) {
             $this->tablePrefix = MAUTIC_TABLE_PREFIX;
@@ -58,7 +55,6 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $args)
 
         // Do not re-apply the prefix in an inheritance hierarchy.
         if ($classMetadata->isInheritanceTypeSingleTable() && !$classMetadata->isRootEntity()) {
-
             return;
         }
 
@@ -85,7 +81,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $args)
                 [
                     'name'              => $this->tablePrefix.$classMetadata->getTableName(),
                     'indexes'           => $indexes,
-                    'uniqueConstraints' => $uniqueConstraints
+                    'uniqueConstraints' => $uniqueConstraints,
                 ]
             );
 
@@ -119,4 +115,4 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $args)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/EventListener/EnvironmentSubscriber.php b/app/bundles/CoreBundle/EventListener/EnvironmentSubscriber.php
index 8fa62afcfdf..a5618786ae0 100644
--- a/app/bundles/CoreBundle/EventListener/EnvironmentSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/EnvironmentSubscriber.php
@@ -1,41 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\EventListener;
 
-use Mautic\CoreBundle\Controller\MauticController;
-use Mautic\CoreBundle\CoreEvents;
-use Mautic\CoreBundle\Event\MenuEvent;
-use Mautic\CoreBundle\Event\RouteEvent;
-use Mautic\CoreBundle\Event\IconEvent;
-use Mautic\ApiBundle\Event as ApiEvents;
-use Mautic\CoreBundle\Helper\BundleHelper;
 use Mautic\CoreBundle\Helper\CookieHelper;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
-use Mautic\CoreBundle\Helper\UserHelper;
-use Mautic\CoreBundle\Menu\MenuHelper;
-use Mautic\CoreBundle\Templating\Helper\AssetsHelper;
-use Mautic\InstallBundle\Controller\InstallController;
 use Mautic\UserBundle\Entity\User;
-use Mautic\UserBundle\Event\LoginEvent;
-use Mautic\UserBundle\Model\UserModel;
-use Mautic\UserBundle\UserEvents;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
-use Symfony\Component\Security\Http\SecurityEvents;
 
 /**
- * Class EnvironmentSubscriber
+ * Class EnvironmentSubscriber.
  */
 class EnvironmentSubscriber extends CommonSubscriber
 {
@@ -68,7 +50,7 @@ public static function getSubscribedEvents()
     }
 
     /**
-     * Set timezone
+     * Set timezone.
      *
      * @param GetResponseEvent $event
      */
@@ -90,11 +72,9 @@ public function onKernelRequestSetTimezone(GetResponseEvent $event)
     }
 
     /**
-     * Set default locale
+     * Set default locale.
      *
      * @param GetResponseEvent $event
-     *
-     * @return void
      */
     public function onKernelRequestSetLocale(GetResponseEvent $event)
     {
diff --git a/app/bundles/CoreBundle/EventListener/ErrorHandlingListener.php b/app/bundles/CoreBundle/EventListener/ErrorHandlingListener.php
index 9cc9ebc0f06..2eb25529492 100644
--- a/app/bundles/CoreBundle/EventListener/ErrorHandlingListener.php
+++ b/app/bundles/CoreBundle/EventListener/ErrorHandlingListener.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -29,9 +30,9 @@ class ErrorHandlingListener implements EventSubscriberInterface
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::REQUEST => array('onKernelRequest', 2047)
-        );
+        return [
+            KernelEvents::REQUEST => ['onKernelRequest', 2047],
+        ];
     }
 
     /**
@@ -44,15 +45,15 @@ public function __construct($environment, LoggerInterface $logger)
             $this->logger = $logger;
 
             // Log PHP fatal errors
-            register_shutdown_function(array($this, 'handleFatal'));
+            register_shutdown_function([$this, 'handleFatal']);
 
             // Log general PHP errors
-            $this->prevErrorHandler = set_error_handler(array($this, 'handleError'));
+            $this->prevErrorHandler = set_error_handler([$this, 'handleError']);
         }
     }
 
     /**
-     * Log fatal error to Mautic's logs and throw exception for the parent generic error page to catch
+     * Log fatal error to Mautic's logs and throw exception for the parent generic error page to catch.
      *
      * @throws \Exception
      */
@@ -68,7 +69,7 @@ public function handleFatal()
                 defined('MAUTIC_OFFLINE') or define('MAUTIC_OFFLINE', 1);
 
                 if (MAUTIC_ENV == 'dev') {
-                    $message    = "<pre>{$error['message']} - in file {$error['file']} - at line {$error['line']}</pre>";
+                    $message = "<pre>{$error['message']} - in file {$error['file']} - at line {$error['line']}</pre>";
 
                     // Get a trace
                     ob_start();
@@ -78,10 +79,10 @@ public function handleFatal()
 
                     // Remove first item from backtrace as it's this function which
                     // is redundant.
-                    $trace = preg_replace ('/^#0\s+' . __FUNCTION__ . "[^\n]*\n/", '', $trace, 1);
+                    $trace = preg_replace('/^#0\s+'.__FUNCTION__."[^\n]*\n/", '', $trace, 1);
 
                     // Renumber backtrace items.
-                    $trace = preg_replace ('/^#(\d+)/me', '\'#\' . ($1 - 1)', $trace);
+                    $trace = preg_replace('/^#(\d+)/me', '\'#\' . ($1 - 1)', $trace);
 
                     $submessage = "<pre>$trace</pre>";
                 } else {
@@ -95,7 +96,7 @@ public function handleFatal()
     }
 
     /**
-     * Log PHP information to Mautic's logs
+     * Log PHP information to Mautic's logs.
      *
      * @param        $level
      * @param        $message
@@ -105,7 +106,7 @@ public function handleFatal()
      *
      * @return mixed
      */
-    public function handleError($level, $message, $file = 'unknown', $line = 0, $context = array())
+    public function handleError($level, $message, $file = 'unknown', $line = 0, $context = [])
     {
         $errorReporting = error_reporting();
         if ($level & $errorReporting) {
@@ -117,7 +118,7 @@ public function handleError($level, $message, $file = 'unknown', $line = 0, $con
                 $level = LogLevel::ERROR;
             }
 
-            $this->logger->log($level, "PHP " . ucfirst($level) . ": $message - in file $file - at line $line");
+            $this->logger->log($level, 'PHP '.ucfirst($level).": $message - in file $file - at line $line");
 
             if ($this->prevErrorHandler) {
                 call_user_func($this->prevErrorHandler, $level, $message, $file, $line, $context);
@@ -146,22 +147,22 @@ private function getErrorName($bit)
             case E_CORE_ERROR:
             case E_RECOVERABLE_ERROR:
 
-                return "Error";
+                return 'Error';
 
             case E_WARNING:
             case E_USER_WARNING:
             case E_CORE_WARNING:
 
-                return "Warning";
+                return 'Warning';
 
             case E_DEPRECATED:
             case E_USER_DEPRECATED:
 
-                return "Deprecation";
+                return 'Deprecation';
 
             default:
 
-                return "Notice";
+                return 'Notice';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/EventListener/ExceptionListener.php b/app/bundles/CoreBundle/EventListener/ExceptionListener.php
index 5a8e1b05c81..28fb9ea0825 100644
--- a/app/bundles/CoreBundle/EventListener/ExceptionListener.php
+++ b/app/bundles/CoreBundle/EventListener/ExceptionListener.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,19 +12,17 @@
 
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\EventListener\ExceptionListener as KernelExceptionListener;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\LogoutException;
 
 /**
- * Class ExceptionListener
+ * Class ExceptionListener.
  */
 class ExceptionListener extends KernelExceptionListener
 {
     /**
      * @param GetResponseForExceptionEvent $event
-     *
-     * @return void
      */
     public function onKernelException(GetResponseForExceptionEvent $event)
     {
diff --git a/app/bundles/CoreBundle/EventListener/MaintenanceSubscriber.php b/app/bundles/CoreBundle/EventListener/MaintenanceSubscriber.php
index b25f40eabfe..36a8fdcd489 100644
--- a/app/bundles/CoreBundle/EventListener/MaintenanceSubscriber.php
+++ b/app/bundles/CoreBundle/EventListener/MaintenanceSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,10 +13,9 @@
 use Doctrine\DBAL\Connection;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\MaintenanceEvent;
-use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class MaintenanceSubscriber
+ * Class MaintenanceSubscriber.
  */
 class MaintenanceSubscriber extends CommonSubscriber
 {
@@ -27,7 +27,7 @@ class MaintenanceSubscriber extends CommonSubscriber
     /**
      * MaintenanceSubscriber constructor.
      *
-     * @param Connection    $db
+     * @param Connection $db
      */
     public function __construct(Connection $db)
     {
@@ -40,14 +40,14 @@ public function __construct(Connection $db)
     public static function getSubscribedEvents()
     {
         return [
-            CoreEvents::MAINTENANCE_CLEANUP_DATA => ['onDataCleanup', -50]
+            CoreEvents::MAINTENANCE_CLEANUP_DATA => ['onDataCleanup', -50],
         ];
     }
 
     /**
      * @param MaintenanceEvent $event
      */
-    public function onDataCleanup (MaintenanceEvent $event)
+    public function onDataCleanup(MaintenanceEvent $event)
     {
         $this->cleanupData($event, 'audit_log');
         $this->cleanupData($event, 'notifications');
@@ -57,7 +57,7 @@ public function onDataCleanup (MaintenanceEvent $event)
      * @param MaintenanceEvent $event
      * @param                  $table
      */
-    private function cleanupData (MaintenanceEvent $event, $table)
+    private function cleanupData(MaintenanceEvent $event, $table)
     {
         $qb = $this->db->createQueryBuilder()
             ->setParameter('date', $event->getDate()->format('Y-m-d H:i:s'));
diff --git a/app/bundles/CoreBundle/Exception/BadConfigurationException.php b/app/bundles/CoreBundle/Exception/BadConfigurationException.php
index 6b70d8e04e2..b0d4f33d236 100644
--- a/app/bundles/CoreBundle/Exception/BadConfigurationException.php
+++ b/app/bundles/CoreBundle/Exception/BadConfigurationException.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Exception;
 
-
 class BadConfigurationException extends \Exception
 {
     public function __construct($message = 'Configuration is bad.', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Exception/DatabaseConnectionException.php b/app/bundles/CoreBundle/Exception/DatabaseConnectionException.php
index 6db5d56d6aa..216920a8d8e 100644
--- a/app/bundles/CoreBundle/Exception/DatabaseConnectionException.php
+++ b/app/bundles/CoreBundle/Exception/DatabaseConnectionException.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Exception;
 
-
 class DatabaseConnectionException extends \Exception
 {
     public function __construct($message = 'Unable to connect to the database.', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Exception/FileExistsException.php b/app/bundles/CoreBundle/Exception/FileExistsException.php
index 32a59768a86..1b2cba5e8e4 100644
--- a/app/bundles/CoreBundle/Exception/FileExistsException.php
+++ b/app/bundles/CoreBundle/Exception/FileExistsException.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Exception;
 
-
 class FileExistsException extends \Exception
 {
     public function __construct($message = 'File exists.', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Exception/FileNotFoundException.php b/app/bundles/CoreBundle/Exception/FileNotFoundException.php
index bee36224229..8c39da33577 100644
--- a/app/bundles/CoreBundle/Exception/FileNotFoundException.php
+++ b/app/bundles/CoreBundle/Exception/FileNotFoundException.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Exception;
 
-
 class FileNotFoundException extends \Exception
 {
     public function __construct($message = 'File not found.', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Exception/SchemaException.php b/app/bundles/CoreBundle/Exception/SchemaException.php
index d7786e71005..0b1f15b5ad8 100644
--- a/app/bundles/CoreBundle/Exception/SchemaException.php
+++ b/app/bundles/CoreBundle/Exception/SchemaException.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Exception;
 
-
 class SchemaException extends \Exception
 {
     public function __construct($message = 'Could not perform schema change.', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Factory/IpLookupFactory.php b/app/bundles/CoreBundle/Factory/IpLookupFactory.php
index 46863910526..5ab45e9dcb0 100644
--- a/app/bundles/CoreBundle/Factory/IpLookupFactory.php
+++ b/app/bundles/CoreBundle/Factory/IpLookupFactory.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -58,18 +59,16 @@ public function __construct(array $lookupServices, LoggerInterface $logger = nul
      *
      * @return null|AbstractLookup
      */
-    public function getService($service, $auth = null, array $ipLookupConfig = array())
+    public function getService($service, $auth = null, array $ipLookupConfig = [])
     {
-        static $services = array();
+        static $services = [];
 
         if (empty($service)) {
-
             return null;
         }
 
         if (!isset($services[$service]) || (null !== $auth || null !== $ipLookupConfig)) {
             if (!isset($this->lookupServices[$service])) {
-
                 throw new \InvalidArgumentException($service.' not registered.');
             }
 
@@ -89,4 +88,4 @@ public function getService($service, $auth = null, array $ipLookupConfig = array
 
         return $services[$service];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Factory/MauticFactory.php b/app/bundles/CoreBundle/Factory/MauticFactory.php
index 3551af25259..1fa4dce9ba9 100644
--- a/app/bundles/CoreBundle/Factory/MauticFactory.php
+++ b/app/bundles/CoreBundle/Factory/MauticFactory.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,18 +15,16 @@
 use Mautic\CoreBundle\Exception\FileNotFoundException;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Model\AbstractCommonModel;
-use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\CoreBundle\Templating\Helper\ThemeHelper;
+use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\UserBundle\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 
 /**
- * Mautic's Factory
+ * Mautic's Factory.
  *
  * @deprecated 2.0 to be removed in 3.0
  */
@@ -55,7 +54,7 @@ public function __construct(ContainerInterface $container)
     }
 
     /**
-     * Get a model instance from the service container
+     * Get a model instance from the service container.
      *
      * @param $modelNameKey
      *
@@ -69,7 +68,7 @@ public function getModel($modelNameKey)
     }
 
     /**
-     * Retrieves Mautic's security object
+     * Retrieves Mautic's security object.
      *
      * @return \Mautic\CoreBundle\Security\Permissions\CorePermissions
      */
@@ -79,7 +78,7 @@ public function getSecurity()
     }
 
     /**
-     * Retrieves Symfony's security context
+     * Retrieves Symfony's security context.
      *
      * @return \Symfony\Component\Security\Core\SecurityContext
      */
@@ -89,7 +88,7 @@ public function getSecurityContext()
     }
 
     /**
-     * Retrieves user currently logged in
+     * Retrieves user currently logged in.
      *
      * @param bool $nullIfGuest
      *
@@ -101,7 +100,7 @@ public function getUser($nullIfGuest = false)
     }
 
     /**
-     * Retrieves session object
+     * Retrieves session object.
      *
      * @return \Symfony\Component\HttpFoundation\Session\Session
      */
@@ -111,7 +110,7 @@ public function getSession()
     }
 
     /**
-     * Retrieves Doctrine EntityManager
+     * Retrieves Doctrine EntityManager.
      *
      * @return \Doctrine\ORM\EntityManager
      */
@@ -129,7 +128,7 @@ public function setEntityManager(EntityManager $em)
     }
 
     /**
-     * Retrieves Doctrine database connection for DBAL use
+     * Retrieves Doctrine database connection for DBAL use.
      *
      * @return \Doctrine\DBAL\Connection
      */
@@ -147,7 +146,7 @@ public function setDatabase($db)
     }
 
     /**
-     * Gets a schema helper for manipulating database schemas
+     * Gets a schema helper for manipulating database schemas.
      *
      * @param string $type
      * @param string $name Object name; i.e. table name
@@ -160,7 +159,7 @@ public function getSchemaHelper($type, $name = null)
     }
 
     /**
-     * Retrieves Translator
+     * Retrieves Translator.
      *
      * @return \Mautic\CoreBundle\Translation\Translator
      */
@@ -181,7 +180,7 @@ public function getTranslator()
     }
 
     /**
-     * Retrieves serializer
+     * Retrieves serializer.
      *
      * @return \JMS\Serializer\Serializer
      */
@@ -191,7 +190,7 @@ public function getSerializer()
     }
 
     /**
-     * Retrieves templating service
+     * Retrieves templating service.
      *
      * @return \Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine
      */
@@ -201,7 +200,7 @@ public function getTemplating()
     }
 
     /**
-     * Retrieves event dispatcher
+     * Retrieves event dispatcher.
      *
      * @return \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher
      */
@@ -211,7 +210,7 @@ public function getDispatcher()
     }
 
     /**
-     * Retrieves request
+     * Retrieves request.
      *
      * @return \Symfony\Component\HttpFoundation\Request|null
      */
@@ -230,7 +229,7 @@ public function getRequest()
     }
 
     /**
-     * Retrieves Symfony's validator
+     * Retrieves Symfony's validator.
      *
      * @return \Symfony\Component\Validator\Validator
      */
@@ -240,7 +239,7 @@ public function getValidator()
     }
 
     /**
-     * Retrieves Mautic system parameters
+     * Retrieves Mautic system parameters.
      *
      * @return array
      */
@@ -250,7 +249,7 @@ public function getSystemParameters()
     }
 
     /**
-     * Retrieves a Mautic parameter
+     * Retrieves a Mautic parameter.
      *
      * @param       $id
      * @param mixed $default
@@ -263,7 +262,7 @@ public function getParameter($id, $default = false)
     }
 
     /**
-     * Get DateTimeHelper
+     * Get DateTimeHelper.
      *
      * @param string $string
      * @param string $format
@@ -277,7 +276,7 @@ public function getDate($string = null, $format = null, $tz = 'local')
     }
 
     /**
-     * Get Router
+     * Get Router.
      *
      * @return Router
      */
@@ -288,12 +287,13 @@ public function getRouter()
 
     /**
      * Get the path to specified area.  Returns relative by default with the exception of cache and log
-     * which will be absolute regardless of $fullPath setting
+     * which will be absolute regardless of $fullPath setting.
      *
      * @param string $name
      * @param bool   $fullPath
      *
      * @return string
+     *
      * @throws \InvalidArgumentException
      */
     public function getSystemPath($name, $fullPath = false)
@@ -302,7 +302,7 @@ public function getSystemPath($name, $fullPath = false)
     }
 
     /**
-     * Returns local config file path
+     * Returns local config file path.
      *
      * @param bool $checkExists If true, returns false if file doesn't exist
      *
@@ -317,7 +317,7 @@ public function getLocalConfigFile($checkExists = true)
     }
 
     /**
-     * Get the current environment
+     * Get the current environment.
      *
      * @return string
      */
@@ -327,7 +327,7 @@ public function getEnvironment()
     }
 
     /**
-     * Returns if Symfony is in debug mode
+     * Returns if Symfony is in debug mode.
      *
      * @return mixed
      */
@@ -337,12 +337,13 @@ public function getDebugMode()
     }
 
     /**
-     * returns a ThemeHelper instance for the given theme
+     * returns a ThemeHelper instance for the given theme.
      *
      * @param string $theme
      * @param bool   $throwException
      *
      * @return mixed
+     *
      * @throws FileNotFoundException
      * @throws \Exception
      */
@@ -352,10 +353,10 @@ public function getTheme($theme = 'current', $throwException = false)
     }
 
     /**
-     * Gets a list of installed themes
+     * Gets a list of installed themes.
      *
      * @param string $specificFeature limits list to those that support a specific feature
-     * @param boolean $extended returns extended information about the themes
+     * @param bool   $extended        returns extended information about the themes
      *
      * @return array
      */
@@ -365,7 +366,7 @@ public function getInstalledThemes($specificFeature = 'all', $extended = false)
     }
 
     /**
-     * Returns MailHelper wrapper for Swift_Message via $helper->message
+     * Returns MailHelper wrapper for Swift_Message via $helper->message.
      *
      * @param bool $cleanSlate False to preserve current settings, i.e. to process batched emails
      *
@@ -387,7 +388,7 @@ public function getIpAddressFromRequest()
     }
 
     /**
-     * Get an IpAddress entity for current session or for passed in IP address
+     * Get an IpAddress entity for current session or for passed in IP address.
      *
      * @param string $ip
      *
@@ -399,7 +400,7 @@ public function getIpAddress($ip = null)
     }
 
     /**
-     * Retrieves the application's version number
+     * Retrieves the application's version number.
      *
      * @return string
      */
@@ -409,7 +410,7 @@ public function getVersion()
     }
 
     /**
-     * Get Symfony's logger
+     * Get Symfony's logger.
      *
      * @param bool|false $system
      *
@@ -425,7 +426,7 @@ public function getLogger($system = false)
     }
 
     /**
-     * Get a mautic helper service
+     * Get a mautic helper service.
      *
      * @param $helper
      *
@@ -450,7 +451,7 @@ public function getHelper($helper)
     }
 
     /**
-     * Get's the Symfony kernel
+     * Get's the Symfony kernel.
      *
      * @return \AppKernel
      */
@@ -460,7 +461,7 @@ public function getKernel()
     }
 
     /**
-     * Get's an array of details for Mautic core bundles
+     * Get's an array of details for Mautic core bundles.
      *
      * @param bool|false $includePlugins
      *
@@ -472,7 +473,7 @@ public function getMauticBundles($includePlugins = false)
     }
 
     /**
-     * Get's an array of details for enabled Mautic plugins
+     * Get's an array of details for enabled Mautic plugins.
      *
      * @return array
      */
@@ -482,13 +483,14 @@ public function getPluginBundles()
     }
 
     /**
-     * Gets an array of a specific bundle's config settings
+     * Gets an array of a specific bundle's config settings.
      *
      * @param        $bundleName
      * @param string $configKey
      * @param bool   $includePlugins
      *
      * @return mixed
+     *
      * @throws \Exception
      */
     public function getBundleConfig($bundleName, $configKey = '', $includePlugins = false)
diff --git a/app/bundles/CoreBundle/Factory/ModelFactory.php b/app/bundles/CoreBundle/Factory/ModelFactory.php
index 38eb35eb1a0..5507081acf4 100644
--- a/app/bundles/CoreBundle/Factory/ModelFactory.php
+++ b/app/bundles/CoreBundle/Factory/ModelFactory.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Factory;
 
-
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class ModelFactory
+ * Class ModelFactory.
  */
 class ModelFactory
 {
@@ -42,22 +42,22 @@ public function getModel($modelNameKey)
         $parts = explode('.', $modelNameKey);
 
         if (count($parts) !== 2) {
-            throw new \InvalidArgumentException($modelNameKey . " is not a valid model key.");
+            throw new \InvalidArgumentException($modelNameKey.' is not a valid model key.');
         }
 
         list($bundle, $name) = $parts;
 
-        $containerKey = str_replace(array('%bundle%', '%name%'), array($bundle, $name), 'mautic.%bundle%.model.%name%');
+        $containerKey = str_replace(['%bundle%', '%name%'], [$bundle, $name], 'mautic.%bundle%.model.%name%');
 
         if ($this->container->has($containerKey)) {
             return $this->container->get($containerKey);
         }
 
-        throw new \InvalidArgumentException($containerKey . ' is not a registered container key.');
+        throw new \InvalidArgumentException($containerKey.' is not a registered container key.');
     }
 
     /**
-     * Check if a model exists
+     * Check if a model exists.
      *
      * @param $modelNameKey
      */
@@ -71,4 +71,4 @@ public function hasModel($modelNameKey)
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/ArrayLinebreakTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/ArrayLinebreakTransformer.php
index a6fa29839d4..83dbd948415 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/ArrayLinebreakTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/ArrayLinebreakTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class ArrayLinebreakTransformer
+ * Class ArrayLinebreakTransformer.
  */
 class ArrayLinebreakTransformer implements DataTransformerInterface
 {
-
     /**
      * {@inheritdoc}
      *
@@ -25,7 +25,7 @@ class ArrayLinebreakTransformer implements DataTransformerInterface
     public function transform($array)
     {
         if ($array === null) {
-            return "";
+            return '';
         }
 
         return implode("\n", $array);
@@ -39,7 +39,7 @@ public function transform($array)
     public function reverseTransform($string)
     {
         if (!$string) {
-            return array();
+            return [];
         }
 
         return array_map('trim', explode("\n", $string));
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/ArrayStringTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/ArrayStringTransformer.php
index ccfa759be54..99eae3f5aa3 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/ArrayStringTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/ArrayStringTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class ArrayStringTransformer
+ * Class ArrayStringTransformer.
  */
 class ArrayStringTransformer implements DataTransformerInterface
 {
-
     /**
      * {@inheritdoc}
      *
@@ -25,10 +25,10 @@ class ArrayStringTransformer implements DataTransformerInterface
     public function transform($array)
     {
         if ($array === null) {
-            return "";
+            return '';
         }
 
-        return implode(",", $array);
+        return implode(',', $array);
     }
 
     /**
@@ -39,7 +39,7 @@ public function transform($array)
     public function reverseTransform($string)
     {
         if (!$string) {
-            return array();
+            return [];
         }
 
         return array_map('trim', explode(',', $string));
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/DatetimeToStringTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/DatetimeToStringTransformer.php
index d699f745055..19d2903d5b3 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/DatetimeToStringTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/DatetimeToStringTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class DatetimeToStringTransformer
+ * Class DatetimeToStringTransformer.
  */
 class DatetimeToStringTransformer implements DataTransformerInterface
 {
-
     /**
      * @var string
      */
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/EmojiToHtmlTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/EmojiToHtmlTransformer.php
index 7f48f5ce833..5bf64648b98 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/EmojiToHtmlTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/EmojiToHtmlTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,12 +14,12 @@
 use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class EmojiToHtmlTransformer
+ * Class EmojiToHtmlTransformer.
  */
 class EmojiToHtmlTransformer implements DataTransformerInterface
 {
     /**
-     * Convert emoji unicode to HTML
+     * Convert emoji unicode to HTML.
      *
      * @param array|string $content
      *
@@ -38,7 +39,7 @@ public function transform($content)
     }
 
     /**
-     * Convert HTML emoji to unicode bytes
+     * Convert HTML emoji to unicode bytes.
      *
      * @param array|string $content
      *
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/EmojiToShortTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/EmojiToShortTransformer.php
index db57cda5a72..6bb2ae0f217 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/EmojiToShortTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/EmojiToShortTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,12 +14,12 @@
 use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class EmojiToShortTransformer
+ * Class EmojiToShortTransformer.
  */
 class EmojiToShortTransformer implements DataTransformerInterface
 {
     /**
-     * Convert short to unicode
+     * Convert short to unicode.
      *
      * @param array|string $content
      *
@@ -38,7 +39,7 @@ public function transform($content)
     }
 
     /**
-     * Convert emoji to short bytes
+     * Convert emoji to short bytes.
      *
      * @param array|string $content
      *
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/IdToEntityModelTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/IdToEntityModelTransformer.php
index 2cf6d9090c0..ee6361a8f4c 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/IdToEntityModelTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/IdToEntityModelTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
 /**
- * Class IdToEntityModelTransformer
+ * Class IdToEntityModelTransformer.
  */
 class IdToEntityModelTransformer implements DataTransformerInterface
 {
@@ -58,7 +59,7 @@ public function __construct(EntityManager $em, $repo = '', $identifier = 'id', $
      */
     public function transform($entity)
     {
-        $func = 'get' . ucfirst($this->id);
+        $func = 'get'.ucfirst($this->id);
 
         if (!$this->isArray) {
             if (is_null($entity) || !is_object($entity) || !method_exists($entity, $func)) {
@@ -69,10 +70,10 @@ public function transform($entity)
         }
 
         if (is_null($entity) && !is_array($entity) && !$entity instanceof PersistentCollection) {
-            return array();
+            return [];
         }
 
-        $return = array();
+        $return = [];
         foreach ($entity as $e) {
             $return[] = $e->$func();
         }
@@ -83,7 +84,7 @@ public function transform($entity)
     /**
      * {@inheritdoc}
      *
-     * @throws TransformationFailedException if object is not found.
+     * @throws TransformationFailedException if object is not found
      */
     public function reverseTransform($id)
     {
@@ -94,12 +95,12 @@ public function reverseTransform($id)
 
             $entity = $this->em
                 ->getRepository($this->repository)
-                ->findOneBy(array($this->id => $id))
+                ->findOneBy([$this->id => $id])
             ;
 
             if ($entity === null) {
                 throw new TransformationFailedException(sprintf(
-                    'An entity with a/an ' . $this->id . ' of "%s" does not exist!',
+                    'An entity with a/an '.$this->id.' of "%s" does not exist!',
                     $id
                 ));
             }
@@ -108,28 +109,28 @@ public function reverseTransform($id)
         }
 
         if (empty($id) || !is_array($id)) {
-            return array();
+            return [];
         }
 
         $repo   = $this->em->getRepository($this->repository);
         $prefix = $repo->getTableAlias();
 
-        $entities = $repo->getEntities(array(
-            'filter' => array(
-                'force' => array(
-                    array(
-                        'column' => $prefix . '.' . $this->id,
+        $entities = $repo->getEntities([
+            'filter' => [
+                'force' => [
+                    [
+                        'column' => $prefix.'.'.$this->id,
                         'expr'   => 'in',
-                        'value'  => $id
-                    )
-                )
-            ),
-            'ignore_paginator' => true
-        ));
+                        'value'  => $id,
+                    ],
+                ],
+            ],
+            'ignore_paginator' => true,
+        ]);
 
         if (!count($entities)) {
             throw new TransformationFailedException(sprintf(
-                'Entities with a/an ' . $this->id . ' of "%s" does not exist!',
+                'Entities with a/an '.$this->id.' of "%s" does not exist!',
                 $id
             ));
         }
@@ -138,11 +139,9 @@ public function reverseTransform($id)
     }
 
     /**
-     * Set the repository to use
+     * Set the repository to use.
      *
      * @param string $repo
-     *
-     * @return void
      */
     public function setRepository($repo)
     {
@@ -150,11 +149,9 @@ public function setRepository($repo)
     }
 
     /**
-     * Set the identifier to use
+     * Set the identifier to use.
      *
      * @param string $id
-     *
-     * @return void
      */
     public function setIdentifier($id)
     {
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/NullToEmptyTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/NullToEmptyTransformer.php
index e663fa7ccb7..a2796d1eea0 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/NullToEmptyTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/NullToEmptyTransformer.php
@@ -1,8 +1,10 @@
-<?php /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+<?php
+/**
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +15,9 @@
 class NullToEmptyTransformer implements DataTransformerInterface
 {
     /**
-     * Does not transform anything
+     * Does not transform anything.
      *
-     * @param  string|null $value
+     * @param string|null $value
      *
      * @return string
      */
@@ -27,7 +29,7 @@ public function transform($value)
     /**
      * Transforms a null to an empty string.
      *
-     * @param  string $value
+     * @param string $value
      *
      * @return string
      */
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/SecondsConversionTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/SecondsConversionTransformer.php
index 29d44a8b902..aae98ea8752 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/SecondsConversionTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/SecondsConversionTransformer.php
@@ -1,8 +1,10 @@
-<?php /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+<?php
+/**
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +13,7 @@
 use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class SecondsConversionTransformer
+ * Class SecondsConversionTransformer.
  */
 class SecondsConversionTransformer implements DataTransformerInterface
 {
@@ -19,13 +21,13 @@ class SecondsConversionTransformer implements DataTransformerInterface
 
     public function __construct($viewFormat = 'H')
     {
-        $this->viewFormat  = $viewFormat;
+        $this->viewFormat = $viewFormat;
     }
 
     /**
-     * Converts to format
+     * Converts to format.
      *
-     * @param  string|null $value
+     * @param string|null $value
      *
      * @return string
      */
@@ -52,9 +54,9 @@ public function reverseTransform($value)
     }
 
     /**
-     * Converts to seconds
+     * Converts to seconds.
      *
-     * @param  string $value
+     * @param string $value
      *
      * @return string
      */
diff --git a/app/bundles/CoreBundle/Form/DataTransformer/SortableListTransformer.php b/app/bundles/CoreBundle/Form/DataTransformer/SortableListTransformer.php
index 94c8e9c2f98..33736f44f42 100644
--- a/app/bundles/CoreBundle/Form/DataTransformer/SortableListTransformer.php
+++ b/app/bundles/CoreBundle/Form/DataTransformer/SortableListTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class SortableListTransformer
+ * Class SortableListTransformer.
  */
 class SortableListTransformer implements DataTransformerInterface
 {
diff --git a/app/bundles/CoreBundle/Form/EventListener/CleanFormSubscriber.php b/app/bundles/CoreBundle/Form/EventListener/CleanFormSubscriber.php
index c1a61f4e666..2e07a66876d 100644
--- a/app/bundles/CoreBundle/Form/EventListener/CleanFormSubscriber.php
+++ b/app/bundles/CoreBundle/Form/EventListener/CleanFormSubscriber.php
@@ -1,27 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Form\EventListener;
 
 use Mautic\CoreBundle\Helper\InputHelper;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * Class CleanFormSubscriber
+ * Class CleanFormSubscriber.
  *
  * Clean data before persisting to DB
  */
 class CleanFormSubscriber implements EventSubscriberInterface
 {
-
     /**
      * @var string
      */
@@ -40,15 +40,13 @@ public function __construct($masks = 'clean')
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            FormEvents::PRE_SUBMIT  => 'preSubmitData'
-        );
+        return [
+            FormEvents::PRE_SUBMIT => 'preSubmitData',
+        ];
     }
 
     /**
      * @param FormEvent $event
-     *
-     * @return void
      */
     public function preSubmitData(FormEvent $event)
     {
diff --git a/app/bundles/CoreBundle/Form/EventListener/FormExitSubscriber.php b/app/bundles/CoreBundle/Form/EventListener/FormExitSubscriber.php
index 3f7cef86be7..23f9f644bf9 100644
--- a/app/bundles/CoreBundle/Form/EventListener/FormExitSubscriber.php
+++ b/app/bundles/CoreBundle/Form/EventListener/FormExitSubscriber.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Form\EventListener;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * Class FormExitSubscriber
+ * Class FormExitSubscriber.
  */
 class FormExitSubscriber implements EventSubscriberInterface
 {
-
     /**
      * @var \Mautic\CoreBundle\Model\CommonModel
      */
@@ -31,9 +31,9 @@ class FormExitSubscriber implements EventSubscriberInterface
 
     /**
      * @param \Mautic\CoreBundle\Model\CommonModel $model
-     * @param array $options
+     * @param array                                $options
      */
-    public function __construct($model, $options = array())
+    public function __construct($model, $options = [])
     {
         $this->model   = $model;
         $this->options = $options;
@@ -44,13 +44,11 @@ public function __construct($model, $options = array())
      */
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::PRE_SET_DATA  => 'preSetData');
+        return [FormEvents::PRE_SET_DATA => 'preSetData'];
     }
 
     /**
      * @param FormEvent $event
-     *
-     * @return void
      */
     public function preSetData(FormEvent $event)
     {
@@ -59,27 +57,27 @@ public function preSetData(FormEvent $event)
             //add a hidden field that is used exclusively to warn a user to use save/cancel to exit a form
             $form = $event->getForm();
 
-            $form->add('unlockModel', 'hidden', array(
+            $form->add('unlockModel', 'hidden', [
                 'data'     => $this->model,
                 'required' => false,
                 'mapped'   => false,
-                'attr'     => array('class' => 'form-exit-unlock-model')
-            ));
+                'attr'     => ['class' => 'form-exit-unlock-model'],
+            ]);
 
-            $form->add('unlockId', 'hidden', array(
+            $form->add('unlockId', 'hidden', [
                 'data'     => $id,
                 'required' => false,
                 'mapped'   => false,
-                'attr'     => array('class' => 'form-exit-unlock-id')
-            ));
+                'attr'     => ['class' => 'form-exit-unlock-id'],
+            ]);
 
             if (isset($this->options['unlockParameter'])) {
-                $form->add('unlockParameter', 'hidden', array(
+                $form->add('unlockParameter', 'hidden', [
                     'data'     => $this->options['unlockParameter'],
                     'required' => false,
                     'mapped'   => false,
-                    'attr'     => array('class' => 'form-exit-unlock-parameter')
-                ));
+                    'attr'     => ['class' => 'form-exit-unlock-parameter'],
+                ]);
             }
         }
     }
diff --git a/app/bundles/CoreBundle/Form/Type/BuilderSectionType.php b/app/bundles/CoreBundle/Form/Type/BuilderSectionType.php
index c47be1d3984..54323011d8e 100644
--- a/app/bundles/CoreBundle/Form/Type/BuilderSectionType.php
+++ b/app/bundles/CoreBundle/Form/Type/BuilderSectionType.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 
 /**
- * Class BuilderSectionType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class BuilderSectionType.
  */
 class BuilderSectionType extends AbstractType
 {
@@ -34,7 +31,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'attr'       => [
                 'class'           => 'form-control',
                 'data-slot-param' => 'background-color',
-                'data-toggle'     => 'color'
+                'data-toggle'     => 'color',
             ],
         ]);
 
@@ -45,7 +42,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'attr'       => [
                 'class'           => 'form-control',
                 'data-slot-param' => 'background-color',
-                'data-toggle'     => 'color'
+                'data-toggle'     => 'color',
             ],
         ]);
     }
@@ -55,6 +52,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "builder_section";
+        return 'builder_section';
     }
 }
diff --git a/app/bundles/CoreBundle/Form/Type/ButtonGroupType.php b/app/bundles/CoreBundle/Form/Type/ButtonGroupType.php
index d978612ca89..d26555c8dd6 100644
--- a/app/bundles/CoreBundle/Form/Type/ButtonGroupType.php
+++ b/app/bundles/CoreBundle/Form/Type/ButtonGroupType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ButtonGroupType
+ * Class ButtonGroupType.
  */
 class ButtonGroupType extends AbstractType
 {
@@ -40,14 +41,14 @@ public function getName()
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'expanded'           => true,
             'multiple'           => false,
             'empty_value'        => false,
             'required'           => false,
-            'label_attr'         => array('class' => 'control-label'),
-            'button_group_class' => 'btn-block'
-        ));
+            'label_attr'         => ['class' => 'control-label'],
+            'button_group_class' => 'btn-block',
+        ]);
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/Type/ConfigType.php b/app/bundles/CoreBundle/Form/Type/ConfigType.php
index f2696fc54dd..dca71b95438 100644
--- a/app/bundles/CoreBundle/Form/Type/ConfigType.php
+++ b/app/bundles/CoreBundle/Form/Type/ConfigType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -25,9 +26,7 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class ConfigType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
@@ -52,7 +51,7 @@ class ConfigType extends AbstractType
     private $supportedLanguages;
 
     /**
-     * @var $ipLookupFactory
+     * @var
      */
     private $ipLookupFactory;
 
@@ -85,7 +84,7 @@ public function __construct(
         $this->ipLookup           = $ipLookup;
         $this->supportedLanguages = $supportedLanguages;
 
-        $choices = array();
+        $choices = [];
         foreach ($ipLookupServices as $name => $service) {
             $choices[$name] = $service['display_name'];
         }
@@ -104,115 +103,115 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'site_url',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.site.url',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.site.url',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.site.url.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.site.url.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'webroot',
             'page_list',
-            array(
-                'label'       => 'mautic.core.config.form.webroot',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.webroot',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'            => 'form-control',
                     'tooltip'          => 'mautic.core.config.form.webroot.tooltip',
-                    'data-placeholder' => $this->translator->trans('mautic.core.config.form.webroot.dashboard')
-                ),
+                    'data-placeholder' => $this->translator->trans('mautic.core.config.form.webroot.dashboard'),
+                ],
                 'multiple'    => false,
                 'empty_value' => '',
-                'required'    => false
-            )
+                'required'    => false,
+            ]
         );
 
         $builder->add(
             'cache_path',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.cache.path',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.cache.path',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.cache.path.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.cache.path.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'log_path',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.log.path',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.log.path',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.log.path.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.log.path.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'image_path',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.image.path',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.image.path',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.image.path.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.image.path.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'theme',
             'theme_list',
-            array(
+            [
                 'label' => 'mautic.core.config.form.theme',
-                'attr'  => array(
+                'attr'  => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.page.form.template.help'
-                )
-            )
+                    'tooltip' => 'mautic.page.form.template.help',
+                ],
+            ]
         );
 
         // Get the list of available languages
         $languages   = $this->langHelper->fetchLanguages(false, false);
-        $langChoices = array();
+        $langChoices = [];
 
         foreach ($languages as $code => $langData) {
             $langChoices[$code] = $langData['name'];
@@ -226,16 +225,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'locale',
             'choice',
-            array(
-                'choices'     => $langChoices,
-                'label'       => 'mautic.core.config.form.locale',
-                'required'    => false,
-                'attr'        => array(
+            [
+                'choices'  => $langChoices,
+                'label'    => 'mautic.core.config.form.locale',
+                'required' => false,
+                'attr'     => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.locale.tooltip'
-                ),
-                'empty_value' => false
-            )
+                    'tooltip' => 'mautic.core.config.form.locale.tooltip',
+                ],
+                'empty_value' => false,
+            ]
         );
 
         $arrayStringTransformer = new ArrayStringTransformer();
@@ -243,15 +242,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->create(
                 'trusted_hosts',
                 'text',
-                array(
+                [
                     'label'      => 'mautic.core.config.form.trusted.hosts',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'   => 'form-control',
-                        'tooltip' => 'mautic.core.config.form.trusted.hosts.tooltip'
-                    ),
-                    'required'   => false
-                )
+                        'tooltip' => 'mautic.core.config.form.trusted.hosts.tooltip',
+                    ],
+                    'required' => false,
+                ]
             )->addViewTransformer($arrayStringTransformer)
         );
 
@@ -259,15 +258,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->create(
                 'trusted_proxies',
                 'text',
-                array(
+                [
                     'label'      => 'mautic.core.config.form.trusted.proxies',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'   => 'form-control',
-                        'tooltip' => 'mautic.core.config.form.trusted.proxies.tooltip'
-                    ),
-                    'required'   => false
-                )
+                        'tooltip' => 'mautic.core.config.form.trusted.proxies.tooltip',
+                    ],
+                    'required' => false,
+                ]
             )->addViewTransformer($arrayStringTransformer)
         );
 
@@ -276,97 +275,97 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->create(
                 'do_not_track_ips',
                 'textarea',
-                array(
+                [
                     'label'      => 'mautic.core.config.form.do_not_track_ips',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'   => 'form-control',
-                        'tooltip' => 'mautic.core.config.form.do_not_track_ips.tooltip'
-                    ),
-                    'required'   => false
-                )
+                        'tooltip' => 'mautic.core.config.form.do_not_track_ips.tooltip',
+                    ],
+                    'required' => false,
+                ]
             )->addViewTransformer($arrayLinebreakTransformer)
         );
 
         $builder->add(
             'rememberme_key',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.rememberme.key',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.rememberme.key',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.rememberme.key.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.rememberme.key.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'rememberme_lifetime',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.rememberme.lifetime',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.rememberme.lifetime',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.rememberme.lifetime.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.rememberme.lifetime.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'rememberme_path',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.rememberme.path',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.rememberme.path',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.rememberme.path.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.rememberme.path.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'rememberme_domain',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.config.form.rememberme.domain',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.rememberme.domain.tooltip'
-                ),
-                'required'   => false
-            )
+                    'tooltip' => 'mautic.core.config.form.rememberme.domain.tooltip',
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'default_pagelimit',
             'choice',
-            array(
-                'choices'     => array(
+            [
+                'choices' => [
                     5   => 'mautic.core.pagination.5',
                     10  => 'mautic.core.pagination.10',
                     15  => 'mautic.core.pagination.15',
@@ -374,175 +373,175 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     25  => 'mautic.core.pagination.25',
                     30  => 'mautic.core.pagination.30',
                     50  => 'mautic.core.pagination.50',
-                    100 => 'mautic.core.pagination.100'
-                ),
-                'expanded'    => false,
-                'multiple'    => false,
-                'label'       => 'mautic.core.config.form.default.pagelimit',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+                    100 => 'mautic.core.pagination.100',
+                ],
+                'expanded'   => false,
+                'multiple'   => false,
+                'label'      => 'mautic.core.config.form.default.pagelimit',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.default.pagelimit.tooltip'
-                ),
+                    'tooltip' => 'mautic.core.config.form.default.pagelimit.tooltip',
+                ],
                 'required'    => false,
-                'empty_value' => false
-            )
+                'empty_value' => false,
+            ]
         );
 
         $builder->add(
             'default_timezone',
             'timezone',
-            array(
-                'label'       => 'mautic.core.config.form.default.timezone',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.default.timezone',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.default.timezone.tooltip'
-                ),
+                    'tooltip' => 'mautic.core.config.form.default.timezone.tooltip',
+                ],
                 'multiple'    => false,
                 'empty_value' => 'mautic.user.user.form.defaulttimezone',
-                'required'    => false
-            )
+                'required'    => false,
+            ]
         );
 
         $builder->add(
             'cached_data_timeout',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.cached.data.timeout',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.cached.data.timeout',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'          => 'form-control',
                     'tooltip'        => 'mautic.core.config.form.cached.data.timeout.tooltip',
                     'postaddon'      => '',
-                    'postaddon_text' => $this->translator->trans('mautic.core.time.minutes')
-                ),
-                'constraints' => array(
+                    'postaddon_text' => $this->translator->trans('mautic.core.time.minutes'),
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'date_format_full',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.date.format.full',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.date.format.full',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.date.format.full.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.date.format.full.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'date_format_short',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.date.format.short',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.date.format.short',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.date.format.short.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.date.format.short.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'date_format_dateonly',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.date.format.dateonly',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.date.format.dateonly',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.date.format.dateonly.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.date.format.dateonly.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'date_format_timeonly',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.date.format.timeonly',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.date.format.timeonly',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.date.format.timeonly.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.date.format.timeonly.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'ip_lookup_service',
             'choice',
-            array(
+            [
                 'choices'    => $this->ipLookupChoices,
                 'label'      => 'mautic.core.config.form.ip.lookup.service',
-                'label_attr' => array(
-                    'class' => 'control-label'
-                ),
-                'required'   => false,
-                'attr'       => array(
-                    'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.ip.lookup.service.tooltip',
-                    'onchange' => 'Mautic.getIpLookupFormConfig()'
-                )
-            )
+                'label_attr' => [
+                    'class' => 'control-label',
+                ],
+                'required' => false,
+                'attr'     => [
+                    'class'    => 'form-control',
+                    'tooltip'  => 'mautic.core.config.form.ip.lookup.service.tooltip',
+                    'onchange' => 'Mautic.getIpLookupFormConfig()',
+                ],
+            ]
         );
 
         $builder->add(
             'ip_lookup_auth',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.config.form.ip.lookup.auth',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.ip.lookup.auth.tooltip'
-                ),
-                'required'   => false
-            )
+                    'tooltip' => 'mautic.core.config.form.ip.lookup.auth.tooltip',
+                ],
+                'required' => false,
+            ]
         );
 
         $ipLookupFactory = $this->ipLookupFactory;
-        $formModifier = function (FormEvent $event) use ($ipLookupFactory) {
-            $data    = $event->getData();
-            $form    = $event->getForm();
+        $formModifier    = function (FormEvent $event) use ($ipLookupFactory) {
+            $data = $event->getData();
+            $form = $event->getForm();
 
             $ipServiceName = (isset($data['ip_lookup_service'])) ? $data['ip_lookup_service'] : null;
             if ($ipServiceName && $lookupService = $ipLookupFactory->getService($ipServiceName)) {
@@ -550,10 +549,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $form->add(
                         'ip_lookup_config',
                         $formType,
-                        array(
+                        [
                             'label'             => false,
-                            'ip_lookup_service' => $lookupService
-                        )
+                            'ip_lookup_service' => $lookupService,
+                        ]
                     );
                 }
             }
@@ -576,139 +575,139 @@ function (FormEvent $event) use ($formModifier) {
         $builder->add(
             'transifex_username',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.config.form.transifex.username',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'tooltip'      => 'mautic.core.config.form.transifex.username.tooltip',
-                    'autocomplete' => 'off'
-                ),
-                'required'   => false
-            )
+                    'autocomplete' => 'off',
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'transifex_password',
             'password',
-            array(
+            [
                 'label'      => 'mautic.core.config.form.transifex.password',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'placeholder'  => 'mautic.user.user.form.passwordplaceholder',
                     'preaddon'     => 'fa fa-lock',
                     'tooltip'      => 'mautic.core.config.form.transifex.password.tooltip',
-                    'autocomplete' => 'off'
-                ),
-                'required'   => false
-            )
+                    'autocomplete' => 'off',
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'update_stability',
             'choice',
-            array(
-                'choices'     => array(
+            [
+                'choices' => [
                     'alpha'  => 'mautic.core.config.update_stability.alpha',
                     'beta'   => 'mautic.core.config.update_stability.beta',
                     'rc'     => 'mautic.core.config.update_stability.rc',
-                    'stable' => 'mautic.core.config.update_stability.stable'
-                ),
-                'label'       => 'mautic.core.config.form.update.stability',
-                'required'    => false,
-                'attr'        => array(
+                    'stable' => 'mautic.core.config.update_stability.stable',
+                ],
+                'label'    => 'mautic.core.config.form.update.stability',
+                'required' => false,
+                'attr'     => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.update.stability.tooltip'
-                ),
-                'empty_value' => false
-            )
+                    'tooltip' => 'mautic.core.config.form.update.stability.tooltip',
+                ],
+                'empty_value' => false,
+            ]
         );
 
         $builder->add(
             'cookie_path',
             'text',
-            array(
-                'label'       => 'mautic.core.config.form.cookie.path',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.core.config.form.cookie.path',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.cookie.path.tooltip'
-                ),
-                'constraints' => array(
+                    'tooltip' => 'mautic.core.config.form.cookie.path.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'cookie_domain',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.config.form.cookie.domain',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.form.cookie.domain.tooltip'
-                ),
-                'required'   => false
-            )
+                    'tooltip' => 'mautic.core.config.form.cookie.domain.tooltip',
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'cookie_secure',
             'yesno_button_group',
-            array(
+            [
                 'label'       => 'mautic.core.config.form.cookie.secure',
                 'empty_value' => 'mautic.core.form.default',
                 'data'        => (array_key_exists('cookie_secure', $options['data'])) ? $options['data']['cookie_secure'] : '',
-                'attr'        => array(
-                    'tooltip' => 'mautic.core.config.form.cookie.secure.tooltip'
-                )
-            )
+                'attr'        => [
+                    'tooltip' => 'mautic.core.config.form.cookie.secure.tooltip',
+                ],
+            ]
         );
 
         $builder->add(
             'cookie_httponly',
             'yesno_button_group',
-            array(
+            [
                 'label' => 'mautic.core.config.form.cookie.httponly',
                 'data'  => (array_key_exists('cookie_httponly', $options['data']) && !empty($options['data']['cookie_httponly'])) ? true : false,
-                'attr'  => array(
-                    'tooltip' => 'mautic.core.config.form.cookie.httponly.tooltip'
-                )
-            )
+                'attr'  => [
+                    'tooltip' => 'mautic.core.config.form.cookie.httponly.tooltip',
+                ],
+            ]
         );
 
         $builder->add(
             'link_shortener_url',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.config.form.link.shortener',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
-                    'class'        => 'form-control',
-                    'tooltip'      => 'mautic.core.config.form.link.shortener.tooltip'
-                ),
-                'required'   => false
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'   => 'form-control',
+                    'tooltip' => 'mautic.core.config.form.link.shortener.tooltip',
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'cors_restrict_domains',
             'yesno_button_group',
-            array(
+            [
                 'label' => 'mautic.core.config.cors.restrict.domains',
                 'data'  => (array_key_exists('cors_restrict_domains', $options['data']) && !empty($options['data']['cors_restrict_domains'])),
-                'attr'  => array(
+                'attr'  => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.config.cors.restrict.domains.tooltip'
-                )
-            )
+                    'tooltip' => 'mautic.core.config.cors.restrict.domains.tooltip',
+                ],
+            ]
         );
 
         $arrayLinebreakTransformer = new ArrayLinebreakTransformer();
@@ -716,15 +715,15 @@ function (FormEvent $event) use ($formModifier) {
             $builder->create(
                 'cors_valid_domains',
                 'textarea',
-                array(
+                [
                     'label'      => 'mautic.core.config.cors.valid.domains',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'        => 'form-control',
                         'tooltip'      => 'mautic.core.config.cors.valid.domains.tooltip',
                         'data-show-on' => '{"config_coreconfig_cors_restrict_domains_1":"checked"}',
-                    )
-                )
+                    ],
+                ]
             )->addViewTransformer($arrayLinebreakTransformer)
         );
     }
diff --git a/app/bundles/CoreBundle/Form/Type/DateRangeType.php b/app/bundles/CoreBundle/Form/Type/DateRangeType.php
index d6ebaba55c9..df35c4a2f9f 100644
--- a/app/bundles/CoreBundle/Form/Type/DateRangeType.php
+++ b/app/bundles/CoreBundle/Form/Type/DateRangeType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,10 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class FilterType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class FilterType.
  */
 class DateRangeType extends AbstractType
 {
-
     private $factory;
 
     /**
@@ -48,13 +46,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'date_from',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.date.from',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
                 'required'   => false,
                 'data'       => $dateFrom->format($humanFormat),
-            )
+            ]
         );
 
         $dateTo = (empty($options['data']['date_to']))
@@ -66,26 +64,26 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'date_to',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.date.to',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
                 'required'   => false,
-                'data'       => $dateTo->format($humanFormat)
-            )
+                'data'       => $dateTo->format($humanFormat),
+            ]
         );
 
         $builder->add(
             'apply',
             'submit',
-            array(
+            [
                 'label' => 'mautic.core.form.apply',
-                'attr'  => array('class' => 'btn btn-default')
-            )
+                'attr'  => ['class' => 'btn btn-default'],
+            ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -94,6 +92,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "daterange";
+        return 'daterange';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php
index 114283fbc82..22cae894474 100644
--- a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php
+++ b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryFiltersType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,20 +13,15 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
 use Mautic\LeadBundle\Model\ListModel;
-use Mautic\UserBundle\Form\DataTransformer as Transformers;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class DynamicContentFilterEntryFiltersType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class DynamicContentFilterEntryFiltersType.
  */
 class DynamicContentFilterEntryFiltersType extends AbstractType
 {
@@ -60,38 +56,38 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'glue',
             'choice',
-            array(
+            [
                 'label'   => false,
-                'choices' => array(
+                'choices' => [
                     'and' => 'mautic.lead.list.form.glue.and',
-                    'or'  => 'mautic.lead.list.form.glue.or'
-                ),
-                'attr'    => array(
-                    'class' => 'form-control not-chosen glue-select',
-                    'onchange' => 'Mautic.updateFilterPositioning(this)'
-                )
-            )
+                    'or'  => 'mautic.lead.list.form.glue.or',
+                ],
+                'attr' => [
+                    'class'    => 'form-control not-chosen glue-select',
+                    'onchange' => 'Mautic.updateFilterPositioning(this)',
+                ],
+            ]
         );
 
         $translator      = $this->translator;
         $operatorChoices = $this->operatorChoices;
 
         $formModifier = function (FormEvent $event, $eventName) use ($translator, $operatorChoices) {
-            $data      = $event->getData();
-            $form      = $event->getForm();
-            $options   = $form->getConfig()->getOptions();
+            $data    = $event->getData();
+            $form    = $event->getForm();
+            $options = $form->getConfig()->getOptions();
 
             $fieldType = $data['type'];
             $fieldName = $data['field'];
 
-            $type        = 'text';
-            $attr        = array(
-                'class' => 'form-control'
-            );
+            $type = 'text';
+            $attr = [
+                'class' => 'form-control',
+            ];
             $displayType = 'hidden';
-            $displayAttr = array();
+            $displayAttr = [];
 
-            $customOptions = array();
+            $customOptions = [];
 
             switch ($fieldType) {
                 case 'country':
@@ -120,13 +116,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $type                     = 'choice';
                     $customOptions['choices'] = $options[$choiceKey];
 
-                    $customOptions['multiple'] = (in_array($data['operator'], array('in', '!in')));
+                    $customOptions['multiple'] = (in_array($data['operator'], ['in', '!in']));
 
                     if ($customOptions['multiple']) {
-                        array_unshift($customOptions['choices'], array('' => ''));
+                        array_unshift($customOptions['choices'], ['' => '']);
 
                         if (!isset($data['filter'])) {
-                            $data['filter'] = array();
+                            $data['filter'] = [];
                         }
                     }
 
@@ -141,14 +137,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $displayType = 'text';
                     $displayAttr = array_merge(
                         $displayAttr,
-                        array(
+                        [
                             'class'       => 'form-control',
                             'data-toggle' => 'field-lookup',
                             'data-target' => $data['field'],
                             'placeholder' => $translator->trans(
                                 'mautic.lead.list.form.filtervalue'
-                            )
-                        )
+                            ),
+                        ]
                     );
 
                     if (isset($options['fields'][$fieldName]['properties']['list'])) {
@@ -161,28 +157,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $type = 'choice';
                     $attr = array_merge(
                         $attr,
-                        array(
-                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue')
-                        )
+                        [
+                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
+                        ]
                     );
 
-                    if (in_array($data['operator'], array('in', '!in'))) {
+                    if (in_array($data['operator'], ['in', '!in'])) {
                         $customOptions['multiple'] = true;
                         if (!isset($data['filter'])) {
-                            $data['filter'] = array();
+                            $data['filter'] = [];
                         } elseif (!is_array($data['filter'])) {
-                            $data['filter'] = array($data['filter']);
+                            $data['filter'] = [$data['filter']];
                         }
                     }
 
-                    $list = $options['fields'][$fieldName]['properties']['list'];
+                    $list    = $options['fields'][$fieldName]['properties']['list'];
                     $choices = FormFieldHelper::parseListStringIntoArray($list);
 
                     if ($fieldType == 'select') {
                         // array_unshift cannot be used because numeric values get lost as keys
-                        $choices = array_reverse($choices, true);
+                        $choices     = array_reverse($choices, true);
                         $choices[''] = '';
-                        $choices = array_reverse($choices, true);
+                        $choices     = array_reverse($choices, true);
                     }
 
                     $customOptions['choices'] = $choices;
@@ -191,11 +187,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 default:
                     $attr = array_merge(
                         $attr,
-                        array(
+                        [
                             'data-toggle' => 'field-lookup',
                             'data-target' => $data['field'],
-                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue')
-                        )
+                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
+                        ]
                     );
 
                     if (isset($options['fields'][$fieldName]['properties']['list'])) {
@@ -205,43 +201,43 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     break;
             }
 
-            if (in_array($data['operator'], array('empty', '!empty'))) {
+            if (in_array($data['operator'], ['empty', '!empty'])) {
                 $attr['disabled'] = 'disabled';
             } else {
-                $customOptions['constraints'] = array(
+                $customOptions['constraints'] = [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                );
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ];
             }
 
             // @todo implement in UI
-            if (in_array($data['operator'], array('between', '!between'))) {
+            if (in_array($data['operator'], ['between', '!between'])) {
                 $form->add(
                     'filter',
                     'collection',
-                    array(
+                    [
                         'type'    => $type,
-                        'options' => array(
+                        'options' => [
                             'label' => false,
-                            'attr'  => $attr
-                        ),
-                        'label'   => false
-                    )
+                            'attr'  => $attr,
+                        ],
+                        'label' => false,
+                    ]
                 );
             } else {
                 $form->add(
                     'filter',
                     $type,
                     array_merge(
-                        array(
+                        [
                             'label'          => false,
                             'attr'           => $attr,
                             'data'           => isset($data['filter']) ? $data['filter'] : '',
                             'error_bubbling' => false,
-                        ),
+                        ],
                         $customOptions
                     )
                 );
@@ -250,12 +246,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $form->add(
                 'display',
                 $displayType,
-                array(
+                [
                     'label'          => false,
                     'attr'           => $displayAttr,
                     'data'           => $data['display'],
-                    'error_bubbling' => false
-                )
+                    'error_bubbling' => false,
+                ]
             );
 
             $choices = $operatorChoices;
@@ -270,14 +266,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $form->add(
                 'operator',
                 'choice',
-                array(
+                [
                     'label'   => false,
                     'choices' => $choices,
-                    'attr'    => array(
+                    'attr'    => [
                         'class'    => 'form-control not-chosen',
-                        'onchange' => 'Mautic.convertLeadFilterInput(this)'
-                    )
-                )
+                        'onchange' => 'Mautic.convertLeadFilterInput(this)',
+                    ],
+                ]
             );
 
             if ($eventName == FormEvents::PRE_SUBMIT) {
@@ -315,14 +311,14 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'regions',
                 'timezones',
                 'stages',
-                'locales'
+                'locales',
             ]
         );
 
         $resolver->setDefaults(
             [
                 'label'          => false,
-                'error_bubbling' => false
+                'error_bubbling' => false,
             ]
         );
     }
@@ -332,6 +328,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "dynamic_content_filter_entry_filters";
+        return 'dynamic_content_filter_entry_filters';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryType.php b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryType.php
index ea2d762da7e..97cd905a1f7 100644
--- a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryType.php
+++ b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterEntryType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,18 +20,16 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class DynamicContentFilterEntryType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class DynamicContentFilterEntryType.
  */
 class DynamicContentFilterEntryType extends AbstractType
 {
-    private $fieldChoices = [];
-    private $countryChoices = [];
-    private $regionChoices = [];
+    private $fieldChoices    = [];
+    private $countryChoices  = [];
+    private $regionChoices   = [];
     private $timezoneChoices = [];
-    private $stageChoices = [];
-    private $localeChoices = [];
+    private $stageChoices    = [];
+    private $localeChoices   = [];
 
     /**
      * DynamicContentFilterEntryType constructor.
@@ -40,7 +39,7 @@ class DynamicContentFilterEntryType extends AbstractType
      */
     public function __construct(ListModel $listModel, StageModel $stageModel)
     {
-        $this->fieldChoices    = $listModel->getChoiceFields();
+        $this->fieldChoices = $listModel->getChoiceFields();
 
         $this->filterFieldChoices();
 
@@ -68,8 +67,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label' => 'mautic.core.dynamicContent.alt_content',
                 'attr'  => [
-                    'class' => 'form-control editor editor-basic'
-                ]
+                    'class' => 'form-control editor editor-basic',
+                ],
             ]
         );
 
@@ -78,11 +77,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'filters',
                 'collection',
                 [
-                    'type' => 'dynamic_content_filter_entry_filters',
+                    'type'    => 'dynamic_content_filter_entry_filters',
                     'options' => [
                         'label' => false,
                         'attr'  => [
-                            'class' => 'form-control'
+                            'class' => 'form-control',
                         ],
                         'countries' => $this->countryChoices,
                         'regions'   => $this->regionChoices,
@@ -94,7 +93,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'mapped'         => true,
                     'allow_add'      => true,
                     'allow_delete'   => true,
-                    'label'          => false
+                    'label'          => false,
                 ]
             )
         );
@@ -114,10 +113,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(
-            array(
+            [
                 'label'          => false,
-                'error_bubbling' => false
-            )
+                'error_bubbling' => false,
+            ]
         );
     }
 
@@ -126,7 +125,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "dynamic_content_filter_entry";
+        return 'dynamic_content_filter_entry';
     }
 
     private function filterFieldChoices()
@@ -135,4 +134,4 @@ private function filterFieldChoices()
             return !in_array($key, ['company', 'leadlist', 'lead_email_received', 'tags', 'dnc_bounced', 'dnc_unsubscribed', 'dnc_bounced_sms', 'dnc_unsubscribed_sms', 'hit_url']);
         }, ARRAY_FILTER_USE_KEY);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterType.php b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterType.php
index 623137636f4..b2eb3458e99 100644
--- a/app/bundles/CoreBundle/Form/Type/DynamicContentFilterType.php
+++ b/app/bundles/CoreBundle/Form/Type/DynamicContentFilterType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class DynamicContentFilterType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class DynamicContentFilterType.
  */
 class DynamicContentFilterType extends AbstractType
 {
@@ -32,8 +31,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label' => 'mautic.core.dynamicContent.token_name',
                 'attr'  => [
-                    'class' => 'form-control dynamic-content-token-name'
-                ]
+                    'class' => 'form-control dynamic-content-token-name',
+                ],
             ]
         );
 
@@ -43,8 +42,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label' => 'mautic.core.dynamicContent.default_content',
                 'attr'  => [
-                    'class' => 'form-control editor editor-basic'
-                ]
+                    'class' => 'form-control editor editor-basic',
+                ],
             ]
         );
 
@@ -53,15 +52,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'filters',
                 'collection',
                 [
-                    'type' => 'dynamic_content_filter_entry',
+                    'type'    => 'dynamic_content_filter_entry',
                     'options' => [
                         'label' => false,
                         'attr'  => [
-                            'class' => 'form-control'
-                        ]
+                            'class' => 'form-control',
+                        ],
                     ],
-                    'allow_add'      => true,
-                    'allow_delete'   => true,
+                    'allow_add'    => true,
+                    'allow_delete' => true,
                 ]
             )
         );
@@ -75,7 +74,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(
             [
                 'label'          => false,
-                'error_bubbling' => false
+                'error_bubbling' => false,
             ]
         );
     }
@@ -85,6 +84,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "dynamic_content_filter";
+        return 'dynamic_content_filter';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/Type/DynamicListType.php b/app/bundles/CoreBundle/Form/Type/DynamicListType.php
index 057da70eddf..035164430c6 100644
--- a/app/bundles/CoreBundle/Form/Type/DynamicListType.php
+++ b/app/bundles/CoreBundle/Form/Type/DynamicListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -21,11 +22,10 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class DynamicListType
+ * Class DynamicListType.
  */
 class DynamicListType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -52,69 +52,63 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'remove_onclick'  => 'Mautic.removeFormListOption(this);',
             'option_required' => true,
             'option_notblank' => true,
             'remove_icon'     => 'fa fa-times',
             'sortable'        => 'fa fa-ellipsis-v handle',
-            'label'        => false,
-            'options'      => array(
+            'label'           => false,
+            'options'         => [
                 'label'    => false,
                 'required' => false,
-                'attr'     => array(
-                    'class'         => 'form-control',
-                    'preaddon'      => function (Options $options) {
-
+                'attr'     => [
+                    'class'    => 'form-control',
+                    'preaddon' => function (Options $options) {
                         return $options['remove_icon'];
                     },
-                    'preaddon_attr' =>
-                        function (Options $options) {
-
-                            return array(
-                                'onclick' => $options['remove_onclick']
-                            );
-                        },
-                    'postaddon'  => function (Options $options) {
-
+                    'preaddon_attr' => function (Options $options) {
+                        return [
+                                'onclick' => $options['remove_onclick'],
+                            ];
+                    },
+                    'postaddon' => function (Options $options) {
                         return $options['sortable'];
                     },
-                ),
+                ],
 
                 'constraints' => function (Options $options) {
-
-                    return ($options['option_notblank']) ? array(
+                    return ($options['option_notblank']) ? [
                         new NotBlank(
-                            array('message' => 'mautic.form.lists.notblank')
-                        )
-                    ) : array();
+                            ['message' => 'mautic.form.lists.notblank']
+                        ),
+                    ] : [];
                 },
-                'error_bubbling' => true
-            ),
+                'error_bubbling' => true,
+            ],
             'allow_add'    => true,
             'allow_delete' => true,
             'prototype'    => true,
-            'constraints'  =>  function (Options $options) {
-
-                return ($options['option_required']) ? array(
+            'constraints'  => function (Options $options) {
+                return ($options['option_required']) ? [
                     new Count(
-                        array(
+                        [
                             'minMessage' => 'mautic.form.lists.count',
-                            'min'        => 1
-                        )
-                    )
-                ) : array();
+                            'min'        => 1,
+                        ]
+                    ),
+                ] : [];
             },
-            'error_bubbling' => false
-        ));
+            'error_bubbling' => false,
+        ]);
 
-        $resolver->setOptional(array(
+        $resolver->setOptional([
             'sortable',
             'remove_onclick',
             'option_required',
             'option_notblank',
-            'remove_icon'
-        ));
+            'remove_icon',
+        ]);
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/Type/FormButtonsType.php b/app/bundles/CoreBundle/Form/Type/FormButtonsType.php
index 63964d06e14..35ca52c02ef 100644
--- a/app/bundles/CoreBundle/Form/Type/FormButtonsType.php
+++ b/app/bundles/CoreBundle/Form/Type/FormButtonsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FormButtonsType
+ * Class FormButtonsType.
  */
 class FormButtonsType extends AbstractType
 {
@@ -25,16 +26,15 @@ class FormButtonsType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
         foreach ($options['pre_extra_buttons'] as $btn) {
             $type = (empty($btn['type'])) ? 'button' : 'submit';
             $builder->add(
                 $btn['name'],
                 $type,
-                array(
+                [
                     'label' => $btn['label'],
-                    'attr'  => $btn['attr']
-                )
+                    'attr'  => $btn['attr'],
+                ]
             );
         }
 
@@ -42,17 +42,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 'cancel',
                 'submit',
-                array(
+                [
                     'label' => $options['cancel_text'],
                     'attr'  => array_merge(
                         $options['cancel_attr'],
-                        array(
+                        [
                             'class'   => $options['cancel_class'],
                             'icon'    => $options['cancel_icon'],
-                            'onclick' => $options['cancel_onclick']
-                        )
-                    )
-                )
+                            'onclick' => $options['cancel_onclick'],
+                        ]
+                    ),
+                ]
             );
         }
 
@@ -60,17 +60,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 'save',
                 'submit',
-                array(
+                [
                     'label' => $options['save_text'],
                     'attr'  => array_merge(
                         $options['save_attr'],
-                        array(
+                        [
                             'class'   => $options['save_class'],
                             'icon'    => $options['save_icon'],
-                            'onclick' => $options['save_onclick']
-                        )
-                    )
-                )
+                            'onclick' => $options['save_onclick'],
+                        ]
+                    ),
+                ]
             );
         }
 
@@ -78,17 +78,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 'apply',
                 'submit',
-                array(
+                [
                     'label' => $options['apply_text'],
                     'attr'  => array_merge(
                         $options['apply_attr'],
-                        array(
+                        [
                             'class'   => $options['apply_class'],
                             'icon'    => $options['apply_icon'],
-                            'onclick' => $options['apply_onclick']
-                        )
-                    )
-                )
+                            'onclick' => $options['apply_onclick'],
+                        ]
+                    ),
+                ]
             );
         }
 
@@ -97,10 +97,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 $btn['name'],
                 $type,
-                array(
+                [
                     'label' => $btn['label'],
-                    'attr'  => $btn['attr']
-                )
+                    'attr'  => $btn['attr'],
+                ]
             );
         }
     }
@@ -110,29 +110,29 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'apply_text'         => 'mautic.core.form.apply',
             'apply_icon'         => 'fa fa-check text-success',
             'apply_class'        => 'btn btn-default btn-apply',
             'apply_onclick'      => false,
-            'apply_attr'         => array(),
+            'apply_attr'         => [],
             'save_text'          => 'mautic.core.form.saveandclose',
             'save_icon'          => 'fa fa-save',
             'save_class'         => 'btn btn-default btn-save',
             'save_onclick'       => false,
-            'save_attr'          => array(),
+            'save_attr'          => [],
             'cancel_text'        => 'mautic.core.form.cancel',
             'cancel_icon'        => 'fa fa-times text-danger',
             'cancel_class'       => 'btn btn-default btn-cancel',
             'cancel_onclick'     => false,
-            'cancel_attr'        => array(),
+            'cancel_attr'        => [],
             'mapped'             => false,
             'label'              => false,
             'required'           => false,
-            'pre_extra_buttons'  => array(),
-            'post_extra_buttons' => array(),
-            'container_class'    => 'bottom-form-buttons'
-        ));
+            'pre_extra_buttons'  => [],
+            'post_extra_buttons' => [],
+            'container_class'    => 'bottom-form-buttons',
+        ]);
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/Type/HiddenEntityType.php b/app/bundles/CoreBundle/Form/Type/HiddenEntityType.php
index 2a47df56da5..75246de56f0 100644
--- a/app/bundles/CoreBundle/Form/Type/HiddenEntityType.php
+++ b/app/bundles/CoreBundle/Form/Type/HiddenEntityType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class HiddenEntityType
+ * Class HiddenEntityType.
  */
 class HiddenEntityType extends AbstractType
 {
-
     /**
      * @var EntityManager
      */
@@ -48,13 +48,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setRequired(
-            array('repository')
+            ['repository']
         );
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'transformer' => 'Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer',
-            'identifier'  => 'id'
-        ));
+            'identifier'  => 'id',
+        ]);
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/Type/IpLookupDownloadDataStoreButtonType.php b/app/bundles/CoreBundle/Form/Type/IpLookupDownloadDataStoreButtonType.php
index ba464b3d7dc..0d1e1361e3c 100644
--- a/app/bundles/CoreBundle/Form/Type/IpLookupDownloadDataStoreButtonType.php
+++ b/app/bundles/CoreBundle/Form/Type/IpLookupDownloadDataStoreButtonType.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CoreBundle\Form\Type;
 
 use Mautic\CoreBundle\IpLookup\AbstractLocalDataLookup;
@@ -32,7 +34,7 @@ class IpLookupDownloadDataStoreButtonType extends AbstractType
     /**
      * IpLookupDownloadDataStoreButtonType constructor.
      *
-     * @param DateHelper $dateHelper
+     * @param DateHelper          $dateHelper
      * @param TranslatorInterface $translator
      */
     public function __construct(DateHelper $dateHelper, TranslatorInterface $translator)
@@ -53,10 +55,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'button',
             [
                 'label' => ($localDataExists) ? 'mautic.core.ip_lookup.update_data' : 'mautic.core.ip_lookup.fetch_data',
-                'attr' => [
+                'attr'  => [
                     'class'   => 'btn btn-'.($localDataExists ? 'success' : 'danger'),
                     'onclick' => 'Mautic.downloadIpLookupDataStore()',
-                ]
+                ],
             ]
         );
     }
@@ -94,4 +96,4 @@ public function getName()
     {
         return 'iplookup_download_data_store_button';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SlotButtonType.php b/app/bundles/CoreBundle/Form/Type/SlotButtonType.php
index 9a620deae37..929a36e33d2 100644
--- a/app/bundles/CoreBundle/Form/Type/SlotButtonType.php
+++ b/app/bundles/CoreBundle/Form/Type/SlotButtonType.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\Type\SlotType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class SlotButtonType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class SlotButtonType.
  */
 class SlotButtonType extends SlotType
 {
@@ -84,7 +81,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'attr'       => [
                 'class'           => 'form-control',
                 'data-slot-param' => 'background-color',
-                'data-toggle'     => 'color'
+                'data-toggle'     => 'color',
             ],
         ]);
 
@@ -95,7 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'attr'       => [
                 'class'           => 'form-control',
                 'data-slot-param' => 'color',
-                'data-toggle'     => 'color'
+                'data-toggle'     => 'color',
             ],
         ]);
     }
@@ -105,6 +102,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "slot_button";
+        return 'slot_button';
     }
 }
diff --git a/app/bundles/CoreBundle/Form/Type/SlotType.php b/app/bundles/CoreBundle/Form/Type/SlotType.php
index e29163ade07..b4aab57ae07 100644
--- a/app/bundles/CoreBundle/Form/Type/SlotType.php
+++ b/app/bundles/CoreBundle/Form/Type/SlotType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,10 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class SlotType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class SlotType.
  */
 class SlotType extends AbstractType
 {
-
     private $factory;
 
     /**
@@ -37,27 +35,27 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('padding-top', 'number', array(
+        $builder->add('padding-top', 'number', [
             'label'      => 'mautic.core.padding.top',
-            'label_attr' => array('class' => 'control-label'),
+            'label_attr' => ['class' => 'control-label'],
             'required'   => false,
-            'attr'       => array(
+            'attr'       => [
                 'class'           => 'form-control',
                 'data-slot-param' => 'padding-top',
                 'postaddon_text'  => 'px',
-            ),
-        ));
+            ],
+        ]);
 
-        $builder->add('padding-bottom', 'number', array(
+        $builder->add('padding-bottom', 'number', [
             'label'      => 'mautic.core.padding.bottom',
-            'label_attr' => array('class' => 'control-label'),
+            'label_attr' => ['class' => 'control-label'],
             'required'   => false,
-            'attr'       => array(
+            'attr'       => [
                 'class'           => 'form-control',
                 'data-slot-param' => 'padding-bottom',
                 'postaddon_text'  => 'px',
-            ),
-        ));
+            ],
+        ]);
     }
 
     /**
@@ -65,6 +63,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "slot";
+        return 'slot';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SortableListType.php b/app/bundles/CoreBundle/Form/Type/SortableListType.php
index 855153c4cb6..f227fb7a1e0 100644
--- a/app/bundles/CoreBundle/Form/Type/SortableListType.php
+++ b/app/bundles/CoreBundle/Form/Type/SortableListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,11 +21,10 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class SortableListType
+ * Class SortableListType.
  */
 class SortableListType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -34,9 +34,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             new Count(
                 [
                     'minMessage' => 'mautic.form.lists.count',
-                    'min'        => 1
+                    'min'        => 1,
                 ]
-            )
+            ),
         ] : [];
 
         if ($options['constraint_callback'] instanceof Callback) {
@@ -48,25 +48,25 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'list',
                 'collection',
                 [
-                    'label'          => false,
-                    'entry_type'     => ($options['with_labels']) ? SortableValueLabelListType::class : 'text',
-                    'options'        => [
-                        'label'          => false,
-                        'required'       => false,
-                        'attr'           => [
+                    'label'      => false,
+                    'entry_type' => ($options['with_labels']) ? SortableValueLabelListType::class : 'text',
+                    'options'    => [
+                        'label'    => false,
+                        'required' => false,
+                        'attr'     => [
                             'class'         => 'form-control',
                             'preaddon'      => $options['remove_icon'],
                             'preaddon_attr' => [
-                                'onclick' => $options['remove_onclick']
+                                'onclick' => $options['remove_onclick'],
                             ],
-                            'postaddon'     => $options['sortable']
+                            'postaddon' => $options['sortable'],
                         ],
-                        'constraints'    => ($options['option_notblank']) ? [
+                        'constraints' => ($options['option_notblank']) ? [
                             new NotBlank(
                                 ['message' => 'mautic.form.lists.notblank']
-                            )
+                            ),
                         ] : [],
-                        'error_bubbling' => true
+                        'error_bubbling' => true,
                     ],
                     'allow_add'      => true,
                     'allow_delete'   => true,
@@ -109,7 +109,7 @@ public function configureOptions(OptionsResolver $resolver)
                 'remove_onclick',
                 'option_required',
                 'option_notblank',
-                'remove_icon'
+                'remove_icon',
             ]
         );
     }
diff --git a/app/bundles/CoreBundle/Form/Type/SortableValueLabelListType.php b/app/bundles/CoreBundle/Form/Type/SortableValueLabelListType.php
index 0431799ea0a..b67bab100a5 100644
--- a/app/bundles/CoreBundle/Form/Type/SortableValueLabelListType.php
+++ b/app/bundles/CoreBundle/Form/Type/SortableValueLabelListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\Form\FormView;
 
 /**
- * Class SortableValueLabelListType
+ * Class SortableValueLabelListType.
  */
 class SortableValueLabelListType extends AbstractType
 {
@@ -37,4 +38,4 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['preaddon']      = (isset($options['attr']['preaddon'])) ? $options['attr']['preaddon'] : [];
         $view->vars['postaddon']     = (isset($options['attr']['postaddon'])) ? $options['attr']['postaddon'] : [];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Form/Type/SpacerType.php b/app/bundles/CoreBundle/Form/Type/SpacerType.php
index 22bbc0d50c0..6bc1db02be5 100644
--- a/app/bundles/CoreBundle/Form/Type/SpacerType.php
+++ b/app/bundles/CoreBundle/Form/Type/SpacerType.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class SpacerType
+ * Class SpacerType.
  */
 class SpacerType extends AbstractType
 {
@@ -25,28 +26,28 @@ class SpacerType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'mapped' => false,
-            'text'  =>  '',
-            'class' =>  '',
-            'tag'   =>  'div'
-        ));
+            'text'   => '',
+            'class'  => '',
+            'tag'    => 'div',
+        ]);
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace($view->vars, array(
+        $view->vars = array_replace($view->vars, [
             'text'  => $options['text'],
             'class' => $options['class'],
-            'tag'   => $options['tag']
-        ));
+            'tag'   => $options['tag'],
+        ]);
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/app/bundles/CoreBundle/Form/Type/StandAloneButtonType.php b/app/bundles/CoreBundle/Form/Type/StandAloneButtonType.php
index da0e0a4b780..cd5e7199932 100644
--- a/app/bundles/CoreBundle/Form/Type/StandAloneButtonType.php
+++ b/app/bundles/CoreBundle/Form/Type/StandAloneButtonType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class StandAloneButtonType
+ * Class StandAloneButtonType.
  */
 class StandAloneButtonType extends AbstractType
 {
@@ -22,9 +23,9 @@ class StandAloneButtonType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'mapped' => false
-        ));
+        $resolver->setDefaults([
+            'mapped' => false,
+        ]);
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/Type/TelType.php b/app/bundles/CoreBundle/Form/Type/TelType.php
index 04a19f39ca3..a6a1014f992 100644
--- a/app/bundles/CoreBundle/Form/Type/TelType.php
+++ b/app/bundles/CoreBundle/Form/Type/TelType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class TelType
+ * Class TelType.
  */
 class TelType extends AbstractType
 {
@@ -22,9 +23,9 @@ class TelType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'compound' => false,
-        ));
+        ]);
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Form/Type/ThemeListType.php b/app/bundles/CoreBundle/Form/Type/ThemeListType.php
index 53cbab25fea..6acf7d3bbc8 100644
--- a/app/bundles/CoreBundle/Form/Type/ThemeListType.php
+++ b/app/bundles/CoreBundle/Form/Type/ThemeListType.php
@@ -1,35 +1,32 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ThemeListType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class ThemeListType.
  */
 class ThemeListType extends AbstractType
 {
-
     private $factory;
 
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->factory = $factory;
     }
 
@@ -38,36 +35,36 @@ public function __construct(MauticFactory $factory) {
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-
         $factory = $this->factory;
-        $resolver->setDefaults(array(
-            'choices'       => function(Options $options) use ($factory) {
+        $resolver->setDefaults([
+            'choices' => function (Options $options) use ($factory) {
                 return $factory->getInstalledThemes($options['feature']);
             },
-            'expanded'      => false,
-            'multiple'      => false,
-            'label'         => 'mautic.core.form.theme',
-            'label_attr'    => array('class' => 'control-label'),
-            'empty_value'   => false,
-            'required'      => false,
-            'attr'       => array(
-                'class'   => 'form-control'
-            ),
-            'feature'       => 'all'
-        ));
+            'expanded'    => false,
+            'multiple'    => false,
+            'label'       => 'mautic.core.form.theme',
+            'label_attr'  => ['class' => 'control-label'],
+            'empty_value' => false,
+            'required'    => false,
+            'attr'        => [
+                'class' => 'form-control',
+            ],
+            'feature' => 'all',
+        ]);
 
-        $resolver->setOptional(array('feature'));
+        $resolver->setOptional(['feature']);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "theme_list";
+    public function getName()
+    {
+        return 'theme_list';
     }
 
     public function getParent()
     {
-        return "choice";
+        return 'choice';
     }
 }
diff --git a/app/bundles/CoreBundle/Form/Type/ThemeUploadType.php b/app/bundles/CoreBundle/Form/Type/ThemeUploadType.php
index 9c0f8cf1eda..0baf5b5ce9a 100644
--- a/app/bundles/CoreBundle/Form/Type/ThemeUploadType.php
+++ b/app/bundles/CoreBundle/Form/Type/ThemeUploadType.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+
 /**
- * Class ThemeUploadType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class ThemeUploadType.
  */
 class ThemeUploadType extends AbstractType
 {
@@ -21,36 +22,36 @@ class ThemeUploadType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('file', 'file', [
-            'attr'  => [
+            'attr' => [
                 'accept' => '.zip',
-                'class'  => 'form-control'
-            ]
+                'class'  => 'form-control',
+            ],
         ]);
         $constraints = [
             new \Symfony\Component\Validator\Constraints\NotBlank(
                 ['message' => 'mautic.core.value.required']
-            )
+            ),
         ];
         $builder->add('start', 'submit', [
-            'attr'  => [
+            'attr' => [
                 'class'   => 'btn btn-primary',
                 'icon'    => 'fa fa-upload',
-                'onclick' => "mQuery(this).prop('disabled', true); mQuery('form[name=\'theme_upload\']').submit();"
+                'onclick' => "mQuery(this).prop('disabled', true); mQuery('form[name=\'theme_upload\']').submit();",
             ],
-            'label' => 'mautic.core.theme.install'
+            'label' => 'mautic.core.theme.install',
         ]);
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "theme_upload";
+        return 'theme_upload';
     }
 }
diff --git a/app/bundles/CoreBundle/Form/Type/YesNoButtonGroupType.php b/app/bundles/CoreBundle/Form/Type/YesNoButtonGroupType.php
index b16e85331fc..4a3e100ee28 100644
--- a/app/bundles/CoreBundle/Form/Type/YesNoButtonGroupType.php
+++ b/app/bundles/CoreBundle/Form/Type/YesNoButtonGroupType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class YesNoButtonGroupType
+ * Class YesNoButtonGroupType.
  */
 class YesNoButtonGroupType extends AbstractType
 {
@@ -41,30 +42,30 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
-                'choices'           => function (Options $options) {
+                'choices' => function (Options $options) {
                     return [
                         $options['no_label']  => $options['no_value'],
                         $options['yes_label'] => $options['yes_value'],
                     ];
                 },
                 'choices_as_values' => true,
-                'choice_value' => function ($choiceKey) {
+                'choice_value'      => function ($choiceKey) {
                     if (null === $choiceKey || '' === $choiceKey) {
                         return null;
                     }
 
-                   return (int) $choiceKey;
+                    return (int) $choiceKey;
                 },
-                'expanded'          => true,
-                'multiple'          => false,
-                'label_attr'        => ['class' => 'control-label'],
-                'label'             => 'mautic.core.form.published',
-                'empty_value'       => false,
-                'required'          => false,
-                'no_label'          => 'mautic.core.form.no',
-                'no_value'          => 0,
-                'yes_label'         => 'mautic.core.form.yes',
-                'yes_value'         => 1,
+                'expanded'    => true,
+                'multiple'    => false,
+                'label_attr'  => ['class' => 'control-label'],
+                'label'       => 'mautic.core.form.published',
+                'empty_value' => false,
+                'required'    => false,
+                'no_label'    => 'mautic.core.form.no',
+                'no_value'    => 0,
+                'yes_label'   => 'mautic.core.form.yes',
+                'yes_value'   => 1,
             ]
         );
     }
diff --git a/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php b/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php
index 81963981752..4d58880da8a 100644
--- a/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php
+++ b/app/bundles/CoreBundle/Helper/AbstractFormFieldHelper.php
@@ -1,35 +1,36 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-namespace Mautic\CoreBundle\Helper;
 
+namespace Mautic\CoreBundle\Helper;
 
 use Symfony\Component\Translation\TranslatorInterface;
 
 abstract class AbstractFormFieldHelper
 {
     /**
-     * Json encoded format
+     * Json encoded format.
      */
     const FORMAT_JSON = 'json';
 
     /**
-     * Bar format value1|value2
+     * Bar format value1|value2.
      */
     const FORMAT_BAR = 'bar';
 
     /**
-     * Simple value => label array
+     * Simple value => label array.
      */
     const FORMAT_SIMPLE_ARRAY = 'simple_array';
 
     /**
-     * Array [['value' => 'value', 'label' => 'label'] ..]
+     * Array [['value' => 'value', 'label' => 'label'] ..].
      */
     const FORMAT_ARRAY = 'array';
 
@@ -62,7 +63,7 @@ public function __construct()
     }
 
     /**
-     * Set translator
+     * Set translator.
      *
      * @param TranslatorInterface $translator
      */
@@ -94,14 +95,14 @@ public function getChoiceList($customFields = [])
     }
 
     /**
-     * Format a string into an array
+     * Format a string into an array.
      *
      * @param      $list
      * @param bool $removeEmpty
      *
      * @return array
      */
-    static function parseList($list, $removeEmpty = true, $ignoreNumerical = false)
+    public static function parseList($list, $removeEmpty = true, $ignoreNumerical = false)
     {
         // Note if this was an array to start and if we need to determine if the keys are sequentially numerical
         // for BC purposes
@@ -113,7 +114,7 @@ static function parseList($list, $removeEmpty = true, $ignoreNumerical = false)
             } else {
                 if (strpos($list, '|') !== false) {
                     $checkNumericalKeys = false;
-                    $parts = explode('||', $list);
+                    $parts              = explode('||', $list);
                     if (count($parts) > 1) {
                         $labels = explode('|', $parts[0]);
                         $values = explode('|', $parts[1]);
@@ -163,7 +164,7 @@ static function parseList($list, $removeEmpty = true, $ignoreNumerical = false)
      *
      * @return array|string
      */
-    static function formatList($format, $choices)
+    public static function formatList($format, $choices)
     {
         switch ($format) {
             case self::FORMAT_JSON:
@@ -177,9 +178,10 @@ static function formatList($format, $choices)
                 foreach ($choices as $value => $label) {
                     $array[] = [
                         'label' => $label,
-                        'value' => $value
+                        'value' => $value,
                     ];
                 }
+
                 return $array;
         }
     }
@@ -191,8 +193,8 @@ static function formatList($format, $choices)
      *
      * @return array|string
      */
-    static function parseListStringIntoArray($list)
+    public static function parseListStringIntoArray($list)
     {
         return self::parseList($list);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/AssetGenerationHelper.php b/app/bundles/CoreBundle/Helper/AssetGenerationHelper.php
index 65a48a78f88..ae5e6b6fbde 100644
--- a/app/bundles/CoreBundle/Helper/AssetGenerationHelper.php
+++ b/app/bundles/CoreBundle/Helper/AssetGenerationHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Symfony\Component\Finder\Finder;
 
 /**
- * Class AssetGenerationHelper
+ * Class AssetGenerationHelper.
  */
 class AssetGenerationHelper
 {
-
     /**
      * @var MauticFactory
      */
@@ -38,7 +38,7 @@ public function __construct(MauticFactory $factory)
     }
 
     /**
-     * Generates and returns assets
+     * Generates and returns assets.
      *
      * @param bool $forceRegeneration
      *
@@ -46,7 +46,7 @@ public function __construct(MauticFactory $factory)
      */
     public function getAssets($forceRegeneration = false)
     {
-        static $assets = array();
+        static $assets = [];
 
         if (empty($assets)) {
             $loadAll    = true;
@@ -59,12 +59,12 @@ public function getAssets($forceRegeneration = false)
                 $loadAll = false; //by default, loading should not be required
 
                 //check for libraries and app files and generate them if they don't exist if in prod environment
-                $prodFiles = array(
+                $prodFiles = [
                     'css/libraries.css',
                     'css/app.css',
                     'js/libraries.js',
-                    'js/app.js'
-                );
+                    'js/app.js',
+                ];
 
                 foreach ($prodFiles as $file) {
                     if (!file_exists("$assetsFullPath/$file")) {
@@ -88,16 +88,16 @@ public function getAssets($forceRegeneration = false)
                     file_put_contents($inProgressFile, date('r'));
                 }
 
-                $modifiedLast = array();
+                $modifiedLast = [];
 
                 //get a list of all core asset files
                 $bundles = $this->factory->getParameter('bundles');
 
-                $fileTypes = array('css', 'js');
+                $fileTypes = ['css', 'js'];
                 foreach ($bundles as $bundle) {
                     foreach ($fileTypes as $ft) {
                         if (!isset($modifiedLast[$ft])) {
-                            $modifiedLast[$ft] = array();
+                            $modifiedLast[$ft] = [];
                         }
                         $dir = "{$bundle['directory']}/Assets/$ft";
                         if (file_exists($dir)) {
@@ -108,12 +108,12 @@ public function getAssets($forceRegeneration = false)
                 $modifiedLast = array_merge($modifiedLast, $this->findOverrides($env, $assets));
 
                 //combine the files into their corresponding name and put in the root media folder
-                if ($env == "prod") {
-                    $checkPaths = array(
+                if ($env == 'prod') {
+                    $checkPaths = [
                         $assetsFullPath,
                         "$assetsFullPath/css",
                         "$assetsFullPath/js",
-                    );
+                    ];
                     array_walk($checkPaths, function ($path) {
                         if (!file_exists($path)) {
                             mkdir($path);
@@ -139,17 +139,17 @@ public function getAssets($forceRegeneration = false)
                                     $out = fopen($assetFile, 'w');
 
                                     foreach ($files as $relPath => $details) {
-                                        $cssRel = '../../' . dirname($relPath) . '/';
+                                        $cssRel = '../../'.dirname($relPath).'/';
                                         if ($useMinify) {
-                                            $content = \Minify::combine(array($details['fullPath']), array(
+                                            $content = \Minify::combine([$details['fullPath']], [
                                                 'rewriteCssUris'  => false,
-                                                'minifierOptions' => array(
-                                                    'text/css' => array(
+                                                'minifierOptions' => [
+                                                    'text/css' => [
                                                         'currentDir'          => '',
-                                                        'prependRelativePath' => $cssRel
-                                                    )
-                                                )
-                                            ));
+                                                        'prependRelativePath' => $cssRel,
+                                                    ],
+                                                ],
+                                            ]);
                                         } else {
                                             $content = file_get_contents($details['fullPath']);
                                             $search  = '#url\((?!\s*([\'"]?(((?:https?:)?//)|(?:data\:?:))))\s*([\'"])?#';
@@ -162,7 +162,9 @@ public function getAssets($forceRegeneration = false)
 
                                     fclose($out);
                                 } else {
-                                    array_walk($files, function (&$file) { $file = $file['fullPath']; });
+                                    array_walk($files, function (&$file) {
+                                        $file = $file['fullPath'];
+                                    });
                                     file_put_contents($assetFile, \Minify::combine($files));
                                 }
                             }
@@ -175,16 +177,16 @@ public function getAssets($forceRegeneration = false)
 
             if ($env == 'prod') {
                 //return prod generated assets
-                $assets = array(
-                    'css' => array(
+                $assets = [
+                    'css' => [
                         "{$assetsPath}/css/libraries.css?v{$this->version}",
-                        "{$assetsPath}/css/app.css?v{$this->version}"
-                    ),
-                    'js'  => array(
+                        "{$assetsPath}/css/app.css?v{$this->version}",
+                    ],
+                    'js' => [
                         "{$assetsPath}/js/libraries.js?v{$this->version}",
-                        "{$assetsPath}/js/app.js?v{$this->version}"
-                    )
-                );
+                        "{$assetsPath}/js/app.js?v{$this->version}",
+                    ],
+                ];
             } else {
                 foreach ($assets as $type => &$typeAssets) {
                     $typeAssets = array_keys($typeAssets);
@@ -196,7 +198,7 @@ public function getAssets($forceRegeneration = false)
     }
 
     /**
-     * Finds directory assets
+     * Finds directory assets.
      *
      * @param string $dir
      * @param string $ext
@@ -207,24 +209,24 @@ public function getAssets($forceRegeneration = false)
      */
     protected function findAssets($dir, $ext, $env, &$assets)
     {
-        $rootPath    = str_replace('\\', '/', $this->factory->getSystemPath('assets_root') . '/');
+        $rootPath    = str_replace('\\', '/', $this->factory->getSystemPath('assets_root').'/');
         $directories = new Finder();
         $directories->directories()->exclude('*less')->depth('0')->ignoreDotFiles(true)->in($dir);
 
-        $modifiedLast = array();
+        $modifiedLast = [];
 
         if (count($directories)) {
             foreach ($directories as $directory) {
                 $group = $directory->getBasename();
 
                 // Only auto load directories app or libraries
-                if (!in_array($group, array('app', 'libraries'))) {
+                if (!in_array($group, ['app', 'libraries'])) {
                     continue;
                 }
 
                 $files         = new Finder();
                 $thisDirectory = str_replace('\\', '/', $directory->getRealPath());
-                $files->files()->depth('0')->name('*.' . $ext)->in($thisDirectory);
+                $files->files()->depth('0')->name('*.'.$ext)->in($thisDirectory);
 
                 $sort = function (\SplFileInfo $a, \SplFileInfo $b) {
                     return strnatcmp($a->getRealpath(), $b->getRealpath());
@@ -238,10 +240,10 @@ protected function findAssets($dir, $ext, $env, &$assets)
                         $relPath = substr($relPath, 1);
                     }
 
-                    $details = array(
-                        'fullPath'  => $fullPath,
-                        'relPath'   => $relPath
-                    );
+                    $details = [
+                        'fullPath' => $fullPath,
+                        'relPath'  => $relPath,
+                    ];
 
                     if ($env == 'prod') {
                         $lastModified = filemtime($fullPath);
@@ -259,7 +261,7 @@ protected function findAssets($dir, $ext, $env, &$assets)
 
         unset($directories);
         $files = new Finder();
-        $files->files()->depth('0')->ignoreDotFiles(true)->name('*.' . $ext)->in($dir);
+        $files->files()->depth('0')->ignoreDotFiles(true)->name('*.'.$ext)->in($dir);
 
         $sort = function (\SplFileInfo $a, \SplFileInfo $b) {
             return strnatcmp($a->getRealpath(), $b->getRealpath());
@@ -267,13 +269,13 @@ protected function findAssets($dir, $ext, $env, &$assets)
         $files->sort($sort);
 
         foreach ($files as $file) {
-           	$fullPath = str_replace('\\', '/', $file->getPathname());
+            $fullPath = str_replace('\\', '/', $file->getPathname());
             $relPath  = str_replace($rootPath, '', $fullPath);
 
-            $details = array(
-                'fullPath'  => $fullPath,
-                'relPath'   => $relPath
-            );
+            $details = [
+                'fullPath' => $fullPath,
+                'relPath'  => $relPath,
+            ];
 
             if ($env == 'prod') {
                 $lastModified = filemtime($fullPath);
@@ -291,7 +293,7 @@ protected function findAssets($dir, $ext, $env, &$assets)
     }
 
     /**
-     * Find asset overrides in the template
+     * Find asset overrides in the template.
      *
      * @param $env
      * @param $assets
@@ -302,12 +304,12 @@ protected function findOverrides($env, &$assets)
     {
         $rootPath      = $this->factory->getSystemPath('assets_root');
         $currentTheme  = $this->factory->getSystemPath('current_theme');
-        $modifiedLast  = array();
-        $types         = array('css', 'js');
-        $overrideFiles = array(
-            "libraries" => "libraries_custom",
-            "app"       => "app_custom"
-        );
+        $modifiedLast  = [];
+        $types         = ['css', 'js'];
+        $overrideFiles = [
+            'libraries' => 'libraries_custom',
+            'app'       => 'app_custom',
+        ];
 
         foreach ($types as $ext) {
             foreach ($overrideFiles as $group => $of) {
@@ -315,10 +317,10 @@ protected function findOverrides($env, &$assets)
                     $fullPath = "$rootPath/$currentTheme/$ext/$of.$ext";
                     $relPath  = "$currentTheme/$ext/$of.$ext";
 
-                    $details = array(
-                        'fullPath'  => $fullPath,
-                        'relPath'   => $relPath
-                    );
+                    $details = [
+                        'fullPath' => $fullPath,
+                        'relPath'  => $relPath,
+                    ];
 
                     if ($env == 'prod') {
                         $lastModified = filemtime($fullPath);
diff --git a/app/bundles/CoreBundle/Helper/BuilderTokenHelper.php b/app/bundles/CoreBundle/Helper/BuilderTokenHelper.php
index 2c05f5a4214..a53db2d78ec 100644
--- a/app/bundles/CoreBundle/Helper/BuilderTokenHelper.php
+++ b/app/bundles/CoreBundle/Helper/BuilderTokenHelper.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
-use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\ORM\Query\Expr;
 use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class BuilderTokenHelper
+ * Class BuilderTokenHelper.
  */
 class BuilderTokenHelper
 {
-
     protected $viewPermissionBase;
     protected $modelName;
     protected $langVar;
@@ -45,10 +44,10 @@ public function __construct(MauticFactory $factory, $modelName, $viewPermissionB
         $this->bundleName         = (!empty($bundleName)) ? $bundleName : 'Mautic'.ucfirst($modelName).'Bundle';
         $this->langVar            = (!empty($langVar)) ? $langVar : $modelName;
 
-        $this->permissionSet = array(
+        $this->permissionSet = [
             $this->viewPermissionBase.':viewown',
-            $this->viewPermissionBase.':viewother'
-        );
+            $this->viewPermissionBase.':viewother',
+        ];
     }
 
     /**
@@ -58,7 +57,7 @@ public function __construct(MauticFactory $factory, $modelName, $viewPermissionB
      *
      * @return string
      */
-    public function getTokenContent($page = 1, $entityArguments = array(), $viewParameters = array())
+    public function getTokenContent($page = 1, $entityArguments = [], $viewParameters = [])
     {
         if (is_array($page)) {
             // Laziness
@@ -69,10 +68,9 @@ public function getTokenContent($page = 1, $entityArguments = array(), $viewPara
         //set some permissions
         $permissions = $this->factory->getSecurity()->isGranted(
             $this->permissionSet,
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
-
         if (count(array_unique($permissions)) == 1 && end($permissions) == false) {
             return;
         }
@@ -99,21 +97,21 @@ public function getTokenContent($page = 1, $entityArguments = array(), $viewPara
             $prefix .= '.';
         }
 
-        $filter          = array('string' => $search);
-        $filter['force'] = (isset($entityArguments['filter']['force'])) ? $entityArguments['filter']['force'] : array();
+        $filter          = ['string' => $search];
+        $filter['force'] = (isset($entityArguments['filter']['force'])) ? $entityArguments['filter']['force'] : [];
 
         if (isset($permissions[$this->viewPermissionBase.':viewother']) && !$permissions[$this->viewPermissionBase.':viewother']) {
-            $filter['force'][] = array('column' => $prefix.'createdBy', 'expr' => 'eq', 'value' => $this->factory->getUser()->getId());
+            $filter['force'][] = ['column' => $prefix.'createdBy', 'expr' => 'eq', 'value' => $this->factory->getUser()->getId()];
         }
 
         $entityArguments['filter'] = $filter;
 
         $entityArguments = array_merge(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
-                'orderByDir' => 'DESC'
-            ),
+                'orderByDir' => 'DESC',
+            ],
             $entityArguments
         );
 
@@ -134,25 +132,25 @@ public function getTokenContent($page = 1, $entityArguments = array(), $viewPara
             $this->bundleName.':SubscribedEvents\BuilderToken:list.html.php',
             array_merge(
                 $viewParameters,
-                array(
+                [
                     'items'       => $items,
                     'page'        => $page,
                     'limit'       => $limit,
                     'totalCount'  => $count,
                     'tmpl'        => $request->get('tmpl', 'index'),
-                    'searchValue' => $search
-                )
+                    'searchValue' => $search,
+                ]
             )
         );
     }
 
     /**
-     * @param string              $tokenRegex     Token regex without wrapping regex escape characters.  Use (value) or (.*?) where the ID of the
-     *                                            entity should go. i.e. {pagelink=(value)}
-     * @param string              $filter         String to filter results by
-     * @param string              $labelColumn    The column that houses the label
-     * @param string              $valueColumn    The column that houses the value
-     * @param CompositeExpression $expr           Use $factory->getDatabase()->getExpressionBuilder()->andX()
+     * @param string              $tokenRegex  Token regex without wrapping regex escape characters.  Use (value) or (.*?) where the ID of the
+     *                                         entity should go. i.e. {pagelink=(value)}
+     * @param string              $filter      String to filter results by
+     * @param string              $labelColumn The column that houses the label
+     * @param string              $valueColumn The column that houses the value
+     * @param CompositeExpression $expr        Use $factory->getDatabase()->getExpressionBuilder()->andX()
      *
      * @return array|void
      */
@@ -166,7 +164,7 @@ public function getTokens(
         //set some permissions
         $permissions = $this->factory->getSecurity()->isGranted(
             $this->permissionSet,
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if (count(array_unique($permissions)) == 1 && end($permissions) == false) {
@@ -195,18 +193,18 @@ public function getTokens(
                 $exprBuilder->like('LOWER('.$labelColumn.')', ':label')
             );
 
-            $parameters = array(
-                'label' => strtolower($filter).'%'
-            );
+            $parameters = [
+                'label' => strtolower($filter).'%',
+            ];
         } else {
-            $parameters = array();
+            $parameters = [];
         }
 
         $items = $repo->getSimpleList($expr, $parameters, $labelColumn, $valueColumn);
 
-        $tokens = array();
+        $tokens = [];
         foreach ($items as $item) {
-            $token          = str_replace(array('(value)', '(.*?)'), $item['value'], $tokenRegex);
+            $token          = str_replace(['(value)', '(.*?)'], $item['value'], $tokenRegex);
             $tokens[$token] = $item['label'];
         }
 
@@ -214,7 +212,7 @@ public function getTokens(
     }
 
     /**
-     * Override default permission set of viewown and viewother
+     * Override default permission set of viewown and viewother.
      *
      * @param array $permissions
      */
@@ -227,7 +225,7 @@ public function setPermissionSet(array $permissions)
      * @param $content
      * @param $encodeTokensInUrls
      */
-    static public function replaceVisualPlaceholdersWithTokens(&$content, $encodeTokensInUrls = array('leadfield'))
+    public static function replaceVisualPlaceholdersWithTokens(&$content, $encodeTokensInUrls = ['leadfield'])
     {
         if (is_array($content)) {
             foreach ($content as &$slot) {
@@ -245,21 +243,21 @@ static public function replaceVisualPlaceholdersWithTokens(&$content, $encodeTok
     }
 
     /**
-     * Prevent tokens in URLs from being converted to visual tokens by encoding the brackets
+     * Prevent tokens in URLs from being converted to visual tokens by encoding the brackets.
      *
      * @param string $content
      * @param array  $tokenKeys
      */
-    static public function encodeUrlTokens(&$content, array $tokenKeys)
+    public static function encodeUrlTokens(&$content, array $tokenKeys)
     {
-        $processMatches = function($matches) use (&$content, $tokenKeys) {
+        $processMatches = function ($matches) use (&$content, $tokenKeys) {
             foreach ($matches as $link) {
                 // There may be more than one leadfield token in the URL
                 preg_match_all('/{['.implode('|', $tokenKeys).'].*?}/i', $link, $tokens);
                 $newLink = $link;
                 foreach ($tokens as $token) {
                     // Encode brackets
-                    $encodedToken = str_replace(array('{', '}'), array('%7B', '%7D'), $token);
+                    $encodedToken = str_replace(['{', '}'], ['%7B', '%7D'], $token);
                     $newLink      = str_replace($token, $encodedToken, $newLink);
                 }
                 $content = str_replace($link, $newLink, $content);
@@ -286,7 +284,7 @@ static public function encodeUrlTokens(&$content, array $tokenKeys)
      *
      * @return string
      */
-    static public function getVisualTokenHtml($token, $description, $forPregReplace = false)
+    public static function getVisualTokenHtml($token, $description, $forPregReplace = false)
     {
         if ($forPregReplace) {
             return preg_quote('<strong contenteditable="false" data-token="', '/').'(.*?)'.preg_quote('">**', '/')
diff --git a/app/bundles/CoreBundle/Helper/BundleHelper.php b/app/bundles/CoreBundle/Helper/BundleHelper.php
index cd6c494143a..b3713f8994c 100644
--- a/app/bundles/CoreBundle/Helper/BundleHelper.php
+++ b/app/bundles/CoreBundle/Helper/BundleHelper.php
@@ -1,17 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
+
 use Symfony\Component\HttpKernel\Kernel;
 
 /**
- * Class BundleHelper
+ * Class BundleHelper.
  */
 class BundleHelper
 {
@@ -27,24 +29,25 @@ class BundleHelper
 
     /**
      * BundleHelper constructor.
-     * 
+     *
      * @param CoreParametersHelper $coreParametersHelper
-     * @param Kernel $kernel
+     * @param Kernel               $kernel
      */
     public function __construct(CoreParametersHelper $coreParametersHelper, Kernel $kernel)
     {
         $this->coreParametersHelper = $coreParametersHelper;
-        $this->kernel = $kernel;
+        $this->kernel               = $kernel;
     }
 
     /**
      * @param bool $includePlugins
+     *
      * @return mixed
      */
     public function getMauticBundles($includePlugins = true)
     {
         $bundles = $this->coreParametersHelper->getParameter('mautic.bundles');
-        
+
         if ($includePlugins) {
             $plugins = $this->coreParametersHelper->getParameter('mautic.plugin.bundles');
             $bundles = array_merge($bundles, $plugins);
@@ -54,7 +57,7 @@ public function getMauticBundles($includePlugins = true)
     }
 
     /**
-     * Get's an array of details for enabled Mautic plugins
+     * Get's an array of details for enabled Mautic plugins.
      *
      * @return array
      */
@@ -64,13 +67,14 @@ public function getPluginBundles()
     }
 
     /**
-     * Gets an array of a specific bundle's config settings
+     * Gets an array of a specific bundle's config settings.
      *
      * @param        $bundleName
      * @param string $configKey
      * @param bool   $includePlugins
      *
      * @return mixed
+     *
      * @throws \Exception
      */
     public function getBundleConfig($bundleName, $configKey = '', $includePlugins = false)
diff --git a/app/bundles/CoreBundle/Helper/CacheHelper.php b/app/bundles/CoreBundle/Helper/CacheHelper.php
index 98f1ac753d8..e7d191c1e67 100644
--- a/app/bundles/CoreBundle/Helper/CacheHelper.php
+++ b/app/bundles/CoreBundle/Helper/CacheHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,9 +17,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
- * Class CacheHelper
- *
- * @package Mautic\CoreBundle\Helper
+ * Class CacheHelper.
  */
 class CacheHelper
 {
@@ -45,9 +44,7 @@ public function __construct(MauticFactory $factory)
     }
 
     /**
-     * Clear the application cache and run the warmup routine for the current environment
-     *
-     * @return void
+     * Clear the application cache and run the warmup routine for the current environment.
      */
     public function clearCache()
     {
@@ -62,7 +59,7 @@ public function clearCache()
         //attempt to squash command output
         ob_start();
 
-        $args = array('console', 'cache:clear', '--env=' . $this->env);
+        $args = ['console', 'cache:clear', '--env='.$this->env];
 
         if ($this->env == 'prod') {
             $args[] = '--no-debug';
@@ -71,7 +68,7 @@ public function clearCache()
         $input       = new ArgvInput($args);
         $application = new Application($this->factory->getKernel());
         $application->setAutoExit(false);
-        $output      = new NullOutput();
+        $output = new NullOutput();
         $application->run($input, $output);
 
         if (ob_get_length() > 0) {
@@ -80,7 +77,7 @@ public function clearCache()
     }
 
     /**
-     * Deletes the cache folder
+     * Deletes the cache folder.
      */
     public function nukeCache()
     {
@@ -93,7 +90,7 @@ public function nukeCache()
     }
 
     /**
-     * Delete's the file Symfony caches settings in
+     * Delete's the file Symfony caches settings in.
      *
      * @param bool $configSave
      */
@@ -110,32 +107,32 @@ public function clearContainerFile($configSave = true)
     }
 
     /**
-     * Clears the cache for translations
+     * Clears the cache for translations.
      *
      * @param null $locale
      */
     public function clearTranslationCache($locale = null)
     {
         if ($locale) {
-            $localeCache = $this->cacheDir . '/translations/catalogue.' . $locale . '.php';
+            $localeCache = $this->cacheDir.'/translations/catalogue.'.$locale.'.php';
             if (file_exists($localeCache)) {
                 unlink($localeCache);
             }
         } else {
             $fs = new Filesystem();
-            $fs->remove($this->cacheDir . '/translations');
+            $fs->remove($this->cacheDir.'/translations');
         }
     }
 
     /**
-     * Clears the cache for routing
+     * Clears the cache for routing.
      */
     public function clearRoutingCache()
     {
-        $unlink = array(
+        $unlink = [
             $this->factory->getKernel()->getContainer()->getParameter('router.options.generator.cache_class'),
-            $this->factory->getKernel()->getContainer()->getParameter('router.options.matcher.cache_class')
-        );
+            $this->factory->getKernel()->getContainer()->getParameter('router.options.matcher.cache_class'),
+        ];
 
         foreach ($unlink as $file) {
             if (file_exists($this->cacheDir.'/'.$file.'.php')) {
@@ -145,7 +142,7 @@ public function clearRoutingCache()
     }
 
     /**
-     * Clear cache related session items
+     * Clear cache related session items.
      */
     protected function clearSessionItems()
     {
@@ -156,7 +153,7 @@ protected function clearSessionItems()
     }
 
     /**
-     * Clear opcaches
+     * Clear opcaches.
      *
      * @param bool|false $configSave
      */
@@ -178,4 +175,4 @@ protected function clearOpcaches($configSave = false)
             apc_clear_cache();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/CacheStorageHelper.php b/app/bundles/CoreBundle/Helper/CacheStorageHelper.php
index 3ddce62b6e9..b350a07fbaa 100644
--- a/app/bundles/CoreBundle/Helper/CacheStorageHelper.php
+++ b/app/bundles/CoreBundle/Helper/CacheStorageHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,9 +13,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
- * Class CacheStorageHelper
- *
- * @package Mautic\CoreBundle\Helper
+ * Class CacheStorageHelper.
  */
 class CacheStorageHelper
 {
@@ -33,10 +32,10 @@ class CacheStorageHelper
      */
     public function __construct($cacheDir, $uniqueCacheDir = null)
     {
-        $this->cacheDir = $cacheDir . '/data';
+        $this->cacheDir = $cacheDir.'/data';
 
         if ($uniqueCacheDir) {
-            $this->cacheDir .= '/' . $uniqueCacheDir;
+            $this->cacheDir .= '/'.$uniqueCacheDir;
         }
 
         $this->fs = new Filesystem();
@@ -44,7 +43,7 @@ public function __construct($cacheDir, $uniqueCacheDir = null)
     }
 
     /**
-     * Creates the cache directory if doesn't exist
+     * Creates the cache directory if doesn't exist.
      */
     public function touchDir()
     {
@@ -54,14 +53,14 @@ public function touchDir()
     }
 
     /**
-     * Writes/updates a file in app/cache/{env}/data directory
+     * Writes/updates a file in app/cache/{env}/data directory.
      *
-     * @param  string $fileName
-     * @param  array  $data
+     * @param string $fileName
+     * @param array  $data
      */
     public function set($fileName, $data)
     {
-        $filePath = $this->cacheDir . '/' . $fileName . '.php';
+        $filePath = $this->cacheDir.'/'.$fileName.'.php';
 
         if (is_writable($this->cacheDir)) {
             file_put_contents($filePath, json_encode($data));
@@ -72,8 +71,8 @@ public function set($fileName, $data)
      * Reads a file in app/cache/{env}/data/$filename.
      * If the cache file is expired, it will return false as well as if it doesn't exist.
      *
-     * @param  string  $fileName
-     * @param  integer $maxAge in minutes. 0 == any
+     * @param string $fileName
+     * @param int    $maxAge   in minutes. 0 == any
      *
      * @return array|false
      */
@@ -86,14 +85,12 @@ public function get($fileName, $maxAge = 0)
         $filePath = $this->cacheDir.'/'.$fileName.'.php';
 
         if ($this->fs->exists($filePath)) {
-
             if ($maxAge) {
                 $modifiedAt = filemtime($filePath);
                 $now        = time();
                 $fileAge    = round(($now - $modifiedAt) / 60); // in minutes
 
                 if ($fileAge >= $maxAge) {
-
                     return false;
                 }
             }
@@ -105,7 +102,7 @@ public function get($fileName, $maxAge = 0)
     }
 
     /**
-     * Wipes out the cache directory
+     * Wipes out the cache directory.
      */
     public function clear()
     {
diff --git a/app/bundles/CoreBundle/Helper/Chart/AbstractChart.php b/app/bundles/CoreBundle/Helper/Chart/AbstractChart.php
index bc2837f0588..c0344bc1db2 100644
--- a/app/bundles/CoreBundle/Helper/Chart/AbstractChart.php
+++ b/app/bundles/CoreBundle/Helper/Chart/AbstractChart.php
@@ -1,129 +1,131 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper\Chart;
 
 use Mautic\CoreBundle\Helper\ColorHelper;
-use Doctrine\DBAL\Connection;
 
 /**
- * Class AbstractChart
+ * Class AbstractChart.
  */
 abstract class AbstractChart
 {
     /**
-     * Datasets of the chart
+     * Datasets of the chart.
      *
      * @var array
      */
-    protected $datasets = array();
+    protected $datasets = [];
 
     /**
-     * Labels of the time axe
+     * Labels of the time axe.
      *
      * @var array
      */
-    protected $labels = array();
+    protected $labels = [];
 
     /**
-     * Date from
+     * Date from.
      *
      * @var \DateTime
      */
     protected $dateFrom;
 
     /**
-     * Date to
+     * Date to.
      *
      * @var \DateTime
      */
     protected $dateTo;
 
     /**
-     * Timezone data is requested to be in
+     * Timezone data is requested to be in.
      *
      * @var
      */
     protected $timezone;
 
     /**
-     * Time unit
+     * Time unit.
      *
      * @var string
      */
     protected $unit;
 
     /**
-     * True if unit is H, i, or s
+     * True if unit is H, i, or s.
      *
      * @var bool
      */
     protected $isTimeUnit = false;
 
     /**
-     * amount of items
+     * amount of items.
      *
-     * @var integer
+     * @var int
      */
     protected $amount;
 
     /**
-     * Default Mautic colors
+     * Default Mautic colors.
      *
      * @var array
      */
-    public $colors = array('#4E5D9D', '#00B49C', '#FD9572', '#FDB933', '#757575', '#9C4E5C', '#694535', '#596935');
+    public $colors = ['#4E5D9D', '#00B49C', '#FD9572', '#FDB933', '#757575', '#9C4E5C', '#694535', '#596935'];
 
     /**
-     * Create a DateInterval time unit
+     * Create a DateInterval time unit.
      *
-     * @param  string  $unit
+     * @param string $unit
      *
      * @return \DateInterval
      */
     public function getUnitInterval($unit = null)
     {
-        if (!$unit) $unit = $this->unit;
-        $isTime  = in_array($unit, array('H', 'i', 's')) ? 'T' : '';
-        $toUpper = array('d', 'i');
+        if (!$unit) {
+            $unit = $this->unit;
+        }
+        $isTime  = in_array($unit, ['H', 'i', 's']) ? 'T' : '';
+        $toUpper = ['d', 'i'];
 
         if ($unit == 'i') {
             $unit = 'M';
         }
 
-        return new \DateInterval('P' . $isTime . '1' . strtoupper($unit));
+        return new \DateInterval('P'.$isTime.'1'.strtoupper($unit));
     }
 
     /**
-     * Helper function to shorten/truncate a string
+     * Helper function to shorten/truncate a string.
      *
-     * @param string  $string
-     * @param integer $length
-     * @param string  $append
+     * @param string $string
+     * @param int    $length
+     * @param string $append
      *
      * @return string
      */
-    public static function truncate($string, $length = 100, $append = "...")
+    public static function truncate($string, $length = 100, $append = '...')
     {
         $string = trim($string);
 
         if (strlen($string) > $length) {
             $string = wordwrap($string, $length);
             $string = explode("\n", $string, 2);
-            $string = $string[0] . $append;
+            $string = $string[0].$append;
         }
 
         return $string;
     }
 
     /**
-     * Sets the clones of the date range and validates it
+     * Sets the clones of the date range and validates it.
      *
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
@@ -161,7 +163,7 @@ public function addOneUnitMinusOneSec(\DateTime &$date)
     }
 
     /**
-     * Count amount of time slots of a time unit from a date range
+     * Count amount of time slots of a time unit from a date range.
      *
      * @return int
      */
@@ -173,24 +175,28 @@ public function countAmountFromDateRange()
                 break;
             case 'W':
                 $dayAmount = $this->dateTo->diff($this->dateFrom)->format('%a');
-                $amount = (ceil($dayAmount / 7) + 1);
+                $amount    = (ceil($dayAmount / 7) + 1);
                 break;
             case 'm':
                 $amount = $this->dateTo->diff($this->dateFrom)->format('%y') * 12 + $this->dateTo->diff($this->dateFrom)->format('%m');
 
                 // Add 1 month if there are some days left
-                if ($this->dateTo->diff($this->dateFrom)->format('%d') > 0) $amount++;
+                if ($this->dateTo->diff($this->dateFrom)->format('%d') > 0) {
+                    ++$amount;
+                }
 
                 // Add 1 month if count of days are greater or equal than in date to
-                if ($this->dateFrom->format('d') >= $this->dateTo->format('d')) $amount++;
+                if ($this->dateFrom->format('d') >= $this->dateTo->format('d')) {
+                    ++$amount;
+                }
                 break;
             case 'H':
                 $dateDiff = $this->dateTo->diff($this->dateFrom);
-                $amount = $dateDiff->h + $dateDiff->days * 24;
-                $amount++;
+                $amount   = $dateDiff->h + $dateDiff->days * 24;
+                ++$amount;
                 break;
             default:
-                $amount = ($this->dateTo->diff($this->dateFrom)->format('%' . $this->unit) + 1);
+                $amount = ($this->dateTo->diff($this->dateFrom)->format('%'.$this->unit) + 1);
                 break;
         }
 
@@ -198,7 +204,7 @@ public function countAmountFromDateRange()
     }
 
     /**
-     * Returns appropriate time unit from a date range so the line/bar charts won't be too full/empty
+     * Returns appropriate time unit from a date range so the line/bar charts won't be too full/empty.
      *
      * @param $dateFrom
      * @param $dateTo
@@ -210,24 +216,32 @@ public function getTimeUnitFromDateRange($dateFrom, $dateTo)
         $diff = $dateTo->diff($dateFrom)->format('%a');
         $unit = 'd';
 
-        if ($diff <= 1) $unit = 'H';
-        if ($diff > 31) $unit = 'W';
-        if ($diff > 100) $unit = 'm';
-        if ($diff > 1000) $unit = 'Y';
+        if ($diff <= 1) {
+            $unit = 'H';
+        }
+        if ($diff > 31) {
+            $unit = 'W';
+        }
+        if ($diff > 100) {
+            $unit = 'm';
+        }
+        if ($diff > 1000) {
+            $unit = 'Y';
+        }
 
         return $unit;
     }
 
     /**
-     * Generate unique color for the dataset
+     * Generate unique color for the dataset.
      *
-     * @param  integer  $datasetId
+     * @param int $datasetId
      *
      * @return ColorHelper
      */
     public function configureColorHelper($datasetId)
     {
-        $colorHelper = new ColorHelper;
+        $colorHelper = new ColorHelper();
 
         if (isset($this->colors[$datasetId])) {
             $color = $colorHelper->setHex($this->colors[$datasetId]);
diff --git a/app/bundles/CoreBundle/Helper/Chart/BarChart.php b/app/bundles/CoreBundle/Helper/Chart/BarChart.php
index 73e7409eef7..3fc66645a2d 100644
--- a/app/bundles/CoreBundle/Helper/Chart/BarChart.php
+++ b/app/bundles/CoreBundle/Helper/Chart/BarChart.php
@@ -1,24 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper\Chart;
 
-use Mautic\CoreBundle\Helper\Chart\AbstactChart;
-use Mautic\CoreBundle\Helper\Chart\ChartInterface;
-
 /**
- * Class BarChart
+ * Class BarChart.
  */
 class BarChart extends AbstractChart implements ChartInterface
 {
     /**
-     * Defines the basic chart values, generates the time axe labels from it
+     * Defines the basic chart values, generates the time axe labels from it.
      *
      * @param array $labels
      */
@@ -28,47 +26,49 @@ public function __construct(array $labels)
     }
 
     /**
-     * Render chart data
+     * Render chart data.
      */
-    public function render() {
+    public function render()
+    {
         ksort($this->datasets);
-        return array(
+
+        return [
             'labels'   => $this->labels,
-            'datasets' => $this->datasets
-        );
+            'datasets' => $this->datasets,
+        ];
     }
 
     /**
      * Define a dataset by name and data. Method will add the rest.
      *
-     * @param  string  $label
-     * @param  array   $data
-     * @param  integer $order
+     * @param string $label
+     * @param array  $data
+     * @param int    $order
      *
      * @return $this
      */
-    public function setDataset($label = null, array $data, $order = null)
+    public function setDataset($label, array $data, $order = null)
     {
         $datasetId = count($this->datasets);
 
-        $baseData = array(
+        $baseData = [
             'label' => $label,
             'data'  => $data,
-        );
+        ];
 
         if ($order === null) {
             $order = count($this->datasets);
         }
-        
+
         $this->datasets[$order] = array_merge($baseData, $this->generateColors($datasetId));
 
         return $this;
     }
 
     /**
-     * Generate unique color for the dataset
+     * Generate unique color for the dataset.
      *
-     * @param  integer  $datasetId
+     * @param int $datasetId
      *
      * @return array
      */
@@ -76,12 +76,12 @@ public function generateColors($datasetId)
     {
         $color = $this->configureColorHelper($datasetId);
 
-        return array(
-            'fill' => true,
+        return [
+            'fill'                      => true,
             'backgroundColor'           => $color->toRgba(0.7),
             'borderColor'               => $color->toRgba(0.8),
             'pointHoverBackgroundColor' => $color->toRgba(0.9),
-            'pointHoverBorderColor'     => $color->toRgba(1)
-        );
+            'pointHoverBorderColor'     => $color->toRgba(1),
+        ];
     }
 }
diff --git a/app/bundles/CoreBundle/Helper/Chart/ChartInterface.php b/app/bundles/CoreBundle/Helper/Chart/ChartInterface.php
index 7983b699637..9832d93dd06 100644
--- a/app/bundles/CoreBundle/Helper/Chart/ChartInterface.php
+++ b/app/bundles/CoreBundle/Helper/Chart/ChartInterface.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper\Chart;
 
 /**
- * Class ChartInterface
+ * Class ChartInterface.
  */
 interface ChartInterface
 {
     /**
-     * Render the chart data
+     * Render the chart data.
      */
     public function render();
 }
diff --git a/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php b/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php
index 34d62ade293..3de5378bfc5 100644
--- a/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php
+++ b/app/bundles/CoreBundle/Helper/Chart/ChartQuery.php
@@ -1,35 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper\Chart;
 
-use Mautic\CoreBundle\Helper\Chart\AbstactChart;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
 
 /**
- * Class ChartQuery
+ * Class ChartQuery.
  *
  * Methods to get the chart data as native queries to get better performance and work with date/time native SQL queries.
  */
 class ChartQuery extends AbstractChart
 {
     /**
-     * Doctrine's Connetion object
+     * Doctrine's Connetion object.
      *
-     * @var  Connection $connection
+     * @var Connection
      */
     protected $connection;
 
     /**
      * Match date/time unit to a SQL datetime format
-     * {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}.
      *
      * @var array
      */
@@ -48,7 +48,7 @@ class ChartQuery extends AbstractChart
     /**
      * Match date/time unit to a MySql datetime format
      * {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
-     * {@link dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html#function_date-format}
+     * {@link dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html#function_date-format}.
      *
      * @var array
      */
@@ -61,16 +61,16 @@ class ChartQuery extends AbstractChart
         'W' => '%Y %U',
         'm' => '%Y-%m',
         'M' => '%Y-%m', // ('M' is BC. Can be removed when all charts use this class)
-        'Y' => '%Y'
+        'Y' => '%Y',
     ];
 
     /**
-     * Construct a new ChartQuery object
+     * Construct a new ChartQuery object.
      *
-     * @param  Connection $connection
-     * @param  DateTime   $dateFrom
-     * @param  DateTime   $dateTo
-     * @param  string     $unit
+     * @param Connection $connection
+     * @param DateTime   $dateFrom
+     * @param DateTime   $dateTo
+     * @param string     $unit
      */
     public function __construct(Connection $connection, \DateTime $dateFrom, \DateTime $dateTo, $unit = null)
     {
@@ -81,10 +81,10 @@ public function __construct(Connection $connection, \DateTime $dateFrom, \DateTi
     }
 
     /**
-     * Apply where filters to the query
+     * Apply where filters to the query.
      *
-     * @param  QueryBuilder $query
-     * @param  array        $filters
+     * @param QueryBuilder $query
+     * @param array        $filters
      */
     public function applyFilters(&$query, $filters)
     {
@@ -116,11 +116,11 @@ public function applyFilters(&$query, $filters)
     }
 
     /**
-     * Apply date filters to the query
+     * Apply date filters to the query.
      *
-     * @param  QueryBuilder $query
-     * @param  string       $dateColumn
-     * @param  string       $tablePrefix
+     * @param QueryBuilder $query
+     * @param string       $dateColumn
+     * @param string       $tablePrefix
      */
     public function applyDateFilters(&$query, $dateColumn, $tablePrefix = 't')
     {
@@ -170,9 +170,9 @@ public function applyDateFilters(&$query, $dateColumn, $tablePrefix = 't')
     }
 
     /**
-     * Get the right unit for current database platform
+     * Get the right unit for current database platform.
      *
-     * @param  string $unit {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param string $unit {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      *
      * @return string
      */
@@ -186,11 +186,11 @@ public function translateTimeUnit($unit)
     }
 
     /**
-     * Prepare database query for fetching the line time chart data
+     * Prepare database query for fetching the line time chart data.
      *
-     * @param  string $table   without prefix
-     * @param  string $column  name. The column must be type of datetime
-     * @param  array  $filters will be added to where claues
+     * @param string $table   without prefix
+     * @param string $column  name. The column must be type of datetime
+     * @param array  $filters will be added to where claues
      *
      * @return \Doctrine\DBAL\Query\QueryBuilder
      */
@@ -208,11 +208,11 @@ public function prepareTimeDataQuery($table, $column, $filters = [])
     }
 
     /**
-     * Modify database query for fetching the line time chart data
+     * Modify database query for fetching the line time chart data.
      *
-     * @param  QueryBuilder $query
-     * @param  string       $column name
-     * @param  string       $tablePrefix
+     * @param QueryBuilder $query
+     * @param string       $column      name
+     * @param string       $tablePrefix
      */
     public function modifyTimeDataQuery(&$query, $column, $tablePrefix = 't')
     {
@@ -233,11 +233,11 @@ public function modifyTimeDataQuery(&$query, $column, $tablePrefix = 't')
     }
 
     /**
-     * Fetch data for a time related dataset
+     * Fetch data for a time related dataset.
      *
-     * @param  string $table   without prefix
-     * @param  string $column  name. The column must be type of datetime
-     * @param  array  $filters will be added to where claues
+     * @param string $table   without prefix
+     * @param string $column  name. The column must be type of datetime
+     * @param array  $filters will be added to where claues
      *
      * @return array
      */
@@ -249,9 +249,9 @@ public function fetchTimeData($table, $column, $filters = [])
     }
 
     /**
-     * Loads data from prepared query and builds the chart data
+     * Loads data from prepared query and builds the chart data.
      *
-     * @param  QueryBuilder $query
+     * @param QueryBuilder $query
      *
      * @return array
      */
@@ -263,11 +263,11 @@ public function loadAndBuildTimeData($query)
     }
 
     /**
-     * Go through the raw data and add the missing times
+     * Go through the raw data and add the missing times.
      *
-     * @param  string $table   without prefix
-     * @param  string $column  name. The column must be type of datetime
-     * @param  array  $filters will be added to where claues
+     * @param string $table   without prefix
+     * @param string $column  name. The column must be type of datetime
+     * @param array  $filters will be added to where claues
      *
      * @return array
      */
@@ -278,7 +278,7 @@ public function completeTimeData($rawData, $countAverage = false)
         $oneUnit       = $this->getUnitInterval();
         $limit         = $this->countAmountFromDateRange($this->unit);
         $previousDate  = clone $this->dateFrom;
-        $utcTz         = new \DateTimeZone("UTC");
+        $utcTz         = new \DateTimeZone('UTC');
 
         if ($this->unit === 'Y') {
             $previousDate->modify('first day of January');
@@ -289,8 +289,7 @@ public function completeTimeData($rawData, $countAverage = false)
         }
 
         // Convert data from DB to the chart.js format
-        for ($i = 0; $i < $limit; $i++) {
-
+        for ($i = 0; $i < $limit; ++$i) {
             $nextDate = clone $previousDate;
 
             if ($this->unit === 'm') {
@@ -304,13 +303,13 @@ public function completeTimeData($rawData, $countAverage = false)
             foreach ($rawData as $key => &$item) {
                 if (!isset($item['date_comparison'])) {
                     if (!$item['date'] instanceof \DateTime) {
-                        /**
+                        /*
                          * PHP DateTime cannot parse the Y W (ex 2016 09)
                          * format, so we transform it into d-M-Y.
                          */
                         if ($this->unit === 'W' && isset($item['date'])) {
                             list($year, $week) = explode(' ', $item['date']);
-                            $newDate = new \DateTime();
+                            $newDate           = new \DateTime();
                             $newDate->setISODate($year, $week);
                             $item['date'] = $newDate->format('d-M-Y');
                             unset($newDate);
@@ -348,7 +347,7 @@ public function completeTimeData($rawData, $countAverage = false)
                     if (isset($data[$i])) {
                         $data[$i] += $item['data'];
                         if ($countAverage) {
-                            $averageCounts[$i]++;
+                            ++$averageCounts[$i];
                         }
                     } else {
                         $data[$i] = $item['data'];
@@ -384,13 +383,13 @@ public function completeTimeData($rawData, $countAverage = false)
     }
 
     /**
-     * Count occurences of a value in a column
+     * Count occurences of a value in a column.
      *
-     * @param  string $table        without prefix
-     * @param  string $uniqueColumn name
-     * @param  string $dateColumn   name
-     * @param  array  $filters      will be added to where claues
-     * @param  array  $options      for special behavior
+     * @param string $table        without prefix
+     * @param string $uniqueColumn name
+     * @param string $dateColumn   name
+     * @param array  $filters      will be added to where claues
+     * @param array  $options      for special behavior
      *
      * @return QueryBuilder $query
      */
@@ -406,12 +405,12 @@ public function getCountQuery($table, $uniqueColumn, $dateColumn = null, $filter
     }
 
     /**
-     * Modify the query to count occurences of a value in a column
+     * Modify the query to count occurences of a value in a column.
      *
-     * @param  QueryBuilder $table        without prefix
-     * @param  string       $uniqueColumn name
-     * @param  array        $options      for special behavior
-     * @param  string       $tablePrefix
+     * @param QueryBuilder $table        without prefix
+     * @param string       $uniqueColumn name
+     * @param array        $options      for special behavior
+     * @param string       $tablePrefix
      */
     public function modifyCountQuery(QueryBuilder &$query, $uniqueColumn, $options = [], $tablePrefix = 't')
     {
@@ -444,15 +443,15 @@ public function modifyCountQuery(QueryBuilder &$query, $uniqueColumn, $options =
     }
 
     /**
-     * Count occurences of a value in a column
+     * Count occurences of a value in a column.
      *
-     * @param  string $table        without prefix
-     * @param  string $uniqueColumn name
-     * @param  string $dateColumn   name
-     * @param  array  $filters      will be added to where claues
-     * @param  array  $options      for special behavior
+     * @param string $table        without prefix
+     * @param string $uniqueColumn name
+     * @param string $dateColumn   name
+     * @param array  $filters      will be added to where claues
+     * @param array  $options      for special behavior
      *
-     * @return integer
+     * @return int
      */
     public function count($table, $uniqueColumn, $dateColumn = null, $filters = [], $options = [])
     {
@@ -462,11 +461,11 @@ public function count($table, $uniqueColumn, $dateColumn = null, $filters = [],
     }
 
     /**
-     * Fetch the count integet from a query
+     * Fetch the count integet from a query.
      *
-     * @param  QueryBuilder $query
+     * @param QueryBuilder $query
      *
-     * @return integer
+     * @return int
      */
     public function fetchCount(QueryBuilder $query)
     {
@@ -476,15 +475,15 @@ public function fetchCount(QueryBuilder $query)
     }
 
     /**
-     * Get the query to count how many rows is between a range of date diff in seconds
+     * Get the query to count how many rows is between a range of date diff in seconds.
      *
-     * @param  string  $table   without prefix
-     * @param  string  $dateColumn1
-     * @param  string  $dateColumn2
-     * @param  integer $startSecond
-     * @param  integer $endSecond
-     * @param  array   $filters will be added to where claues
-     * @param  string  $tablePrefix
+     * @param string $table       without prefix
+     * @param string $dateColumn1
+     * @param string $dateColumn2
+     * @param int    $startSecond
+     * @param int    $endSecond
+     * @param array  $filters     will be added to where claues
+     * @param string $tablePrefix
      *
      * @return QueryBuilder $query
      */
@@ -500,15 +499,15 @@ public function getCountDateDiffQuery($table, $dateColumn1, $dateColumn2, $start
     }
 
     /**
-     * Modify the query to count how many rows is between a range of date diff in seconds
+     * Modify the query to count how many rows is between a range of date diff in seconds.
      *
-     * @param  QueryBuilder $query
-     * @param  string       $dateColumn1
-     * @param  string       $dateColumn2
-     * @param  integer      $startSecond
-     * @param  integer      $endSecond
-     * @param  array        $filters will be added to where claues
-     * @param  string       $tablePrefix
+     * @param QueryBuilder $query
+     * @param string       $dateColumn1
+     * @param string       $dateColumn2
+     * @param int          $startSecond
+     * @param int          $endSecond
+     * @param array        $filters     will be added to where claues
+     * @param string       $tablePrefix
      */
     public function modifyCountDateDiffQuery(QueryBuilder &$query, $dateColumn1, $dateColumn2, $startSecond = 0, $endSecond = 60, $tablePrefix = 't')
     {
@@ -521,11 +520,11 @@ public function modifyCountDateDiffQuery(QueryBuilder &$query, $dateColumn1, $da
     }
 
     /**
-     * Count how many rows is between a range of date diff in seconds
+     * Count how many rows is between a range of date diff in seconds.
      *
-     * @param  string $query
+     * @param string $query
      *
-     * @return integer
+     * @return int
      */
     public function fetchCountDateDiff($query)
     {
diff --git a/app/bundles/CoreBundle/Helper/Chart/LineChart.php b/app/bundles/CoreBundle/Helper/Chart/LineChart.php
index 69f36e5b7f7..0d4310a8c61 100644
--- a/app/bundles/CoreBundle/Helper/Chart/LineChart.php
+++ b/app/bundles/CoreBundle/Helper/Chart/LineChart.php
@@ -1,26 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper\Chart;
 
-use Mautic\CoreBundle\Helper\Chart\AbstactChart;
-use Mautic\CoreBundle\Helper\Chart\ChartInterface;
-
 /**
- * Class LineChart
+ * Class LineChart.
  *
  * Line chart requires the same data as Bar chart
  */
 class LineChart extends AbstractChart implements ChartInterface
 {
     /**
-     * Configurable date format
+     * Configurable date format.
      *
      * @var string
      */
@@ -28,7 +26,7 @@ class LineChart extends AbstractChart implements ChartInterface
 
     /**
      * Match date/time unit to a humanly readable label
-     * {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}.
      *
      * @var array
      */
@@ -45,9 +43,9 @@ class LineChart extends AbstractChart implements ChartInterface
     ];
 
     /**
-     * Defines the basic chart values, generates the time axe labels from it
+     * Defines the basic chart values, generates the time axe labels from it.
      *
-     * @param string    $unit {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param string    $unit       {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
@@ -65,25 +63,25 @@ public function __construct($unit = null, $dateFrom = null, $dateTo = null, $dat
     }
 
     /**
-     * Render chart data
+     * Render chart data.
      */
     public function render()
     {
         return [
             'labels'   => $this->labels,
-            'datasets' => $this->datasets
+            'datasets' => $this->datasets,
         ];
     }
 
     /**
      * Define a dataset by name and data. Method will add the rest.
      *
-     * @param  string $label
-     * @param  array  $data
+     * @param string $label
+     * @param array  $data
      *
      * @return $this
      */
-    public function setDataset($label = null, array $data)
+    public function setDataset($label, array $data)
     {
         $datasetId = count($this->datasets);
 
@@ -98,9 +96,9 @@ public function setDataset($label = null, array $data)
     }
 
     /**
-     * Generate array of labels from the form data
+     * Generate array of labels from the form data.
      *
-     * @param  integer $amount
+     * @param int $amount
      */
     public function generateTimeLabels($amount)
     {
@@ -112,7 +110,7 @@ public function generateTimeLabels($amount)
         $oneUnit = $this->getUnitInterval();
         $format  = !empty($this->dateFormat) ? $this->dateFormat : $this->labelFormats[$this->unit];
 
-        for ($i = 0; $i < $amount; $i++) {
+        for ($i = 0; $i < $amount; ++$i) {
             $this->labels[] = $date->format($format);
 
             // Special case for months because PHP behaves weird with February
@@ -127,9 +125,9 @@ public function generateTimeLabels($amount)
     }
 
     /**
-     * Generate unique color for the dataset
+     * Generate unique color for the dataset.
      *
-     * @param  integer $datasetId
+     * @param int $datasetId
      *
      * @return array
      */
@@ -141,7 +139,7 @@ public function generateColors($datasetId)
             'backgroundColor'           => $color->toRgba(0.1),
             'borderColor'               => $color->toRgba(0.8),
             'pointHoverBackgroundColor' => $color->toRgba(0.75),
-            'pointHoverBorderColor'     => $color->toRgba(1)
+            'pointHoverBorderColor'     => $color->toRgba(1),
         ];
     }
 }
diff --git a/app/bundles/CoreBundle/Helper/Chart/PieChart.php b/app/bundles/CoreBundle/Helper/Chart/PieChart.php
index e313cf1b12d..4fc6add297f 100644
--- a/app/bundles/CoreBundle/Helper/Chart/PieChart.php
+++ b/app/bundles/CoreBundle/Helper/Chart/PieChart.php
@@ -1,57 +1,55 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper\Chart;
 
-use Mautic\CoreBundle\Helper\Chart\AbstactChart;
-use Mautic\CoreBundle\Helper\Chart\ChartInterface;
-
 /**
- * Class PieChart
+ * Class PieChart.
  */
 class PieChart extends AbstractChart implements ChartInterface
 {
     /**
-     * Holds the suma of the all dataset values
+     * Holds the suma of the all dataset values.
      *
      * @var float
      */
     protected $totalCount = 0;
 
     /**
-     * Render chart data
+     * Render chart data.
      */
     public function render($withCounts = true)
     {
-        $data = array('data' => array(), 'backgroundColor' => array(), 'hoverBackgroundColor' => array());
+        $data = ['data' => [], 'backgroundColor' => [], 'hoverBackgroundColor' => []];
 
         foreach ($this->datasets as $datasetId => $value) {
-            $color = $this->configureColorHelper($datasetId);
-            $data['data'][] = $value;
-            $data['backgroundColor'][] = $color->toRgba(0.8);
+            $color                          = $this->configureColorHelper($datasetId);
+            $data['data'][]                 = $value;
+            $data['backgroundColor'][]      = $color->toRgba(0.8);
             $data['hoverBackgroundColor'][] = $color->toRgba(0.9);
             if ($withCounts) {
                 $this->labels[$datasetId] = $this->buildFullLabel($this->labels[$datasetId], $value);
             }
         }
 
-        return array(
+        return [
             'labels'   => $this->labels,
-            'datasets' => array($data)
-        );
+            'datasets' => [$data],
+        ];
     }
 
     /**
      * Define a dataset by name and count number. Method will add the rest.
      *
-     * @param  string  $label
-     * @param  integer $value
+     * @param string $label
+     * @param int    $value
      *
      * @return $this
      */
@@ -59,23 +57,26 @@ public function setDataset($label, $value)
     {
         $this->totalCount += $value;
         $this->datasets[] = $value;
-        $this->labels[] = $label;
+        $this->labels[]   = $label;
 
         return $this;
     }
 
     /**
-     * Adds to the label also the value and the percentage
+     * Adds to the label also the value and the percentage.
      *
-     * @param  string  $label
-     * @param  integer $value
+     * @param string $label
+     * @param int    $value
      *
      * @return string
      */
     public function buildFullLabel($label, $value)
     {
-        if (!$this->totalCount) return $label;
+        if (!$this->totalCount) {
+            return $label;
+        }
         $percentage = round($value / $this->totalCount * 100, 2);
-        return $label . '; ' . $value . 'x, ' . $percentage . '%';
+
+        return $label.'; '.$value.'x, '.$percentage.'%';
     }
 }
diff --git a/app/bundles/CoreBundle/Helper/ColorHelper.php b/app/bundles/CoreBundle/Helper/ColorHelper.php
index 22c247f1946..8c7de36d7bf 100644
--- a/app/bundles/CoreBundle/Helper/ColorHelper.php
+++ b/app/bundles/CoreBundle/Helper/ColorHelper.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
 /**
- * Helper class for operations with colors
+ * Helper class for operations with colors.
  */
 class ColorHelper
 {
@@ -30,45 +31,48 @@ class ColorHelper
     protected $blue = 0;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param  string in format #xxxxxx or #xxx
      */
-    public function __construct($hex = null) {
+    public function __construct($hex = null)
+    {
         if ($hex) {
             $this->setHex($hex);
         }
     }
 
     /**
-     * Sets random values to RGB properties. It will avoid too black or too wight colors
+     * Sets random values to RGB properties. It will avoid too black or too wight colors.
      *
      * @return ColorHelper
      */
-    public function buildRandomColor() {
-        $this->red = rand(20, 236);
+    public function buildRandomColor()
+    {
+        $this->red   = rand(20, 236);
         $this->green = rand(20, 236);
-        $this->blue = rand(20, 236);
+        $this->blue  = rand(20, 236);
 
         return $this;
     }
 
     /**
-     * Populate color from hexadecimal code
+     * Populate color from hexadecimal code.
      *
      * @param  string in format #xxxxxx or #xxx
      *
      * @return ColorHelper
      */
-    public function setHex($hex) {
+    public function setHex($hex)
+    {
         if (strlen($hex) === 4) {
-            $format = "#%1s%1s%1s";
+            $format          = '#%1s%1s%1s';
             list($r, $g, $b) = sscanf($hex, $format);
-            $this->red = hexdec("$r$r");
-            $this->green = hexdec("$g$g");
-            $this->blue = hexdec("$b$b");
+            $this->red       = hexdec("$r$r");
+            $this->green     = hexdec("$g$g");
+            $this->blue      = hexdec("$b$b");
         } else {
-            $format = "#%2x%2x%2x";
+            $format                                     = '#%2x%2x%2x';
             list($this->red, $this->green, $this->blue) = sscanf($hex, $format);
         }
 
@@ -76,45 +80,48 @@ public function setHex($hex) {
     }
 
     /**
-     * Returns array of [R, G, B] of current state
+     * Returns array of [R, G, B] of current state.
      *
      * @return array
      */
     public function getColorArray()
     {
-        return array($this->red, $this->green, $this->blue);
+        return [$this->red, $this->green, $this->blue];
     }
 
     /**
-     * Returns array of [R, G, B] of current state
+     * Returns array of [R, G, B] of current state.
      *
      * @return string
      */
-    public function toRgb() {
+    public function toRgb()
+    {
         return sprintf('rgb(%d,%d,%d)', $this->red, $this->green, $this->blue);
     }
 
     /**
-     * Returns array of [R, G, B] of current state with alpha
+     * Returns array of [R, G, B] of current state with alpha.
      *
      * @param  float (0 - 1)
      *
      * @return string
      */
-    public function toRgba($alpha = 1) {
+    public function toRgba($alpha = 1)
+    {
         return sprintf('rgba(%d,%d,%d,%g)', $this->red, $this->green, $this->blue, (float) $alpha);
     }
 
     /**
-     * Returns current color to hexadecimal hash
+     * Returns current color to hexadecimal hash.
      *
      * @return string
      */
-    public function toHex() {
-        $hex = "#";
-        $hex .= str_pad(dechex($this->red), 2, "0", STR_PAD_LEFT);
-        $hex .= str_pad(dechex($this->green), 2, "0", STR_PAD_LEFT);
-        $hex .= str_pad(dechex($this->blue), 2, "0", STR_PAD_LEFT);
+    public function toHex()
+    {
+        $hex = '#';
+        $hex .= str_pad(dechex($this->red), 2, '0', STR_PAD_LEFT);
+        $hex .= str_pad(dechex($this->green), 2, '0', STR_PAD_LEFT);
+        $hex .= str_pad(dechex($this->blue), 2, '0', STR_PAD_LEFT);
 
         return $hex;
     }
diff --git a/app/bundles/CoreBundle/Helper/CookieHelper.php b/app/bundles/CoreBundle/Helper/CookieHelper.php
index e8764cd96fc..131cb327e20 100644
--- a/app/bundles/CoreBundle/Helper/CookieHelper.php
+++ b/app/bundles/CoreBundle/Helper/CookieHelper.php
@@ -1,28 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * Class CookieHelper
- *
- * @package Mautic\CoreBundle\Helper
+ * Class CookieHelper.
  */
 class CookieHelper
 {
-    private $path = null;
-    private $domain = null;
-    private $secure = false;
+    private $path     = null;
+    private $domain   = null;
+    private $secure   = false;
     private $httponly = false;
 
     /**
@@ -58,7 +56,6 @@ public function __construct($cookiePath, $cookieDomain, $cookieSecure, $cookieHt
      */
     public function setCookie($name, $value, $expire = 1800, $path = null, $domain = null, $secure = null, $httponly = null)
     {
-
         if ($this->request == null) {
             return true;
         }
@@ -75,7 +72,7 @@ public function setCookie($name, $value, $expire = 1800, $path = null, $domain =
     }
 
     /**
-     * Deletes a cookie by expiring it
+     * Deletes a cookie by expiring it.
      *
      * @param           $name
      * @param null      $path
@@ -87,4 +84,4 @@ public function deleteCookie($name, $path = null, $domain = null, $secure = null
     {
         $this->setCookie($name, '', time() - 3600, $path, $domain, $secure, $httponly);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/CoreParametersHelper.php b/app/bundles/CoreBundle/Helper/CoreParametersHelper.php
index c980e988c40..d09212d8512 100644
--- a/app/bundles/CoreBundle/Helper/CoreParametersHelper.php
+++ b/app/bundles/CoreBundle/Helper/CoreParametersHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\HttpKernel\Kernel;
 
 /**
- * Class CoreParametersHelper
+ * Class CoreParametersHelper.
  */
 class CoreParametersHelper
 {
@@ -24,7 +25,7 @@ class CoreParametersHelper
 
     /**
      * CoreParametersHelper constructor.
-     * 
+     *
      * @param Kernel $kernel
      */
     public function __construct(Kernel $kernel)
@@ -35,7 +36,7 @@ public function __construct(Kernel $kernel)
     /**
      * @param string $name
      * @param mixed  $default
-     * 
+     *
      * @return mixed
      */
     public function getParameter($name, $default = null)
@@ -45,25 +46,25 @@ public function getParameter($name, $default = null)
             return MAUTIC_TABLE_PREFIX;
         }
 
-        if ($this->parameterBag->has('mautic.' . $name)) {
-            return $this->parameterBag->get('mautic.' . $name);
+        if ($this->parameterBag->has('mautic.'.$name)) {
+            return $this->parameterBag->get('mautic.'.$name);
         }
 
         // Last ditch effort in case we're getting non-mautic params
         if ($this->parameterBag->has($name)) {
             return $this->parameterBag->get($name);
         }
-        
+
         return $default;
     }
 
     /**
      * @param string $name
-     * 
+     *
      * @return bool
      */
     public function hasParameter($name)
     {
-        return $this->parameterBag->has('mautic.' . $name);
+        return $this->parameterBag->has('mautic.'.$name);
     }
 }
diff --git a/app/bundles/CoreBundle/Helper/CsvHelper.php b/app/bundles/CoreBundle/Helper/CsvHelper.php
index 46ec26a3155..0828781a9e2 100644
--- a/app/bundles/CoreBundle/Helper/CsvHelper.php
+++ b/app/bundles/CoreBundle/Helper/CsvHelper.php
@@ -1,34 +1,34 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
 /**
- * Class CsvHelper
+ * Class CsvHelper.
  */
 class CsvHelper
 {
-
     /**
      * @param string $filename
      * @param string $delimiter
      *
      * @return array
      */
-    public static function csv_to_array($filename='', $delimiter=',')
+    public static function csv_to_array($filename = '', $delimiter = ',')
     {
         if (!file_exists($filename) || !is_readable($filename)) {
             return false;
         }
 
         $header = null;
-        $data   = array();
+        $data   = [];
         if (($handle = fopen($filename, 'r')) !== false) {
             while (($row = fgetcsv($handle, 1000, $delimiter)) !== false) {
                 if (!$header) {
diff --git a/app/bundles/CoreBundle/Helper/DateTimeHelper.php b/app/bundles/CoreBundle/Helper/DateTimeHelper.php
index 1d2d488a53d..0e9e968a1ef 100644
--- a/app/bundles/CoreBundle/Helper/DateTimeHelper.php
+++ b/app/bundles/CoreBundle/Helper/DateTimeHelper.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
 /**
- * Class DateTimeHelper
+ * Class DateTimeHelper.
  */
 class DateTimeHelper
 {
-
     /**
      * @var string
      */
@@ -56,7 +56,7 @@ public function __construct($string = '', $fromFormat = 'Y-m-d H:i:s', $timezone
     }
 
     /**
-     * Sets date/time
+     * Sets date/time.
      *
      * @param \DateTime|string $datetime
      * @param string           $fromFormat
@@ -78,10 +78,10 @@ public function setDateTime($datetime = '', $fromFormat = 'Y-m-d H:i:s', $timezo
 
         if ($datetime instanceof \DateTime) {
             $this->datetime = $datetime;
-            $this->string = $this->datetime->format($fromFormat);
+            $this->string   = $this->datetime->format($fromFormat);
         } elseif (empty($datetime)) {
             $this->datetime = new \DateTime('now', new \DateTimeZone($this->timezone));
-            $this->string = $this->datetime->format($fromFormat);
+            $this->string   = $this->datetime->format($fromFormat);
         } elseif ($fromFormat == null) {
             $this->string   = $datetime;
             $this->datetime = new \DateTime($datetime, new \DateTimeZone($this->timezone));
@@ -96,7 +96,7 @@ public function setDateTime($datetime = '', $fromFormat = 'Y-m-d H:i:s', $timezo
 
             if ($this->datetime === false) {
                 //the format does not match the string so let's attempt to fix that
-                $this->string = date($this->format, strtotime($datetime));
+                $this->string   = date($this->format, strtotime($datetime));
                 $this->datetime = \DateTime::createFromFormat(
                     $this->format,
                     $this->string
@@ -117,6 +117,7 @@ public function toUtcString($format = null)
             if (empty($format)) {
                 $format = $this->format;
             }
+
             return $utc->format($format);
         }
 
@@ -187,6 +188,7 @@ public function getLocalTimestamp()
     {
         if ($this->datetime) {
             $local = $this->datetime->setTimezone($this->local);
+
             return $local->getTimestamp();
         }
 
@@ -200,6 +202,7 @@ public function getUtcTimestamp()
     {
         if ($this->datetime) {
             $utc = $this->datetime->setTimezone($this->utc);
+
             return $utc->getTimestamp();
         }
 
@@ -207,7 +210,7 @@ public function getUtcTimestamp()
     }
 
     /**
-     * Gets a difference
+     * Gets a difference.
      *
      * @param string     $compare
      * @param null       $format
@@ -224,8 +227,8 @@ public function getDiff($compare = 'now', $format = null, $resetTime = false)
         $with = clone $this->datetime;
 
         if ($resetTime) {
-            $compare->setTime( 0, 0, 0 );
-            $with->setTime( 0, 0, 0 );
+            $compare->setTime(0, 0, 0);
+            $with->setTime(0, 0, 0);
         }
 
         $interval = $compare->diff($with);
@@ -234,10 +237,10 @@ public function getDiff($compare = 'now', $format = null, $resetTime = false)
     }
 
     /**
-     * Add to datetime
+     * Add to datetime.
      *
      * @param            $intervalString
-     * @param bool|false $clone             If true, return a new \DateTime rather than update current one
+     * @param bool|false $clone          If true, return a new \DateTime rather than update current one
      *
      * @return \DateTime
      */
@@ -256,10 +259,10 @@ public function add($intervalString, $clone = false)
     }
 
     /**
-     * Subtract from datetime
+     * Subtract from datetime.
      *
      * @param            $intervalString
-     * @param bool|false $clone             If true, return a new \DateTime rather than update current one
+     * @param bool|false $clone          If true, return a new \DateTime rather than update current one
      *
      * @return \DateTime
      */
@@ -278,10 +281,10 @@ public function sub($intervalString, $clone = false)
     }
 
     /**
-     * Modify datetime
+     * Modify datetime.
      *
      * @param            $string
-     * @param bool|false $clone    If true, return a new \DateTime rather than update current one
+     * @param bool|false $clone  If true, return a new \DateTime rather than update current one
      *
      * @return \DateTime
      */
@@ -298,7 +301,7 @@ public function modify($string, $clone = false)
     }
 
     /**
-     * Returns today, yesterday, tomorrow or false if before yesterday or after tomorrow
+     * Returns today, yesterday, tomorrow or false if before yesterday or after tomorrow.
      *
      * @param $interval
      *
@@ -310,9 +313,9 @@ public function getTextDate($interval = null)
             $interval = $this->getDiff('now', null, true);
         }
 
-        $diffDays = (integer) $interval->format( "%R%a" );
+        $diffDays = (int) $interval->format('%R%a');
 
-        switch( $diffDays ) {
+        switch ($diffDays) {
             case 0:
                 return 'today';
             case -1:
diff --git a/app/bundles/CoreBundle/Helper/EmojiHelper.php b/app/bundles/CoreBundle/Helper/EmojiHelper.php
index 0129d4ee918..90aa8e26191 100644
--- a/app/bundles/CoreBundle/Helper/EmojiHelper.php
+++ b/app/bundles/CoreBundle/Helper/EmojiHelper.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
 /**
- * Helper class for Emoji unicodes
+ * Helper class for Emoji unicodes.
  *
  * Build from modified https://github.com/iamcal/php-emoji
  */
 class EmojiHelper
 {
     /**
-     * Convert to html
+     * Convert to html.
      *
      * @param $text
      * @param $from
@@ -30,7 +31,7 @@ public static function toHtml($text, $from = 'emoji')
     }
 
     /**
-     * Convert to emoji
+     * Convert to emoji.
      *
      * @param $text
      * @param $from
@@ -43,7 +44,7 @@ public static function toEmoji($text, $from = 'html')
     }
 
     /**
-     * Convert to short code
+     * Convert to short code.
      *
      * @param        $text
      * @param string $from
@@ -56,7 +57,7 @@ public static function toShort($text, $from = 'emoji')
     }
 
     /**
-     * Converts emojis
+     * Converts emojis.
      *
      * @param $text
      * @param $from
@@ -66,7 +67,7 @@ public static function toShort($text, $from = 'emoji')
      */
     private static function emojiConvert($text, $from, $to)
     {
-        $maps = array();
+        $maps = [];
         switch ($from) {
             case 'html':
                 switch ($to) {
@@ -111,19 +112,19 @@ private static function emojiConvert($text, $from, $to)
             // Parse out missed emojis
             $text = self::removeEmoji($text);
         }
+
         return $text;
     }
 
     /**
-     * Remove emojis from text
+     * Remove emojis from text.
      *
      * @param $text
      *
      * @return mixed
      */
-    static private function removeEmoji($text)
+    private static function removeEmoji($text)
     {
-
         return preg_replace('/([0-9#][\x{20E3}])|[\x{00ae}\x{00a9}\x{203C}\x{2047}\x{2048}\x{2049}\x{3030}\x{303D}\x{2139}\x{2122}\x{3297}\x{3299}][\x{FE00}-\x{FEFF}]?|[\x{2190}-\x{21FF}][\x{FE00}-\x{FEFF}]?|[\x{2300}-\x{23FF}][\x{FE00}-\x{FEFF}]?|[\x{2460}-\x{24FF}][\x{FE00}-\x{FEFF}]?|[\x{25A0}-\x{25FF}][\x{FE00}-\x{FEFF}]?|[\x{2600}-\x{27BF}][\x{FE00}-\x{FEFF}]?|[\x{2900}-\x{297F}][\x{FE00}-\x{FEFF}]?|[\x{2B00}-\x{2BF0}][\x{FE00}-\x{FEFF}]?|[\x{1F000}-\x{1F6FF}][\x{FE00}-\x{FEFF}]?/u', '', $text);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/EmojiMap/HtmlToUnicodeEmojiMap.php b/app/bundles/CoreBundle/Helper/EmojiMap/HtmlToUnicodeEmojiMap.php
index 127983b0867..cd06bd833a9 100644
--- a/app/bundles/CoreBundle/Helper/EmojiMap/HtmlToUnicodeEmojiMap.php
+++ b/app/bundles/CoreBundle/Helper/EmojiMap/HtmlToUnicodeEmojiMap.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * This class will kill some IDEs so best to not parse these as PHP
@@ -13,7 +14,7 @@
 
 class HtmlToUnicodeEmojiMap
 {
-    static public $map = [
+    public static $map = [
         "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>"                                  => "\xc2\xa9",
         "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>"                                  => "\xc2\xae",
         "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>"                                => "\xe2\x80\xbc",
@@ -1314,4 +1315,4 @@ class HtmlToUnicodeEmojiMap
         "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d2764fe0f200d1f469\x22></span></span>"          => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9",
         "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d2764fe0f200d1f48b200d1f469\x22></span></span>" => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9",
     ];
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/EmojiMap/ShortToUnicodeEmojiMap.php b/app/bundles/CoreBundle/Helper/EmojiMap/ShortToUnicodeEmojiMap.php
index 6a0a2f797d2..6d38c90bf32 100644
--- a/app/bundles/CoreBundle/Helper/EmojiMap/ShortToUnicodeEmojiMap.php
+++ b/app/bundles/CoreBundle/Helper/EmojiMap/ShortToUnicodeEmojiMap.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * This class will kill some IDEs so best to not parse these as PHP
@@ -11,1349 +12,1350 @@
 
 namespace Mautic\CoreBundle\Helper\EmojiMap;
 
-class ShortToUnicodeEmojiMap {
-      static public $map = [
-            ":copyright:"=>"\xc2\xa9",
-            ":registered:"=>"\xc2\xae",
-            ":bangbang:"=>"\xe2\x80\xbc",
-            ":interrobang:"=>"\xe2\x81\x89",
-            ":tm:"=>"\xe2\x84\xa2",
-            ":information_source:"=>"\xe2\x84\xb9",
-            ":left_right_arrow:"=>"\xe2\x86\x94",
-            ":arrow_up_down:"=>"\xe2\x86\x95",
-            ":arrow_upper_left:"=>"\xe2\x86\x96",
-            ":arrow_upper_right:"=>"\xe2\x86\x97",
-            ":arrow_lower_right:"=>"\xe2\x86\x98",
-            ":arrow_lower_left:"=>"\xe2\x86\x99",
-            ":leftwards_arrow_with_hook:"=>"\xe2\x86\xa9",
-            ":arrow_right_hook:"=>"\xe2\x86\xaa",
-            ":watch:"=>"\xe2\x8c\x9a",
-            ":hourglass:"=>"\xe2\x8c\x9b",
-            ":keyboard:"=>"\xe2\x8c\xa8",
-            ":fast_forward:"=>"\xe2\x8f\xa9",
-            ":rewind:"=>"\xe2\x8f\xaa",
-            ":arrow_double_up:"=>"\xe2\x8f\xab",
-            ":arrow_double_down:"=>"\xe2\x8f\xac",
-            ":black_right_pointing_double_triangle_with_vertical_bar:"=>"\xe2\x8f\xad",
-            ":black_left_pointing_double_triangle_with_vertical_bar:"=>"\xe2\x8f\xae",
-            ":black_right_pointing_triangle_with_double_vertical_bar:"=>"\xe2\x8f\xaf",
-            ":alarm_clock:"=>"\xe2\x8f\xb0",
-            ":stopwatch:"=>"\xe2\x8f\xb1",
-            ":timer_clock:"=>"\xe2\x8f\xb2",
-            ":hourglass_flowing_sand:"=>"\xe2\x8f\xb3",
-            ":double_vertical_bar:"=>"\xe2\x8f\xb8",
-            ":black_square_for_stop:"=>"\xe2\x8f\xb9",
-            ":black_circle_for_record:"=>"\xe2\x8f\xba",
-            ":m:"=>"\xe2\x93\x82",
-            ":black_small_square:"=>"\xe2\x96\xaa",
-            ":white_small_square:"=>"\xe2\x96\xab",
-            ":arrow_forward:"=>"\xe2\x96\xb6",
-            ":arrow_backward:"=>"\xe2\x97\x80",
-            ":white_medium_square:"=>"\xe2\x97\xbb",
-            ":black_medium_square:"=>"\xe2\x97\xbc",
-            ":white_medium_small_square:"=>"\xe2\x97\xbd",
-            ":black_medium_small_square:"=>"\xe2\x97\xbe",
-            ":sunny:"=>"\xe2\x98\x80",
-            ":cloud:"=>"\xe2\x98\x81",
-            ":umbrella:"=>"\xe2\x98\x94",
-            ":showman:"=>"\xe2\x98\x83",
-            ":comet:"=>"\xe2\x98\x84",
-            ":phone:"=>"\xe2\x98\x8e",
-            ":telephone:"=>"\xe2\x98\x8e",
-            ":ballot_box_with_check:"=>"\xe2\x98\x91",
-            ":coffee:"=>"\xe2\x98\x95",
-            ":shamrock:"=>"\xe2\x98\x98",
-            ":point_up:"=>"\xe2\x98\x9d",
-            ":skull_and_crossbones:"=>"\xe2\x98\xa0",
-            ":radioactive_sign:"=>"\xe2\x98\xa2",
-            ":biohazard_sign:"=>"\xe2\x98\xa3",
-            ":orthodox_cross:"=>"\xe2\x98\xa6",
-            ":star_and_crescent:"=>"\xe2\x98\xaa",
-            ":peace_symbol:"=>"\xe2\x98\xae",
-            ":yin_yang:"=>"\xe2\x98\xaf",
-            ":wheel_of_dharma:"=>"\xe2\x98\xb8",
-            ":white_frowning_face:"=>"\xe2\x98\xb9",
-            ":relaxed:"=>"\xe2\x98\xba",
-            ":aries:"=>"\xe2\x99\x88",
-            ":taurus:"=>"\xe2\x99\x89",
-            ":gemini:"=>"\xe2\x99\x8a",
-            ":cancer:"=>"\xe2\x99\x8b",
-            ":leo:"=>"\xe2\x99\x8c",
-            ":virgo:"=>"\xe2\x99\x8d",
-            ":libra:"=>"\xe2\x99\x8e",
-            ":scorpius:"=>"\xe2\x99\x8f",
-            ":sagittarius:"=>"\xe2\x99\x90",
-            ":capricorn:"=>"\xe2\x99\x91",
-            ":aquarius:"=>"\xe2\x99\x92",
-            ":pisces:"=>"\xe2\x99\x93",
-            ":spades:"=>"\xe2\x99\xa0",
-            ":clubs:"=>"\xe2\x99\xa3",
-            ":hearts:"=>"\xe2\x99\xa5",
-            ":diamonds:"=>"\xe2\x99\xa6",
-            ":hotsprings:"=>"\xe2\x99\xa8",
-            ":recycle:"=>"\xe2\x99\xbb",
-            ":wheelchair:"=>"\xe2\x99\xbf",
-            ":hammer_and_pick:"=>"\xe2\x9a\x92",
-            ":anchor:"=>"\xe2\x9a\x93",
-            ":crossed_swords:"=>"\xe2\x9a\x94",
-            ":scales:"=>"\xe2\x9a\x96",
-            ":alembic:"=>"\xe2\x9a\x97",
-            ":gear:"=>"\xe2\x9a\x99",
-            ":atom_symbol:"=>"\xe2\x9a\x9b",
-            ":fleur_de_lis:"=>"\xe2\x9a\x9c",
-            ":warning:"=>"\xe2\x9a\xa0",
-            ":zap:"=>"\xe2\x9a\xa1",
-            ":white_circle:"=>"\xe2\x9a\xaa",
-            ":black_circle:"=>"\xe2\x9a\xab",
-            ":coffin:"=>"\xe2\x9a\xb0",
-            ":funeral_urn:"=>"\xe2\x9a\xb1",
-            ":soccer:"=>"\xe2\x9a\xbd",
-            ":baseball:"=>"\xe2\x9a\xbe",
-            ":snowman:"=>"\xe2\x9b\x84",
-            ":partly_sunny:"=>"\xe2\x9b\x85",
-            ":thunder_cloud_and_rain:"=>"\xe2\x9b\x88",
-            ":ophiuchus:"=>"\xe2\x9b\x8e",
-            ":pick:"=>"\xe2\x9b\x8f",
-            ":helmet_with_white_cross:"=>"\xe2\x9b\x91",
-            ":chains:"=>"\xe2\x9b\x93",
-            ":no_entry:"=>"\xe2\x9b\x94",
-            ":shinto_shrine:"=>"\xe2\x9b\xa9",
-            ":church:"=>"\xe2\x9b\xaa",
-            ":mountain:"=>"\xe2\x9b\xb0",
-            ":umbrella_on_ground:"=>"\xe2\x9b\xb1",
-            ":fountain:"=>"\xe2\x9b\xb2",
-            ":golf:"=>"\xe2\x9b\xb3",
-            ":ferry:"=>"\xe2\x9b\xb4",
-            ":boat:"=>"\xe2\x9b\xb5",
-            ":sailboat:"=>"\xe2\x9b\xb5",
-            ":skier:"=>"\xe2\x9b\xb7",
-            ":ice_skate:"=>"\xe2\x9b\xb8",
-            ":person_with_ball:"=>"\xe2\x9b\xb9",
-            ":tent:"=>"\xe2\x9b\xba",
-            ":fuelpump:"=>"\xe2\x9b\xbd",
-            ":scissors:"=>"\xe2\x9c\x82",
-            ":white_check_mark:"=>"\xe2\x9c\x85",
-            ":airplane:"=>"\xe2\x9c\x88",
-            ":email:"=>"\xe2\x9c\x89",
-            ":envelope:"=>"\xe2\x9c\x89",
-            ":fist:"=>"\xe2\x9c\x8a",
-            ":hand:"=>"\xe2\x9c\x8b",
-            ":raised_hand:"=>"\xe2\x9c\x8b",
-            ":v:"=>"\xe2\x9c\x8c",
-            ":writing_hand:"=>"\xe2\x9c\x8d",
-            ":pencil2:"=>"\xe2\x9c\x8f",
-            ":black_nib:"=>"\xe2\x9c\x92",
-            ":heavy_check_mark:"=>"\xe2\x9c\x94",
-            ":heavy_multiplication_x:"=>"\xe2\x9c\x96",
-            ":latin_cross:"=>"\xe2\x9c\x9d",
-            ":star_of_david:"=>"\xe2\x9c\xa1",
-            ":sparkles:"=>"\xe2\x9c\xa8",
-            ":eight_spoked_asterisk:"=>"\xe2\x9c\xb3",
-            ":eight_pointed_black_star:"=>"\xe2\x9c\xb4",
-            ":snowflake:"=>"\xe2\x9d\x84",
-            ":sparkle:"=>"\xe2\x9d\x87",
-            ":x:"=>"\xe2\x9d\x8c",
-            ":negative_squared_cross_mark:"=>"\xe2\x9d\x8e",
-            ":question:"=>"\xe2\x9d\x93",
-            ":grey_question:"=>"\xe2\x9d\x94",
-            ":grey_exclamation:"=>"\xe2\x9d\x95",
-            ":exclamation:"=>"\xe2\x9d\x97",
-            ":heavy_exclamation_mark:"=>"\xe2\x9d\x97",
-            ":heavy_heart_exclamation_mark_ornament:"=>"\xe2\x9d\xa3",
-            ":heart:"=>"\xe2\x9d\xa4",
-            ":heavy_plus_sign:"=>"\xe2\x9e\x95",
-            ":heavy_minus_sign:"=>"\xe2\x9e\x96",
-            ":heavy_division_sign:"=>"\xe2\x9e\x97",
-            ":arrow_right:"=>"\xe2\x9e\xa1",
-            ":curly_loop:"=>"\xe2\x9e\xb0",
-            ":loop:"=>"\xe2\x9e\xbf",
-            ":arrow_heading_up:"=>"\xe2\xa4\xb4",
-            ":arrow_heading_down:"=>"\xe2\xa4\xb5",
-            ":arrow_left:"=>"\xe2\xac\x85",
-            ":arrow_up:"=>"\xe2\xac\x86",
-            ":arrow_down:"=>"\xe2\xac\x87",
-            ":black_large_square:"=>"\xe2\xac\x9b",
-            ":white_large_square:"=>"\xe2\xac\x9c",
-            ":star:"=>"\xe2\xad\x90",
-            ":o:"=>"\xe2\xad\x95",
-            ":wavy_dash:"=>"\xe3\x80\xb0",
-            ":part_alternation_mark:"=>"\xe3\x80\xbd",
-            ":congratulations:"=>"\xe3\x8a\x97",
-            ":secret:"=>"\xe3\x8a\x99",
-            ":mahjong:"=>"\xf0\x9f\x80\x84",
-            ":black_joker:"=>"\xf0\x9f\x83\x8f",
-            ":a:"=>"\xf0\x9f\x85\xb0",
-            ":b:"=>"\xf0\x9f\x85\xb1",
-            ":o2:"=>"\xf0\x9f\x85\xbe",
-            ":parking:"=>"\xf0\x9f\x85\xbf",
-            ":ab:"=>"\xf0\x9f\x86\x8e",
-            ":cl:"=>"\xf0\x9f\x86\x91",
-            ":cool:"=>"\xf0\x9f\x86\x92",
-            ":free:"=>"\xf0\x9f\x86\x93",
-            ":id:"=>"\xf0\x9f\x86\x94",
-            ":new:"=>"\xf0\x9f\x86\x95",
-            ":ng:"=>"\xf0\x9f\x86\x96",
-            ":ok:"=>"\xf0\x9f\x86\x97",
-            ":sos:"=>"\xf0\x9f\x86\x98",
-            ":up:"=>"\xf0\x9f\x86\x99",
-            ":vs:"=>"\xf0\x9f\x86\x9a",
-            ":koko:"=>"\xf0\x9f\x88\x81",
-            ":sa:"=>"\xf0\x9f\x88\x82",
-            ":u7121:"=>"\xf0\x9f\x88\x9a",
-            ":u6307:"=>"\xf0\x9f\x88\xaf",
-            ":u7981:"=>"\xf0\x9f\x88\xb2",
-            ":u7a7a:"=>"\xf0\x9f\x88\xb3",
-            ":u5408:"=>"\xf0\x9f\x88\xb4",
-            ":u6e80:"=>"\xf0\x9f\x88\xb5",
-            ":u6709:"=>"\xf0\x9f\x88\xb6",
-            ":u6708:"=>"\xf0\x9f\x88\xb7",
-            ":u7533:"=>"\xf0\x9f\x88\xb8",
-            ":u5272:"=>"\xf0\x9f\x88\xb9",
-            ":u55b6:"=>"\xf0\x9f\x88\xba",
-            ":ideograph_advantage:"=>"\xf0\x9f\x89\x90",
-            ":accept:"=>"\xf0\x9f\x89\x91",
-            ":cyclone:"=>"\xf0\x9f\x8c\x80",
-            ":foggy:"=>"\xf0\x9f\x8c\x81",
-            ":closed_umbrella:"=>"\xf0\x9f\x8c\x82",
-            ":night_with_stars:"=>"\xf0\x9f\x8c\x83",
-            ":sunrise_over_mountains:"=>"\xf0\x9f\x8c\x84",
-            ":sunrise:"=>"\xf0\x9f\x8c\x85",
-            ":city_sunset:"=>"\xf0\x9f\x8c\x86",
-            ":city_sunrise:"=>"\xf0\x9f\x8c\x87",
-            ":rainbow:"=>"\xf0\x9f\x8c\x88",
-            ":bridge_at_night:"=>"\xf0\x9f\x8c\x89",
-            ":ocean:"=>"\xf0\x9f\x8c\x8a",
-            ":volcano:"=>"\xf0\x9f\x8c\x8b",
-            ":milky_way:"=>"\xf0\x9f\x8c\x8c",
-            ":earth_africa:"=>"\xf0\x9f\x8c\x8d",
-            ":earth_americas:"=>"\xf0\x9f\x8c\x8e",
-            ":earth_asia:"=>"\xf0\x9f\x8c\x8f",
-            ":globe_with_meridians:"=>"\xf0\x9f\x8c\x90",
-            ":new_moon:"=>"\xf0\x9f\x8c\x91",
-            ":waxing_crescent_moon:"=>"\xf0\x9f\x8c\x92",
-            ":first_quarter_moon:"=>"\xf0\x9f\x8c\x93",
-            ":moon:"=>"\xf0\x9f\x8c\x94",
-            ":waxing_gibbous_moon:"=>"\xf0\x9f\x8c\x94",
-            ":full_moon:"=>"\xf0\x9f\x8c\x95",
-            ":waning_gibbous_moon:"=>"\xf0\x9f\x8c\x96",
-            ":last_quarter_moon:"=>"\xf0\x9f\x8c\x97",
-            ":waning_crescent_moon:"=>"\xf0\x9f\x8c\x98",
-            ":crescent_moon:"=>"\xf0\x9f\x8c\x99",
-            ":new_moon_with_face:"=>"\xf0\x9f\x8c\x9a",
-            ":first_quarter_moon_with_face:"=>"\xf0\x9f\x8c\x9b",
-            ":last_quarter_moon_with_face:"=>"\xf0\x9f\x8c\x9c",
-            ":full_moon_with_face:"=>"\xf0\x9f\x8c\x9d",
-            ":sun_with_face:"=>"\xf0\x9f\x8c\x9e",
-            ":star2:"=>"\xf0\x9f\x8c\x9f",
-            ":stars:"=>"\xf0\x9f\x8c\xa0",
-            ":thermometer:"=>"\xf0\x9f\x8c\xa1",
-            ":mostly_sunny:"=>"\xf0\x9f\x8c\xa4",
-            ":sun_small_cloud:"=>"\xf0\x9f\x8c\xa4",
-            ":barely_sunny:"=>"\xf0\x9f\x8c\xa5",
-            ":sun_behind_cloud:"=>"\xf0\x9f\x8c\xa5",
-            ":partly_sunny_rain:"=>"\xf0\x9f\x8c\xa6",
-            ":sun_behind_rain_cloud:"=>"\xf0\x9f\x8c\xa6",
-            ":rain_cloud:"=>"\xf0\x9f\x8c\xa7",
-            ":snow_cloud:"=>"\xf0\x9f\x8c\xa8",
-            ":lightning:"=>"\xf0\x9f\x8c\xa9",
-            ":lightning_cloud:"=>"\xf0\x9f\x8c\xa9",
-            ":tornado:"=>"\xf0\x9f\x8c\xaa",
-            ":tornado_cloud:"=>"\xf0\x9f\x8c\xaa",
-            ":fog:"=>"\xf0\x9f\x8c\xab",
-            ":wind_blowing_face:"=>"\xf0\x9f\x8c\xac",
-            ":hotdog:"=>"\xf0\x9f\x8c\xad",
-            ":taco:"=>"\xf0\x9f\x8c\xae",
-            ":burrito:"=>"\xf0\x9f\x8c\xaf",
-            ":chestnut:"=>"\xf0\x9f\x8c\xb0",
-            ":seedling:"=>"\xf0\x9f\x8c\xb1",
-            ":evergreen_tree:"=>"\xf0\x9f\x8c\xb2",
-            ":deciduous_tree:"=>"\xf0\x9f\x8c\xb3",
-            ":palm_tree:"=>"\xf0\x9f\x8c\xb4",
-            ":cactus:"=>"\xf0\x9f\x8c\xb5",
-            ":hot_pepper:"=>"\xf0\x9f\x8c\xb6",
-            ":tulip:"=>"\xf0\x9f\x8c\xb7",
-            ":cherry_blossom:"=>"\xf0\x9f\x8c\xb8",
-            ":rose:"=>"\xf0\x9f\x8c\xb9",
-            ":hibiscus:"=>"\xf0\x9f\x8c\xba",
-            ":sunflower:"=>"\xf0\x9f\x8c\xbb",
-            ":blossom:"=>"\xf0\x9f\x8c\xbc",
-            ":corn:"=>"\xf0\x9f\x8c\xbd",
-            ":ear_of_rice:"=>"\xf0\x9f\x8c\xbe",
-            ":herb:"=>"\xf0\x9f\x8c\xbf",
-            ":four_leaf_clover:"=>"\xf0\x9f\x8d\x80",
-            ":maple_leaf:"=>"\xf0\x9f\x8d\x81",
-            ":fallen_leaf:"=>"\xf0\x9f\x8d\x82",
-            ":leaves:"=>"\xf0\x9f\x8d\x83",
-            ":mushroom:"=>"\xf0\x9f\x8d\x84",
-            ":tomato:"=>"\xf0\x9f\x8d\x85",
-            ":eggplant:"=>"\xf0\x9f\x8d\x86",
-            ":grapes:"=>"\xf0\x9f\x8d\x87",
-            ":melon:"=>"\xf0\x9f\x8d\x88",
-            ":watermelon:"=>"\xf0\x9f\x8d\x89",
-            ":tangerine:"=>"\xf0\x9f\x8d\x8a",
-            ":lemon:"=>"\xf0\x9f\x8d\x8b",
-            ":banana:"=>"\xf0\x9f\x8d\x8c",
-            ":pineapple:"=>"\xf0\x9f\x8d\x8d",
-            ":apple:"=>"\xf0\x9f\x8d\x8e",
-            ":green_apple:"=>"\xf0\x9f\x8d\x8f",
-            ":pear:"=>"\xf0\x9f\x8d\x90",
-            ":peach:"=>"\xf0\x9f\x8d\x91",
-            ":cherries:"=>"\xf0\x9f\x8d\x92",
-            ":strawberry:"=>"\xf0\x9f\x8d\x93",
-            ":hamburger:"=>"\xf0\x9f\x8d\x94",
-            ":pizza:"=>"\xf0\x9f\x8d\x95",
-            ":meat_on_bone:"=>"\xf0\x9f\x8d\x96",
-            ":poultry_leg:"=>"\xf0\x9f\x8d\x97",
-            ":rice_cracker:"=>"\xf0\x9f\x8d\x98",
-            ":rice_ball:"=>"\xf0\x9f\x8d\x99",
-            ":rice:"=>"\xf0\x9f\x8d\x9a",
-            ":curry:"=>"\xf0\x9f\x8d\x9b",
-            ":ramen:"=>"\xf0\x9f\x8d\x9c",
-            ":spaghetti:"=>"\xf0\x9f\x8d\x9d",
-            ":bread:"=>"\xf0\x9f\x8d\x9e",
-            ":fries:"=>"\xf0\x9f\x8d\x9f",
-            ":sweet_potato:"=>"\xf0\x9f\x8d\xa0",
-            ":dango:"=>"\xf0\x9f\x8d\xa1",
-            ":oden:"=>"\xf0\x9f\x8d\xa2",
-            ":sushi:"=>"\xf0\x9f\x8d\xa3",
-            ":fried_shrimp:"=>"\xf0\x9f\x8d\xa4",
-            ":fish_cake:"=>"\xf0\x9f\x8d\xa5",
-            ":icecream:"=>"\xf0\x9f\x8d\xa6",
-            ":shaved_ice:"=>"\xf0\x9f\x8d\xa7",
-            ":ice_cream:"=>"\xf0\x9f\x8d\xa8",
-            ":doughnut:"=>"\xf0\x9f\x8d\xa9",
-            ":cookie:"=>"\xf0\x9f\x8d\xaa",
-            ":chocolate_bar:"=>"\xf0\x9f\x8d\xab",
-            ":candy:"=>"\xf0\x9f\x8d\xac",
-            ":lollipop:"=>"\xf0\x9f\x8d\xad",
-            ":custard:"=>"\xf0\x9f\x8d\xae",
-            ":honey_pot:"=>"\xf0\x9f\x8d\xaf",
-            ":cake:"=>"\xf0\x9f\x8d\xb0",
-            ":bento:"=>"\xf0\x9f\x8d\xb1",
-            ":stew:"=>"\xf0\x9f\x8d\xb2",
-            ":egg:"=>"\xf0\x9f\x8d\xb3",
-            ":fork_and_knife:"=>"\xf0\x9f\x8d\xb4",
-            ":tea:"=>"\xf0\x9f\x8d\xb5",
-            ":sake:"=>"\xf0\x9f\x8d\xb6",
-            ":wine_glass:"=>"\xf0\x9f\x8d\xb7",
-            ":cocktail:"=>"\xf0\x9f\x8d\xb8",
-            ":tropical_drink:"=>"\xf0\x9f\x8d\xb9",
-            ":beer:"=>"\xf0\x9f\x8d\xba",
-            ":beers:"=>"\xf0\x9f\x8d\xbb",
-            ":baby_bottle:"=>"\xf0\x9f\x8d\xbc",
-            ":knife_fork_plate:"=>"\xf0\x9f\x8d\xbd",
-            ":champagne:"=>"\xf0\x9f\x8d\xbe",
-            ":popcorn:"=>"\xf0\x9f\x8d\xbf",
-            ":ribbon:"=>"\xf0\x9f\x8e\x80",
-            ":gift:"=>"\xf0\x9f\x8e\x81",
-            ":birthday:"=>"\xf0\x9f\x8e\x82",
-            ":jack_o_lantern:"=>"\xf0\x9f\x8e\x83",
-            ":christmas_tree:"=>"\xf0\x9f\x8e\x84",
-            ":santa:"=>"\xf0\x9f\x8e\x85",
-            ":fireworks:"=>"\xf0\x9f\x8e\x86",
-            ":sparkler:"=>"\xf0\x9f\x8e\x87",
-            ":balloon:"=>"\xf0\x9f\x8e\x88",
-            ":tada:"=>"\xf0\x9f\x8e\x89",
-            ":confetti_ball:"=>"\xf0\x9f\x8e\x8a",
-            ":tanabata_tree:"=>"\xf0\x9f\x8e\x8b",
-            ":crossed_flags:"=>"\xf0\x9f\x8e\x8c",
-            ":bamboo:"=>"\xf0\x9f\x8e\x8d",
-            ":dolls:"=>"\xf0\x9f\x8e\x8e",
-            ":flags:"=>"\xf0\x9f\x8e\x8f",
-            ":wind_chime:"=>"\xf0\x9f\x8e\x90",
-            ":rice_scene:"=>"\xf0\x9f\x8e\x91",
-            ":school_satchel:"=>"\xf0\x9f\x8e\x92",
-            ":mortar_board:"=>"\xf0\x9f\x8e\x93",
-            ":medal:"=>"\xf0\x9f\x8e\x96",
-            ":reminder_ribbon:"=>"\xf0\x9f\x8e\x97",
-            ":studio_microphone:"=>"\xf0\x9f\x8e\x99",
-            ":level_slider:"=>"\xf0\x9f\x8e\x9a",
-            ":control_knobs:"=>"\xf0\x9f\x8e\x9b",
-            ":film_frames:"=>"\xf0\x9f\x8e\x9e",
-            ":admission_tickets:"=>"\xf0\x9f\x8e\x9f",
-            ":carousel_horse:"=>"\xf0\x9f\x8e\xa0",
-            ":ferris_wheel:"=>"\xf0\x9f\x8e\xa1",
-            ":roller_coaster:"=>"\xf0\x9f\x8e\xa2",
-            ":fishing_pole_and_fish:"=>"\xf0\x9f\x8e\xa3",
-            ":microphone:"=>"\xf0\x9f\x8e\xa4",
-            ":movie_camera:"=>"\xf0\x9f\x8e\xa5",
-            ":cinema:"=>"\xf0\x9f\x8e\xa6",
-            ":headphones:"=>"\xf0\x9f\x8e\xa7",
-            ":art:"=>"\xf0\x9f\x8e\xa8",
-            ":tophat:"=>"\xf0\x9f\x8e\xa9",
-            ":circus_tent:"=>"\xf0\x9f\x8e\xaa",
-            ":ticket:"=>"\xf0\x9f\x8e\xab",
-            ":clapper:"=>"\xf0\x9f\x8e\xac",
-            ":performing_arts:"=>"\xf0\x9f\x8e\xad",
-            ":video_game:"=>"\xf0\x9f\x8e\xae",
-            ":dart:"=>"\xf0\x9f\x8e\xaf",
-            ":slot_machine:"=>"\xf0\x9f\x8e\xb0",
-            ":8ball:"=>"\xf0\x9f\x8e\xb1",
-            ":game_die:"=>"\xf0\x9f\x8e\xb2",
-            ":bowling:"=>"\xf0\x9f\x8e\xb3",
-            ":flower_playing_cards:"=>"\xf0\x9f\x8e\xb4",
-            ":musical_note:"=>"\xf0\x9f\x8e\xb5",
-            ":notes:"=>"\xf0\x9f\x8e\xb6",
-            ":saxophone:"=>"\xf0\x9f\x8e\xb7",
-            ":guitar:"=>"\xf0\x9f\x8e\xb8",
-            ":musical_keyboard:"=>"\xf0\x9f\x8e\xb9",
-            ":trumpet:"=>"\xf0\x9f\x8e\xba",
-            ":violin:"=>"\xf0\x9f\x8e\xbb",
-            ":musical_score:"=>"\xf0\x9f\x8e\xbc",
-            ":running_shirt_with_sash:"=>"\xf0\x9f\x8e\xbd",
-            ":tennis:"=>"\xf0\x9f\x8e\xbe",
-            ":ski:"=>"\xf0\x9f\x8e\xbf",
-            ":basketball:"=>"\xf0\x9f\x8f\x80",
-            ":checkered_flag:"=>"\xf0\x9f\x8f\x81",
-            ":snowboarder:"=>"\xf0\x9f\x8f\x82",
-            ":runner:"=>"\xf0\x9f\x8f\x83",
-            ":running:"=>"\xf0\x9f\x8f\x83",
-            ":surfer:"=>"\xf0\x9f\x8f\x84",
-            ":sports_medal:"=>"\xf0\x9f\x8f\x85",
-            ":trophy:"=>"\xf0\x9f\x8f\x86",
-            ":horse_racing:"=>"\xf0\x9f\x8f\x87",
-            ":football:"=>"\xf0\x9f\x8f\x88",
-            ":rugby_football:"=>"\xf0\x9f\x8f\x89",
-            ":swimmer:"=>"\xf0\x9f\x8f\x8a",
-            ":weight_lifter:"=>"\xf0\x9f\x8f\x8b",
-            ":golfer:"=>"\xf0\x9f\x8f\x8c",
-            ":racing_motorcycle:"=>"\xf0\x9f\x8f\x8d",
-            ":racing_car:"=>"\xf0\x9f\x8f\x8e",
-            ":cricket_bat_and_ball:"=>"\xf0\x9f\x8f\x8f",
-            ":volleyball:"=>"\xf0\x9f\x8f\x90",
-            ":field_hockey_stick_and_ball:"=>"\xf0\x9f\x8f\x91",
-            ":ice_hockey_stick_and_puck:"=>"\xf0\x9f\x8f\x92",
-            ":table_tennis_paddle_and_ball:"=>"\xf0\x9f\x8f\x93",
-            ":snow_capped_mountain:"=>"\xf0\x9f\x8f\x94",
-            ":camping:"=>"\xf0\x9f\x8f\x95",
-            ":beach_with_umbrella:"=>"\xf0\x9f\x8f\x96",
-            ":building_construction:"=>"\xf0\x9f\x8f\x97",
-            ":house_buildings:"=>"\xf0\x9f\x8f\x98",
-            ":cityscape:"=>"\xf0\x9f\x8f\x99",
-            ":derelict_house_building:"=>"\xf0\x9f\x8f\x9a",
-            ":classical_building:"=>"\xf0\x9f\x8f\x9b",
-            ":desert:"=>"\xf0\x9f\x8f\x9c",
-            ":desert_island:"=>"\xf0\x9f\x8f\x9d",
-            ":national_park:"=>"\xf0\x9f\x8f\x9e",
-            ":stadium:"=>"\xf0\x9f\x8f\x9f",
-            ":house:"=>"\xf0\x9f\x8f\xa0",
-            ":house_with_garden:"=>"\xf0\x9f\x8f\xa1",
-            ":office:"=>"\xf0\x9f\x8f\xa2",
-            ":post_office:"=>"\xf0\x9f\x8f\xa3",
-            ":european_post_office:"=>"\xf0\x9f\x8f\xa4",
-            ":hospital:"=>"\xf0\x9f\x8f\xa5",
-            ":bank:"=>"\xf0\x9f\x8f\xa6",
-            ":atm:"=>"\xf0\x9f\x8f\xa7",
-            ":hotel:"=>"\xf0\x9f\x8f\xa8",
-            ":love_hotel:"=>"\xf0\x9f\x8f\xa9",
-            ":convenience_store:"=>"\xf0\x9f\x8f\xaa",
-            ":school:"=>"\xf0\x9f\x8f\xab",
-            ":department_store:"=>"\xf0\x9f\x8f\xac",
-            ":factory:"=>"\xf0\x9f\x8f\xad",
-            ":izakaya_lantern:"=>"\xf0\x9f\x8f\xae",
-            ":lantern:"=>"\xf0\x9f\x8f\xae",
-            ":japanese_castle:"=>"\xf0\x9f\x8f\xaf",
-            ":european_castle:"=>"\xf0\x9f\x8f\xb0",
-            ":waving_white_flag:"=>"\xf0\x9f\x8f\xb3",
-            ":waving_black_flag:"=>"\xf0\x9f\x8f\xb4",
-            ":rosette:"=>"\xf0\x9f\x8f\xb5",
-            ":label:"=>"\xf0\x9f\x8f\xb7",
-            ":badminton_racquet_and_shuttlecock:"=>"\xf0\x9f\x8f\xb8",
-            ":bow_and_arrow:"=>"\xf0\x9f\x8f\xb9",
-            ":amphora:"=>"\xf0\x9f\x8f\xba",
-            ":skin-tone-2:"=>"\xf0\x9f\x8f\xbb",
-            ":skin-tone-3:"=>"\xf0\x9f\x8f\xbc",
-            ":skin-tone-4:"=>"\xf0\x9f\x8f\xbd",
-            ":skin-tone-5:"=>"\xf0\x9f\x8f\xbe",
-            ":skin-tone-6:"=>"\xf0\x9f\x8f\xbf",
-            ":rat:"=>"\xf0\x9f\x90\x80",
-            ":mouse2:"=>"\xf0\x9f\x90\x81",
-            ":ox:"=>"\xf0\x9f\x90\x82",
-            ":water_buffalo:"=>"\xf0\x9f\x90\x83",
-            ":cow2:"=>"\xf0\x9f\x90\x84",
-            ":tiger2:"=>"\xf0\x9f\x90\x85",
-            ":leopard:"=>"\xf0\x9f\x90\x86",
-            ":rabbit2:"=>"\xf0\x9f\x90\x87",
-            ":cat2:"=>"\xf0\x9f\x90\x88",
-            ":dragon:"=>"\xf0\x9f\x90\x89",
-            ":crocodile:"=>"\xf0\x9f\x90\x8a",
-            ":whale2:"=>"\xf0\x9f\x90\x8b",
-            ":snail:"=>"\xf0\x9f\x90\x8c",
-            ":snake:"=>"\xf0\x9f\x90\x8d",
-            ":racehorse:"=>"\xf0\x9f\x90\x8e",
-            ":ram:"=>"\xf0\x9f\x90\x8f",
-            ":goat:"=>"\xf0\x9f\x90\x90",
-            ":sheep:"=>"\xf0\x9f\x90\x91",
-            ":monkey:"=>"\xf0\x9f\x90\x92",
-            ":rooster:"=>"\xf0\x9f\x90\x93",
-            ":chicken:"=>"\xf0\x9f\x90\x94",
-            ":dog2:"=>"\xf0\x9f\x90\x95",
-            ":pig2:"=>"\xf0\x9f\x90\x96",
-            ":boar:"=>"\xf0\x9f\x90\x97",
-            ":elephant:"=>"\xf0\x9f\x90\x98",
-            ":octopus:"=>"\xf0\x9f\x90\x99",
-            ":shell:"=>"\xf0\x9f\x90\x9a",
-            ":bug:"=>"\xf0\x9f\x90\x9b",
-            ":ant:"=>"\xf0\x9f\x90\x9c",
-            ":bee:"=>"\xf0\x9f\x90\x9d",
-            ":honeybee:"=>"\xf0\x9f\x90\x9d",
-            ":beetle:"=>"\xf0\x9f\x90\x9e",
-            ":fish:"=>"\xf0\x9f\x90\x9f",
-            ":tropical_fish:"=>"\xf0\x9f\x90\xa0",
-            ":blowfish:"=>"\xf0\x9f\x90\xa1",
-            ":turtle:"=>"\xf0\x9f\x90\xa2",
-            ":hatching_chick:"=>"\xf0\x9f\x90\xa3",
-            ":baby_chick:"=>"\xf0\x9f\x90\xa4",
-            ":hatched_chick:"=>"\xf0\x9f\x90\xa5",
-            ":bird:"=>"\xf0\x9f\x90\xa6",
-            ":penguin:"=>"\xf0\x9f\x90\xa7",
-            ":koala:"=>"\xf0\x9f\x90\xa8",
-            ":poodle:"=>"\xf0\x9f\x90\xa9",
-            ":dromedary_camel:"=>"\xf0\x9f\x90\xaa",
-            ":camel:"=>"\xf0\x9f\x90\xab",
-            ":dolphin:"=>"\xf0\x9f\x90\xac",
-            ":flipper:"=>"\xf0\x9f\x90\xac",
-            ":mouse:"=>"\xf0\x9f\x90\xad",
-            ":cow:"=>"\xf0\x9f\x90\xae",
-            ":tiger:"=>"\xf0\x9f\x90\xaf",
-            ":rabbit:"=>"\xf0\x9f\x90\xb0",
-            ":cat:"=>"\xf0\x9f\x90\xb1",
-            ":dragon_face:"=>"\xf0\x9f\x90\xb2",
-            ":whale:"=>"\xf0\x9f\x90\xb3",
-            ":horse:"=>"\xf0\x9f\x90\xb4",
-            ":monkey_face:"=>"\xf0\x9f\x90\xb5",
-            ":dog:"=>"\xf0\x9f\x90\xb6",
-            ":pig:"=>"\xf0\x9f\x90\xb7",
-            ":frog:"=>"\xf0\x9f\x90\xb8",
-            ":hamster:"=>"\xf0\x9f\x90\xb9",
-            ":wolf:"=>"\xf0\x9f\x90\xba",
-            ":bear:"=>"\xf0\x9f\x90\xbb",
-            ":panda_face:"=>"\xf0\x9f\x90\xbc",
-            ":pig_nose:"=>"\xf0\x9f\x90\xbd",
-            ":feet:"=>"\xf0\x9f\x90\xbe",
-            ":paw_prints:"=>"\xf0\x9f\x90\xbe",
-            ":chipmunk:"=>"\xf0\x9f\x90\xbf",
-            ":eyes:"=>"\xf0\x9f\x91\x80",
-            ":eye:"=>"\xf0\x9f\x91\x81",
-            ":ear:"=>"\xf0\x9f\x91\x82",
-            ":nose:"=>"\xf0\x9f\x91\x83",
-            ":lips:"=>"\xf0\x9f\x91\x84",
-            ":tongue:"=>"\xf0\x9f\x91\x85",
-            ":point_up_2:"=>"\xf0\x9f\x91\x86",
-            ":point_down:"=>"\xf0\x9f\x91\x87",
-            ":point_left:"=>"\xf0\x9f\x91\x88",
-            ":point_right:"=>"\xf0\x9f\x91\x89",
-            ":facepunch:"=>"\xf0\x9f\x91\x8a",
-            ":punch:"=>"\xf0\x9f\x91\x8a",
-            ":wave:"=>"\xf0\x9f\x91\x8b",
-            ":ok_hand:"=>"\xf0\x9f\x91\x8c",
-            ":+1:"=>"\xf0\x9f\x91\x8d",
-            ":thumbsup:"=>"\xf0\x9f\x91\x8d",
-            ":-1:"=>"\xf0\x9f\x91\x8e",
-            ":thumbsdown:"=>"\xf0\x9f\x91\x8e",
-            ":clap:"=>"\xf0\x9f\x91\x8f",
-            ":open_hands:"=>"\xf0\x9f\x91\x90",
-            ":crown:"=>"\xf0\x9f\x91\x91",
-            ":womans_hat:"=>"\xf0\x9f\x91\x92",
-            ":eyeglasses:"=>"\xf0\x9f\x91\x93",
-            ":necktie:"=>"\xf0\x9f\x91\x94",
-            ":shirt:"=>"\xf0\x9f\x91\x95",
-            ":tshirt:"=>"\xf0\x9f\x91\x95",
-            ":jeans:"=>"\xf0\x9f\x91\x96",
-            ":dress:"=>"\xf0\x9f\x91\x97",
-            ":kimono:"=>"\xf0\x9f\x91\x98",
-            ":bikini:"=>"\xf0\x9f\x91\x99",
-            ":womans_clothes:"=>"\xf0\x9f\x91\x9a",
-            ":purse:"=>"\xf0\x9f\x91\x9b",
-            ":handbag:"=>"\xf0\x9f\x91\x9c",
-            ":pouch:"=>"\xf0\x9f\x91\x9d",
-            ":mans_shoe:"=>"\xf0\x9f\x91\x9e",
-            ":shoe:"=>"\xf0\x9f\x91\x9e",
-            ":athletic_shoe:"=>"\xf0\x9f\x91\x9f",
-            ":high_heel:"=>"\xf0\x9f\x91\xa0",
-            ":sandal:"=>"\xf0\x9f\x91\xa1",
-            ":boot:"=>"\xf0\x9f\x91\xa2",
-            ":footprints:"=>"\xf0\x9f\x91\xa3",
-            ":bust_in_silhouette:"=>"\xf0\x9f\x91\xa4",
-            ":busts_in_silhouette:"=>"\xf0\x9f\x91\xa5",
-            ":boy:"=>"\xf0\x9f\x91\xa6",
-            ":girl:"=>"\xf0\x9f\x91\xa7",
-            ":man:"=>"\xf0\x9f\x91\xa8",
-            ":woman:"=>"\xf0\x9f\x91\xa9",
-            ":family:"=>"\xf0\x9f\x91\xaa",
-            ":man-woman-boy:"=>"\xf0\x9f\x91\xaa",
-            ":couple:"=>"\xf0\x9f\x91\xab",
-            ":man_and_woman_holding_hands:"=>"\xf0\x9f\x91\xab",
-            ":two_men_holding_hands:"=>"\xf0\x9f\x91\xac",
-            ":two_women_holding_hands:"=>"\xf0\x9f\x91\xad",
-            ":cop:"=>"\xf0\x9f\x91\xae",
-            ":dancers:"=>"\xf0\x9f\x91\xaf",
-            ":bride_with_veil:"=>"\xf0\x9f\x91\xb0",
-            ":person_with_blond_hair:"=>"\xf0\x9f\x91\xb1",
-            ":man_with_gua_pi_mao:"=>"\xf0\x9f\x91\xb2",
-            ":man_with_turban:"=>"\xf0\x9f\x91\xb3",
-            ":older_man:"=>"\xf0\x9f\x91\xb4",
-            ":older_woman:"=>"\xf0\x9f\x91\xb5",
-            ":baby:"=>"\xf0\x9f\x91\xb6",
-            ":construction_worker:"=>"\xf0\x9f\x91\xb7",
-            ":princess:"=>"\xf0\x9f\x91\xb8",
-            ":japanese_ogre:"=>"\xf0\x9f\x91\xb9",
-            ":japanese_goblin:"=>"\xf0\x9f\x91\xba",
-            ":ghost:"=>"\xf0\x9f\x91\xbb",
-            ":angel:"=>"\xf0\x9f\x91\xbc",
-            ":alien:"=>"\xf0\x9f\x91\xbd",
-            ":space_invader:"=>"\xf0\x9f\x91\xbe",
-            ":imp:"=>"\xf0\x9f\x91\xbf",
-            ":skull:"=>"\xf0\x9f\x92\x80",
-            ":information_desk_person:"=>"\xf0\x9f\x92\x81",
-            ":guardsman:"=>"\xf0\x9f\x92\x82",
-            ":dancer:"=>"\xf0\x9f\x92\x83",
-            ":lipstick:"=>"\xf0\x9f\x92\x84",
-            ":nail_care:"=>"\xf0\x9f\x92\x85",
-            ":massage:"=>"\xf0\x9f\x92\x86",
-            ":haircut:"=>"\xf0\x9f\x92\x87",
-            ":barber:"=>"\xf0\x9f\x92\x88",
-            ":syringe:"=>"\xf0\x9f\x92\x89",
-            ":pill:"=>"\xf0\x9f\x92\x8a",
-            ":kiss:"=>"\xf0\x9f\x92\x8b",
-            ":love_letter:"=>"\xf0\x9f\x92\x8c",
-            ":ring:"=>"\xf0\x9f\x92\x8d",
-            ":gem:"=>"\xf0\x9f\x92\x8e",
-            ":couplekiss:"=>"\xf0\x9f\x92\x8f",
-            ":bouquet:"=>"\xf0\x9f\x92\x90",
-            ":couple_with_heart:"=>"\xf0\x9f\x92\x91",
-            ":wedding:"=>"\xf0\x9f\x92\x92",
-            ":heartbeat:"=>"\xf0\x9f\x92\x93",
-            ":broken_heart:"=>"\xf0\x9f\x92\x94",
-            ":two_hearts:"=>"\xf0\x9f\x92\x95",
-            ":sparkling_heart:"=>"\xf0\x9f\x92\x96",
-            ":heartpulse:"=>"\xf0\x9f\x92\x97",
-            ":cupid:"=>"\xf0\x9f\x92\x98",
-            ":blue_heart:"=>"\xf0\x9f\x92\x99",
-            ":green_heart:"=>"\xf0\x9f\x92\x9a",
-            ":yellow_heart:"=>"\xf0\x9f\x92\x9b",
-            ":purple_heart:"=>"\xf0\x9f\x92\x9c",
-            ":gift_heart:"=>"\xf0\x9f\x92\x9d",
-            ":revolving_hearts:"=>"\xf0\x9f\x92\x9e",
-            ":heart_decoration:"=>"\xf0\x9f\x92\x9f",
-            ":diamond_shape_with_a_dot_inside:"=>"\xf0\x9f\x92\xa0",
-            ":bulb:"=>"\xf0\x9f\x92\xa1",
-            ":anger:"=>"\xf0\x9f\x92\xa2",
-            ":bomb:"=>"\xf0\x9f\x92\xa3",
-            ":zzz:"=>"\xf0\x9f\x92\xa4",
-            ":boom:"=>"\xf0\x9f\x92\xa5",
-            ":collision:"=>"\xf0\x9f\x92\xa5",
-            ":sweat_drops:"=>"\xf0\x9f\x92\xa6",
-            ":droplet:"=>"\xf0\x9f\x92\xa7",
-            ":dash:"=>"\xf0\x9f\x92\xa8",
-            ":hankey:"=>"\xf0\x9f\x92\xa9",
-            ":poop:"=>"\xf0\x9f\x92\xa9",
-            ":shit:"=>"\xf0\x9f\x92\xa9",
-            ":muscle:"=>"\xf0\x9f\x92\xaa",
-            ":dizzy:"=>"\xf0\x9f\x92\xab",
-            ":speech_balloon:"=>"\xf0\x9f\x92\xac",
-            ":thought_balloon:"=>"\xf0\x9f\x92\xad",
-            ":white_flower:"=>"\xf0\x9f\x92\xae",
-            ":100:"=>"\xf0\x9f\x92\xaf",
-            ":moneybag:"=>"\xf0\x9f\x92\xb0",
-            ":currency_exchange:"=>"\xf0\x9f\x92\xb1",
-            ":heavy_dollar_sign:"=>"\xf0\x9f\x92\xb2",
-            ":credit_card:"=>"\xf0\x9f\x92\xb3",
-            ":yen:"=>"\xf0\x9f\x92\xb4",
-            ":dollar:"=>"\xf0\x9f\x92\xb5",
-            ":euro:"=>"\xf0\x9f\x92\xb6",
-            ":pound:"=>"\xf0\x9f\x92\xb7",
-            ":money_with_wings:"=>"\xf0\x9f\x92\xb8",
-            ":chart:"=>"\xf0\x9f\x92\xb9",
-            ":seat:"=>"\xf0\x9f\x92\xba",
-            ":computer:"=>"\xf0\x9f\x92\xbb",
-            ":briefcase:"=>"\xf0\x9f\x92\xbc",
-            ":minidisc:"=>"\xf0\x9f\x92\xbd",
-            ":floppy_disk:"=>"\xf0\x9f\x92\xbe",
-            ":cd:"=>"\xf0\x9f\x92\xbf",
-            ":dvd:"=>"\xf0\x9f\x93\x80",
-            ":file_folder:"=>"\xf0\x9f\x93\x81",
-            ":open_file_folder:"=>"\xf0\x9f\x93\x82",
-            ":page_with_curl:"=>"\xf0\x9f\x93\x83",
-            ":page_facing_up:"=>"\xf0\x9f\x93\x84",
-            ":date:"=>"\xf0\x9f\x93\x85",
-            ":calendar:"=>"\xf0\x9f\x93\x86",
-            ":card_index:"=>"\xf0\x9f\x93\x87",
-            ":chart_with_upwards_trend:"=>"\xf0\x9f\x93\x88",
-            ":chart_with_downwards_trend:"=>"\xf0\x9f\x93\x89",
-            ":bar_chart:"=>"\xf0\x9f\x93\x8a",
-            ":clipboard:"=>"\xf0\x9f\x93\x8b",
-            ":pushpin:"=>"\xf0\x9f\x93\x8c",
-            ":round_pushpin:"=>"\xf0\x9f\x93\x8d",
-            ":paperclip:"=>"\xf0\x9f\x93\x8e",
-            ":straight_ruler:"=>"\xf0\x9f\x93\x8f",
-            ":triangular_ruler:"=>"\xf0\x9f\x93\x90",
-            ":bookmark_tabs:"=>"\xf0\x9f\x93\x91",
-            ":ledger:"=>"\xf0\x9f\x93\x92",
-            ":notebook:"=>"\xf0\x9f\x93\x93",
-            ":notebook_with_decorative_cover:"=>"\xf0\x9f\x93\x94",
-            ":closed_book:"=>"\xf0\x9f\x93\x95",
-            ":book:"=>"\xf0\x9f\x93\x96",
-            ":open_book:"=>"\xf0\x9f\x93\x96",
-            ":green_book:"=>"\xf0\x9f\x93\x97",
-            ":blue_book:"=>"\xf0\x9f\x93\x98",
-            ":orange_book:"=>"\xf0\x9f\x93\x99",
-            ":books:"=>"\xf0\x9f\x93\x9a",
-            ":name_badge:"=>"\xf0\x9f\x93\x9b",
-            ":scroll:"=>"\xf0\x9f\x93\x9c",
-            ":memo:"=>"\xf0\x9f\x93\x9d",
-            ":pencil:"=>"\xf0\x9f\x93\x9d",
-            ":telephone_receiver:"=>"\xf0\x9f\x93\x9e",
-            ":pager:"=>"\xf0\x9f\x93\x9f",
-            ":fax:"=>"\xf0\x9f\x93\xa0",
-            ":satellite_antenna:"=>"\xf0\x9f\x93\xa1",
-            ":loudspeaker:"=>"\xf0\x9f\x93\xa2",
-            ":mega:"=>"\xf0\x9f\x93\xa3",
-            ":outbox_tray:"=>"\xf0\x9f\x93\xa4",
-            ":inbox_tray:"=>"\xf0\x9f\x93\xa5",
-            ":package:"=>"\xf0\x9f\x93\xa6",
-            ":e-mail:"=>"\xf0\x9f\x93\xa7",
-            ":incoming_envelope:"=>"\xf0\x9f\x93\xa8",
-            ":envelope_with_arrow:"=>"\xf0\x9f\x93\xa9",
-            ":mailbox_closed:"=>"\xf0\x9f\x93\xaa",
-            ":mailbox:"=>"\xf0\x9f\x93\xab",
-            ":mailbox_with_mail:"=>"\xf0\x9f\x93\xac",
-            ":mailbox_with_no_mail:"=>"\xf0\x9f\x93\xad",
-            ":postbox:"=>"\xf0\x9f\x93\xae",
-            ":postal_horn:"=>"\xf0\x9f\x93\xaf",
-            ":newspaper:"=>"\xf0\x9f\x93\xb0",
-            ":iphone:"=>"\xf0\x9f\x93\xb1",
-            ":calling:"=>"\xf0\x9f\x93\xb2",
-            ":vibration_mode:"=>"\xf0\x9f\x93\xb3",
-            ":mobile_phone_off:"=>"\xf0\x9f\x93\xb4",
-            ":no_mobile_phones:"=>"\xf0\x9f\x93\xb5",
-            ":signal_strength:"=>"\xf0\x9f\x93\xb6",
-            ":camera:"=>"\xf0\x9f\x93\xb7",
-            ":camera_with_flash:"=>"\xf0\x9f\x93\xb8",
-            ":video_camera:"=>"\xf0\x9f\x93\xb9",
-            ":tv:"=>"\xf0\x9f\x93\xba",
-            ":radio:"=>"\xf0\x9f\x93\xbb",
-            ":vhs:"=>"\xf0\x9f\x93\xbc",
-            ":film_projector:"=>"\xf0\x9f\x93\xbd",
-            ":prayer_beads:"=>"\xf0\x9f\x93\xbf",
-            ":twisted_rightwards_arrows:"=>"\xf0\x9f\x94\x80",
-            ":repeat:"=>"\xf0\x9f\x94\x81",
-            ":repeat_one:"=>"\xf0\x9f\x94\x82",
-            ":arrows_clockwise:"=>"\xf0\x9f\x94\x83",
-            ":arrows_counterclockwise:"=>"\xf0\x9f\x94\x84",
-            ":low_brightness:"=>"\xf0\x9f\x94\x85",
-            ":high_brightness:"=>"\xf0\x9f\x94\x86",
-            ":mute:"=>"\xf0\x9f\x94\x87",
-            ":speaker:"=>"\xf0\x9f\x94\x88",
-            ":sound:"=>"\xf0\x9f\x94\x89",
-            ":loud_sound:"=>"\xf0\x9f\x94\x8a",
-            ":battery:"=>"\xf0\x9f\x94\x8b",
-            ":electric_plug:"=>"\xf0\x9f\x94\x8c",
-            ":mag:"=>"\xf0\x9f\x94\x8d",
-            ":mag_right:"=>"\xf0\x9f\x94\x8e",
-            ":lock_with_ink_pen:"=>"\xf0\x9f\x94\x8f",
-            ":closed_lock_with_key:"=>"\xf0\x9f\x94\x90",
-            ":key:"=>"\xf0\x9f\x94\x91",
-            ":lock:"=>"\xf0\x9f\x94\x92",
-            ":unlock:"=>"\xf0\x9f\x94\x93",
-            ":bell:"=>"\xf0\x9f\x94\x94",
-            ":no_bell:"=>"\xf0\x9f\x94\x95",
-            ":bookmark:"=>"\xf0\x9f\x94\x96",
-            ":link:"=>"\xf0\x9f\x94\x97",
-            ":radio_button:"=>"\xf0\x9f\x94\x98",
-            ":back:"=>"\xf0\x9f\x94\x99",
-            ":end:"=>"\xf0\x9f\x94\x9a",
-            ":on:"=>"\xf0\x9f\x94\x9b",
-            ":soon:"=>"\xf0\x9f\x94\x9c",
-            ":top:"=>"\xf0\x9f\x94\x9d",
-            ":underage:"=>"\xf0\x9f\x94\x9e",
-            ":keycap_ten:"=>"\xf0\x9f\x94\x9f",
-            ":capital_abcd:"=>"\xf0\x9f\x94\xa0",
-            ":abcd:"=>"\xf0\x9f\x94\xa1",
-            ":1234:"=>"\xf0\x9f\x94\xa2",
-            ":symbols:"=>"\xf0\x9f\x94\xa3",
-            ":abc:"=>"\xf0\x9f\x94\xa4",
-            ":fire:"=>"\xf0\x9f\x94\xa5",
-            ":flashlight:"=>"\xf0\x9f\x94\xa6",
-            ":wrench:"=>"\xf0\x9f\x94\xa7",
-            ":hammer:"=>"\xf0\x9f\x94\xa8",
-            ":nut_and_bolt:"=>"\xf0\x9f\x94\xa9",
-            ":hocho:"=>"\xf0\x9f\x94\xaa",
-            ":knife:"=>"\xf0\x9f\x94\xaa",
-            ":gun:"=>"\xf0\x9f\x94\xab",
-            ":microscope:"=>"\xf0\x9f\x94\xac",
-            ":telescope:"=>"\xf0\x9f\x94\xad",
-            ":crystal_ball:"=>"\xf0\x9f\x94\xae",
-            ":six_pointed_star:"=>"\xf0\x9f\x94\xaf",
-            ":beginner:"=>"\xf0\x9f\x94\xb0",
-            ":trident:"=>"\xf0\x9f\x94\xb1",
-            ":black_square_button:"=>"\xf0\x9f\x94\xb2",
-            ":white_square_button:"=>"\xf0\x9f\x94\xb3",
-            ":red_circle:"=>"\xf0\x9f\x94\xb4",
-            ":large_blue_circle:"=>"\xf0\x9f\x94\xb5",
-            ":large_orange_diamond:"=>"\xf0\x9f\x94\xb6",
-            ":large_blue_diamond:"=>"\xf0\x9f\x94\xb7",
-            ":small_orange_diamond:"=>"\xf0\x9f\x94\xb8",
-            ":small_blue_diamond:"=>"\xf0\x9f\x94\xb9",
-            ":small_red_triangle:"=>"\xf0\x9f\x94\xba",
-            ":small_red_triangle_down:"=>"\xf0\x9f\x94\xbb",
-            ":arrow_up_small:"=>"\xf0\x9f\x94\xbc",
-            ":arrow_down_small:"=>"\xf0\x9f\x94\xbd",
-            ":om_symbol:"=>"\xf0\x9f\x95\x89",
-            ":dove_of_peace:"=>"\xf0\x9f\x95\x8a",
-            ":kaaba:"=>"\xf0\x9f\x95\x8b",
-            ":mosque:"=>"\xf0\x9f\x95\x8c",
-            ":synagogue:"=>"\xf0\x9f\x95\x8d",
-            ":menorah_with_nine_branches:"=>"\xf0\x9f\x95\x8e",
-            ":clock1:"=>"\xf0\x9f\x95\x90",
-            ":clock2:"=>"\xf0\x9f\x95\x91",
-            ":clock3:"=>"\xf0\x9f\x95\x92",
-            ":clock4:"=>"\xf0\x9f\x95\x93",
-            ":clock5:"=>"\xf0\x9f\x95\x94",
-            ":clock6:"=>"\xf0\x9f\x95\x95",
-            ":clock7:"=>"\xf0\x9f\x95\x96",
-            ":clock8:"=>"\xf0\x9f\x95\x97",
-            ":clock9:"=>"\xf0\x9f\x95\x98",
-            ":clock10:"=>"\xf0\x9f\x95\x99",
-            ":clock11:"=>"\xf0\x9f\x95\x9a",
-            ":clock12:"=>"\xf0\x9f\x95\x9b",
-            ":clock130:"=>"\xf0\x9f\x95\x9c",
-            ":clock230:"=>"\xf0\x9f\x95\x9d",
-            ":clock330:"=>"\xf0\x9f\x95\x9e",
-            ":clock430:"=>"\xf0\x9f\x95\x9f",
-            ":clock530:"=>"\xf0\x9f\x95\xa0",
-            ":clock630:"=>"\xf0\x9f\x95\xa1",
-            ":clock730:"=>"\xf0\x9f\x95\xa2",
-            ":clock830:"=>"\xf0\x9f\x95\xa3",
-            ":clock930:"=>"\xf0\x9f\x95\xa4",
-            ":clock1030:"=>"\xf0\x9f\x95\xa5",
-            ":clock1130:"=>"\xf0\x9f\x95\xa6",
-            ":clock1230:"=>"\xf0\x9f\x95\xa7",
-            ":candle:"=>"\xf0\x9f\x95\xaf",
-            ":mantelpiece_clock:"=>"\xf0\x9f\x95\xb0",
-            ":hole:"=>"\xf0\x9f\x95\xb3",
-            ":man_in_business_suit_levitating:"=>"\xf0\x9f\x95\xb4",
-            ":sleuth_or_spy:"=>"\xf0\x9f\x95\xb5",
-            ":dark_sunglasses:"=>"\xf0\x9f\x95\xb6",
-            ":spider:"=>"\xf0\x9f\x95\xb7",
-            ":spider_web:"=>"\xf0\x9f\x95\xb8",
-            ":joystick:"=>"\xf0\x9f\x95\xb9",
-            ":linked_paperclips:"=>"\xf0\x9f\x96\x87",
-            ":lower_left_ballpoint_pen:"=>"\xf0\x9f\x96\x8a",
-            ":lower_left_fountain_pen:"=>"\xf0\x9f\x96\x8b",
-            ":lower_left_paintbrush:"=>"\xf0\x9f\x96\x8c",
-            ":lower_left_crayon:"=>"\xf0\x9f\x96\x8d",
-            ":raised_hand_with_fingers_splayed:"=>"\xf0\x9f\x96\x90",
-            ":middle_finger:"=>"\xf0\x9f\x96\x95",
-            ":reversed_hand_with_middle_finger_extended:"=>"\xf0\x9f\x96\x95",
-            ":spock-hand:"=>"\xf0\x9f\x96\x96",
-            ":desktop_computer:"=>"\xf0\x9f\x96\xa5",
-            ":printer:"=>"\xf0\x9f\x96\xa8",
-            ":three_button_mouse:"=>"\xf0\x9f\x96\xb1",
-            ":trackball:"=>"\xf0\x9f\x96\xb2",
-            ":frame_with_picture:"=>"\xf0\x9f\x96\xbc",
-            ":card_index_dividers:"=>"\xf0\x9f\x97\x82",
-            ":card_file_box:"=>"\xf0\x9f\x97\x83",
-            ":file_cabinet:"=>"\xf0\x9f\x97\x84",
-            ":wastebasket:"=>"\xf0\x9f\x97\x91",
-            ":spiral_note_pad:"=>"\xf0\x9f\x97\x92",
-            ":spiral_calendar_pad:"=>"\xf0\x9f\x97\x93",
-            ":compression:"=>"\xf0\x9f\x97\x9c",
-            ":old_key:"=>"\xf0\x9f\x97\x9d",
-            ":rolled_up_newspaper:"=>"\xf0\x9f\x97\x9e",
-            ":dagger_knife:"=>"\xf0\x9f\x97\xa1",
-            ":speaking_head_in_silhouette:"=>"\xf0\x9f\x97\xa3",
-            ":left_speech_bubble:"=>"\xf0\x9f\x97\xa8",
-            ":right_anger_bubble:"=>"\xf0\x9f\x97\xaf",
-            ":ballot_box_with_ballot:"=>"\xf0\x9f\x97\xb3",
-            ":world_map:"=>"\xf0\x9f\x97\xba",
-            ":mount_fuji:"=>"\xf0\x9f\x97\xbb",
-            ":tokyo_tower:"=>"\xf0\x9f\x97\xbc",
-            ":statue_of_liberty:"=>"\xf0\x9f\x97\xbd",
-            ":japan:"=>"\xf0\x9f\x97\xbe",
-            ":moyai:"=>"\xf0\x9f\x97\xbf",
-            ":grinning:"=>"\xf0\x9f\x98\x80",
-            ":grin:"=>"\xf0\x9f\x98\x81",
-            ":joy:"=>"\xf0\x9f\x98\x82",
-            ":smiley:"=>"\xf0\x9f\x98\x83",
-            ":smile:"=>"\xf0\x9f\x98\x84",
-            ":sweat_smile:"=>"\xf0\x9f\x98\x85",
-            ":laughing:"=>"\xf0\x9f\x98\x86",
-            ":satisfied:"=>"\xf0\x9f\x98\x86",
-            ":innocent:"=>"\xf0\x9f\x98\x87",
-            ":smiling_imp:"=>"\xf0\x9f\x98\x88",
-            ":wink:"=>"\xf0\x9f\x98\x89",
-            ":blush:"=>"\xf0\x9f\x98\x8a",
-            ":yum:"=>"\xf0\x9f\x98\x8b",
-            ":relieved:"=>"\xf0\x9f\x98\x8c",
-            ":heart_eyes:"=>"\xf0\x9f\x98\x8d",
-            ":sunglasses:"=>"\xf0\x9f\x98\x8e",
-            ":smirk:"=>"\xf0\x9f\x98\x8f",
-            ":neutral_face:"=>"\xf0\x9f\x98\x90",
-            ":expressionless:"=>"\xf0\x9f\x98\x91",
-            ":unamused:"=>"\xf0\x9f\x98\x92",
-            ":sweat:"=>"\xf0\x9f\x98\x93",
-            ":pensive:"=>"\xf0\x9f\x98\x94",
-            ":confused:"=>"\xf0\x9f\x98\x95",
-            ":confounded:"=>"\xf0\x9f\x98\x96",
-            ":kissing:"=>"\xf0\x9f\x98\x97",
-            ":kissing_heart:"=>"\xf0\x9f\x98\x98",
-            ":kissing_smiling_eyes:"=>"\xf0\x9f\x98\x99",
-            ":kissing_closed_eyes:"=>"\xf0\x9f\x98\x9a",
-            ":stuck_out_tongue:"=>"\xf0\x9f\x98\x9b",
-            ":stuck_out_tongue_winking_eye:"=>"\xf0\x9f\x98\x9c",
-            ":stuck_out_tongue_closed_eyes:"=>"\xf0\x9f\x98\x9d",
-            ":disappointed:"=>"\xf0\x9f\x98\x9e",
-            ":worried:"=>"\xf0\x9f\x98\x9f",
-            ":angry:"=>"\xf0\x9f\x98\xa0",
-            ":rage:"=>"\xf0\x9f\x98\xa1",
-            ":cry:"=>"\xf0\x9f\x98\xa2",
-            ":persevere:"=>"\xf0\x9f\x98\xa3",
-            ":triumph:"=>"\xf0\x9f\x98\xa4",
-            ":disappointed_relieved:"=>"\xf0\x9f\x98\xa5",
-            ":frowning:"=>"\xf0\x9f\x98\xa6",
-            ":anguished:"=>"\xf0\x9f\x98\xa7",
-            ":fearful:"=>"\xf0\x9f\x98\xa8",
-            ":weary:"=>"\xf0\x9f\x98\xa9",
-            ":sleepy:"=>"\xf0\x9f\x98\xaa",
-            ":tired_face:"=>"\xf0\x9f\x98\xab",
-            ":grimacing:"=>"\xf0\x9f\x98\xac",
-            ":sob:"=>"\xf0\x9f\x98\xad",
-            ":open_mouth:"=>"\xf0\x9f\x98\xae",
-            ":hushed:"=>"\xf0\x9f\x98\xaf",
-            ":cold_sweat:"=>"\xf0\x9f\x98\xb0",
-            ":scream:"=>"\xf0\x9f\x98\xb1",
-            ":astonished:"=>"\xf0\x9f\x98\xb2",
-            ":flushed:"=>"\xf0\x9f\x98\xb3",
-            ":sleeping:"=>"\xf0\x9f\x98\xb4",
-            ":dizzy_face:"=>"\xf0\x9f\x98\xb5",
-            ":no_mouth:"=>"\xf0\x9f\x98\xb6",
-            ":mask:"=>"\xf0\x9f\x98\xb7",
-            ":smile_cat:"=>"\xf0\x9f\x98\xb8",
-            ":joy_cat:"=>"\xf0\x9f\x98\xb9",
-            ":smiley_cat:"=>"\xf0\x9f\x98\xba",
-            ":heart_eyes_cat:"=>"\xf0\x9f\x98\xbb",
-            ":smirk_cat:"=>"\xf0\x9f\x98\xbc",
-            ":kissing_cat:"=>"\xf0\x9f\x98\xbd",
-            ":pouting_cat:"=>"\xf0\x9f\x98\xbe",
-            ":crying_cat_face:"=>"\xf0\x9f\x98\xbf",
-            ":scream_cat:"=>"\xf0\x9f\x99\x80",
-            ":slightly_frowning_face:"=>"\xf0\x9f\x99\x81",
-            ":slightly_smiling_face:"=>"\xf0\x9f\x99\x82",
-            ":upside_down_face:"=>"\xf0\x9f\x99\x83",
-            ":face_with_rolling_eyes:"=>"\xf0\x9f\x99\x84",
-            ":no_good:"=>"\xf0\x9f\x99\x85",
-            ":ok_woman:"=>"\xf0\x9f\x99\x86",
-            ":bow:"=>"\xf0\x9f\x99\x87",
-            ":see_no_evil:"=>"\xf0\x9f\x99\x88",
-            ":hear_no_evil:"=>"\xf0\x9f\x99\x89",
-            ":speak_no_evil:"=>"\xf0\x9f\x99\x8a",
-            ":raising_hand:"=>"\xf0\x9f\x99\x8b",
-            ":raised_hands:"=>"\xf0\x9f\x99\x8c",
-            ":person_frowning:"=>"\xf0\x9f\x99\x8d",
-            ":person_with_pouting_face:"=>"\xf0\x9f\x99\x8e",
-            ":pray:"=>"\xf0\x9f\x99\x8f",
-            ":rocket:"=>"\xf0\x9f\x9a\x80",
-            ":helicopter:"=>"\xf0\x9f\x9a\x81",
-            ":steam_locomotive:"=>"\xf0\x9f\x9a\x82",
-            ":railway_car:"=>"\xf0\x9f\x9a\x83",
-            ":bullettrain_side:"=>"\xf0\x9f\x9a\x84",
-            ":bullettrain_front:"=>"\xf0\x9f\x9a\x85",
-            ":train2:"=>"\xf0\x9f\x9a\x86",
-            ":metro:"=>"\xf0\x9f\x9a\x87",
-            ":light_rail:"=>"\xf0\x9f\x9a\x88",
-            ":station:"=>"\xf0\x9f\x9a\x89",
-            ":tram:"=>"\xf0\x9f\x9a\x8a",
-            ":train:"=>"\xf0\x9f\x9a\x8b",
-            ":bus:"=>"\xf0\x9f\x9a\x8c",
-            ":oncoming_bus:"=>"\xf0\x9f\x9a\x8d",
-            ":trolleybus:"=>"\xf0\x9f\x9a\x8e",
-            ":busstop:"=>"\xf0\x9f\x9a\x8f",
-            ":minibus:"=>"\xf0\x9f\x9a\x90",
-            ":ambulance:"=>"\xf0\x9f\x9a\x91",
-            ":fire_engine:"=>"\xf0\x9f\x9a\x92",
-            ":police_car:"=>"\xf0\x9f\x9a\x93",
-            ":oncoming_police_car:"=>"\xf0\x9f\x9a\x94",
-            ":taxi:"=>"\xf0\x9f\x9a\x95",
-            ":oncoming_taxi:"=>"\xf0\x9f\x9a\x96",
-            ":car:"=>"\xf0\x9f\x9a\x97",
-            ":red_car:"=>"\xf0\x9f\x9a\x97",
-            ":oncoming_automobile:"=>"\xf0\x9f\x9a\x98",
-            ":blue_car:"=>"\xf0\x9f\x9a\x99",
-            ":truck:"=>"\xf0\x9f\x9a\x9a",
-            ":articulated_lorry:"=>"\xf0\x9f\x9a\x9b",
-            ":tractor:"=>"\xf0\x9f\x9a\x9c",
-            ":monorail:"=>"\xf0\x9f\x9a\x9d",
-            ":mountain_railway:"=>"\xf0\x9f\x9a\x9e",
-            ":suspension_railway:"=>"\xf0\x9f\x9a\x9f",
-            ":mountain_cableway:"=>"\xf0\x9f\x9a\xa0",
-            ":aerial_tramway:"=>"\xf0\x9f\x9a\xa1",
-            ":ship:"=>"\xf0\x9f\x9a\xa2",
-            ":rowboat:"=>"\xf0\x9f\x9a\xa3",
-            ":speedboat:"=>"\xf0\x9f\x9a\xa4",
-            ":traffic_light:"=>"\xf0\x9f\x9a\xa5",
-            ":vertical_traffic_light:"=>"\xf0\x9f\x9a\xa6",
-            ":construction:"=>"\xf0\x9f\x9a\xa7",
-            ":rotating_light:"=>"\xf0\x9f\x9a\xa8",
-            ":triangular_flag_on_post:"=>"\xf0\x9f\x9a\xa9",
-            ":door:"=>"\xf0\x9f\x9a\xaa",
-            ":no_entry_sign:"=>"\xf0\x9f\x9a\xab",
-            ":smoking:"=>"\xf0\x9f\x9a\xac",
-            ":no_smoking:"=>"\xf0\x9f\x9a\xad",
-            ":put_litter_in_its_place:"=>"\xf0\x9f\x9a\xae",
-            ":do_not_litter:"=>"\xf0\x9f\x9a\xaf",
-            ":potable_water:"=>"\xf0\x9f\x9a\xb0",
-            ":non-potable_water:"=>"\xf0\x9f\x9a\xb1",
-            ":bike:"=>"\xf0\x9f\x9a\xb2",
-            ":no_bicycles:"=>"\xf0\x9f\x9a\xb3",
-            ":bicyclist:"=>"\xf0\x9f\x9a\xb4",
-            ":mountain_bicyclist:"=>"\xf0\x9f\x9a\xb5",
-            ":walking:"=>"\xf0\x9f\x9a\xb6",
-            ":no_pedestrians:"=>"\xf0\x9f\x9a\xb7",
-            ":children_crossing:"=>"\xf0\x9f\x9a\xb8",
-            ":mens:"=>"\xf0\x9f\x9a\xb9",
-            ":womens:"=>"\xf0\x9f\x9a\xba",
-            ":restroom:"=>"\xf0\x9f\x9a\xbb",
-            ":baby_symbol:"=>"\xf0\x9f\x9a\xbc",
-            ":toilet:"=>"\xf0\x9f\x9a\xbd",
-            ":wc:"=>"\xf0\x9f\x9a\xbe",
-            ":shower:"=>"\xf0\x9f\x9a\xbf",
-            ":bath:"=>"\xf0\x9f\x9b\x80",
-            ":bathtub:"=>"\xf0\x9f\x9b\x81",
-            ":passport_control:"=>"\xf0\x9f\x9b\x82",
-            ":customs:"=>"\xf0\x9f\x9b\x83",
-            ":baggage_claim:"=>"\xf0\x9f\x9b\x84",
-            ":left_luggage:"=>"\xf0\x9f\x9b\x85",
-            ":couch_and_lamp:"=>"\xf0\x9f\x9b\x8b",
-            ":sleeping_accommodation:"=>"\xf0\x9f\x9b\x8c",
-            ":shopping_bags:"=>"\xf0\x9f\x9b\x8d",
-            ":bellhop_bell:"=>"\xf0\x9f\x9b\x8e",
-            ":bed:"=>"\xf0\x9f\x9b\x8f",
-            ":place_of_worship:"=>"\xf0\x9f\x9b\x90",
-            ":hammer_and_wrench:"=>"\xf0\x9f\x9b\xa0",
-            ":shield:"=>"\xf0\x9f\x9b\xa1",
-            ":oil_drum:"=>"\xf0\x9f\x9b\xa2",
-            ":motorway:"=>"\xf0\x9f\x9b\xa3",
-            ":railway_track:"=>"\xf0\x9f\x9b\xa4",
-            ":motor_boat:"=>"\xf0\x9f\x9b\xa5",
-            ":small_airplane:"=>"\xf0\x9f\x9b\xa9",
-            ":airplane_departure:"=>"\xf0\x9f\x9b\xab",
-            ":airplane_arriving:"=>"\xf0\x9f\x9b\xac",
-            ":satellite:"=>"\xf0\x9f\x9b\xb0",
-            ":passenger_ship:"=>"\xf0\x9f\x9b\xb3",
-            ":zipper_mouth_face:"=>"\xf0\x9f\xa4\x90",
-            ":money_mouth_face:"=>"\xf0\x9f\xa4\x91",
-            ":face_with_thermometer:"=>"\xf0\x9f\xa4\x92",
-            ":nerd_face:"=>"\xf0\x9f\xa4\x93",
-            ":thinking_face:"=>"\xf0\x9f\xa4\x94",
-            ":face_with_head_bandage:"=>"\xf0\x9f\xa4\x95",
-            ":robot_face:"=>"\xf0\x9f\xa4\x96",
-            ":hugging_face:"=>"\xf0\x9f\xa4\x97",
-            ":the_horns:"=>"\xf0\x9f\xa4\x98",
-            ":sign_of_the_horns:"=>"\xf0\x9f\xa4\x98",
-            ":crab:"=>"\xf0\x9f\xa6\x80",
-            ":lion_face:"=>"\xf0\x9f\xa6\x81",
-            ":scorpion:"=>"\xf0\x9f\xa6\x82",
-            ":turkey:"=>"\xf0\x9f\xa6\x83",
-            ":unicorn_face:"=>"\xf0\x9f\xa6\x84",
-            ":cheese_wedge:"=>"\xf0\x9f\xa7\x80",
-            ":hash:"=>"#\xe2\x83\xa3",
-            ":keycap_star:"=>"*\xe2\x83\xa3",
-            ":zero:"=>"0\xe2\x83\xa3",
-            ":one:"=>"1\xe2\x83\xa3",
-            ":two:"=>"2\xe2\x83\xa3",
-            ":three:"=>"3\xe2\x83\xa3",
-            ":four:"=>"4\xe2\x83\xa3",
-            ":five:"=>"5\xe2\x83\xa3",
-            ":six:"=>"6\xe2\x83\xa3",
-            ":seven:"=>"7\xe2\x83\xa3",
-            ":eight:"=>"8\xe2\x83\xa3",
-            ":nine:"=>"9\xe2\x83\xa3",
-            ":flag-ac:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xa8",
-            ":flag-ad:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xa9",
-            ":flag-ae:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xaa",
-            ":flag-af:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xab",
-            ":flag-ag:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xac",
-            ":flag-ai:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xae",
-            ":flag-al:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xb1",
-            ":flag-am:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xb2",
-            ":flag-ao:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xb4",
-            ":flag-aq:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xb6",
-            ":flag-ar:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xb7",
-            ":flag-as:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xb8",
-            ":flag-at:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xb9",
-            ":flag-au:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xba",
-            ":flag-aw:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xbc",
-            ":flag-ax:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xbd",
-            ":flag-az:"=>"\xf0\x9f\x87\xa6\xf0\x9f\x87\xbf",
-            ":flag-ba:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xa6",
-            ":flag-bb:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xa7",
-            ":flag-bd:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xa9",
-            ":flag-be:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xaa",
-            ":flag-bf:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xab",
-            ":flag-bg:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xac",
-            ":flag-bh:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xad",
-            ":flag-bi:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xae",
-            ":flag-bj:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xaf",
-            ":flag-bl:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb1",
-            ":flag-bm:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb2",
-            ":flag-bn:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb3",
-            ":flag-bo:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb4",
-            ":flag-bq:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb6",
-            ":flag-br:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb7",
-            ":flag-bs:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb8",
-            ":flag-bt:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xb9",
-            ":flag-bv:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xbb",
-            ":flag-bw:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xbc",
-            ":flag-by:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xbe",
-            ":flag-bz:"=>"\xf0\x9f\x87\xa7\xf0\x9f\x87\xbf",
-            ":flag-ca:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xa6",
-            ":flag-cc:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xa8",
-            ":flag-cd:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xa9",
-            ":flag-cf:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xab",
-            ":flag-cg:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xac",
-            ":flag-ch:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xad",
-            ":flag-ci:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xae",
-            ":flag-ck:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb0",
-            ":flag-cl:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb1",
-            ":flag-cm:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb2",
-            ":flag-cn:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3",
-            ":cn:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3",
-            ":flag-co:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb4",
-            ":flag-cp:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb5",
-            ":flag-cr:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xb7",
-            ":flag-cu:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xba",
-            ":flag-cv:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xbb",
-            ":flag-cw:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xbc",
-            ":flag-cx:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xbd",
-            ":flag-cy:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xbe",
-            ":flag-cz:"=>"\xf0\x9f\x87\xa8\xf0\x9f\x87\xbf",
-            ":flag-de:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa",
-            ":de:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa",
-            ":flag-dg:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xac",
-            ":flag-dj:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xaf",
-            ":flag-dk:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xb0",
-            ":flag-dm:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xb2",
-            ":flag-do:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xb4",
-            ":flag-dz:"=>"\xf0\x9f\x87\xa9\xf0\x9f\x87\xbf",
-            ":flag-ea:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xa6",
-            ":flag-ec:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xa8",
-            ":flag-ee:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xaa",
-            ":flag-eg:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xac",
-            ":flag-eh:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xad",
-            ":flag-er:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xb7",
-            ":flag-es:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8",
-            ":es:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8",
-            ":flag-et:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xb9",
-            ":flag-eu:"=>"\xf0\x9f\x87\xaa\xf0\x9f\x87\xba",
-            ":flag-fi:"=>"\xf0\x9f\x87\xab\xf0\x9f\x87\xae",
-            ":flag-fj:"=>"\xf0\x9f\x87\xab\xf0\x9f\x87\xaf",
-            ":flag-fk:"=>"\xf0\x9f\x87\xab\xf0\x9f\x87\xb0",
-            ":flag-fm:"=>"\xf0\x9f\x87\xab\xf0\x9f\x87\xb2",
-            ":flag-fo:"=>"\xf0\x9f\x87\xab\xf0\x9f\x87\xb4",
-            ":flag-fr:"=>"\xf0\x9f\x87\xab\xf0\x9f\x87\xb7",
-            ":fr:"=>"\xf0\x9f\x87\xab\xf0\x9f\x87\xb7",
-            ":flag-ga:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xa6",
-            ":flag-gb:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xa7",
-            ":gb:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xa7",
-            ":uk:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xa7",
-            ":flag-gd:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xa9",
-            ":flag-ge:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xaa",
-            ":flag-gf:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xab",
-            ":flag-gg:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xac",
-            ":flag-gh:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xad",
-            ":flag-gi:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xae",
-            ":flag-gl:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb1",
-            ":flag-gm:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb2",
-            ":flag-gn:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb3",
-            ":flag-gp:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb5",
-            ":flag-gq:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb6",
-            ":flag-gr:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb7",
-            ":flag-gs:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb8",
-            ":flag-gt:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xb9",
-            ":flag-gu:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xba",
-            ":flag-gw:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xbc",
-            ":flag-gy:"=>"\xf0\x9f\x87\xac\xf0\x9f\x87\xbe",
-            ":flag-hk:"=>"\xf0\x9f\x87\xad\xf0\x9f\x87\xb0",
-            ":flag-hm:"=>"\xf0\x9f\x87\xad\xf0\x9f\x87\xb2",
-            ":flag-hn:"=>"\xf0\x9f\x87\xad\xf0\x9f\x87\xb3",
-            ":flag-hr:"=>"\xf0\x9f\x87\xad\xf0\x9f\x87\xb7",
-            ":flag-ht:"=>"\xf0\x9f\x87\xad\xf0\x9f\x87\xb9",
-            ":flag-hu:"=>"\xf0\x9f\x87\xad\xf0\x9f\x87\xba",
-            ":flag-ic:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xa8",
-            ":flag-id:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xa9",
-            ":flag-ie:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xaa",
-            ":flag-il:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb1",
-            ":flag-im:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb2",
-            ":flag-in:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb3",
-            ":flag-io:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb4",
-            ":flag-iq:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb6",
-            ":flag-ir:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb7",
-            ":flag-is:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb8",
-            ":flag-it:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb9",
-            ":it:"=>"\xf0\x9f\x87\xae\xf0\x9f\x87\xb9",
-            ":flag-je:"=>"\xf0\x9f\x87\xaf\xf0\x9f\x87\xaa",
-            ":flag-jm:"=>"\xf0\x9f\x87\xaf\xf0\x9f\x87\xb2",
-            ":flag-jo:"=>"\xf0\x9f\x87\xaf\xf0\x9f\x87\xb4",
-            ":flag-jp:"=>"\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5",
-            ":jp:"=>"\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5",
-            ":flag-ke:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xaa",
-            ":flag-kg:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xac",
-            ":flag-kh:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xad",
-            ":flag-ki:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xae",
-            ":flag-km:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xb2",
-            ":flag-kn:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xb3",
-            ":flag-kp:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xb5",
-            ":flag-kr:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7",
-            ":kr:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7",
-            ":flag-kw:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xbc",
-            ":flag-ky:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xbe",
-            ":flag-kz:"=>"\xf0\x9f\x87\xb0\xf0\x9f\x87\xbf",
-            ":flag-la:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xa6",
-            ":flag-lb:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xa7",
-            ":flag-lc:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xa8",
-            ":flag-li:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xae",
-            ":flag-lk:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xb0",
-            ":flag-lr:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xb7",
-            ":flag-ls:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xb8",
-            ":flag-lt:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xb9",
-            ":flag-lu:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xba",
-            ":flag-lv:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xbb",
-            ":flag-ly:"=>"\xf0\x9f\x87\xb1\xf0\x9f\x87\xbe",
-            ":flag-ma:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xa6",
-            ":flag-mc:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xa8",
-            ":flag-md:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xa9",
-            ":flag-me:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xaa",
-            ":flag-mf:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xab",
-            ":flag-mg:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xac",
-            ":flag-mh:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xad",
-            ":flag-mk:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb0",
-            ":flag-ml:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb1",
-            ":flag-mm:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb2",
-            ":flag-mn:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb3",
-            ":flag-mo:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb4",
-            ":flag-mp:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb5",
-            ":flag-mq:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb6",
-            ":flag-mr:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb7",
-            ":flag-ms:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb8",
-            ":flag-mt:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xb9",
-            ":flag-mu:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xba",
-            ":flag-mv:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xbb",
-            ":flag-mw:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xbc",
-            ":flag-mx:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xbd",
-            ":flag-my:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xbe",
-            ":flag-mz:"=>"\xf0\x9f\x87\xb2\xf0\x9f\x87\xbf",
-            ":flag-na:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xa6",
-            ":flag-nc:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xa8",
-            ":flag-ne:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xaa",
-            ":flag-nf:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xab",
-            ":flag-ng:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xac",
-            ":flag-ni:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xae",
-            ":flag-nl:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xb1",
-            ":flag-no:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xb4",
-            ":flag-np:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xb5",
-            ":flag-nr:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xb7",
-            ":flag-nu:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xba",
-            ":flag-nz:"=>"\xf0\x9f\x87\xb3\xf0\x9f\x87\xbf",
-            ":flag-om:"=>"\xf0\x9f\x87\xb4\xf0\x9f\x87\xb2",
-            ":flag-pa:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xa6",
-            ":flag-pe:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xaa",
-            ":flag-pf:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xab",
-            ":flag-pg:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xac",
-            ":flag-ph:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xad",
-            ":flag-pk:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xb0",
-            ":flag-pl:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xb1",
-            ":flag-pm:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xb2",
-            ":flag-pn:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xb3",
-            ":flag-pr:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xb7",
-            ":flag-ps:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xb8",
-            ":flag-pt:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xb9",
-            ":flag-pw:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xbc",
-            ":flag-py:"=>"\xf0\x9f\x87\xb5\xf0\x9f\x87\xbe",
-            ":flag-qa:"=>"\xf0\x9f\x87\xb6\xf0\x9f\x87\xa6",
-            ":flag-re:"=>"\xf0\x9f\x87\xb7\xf0\x9f\x87\xaa",
-            ":flag-ro:"=>"\xf0\x9f\x87\xb7\xf0\x9f\x87\xb4",
-            ":flag-rs:"=>"\xf0\x9f\x87\xb7\xf0\x9f\x87\xb8",
-            ":flag-ru:"=>"\xf0\x9f\x87\xb7\xf0\x9f\x87\xba",
-            ":ru:"=>"\xf0\x9f\x87\xb7\xf0\x9f\x87\xba",
-            ":flag-rw:"=>"\xf0\x9f\x87\xb7\xf0\x9f\x87\xbc",
-            ":flag-sa:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xa6",
-            ":flag-sb:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xa7",
-            ":flag-sc:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xa8",
-            ":flag-sd:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xa9",
-            ":flag-se:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xaa",
-            ":flag-sg:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xac",
-            ":flag-sh:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xad",
-            ":flag-si:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xae",
-            ":flag-sj:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xaf",
-            ":flag-sk:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb0",
-            ":flag-sl:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb1",
-            ":flag-sm:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb2",
-            ":flag-sn:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb3",
-            ":flag-so:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb4",
-            ":flag-sr:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb7",
-            ":flag-ss:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb8",
-            ":flag-st:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xb9",
-            ":flag-sv:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xbb",
-            ":flag-sx:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xbd",
-            ":flag-sy:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xbe",
-            ":flag-sz:"=>"\xf0\x9f\x87\xb8\xf0\x9f\x87\xbf",
-            ":flag-ta:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xa6",
-            ":flag-tc:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xa8",
-            ":flag-td:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xa9",
-            ":flag-tf:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xab",
-            ":flag-tg:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xac",
-            ":flag-th:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xad",
-            ":flag-tj:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xaf",
-            ":flag-tk:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xb0",
-            ":flag-tl:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xb1",
-            ":flag-tm:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xb2",
-            ":flag-tn:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xb3",
-            ":flag-to:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xb4",
-            ":flag-tr:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xb7",
-            ":flag-tt:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xb9",
-            ":flag-tv:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xbb",
-            ":flag-tw:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xbc",
-            ":flag-tz:"=>"\xf0\x9f\x87\xb9\xf0\x9f\x87\xbf",
-            ":flag-ua:"=>"\xf0\x9f\x87\xba\xf0\x9f\x87\xa6",
-            ":flag-ug:"=>"\xf0\x9f\x87\xba\xf0\x9f\x87\xac",
-            ":flag-um:"=>"\xf0\x9f\x87\xba\xf0\x9f\x87\xb2",
-            ":flag-us:"=>"\xf0\x9f\x87\xba\xf0\x9f\x87\xb8",
-            ":us:"=>"\xf0\x9f\x87\xba\xf0\x9f\x87\xb8",
-            ":flag-uy:"=>"\xf0\x9f\x87\xba\xf0\x9f\x87\xbe",
-            ":flag-uz:"=>"\xf0\x9f\x87\xba\xf0\x9f\x87\xbf",
-            ":flag-va:"=>"\xf0\x9f\x87\xbb\xf0\x9f\x87\xa6",
-            ":flag-vc:"=>"\xf0\x9f\x87\xbb\xf0\x9f\x87\xa8",
-            ":flag-ve:"=>"\xf0\x9f\x87\xbb\xf0\x9f\x87\xaa",
-            ":flag-vg:"=>"\xf0\x9f\x87\xbb\xf0\x9f\x87\xac",
-            ":flag-vi:"=>"\xf0\x9f\x87\xbb\xf0\x9f\x87\xae",
-            ":flag-vn:"=>"\xf0\x9f\x87\xbb\xf0\x9f\x87\xb3",
-            ":flag-vu:"=>"\xf0\x9f\x87\xbb\xf0\x9f\x87\xba",
-            ":flag-wf:"=>"\xf0\x9f\x87\xbc\xf0\x9f\x87\xab",
-            ":flag-ws:"=>"\xf0\x9f\x87\xbc\xf0\x9f\x87\xb8",
-            ":flag-xk:"=>"\xf0\x9f\x87\xbd\xf0\x9f\x87\xb0",
-            ":flag-ye:"=>"\xf0\x9f\x87\xbe\xf0\x9f\x87\xaa",
-            ":flag-yt:"=>"\xf0\x9f\x87\xbe\xf0\x9f\x87\xb9",
-            ":flag-za:"=>"\xf0\x9f\x87\xbf\xf0\x9f\x87\xa6",
-            ":flag-zm:"=>"\xf0\x9f\x87\xbf\xf0\x9f\x87\xb2",
-            ":flag-zw:"=>"\xf0\x9f\x87\xbf\xf0\x9f\x87\xbc",
-            ":man-man-boy:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":man-man-boy-boy:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":man-man-girl:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7",
-            ":man-man-girl-boy:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":man-man-girl-girl:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7",
-            ":man-woman-boy-boy:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":man-woman-girl:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7",
-            ":man-woman-girl-boy:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":man-woman-girl-girl:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7",
-            ":man-heart-man:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8",
-            ":man-kiss-man:"=>"\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa8",
-            ":woman-woman-boy:"=>"\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":woman-woman-boy-boy:"=>"\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":woman-woman-girl:"=>"\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7",
-            ":woman-woman-girl-boy:"=>"\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6",
-            ":woman-woman-girl-girl:"=>"\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7",
-            ":woman-heart-woman:"=>"\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9",
-            ":woman-kiss-woman:"=>"\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9",
+class ShortToUnicodeEmojiMap
+{
+    public static $map = [
+            ':copyright:'                                              => "\xc2\xa9",
+            ':registered:'                                             => "\xc2\xae",
+            ':bangbang:'                                               => "\xe2\x80\xbc",
+            ':interrobang:'                                            => "\xe2\x81\x89",
+            ':tm:'                                                     => "\xe2\x84\xa2",
+            ':information_source:'                                     => "\xe2\x84\xb9",
+            ':left_right_arrow:'                                       => "\xe2\x86\x94",
+            ':arrow_up_down:'                                          => "\xe2\x86\x95",
+            ':arrow_upper_left:'                                       => "\xe2\x86\x96",
+            ':arrow_upper_right:'                                      => "\xe2\x86\x97",
+            ':arrow_lower_right:'                                      => "\xe2\x86\x98",
+            ':arrow_lower_left:'                                       => "\xe2\x86\x99",
+            ':leftwards_arrow_with_hook:'                              => "\xe2\x86\xa9",
+            ':arrow_right_hook:'                                       => "\xe2\x86\xaa",
+            ':watch:'                                                  => "\xe2\x8c\x9a",
+            ':hourglass:'                                              => "\xe2\x8c\x9b",
+            ':keyboard:'                                               => "\xe2\x8c\xa8",
+            ':fast_forward:'                                           => "\xe2\x8f\xa9",
+            ':rewind:'                                                 => "\xe2\x8f\xaa",
+            ':arrow_double_up:'                                        => "\xe2\x8f\xab",
+            ':arrow_double_down:'                                      => "\xe2\x8f\xac",
+            ':black_right_pointing_double_triangle_with_vertical_bar:' => "\xe2\x8f\xad",
+            ':black_left_pointing_double_triangle_with_vertical_bar:'  => "\xe2\x8f\xae",
+            ':black_right_pointing_triangle_with_double_vertical_bar:' => "\xe2\x8f\xaf",
+            ':alarm_clock:'                                            => "\xe2\x8f\xb0",
+            ':stopwatch:'                                              => "\xe2\x8f\xb1",
+            ':timer_clock:'                                            => "\xe2\x8f\xb2",
+            ':hourglass_flowing_sand:'                                 => "\xe2\x8f\xb3",
+            ':double_vertical_bar:'                                    => "\xe2\x8f\xb8",
+            ':black_square_for_stop:'                                  => "\xe2\x8f\xb9",
+            ':black_circle_for_record:'                                => "\xe2\x8f\xba",
+            ':m:'                                                      => "\xe2\x93\x82",
+            ':black_small_square:'                                     => "\xe2\x96\xaa",
+            ':white_small_square:'                                     => "\xe2\x96\xab",
+            ':arrow_forward:'                                          => "\xe2\x96\xb6",
+            ':arrow_backward:'                                         => "\xe2\x97\x80",
+            ':white_medium_square:'                                    => "\xe2\x97\xbb",
+            ':black_medium_square:'                                    => "\xe2\x97\xbc",
+            ':white_medium_small_square:'                              => "\xe2\x97\xbd",
+            ':black_medium_small_square:'                              => "\xe2\x97\xbe",
+            ':sunny:'                                                  => "\xe2\x98\x80",
+            ':cloud:'                                                  => "\xe2\x98\x81",
+            ':umbrella:'                                               => "\xe2\x98\x94",
+            ':showman:'                                                => "\xe2\x98\x83",
+            ':comet:'                                                  => "\xe2\x98\x84",
+            ':phone:'                                                  => "\xe2\x98\x8e",
+            ':telephone:'                                              => "\xe2\x98\x8e",
+            ':ballot_box_with_check:'                                  => "\xe2\x98\x91",
+            ':coffee:'                                                 => "\xe2\x98\x95",
+            ':shamrock:'                                               => "\xe2\x98\x98",
+            ':point_up:'                                               => "\xe2\x98\x9d",
+            ':skull_and_crossbones:'                                   => "\xe2\x98\xa0",
+            ':radioactive_sign:'                                       => "\xe2\x98\xa2",
+            ':biohazard_sign:'                                         => "\xe2\x98\xa3",
+            ':orthodox_cross:'                                         => "\xe2\x98\xa6",
+            ':star_and_crescent:'                                      => "\xe2\x98\xaa",
+            ':peace_symbol:'                                           => "\xe2\x98\xae",
+            ':yin_yang:'                                               => "\xe2\x98\xaf",
+            ':wheel_of_dharma:'                                        => "\xe2\x98\xb8",
+            ':white_frowning_face:'                                    => "\xe2\x98\xb9",
+            ':relaxed:'                                                => "\xe2\x98\xba",
+            ':aries:'                                                  => "\xe2\x99\x88",
+            ':taurus:'                                                 => "\xe2\x99\x89",
+            ':gemini:'                                                 => "\xe2\x99\x8a",
+            ':cancer:'                                                 => "\xe2\x99\x8b",
+            ':leo:'                                                    => "\xe2\x99\x8c",
+            ':virgo:'                                                  => "\xe2\x99\x8d",
+            ':libra:'                                                  => "\xe2\x99\x8e",
+            ':scorpius:'                                               => "\xe2\x99\x8f",
+            ':sagittarius:'                                            => "\xe2\x99\x90",
+            ':capricorn:'                                              => "\xe2\x99\x91",
+            ':aquarius:'                                               => "\xe2\x99\x92",
+            ':pisces:'                                                 => "\xe2\x99\x93",
+            ':spades:'                                                 => "\xe2\x99\xa0",
+            ':clubs:'                                                  => "\xe2\x99\xa3",
+            ':hearts:'                                                 => "\xe2\x99\xa5",
+            ':diamonds:'                                               => "\xe2\x99\xa6",
+            ':hotsprings:'                                             => "\xe2\x99\xa8",
+            ':recycle:'                                                => "\xe2\x99\xbb",
+            ':wheelchair:'                                             => "\xe2\x99\xbf",
+            ':hammer_and_pick:'                                        => "\xe2\x9a\x92",
+            ':anchor:'                                                 => "\xe2\x9a\x93",
+            ':crossed_swords:'                                         => "\xe2\x9a\x94",
+            ':scales:'                                                 => "\xe2\x9a\x96",
+            ':alembic:'                                                => "\xe2\x9a\x97",
+            ':gear:'                                                   => "\xe2\x9a\x99",
+            ':atom_symbol:'                                            => "\xe2\x9a\x9b",
+            ':fleur_de_lis:'                                           => "\xe2\x9a\x9c",
+            ':warning:'                                                => "\xe2\x9a\xa0",
+            ':zap:'                                                    => "\xe2\x9a\xa1",
+            ':white_circle:'                                           => "\xe2\x9a\xaa",
+            ':black_circle:'                                           => "\xe2\x9a\xab",
+            ':coffin:'                                                 => "\xe2\x9a\xb0",
+            ':funeral_urn:'                                            => "\xe2\x9a\xb1",
+            ':soccer:'                                                 => "\xe2\x9a\xbd",
+            ':baseball:'                                               => "\xe2\x9a\xbe",
+            ':snowman:'                                                => "\xe2\x9b\x84",
+            ':partly_sunny:'                                           => "\xe2\x9b\x85",
+            ':thunder_cloud_and_rain:'                                 => "\xe2\x9b\x88",
+            ':ophiuchus:'                                              => "\xe2\x9b\x8e",
+            ':pick:'                                                   => "\xe2\x9b\x8f",
+            ':helmet_with_white_cross:'                                => "\xe2\x9b\x91",
+            ':chains:'                                                 => "\xe2\x9b\x93",
+            ':no_entry:'                                               => "\xe2\x9b\x94",
+            ':shinto_shrine:'                                          => "\xe2\x9b\xa9",
+            ':church:'                                                 => "\xe2\x9b\xaa",
+            ':mountain:'                                               => "\xe2\x9b\xb0",
+            ':umbrella_on_ground:'                                     => "\xe2\x9b\xb1",
+            ':fountain:'                                               => "\xe2\x9b\xb2",
+            ':golf:'                                                   => "\xe2\x9b\xb3",
+            ':ferry:'                                                  => "\xe2\x9b\xb4",
+            ':boat:'                                                   => "\xe2\x9b\xb5",
+            ':sailboat:'                                               => "\xe2\x9b\xb5",
+            ':skier:'                                                  => "\xe2\x9b\xb7",
+            ':ice_skate:'                                              => "\xe2\x9b\xb8",
+            ':person_with_ball:'                                       => "\xe2\x9b\xb9",
+            ':tent:'                                                   => "\xe2\x9b\xba",
+            ':fuelpump:'                                               => "\xe2\x9b\xbd",
+            ':scissors:'                                               => "\xe2\x9c\x82",
+            ':white_check_mark:'                                       => "\xe2\x9c\x85",
+            ':airplane:'                                               => "\xe2\x9c\x88",
+            ':email:'                                                  => "\xe2\x9c\x89",
+            ':envelope:'                                               => "\xe2\x9c\x89",
+            ':fist:'                                                   => "\xe2\x9c\x8a",
+            ':hand:'                                                   => "\xe2\x9c\x8b",
+            ':raised_hand:'                                            => "\xe2\x9c\x8b",
+            ':v:'                                                      => "\xe2\x9c\x8c",
+            ':writing_hand:'                                           => "\xe2\x9c\x8d",
+            ':pencil2:'                                                => "\xe2\x9c\x8f",
+            ':black_nib:'                                              => "\xe2\x9c\x92",
+            ':heavy_check_mark:'                                       => "\xe2\x9c\x94",
+            ':heavy_multiplication_x:'                                 => "\xe2\x9c\x96",
+            ':latin_cross:'                                            => "\xe2\x9c\x9d",
+            ':star_of_david:'                                          => "\xe2\x9c\xa1",
+            ':sparkles:'                                               => "\xe2\x9c\xa8",
+            ':eight_spoked_asterisk:'                                  => "\xe2\x9c\xb3",
+            ':eight_pointed_black_star:'                               => "\xe2\x9c\xb4",
+            ':snowflake:'                                              => "\xe2\x9d\x84",
+            ':sparkle:'                                                => "\xe2\x9d\x87",
+            ':x:'                                                      => "\xe2\x9d\x8c",
+            ':negative_squared_cross_mark:'                            => "\xe2\x9d\x8e",
+            ':question:'                                               => "\xe2\x9d\x93",
+            ':grey_question:'                                          => "\xe2\x9d\x94",
+            ':grey_exclamation:'                                       => "\xe2\x9d\x95",
+            ':exclamation:'                                            => "\xe2\x9d\x97",
+            ':heavy_exclamation_mark:'                                 => "\xe2\x9d\x97",
+            ':heavy_heart_exclamation_mark_ornament:'                  => "\xe2\x9d\xa3",
+            ':heart:'                                                  => "\xe2\x9d\xa4",
+            ':heavy_plus_sign:'                                        => "\xe2\x9e\x95",
+            ':heavy_minus_sign:'                                       => "\xe2\x9e\x96",
+            ':heavy_division_sign:'                                    => "\xe2\x9e\x97",
+            ':arrow_right:'                                            => "\xe2\x9e\xa1",
+            ':curly_loop:'                                             => "\xe2\x9e\xb0",
+            ':loop:'                                                   => "\xe2\x9e\xbf",
+            ':arrow_heading_up:'                                       => "\xe2\xa4\xb4",
+            ':arrow_heading_down:'                                     => "\xe2\xa4\xb5",
+            ':arrow_left:'                                             => "\xe2\xac\x85",
+            ':arrow_up:'                                               => "\xe2\xac\x86",
+            ':arrow_down:'                                             => "\xe2\xac\x87",
+            ':black_large_square:'                                     => "\xe2\xac\x9b",
+            ':white_large_square:'                                     => "\xe2\xac\x9c",
+            ':star:'                                                   => "\xe2\xad\x90",
+            ':o:'                                                      => "\xe2\xad\x95",
+            ':wavy_dash:'                                              => "\xe3\x80\xb0",
+            ':part_alternation_mark:'                                  => "\xe3\x80\xbd",
+            ':congratulations:'                                        => "\xe3\x8a\x97",
+            ':secret:'                                                 => "\xe3\x8a\x99",
+            ':mahjong:'                                                => "\xf0\x9f\x80\x84",
+            ':black_joker:'                                            => "\xf0\x9f\x83\x8f",
+            ':a:'                                                      => "\xf0\x9f\x85\xb0",
+            ':b:'                                                      => "\xf0\x9f\x85\xb1",
+            ':o2:'                                                     => "\xf0\x9f\x85\xbe",
+            ':parking:'                                                => "\xf0\x9f\x85\xbf",
+            ':ab:'                                                     => "\xf0\x9f\x86\x8e",
+            ':cl:'                                                     => "\xf0\x9f\x86\x91",
+            ':cool:'                                                   => "\xf0\x9f\x86\x92",
+            ':free:'                                                   => "\xf0\x9f\x86\x93",
+            ':id:'                                                     => "\xf0\x9f\x86\x94",
+            ':new:'                                                    => "\xf0\x9f\x86\x95",
+            ':ng:'                                                     => "\xf0\x9f\x86\x96",
+            ':ok:'                                                     => "\xf0\x9f\x86\x97",
+            ':sos:'                                                    => "\xf0\x9f\x86\x98",
+            ':up:'                                                     => "\xf0\x9f\x86\x99",
+            ':vs:'                                                     => "\xf0\x9f\x86\x9a",
+            ':koko:'                                                   => "\xf0\x9f\x88\x81",
+            ':sa:'                                                     => "\xf0\x9f\x88\x82",
+            ':u7121:'                                                  => "\xf0\x9f\x88\x9a",
+            ':u6307:'                                                  => "\xf0\x9f\x88\xaf",
+            ':u7981:'                                                  => "\xf0\x9f\x88\xb2",
+            ':u7a7a:'                                                  => "\xf0\x9f\x88\xb3",
+            ':u5408:'                                                  => "\xf0\x9f\x88\xb4",
+            ':u6e80:'                                                  => "\xf0\x9f\x88\xb5",
+            ':u6709:'                                                  => "\xf0\x9f\x88\xb6",
+            ':u6708:'                                                  => "\xf0\x9f\x88\xb7",
+            ':u7533:'                                                  => "\xf0\x9f\x88\xb8",
+            ':u5272:'                                                  => "\xf0\x9f\x88\xb9",
+            ':u55b6:'                                                  => "\xf0\x9f\x88\xba",
+            ':ideograph_advantage:'                                    => "\xf0\x9f\x89\x90",
+            ':accept:'                                                 => "\xf0\x9f\x89\x91",
+            ':cyclone:'                                                => "\xf0\x9f\x8c\x80",
+            ':foggy:'                                                  => "\xf0\x9f\x8c\x81",
+            ':closed_umbrella:'                                        => "\xf0\x9f\x8c\x82",
+            ':night_with_stars:'                                       => "\xf0\x9f\x8c\x83",
+            ':sunrise_over_mountains:'                                 => "\xf0\x9f\x8c\x84",
+            ':sunrise:'                                                => "\xf0\x9f\x8c\x85",
+            ':city_sunset:'                                            => "\xf0\x9f\x8c\x86",
+            ':city_sunrise:'                                           => "\xf0\x9f\x8c\x87",
+            ':rainbow:'                                                => "\xf0\x9f\x8c\x88",
+            ':bridge_at_night:'                                        => "\xf0\x9f\x8c\x89",
+            ':ocean:'                                                  => "\xf0\x9f\x8c\x8a",
+            ':volcano:'                                                => "\xf0\x9f\x8c\x8b",
+            ':milky_way:'                                              => "\xf0\x9f\x8c\x8c",
+            ':earth_africa:'                                           => "\xf0\x9f\x8c\x8d",
+            ':earth_americas:'                                         => "\xf0\x9f\x8c\x8e",
+            ':earth_asia:'                                             => "\xf0\x9f\x8c\x8f",
+            ':globe_with_meridians:'                                   => "\xf0\x9f\x8c\x90",
+            ':new_moon:'                                               => "\xf0\x9f\x8c\x91",
+            ':waxing_crescent_moon:'                                   => "\xf0\x9f\x8c\x92",
+            ':first_quarter_moon:'                                     => "\xf0\x9f\x8c\x93",
+            ':moon:'                                                   => "\xf0\x9f\x8c\x94",
+            ':waxing_gibbous_moon:'                                    => "\xf0\x9f\x8c\x94",
+            ':full_moon:'                                              => "\xf0\x9f\x8c\x95",
+            ':waning_gibbous_moon:'                                    => "\xf0\x9f\x8c\x96",
+            ':last_quarter_moon:'                                      => "\xf0\x9f\x8c\x97",
+            ':waning_crescent_moon:'                                   => "\xf0\x9f\x8c\x98",
+            ':crescent_moon:'                                          => "\xf0\x9f\x8c\x99",
+            ':new_moon_with_face:'                                     => "\xf0\x9f\x8c\x9a",
+            ':first_quarter_moon_with_face:'                           => "\xf0\x9f\x8c\x9b",
+            ':last_quarter_moon_with_face:'                            => "\xf0\x9f\x8c\x9c",
+            ':full_moon_with_face:'                                    => "\xf0\x9f\x8c\x9d",
+            ':sun_with_face:'                                          => "\xf0\x9f\x8c\x9e",
+            ':star2:'                                                  => "\xf0\x9f\x8c\x9f",
+            ':stars:'                                                  => "\xf0\x9f\x8c\xa0",
+            ':thermometer:'                                            => "\xf0\x9f\x8c\xa1",
+            ':mostly_sunny:'                                           => "\xf0\x9f\x8c\xa4",
+            ':sun_small_cloud:'                                        => "\xf0\x9f\x8c\xa4",
+            ':barely_sunny:'                                           => "\xf0\x9f\x8c\xa5",
+            ':sun_behind_cloud:'                                       => "\xf0\x9f\x8c\xa5",
+            ':partly_sunny_rain:'                                      => "\xf0\x9f\x8c\xa6",
+            ':sun_behind_rain_cloud:'                                  => "\xf0\x9f\x8c\xa6",
+            ':rain_cloud:'                                             => "\xf0\x9f\x8c\xa7",
+            ':snow_cloud:'                                             => "\xf0\x9f\x8c\xa8",
+            ':lightning:'                                              => "\xf0\x9f\x8c\xa9",
+            ':lightning_cloud:'                                        => "\xf0\x9f\x8c\xa9",
+            ':tornado:'                                                => "\xf0\x9f\x8c\xaa",
+            ':tornado_cloud:'                                          => "\xf0\x9f\x8c\xaa",
+            ':fog:'                                                    => "\xf0\x9f\x8c\xab",
+            ':wind_blowing_face:'                                      => "\xf0\x9f\x8c\xac",
+            ':hotdog:'                                                 => "\xf0\x9f\x8c\xad",
+            ':taco:'                                                   => "\xf0\x9f\x8c\xae",
+            ':burrito:'                                                => "\xf0\x9f\x8c\xaf",
+            ':chestnut:'                                               => "\xf0\x9f\x8c\xb0",
+            ':seedling:'                                               => "\xf0\x9f\x8c\xb1",
+            ':evergreen_tree:'                                         => "\xf0\x9f\x8c\xb2",
+            ':deciduous_tree:'                                         => "\xf0\x9f\x8c\xb3",
+            ':palm_tree:'                                              => "\xf0\x9f\x8c\xb4",
+            ':cactus:'                                                 => "\xf0\x9f\x8c\xb5",
+            ':hot_pepper:'                                             => "\xf0\x9f\x8c\xb6",
+            ':tulip:'                                                  => "\xf0\x9f\x8c\xb7",
+            ':cherry_blossom:'                                         => "\xf0\x9f\x8c\xb8",
+            ':rose:'                                                   => "\xf0\x9f\x8c\xb9",
+            ':hibiscus:'                                               => "\xf0\x9f\x8c\xba",
+            ':sunflower:'                                              => "\xf0\x9f\x8c\xbb",
+            ':blossom:'                                                => "\xf0\x9f\x8c\xbc",
+            ':corn:'                                                   => "\xf0\x9f\x8c\xbd",
+            ':ear_of_rice:'                                            => "\xf0\x9f\x8c\xbe",
+            ':herb:'                                                   => "\xf0\x9f\x8c\xbf",
+            ':four_leaf_clover:'                                       => "\xf0\x9f\x8d\x80",
+            ':maple_leaf:'                                             => "\xf0\x9f\x8d\x81",
+            ':fallen_leaf:'                                            => "\xf0\x9f\x8d\x82",
+            ':leaves:'                                                 => "\xf0\x9f\x8d\x83",
+            ':mushroom:'                                               => "\xf0\x9f\x8d\x84",
+            ':tomato:'                                                 => "\xf0\x9f\x8d\x85",
+            ':eggplant:'                                               => "\xf0\x9f\x8d\x86",
+            ':grapes:'                                                 => "\xf0\x9f\x8d\x87",
+            ':melon:'                                                  => "\xf0\x9f\x8d\x88",
+            ':watermelon:'                                             => "\xf0\x9f\x8d\x89",
+            ':tangerine:'                                              => "\xf0\x9f\x8d\x8a",
+            ':lemon:'                                                  => "\xf0\x9f\x8d\x8b",
+            ':banana:'                                                 => "\xf0\x9f\x8d\x8c",
+            ':pineapple:'                                              => "\xf0\x9f\x8d\x8d",
+            ':apple:'                                                  => "\xf0\x9f\x8d\x8e",
+            ':green_apple:'                                            => "\xf0\x9f\x8d\x8f",
+            ':pear:'                                                   => "\xf0\x9f\x8d\x90",
+            ':peach:'                                                  => "\xf0\x9f\x8d\x91",
+            ':cherries:'                                               => "\xf0\x9f\x8d\x92",
+            ':strawberry:'                                             => "\xf0\x9f\x8d\x93",
+            ':hamburger:'                                              => "\xf0\x9f\x8d\x94",
+            ':pizza:'                                                  => "\xf0\x9f\x8d\x95",
+            ':meat_on_bone:'                                           => "\xf0\x9f\x8d\x96",
+            ':poultry_leg:'                                            => "\xf0\x9f\x8d\x97",
+            ':rice_cracker:'                                           => "\xf0\x9f\x8d\x98",
+            ':rice_ball:'                                              => "\xf0\x9f\x8d\x99",
+            ':rice:'                                                   => "\xf0\x9f\x8d\x9a",
+            ':curry:'                                                  => "\xf0\x9f\x8d\x9b",
+            ':ramen:'                                                  => "\xf0\x9f\x8d\x9c",
+            ':spaghetti:'                                              => "\xf0\x9f\x8d\x9d",
+            ':bread:'                                                  => "\xf0\x9f\x8d\x9e",
+            ':fries:'                                                  => "\xf0\x9f\x8d\x9f",
+            ':sweet_potato:'                                           => "\xf0\x9f\x8d\xa0",
+            ':dango:'                                                  => "\xf0\x9f\x8d\xa1",
+            ':oden:'                                                   => "\xf0\x9f\x8d\xa2",
+            ':sushi:'                                                  => "\xf0\x9f\x8d\xa3",
+            ':fried_shrimp:'                                           => "\xf0\x9f\x8d\xa4",
+            ':fish_cake:'                                              => "\xf0\x9f\x8d\xa5",
+            ':icecream:'                                               => "\xf0\x9f\x8d\xa6",
+            ':shaved_ice:'                                             => "\xf0\x9f\x8d\xa7",
+            ':ice_cream:'                                              => "\xf0\x9f\x8d\xa8",
+            ':doughnut:'                                               => "\xf0\x9f\x8d\xa9",
+            ':cookie:'                                                 => "\xf0\x9f\x8d\xaa",
+            ':chocolate_bar:'                                          => "\xf0\x9f\x8d\xab",
+            ':candy:'                                                  => "\xf0\x9f\x8d\xac",
+            ':lollipop:'                                               => "\xf0\x9f\x8d\xad",
+            ':custard:'                                                => "\xf0\x9f\x8d\xae",
+            ':honey_pot:'                                              => "\xf0\x9f\x8d\xaf",
+            ':cake:'                                                   => "\xf0\x9f\x8d\xb0",
+            ':bento:'                                                  => "\xf0\x9f\x8d\xb1",
+            ':stew:'                                                   => "\xf0\x9f\x8d\xb2",
+            ':egg:'                                                    => "\xf0\x9f\x8d\xb3",
+            ':fork_and_knife:'                                         => "\xf0\x9f\x8d\xb4",
+            ':tea:'                                                    => "\xf0\x9f\x8d\xb5",
+            ':sake:'                                                   => "\xf0\x9f\x8d\xb6",
+            ':wine_glass:'                                             => "\xf0\x9f\x8d\xb7",
+            ':cocktail:'                                               => "\xf0\x9f\x8d\xb8",
+            ':tropical_drink:'                                         => "\xf0\x9f\x8d\xb9",
+            ':beer:'                                                   => "\xf0\x9f\x8d\xba",
+            ':beers:'                                                  => "\xf0\x9f\x8d\xbb",
+            ':baby_bottle:'                                            => "\xf0\x9f\x8d\xbc",
+            ':knife_fork_plate:'                                       => "\xf0\x9f\x8d\xbd",
+            ':champagne:'                                              => "\xf0\x9f\x8d\xbe",
+            ':popcorn:'                                                => "\xf0\x9f\x8d\xbf",
+            ':ribbon:'                                                 => "\xf0\x9f\x8e\x80",
+            ':gift:'                                                   => "\xf0\x9f\x8e\x81",
+            ':birthday:'                                               => "\xf0\x9f\x8e\x82",
+            ':jack_o_lantern:'                                         => "\xf0\x9f\x8e\x83",
+            ':christmas_tree:'                                         => "\xf0\x9f\x8e\x84",
+            ':santa:'                                                  => "\xf0\x9f\x8e\x85",
+            ':fireworks:'                                              => "\xf0\x9f\x8e\x86",
+            ':sparkler:'                                               => "\xf0\x9f\x8e\x87",
+            ':balloon:'                                                => "\xf0\x9f\x8e\x88",
+            ':tada:'                                                   => "\xf0\x9f\x8e\x89",
+            ':confetti_ball:'                                          => "\xf0\x9f\x8e\x8a",
+            ':tanabata_tree:'                                          => "\xf0\x9f\x8e\x8b",
+            ':crossed_flags:'                                          => "\xf0\x9f\x8e\x8c",
+            ':bamboo:'                                                 => "\xf0\x9f\x8e\x8d",
+            ':dolls:'                                                  => "\xf0\x9f\x8e\x8e",
+            ':flags:'                                                  => "\xf0\x9f\x8e\x8f",
+            ':wind_chime:'                                             => "\xf0\x9f\x8e\x90",
+            ':rice_scene:'                                             => "\xf0\x9f\x8e\x91",
+            ':school_satchel:'                                         => "\xf0\x9f\x8e\x92",
+            ':mortar_board:'                                           => "\xf0\x9f\x8e\x93",
+            ':medal:'                                                  => "\xf0\x9f\x8e\x96",
+            ':reminder_ribbon:'                                        => "\xf0\x9f\x8e\x97",
+            ':studio_microphone:'                                      => "\xf0\x9f\x8e\x99",
+            ':level_slider:'                                           => "\xf0\x9f\x8e\x9a",
+            ':control_knobs:'                                          => "\xf0\x9f\x8e\x9b",
+            ':film_frames:'                                            => "\xf0\x9f\x8e\x9e",
+            ':admission_tickets:'                                      => "\xf0\x9f\x8e\x9f",
+            ':carousel_horse:'                                         => "\xf0\x9f\x8e\xa0",
+            ':ferris_wheel:'                                           => "\xf0\x9f\x8e\xa1",
+            ':roller_coaster:'                                         => "\xf0\x9f\x8e\xa2",
+            ':fishing_pole_and_fish:'                                  => "\xf0\x9f\x8e\xa3",
+            ':microphone:'                                             => "\xf0\x9f\x8e\xa4",
+            ':movie_camera:'                                           => "\xf0\x9f\x8e\xa5",
+            ':cinema:'                                                 => "\xf0\x9f\x8e\xa6",
+            ':headphones:'                                             => "\xf0\x9f\x8e\xa7",
+            ':art:'                                                    => "\xf0\x9f\x8e\xa8",
+            ':tophat:'                                                 => "\xf0\x9f\x8e\xa9",
+            ':circus_tent:'                                            => "\xf0\x9f\x8e\xaa",
+            ':ticket:'                                                 => "\xf0\x9f\x8e\xab",
+            ':clapper:'                                                => "\xf0\x9f\x8e\xac",
+            ':performing_arts:'                                        => "\xf0\x9f\x8e\xad",
+            ':video_game:'                                             => "\xf0\x9f\x8e\xae",
+            ':dart:'                                                   => "\xf0\x9f\x8e\xaf",
+            ':slot_machine:'                                           => "\xf0\x9f\x8e\xb0",
+            ':8ball:'                                                  => "\xf0\x9f\x8e\xb1",
+            ':game_die:'                                               => "\xf0\x9f\x8e\xb2",
+            ':bowling:'                                                => "\xf0\x9f\x8e\xb3",
+            ':flower_playing_cards:'                                   => "\xf0\x9f\x8e\xb4",
+            ':musical_note:'                                           => "\xf0\x9f\x8e\xb5",
+            ':notes:'                                                  => "\xf0\x9f\x8e\xb6",
+            ':saxophone:'                                              => "\xf0\x9f\x8e\xb7",
+            ':guitar:'                                                 => "\xf0\x9f\x8e\xb8",
+            ':musical_keyboard:'                                       => "\xf0\x9f\x8e\xb9",
+            ':trumpet:'                                                => "\xf0\x9f\x8e\xba",
+            ':violin:'                                                 => "\xf0\x9f\x8e\xbb",
+            ':musical_score:'                                          => "\xf0\x9f\x8e\xbc",
+            ':running_shirt_with_sash:'                                => "\xf0\x9f\x8e\xbd",
+            ':tennis:'                                                 => "\xf0\x9f\x8e\xbe",
+            ':ski:'                                                    => "\xf0\x9f\x8e\xbf",
+            ':basketball:'                                             => "\xf0\x9f\x8f\x80",
+            ':checkered_flag:'                                         => "\xf0\x9f\x8f\x81",
+            ':snowboarder:'                                            => "\xf0\x9f\x8f\x82",
+            ':runner:'                                                 => "\xf0\x9f\x8f\x83",
+            ':running:'                                                => "\xf0\x9f\x8f\x83",
+            ':surfer:'                                                 => "\xf0\x9f\x8f\x84",
+            ':sports_medal:'                                           => "\xf0\x9f\x8f\x85",
+            ':trophy:'                                                 => "\xf0\x9f\x8f\x86",
+            ':horse_racing:'                                           => "\xf0\x9f\x8f\x87",
+            ':football:'                                               => "\xf0\x9f\x8f\x88",
+            ':rugby_football:'                                         => "\xf0\x9f\x8f\x89",
+            ':swimmer:'                                                => "\xf0\x9f\x8f\x8a",
+            ':weight_lifter:'                                          => "\xf0\x9f\x8f\x8b",
+            ':golfer:'                                                 => "\xf0\x9f\x8f\x8c",
+            ':racing_motorcycle:'                                      => "\xf0\x9f\x8f\x8d",
+            ':racing_car:'                                             => "\xf0\x9f\x8f\x8e",
+            ':cricket_bat_and_ball:'                                   => "\xf0\x9f\x8f\x8f",
+            ':volleyball:'                                             => "\xf0\x9f\x8f\x90",
+            ':field_hockey_stick_and_ball:'                            => "\xf0\x9f\x8f\x91",
+            ':ice_hockey_stick_and_puck:'                              => "\xf0\x9f\x8f\x92",
+            ':table_tennis_paddle_and_ball:'                           => "\xf0\x9f\x8f\x93",
+            ':snow_capped_mountain:'                                   => "\xf0\x9f\x8f\x94",
+            ':camping:'                                                => "\xf0\x9f\x8f\x95",
+            ':beach_with_umbrella:'                                    => "\xf0\x9f\x8f\x96",
+            ':building_construction:'                                  => "\xf0\x9f\x8f\x97",
+            ':house_buildings:'                                        => "\xf0\x9f\x8f\x98",
+            ':cityscape:'                                              => "\xf0\x9f\x8f\x99",
+            ':derelict_house_building:'                                => "\xf0\x9f\x8f\x9a",
+            ':classical_building:'                                     => "\xf0\x9f\x8f\x9b",
+            ':desert:'                                                 => "\xf0\x9f\x8f\x9c",
+            ':desert_island:'                                          => "\xf0\x9f\x8f\x9d",
+            ':national_park:'                                          => "\xf0\x9f\x8f\x9e",
+            ':stadium:'                                                => "\xf0\x9f\x8f\x9f",
+            ':house:'                                                  => "\xf0\x9f\x8f\xa0",
+            ':house_with_garden:'                                      => "\xf0\x9f\x8f\xa1",
+            ':office:'                                                 => "\xf0\x9f\x8f\xa2",
+            ':post_office:'                                            => "\xf0\x9f\x8f\xa3",
+            ':european_post_office:'                                   => "\xf0\x9f\x8f\xa4",
+            ':hospital:'                                               => "\xf0\x9f\x8f\xa5",
+            ':bank:'                                                   => "\xf0\x9f\x8f\xa6",
+            ':atm:'                                                    => "\xf0\x9f\x8f\xa7",
+            ':hotel:'                                                  => "\xf0\x9f\x8f\xa8",
+            ':love_hotel:'                                             => "\xf0\x9f\x8f\xa9",
+            ':convenience_store:'                                      => "\xf0\x9f\x8f\xaa",
+            ':school:'                                                 => "\xf0\x9f\x8f\xab",
+            ':department_store:'                                       => "\xf0\x9f\x8f\xac",
+            ':factory:'                                                => "\xf0\x9f\x8f\xad",
+            ':izakaya_lantern:'                                        => "\xf0\x9f\x8f\xae",
+            ':lantern:'                                                => "\xf0\x9f\x8f\xae",
+            ':japanese_castle:'                                        => "\xf0\x9f\x8f\xaf",
+            ':european_castle:'                                        => "\xf0\x9f\x8f\xb0",
+            ':waving_white_flag:'                                      => "\xf0\x9f\x8f\xb3",
+            ':waving_black_flag:'                                      => "\xf0\x9f\x8f\xb4",
+            ':rosette:'                                                => "\xf0\x9f\x8f\xb5",
+            ':label:'                                                  => "\xf0\x9f\x8f\xb7",
+            ':badminton_racquet_and_shuttlecock:'                      => "\xf0\x9f\x8f\xb8",
+            ':bow_and_arrow:'                                          => "\xf0\x9f\x8f\xb9",
+            ':amphora:'                                                => "\xf0\x9f\x8f\xba",
+            ':skin-tone-2:'                                            => "\xf0\x9f\x8f\xbb",
+            ':skin-tone-3:'                                            => "\xf0\x9f\x8f\xbc",
+            ':skin-tone-4:'                                            => "\xf0\x9f\x8f\xbd",
+            ':skin-tone-5:'                                            => "\xf0\x9f\x8f\xbe",
+            ':skin-tone-6:'                                            => "\xf0\x9f\x8f\xbf",
+            ':rat:'                                                    => "\xf0\x9f\x90\x80",
+            ':mouse2:'                                                 => "\xf0\x9f\x90\x81",
+            ':ox:'                                                     => "\xf0\x9f\x90\x82",
+            ':water_buffalo:'                                          => "\xf0\x9f\x90\x83",
+            ':cow2:'                                                   => "\xf0\x9f\x90\x84",
+            ':tiger2:'                                                 => "\xf0\x9f\x90\x85",
+            ':leopard:'                                                => "\xf0\x9f\x90\x86",
+            ':rabbit2:'                                                => "\xf0\x9f\x90\x87",
+            ':cat2:'                                                   => "\xf0\x9f\x90\x88",
+            ':dragon:'                                                 => "\xf0\x9f\x90\x89",
+            ':crocodile:'                                              => "\xf0\x9f\x90\x8a",
+            ':whale2:'                                                 => "\xf0\x9f\x90\x8b",
+            ':snail:'                                                  => "\xf0\x9f\x90\x8c",
+            ':snake:'                                                  => "\xf0\x9f\x90\x8d",
+            ':racehorse:'                                              => "\xf0\x9f\x90\x8e",
+            ':ram:'                                                    => "\xf0\x9f\x90\x8f",
+            ':goat:'                                                   => "\xf0\x9f\x90\x90",
+            ':sheep:'                                                  => "\xf0\x9f\x90\x91",
+            ':monkey:'                                                 => "\xf0\x9f\x90\x92",
+            ':rooster:'                                                => "\xf0\x9f\x90\x93",
+            ':chicken:'                                                => "\xf0\x9f\x90\x94",
+            ':dog2:'                                                   => "\xf0\x9f\x90\x95",
+            ':pig2:'                                                   => "\xf0\x9f\x90\x96",
+            ':boar:'                                                   => "\xf0\x9f\x90\x97",
+            ':elephant:'                                               => "\xf0\x9f\x90\x98",
+            ':octopus:'                                                => "\xf0\x9f\x90\x99",
+            ':shell:'                                                  => "\xf0\x9f\x90\x9a",
+            ':bug:'                                                    => "\xf0\x9f\x90\x9b",
+            ':ant:'                                                    => "\xf0\x9f\x90\x9c",
+            ':bee:'                                                    => "\xf0\x9f\x90\x9d",
+            ':honeybee:'                                               => "\xf0\x9f\x90\x9d",
+            ':beetle:'                                                 => "\xf0\x9f\x90\x9e",
+            ':fish:'                                                   => "\xf0\x9f\x90\x9f",
+            ':tropical_fish:'                                          => "\xf0\x9f\x90\xa0",
+            ':blowfish:'                                               => "\xf0\x9f\x90\xa1",
+            ':turtle:'                                                 => "\xf0\x9f\x90\xa2",
+            ':hatching_chick:'                                         => "\xf0\x9f\x90\xa3",
+            ':baby_chick:'                                             => "\xf0\x9f\x90\xa4",
+            ':hatched_chick:'                                          => "\xf0\x9f\x90\xa5",
+            ':bird:'                                                   => "\xf0\x9f\x90\xa6",
+            ':penguin:'                                                => "\xf0\x9f\x90\xa7",
+            ':koala:'                                                  => "\xf0\x9f\x90\xa8",
+            ':poodle:'                                                 => "\xf0\x9f\x90\xa9",
+            ':dromedary_camel:'                                        => "\xf0\x9f\x90\xaa",
+            ':camel:'                                                  => "\xf0\x9f\x90\xab",
+            ':dolphin:'                                                => "\xf0\x9f\x90\xac",
+            ':flipper:'                                                => "\xf0\x9f\x90\xac",
+            ':mouse:'                                                  => "\xf0\x9f\x90\xad",
+            ':cow:'                                                    => "\xf0\x9f\x90\xae",
+            ':tiger:'                                                  => "\xf0\x9f\x90\xaf",
+            ':rabbit:'                                                 => "\xf0\x9f\x90\xb0",
+            ':cat:'                                                    => "\xf0\x9f\x90\xb1",
+            ':dragon_face:'                                            => "\xf0\x9f\x90\xb2",
+            ':whale:'                                                  => "\xf0\x9f\x90\xb3",
+            ':horse:'                                                  => "\xf0\x9f\x90\xb4",
+            ':monkey_face:'                                            => "\xf0\x9f\x90\xb5",
+            ':dog:'                                                    => "\xf0\x9f\x90\xb6",
+            ':pig:'                                                    => "\xf0\x9f\x90\xb7",
+            ':frog:'                                                   => "\xf0\x9f\x90\xb8",
+            ':hamster:'                                                => "\xf0\x9f\x90\xb9",
+            ':wolf:'                                                   => "\xf0\x9f\x90\xba",
+            ':bear:'                                                   => "\xf0\x9f\x90\xbb",
+            ':panda_face:'                                             => "\xf0\x9f\x90\xbc",
+            ':pig_nose:'                                               => "\xf0\x9f\x90\xbd",
+            ':feet:'                                                   => "\xf0\x9f\x90\xbe",
+            ':paw_prints:'                                             => "\xf0\x9f\x90\xbe",
+            ':chipmunk:'                                               => "\xf0\x9f\x90\xbf",
+            ':eyes:'                                                   => "\xf0\x9f\x91\x80",
+            ':eye:'                                                    => "\xf0\x9f\x91\x81",
+            ':ear:'                                                    => "\xf0\x9f\x91\x82",
+            ':nose:'                                                   => "\xf0\x9f\x91\x83",
+            ':lips:'                                                   => "\xf0\x9f\x91\x84",
+            ':tongue:'                                                 => "\xf0\x9f\x91\x85",
+            ':point_up_2:'                                             => "\xf0\x9f\x91\x86",
+            ':point_down:'                                             => "\xf0\x9f\x91\x87",
+            ':point_left:'                                             => "\xf0\x9f\x91\x88",
+            ':point_right:'                                            => "\xf0\x9f\x91\x89",
+            ':facepunch:'                                              => "\xf0\x9f\x91\x8a",
+            ':punch:'                                                  => "\xf0\x9f\x91\x8a",
+            ':wave:'                                                   => "\xf0\x9f\x91\x8b",
+            ':ok_hand:'                                                => "\xf0\x9f\x91\x8c",
+            ':+1:'                                                     => "\xf0\x9f\x91\x8d",
+            ':thumbsup:'                                               => "\xf0\x9f\x91\x8d",
+            ':-1:'                                                     => "\xf0\x9f\x91\x8e",
+            ':thumbsdown:'                                             => "\xf0\x9f\x91\x8e",
+            ':clap:'                                                   => "\xf0\x9f\x91\x8f",
+            ':open_hands:'                                             => "\xf0\x9f\x91\x90",
+            ':crown:'                                                  => "\xf0\x9f\x91\x91",
+            ':womans_hat:'                                             => "\xf0\x9f\x91\x92",
+            ':eyeglasses:'                                             => "\xf0\x9f\x91\x93",
+            ':necktie:'                                                => "\xf0\x9f\x91\x94",
+            ':shirt:'                                                  => "\xf0\x9f\x91\x95",
+            ':tshirt:'                                                 => "\xf0\x9f\x91\x95",
+            ':jeans:'                                                  => "\xf0\x9f\x91\x96",
+            ':dress:'                                                  => "\xf0\x9f\x91\x97",
+            ':kimono:'                                                 => "\xf0\x9f\x91\x98",
+            ':bikini:'                                                 => "\xf0\x9f\x91\x99",
+            ':womans_clothes:'                                         => "\xf0\x9f\x91\x9a",
+            ':purse:'                                                  => "\xf0\x9f\x91\x9b",
+            ':handbag:'                                                => "\xf0\x9f\x91\x9c",
+            ':pouch:'                                                  => "\xf0\x9f\x91\x9d",
+            ':mans_shoe:'                                              => "\xf0\x9f\x91\x9e",
+            ':shoe:'                                                   => "\xf0\x9f\x91\x9e",
+            ':athletic_shoe:'                                          => "\xf0\x9f\x91\x9f",
+            ':high_heel:'                                              => "\xf0\x9f\x91\xa0",
+            ':sandal:'                                                 => "\xf0\x9f\x91\xa1",
+            ':boot:'                                                   => "\xf0\x9f\x91\xa2",
+            ':footprints:'                                             => "\xf0\x9f\x91\xa3",
+            ':bust_in_silhouette:'                                     => "\xf0\x9f\x91\xa4",
+            ':busts_in_silhouette:'                                    => "\xf0\x9f\x91\xa5",
+            ':boy:'                                                    => "\xf0\x9f\x91\xa6",
+            ':girl:'                                                   => "\xf0\x9f\x91\xa7",
+            ':man:'                                                    => "\xf0\x9f\x91\xa8",
+            ':woman:'                                                  => "\xf0\x9f\x91\xa9",
+            ':family:'                                                 => "\xf0\x9f\x91\xaa",
+            ':man-woman-boy:'                                          => "\xf0\x9f\x91\xaa",
+            ':couple:'                                                 => "\xf0\x9f\x91\xab",
+            ':man_and_woman_holding_hands:'                            => "\xf0\x9f\x91\xab",
+            ':two_men_holding_hands:'                                  => "\xf0\x9f\x91\xac",
+            ':two_women_holding_hands:'                                => "\xf0\x9f\x91\xad",
+            ':cop:'                                                    => "\xf0\x9f\x91\xae",
+            ':dancers:'                                                => "\xf0\x9f\x91\xaf",
+            ':bride_with_veil:'                                        => "\xf0\x9f\x91\xb0",
+            ':person_with_blond_hair:'                                 => "\xf0\x9f\x91\xb1",
+            ':man_with_gua_pi_mao:'                                    => "\xf0\x9f\x91\xb2",
+            ':man_with_turban:'                                        => "\xf0\x9f\x91\xb3",
+            ':older_man:'                                              => "\xf0\x9f\x91\xb4",
+            ':older_woman:'                                            => "\xf0\x9f\x91\xb5",
+            ':baby:'                                                   => "\xf0\x9f\x91\xb6",
+            ':construction_worker:'                                    => "\xf0\x9f\x91\xb7",
+            ':princess:'                                               => "\xf0\x9f\x91\xb8",
+            ':japanese_ogre:'                                          => "\xf0\x9f\x91\xb9",
+            ':japanese_goblin:'                                        => "\xf0\x9f\x91\xba",
+            ':ghost:'                                                  => "\xf0\x9f\x91\xbb",
+            ':angel:'                                                  => "\xf0\x9f\x91\xbc",
+            ':alien:'                                                  => "\xf0\x9f\x91\xbd",
+            ':space_invader:'                                          => "\xf0\x9f\x91\xbe",
+            ':imp:'                                                    => "\xf0\x9f\x91\xbf",
+            ':skull:'                                                  => "\xf0\x9f\x92\x80",
+            ':information_desk_person:'                                => "\xf0\x9f\x92\x81",
+            ':guardsman:'                                              => "\xf0\x9f\x92\x82",
+            ':dancer:'                                                 => "\xf0\x9f\x92\x83",
+            ':lipstick:'                                               => "\xf0\x9f\x92\x84",
+            ':nail_care:'                                              => "\xf0\x9f\x92\x85",
+            ':massage:'                                                => "\xf0\x9f\x92\x86",
+            ':haircut:'                                                => "\xf0\x9f\x92\x87",
+            ':barber:'                                                 => "\xf0\x9f\x92\x88",
+            ':syringe:'                                                => "\xf0\x9f\x92\x89",
+            ':pill:'                                                   => "\xf0\x9f\x92\x8a",
+            ':kiss:'                                                   => "\xf0\x9f\x92\x8b",
+            ':love_letter:'                                            => "\xf0\x9f\x92\x8c",
+            ':ring:'                                                   => "\xf0\x9f\x92\x8d",
+            ':gem:'                                                    => "\xf0\x9f\x92\x8e",
+            ':couplekiss:'                                             => "\xf0\x9f\x92\x8f",
+            ':bouquet:'                                                => "\xf0\x9f\x92\x90",
+            ':couple_with_heart:'                                      => "\xf0\x9f\x92\x91",
+            ':wedding:'                                                => "\xf0\x9f\x92\x92",
+            ':heartbeat:'                                              => "\xf0\x9f\x92\x93",
+            ':broken_heart:'                                           => "\xf0\x9f\x92\x94",
+            ':two_hearts:'                                             => "\xf0\x9f\x92\x95",
+            ':sparkling_heart:'                                        => "\xf0\x9f\x92\x96",
+            ':heartpulse:'                                             => "\xf0\x9f\x92\x97",
+            ':cupid:'                                                  => "\xf0\x9f\x92\x98",
+            ':blue_heart:'                                             => "\xf0\x9f\x92\x99",
+            ':green_heart:'                                            => "\xf0\x9f\x92\x9a",
+            ':yellow_heart:'                                           => "\xf0\x9f\x92\x9b",
+            ':purple_heart:'                                           => "\xf0\x9f\x92\x9c",
+            ':gift_heart:'                                             => "\xf0\x9f\x92\x9d",
+            ':revolving_hearts:'                                       => "\xf0\x9f\x92\x9e",
+            ':heart_decoration:'                                       => "\xf0\x9f\x92\x9f",
+            ':diamond_shape_with_a_dot_inside:'                        => "\xf0\x9f\x92\xa0",
+            ':bulb:'                                                   => "\xf0\x9f\x92\xa1",
+            ':anger:'                                                  => "\xf0\x9f\x92\xa2",
+            ':bomb:'                                                   => "\xf0\x9f\x92\xa3",
+            ':zzz:'                                                    => "\xf0\x9f\x92\xa4",
+            ':boom:'                                                   => "\xf0\x9f\x92\xa5",
+            ':collision:'                                              => "\xf0\x9f\x92\xa5",
+            ':sweat_drops:'                                            => "\xf0\x9f\x92\xa6",
+            ':droplet:'                                                => "\xf0\x9f\x92\xa7",
+            ':dash:'                                                   => "\xf0\x9f\x92\xa8",
+            ':hankey:'                                                 => "\xf0\x9f\x92\xa9",
+            ':poop:'                                                   => "\xf0\x9f\x92\xa9",
+            ':shit:'                                                   => "\xf0\x9f\x92\xa9",
+            ':muscle:'                                                 => "\xf0\x9f\x92\xaa",
+            ':dizzy:'                                                  => "\xf0\x9f\x92\xab",
+            ':speech_balloon:'                                         => "\xf0\x9f\x92\xac",
+            ':thought_balloon:'                                        => "\xf0\x9f\x92\xad",
+            ':white_flower:'                                           => "\xf0\x9f\x92\xae",
+            ':100:'                                                    => "\xf0\x9f\x92\xaf",
+            ':moneybag:'                                               => "\xf0\x9f\x92\xb0",
+            ':currency_exchange:'                                      => "\xf0\x9f\x92\xb1",
+            ':heavy_dollar_sign:'                                      => "\xf0\x9f\x92\xb2",
+            ':credit_card:'                                            => "\xf0\x9f\x92\xb3",
+            ':yen:'                                                    => "\xf0\x9f\x92\xb4",
+            ':dollar:'                                                 => "\xf0\x9f\x92\xb5",
+            ':euro:'                                                   => "\xf0\x9f\x92\xb6",
+            ':pound:'                                                  => "\xf0\x9f\x92\xb7",
+            ':money_with_wings:'                                       => "\xf0\x9f\x92\xb8",
+            ':chart:'                                                  => "\xf0\x9f\x92\xb9",
+            ':seat:'                                                   => "\xf0\x9f\x92\xba",
+            ':computer:'                                               => "\xf0\x9f\x92\xbb",
+            ':briefcase:'                                              => "\xf0\x9f\x92\xbc",
+            ':minidisc:'                                               => "\xf0\x9f\x92\xbd",
+            ':floppy_disk:'                                            => "\xf0\x9f\x92\xbe",
+            ':cd:'                                                     => "\xf0\x9f\x92\xbf",
+            ':dvd:'                                                    => "\xf0\x9f\x93\x80",
+            ':file_folder:'                                            => "\xf0\x9f\x93\x81",
+            ':open_file_folder:'                                       => "\xf0\x9f\x93\x82",
+            ':page_with_curl:'                                         => "\xf0\x9f\x93\x83",
+            ':page_facing_up:'                                         => "\xf0\x9f\x93\x84",
+            ':date:'                                                   => "\xf0\x9f\x93\x85",
+            ':calendar:'                                               => "\xf0\x9f\x93\x86",
+            ':card_index:'                                             => "\xf0\x9f\x93\x87",
+            ':chart_with_upwards_trend:'                               => "\xf0\x9f\x93\x88",
+            ':chart_with_downwards_trend:'                             => "\xf0\x9f\x93\x89",
+            ':bar_chart:'                                              => "\xf0\x9f\x93\x8a",
+            ':clipboard:'                                              => "\xf0\x9f\x93\x8b",
+            ':pushpin:'                                                => "\xf0\x9f\x93\x8c",
+            ':round_pushpin:'                                          => "\xf0\x9f\x93\x8d",
+            ':paperclip:'                                              => "\xf0\x9f\x93\x8e",
+            ':straight_ruler:'                                         => "\xf0\x9f\x93\x8f",
+            ':triangular_ruler:'                                       => "\xf0\x9f\x93\x90",
+            ':bookmark_tabs:'                                          => "\xf0\x9f\x93\x91",
+            ':ledger:'                                                 => "\xf0\x9f\x93\x92",
+            ':notebook:'                                               => "\xf0\x9f\x93\x93",
+            ':notebook_with_decorative_cover:'                         => "\xf0\x9f\x93\x94",
+            ':closed_book:'                                            => "\xf0\x9f\x93\x95",
+            ':book:'                                                   => "\xf0\x9f\x93\x96",
+            ':open_book:'                                              => "\xf0\x9f\x93\x96",
+            ':green_book:'                                             => "\xf0\x9f\x93\x97",
+            ':blue_book:'                                              => "\xf0\x9f\x93\x98",
+            ':orange_book:'                                            => "\xf0\x9f\x93\x99",
+            ':books:'                                                  => "\xf0\x9f\x93\x9a",
+            ':name_badge:'                                             => "\xf0\x9f\x93\x9b",
+            ':scroll:'                                                 => "\xf0\x9f\x93\x9c",
+            ':memo:'                                                   => "\xf0\x9f\x93\x9d",
+            ':pencil:'                                                 => "\xf0\x9f\x93\x9d",
+            ':telephone_receiver:'                                     => "\xf0\x9f\x93\x9e",
+            ':pager:'                                                  => "\xf0\x9f\x93\x9f",
+            ':fax:'                                                    => "\xf0\x9f\x93\xa0",
+            ':satellite_antenna:'                                      => "\xf0\x9f\x93\xa1",
+            ':loudspeaker:'                                            => "\xf0\x9f\x93\xa2",
+            ':mega:'                                                   => "\xf0\x9f\x93\xa3",
+            ':outbox_tray:'                                            => "\xf0\x9f\x93\xa4",
+            ':inbox_tray:'                                             => "\xf0\x9f\x93\xa5",
+            ':package:'                                                => "\xf0\x9f\x93\xa6",
+            ':e-mail:'                                                 => "\xf0\x9f\x93\xa7",
+            ':incoming_envelope:'                                      => "\xf0\x9f\x93\xa8",
+            ':envelope_with_arrow:'                                    => "\xf0\x9f\x93\xa9",
+            ':mailbox_closed:'                                         => "\xf0\x9f\x93\xaa",
+            ':mailbox:'                                                => "\xf0\x9f\x93\xab",
+            ':mailbox_with_mail:'                                      => "\xf0\x9f\x93\xac",
+            ':mailbox_with_no_mail:'                                   => "\xf0\x9f\x93\xad",
+            ':postbox:'                                                => "\xf0\x9f\x93\xae",
+            ':postal_horn:'                                            => "\xf0\x9f\x93\xaf",
+            ':newspaper:'                                              => "\xf0\x9f\x93\xb0",
+            ':iphone:'                                                 => "\xf0\x9f\x93\xb1",
+            ':calling:'                                                => "\xf0\x9f\x93\xb2",
+            ':vibration_mode:'                                         => "\xf0\x9f\x93\xb3",
+            ':mobile_phone_off:'                                       => "\xf0\x9f\x93\xb4",
+            ':no_mobile_phones:'                                       => "\xf0\x9f\x93\xb5",
+            ':signal_strength:'                                        => "\xf0\x9f\x93\xb6",
+            ':camera:'                                                 => "\xf0\x9f\x93\xb7",
+            ':camera_with_flash:'                                      => "\xf0\x9f\x93\xb8",
+            ':video_camera:'                                           => "\xf0\x9f\x93\xb9",
+            ':tv:'                                                     => "\xf0\x9f\x93\xba",
+            ':radio:'                                                  => "\xf0\x9f\x93\xbb",
+            ':vhs:'                                                    => "\xf0\x9f\x93\xbc",
+            ':film_projector:'                                         => "\xf0\x9f\x93\xbd",
+            ':prayer_beads:'                                           => "\xf0\x9f\x93\xbf",
+            ':twisted_rightwards_arrows:'                              => "\xf0\x9f\x94\x80",
+            ':repeat:'                                                 => "\xf0\x9f\x94\x81",
+            ':repeat_one:'                                             => "\xf0\x9f\x94\x82",
+            ':arrows_clockwise:'                                       => "\xf0\x9f\x94\x83",
+            ':arrows_counterclockwise:'                                => "\xf0\x9f\x94\x84",
+            ':low_brightness:'                                         => "\xf0\x9f\x94\x85",
+            ':high_brightness:'                                        => "\xf0\x9f\x94\x86",
+            ':mute:'                                                   => "\xf0\x9f\x94\x87",
+            ':speaker:'                                                => "\xf0\x9f\x94\x88",
+            ':sound:'                                                  => "\xf0\x9f\x94\x89",
+            ':loud_sound:'                                             => "\xf0\x9f\x94\x8a",
+            ':battery:'                                                => "\xf0\x9f\x94\x8b",
+            ':electric_plug:'                                          => "\xf0\x9f\x94\x8c",
+            ':mag:'                                                    => "\xf0\x9f\x94\x8d",
+            ':mag_right:'                                              => "\xf0\x9f\x94\x8e",
+            ':lock_with_ink_pen:'                                      => "\xf0\x9f\x94\x8f",
+            ':closed_lock_with_key:'                                   => "\xf0\x9f\x94\x90",
+            ':key:'                                                    => "\xf0\x9f\x94\x91",
+            ':lock:'                                                   => "\xf0\x9f\x94\x92",
+            ':unlock:'                                                 => "\xf0\x9f\x94\x93",
+            ':bell:'                                                   => "\xf0\x9f\x94\x94",
+            ':no_bell:'                                                => "\xf0\x9f\x94\x95",
+            ':bookmark:'                                               => "\xf0\x9f\x94\x96",
+            ':link:'                                                   => "\xf0\x9f\x94\x97",
+            ':radio_button:'                                           => "\xf0\x9f\x94\x98",
+            ':back:'                                                   => "\xf0\x9f\x94\x99",
+            ':end:'                                                    => "\xf0\x9f\x94\x9a",
+            ':on:'                                                     => "\xf0\x9f\x94\x9b",
+            ':soon:'                                                   => "\xf0\x9f\x94\x9c",
+            ':top:'                                                    => "\xf0\x9f\x94\x9d",
+            ':underage:'                                               => "\xf0\x9f\x94\x9e",
+            ':keycap_ten:'                                             => "\xf0\x9f\x94\x9f",
+            ':capital_abcd:'                                           => "\xf0\x9f\x94\xa0",
+            ':abcd:'                                                   => "\xf0\x9f\x94\xa1",
+            ':1234:'                                                   => "\xf0\x9f\x94\xa2",
+            ':symbols:'                                                => "\xf0\x9f\x94\xa3",
+            ':abc:'                                                    => "\xf0\x9f\x94\xa4",
+            ':fire:'                                                   => "\xf0\x9f\x94\xa5",
+            ':flashlight:'                                             => "\xf0\x9f\x94\xa6",
+            ':wrench:'                                                 => "\xf0\x9f\x94\xa7",
+            ':hammer:'                                                 => "\xf0\x9f\x94\xa8",
+            ':nut_and_bolt:'                                           => "\xf0\x9f\x94\xa9",
+            ':hocho:'                                                  => "\xf0\x9f\x94\xaa",
+            ':knife:'                                                  => "\xf0\x9f\x94\xaa",
+            ':gun:'                                                    => "\xf0\x9f\x94\xab",
+            ':microscope:'                                             => "\xf0\x9f\x94\xac",
+            ':telescope:'                                              => "\xf0\x9f\x94\xad",
+            ':crystal_ball:'                                           => "\xf0\x9f\x94\xae",
+            ':six_pointed_star:'                                       => "\xf0\x9f\x94\xaf",
+            ':beginner:'                                               => "\xf0\x9f\x94\xb0",
+            ':trident:'                                                => "\xf0\x9f\x94\xb1",
+            ':black_square_button:'                                    => "\xf0\x9f\x94\xb2",
+            ':white_square_button:'                                    => "\xf0\x9f\x94\xb3",
+            ':red_circle:'                                             => "\xf0\x9f\x94\xb4",
+            ':large_blue_circle:'                                      => "\xf0\x9f\x94\xb5",
+            ':large_orange_diamond:'                                   => "\xf0\x9f\x94\xb6",
+            ':large_blue_diamond:'                                     => "\xf0\x9f\x94\xb7",
+            ':small_orange_diamond:'                                   => "\xf0\x9f\x94\xb8",
+            ':small_blue_diamond:'                                     => "\xf0\x9f\x94\xb9",
+            ':small_red_triangle:'                                     => "\xf0\x9f\x94\xba",
+            ':small_red_triangle_down:'                                => "\xf0\x9f\x94\xbb",
+            ':arrow_up_small:'                                         => "\xf0\x9f\x94\xbc",
+            ':arrow_down_small:'                                       => "\xf0\x9f\x94\xbd",
+            ':om_symbol:'                                              => "\xf0\x9f\x95\x89",
+            ':dove_of_peace:'                                          => "\xf0\x9f\x95\x8a",
+            ':kaaba:'                                                  => "\xf0\x9f\x95\x8b",
+            ':mosque:'                                                 => "\xf0\x9f\x95\x8c",
+            ':synagogue:'                                              => "\xf0\x9f\x95\x8d",
+            ':menorah_with_nine_branches:'                             => "\xf0\x9f\x95\x8e",
+            ':clock1:'                                                 => "\xf0\x9f\x95\x90",
+            ':clock2:'                                                 => "\xf0\x9f\x95\x91",
+            ':clock3:'                                                 => "\xf0\x9f\x95\x92",
+            ':clock4:'                                                 => "\xf0\x9f\x95\x93",
+            ':clock5:'                                                 => "\xf0\x9f\x95\x94",
+            ':clock6:'                                                 => "\xf0\x9f\x95\x95",
+            ':clock7:'                                                 => "\xf0\x9f\x95\x96",
+            ':clock8:'                                                 => "\xf0\x9f\x95\x97",
+            ':clock9:'                                                 => "\xf0\x9f\x95\x98",
+            ':clock10:'                                                => "\xf0\x9f\x95\x99",
+            ':clock11:'                                                => "\xf0\x9f\x95\x9a",
+            ':clock12:'                                                => "\xf0\x9f\x95\x9b",
+            ':clock130:'                                               => "\xf0\x9f\x95\x9c",
+            ':clock230:'                                               => "\xf0\x9f\x95\x9d",
+            ':clock330:'                                               => "\xf0\x9f\x95\x9e",
+            ':clock430:'                                               => "\xf0\x9f\x95\x9f",
+            ':clock530:'                                               => "\xf0\x9f\x95\xa0",
+            ':clock630:'                                               => "\xf0\x9f\x95\xa1",
+            ':clock730:'                                               => "\xf0\x9f\x95\xa2",
+            ':clock830:'                                               => "\xf0\x9f\x95\xa3",
+            ':clock930:'                                               => "\xf0\x9f\x95\xa4",
+            ':clock1030:'                                              => "\xf0\x9f\x95\xa5",
+            ':clock1130:'                                              => "\xf0\x9f\x95\xa6",
+            ':clock1230:'                                              => "\xf0\x9f\x95\xa7",
+            ':candle:'                                                 => "\xf0\x9f\x95\xaf",
+            ':mantelpiece_clock:'                                      => "\xf0\x9f\x95\xb0",
+            ':hole:'                                                   => "\xf0\x9f\x95\xb3",
+            ':man_in_business_suit_levitating:'                        => "\xf0\x9f\x95\xb4",
+            ':sleuth_or_spy:'                                          => "\xf0\x9f\x95\xb5",
+            ':dark_sunglasses:'                                        => "\xf0\x9f\x95\xb6",
+            ':spider:'                                                 => "\xf0\x9f\x95\xb7",
+            ':spider_web:'                                             => "\xf0\x9f\x95\xb8",
+            ':joystick:'                                               => "\xf0\x9f\x95\xb9",
+            ':linked_paperclips:'                                      => "\xf0\x9f\x96\x87",
+            ':lower_left_ballpoint_pen:'                               => "\xf0\x9f\x96\x8a",
+            ':lower_left_fountain_pen:'                                => "\xf0\x9f\x96\x8b",
+            ':lower_left_paintbrush:'                                  => "\xf0\x9f\x96\x8c",
+            ':lower_left_crayon:'                                      => "\xf0\x9f\x96\x8d",
+            ':raised_hand_with_fingers_splayed:'                       => "\xf0\x9f\x96\x90",
+            ':middle_finger:'                                          => "\xf0\x9f\x96\x95",
+            ':reversed_hand_with_middle_finger_extended:'              => "\xf0\x9f\x96\x95",
+            ':spock-hand:'                                             => "\xf0\x9f\x96\x96",
+            ':desktop_computer:'                                       => "\xf0\x9f\x96\xa5",
+            ':printer:'                                                => "\xf0\x9f\x96\xa8",
+            ':three_button_mouse:'                                     => "\xf0\x9f\x96\xb1",
+            ':trackball:'                                              => "\xf0\x9f\x96\xb2",
+            ':frame_with_picture:'                                     => "\xf0\x9f\x96\xbc",
+            ':card_index_dividers:'                                    => "\xf0\x9f\x97\x82",
+            ':card_file_box:'                                          => "\xf0\x9f\x97\x83",
+            ':file_cabinet:'                                           => "\xf0\x9f\x97\x84",
+            ':wastebasket:'                                            => "\xf0\x9f\x97\x91",
+            ':spiral_note_pad:'                                        => "\xf0\x9f\x97\x92",
+            ':spiral_calendar_pad:'                                    => "\xf0\x9f\x97\x93",
+            ':compression:'                                            => "\xf0\x9f\x97\x9c",
+            ':old_key:'                                                => "\xf0\x9f\x97\x9d",
+            ':rolled_up_newspaper:'                                    => "\xf0\x9f\x97\x9e",
+            ':dagger_knife:'                                           => "\xf0\x9f\x97\xa1",
+            ':speaking_head_in_silhouette:'                            => "\xf0\x9f\x97\xa3",
+            ':left_speech_bubble:'                                     => "\xf0\x9f\x97\xa8",
+            ':right_anger_bubble:'                                     => "\xf0\x9f\x97\xaf",
+            ':ballot_box_with_ballot:'                                 => "\xf0\x9f\x97\xb3",
+            ':world_map:'                                              => "\xf0\x9f\x97\xba",
+            ':mount_fuji:'                                             => "\xf0\x9f\x97\xbb",
+            ':tokyo_tower:'                                            => "\xf0\x9f\x97\xbc",
+            ':statue_of_liberty:'                                      => "\xf0\x9f\x97\xbd",
+            ':japan:'                                                  => "\xf0\x9f\x97\xbe",
+            ':moyai:'                                                  => "\xf0\x9f\x97\xbf",
+            ':grinning:'                                               => "\xf0\x9f\x98\x80",
+            ':grin:'                                                   => "\xf0\x9f\x98\x81",
+            ':joy:'                                                    => "\xf0\x9f\x98\x82",
+            ':smiley:'                                                 => "\xf0\x9f\x98\x83",
+            ':smile:'                                                  => "\xf0\x9f\x98\x84",
+            ':sweat_smile:'                                            => "\xf0\x9f\x98\x85",
+            ':laughing:'                                               => "\xf0\x9f\x98\x86",
+            ':satisfied:'                                              => "\xf0\x9f\x98\x86",
+            ':innocent:'                                               => "\xf0\x9f\x98\x87",
+            ':smiling_imp:'                                            => "\xf0\x9f\x98\x88",
+            ':wink:'                                                   => "\xf0\x9f\x98\x89",
+            ':blush:'                                                  => "\xf0\x9f\x98\x8a",
+            ':yum:'                                                    => "\xf0\x9f\x98\x8b",
+            ':relieved:'                                               => "\xf0\x9f\x98\x8c",
+            ':heart_eyes:'                                             => "\xf0\x9f\x98\x8d",
+            ':sunglasses:'                                             => "\xf0\x9f\x98\x8e",
+            ':smirk:'                                                  => "\xf0\x9f\x98\x8f",
+            ':neutral_face:'                                           => "\xf0\x9f\x98\x90",
+            ':expressionless:'                                         => "\xf0\x9f\x98\x91",
+            ':unamused:'                                               => "\xf0\x9f\x98\x92",
+            ':sweat:'                                                  => "\xf0\x9f\x98\x93",
+            ':pensive:'                                                => "\xf0\x9f\x98\x94",
+            ':confused:'                                               => "\xf0\x9f\x98\x95",
+            ':confounded:'                                             => "\xf0\x9f\x98\x96",
+            ':kissing:'                                                => "\xf0\x9f\x98\x97",
+            ':kissing_heart:'                                          => "\xf0\x9f\x98\x98",
+            ':kissing_smiling_eyes:'                                   => "\xf0\x9f\x98\x99",
+            ':kissing_closed_eyes:'                                    => "\xf0\x9f\x98\x9a",
+            ':stuck_out_tongue:'                                       => "\xf0\x9f\x98\x9b",
+            ':stuck_out_tongue_winking_eye:'                           => "\xf0\x9f\x98\x9c",
+            ':stuck_out_tongue_closed_eyes:'                           => "\xf0\x9f\x98\x9d",
+            ':disappointed:'                                           => "\xf0\x9f\x98\x9e",
+            ':worried:'                                                => "\xf0\x9f\x98\x9f",
+            ':angry:'                                                  => "\xf0\x9f\x98\xa0",
+            ':rage:'                                                   => "\xf0\x9f\x98\xa1",
+            ':cry:'                                                    => "\xf0\x9f\x98\xa2",
+            ':persevere:'                                              => "\xf0\x9f\x98\xa3",
+            ':triumph:'                                                => "\xf0\x9f\x98\xa4",
+            ':disappointed_relieved:'                                  => "\xf0\x9f\x98\xa5",
+            ':frowning:'                                               => "\xf0\x9f\x98\xa6",
+            ':anguished:'                                              => "\xf0\x9f\x98\xa7",
+            ':fearful:'                                                => "\xf0\x9f\x98\xa8",
+            ':weary:'                                                  => "\xf0\x9f\x98\xa9",
+            ':sleepy:'                                                 => "\xf0\x9f\x98\xaa",
+            ':tired_face:'                                             => "\xf0\x9f\x98\xab",
+            ':grimacing:'                                              => "\xf0\x9f\x98\xac",
+            ':sob:'                                                    => "\xf0\x9f\x98\xad",
+            ':open_mouth:'                                             => "\xf0\x9f\x98\xae",
+            ':hushed:'                                                 => "\xf0\x9f\x98\xaf",
+            ':cold_sweat:'                                             => "\xf0\x9f\x98\xb0",
+            ':scream:'                                                 => "\xf0\x9f\x98\xb1",
+            ':astonished:'                                             => "\xf0\x9f\x98\xb2",
+            ':flushed:'                                                => "\xf0\x9f\x98\xb3",
+            ':sleeping:'                                               => "\xf0\x9f\x98\xb4",
+            ':dizzy_face:'                                             => "\xf0\x9f\x98\xb5",
+            ':no_mouth:'                                               => "\xf0\x9f\x98\xb6",
+            ':mask:'                                                   => "\xf0\x9f\x98\xb7",
+            ':smile_cat:'                                              => "\xf0\x9f\x98\xb8",
+            ':joy_cat:'                                                => "\xf0\x9f\x98\xb9",
+            ':smiley_cat:'                                             => "\xf0\x9f\x98\xba",
+            ':heart_eyes_cat:'                                         => "\xf0\x9f\x98\xbb",
+            ':smirk_cat:'                                              => "\xf0\x9f\x98\xbc",
+            ':kissing_cat:'                                            => "\xf0\x9f\x98\xbd",
+            ':pouting_cat:'                                            => "\xf0\x9f\x98\xbe",
+            ':crying_cat_face:'                                        => "\xf0\x9f\x98\xbf",
+            ':scream_cat:'                                             => "\xf0\x9f\x99\x80",
+            ':slightly_frowning_face:'                                 => "\xf0\x9f\x99\x81",
+            ':slightly_smiling_face:'                                  => "\xf0\x9f\x99\x82",
+            ':upside_down_face:'                                       => "\xf0\x9f\x99\x83",
+            ':face_with_rolling_eyes:'                                 => "\xf0\x9f\x99\x84",
+            ':no_good:'                                                => "\xf0\x9f\x99\x85",
+            ':ok_woman:'                                               => "\xf0\x9f\x99\x86",
+            ':bow:'                                                    => "\xf0\x9f\x99\x87",
+            ':see_no_evil:'                                            => "\xf0\x9f\x99\x88",
+            ':hear_no_evil:'                                           => "\xf0\x9f\x99\x89",
+            ':speak_no_evil:'                                          => "\xf0\x9f\x99\x8a",
+            ':raising_hand:'                                           => "\xf0\x9f\x99\x8b",
+            ':raised_hands:'                                           => "\xf0\x9f\x99\x8c",
+            ':person_frowning:'                                        => "\xf0\x9f\x99\x8d",
+            ':person_with_pouting_face:'                               => "\xf0\x9f\x99\x8e",
+            ':pray:'                                                   => "\xf0\x9f\x99\x8f",
+            ':rocket:'                                                 => "\xf0\x9f\x9a\x80",
+            ':helicopter:'                                             => "\xf0\x9f\x9a\x81",
+            ':steam_locomotive:'                                       => "\xf0\x9f\x9a\x82",
+            ':railway_car:'                                            => "\xf0\x9f\x9a\x83",
+            ':bullettrain_side:'                                       => "\xf0\x9f\x9a\x84",
+            ':bullettrain_front:'                                      => "\xf0\x9f\x9a\x85",
+            ':train2:'                                                 => "\xf0\x9f\x9a\x86",
+            ':metro:'                                                  => "\xf0\x9f\x9a\x87",
+            ':light_rail:'                                             => "\xf0\x9f\x9a\x88",
+            ':station:'                                                => "\xf0\x9f\x9a\x89",
+            ':tram:'                                                   => "\xf0\x9f\x9a\x8a",
+            ':train:'                                                  => "\xf0\x9f\x9a\x8b",
+            ':bus:'                                                    => "\xf0\x9f\x9a\x8c",
+            ':oncoming_bus:'                                           => "\xf0\x9f\x9a\x8d",
+            ':trolleybus:'                                             => "\xf0\x9f\x9a\x8e",
+            ':busstop:'                                                => "\xf0\x9f\x9a\x8f",
+            ':minibus:'                                                => "\xf0\x9f\x9a\x90",
+            ':ambulance:'                                              => "\xf0\x9f\x9a\x91",
+            ':fire_engine:'                                            => "\xf0\x9f\x9a\x92",
+            ':police_car:'                                             => "\xf0\x9f\x9a\x93",
+            ':oncoming_police_car:'                                    => "\xf0\x9f\x9a\x94",
+            ':taxi:'                                                   => "\xf0\x9f\x9a\x95",
+            ':oncoming_taxi:'                                          => "\xf0\x9f\x9a\x96",
+            ':car:'                                                    => "\xf0\x9f\x9a\x97",
+            ':red_car:'                                                => "\xf0\x9f\x9a\x97",
+            ':oncoming_automobile:'                                    => "\xf0\x9f\x9a\x98",
+            ':blue_car:'                                               => "\xf0\x9f\x9a\x99",
+            ':truck:'                                                  => "\xf0\x9f\x9a\x9a",
+            ':articulated_lorry:'                                      => "\xf0\x9f\x9a\x9b",
+            ':tractor:'                                                => "\xf0\x9f\x9a\x9c",
+            ':monorail:'                                               => "\xf0\x9f\x9a\x9d",
+            ':mountain_railway:'                                       => "\xf0\x9f\x9a\x9e",
+            ':suspension_railway:'                                     => "\xf0\x9f\x9a\x9f",
+            ':mountain_cableway:'                                      => "\xf0\x9f\x9a\xa0",
+            ':aerial_tramway:'                                         => "\xf0\x9f\x9a\xa1",
+            ':ship:'                                                   => "\xf0\x9f\x9a\xa2",
+            ':rowboat:'                                                => "\xf0\x9f\x9a\xa3",
+            ':speedboat:'                                              => "\xf0\x9f\x9a\xa4",
+            ':traffic_light:'                                          => "\xf0\x9f\x9a\xa5",
+            ':vertical_traffic_light:'                                 => "\xf0\x9f\x9a\xa6",
+            ':construction:'                                           => "\xf0\x9f\x9a\xa7",
+            ':rotating_light:'                                         => "\xf0\x9f\x9a\xa8",
+            ':triangular_flag_on_post:'                                => "\xf0\x9f\x9a\xa9",
+            ':door:'                                                   => "\xf0\x9f\x9a\xaa",
+            ':no_entry_sign:'                                          => "\xf0\x9f\x9a\xab",
+            ':smoking:'                                                => "\xf0\x9f\x9a\xac",
+            ':no_smoking:'                                             => "\xf0\x9f\x9a\xad",
+            ':put_litter_in_its_place:'                                => "\xf0\x9f\x9a\xae",
+            ':do_not_litter:'                                          => "\xf0\x9f\x9a\xaf",
+            ':potable_water:'                                          => "\xf0\x9f\x9a\xb0",
+            ':non-potable_water:'                                      => "\xf0\x9f\x9a\xb1",
+            ':bike:'                                                   => "\xf0\x9f\x9a\xb2",
+            ':no_bicycles:'                                            => "\xf0\x9f\x9a\xb3",
+            ':bicyclist:'                                              => "\xf0\x9f\x9a\xb4",
+            ':mountain_bicyclist:'                                     => "\xf0\x9f\x9a\xb5",
+            ':walking:'                                                => "\xf0\x9f\x9a\xb6",
+            ':no_pedestrians:'                                         => "\xf0\x9f\x9a\xb7",
+            ':children_crossing:'                                      => "\xf0\x9f\x9a\xb8",
+            ':mens:'                                                   => "\xf0\x9f\x9a\xb9",
+            ':womens:'                                                 => "\xf0\x9f\x9a\xba",
+            ':restroom:'                                               => "\xf0\x9f\x9a\xbb",
+            ':baby_symbol:'                                            => "\xf0\x9f\x9a\xbc",
+            ':toilet:'                                                 => "\xf0\x9f\x9a\xbd",
+            ':wc:'                                                     => "\xf0\x9f\x9a\xbe",
+            ':shower:'                                                 => "\xf0\x9f\x9a\xbf",
+            ':bath:'                                                   => "\xf0\x9f\x9b\x80",
+            ':bathtub:'                                                => "\xf0\x9f\x9b\x81",
+            ':passport_control:'                                       => "\xf0\x9f\x9b\x82",
+            ':customs:'                                                => "\xf0\x9f\x9b\x83",
+            ':baggage_claim:'                                          => "\xf0\x9f\x9b\x84",
+            ':left_luggage:'                                           => "\xf0\x9f\x9b\x85",
+            ':couch_and_lamp:'                                         => "\xf0\x9f\x9b\x8b",
+            ':sleeping_accommodation:'                                 => "\xf0\x9f\x9b\x8c",
+            ':shopping_bags:'                                          => "\xf0\x9f\x9b\x8d",
+            ':bellhop_bell:'                                           => "\xf0\x9f\x9b\x8e",
+            ':bed:'                                                    => "\xf0\x9f\x9b\x8f",
+            ':place_of_worship:'                                       => "\xf0\x9f\x9b\x90",
+            ':hammer_and_wrench:'                                      => "\xf0\x9f\x9b\xa0",
+            ':shield:'                                                 => "\xf0\x9f\x9b\xa1",
+            ':oil_drum:'                                               => "\xf0\x9f\x9b\xa2",
+            ':motorway:'                                               => "\xf0\x9f\x9b\xa3",
+            ':railway_track:'                                          => "\xf0\x9f\x9b\xa4",
+            ':motor_boat:'                                             => "\xf0\x9f\x9b\xa5",
+            ':small_airplane:'                                         => "\xf0\x9f\x9b\xa9",
+            ':airplane_departure:'                                     => "\xf0\x9f\x9b\xab",
+            ':airplane_arriving:'                                      => "\xf0\x9f\x9b\xac",
+            ':satellite:'                                              => "\xf0\x9f\x9b\xb0",
+            ':passenger_ship:'                                         => "\xf0\x9f\x9b\xb3",
+            ':zipper_mouth_face:'                                      => "\xf0\x9f\xa4\x90",
+            ':money_mouth_face:'                                       => "\xf0\x9f\xa4\x91",
+            ':face_with_thermometer:'                                  => "\xf0\x9f\xa4\x92",
+            ':nerd_face:'                                              => "\xf0\x9f\xa4\x93",
+            ':thinking_face:'                                          => "\xf0\x9f\xa4\x94",
+            ':face_with_head_bandage:'                                 => "\xf0\x9f\xa4\x95",
+            ':robot_face:'                                             => "\xf0\x9f\xa4\x96",
+            ':hugging_face:'                                           => "\xf0\x9f\xa4\x97",
+            ':the_horns:'                                              => "\xf0\x9f\xa4\x98",
+            ':sign_of_the_horns:'                                      => "\xf0\x9f\xa4\x98",
+            ':crab:'                                                   => "\xf0\x9f\xa6\x80",
+            ':lion_face:'                                              => "\xf0\x9f\xa6\x81",
+            ':scorpion:'                                               => "\xf0\x9f\xa6\x82",
+            ':turkey:'                                                 => "\xf0\x9f\xa6\x83",
+            ':unicorn_face:'                                           => "\xf0\x9f\xa6\x84",
+            ':cheese_wedge:'                                           => "\xf0\x9f\xa7\x80",
+            ':hash:'                                                   => "#\xe2\x83\xa3",
+            ':keycap_star:'                                            => "*\xe2\x83\xa3",
+            ':zero:'                                                   => "0\xe2\x83\xa3",
+            ':one:'                                                    => "1\xe2\x83\xa3",
+            ':two:'                                                    => "2\xe2\x83\xa3",
+            ':three:'                                                  => "3\xe2\x83\xa3",
+            ':four:'                                                   => "4\xe2\x83\xa3",
+            ':five:'                                                   => "5\xe2\x83\xa3",
+            ':six:'                                                    => "6\xe2\x83\xa3",
+            ':seven:'                                                  => "7\xe2\x83\xa3",
+            ':eight:'                                                  => "8\xe2\x83\xa3",
+            ':nine:'                                                   => "9\xe2\x83\xa3",
+            ':flag-ac:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa8",
+            ':flag-ad:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa9",
+            ':flag-ae:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xaa",
+            ':flag-af:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xab",
+            ':flag-ag:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xac",
+            ':flag-ai:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xae",
+            ':flag-al:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb1",
+            ':flag-am:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb2",
+            ':flag-ao:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb4",
+            ':flag-aq:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb6",
+            ':flag-ar:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb7",
+            ':flag-as:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb8",
+            ':flag-at:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb9",
+            ':flag-au:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xba",
+            ':flag-aw:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbc",
+            ':flag-ax:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbd",
+            ':flag-az:'                                                => "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbf",
+            ':flag-ba:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa6",
+            ':flag-bb:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa7",
+            ':flag-bd:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa9",
+            ':flag-be:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaa",
+            ':flag-bf:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xab",
+            ':flag-bg:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xac",
+            ':flag-bh:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xad",
+            ':flag-bi:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xae",
+            ':flag-bj:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaf",
+            ':flag-bl:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb1",
+            ':flag-bm:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb2",
+            ':flag-bn:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb3",
+            ':flag-bo:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb4",
+            ':flag-bq:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb6",
+            ':flag-br:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb7",
+            ':flag-bs:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb8",
+            ':flag-bt:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb9",
+            ':flag-bv:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbb",
+            ':flag-bw:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbc",
+            ':flag-by:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbe",
+            ':flag-bz:'                                                => "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbf",
+            ':flag-ca:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa6",
+            ':flag-cc:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa8",
+            ':flag-cd:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa9",
+            ':flag-cf:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xab",
+            ':flag-cg:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xac",
+            ':flag-ch:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xad",
+            ':flag-ci:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xae",
+            ':flag-ck:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb0",
+            ':flag-cl:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb1",
+            ':flag-cm:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb2",
+            ':flag-cn:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3",
+            ':cn:'                                                     => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3",
+            ':flag-co:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb4",
+            ':flag-cp:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb5",
+            ':flag-cr:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb7",
+            ':flag-cu:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xba",
+            ':flag-cv:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbb",
+            ':flag-cw:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbc",
+            ':flag-cx:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbd",
+            ':flag-cy:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbe",
+            ':flag-cz:'                                                => "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbf",
+            ':flag-de:'                                                => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa",
+            ':de:'                                                     => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa",
+            ':flag-dg:'                                                => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xac",
+            ':flag-dj:'                                                => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaf",
+            ':flag-dk:'                                                => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb0",
+            ':flag-dm:'                                                => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb2",
+            ':flag-do:'                                                => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb4",
+            ':flag-dz:'                                                => "\xf0\x9f\x87\xa9\xf0\x9f\x87\xbf",
+            ':flag-ea:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa6",
+            ':flag-ec:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa8",
+            ':flag-ee:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xaa",
+            ':flag-eg:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xac",
+            ':flag-eh:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xad",
+            ':flag-er:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb7",
+            ':flag-es:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8",
+            ':es:'                                                     => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8",
+            ':flag-et:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb9",
+            ':flag-eu:'                                                => "\xf0\x9f\x87\xaa\xf0\x9f\x87\xba",
+            ':flag-fi:'                                                => "\xf0\x9f\x87\xab\xf0\x9f\x87\xae",
+            ':flag-fj:'                                                => "\xf0\x9f\x87\xab\xf0\x9f\x87\xaf",
+            ':flag-fk:'                                                => "\xf0\x9f\x87\xab\xf0\x9f\x87\xb0",
+            ':flag-fm:'                                                => "\xf0\x9f\x87\xab\xf0\x9f\x87\xb2",
+            ':flag-fo:'                                                => "\xf0\x9f\x87\xab\xf0\x9f\x87\xb4",
+            ':flag-fr:'                                                => "\xf0\x9f\x87\xab\xf0\x9f\x87\xb7",
+            ':fr:'                                                     => "\xf0\x9f\x87\xab\xf0\x9f\x87\xb7",
+            ':flag-ga:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xa6",
+            ':flag-gb:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xa7",
+            ':gb:'                                                     => "\xf0\x9f\x87\xac\xf0\x9f\x87\xa7",
+            ':uk:'                                                     => "\xf0\x9f\x87\xac\xf0\x9f\x87\xa7",
+            ':flag-gd:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xa9",
+            ':flag-ge:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xaa",
+            ':flag-gf:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xab",
+            ':flag-gg:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xac",
+            ':flag-gh:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xad",
+            ':flag-gi:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xae",
+            ':flag-gl:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb1",
+            ':flag-gm:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb2",
+            ':flag-gn:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb3",
+            ':flag-gp:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb5",
+            ':flag-gq:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb6",
+            ':flag-gr:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb7",
+            ':flag-gs:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb8",
+            ':flag-gt:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xb9",
+            ':flag-gu:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xba",
+            ':flag-gw:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xbc",
+            ':flag-gy:'                                                => "\xf0\x9f\x87\xac\xf0\x9f\x87\xbe",
+            ':flag-hk:'                                                => "\xf0\x9f\x87\xad\xf0\x9f\x87\xb0",
+            ':flag-hm:'                                                => "\xf0\x9f\x87\xad\xf0\x9f\x87\xb2",
+            ':flag-hn:'                                                => "\xf0\x9f\x87\xad\xf0\x9f\x87\xb3",
+            ':flag-hr:'                                                => "\xf0\x9f\x87\xad\xf0\x9f\x87\xb7",
+            ':flag-ht:'                                                => "\xf0\x9f\x87\xad\xf0\x9f\x87\xb9",
+            ':flag-hu:'                                                => "\xf0\x9f\x87\xad\xf0\x9f\x87\xba",
+            ':flag-ic:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xa8",
+            ':flag-id:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xa9",
+            ':flag-ie:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xaa",
+            ':flag-il:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb1",
+            ':flag-im:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb2",
+            ':flag-in:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb3",
+            ':flag-io:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb4",
+            ':flag-iq:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb6",
+            ':flag-ir:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb7",
+            ':flag-is:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb8",
+            ':flag-it:'                                                => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb9",
+            ':it:'                                                     => "\xf0\x9f\x87\xae\xf0\x9f\x87\xb9",
+            ':flag-je:'                                                => "\xf0\x9f\x87\xaf\xf0\x9f\x87\xaa",
+            ':flag-jm:'                                                => "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb2",
+            ':flag-jo:'                                                => "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb4",
+            ':flag-jp:'                                                => "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5",
+            ':jp:'                                                     => "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5",
+            ':flag-ke:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xaa",
+            ':flag-kg:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xac",
+            ':flag-kh:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xad",
+            ':flag-ki:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xae",
+            ':flag-km:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb2",
+            ':flag-kn:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb3",
+            ':flag-kp:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb5",
+            ':flag-kr:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7",
+            ':kr:'                                                     => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7",
+            ':flag-kw:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbc",
+            ':flag-ky:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbe",
+            ':flag-kz:'                                                => "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbf",
+            ':flag-la:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa6",
+            ':flag-lb:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa7",
+            ':flag-lc:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa8",
+            ':flag-li:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xae",
+            ':flag-lk:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb0",
+            ':flag-lr:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb7",
+            ':flag-ls:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb8",
+            ':flag-lt:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb9",
+            ':flag-lu:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xba",
+            ':flag-lv:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbb",
+            ':flag-ly:'                                                => "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbe",
+            ':flag-ma:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa6",
+            ':flag-mc:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa8",
+            ':flag-md:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa9",
+            ':flag-me:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xaa",
+            ':flag-mf:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xab",
+            ':flag-mg:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xac",
+            ':flag-mh:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xad",
+            ':flag-mk:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb0",
+            ':flag-ml:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb1",
+            ':flag-mm:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb2",
+            ':flag-mn:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb3",
+            ':flag-mo:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb4",
+            ':flag-mp:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb5",
+            ':flag-mq:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb6",
+            ':flag-mr:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb7",
+            ':flag-ms:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb8",
+            ':flag-mt:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb9",
+            ':flag-mu:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xba",
+            ':flag-mv:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbb",
+            ':flag-mw:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbc",
+            ':flag-mx:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbd",
+            ':flag-my:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbe",
+            ':flag-mz:'                                                => "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbf",
+            ':flag-na:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa6",
+            ':flag-nc:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa8",
+            ':flag-ne:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xaa",
+            ':flag-nf:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xab",
+            ':flag-ng:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xac",
+            ':flag-ni:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xae",
+            ':flag-nl:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb1",
+            ':flag-no:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb4",
+            ':flag-np:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb5",
+            ':flag-nr:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb7",
+            ':flag-nu:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xba",
+            ':flag-nz:'                                                => "\xf0\x9f\x87\xb3\xf0\x9f\x87\xbf",
+            ':flag-om:'                                                => "\xf0\x9f\x87\xb4\xf0\x9f\x87\xb2",
+            ':flag-pa:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xa6",
+            ':flag-pe:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xaa",
+            ':flag-pf:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xab",
+            ':flag-pg:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xac",
+            ':flag-ph:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xad",
+            ':flag-pk:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb0",
+            ':flag-pl:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb1",
+            ':flag-pm:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb2",
+            ':flag-pn:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb3",
+            ':flag-pr:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb7",
+            ':flag-ps:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb8",
+            ':flag-pt:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb9",
+            ':flag-pw:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbc",
+            ':flag-py:'                                                => "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbe",
+            ':flag-qa:'                                                => "\xf0\x9f\x87\xb6\xf0\x9f\x87\xa6",
+            ':flag-re:'                                                => "\xf0\x9f\x87\xb7\xf0\x9f\x87\xaa",
+            ':flag-ro:'                                                => "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb4",
+            ':flag-rs:'                                                => "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb8",
+            ':flag-ru:'                                                => "\xf0\x9f\x87\xb7\xf0\x9f\x87\xba",
+            ':ru:'                                                     => "\xf0\x9f\x87\xb7\xf0\x9f\x87\xba",
+            ':flag-rw:'                                                => "\xf0\x9f\x87\xb7\xf0\x9f\x87\xbc",
+            ':flag-sa:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa6",
+            ':flag-sb:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa7",
+            ':flag-sc:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa8",
+            ':flag-sd:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa9",
+            ':flag-se:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaa",
+            ':flag-sg:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xac",
+            ':flag-sh:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xad",
+            ':flag-si:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xae",
+            ':flag-sj:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaf",
+            ':flag-sk:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb0",
+            ':flag-sl:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb1",
+            ':flag-sm:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb2",
+            ':flag-sn:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb3",
+            ':flag-so:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb4",
+            ':flag-sr:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb7",
+            ':flag-ss:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb8",
+            ':flag-st:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb9",
+            ':flag-sv:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbb",
+            ':flag-sx:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbd",
+            ':flag-sy:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbe",
+            ':flag-sz:'                                                => "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbf",
+            ':flag-ta:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa6",
+            ':flag-tc:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa8",
+            ':flag-td:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa9",
+            ':flag-tf:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xab",
+            ':flag-tg:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xac",
+            ':flag-th:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xad",
+            ':flag-tj:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xaf",
+            ':flag-tk:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb0",
+            ':flag-tl:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb1",
+            ':flag-tm:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb2",
+            ':flag-tn:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb3",
+            ':flag-to:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb4",
+            ':flag-tr:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb7",
+            ':flag-tt:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb9",
+            ':flag-tv:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbb",
+            ':flag-tw:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbc",
+            ':flag-tz:'                                                => "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbf",
+            ':flag-ua:'                                                => "\xf0\x9f\x87\xba\xf0\x9f\x87\xa6",
+            ':flag-ug:'                                                => "\xf0\x9f\x87\xba\xf0\x9f\x87\xac",
+            ':flag-um:'                                                => "\xf0\x9f\x87\xba\xf0\x9f\x87\xb2",
+            ':flag-us:'                                                => "\xf0\x9f\x87\xba\xf0\x9f\x87\xb8",
+            ':us:'                                                     => "\xf0\x9f\x87\xba\xf0\x9f\x87\xb8",
+            ':flag-uy:'                                                => "\xf0\x9f\x87\xba\xf0\x9f\x87\xbe",
+            ':flag-uz:'                                                => "\xf0\x9f\x87\xba\xf0\x9f\x87\xbf",
+            ':flag-va:'                                                => "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa6",
+            ':flag-vc:'                                                => "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa8",
+            ':flag-ve:'                                                => "\xf0\x9f\x87\xbb\xf0\x9f\x87\xaa",
+            ':flag-vg:'                                                => "\xf0\x9f\x87\xbb\xf0\x9f\x87\xac",
+            ':flag-vi:'                                                => "\xf0\x9f\x87\xbb\xf0\x9f\x87\xae",
+            ':flag-vn:'                                                => "\xf0\x9f\x87\xbb\xf0\x9f\x87\xb3",
+            ':flag-vu:'                                                => "\xf0\x9f\x87\xbb\xf0\x9f\x87\xba",
+            ':flag-wf:'                                                => "\xf0\x9f\x87\xbc\xf0\x9f\x87\xab",
+            ':flag-ws:'                                                => "\xf0\x9f\x87\xbc\xf0\x9f\x87\xb8",
+            ':flag-xk:'                                                => "\xf0\x9f\x87\xbd\xf0\x9f\x87\xb0",
+            ':flag-ye:'                                                => "\xf0\x9f\x87\xbe\xf0\x9f\x87\xaa",
+            ':flag-yt:'                                                => "\xf0\x9f\x87\xbe\xf0\x9f\x87\xb9",
+            ':flag-za:'                                                => "\xf0\x9f\x87\xbf\xf0\x9f\x87\xa6",
+            ':flag-zm:'                                                => "\xf0\x9f\x87\xbf\xf0\x9f\x87\xb2",
+            ':flag-zw:'                                                => "\xf0\x9f\x87\xbf\xf0\x9f\x87\xbc",
+            ':man-man-boy:'                                            => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':man-man-boy-boy:'                                        => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':man-man-girl:'                                           => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7",
+            ':man-man-girl-boy:'                                       => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':man-man-girl-girl:'                                      => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7",
+            ':man-woman-boy-boy:'                                      => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':man-woman-girl:'                                         => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7",
+            ':man-woman-girl-boy:'                                     => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':man-woman-girl-girl:'                                    => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7",
+            ':man-heart-man:'                                          => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8",
+            ':man-kiss-man:'                                           => "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa8",
+            ':woman-woman-boy:'                                        => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':woman-woman-boy-boy:'                                    => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':woman-woman-girl:'                                       => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7",
+            ':woman-woman-girl-boy:'                                   => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6",
+            ':woman-woman-girl-girl:'                                  => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7",
+            ':woman-heart-woman:'                                      => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9",
+            ':woman-kiss-woman:'                                       => "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9",
       ];
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToHtmlEmojiMap.php b/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToHtmlEmojiMap.php
index ccc34569897..3fb495ecdcc 100644
--- a/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToHtmlEmojiMap.php
+++ b/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToHtmlEmojiMap.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * This class will kill some IDEs so best to not parse these as PHP
@@ -11,3440 +12,3441 @@
 
 namespace Mautic\CoreBundle\Helper\EmojiMap;
 
-class UnicodeToHtmlEmojiMap {
-	public static $map = [
-	      "\xc2\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
-            "\xf3\xbe\xac\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
-            "\xee\x9c\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
-            "\xee\x89\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
-            "\xee\x95\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
-            "\xc2\xa9\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
-            "\xc2\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
-            "\xf3\xbe\xac\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
-            "\xee\x9c\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
-            "\xee\x89\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
-            "\xee\x95\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
-            "\xc2\xae\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
-            "\xe2\x80\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
-            "\xf3\xbe\xac\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
-            "\xee\x9c\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
-            "\xee\xac\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
-            "\xe2\x80\xbc\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
-            "\xe2\x81\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
-            "\xf3\xbe\xac\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
-            "\xee\x9c\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
-            "\xee\xac\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
-            "\xe2\x81\x89\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
-            "\xe2\x84\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
-            "\xf3\xbe\xac\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
-            "\xee\x9c\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
-            "\xee\x94\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
-            "\xee\x95\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
-            "\xe2\x84\xa2\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
-            "\xe2\x84\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2139\x22></span></span>",
-            "\xf3\xbe\xad\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2139\x22></span></span>",
-            "\xee\x94\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
-            "\xe2\x84\xb9\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2139\x22></span></span>",
-            "\xe2\x86\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
-            "\xf3\xbe\xab\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
-            "\xee\x9c\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
-            "\xee\xad\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
-            "\xe2\x86\x94\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
-            "\xe2\x86\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
-            "\xf3\xbe\xab\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
-            "\xee\x9c\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
-            "\xee\xad\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
-            "\xe2\x86\x95\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
-            "\xe2\x86\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
-            "\xf3\xbe\xab\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
-            "\xee\x9a\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
-            "\xee\x88\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
-            "\xee\x95\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
-            "\xe2\x86\x96\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
-            "\xe2\x86\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
-            "\xf3\xbe\xab\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
-            "\xee\x99\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
-            "\xee\x88\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
-            "\xee\x95\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
-            "\xe2\x86\x97\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
-            "\xe2\x86\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
-            "\xf3\xbe\xab\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
-            "\xee\x9a\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
-            "\xee\x88\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
-            "\xee\x95\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
-            "\xe2\x86\x98\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
-            "\xe2\x86\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
-            "\xf3\xbe\xab\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
-            "\xee\x9a\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
-            "\xee\x88\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
-            "\xee\x95\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
-            "\xe2\x86\x99\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
-            "\xe2\x86\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
-            "\xf3\xbe\xae\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
-            "\xee\x9b\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
-            "\xee\x95\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
-            "\xe2\x86\xa9\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
-            "\xe2\x86\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
-            "\xf3\xbe\xae\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
-            "\xee\x95\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
-            "\xe2\x86\xaa\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
-            "\xe2\x8c\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
-            "\xf3\xbe\x80\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
-            "\xee\x9c\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
-            "\xee\x95\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
-            "\xe2\x8c\x9a\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
-            "\xe2\x8c\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
-            "\xf3\xbe\x80\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
-            "\xee\x9c\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
-            "\xee\x95\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
-            "\xe2\x8c\x9b\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
-            "\xe2\x8c\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2328\x22></span></span>",
-            "\xe2\x8f\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23e9\x22></span></span>",
-            "\xf3\xbe\xab\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23e9\x22></span></span>",
-            "\xee\x88\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23e9\x22></span></span>",
-            "\xee\x94\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
-            "\xe2\x8f\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ea\x22></span></span>",
-            "\xf3\xbe\xab\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ea\x22></span></span>",
-            "\xee\x88\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ea\x22></span></span>",
-            "\xee\x94\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
-            "\xe2\x8f\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23eb\x22></span></span>",
-            "\xf3\xbe\xac\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23eb\x22></span></span>",
-            "\xee\x95\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23eb\x22></span></span>",
-            "\xe2\x8f\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ec\x22></span></span>",
-            "\xf3\xbe\xac\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ec\x22></span></span>",
-            "\xee\x95\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ec\x22></span></span>",
-            "\xe2\x8f\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ed\x22></span></span>",
-            "\xe2\x8f\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ee\x22></span></span>",
-            "\xe2\x8f\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ef\x22></span></span>",
-            "\xe2\x8f\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f0\x22></span></span>",
-            "\xf3\xbe\x80\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f0\x22></span></span>",
-            "\xee\x9a\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
-            "\xee\x80\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f559\x22></span></span>",
-            "\xee\x96\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
-            "\xe2\x8f\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f1\x22></span></span>",
-            "\xe2\x8f\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f2\x22></span></span>",
-            "\xe2\x8f\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
-            "\xf3\xbe\x80\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
-            "\xee\x91\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
-            "\xe2\x8f\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f8\x22></span></span>",
-            "\xe2\x8f\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f9\x22></span></span>",
-            "\xe2\x8f\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23fa\x22></span></span>",
-            "\xe2\x93\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji24c2\x22></span></span>",
-            "\xf3\xbe\x9f\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji24c2\x22></span></span>",
-            "\xee\x99\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
-            "\xee\x90\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
-            "\xee\x96\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
-            "\xe2\x93\x82\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji24c2\x22></span></span>",
-            "\xe2\x96\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25aa\x22></span></span>",
-            "\xf3\xbe\xad\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25aa\x22></span></span>",
-            "\xee\x88\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
-            "\xee\x94\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
-            "\xe2\x96\xaa\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25aa\x22></span></span>",
-            "\xe2\x96\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25ab\x22></span></span>",
-            "\xf3\xbe\xad\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25ab\x22></span></span>",
-            "\xee\x88\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
-            "\xee\x94\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
-            "\xe2\x96\xab\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25ab\x22></span></span>",
-            "\xe2\x96\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
-            "\xf3\xbe\xab\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
-            "\xee\x88\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
-            "\xee\x94\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
-            "\xe2\x96\xb6\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
-            "\xe2\x97\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
-            "\xf3\xbe\xab\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
-            "\xee\x88\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
-            "\xee\x94\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
-            "\xe2\x97\x80\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
-            "\xe2\x97\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
-            "\xf3\xbe\xad\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
-            "\xee\x94\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
-            "\xe2\x97\xbb\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
-            "\xe2\x97\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
-            "\xf3\xbe\xad\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
-            "\xee\x94\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
-            "\xe2\x97\xbc\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
-            "\xe2\x97\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fd\x22></span></span>",
-            "\xf3\xbe\xad\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fd\x22></span></span>",
-            "\xee\x94\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
-            "\xe2\x97\xbd\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fd\x22></span></span>",
-            "\xe2\x97\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fe\x22></span></span>",
-            "\xf3\xbe\xad\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fe\x22></span></span>",
-            "\xee\x94\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
-            "\xe2\x97\xbe\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fe\x22></span></span>",
-            "\xe2\x98\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
-            "\xf3\xbe\x80\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
-            "\xee\x98\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
-            "\xee\x81\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
-            "\xee\x92\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
-            "\xe2\x98\x80\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
-            "\xe2\x98\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
-            "\xf3\xbe\x80\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
-            "\xee\x98\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
-            "\xee\x81\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
-            "\xee\x92\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
-            "\xe2\x98\x81\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
-            "\xe2\x98\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2602\x22></span></span>",
-            "\xe2\x98\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2603\x22></span></span>",
-            "\xe2\x98\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2604\x22></span></span>",
-            "\xe2\x98\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
-            "\xf3\xbe\x94\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
-            "\xee\x9a\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
-            "\xee\x80\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
-            "\xee\x96\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
-            "\xe2\x98\x8e\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
-            "\xe2\x98\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
-            "\xf3\xbe\xae\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
-            "\xee\xac\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
-            "\xe2\x98\x91\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
-            "\xe2\x98\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
-            "\xf3\xbe\x80\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
-            "\xee\x99\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
-            "\xee\x81\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
-            "\xee\x92\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
-            "\xe2\x98\x94\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
-            "\xe2\x98\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
-            "\xf3\xbe\xa6\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
-            "\xee\x99\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
-            "\xee\x81\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
-            "\xee\x96\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
-            "\xe2\x98\x95\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
-            "\xe2\x98\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2618\x22></span></span>",
-            "\xe2\x98\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
-            "\xf3\xbe\xae\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
-            "\xee\x80\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
-            "\xee\x93\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
-            "\xe2\x98\x9d\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
-            "\xe2\x98\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2620\x22></span></span>",
-            "\xe2\x98\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2622\x22></span></span>",
-            "\xe2\x98\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2623\x22></span></span>",
-            "\xe2\x98\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2626\x22></span></span>",
-            "\xe2\x98\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji262a\x22></span></span>",
-            "\xe2\x98\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji262e\x22></span></span>",
-            "\xe2\x98\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji262f\x22></span></span>",
-            "\xe2\x98\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2638\x22></span></span>",
-            "\xe2\x98\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2639\x22></span></span>",
-            "\xe2\x98\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
-            "\xf3\xbe\x8c\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
-            "\xee\x9b\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
-            "\xee\x90\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
-            "\xee\x93\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
-            "\xe2\x98\xba\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
-            "\xe2\x99\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
-            "\xf3\xbe\x80\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
-            "\xee\x99\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
-            "\xee\x88\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
-            "\xee\x92\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f411\x22></span></span>",
-            "\xe2\x99\x88\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
-            "\xe2\x99\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
-            "\xf3\xbe\x80\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
-            "\xee\x99\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
-            "\xee\x89\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
-            "\xee\x92\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
-            "\xe2\x99\x89\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
-            "\xe2\x99\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
-            "\xf3\xbe\x80\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
-            "\xee\x99\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
-            "\xee\x89\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
-            "\xee\x92\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
-            "\xe2\x99\x8a\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
-            "\xe2\x99\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
-            "\xf3\xbe\x80\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
-            "\xee\x99\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
-            "\xee\x89\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
-            "\xee\x92\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
-            "\xe2\x99\x8b\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
-            "\xe2\x99\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
-            "\xf3\xbe\x80\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
-            "\xee\x99\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
-            "\xee\x89\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
-            "\xee\x92\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
-            "\xe2\x99\x8c\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
-            "\xe2\x99\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
-            "\xf3\xbe\x80\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
-            "\xee\x99\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
-            "\xee\x89\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
-            "\xee\x92\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
-            "\xe2\x99\x8d\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
-            "\xe2\x99\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
-            "\xf3\xbe\x80\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
-            "\xee\x99\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
-            "\xee\x89\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
-            "\xee\x92\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
-            "\xe2\x99\x8e\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
-            "\xe2\x99\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
-            "\xf3\xbe\x80\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
-            "\xee\x99\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
-            "\xee\x89\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
-            "\xee\x92\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
-            "\xe2\x99\x8f\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
-            "\xe2\x99\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
-            "\xf3\xbe\x80\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
-            "\xee\x99\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
-            "\xee\x89\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
-            "\xee\x92\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
-            "\xe2\x99\x90\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
-            "\xe2\x99\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
-            "\xf3\xbe\x80\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
-            "\xee\x99\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
-            "\xee\x89\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
-            "\xee\x92\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
-            "\xe2\x99\x91\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
-            "\xe2\x99\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
-            "\xf3\xbe\x80\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
-            "\xee\x99\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
-            "\xee\x89\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
-            "\xee\x92\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
-            "\xe2\x99\x92\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
-            "\xe2\x99\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
-            "\xf3\xbe\x80\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
-            "\xee\x99\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
-            "\xee\x89\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
-            "\xee\x92\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41f\x22></span></span>",
-            "\xe2\x99\x93\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
-            "\xe2\x99\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
-            "\xf3\xbe\xac\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
-            "\xee\x9a\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
-            "\xee\x88\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
-            "\xee\x96\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
-            "\xe2\x99\xa0\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
-            "\xe2\x99\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
-            "\xf3\xbe\xac\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
-            "\xee\x9a\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
-            "\xee\x88\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
-            "\xee\x96\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
-            "\xe2\x99\xa3\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
-            "\xe2\x99\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
-            "\xf3\xbe\xac\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
-            "\xee\x9a\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
-            "\xee\x88\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
-            "\xee\xaa\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
-            "\xe2\x99\xa5\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
-            "\xe2\x99\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
-            "\xf3\xbe\xac\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
-            "\xee\x9a\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
-            "\xee\x88\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
-            "\xee\x96\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
-            "\xe2\x99\xa6\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
-            "\xe2\x99\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
-            "\xf3\xbe\x9f\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
-            "\xee\x9b\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
-            "\xee\x84\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
-            "\xee\x92\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
-            "\xe2\x99\xa8\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
-            "\xe2\x99\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
-            "\xf3\xbe\xac\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
-            "\xee\x9c\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
-            "\xee\xad\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
-            "\xe2\x99\xbb\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
-            "\xe2\x99\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
-            "\xf3\xbe\xac\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
-            "\xee\x9a\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
-            "\xee\x88\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
-            "\xee\x91\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
-            "\xe2\x99\xbf\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
-            "\xe2\x9a\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2692\x22></span></span>",
-            "\xe2\x9a\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
-            "\xf3\xbe\x93\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
-            "\xee\x99\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
-            "\xee\x88\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
-            "\xee\x92\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
-            "\xe2\x9a\x93\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
-            "\xe2\x9a\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2694\x22></span></span>",
-            "\xe2\x9a\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2696\x22></span></span>",
-            "\xe2\x9a\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2697\x22></span></span>",
-            "\xe2\x9a\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2699\x22></span></span>",
-            "\xe2\x9a\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji269b\x22></span></span>",
-            "\xe2\x9a\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji269c\x22></span></span>",
-            "\xe2\x9a\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
-            "\xf3\xbe\xac\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
-            "\xee\x9c\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
-            "\xee\x89\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
-            "\xee\x92\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
-            "\xe2\x9a\xa0\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
-            "\xe2\x9a\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
-            "\xf3\xbe\x80\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
-            "\xee\x99\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
-            "\xee\x84\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
-            "\xee\x92\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
-            "\xe2\x9a\xa1\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
-            "\xe2\x9a\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
-            "\xf3\xbe\xad\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
-            "\xee\x9a\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
-            "\xee\x88\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
-            "\xee\x94\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
-            "\xe2\x9a\xaa\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
-            "\xe2\x9a\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
-            "\xf3\xbe\xad\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
-            "\xee\x94\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
-            "\xe2\x9a\xab\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
-            "\xe2\x9a\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26b0\x22></span></span>",
-            "\xe2\x9a\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26b1\x22></span></span>",
-            "\xe2\x9a\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
-            "\xf3\xbe\x9f\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
-            "\xee\x99\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
-            "\xee\x80\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
-            "\xee\x92\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
-            "\xe2\x9a\xbd\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
-            "\xe2\x9a\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
-            "\xf3\xbe\x9f\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
-            "\xee\x99\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
-            "\xee\x80\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
-            "\xee\x92\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
-            "\xe2\x9a\xbe\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
-            "\xe2\x9b\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
-            "\xf3\xbe\x80\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
-            "\xee\x99\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
-            "\xee\x81\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
-            "\xee\x92\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
-            "\xe2\x9b\x84\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
-            "\xe2\x9b\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
-            "\xf3\xbe\x80\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
-            "\xee\x98\xbe\xee\x98\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
-            "\xee\x81\x8a\xee\x81\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
-            "\xee\x92\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
-            "\xe2\x9b\x85\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
-            "\xe2\x9b\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c8\x22></span></span>",
-            "\xe2\x9b\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
-            "\xf3\xbe\x80\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
-            "\xee\x89\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
-            "\xee\x92\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
-            "\xe2\x9b\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26cf\x22></span></span>",
-            "\xe2\x9b\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d1\x22></span></span>",
-            "\xe2\x9b\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d3\x22></span></span>",
-            "\xe2\x9b\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
-            "\xf3\xbe\xac\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
-            "\xee\x9c\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
-            "\xee\x84\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
-            "\xee\x92\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
-            "\xe2\x9b\x94\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
-            "\xe2\x9b\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26e9\x22></span></span>",
-            "\xe2\x9b\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
-            "\xf3\xbe\x92\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
-            "\xee\x80\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
-            "\xee\x96\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
-            "\xe2\x9b\xaa\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
-            "\xe2\x9b\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f0\x22></span></span>",
-            "\xe2\x9b\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f1\x22></span></span>",
-            "\xe2\x9b\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
-            "\xf3\xbe\x92\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
-            "\xee\x84\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
-            "\xee\x97\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
-            "\xe2\x9b\xb2\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
-            "\xe2\x9b\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
-            "\xf3\xbe\x9f\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
-            "\xee\x99\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
-            "\xee\x80\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
-            "\xee\x96\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
-            "\xe2\x9b\xb3\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
-            "\xe2\x9b\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f4\x22></span></span>",
-            "\xe2\x9b\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
-            "\xf3\xbe\x9f\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
-            "\xee\x9a\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
-            "\xee\x80\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
-            "\xee\x92\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
-            "\xe2\x9b\xb5\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
-            "\xe2\x9b\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f7\x22></span></span>",
-            "\xe2\x9b\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f8\x22></span></span>",
-            "\xe2\x9b\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f9\x22></span></span>",
-            "\xe2\x9b\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
-            "\xf3\xbe\x9f\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
-            "\xee\x84\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
-            "\xee\x97\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
-            "\xe2\x9b\xba\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
-            "\xe2\x9b\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
-            "\xf3\xbe\x9f\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
-            "\xee\x99\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
-            "\xee\x80\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
-            "\xee\x95\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
-            "\xe2\x9b\xbd\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
-            "\xe2\x9c\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
-            "\xf3\xbe\x94\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
-            "\xee\x99\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
-            "\xee\x8c\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
-            "\xee\x94\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
-            "\xe2\x9c\x82\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
-            "\xe2\x9c\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2705\x22></span></span>",
-            "\xf3\xbe\xad\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2705\x22></span></span>",
-            "\xee\x95\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2705\x22></span></span>",
-            "\xe2\x9c\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
-            "\xf3\xbe\x9f\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
-            "\xee\x99\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
-            "\xee\x80\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
-            "\xee\x92\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
-            "\xe2\x9c\x88\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
-            "\xe2\x9c\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2709\x22></span></span>",
-            "\xf3\xbe\x94\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2709\x22></span></span>",
-            "\xee\x9b\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
-            "\xee\x84\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
-            "\xee\x94\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
-            "\xe2\x9c\x89\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2709\x22></span></span>",
-            "\xe2\x9c\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
-            "\xf3\xbe\xae\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
-            "\xee\x9a\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
-            "\xee\x80\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
-            "\xee\xae\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
-            "\xe2\x9c\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270b\x22></span></span>",
-            "\xf3\xbe\xae\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270b\x22></span></span>",
-            "\xee\x9a\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
-            "\xee\x80\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
-            "\xee\x96\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270b\x22></span></span>",
-            "\xe2\x9c\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
-            "\xf3\xbe\xae\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
-            "\xee\x9a\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
-            "\xee\x80\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
-            "\xee\x96\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
-            "\xe2\x9c\x8c\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
-            "\xe2\x9c\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270d\x22></span></span>",
-            "\xe2\x9c\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
-            "\xf3\xbe\x94\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
-            "\xee\x9c\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
-            "\xee\x8c\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
-            "\xee\x92\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
-            "\xe2\x9c\x8f\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
-            "\xe2\x9c\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
-            "\xf3\xbe\x94\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
-            "\xee\x9a\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
-            "\xee\xac\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
-            "\xe2\x9c\x92\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
-            "\xe2\x9c\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
-            "\xf3\xbe\xad\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
-            "\xee\x95\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
-            "\xe2\x9c\x94\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
-            "\xe2\x9c\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
-            "\xf3\xbe\xad\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
-            "\xee\x8c\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
-            "\xee\x95\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
-            "\xe2\x9c\x96\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
-            "\xe2\x9c\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji271d\x22></span></span>",
-            "\xe2\x9c\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2721\x22></span></span>",
-            "\xe2\x9c\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2728\x22></span></span>",
-            "\xf3\xbe\xad\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2728\x22></span></span>",
-            "\xee\x9b\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
-            "\xee\x8c\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
-            "\xee\xaa\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2728\x22></span></span>",
-            "\xe2\x9c\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
-            "\xf3\xbe\xad\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
-            "\xee\x9b\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a0\x22></span></span>",
-            "\xee\x88\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
-            "\xee\x94\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
-            "\xe2\x9c\xb3\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
-            "\xe2\x9c\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
-            "\xf3\xbe\xad\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
-            "\xee\x88\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
-            "\xee\x91\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
-            "\xe2\x9c\xb4\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
-            "\xe2\x9d\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
-            "\xf3\xbe\x80\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
-            "\xee\x92\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
-            "\xe2\x9d\x84\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
-            "\xe2\x9d\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
-            "\xf3\xbe\xad\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
-            "\xee\x91\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
-            "\xe2\x9d\x87\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
-            "\xe2\x9d\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274c\x22></span></span>",
-            "\xf3\xbe\xad\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274c\x22></span></span>",
-            "\xee\x95\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274c\x22></span></span>",
-            "\xe2\x9d\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
-            "\xf3\xbe\xad\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
-            "\xee\x95\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
-            "\xe2\x9d\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2753\x22></span></span>",
-            "\xf3\xbe\xac\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2753\x22></span></span>",
-            "\xee\x80\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2753\x22></span></span>",
-            "\xee\x92\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
-            "\xe2\x9d\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
-            "\xf3\xbe\xac\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
-            "\xee\x8c\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
-            "\xe2\x9d\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2755\x22></span></span>",
-            "\xf3\xbe\xac\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2755\x22></span></span>",
-            "\xee\x9c\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
-            "\xee\x8c\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2755\x22></span></span>",
-            "\xee\x92\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
-            "\xe2\x9d\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
-            "\xf3\xbe\xac\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
-            "\xee\x80\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
-            "\xe2\x9d\x97\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
-            "\xe2\x9d\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2763\x22></span></span>",
-            "\xe2\x9d\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
-            "\xf3\xbe\xac\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
-            "\xee\x9b\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
-            "\xee\x80\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
-            "\xee\x96\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
-            "\xe2\x9d\xa4\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
-            "\xe2\x9e\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2795\x22></span></span>",
-            "\xf3\xbe\xad\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2795\x22></span></span>",
-            "\xee\x94\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2795\x22></span></span>",
-            "\xe2\x9e\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2796\x22></span></span>",
-            "\xf3\xbe\xad\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2796\x22></span></span>",
-            "\xee\x94\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2796\x22></span></span>",
-            "\xe2\x9e\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2797\x22></span></span>",
-            "\xf3\xbe\xad\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2797\x22></span></span>",
-            "\xee\x95\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2797\x22></span></span>",
-            "\xe2\x9e\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
-            "\xf3\xbe\xab\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
-            "\xee\x88\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
-            "\xee\x95\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
-            "\xe2\x9e\xa1\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
-            "\xe2\x9e\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27b0\x22></span></span>",
-            "\xf3\xbe\xac\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27b0\x22></span></span>",
-            "\xee\x9c\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
-            "\xee\xac\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27b0\x22></span></span>",
-            "\xe2\x9e\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
-            "\xf3\xbe\xa0\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
-            "\xee\x9b\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
-            "\xee\x88\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
-            "\xe2\xa4\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
-            "\xf3\xbe\xab\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
-            "\xee\x9b\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
-            "\xee\xac\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
-            "\xe2\xa4\xb4\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
-            "\xe2\xa4\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
-            "\xf3\xbe\xab\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
-            "\xee\x9c\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
-            "\xee\xac\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
-            "\xe2\xa4\xb5\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
-            "\xe2\xac\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
-            "\xf3\xbe\xab\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
-            "\xee\x88\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
-            "\xee\x95\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
-            "\xe2\xac\x85\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
-            "\xe2\xac\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
-            "\xf3\xbe\xab\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
-            "\xee\x88\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
-            "\xee\x94\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
-            "\xe2\xac\x86\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
-            "\xe2\xac\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
-            "\xf3\xbe\xab\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
-            "\xee\x88\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
-            "\xee\x95\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
-            "\xe2\xac\x87\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
-            "\xe2\xac\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
-            "\xf3\xbe\xad\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
-            "\xee\x95\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
-            "\xe2\xac\x9b\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
-            "\xe2\xac\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
-            "\xf3\xbe\xad\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
-            "\xee\x95\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
-            "\xe2\xac\x9c\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
-            "\xe2\xad\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
-            "\xf3\xbe\xad\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
-            "\xee\x8c\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
-            "\xee\x92\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
-            "\xe2\xad\x90\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
-            "\xe2\xad\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
-            "\xf3\xbe\xad\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
-            "\xee\x9a\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f315\x22></span></span>",
-            "\xee\x8c\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
-            "\xee\xaa\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
-            "\xe2\xad\x95\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
-            "\xe3\x80\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
-            "\xf3\xbe\xac\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
-            "\xee\x9c\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
-            "\xe3\x80\xb0\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
-            "\xe3\x80\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
-            "\xf3\xbe\xa0\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
-            "\xee\x84\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
-            "\xe3\x80\xbd\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
-            "\xe3\x8a\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
-            "\xf3\xbe\xad\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
-            "\xee\x8c\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
-            "\xee\xaa\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
-            "\xe3\x8a\x97\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
-            "\xe3\x8a\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
-            "\xf3\xbe\xac\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
-            "\xee\x9c\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
-            "\xee\x8c\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
-            "\xee\x93\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
-            "\xe3\x8a\x99\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
-            "\xf0\x9f\x80\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
-            "\xf3\xbe\xa0\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
-            "\xee\x84\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
-            "\xee\x97\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
-            "\xf0\x9f\x80\x84\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
-            "\xf0\x9f\x83\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f0cf\x22></span></span>",
-            "\xf3\xbe\xa0\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f0cf\x22></span></span>",
-            "\xee\xad\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f0cf\x22></span></span>",
-            "\xf0\x9f\x85\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
-            "\xf3\xbe\x94\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
-            "\xee\xac\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
-            "\xf0\x9f\x85\xb0\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
-            "\xf0\x9f\x85\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
-            "\xf3\xbe\x94\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
-            "\xee\xac\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
-            "\xf0\x9f\x85\xb1\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
-            "\xf0\x9f\x85\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
-            "\xf3\xbe\x94\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
-            "\xee\xac\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
-            "\xf0\x9f\x85\xbe\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
-            "\xf0\x9f\x85\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
-            "\xf3\xbe\x9f\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
-            "\xee\x99\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
-            "\xee\x85\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
-            "\xee\x92\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
-            "\xf0\x9f\x85\xbf\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
-            "\xf0\x9f\x86\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
-            "\xf3\xbe\x94\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
-            "\xee\xac\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
-            "\xf0\x9f\x86\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
-            "\xf3\xbe\xae\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
-            "\xee\x9b\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
-            "\xee\x96\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
-            "\xf0\x9f\x86\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
-            "\xf3\xbe\xac\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
-            "\xee\x88\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
-            "\xee\xaa\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
-            "\xf0\x9f\x86\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
-            "\xf3\xbe\xac\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
-            "\xee\x9b\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
-            "\xee\x95\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
-            "\xf0\x9f\x86\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
-            "\xf3\xbe\xae\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
-            "\xee\x9b\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
-            "\xee\x88\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
-            "\xee\xaa\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
-            "\xf0\x9f\x86\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
-            "\xf3\xbe\xac\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
-            "\xee\x9b\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
-            "\xee\x88\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
-            "\xee\x96\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
-            "\xf0\x9f\x86\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f196\x22></span></span>",
-            "\xf3\xbe\xac\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f196\x22></span></span>",
-            "\xf0\x9f\x86\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
-            "\xf3\xbe\xac\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
-            "\xee\x9c\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
-            "\xee\x89\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
-            "\xee\x96\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
-            "\xf0\x9f\x86\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f198\x22></span></span>",
-            "\xf3\xbe\xad\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f198\x22></span></span>",
-            "\xee\x93\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f198\x22></span></span>",
-            "\xf0\x9f\x86\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f199\x22></span></span>",
-            "\xf3\xbe\xac\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f199\x22></span></span>",
-            "\xee\x88\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f199\x22></span></span>",
-            "\xee\x94\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
-            "\xf0\x9f\x86\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
-            "\xf3\xbe\xac\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
-            "\xee\x84\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
-            "\xee\x97\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
-            "\xf0\x9f\x88\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f201\x22></span></span>",
-            "\xf3\xbe\xac\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f201\x22></span></span>",
-            "\xee\x88\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f201\x22></span></span>",
-            "\xf0\x9f\x88\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
-            "\xf3\xbe\xac\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
-            "\xee\x88\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
-            "\xee\xaa\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
-            "\xf0\x9f\x88\x82\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
-            "\xf0\x9f\x88\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
-            "\xf3\xbe\xac\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
-            "\xee\x88\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
-            "\xf0\x9f\x88\x9a\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
-            "\xf0\x9f\x88\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
-            "\xf3\xbe\xad\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
-            "\xee\x88\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
-            "\xee\xaa\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
-            "\xf0\x9f\x88\xaf\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
-            "\xf0\x9f\x88\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f232\x22></span></span>",
-            "\xf3\xbe\xac\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f232\x22></span></span>",
-            "\xee\x9c\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
-            "\xf0\x9f\x88\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
-            "\xf3\xbe\xac\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
-            "\xee\x9c\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
-            "\xee\x88\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
-            "\xee\xaa\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
-            "\xf0\x9f\x88\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f234\x22></span></span>",
-            "\xf3\xbe\xac\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f234\x22></span></span>",
-            "\xee\x9c\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f234\x22></span></span>",
-            "\xf0\x9f\x88\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
-            "\xf3\xbe\xac\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
-            "\xee\x9c\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
-            "\xee\x88\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
-            "\xee\xaa\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
-            "\xf0\x9f\x88\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f236\x22></span></span>",
-            "\xf3\xbe\xac\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f236\x22></span></span>",
-            "\xee\x88\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f236\x22></span></span>",
-            "\xf0\x9f\x88\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
-            "\xf3\xbe\xac\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
-            "\xee\x88\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
-            "\xf0\x9f\x88\xb7\xef\xb8\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
-            "\xf0\x9f\x88\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f238\x22></span></span>",
-            "\xf3\xbe\xac\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f238\x22></span></span>",
-            "\xee\x88\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f238\x22></span></span>",
-            "\xf0\x9f\x88\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
-            "\xf3\xbe\xac\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
-            "\xee\x88\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
-            "\xee\xaa\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
-            "\xf0\x9f\x88\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
-            "\xf3\xbe\xad\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
-            "\xee\x88\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
-            "\xee\xaa\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
-            "\xf0\x9f\x89\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
-            "\xf3\xbe\xac\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
-            "\xee\x88\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
-            "\xee\x93\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
-            "\xf0\x9f\x89\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f251\x22></span></span>",
-            "\xf3\xbe\xad\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f251\x22></span></span>",
-            "\xee\xac\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f251\x22></span></span>",
-            "\xf0\x9f\x8c\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
-            "\xf3\xbe\x80\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
-            "\xee\x99\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
-            "\xee\x91\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
-            "\xee\x91\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
-            "\xf0\x9f\x8c\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
-            "\xf3\xbe\x80\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
-            "\xee\x99\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
-            "\xee\x96\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
-            "\xf0\x9f\x8c\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
-            "\xf3\xbe\x80\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
-            "\xee\x99\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
-            "\xee\x90\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
-            "\xee\xab\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
-            "\xf0\x9f\x8c\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f303\x22></span></span>",
-            "\xf3\xbe\x80\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f303\x22></span></span>",
-            "\xee\x9a\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
-            "\xee\x91\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
-            "\xee\xab\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f303\x22></span></span>",
-            "\xf0\x9f\x8c\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f304\x22></span></span>",
-            "\xf3\xbe\x80\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f304\x22></span></span>",
-            "\xee\x81\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f304\x22></span></span>",
-            "\xee\xab\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
-            "\xf0\x9f\x8c\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
-            "\xf3\xbe\x80\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
-            "\xee\x91\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
-            "\xf0\x9f\x8c\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f306\x22></span></span>",
-            "\xf3\xbe\x80\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f306\x22></span></span>",
-            "\xee\x85\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f306\x22></span></span>",
-            "\xee\x97\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
-            "\xf0\x9f\x8c\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
-            "\xf3\xbe\x80\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
-            "\xee\x91\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
-            "\xf0\x9f\x8c\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
-            "\xf3\xbe\x80\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
-            "\xee\x91\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
-            "\xee\xab\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
-            "\xf0\x9f\x8c\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f309\x22></span></span>",
-            "\xf3\xbe\x80\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f309\x22></span></span>",
-            "\xee\x92\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f309\x22></span></span>",
-            "\xf0\x9f\x8c\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
-            "\xf3\xbe\x80\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
-            "\xee\x9c\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
-            "\xee\x90\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
-            "\xee\xad\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
-            "\xf0\x9f\x8c\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30b\x22></span></span>",
-            "\xf3\xbe\x80\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30b\x22></span></span>",
-            "\xee\xad\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30b\x22></span></span>",
-            "\xf0\x9f\x8c\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
-            "\xf3\xbe\x80\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
-            "\xee\xad\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
-            "\xf0\x9f\x8c\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30d\x22></span></span>",
-            "\xf0\x9f\x8c\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30e\x22></span></span>",
-            "\xf0\x9f\x8c\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30f\x22></span></span>",
-            "\xf3\xbe\x80\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30f\x22></span></span>",
-            "\xee\x96\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30f\x22></span></span>",
-            "\xf0\x9f\x8c\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f310\x22></span></span>",
-            "\xf0\x9f\x8c\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f311\x22></span></span>",
-            "\xf3\xbe\x80\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f311\x22></span></span>",
-            "\xee\x96\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f311\x22></span></span>",
-            "\xf0\x9f\x8c\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f312\x22></span></span>",
-            "\xf0\x9f\x8c\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f313\x22></span></span>",
-            "\xf3\xbe\x80\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f313\x22></span></span>",
-            "\xee\x9a\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
-            "\xee\x81\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
-            "\xee\x96\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f313\x22></span></span>",
-            "\xf0\x9f\x8c\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
-            "\xf3\xbe\x80\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
-            "\xee\x9a\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
-            "\xee\x96\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
-            "\xf0\x9f\x8c\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f315\x22></span></span>",
-            "\xf3\xbe\x80\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f315\x22></span></span>",
-            "\xf0\x9f\x8c\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f316\x22></span></span>",
-            "\xf0\x9f\x8c\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f317\x22></span></span>",
-            "\xf0\x9f\x8c\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f318\x22></span></span>",
-            "\xf0\x9f\x8c\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
-            "\xf3\xbe\x80\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
-            "\xee\x9a\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
-            "\xee\x92\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
-            "\xf0\x9f\x8c\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31a\x22></span></span>",
-            "\xf0\x9f\x8c\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
-            "\xf3\xbe\x80\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
-            "\xee\x92\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
-            "\xf0\x9f\x8c\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31c\x22></span></span>",
-            "\xf0\x9f\x8c\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31d\x22></span></span>",
-            "\xf0\x9f\x8c\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31e\x22></span></span>",
-            "\xf0\x9f\x8c\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
-            "\xf3\xbe\xad\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
-            "\xee\x8c\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
-            "\xf0\x9f\x8c\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f320\x22></span></span>",
-            "\xf3\xbe\xad\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f320\x22></span></span>",
-            "\xee\x91\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f320\x22></span></span>",
-            "\xf0\x9f\x8c\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f321\x22></span></span>",
-            "\xf0\x9f\x8c\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f324\x22></span></span>",
-            "\xf0\x9f\x8c\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f325\x22></span></span>",
-            "\xf0\x9f\x8c\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f326\x22></span></span>",
-            "\xf0\x9f\x8c\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f327\x22></span></span>",
-            "\xf0\x9f\x8c\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f328\x22></span></span>",
-            "\xf0\x9f\x8c\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f329\x22></span></span>",
-            "\xf0\x9f\x8c\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32a\x22></span></span>",
-            "\xf0\x9f\x8c\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32b\x22></span></span>",
-            "\xf0\x9f\x8c\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32c\x22></span></span>",
-            "\xf0\x9f\x8c\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32d\x22></span></span>",
-            "\xf0\x9f\x8c\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32e\x22></span></span>",
-            "\xf0\x9f\x8c\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32f\x22></span></span>",
-            "\xf0\x9f\x8c\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f330\x22></span></span>",
-            "\xf3\xbe\x81\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f330\x22></span></span>",
-            "\xee\xac\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f330\x22></span></span>",
-            "\xf0\x9f\x8c\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
-            "\xf3\xbe\x80\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
-            "\xee\x9d\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
-            "\xee\x84\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
-            "\xee\xad\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
-            "\xf0\x9f\x8c\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f332\x22></span></span>",
-            "\xf0\x9f\x8c\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f333\x22></span></span>",
-            "\xf0\x9f\x8c\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
-            "\xf3\xbe\x81\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
-            "\xee\x8c\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
-            "\xee\x93\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
-            "\xf0\x9f\x8c\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
-            "\xf3\xbe\x81\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
-            "\xee\x8c\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
-            "\xee\xaa\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
-            "\xf0\x9f\x8c\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f336\x22></span></span>",
-            "\xf0\x9f\x8c\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
-            "\xf3\xbe\x80\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
-            "\xee\x9d\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
-            "\xee\x8c\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
-            "\xee\x93\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
-            "\xf0\x9f\x8c\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
-            "\xf3\xbe\x81\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
-            "\xee\x9d\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
-            "\xee\x80\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
-            "\xee\x93\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
-            "\xf0\x9f\x8c\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
-            "\xf3\xbe\x81\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
-            "\xee\x80\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
-            "\xee\x96\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
-            "\xf0\x9f\x8c\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
-            "\xf3\xbe\x81\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
-            "\xee\x8c\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
-            "\xee\xaa\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
-            "\xf0\x9f\x8c\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33b\x22></span></span>",
-            "\xf3\xbe\x81\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33b\x22></span></span>",
-            "\xee\x8c\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
-            "\xee\x93\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33b\x22></span></span>",
-            "\xf0\x9f\x8c\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
-            "\xf3\xbe\x81\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
-            "\xee\xad\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
-            "\xf0\x9f\x8c\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33d\x22></span></span>",
-            "\xf3\xbe\x81\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33d\x22></span></span>",
-            "\xee\xac\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33d\x22></span></span>",
-            "\xf0\x9f\x8c\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33e\x22></span></span>",
-            "\xf3\xbe\x81\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33e\x22></span></span>",
-            "\xee\x91\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33e\x22></span></span>",
-            "\xf0\x9f\x8c\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33f\x22></span></span>",
-            "\xf3\xbe\x81\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33f\x22></span></span>",
-            "\xee\x9d\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
-            "\xee\xae\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33f\x22></span></span>",
-            "\xf0\x9f\x8d\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
-            "\xf3\xbe\x80\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
-            "\xee\x94\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
-            "\xf0\x9f\x8d\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
-            "\xf3\xbe\x80\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
-            "\xee\x9d\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
-            "\xee\x84\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
-            "\xee\x93\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
-            "\xf0\x9f\x8d\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
-            "\xf3\xbe\x81\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
-            "\xee\x84\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
-            "\xee\x97\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
-            "\xf0\x9f\x8d\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
-            "\xf3\xbe\x81\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
-            "\xee\x91\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
-            "\xf0\x9f\x8d\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f344\x22></span></span>",
-            "\xf3\xbe\x81\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f344\x22></span></span>",
-            "\xee\xac\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f344\x22></span></span>",
-            "\xf0\x9f\x8d\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
-            "\xf3\xbe\x81\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
-            "\xee\x8d\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
-            "\xee\xaa\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
-            "\xf0\x9f\x8d\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
-            "\xf3\xbe\x81\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
-            "\xee\x8d\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
-            "\xee\xaa\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
-            "\xf0\x9f\x8d\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f347\x22></span></span>",
-            "\xf3\xbe\x81\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f347\x22></span></span>",
-            "\xee\xac\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f347\x22></span></span>",
-            "\xf0\x9f\x8d\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f348\x22></span></span>",
-            "\xf3\xbe\x81\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f348\x22></span></span>",
-            "\xee\xac\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f348\x22></span></span>",
-            "\xf0\x9f\x8d\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
-            "\xf3\xbe\x81\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
-            "\xee\x8d\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
-            "\xee\x93\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
-            "\xf0\x9f\x8d\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
-            "\xf3\xbe\x81\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
-            "\xee\x8d\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
-            "\xee\xaa\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
-            "\xf0\x9f\x8d\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34b\x22></span></span>",
-            "\xf0\x9f\x8d\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
-            "\xf3\xbe\x81\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
-            "\xee\x9d\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
-            "\xee\xac\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
-            "\xf0\x9f\x8d\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34d\x22></span></span>",
-            "\xf3\xbe\x81\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34d\x22></span></span>",
-            "\xee\xac\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34d\x22></span></span>",
-            "\xf0\x9f\x8d\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34e\x22></span></span>",
-            "\xf3\xbe\x81\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34e\x22></span></span>",
-            "\xee\x9d\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
-            "\xee\x8d\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
-            "\xee\xaa\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34e\x22></span></span>",
-            "\xf0\x9f\x8d\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
-            "\xf3\xbe\x81\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
-            "\xee\xad\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
-            "\xf0\x9f\x8d\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f350\x22></span></span>",
-            "\xf0\x9f\x8d\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f351\x22></span></span>",
-            "\xf3\xbe\x81\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f351\x22></span></span>",
-            "\xee\xac\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f351\x22></span></span>",
-            "\xf0\x9f\x8d\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
-            "\xf3\xbe\x81\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
-            "\xee\x9d\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
-            "\xee\x93\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
-            "\xf0\x9f\x8d\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
-            "\xf3\xbe\x81\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
-            "\xee\x8d\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
-            "\xee\x93\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
-            "\xf0\x9f\x8d\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
-            "\xf3\xbe\xa5\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
-            "\xee\x99\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
-            "\xee\x84\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
-            "\xee\x93\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
-            "\xf0\x9f\x8d\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f355\x22></span></span>",
-            "\xf3\xbe\xa5\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f355\x22></span></span>",
-            "\xee\xac\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f355\x22></span></span>",
-            "\xf0\x9f\x8d\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f356\x22></span></span>",
-            "\xf3\xbe\xa5\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f356\x22></span></span>",
-            "\xee\x93\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f356\x22></span></span>",
-            "\xf0\x9f\x8d\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f357\x22></span></span>",
-            "\xf3\xbe\xa5\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f357\x22></span></span>",
-            "\xee\xac\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f357\x22></span></span>",
-            "\xf0\x9f\x8d\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
-            "\xf3\xbe\xa5\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
-            "\xee\x8c\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
-            "\xee\xaa\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
-            "\xf0\x9f\x8d\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
-            "\xf3\xbe\xa5\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
-            "\xee\x9d\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
-            "\xee\x8d\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
-            "\xee\x93\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
-            "\xf0\x9f\x8d\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
-            "\xf3\xbe\xa5\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
-            "\xee\x9d\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
-            "\xee\x8c\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
-            "\xee\xaa\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
-            "\xf0\x9f\x8d\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
-            "\xf3\xbe\xa5\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
-            "\xee\x8d\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
-            "\xee\xaa\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
-            "\xf0\x9f\x8d\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
-            "\xf3\xbe\xa5\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
-            "\xee\x8d\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
-            "\xee\x96\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
-            "\xf0\x9f\x8d\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
-            "\xf3\xbe\xa5\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
-            "\xee\x8c\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
-            "\xee\xaa\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
-            "\xf0\x9f\x8d\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
-            "\xf3\xbe\xa5\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
-            "\xee\x9d\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
-            "\xee\x8c\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
-            "\xee\xaa\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
-            "\xf0\x9f\x8d\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
-            "\xf3\xbe\xa5\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
-            "\xee\x8c\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
-            "\xee\xaa\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
-            "\xf0\x9f\x8d\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f360\x22></span></span>",
-            "\xf3\xbe\xa5\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f360\x22></span></span>",
-            "\xee\xac\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f360\x22></span></span>",
-            "\xf0\x9f\x8d\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
-            "\xf3\xbe\xa5\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
-            "\xee\x8c\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
-            "\xee\xaa\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
-            "\xf0\x9f\x8d\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
-            "\xf3\xbe\xa5\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
-            "\xee\x8d\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
-            "\xee\xaa\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
-            "\xf0\x9f\x8d\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
-            "\xf3\xbe\xa5\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
-            "\xee\x8d\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
-            "\xee\xaa\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
-            "\xf0\x9f\x8d\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f364\x22></span></span>",
-            "\xf3\xbe\xa5\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f364\x22></span></span>",
-            "\xee\xad\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f364\x22></span></span>",
-            "\xf0\x9f\x8d\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
-            "\xf3\xbe\xa5\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
-            "\xee\x93\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
-            "\xf0\x9f\x8d\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
-            "\xf3\xbe\xa5\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
-            "\xee\x8c\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
-            "\xee\xaa\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
-            "\xf0\x9f\x8d\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
-            "\xf3\xbe\xa5\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
-            "\xee\x90\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
-            "\xee\xab\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
-            "\xf0\x9f\x8d\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f368\x22></span></span>",
-            "\xf3\xbe\xa5\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f368\x22></span></span>",
-            "\xee\xad\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f368\x22></span></span>",
-            "\xf0\x9f\x8d\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f369\x22></span></span>",
-            "\xf3\xbe\xa5\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f369\x22></span></span>",
-            "\xee\xad\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f369\x22></span></span>",
-            "\xf0\x9f\x8d\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36a\x22></span></span>",
-            "\xf3\xbe\xa5\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36a\x22></span></span>",
-            "\xee\xad\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36a\x22></span></span>",
-            "\xf0\x9f\x8d\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36b\x22></span></span>",
-            "\xf3\xbe\xa5\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36b\x22></span></span>",
-            "\xee\xad\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36b\x22></span></span>",
-            "\xf0\x9f\x8d\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36c\x22></span></span>",
-            "\xf3\xbe\xa5\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36c\x22></span></span>",
-            "\xee\xad\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36c\x22></span></span>",
-            "\xf0\x9f\x8d\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36d\x22></span></span>",
-            "\xf3\xbe\xa5\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36d\x22></span></span>",
-            "\xee\xad\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36d\x22></span></span>",
-            "\xf0\x9f\x8d\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36e\x22></span></span>",
-            "\xf3\xbe\xa5\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36e\x22></span></span>",
-            "\xee\xad\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36e\x22></span></span>",
-            "\xf0\x9f\x8d\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36f\x22></span></span>",
-            "\xf3\xbe\xa5\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36f\x22></span></span>",
-            "\xee\xad\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36f\x22></span></span>",
-            "\xf0\x9f\x8d\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
-            "\xf3\xbe\xa5\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
-            "\xee\x9d\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
-            "\xee\x81\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
-            "\xee\x93\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
-            "\xf0\x9f\x8d\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
-            "\xf3\xbe\xa5\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
-            "\xee\x8d\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
-            "\xee\xaa\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
-            "\xf0\x9f\x8d\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
-            "\xf3\xbe\xa5\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
-            "\xee\x8d\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
-            "\xee\xaa\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
-            "\xf0\x9f\x8d\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
-            "\xf3\xbe\xa5\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
-            "\xee\x85\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
-            "\xee\x93\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
-            "\xf0\x9f\x8d\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
-            "\xf3\xbe\xa6\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
-            "\xee\x99\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
-            "\xee\x81\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
-            "\xee\x92\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
-            "\xf0\x9f\x8d\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
-            "\xf3\xbe\xa6\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
-            "\xee\x9c\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
-            "\xee\x8c\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
-            "\xee\xaa\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
-            "\xf0\x9f\x8d\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f376\x22></span></span>",
-            "\xf3\xbe\xa6\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f376\x22></span></span>",
-            "\xee\x9d\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
-            "\xee\x8c\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
-            "\xee\xaa\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f376\x22></span></span>",
-            "\xf0\x9f\x8d\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
-            "\xf3\xbe\xa6\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
-            "\xee\x9d\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
-            "\xee\x81\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
-            "\xee\x93\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
-            "\xf0\x9f\x8d\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f378\x22></span></span>",
-            "\xf3\xbe\xa6\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f378\x22></span></span>",
-            "\xee\x99\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
-            "\xee\x93\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f378\x22></span></span>",
-            "\xf0\x9f\x8d\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
-            "\xf3\xbe\xa6\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
-            "\xee\xac\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
-            "\xf0\x9f\x8d\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
-            "\xf3\xbe\xa6\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
-            "\xee\x99\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
-            "\xee\x81\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
-            "\xee\x93\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
-            "\xf0\x9f\x8d\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
-            "\xf3\xbe\xa6\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
-            "\xee\x8c\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
-            "\xee\xaa\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
-            "\xf0\x9f\x8d\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37c\x22></span></span>",
-            "\xf0\x9f\x8d\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37d\x22></span></span>",
-            "\xf0\x9f\x8d\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37e\x22></span></span>",
-            "\xf0\x9f\x8d\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37f\x22></span></span>",
-            "\xf0\x9f\x8e\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
-            "\xf3\xbe\x94\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
-            "\xee\x9a\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
-            "\xee\x8c\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
-            "\xee\x96\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
-            "\xf0\x9f\x8e\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f381\x22></span></span>",
-            "\xf3\xbe\x94\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f381\x22></span></span>",
-            "\xee\x9a\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
-            "\xee\x84\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
-            "\xee\x93\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f381\x22></span></span>",
-            "\xf0\x9f\x8e\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
-            "\xf3\xbe\x94\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
-            "\xee\x9a\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
-            "\xee\x8d\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
-            "\xee\x96\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
-            "\xf0\x9f\x8e\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
-            "\xf3\xbe\x94\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
-            "\xee\x91\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
-            "\xee\xab\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
-            "\xf0\x9f\x8e\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
-            "\xf3\xbe\x94\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
-            "\xee\x9a\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
-            "\xee\x80\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
-            "\xee\x93\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
-            "\xf0\x9f\x8e\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
-            "\xf3\xbe\x94\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
-            "\xee\x91\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
-            "\xee\xab\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
-            "\xf0\x9f\x8e\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
-            "\xf3\xbe\x94\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
-            "\xee\x84\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
-            "\xee\x97\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
-            "\xf0\x9f\x8e\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
-            "\xf3\xbe\x94\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
-            "\xee\x91\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
-            "\xee\xab\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
-            "\xf0\x9f\x8e\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
-            "\xf3\xbe\x94\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
-            "\xee\x8c\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
-            "\xee\xaa\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
-            "\xf0\x9f\x8e\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
-            "\xf3\xbe\x94\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
-            "\xee\x8c\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
-            "\xee\xaa\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
-            "\xf0\x9f\x8e\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38a\x22></span></span>",
-            "\xf3\xbe\x94\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38a\x22></span></span>",
-            "\xee\x91\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38a\x22></span></span>",
-            "\xf0\x9f\x8e\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38b\x22></span></span>",
-            "\xf3\xbe\x94\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38b\x22></span></span>",
-            "\xee\xac\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38b\x22></span></span>",
-            "\xf0\x9f\x8e\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
-            "\xf3\xbe\x94\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
-            "\xee\x85\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
-            "\xee\x97\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
-            "\xf0\x9f\x8e\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
-            "\xf3\xbe\x94\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
-            "\xee\x90\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
-            "\xee\xab\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
-            "\xf0\x9f\x8e\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
-            "\xf3\xbe\x94\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
-            "\xee\x90\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
-            "\xee\xab\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
-            "\xf0\x9f\x8e\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
-            "\xf3\xbe\x94\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
-            "\xee\x90\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
-            "\xee\xab\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
-            "\xf0\x9f\x8e\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
-            "\xf3\xbe\x94\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
-            "\xee\x91\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
-            "\xee\xab\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
-            "\xf0\x9f\x8e\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
-            "\xf3\xbe\x80\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
-            "\xee\x91\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
-            "\xee\xab\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
-            "\xf0\x9f\x8e\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
-            "\xf3\xbe\x94\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
-            "\xee\x90\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
-            "\xee\xab\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
-            "\xf0\x9f\x8e\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
-            "\xf3\xbe\x94\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
-            "\xee\x90\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
-            "\xee\xab\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
-            "\xf0\x9f\x8e\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f396\x22></span></span>",
-            "\xf0\x9f\x8e\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f397\x22></span></span>",
-            "\xf0\x9f\x8e\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f399\x22></span></span>",
-            "\xf0\x9f\x8e\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39a\x22></span></span>",
-            "\xf0\x9f\x8e\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39b\x22></span></span>",
-            "\xf0\x9f\x8e\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39e\x22></span></span>",
-            "\xf0\x9f\x8e\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39f\x22></span></span>",
-            "\xf0\x9f\x8e\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a0\x22></span></span>",
-            "\xf3\xbe\x9f\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a0\x22></span></span>",
-            "\xee\x99\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a0\x22></span></span>",
-            "\xf0\x9f\x8e\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
-            "\xf3\xbe\x9f\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
-            "\xee\x84\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
-            "\xee\x91\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
-            "\xf0\x9f\x8e\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
-            "\xf3\xbe\x9f\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
-            "\xee\x90\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
-            "\xee\xab\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
-            "\xf0\x9f\x8e\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a3\x22></span></span>",
-            "\xf3\xbe\x9f\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a3\x22></span></span>",
-            "\xee\x9d\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
-            "\xee\x80\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
-            "\xee\xad\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a3\x22></span></span>",
-            "\xf0\x9f\x8e\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
-            "\xf3\xbe\xa0\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
-            "\xee\x99\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
-            "\xee\x80\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
-            "\xee\x94\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
-            "\xf0\x9f\x8e\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a5\x22></span></span>",
-            "\xf3\xbe\xa0\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a5\x22></span></span>",
-            "\xee\x99\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
-            "\xee\x80\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
-            "\xee\x94\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
-            "\xf0\x9f\x8e\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a6\x22></span></span>",
-            "\xf3\xbe\xa0\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a6\x22></span></span>",
-            "\xee\x94\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bb\x22></span></span>",
-            "\xf0\x9f\x8e\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
-            "\xf3\xbe\xa0\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
-            "\xee\x99\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
-            "\xee\x8c\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
-            "\xee\x94\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
-            "\xf0\x9f\x8e\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
-            "\xf3\xbe\xa0\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
-            "\xee\x99\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
-            "\xee\x94\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
-            "\xee\x96\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
-            "\xf0\x9f\x8e\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
-            "\xf3\xbe\xa0\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
-            "\xee\x99\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
-            "\xee\xab\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
-            "\xf0\x9f\x8e\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
-            "\xf3\xbe\xa0\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
-            "\xee\x99\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
-            "\xee\x96\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
-            "\xf0\x9f\x8e\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
-            "\xf3\xbe\xa0\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
-            "\xee\x99\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
-            "\xee\x84\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
-            "\xee\x92\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
-            "\xf0\x9f\x8e\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
-            "\xf3\xbe\xa0\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
-            "\xee\x9a\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
-            "\xee\x8c\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
-            "\xee\x92\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
-            "\xf0\x9f\x8e\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
-            "\xf3\xbe\xa0\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
-            "\xee\x96\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
-            "\xf0\x9f\x8e\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
-            "\xf3\xbe\xa0\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
-            "\xee\x9a\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
-            "\xee\x93\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
-            "\xf0\x9f\x8e\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
-            "\xf3\xbe\xa0\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
-            "\xee\x84\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
-            "\xee\x93\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
-            "\xf0\x9f\x8e\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
-            "\xf3\xbe\xa0\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
-            "\xee\x84\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
-            "\xee\x91\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
-            "\xf0\x9f\x8e\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
-            "\xf3\xbe\xa0\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
-            "\xee\x90\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
-            "\xee\xab\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
-            "\xf0\x9f\x8e\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b2\x22></span></span>",
-            "\xf3\xbe\xa0\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b2\x22></span></span>",
-            "\xee\x93\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b2\x22></span></span>",
-            "\xf0\x9f\x8e\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b3\x22></span></span>",
-            "\xf3\xbe\xa0\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b3\x22></span></span>",
-            "\xee\xad\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b3\x22></span></span>",
-            "\xf0\x9f\x8e\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b4\x22></span></span>",
-            "\xf3\xbe\xa0\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b4\x22></span></span>",
-            "\xee\xad\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b4\x22></span></span>",
-            "\xf0\x9f\x8e\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
-            "\xf3\xbe\xa0\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
-            "\xee\x9b\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
-            "\xee\x80\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
-            "\xee\x96\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
-            "\xf0\x9f\x8e\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b6\x22></span></span>",
-            "\xf3\xbe\xa0\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b6\x22></span></span>",
-            "\xee\x9b\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
-            "\xee\x8c\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
-            "\xee\x94\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
-            "\xf0\x9f\x8e\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b7\x22></span></span>",
-            "\xf3\xbe\xa0\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b7\x22></span></span>",
-            "\xee\x81\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b7\x22></span></span>",
-            "\xf0\x9f\x8e\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b8\x22></span></span>",
-            "\xf3\xbe\xa0\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b8\x22></span></span>",
-            "\xee\x81\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b8\x22></span></span>",
-            "\xee\x94\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
-            "\xf0\x9f\x8e\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b9\x22></span></span>",
-            "\xf3\xbe\xa0\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b9\x22></span></span>",
-            "\xee\xad\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b9\x22></span></span>",
-            "\xf0\x9f\x8e\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
-            "\xf3\xbe\xa0\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
-            "\xee\x81\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
-            "\xee\xab\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
-            "\xf0\x9f\x8e\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bb\x22></span></span>",
-            "\xf3\xbe\xa0\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bb\x22></span></span>",
-            "\xf0\x9f\x8e\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
-            "\xf3\xbe\xa0\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
-            "\xee\xab\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
-            "\xf0\x9f\x8e\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bd\x22></span></span>",
-            "\xf3\xbe\x9f\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bd\x22></span></span>",
-            "\xee\x99\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bd\x22></span></span>",
-            "\xf0\x9f\x8e\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
-            "\xf3\xbe\x9f\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
-            "\xee\x99\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
-            "\xee\x80\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
-            "\xee\x92\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
-            "\xf0\x9f\x8e\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
-            "\xf3\xbe\x9f\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
-            "\xee\x99\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
-            "\xee\x80\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
-            "\xee\xaa\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
-            "\xf0\x9f\x8f\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
-            "\xf3\xbe\x9f\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
-            "\xee\x99\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
-            "\xee\x90\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
-            "\xee\x96\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
-            "\xf0\x9f\x8f\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
-            "\xf3\xbe\x9f\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
-            "\xee\x99\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
-            "\xee\x84\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
-            "\xee\x92\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
-            "\xf0\x9f\x8f\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c2\x22></span></span>",
-            "\xf3\xbe\x9f\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c2\x22></span></span>",
-            "\xee\x9c\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
-            "\xee\x92\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c2\x22></span></span>",
-            "\xf0\x9f\x8f\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
-            "\xf3\xbe\x9f\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
-            "\xee\x9c\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
-            "\xee\x84\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
-            "\xee\x91\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
-            "\xf0\x9f\x8f\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
-            "\xf3\xbe\x9f\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
-            "\xee\x80\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
-            "\xee\xad\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
-            "\xf0\x9f\x8f\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c5\x22></span></span>",
-            "\xf0\x9f\x8f\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
-            "\xf3\xbe\x9f\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
-            "\xee\x84\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
-            "\xee\x97\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
-            "\xf0\x9f\x8f\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c7\x22></span></span>",
-            "\xf0\x9f\x8f\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
-            "\xf3\xbe\x9f\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
-            "\xee\x90\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
-            "\xee\x92\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
-            "\xf0\x9f\x8f\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c9\x22></span></span>",
-            "\xf0\x9f\x8f\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
-            "\xf3\xbe\x9f\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
-            "\xee\x90\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
-            "\xee\xab\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
-            "\xf0\x9f\x8f\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cb\x22></span></span>",
-            "\xf0\x9f\x8f\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cc\x22></span></span>",
-            "\xf0\x9f\x8f\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cd\x22></span></span>",
-            "\xf0\x9f\x8f\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ce\x22></span></span>",
-            "\xf0\x9f\x8f\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cf\x22></span></span>",
-            "\xf0\x9f\x8f\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d0\x22></span></span>",
-            "\xf0\x9f\x8f\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d1\x22></span></span>",
-            "\xf0\x9f\x8f\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d2\x22></span></span>",
-            "\xf0\x9f\x8f\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d3\x22></span></span>",
-            "\xf0\x9f\x8f\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d4\x22></span></span>",
-            "\xf0\x9f\x8f\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d5\x22></span></span>",
-            "\xf0\x9f\x8f\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d6\x22></span></span>",
-            "\xf0\x9f\x8f\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d7\x22></span></span>",
-            "\xf0\x9f\x8f\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d8\x22></span></span>",
-            "\xf0\x9f\x8f\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d9\x22></span></span>",
-            "\xf0\x9f\x8f\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3da\x22></span></span>",
-            "\xf0\x9f\x8f\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3db\x22></span></span>",
-            "\xf0\x9f\x8f\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3dc\x22></span></span>",
-            "\xf0\x9f\x8f\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3dd\x22></span></span>",
-            "\xf0\x9f\x8f\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3de\x22></span></span>",
-            "\xf0\x9f\x8f\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3df\x22></span></span>",
-            "\xf0\x9f\x8f\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e0\x22></span></span>",
-            "\xf3\xbe\x92\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e0\x22></span></span>",
-            "\xee\x99\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
-            "\xee\x80\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
-            "\xee\x92\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e0\x22></span></span>",
-            "\xf0\x9f\x8f\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
-            "\xf3\xbe\x92\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
-            "\xee\xac\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
-            "\xf0\x9f\x8f\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
-            "\xf3\xbe\x92\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
-            "\xee\x99\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
-            "\xee\x80\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
-            "\xee\x92\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
-            "\xf0\x9f\x8f\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
-            "\xf3\xbe\x92\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
-            "\xee\x99\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
-            "\xee\x85\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
-            "\xee\x97\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
-            "\xf0\x9f\x8f\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e4\x22></span></span>",
-            "\xf0\x9f\x8f\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
-            "\xf3\xbe\x92\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
-            "\xee\x99\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
-            "\xee\x85\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
-            "\xee\x97\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
-            "\xf0\x9f\x8f\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
-            "\xf3\xbe\x92\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
-            "\xee\x99\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
-            "\xee\x85\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
-            "\xee\x92\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
-            "\xf0\x9f\x8f\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
-            "\xf3\xbe\x92\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
-            "\xee\x99\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
-            "\xee\x85\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
-            "\xee\x92\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
-            "\xf0\x9f\x8f\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
-            "\xf3\xbe\x92\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
-            "\xee\x99\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
-            "\xee\x85\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
-            "\xee\xaa\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
-            "\xf0\x9f\x8f\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
-            "\xf3\xbe\x92\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
-            "\xee\x99\xa9\xee\x9b\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
-            "\xee\x94\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
-            "\xee\xab\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
-            "\xf0\x9f\x8f\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
-            "\xf3\xbe\x92\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
-            "\xee\x99\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
-            "\xee\x85\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
-            "\xee\x92\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
-            "\xf0\x9f\x8f\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
-            "\xf3\xbe\x92\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
-            "\xee\x9c\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
-            "\xee\x85\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
-            "\xee\xaa\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
-            "\xf0\x9f\x8f\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ec\x22></span></span>",
-            "\xf3\xbe\x92\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ec\x22></span></span>",
-            "\xee\x94\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
-            "\xee\xab\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ec\x22></span></span>",
-            "\xf0\x9f\x8f\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
-            "\xf3\xbe\x93\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
-            "\xee\xab\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
-            "\xf0\x9f\x8f\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
-            "\xf3\xbe\x93\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
-            "\xee\x92\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
-            "\xf0\x9f\x8f\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
-            "\xf3\xbe\x92\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
-            "\xee\xab\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
-            "\xf0\x9f\x8f\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
-            "\xf3\xbe\x92\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
-            "\xee\xab\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
-            "\xf0\x9f\x8f\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f3\x22></span></span>",
-            "\xf0\x9f\x8f\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f4\x22></span></span>",
-            "\xf0\x9f\x8f\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f5\x22></span></span>",
-            "\xf0\x9f\x8f\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f7\x22></span></span>",
-            "\xf0\x9f\x8f\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f8\x22></span></span>",
-            "\xf0\x9f\x8f\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f9\x22></span></span>",
-            "\xf0\x9f\x8f\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fa\x22></span></span>",
-            "\xf0\x9f\x8f\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fb\x22></span></span>",
-            "\xf0\x9f\x8f\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fc\x22></span></span>",
-            "\xf0\x9f\x8f\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fd\x22></span></span>",
-            "\xf0\x9f\x8f\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fe\x22></span></span>",
-            "\xf0\x9f\x8f\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ff\x22></span></span>",
-            "\xf0\x9f\x90\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f400\x22></span></span>",
-            "\xf0\x9f\x90\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f401\x22></span></span>",
-            "\xf0\x9f\x90\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f402\x22></span></span>",
-            "\xf0\x9f\x90\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f403\x22></span></span>",
-            "\xf0\x9f\x90\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f404\x22></span></span>",
-            "\xf0\x9f\x90\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f405\x22></span></span>",
-            "\xf0\x9f\x90\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f406\x22></span></span>",
-            "\xf0\x9f\x90\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f407\x22></span></span>",
-            "\xf0\x9f\x90\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f408\x22></span></span>",
-            "\xf0\x9f\x90\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f409\x22></span></span>",
-            "\xf0\x9f\x90\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40a\x22></span></span>",
-            "\xf0\x9f\x90\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40b\x22></span></span>",
-            "\xf0\x9f\x90\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
-            "\xf3\xbe\x86\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
-            "\xee\x9d\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
-            "\xee\xad\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
-            "\xf0\x9f\x90\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
-            "\xf3\xbe\x87\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
-            "\xee\xac\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
-            "\xf0\x9f\x90\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40e\x22></span></span>",
-            "\xf3\xbe\x9f\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40e\x22></span></span>",
-            "\xee\x9d\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
-            "\xee\x84\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40e\x22></span></span>",
-            "\xee\x93\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
-            "\xf0\x9f\x90\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40f\x22></span></span>",
-            "\xf0\x9f\x90\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f410\x22></span></span>",
-            "\xf0\x9f\x90\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f411\x22></span></span>",
-            "\xf3\xbe\x87\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f411\x22></span></span>",
-            "\xee\x94\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
-            "\xf0\x9f\x90\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f412\x22></span></span>",
-            "\xf3\xbe\x87\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f412\x22></span></span>",
-            "\xee\x94\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
-            "\xee\x93\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
-            "\xf0\x9f\x90\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f413\x22></span></span>",
-            "\xf0\x9f\x90\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
-            "\xf3\xbe\x87\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
-            "\xee\xac\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
-            "\xf0\x9f\x90\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f415\x22></span></span>",
-            "\xf0\x9f\x90\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f416\x22></span></span>",
-            "\xf0\x9f\x90\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
-            "\xf3\xbe\x87\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
-            "\xee\xac\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
-            "\xf0\x9f\x90\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f418\x22></span></span>",
-            "\xf3\xbe\x87\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f418\x22></span></span>",
-            "\xee\x94\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
-            "\xee\xac\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f418\x22></span></span>",
-            "\xf0\x9f\x90\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
-            "\xf3\xbe\x87\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
-            "\xee\x84\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
-            "\xee\x97\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
-            "\xf0\x9f\x90\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
-            "\xf3\xbe\x87\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
-            "\xee\x91\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
-            "\xee\xab\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
-            "\xf0\x9f\x90\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41b\x22></span></span>",
-            "\xf3\xbe\x87\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41b\x22></span></span>",
-            "\xee\x94\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
-            "\xee\xac\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41b\x22></span></span>",
-            "\xf0\x9f\x90\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41c\x22></span></span>",
-            "\xf3\xbe\x87\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41c\x22></span></span>",
-            "\xee\x93\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41c\x22></span></span>",
-            "\xf0\x9f\x90\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41d\x22></span></span>",
-            "\xf3\xbe\x87\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41d\x22></span></span>",
-            "\xee\xad\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41d\x22></span></span>",
-            "\xf0\x9f\x90\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41e\x22></span></span>",
-            "\xf3\xbe\x87\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41e\x22></span></span>",
-            "\xee\xad\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41e\x22></span></span>",
-            "\xf0\x9f\x90\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41f\x22></span></span>",
-            "\xf3\xbe\x86\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41f\x22></span></span>",
-            "\xf0\x9f\x90\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f420\x22></span></span>",
-            "\xf3\xbe\x87\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f420\x22></span></span>",
-            "\xee\x94\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
-            "\xee\xac\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f420\x22></span></span>",
-            "\xf0\x9f\x90\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
-            "\xf3\xbe\x87\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
-            "\xee\x93\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
-            "\xf0\x9f\x90\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f422\x22></span></span>",
-            "\xf3\xbe\x87\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f422\x22></span></span>",
-            "\xee\x97\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f422\x22></span></span>",
-            "\xf0\x9f\x90\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f423\x22></span></span>",
-            "\xf3\xbe\x87\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f423\x22></span></span>",
-            "\xee\x9d\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
-            "\xee\x94\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
-            "\xee\x97\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f423\x22></span></span>",
-            "\xf0\x9f\x90\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f424\x22></span></span>",
-            "\xf3\xbe\x86\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f424\x22></span></span>",
-            "\xee\x93\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
-            "\xf0\x9f\x90\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f425\x22></span></span>",
-            "\xf3\xbe\x86\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f425\x22></span></span>",
-            "\xee\xad\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f425\x22></span></span>",
-            "\xf0\x9f\x90\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
-            "\xf3\xbe\x87\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
-            "\xf0\x9f\x90\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
-            "\xf3\xbe\x86\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
-            "\xee\x9d\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
-            "\xee\x81\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
-            "\xee\x93\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
-            "\xf0\x9f\x90\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f428\x22></span></span>",
-            "\xf3\xbe\x87\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f428\x22></span></span>",
-            "\xee\x94\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
-            "\xee\xac\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f428\x22></span></span>",
-            "\xf0\x9f\x90\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f429\x22></span></span>",
-            "\xf3\xbe\x87\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f429\x22></span></span>",
-            "\xee\x9a\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
-            "\xee\x81\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f436\x22></span></span>",
-            "\xee\x93\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f429\x22></span></span>",
-            "\xf0\x9f\x90\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42a\x22></span></span>",
-            "\xf0\x9f\x90\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
-            "\xf3\xbe\x87\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
-            "\xee\xac\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
-            "\xf0\x9f\x90\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42c\x22></span></span>",
-            "\xf3\xbe\x87\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42c\x22></span></span>",
-            "\xee\x94\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
-            "\xee\xac\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42c\x22></span></span>",
-            "\xf0\x9f\x90\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
-            "\xf3\xbe\x87\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
-            "\xee\x81\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
-            "\xee\x97\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
-            "\xf0\x9f\x90\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42e\x22></span></span>",
-            "\xf3\xbe\x87\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42e\x22></span></span>",
-            "\xee\x94\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51f\x22></span></span>",
-            "\xee\xac\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42e\x22></span></span>",
-            "\xf0\x9f\x90\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
-            "\xf3\xbe\x87\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
-            "\xee\x81\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
-            "\xee\x97\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
-            "\xf0\x9f\x90\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
-            "\xf3\xbe\x87\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
-            "\xee\x94\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
-            "\xee\x93\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
-            "\xf0\x9f\x90\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
-            "\xf3\xbe\x86\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
-            "\xee\x9a\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
-            "\xee\x81\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
-            "\xee\x93\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
-            "\xf0\x9f\x90\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f432\x22></span></span>",
-            "\xf3\xbe\x87\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f432\x22></span></span>",
-            "\xee\xac\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f432\x22></span></span>",
-            "\xf0\x9f\x90\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
-            "\xf3\xbe\x87\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
-            "\xee\x81\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
-            "\xee\x91\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
-            "\xf0\x9f\x90\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
-            "\xf3\xbe\x86\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
-            "\xee\x80\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
-            "\xf0\x9f\x90\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
-            "\xf3\xbe\x87\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
-            "\xee\x84\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
-            "\xf0\x9f\x90\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f436\x22></span></span>",
-            "\xf3\xbe\x86\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f436\x22></span></span>",
-            "\xee\x93\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
-            "\xf0\x9f\x90\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f437\x22></span></span>",
-            "\xf3\xbe\x86\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f437\x22></span></span>",
-            "\xee\x9d\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
-            "\xee\x84\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
-            "\xee\x93\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f437\x22></span></span>",
-            "\xf0\x9f\x90\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
-            "\xf3\xbe\x87\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
-            "\xee\x93\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
-            "\xf0\x9f\x90\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f439\x22></span></span>",
-            "\xf3\xbe\x87\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f439\x22></span></span>",
-            "\xee\x94\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
-            "\xf0\x9f\x90\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
-            "\xf3\xbe\x87\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
-            "\xee\x94\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
-            "\xf0\x9f\x90\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
-            "\xf3\xbe\x87\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
-            "\xee\x81\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
-            "\xee\x97\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
-            "\xf0\x9f\x90\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43c\x22></span></span>",
-            "\xf3\xbe\x87\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43c\x22></span></span>",
-            "\xee\xad\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43c\x22></span></span>",
-            "\xf0\x9f\x90\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
-            "\xf3\xbe\x87\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
-            "\xee\xad\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
-            "\xf0\x9f\x90\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43e\x22></span></span>",
-            "\xf3\xbe\x87\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43e\x22></span></span>",
-            "\xee\x9a\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
-            "\xee\x94\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f538\x22></span></span>",
-            "\xee\x93\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43e\x22></span></span>",
-            "\xf0\x9f\x90\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43f\x22></span></span>",
-            "\xf0\x9f\x91\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
-            "\xf3\xbe\x86\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
-            "\xee\x9a\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
-            "\xee\x90\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
-            "\xee\x96\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
-            "\xf0\x9f\x91\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f441\x22></span></span>",
-            "\xf0\x9f\x91\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
-            "\xf3\xbe\x86\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
-            "\xee\x9a\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
-            "\xee\x90\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
-            "\xee\x96\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
-            "\xf0\x9f\x91\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
-            "\xf3\xbe\x86\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
-            "\xee\x90\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
-            "\xee\xab\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
-            "\xf0\x9f\x91\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
-            "\xf3\xbe\x86\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
-            "\xee\x9b\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
-            "\xee\x90\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
-            "\xee\xab\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
-            "\xf0\x9f\x91\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f445\x22></span></span>",
-            "\xf3\xbe\x86\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f445\x22></span></span>",
-            "\xee\x9c\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
-            "\xee\x90\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
-            "\xee\xad\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f445\x22></span></span>",
-            "\xf0\x9f\x91\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
-            "\xf3\xbe\xae\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
-            "\xee\x88\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
-            "\xee\xaa\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
-            "\xf0\x9f\x91\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
-            "\xf3\xbe\xae\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
-            "\xee\x88\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
-            "\xee\xaa\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
-            "\xf0\x9f\x91\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
-            "\xf3\xbe\xae\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
-            "\xee\x88\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
-            "\xee\x93\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
-            "\xf0\x9f\x91\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
-            "\xf3\xbe\xae\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
-            "\xee\x88\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
-            "\xee\x94\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
-            "\xf0\x9f\x91\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
-            "\xf3\xbe\xae\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
-            "\xee\x9b\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
-            "\xee\x80\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
-            "\xee\x93\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
-            "\xf0\x9f\x91\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44b\x22></span></span>",
-            "\xf3\xbe\xae\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44b\x22></span></span>",
-            "\xee\x90\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44b\x22></span></span>",
-            "\xee\xab\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
-            "\xf0\x9f\x91\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
-            "\xf3\xbe\xae\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
-            "\xee\x90\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
-            "\xee\xab\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
-            "\xf0\x9f\x91\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
-            "\xf3\xbe\xae\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
-            "\xee\x9c\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
-            "\xee\x80\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
-            "\xee\x93\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
-            "\xf0\x9f\x91\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
-            "\xf3\xbe\xae\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
-            "\xee\x90\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
-            "\xee\xab\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
-            "\xf0\x9f\x91\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
-            "\xf3\xbe\xae\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
-            "\xee\x90\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
-            "\xee\xab\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
-            "\xf0\x9f\x91\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
-            "\xf3\xbe\xae\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
-            "\xee\x90\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
-            "\xf0\x9f\x91\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f451\x22></span></span>",
-            "\xf3\xbe\x93\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f451\x22></span></span>",
-            "\xee\x9c\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
-            "\xee\x84\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f451\x22></span></span>",
-            "\xee\x97\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
-            "\xf0\x9f\x91\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
-            "\xf3\xbe\x93\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
-            "\xee\x8c\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
-            "\xee\xaa\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
-            "\xf0\x9f\x91\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
-            "\xf3\xbe\x93\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
-            "\xee\x9a\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
-            "\xee\x93\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
-            "\xf0\x9f\x91\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
-            "\xf3\xbe\x93\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
-            "\xee\x8c\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
-            "\xee\xaa\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
-            "\xf0\x9f\x91\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f455\x22></span></span>",
-            "\xf3\xbe\x93\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f455\x22></span></span>",
-            "\xee\x9c\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
-            "\xee\x80\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
-            "\xee\x96\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f455\x22></span></span>",
-            "\xf0\x9f\x91\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
-            "\xf3\xbe\x93\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
-            "\xee\x9c\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
-            "\xee\xad\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
-            "\xf0\x9f\x91\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
-            "\xf3\xbe\x93\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
-            "\xee\x8c\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
-            "\xee\xad\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
-            "\xf0\x9f\x91\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
-            "\xf3\xbe\x93\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
-            "\xee\x8c\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
-            "\xee\xaa\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
-            "\xf0\x9f\x91\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
-            "\xf3\xbe\x93\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
-            "\xee\x8c\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
-            "\xee\xaa\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
-            "\xf0\x9f\x91\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
-            "\xf3\xbe\x93\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
-            "\xee\x94\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
-            "\xf0\x9f\x91\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
-            "\xf3\xbe\x93\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
-            "\xee\x9c\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
-            "\xf0\x9f\x91\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
-            "\xf3\xbe\x93\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
-            "\xee\x9a\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
-            "\xee\x8c\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
-            "\xee\x92\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
-            "\xf0\x9f\x91\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45d\x22></span></span>",
-            "\xf3\xbe\x93\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45d\x22></span></span>",
-            "\xee\x9a\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45d\x22></span></span>",
-            "\xf0\x9f\x91\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45e\x22></span></span>",
-            "\xf3\xbe\x93\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45e\x22></span></span>",
-            "\xee\x9a\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
-            "\xee\x80\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
-            "\xee\x96\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45e\x22></span></span>",
-            "\xf0\x9f\x91\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
-            "\xf3\xbe\x93\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
-            "\xee\xac\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
-            "\xf0\x9f\x91\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f460\x22></span></span>",
-            "\xf3\xbe\x93\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f460\x22></span></span>",
-            "\xee\x99\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
-            "\xee\x84\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f460\x22></span></span>",
-            "\xee\x94\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f476\x22></span></span>",
-            "\xf0\x9f\x91\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
-            "\xf3\xbe\x93\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
-            "\xee\x8c\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
-            "\xf0\x9f\x91\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
-            "\xf3\xbe\x93\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
-            "\xee\x8c\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
-            "\xee\xaa\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
-            "\xf0\x9f\x91\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
-            "\xf3\xbe\x95\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
-            "\xee\xac\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
-            "\xf0\x9f\x91\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f464\x22></span></span>",
-            "\xf3\xbe\x86\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f464\x22></span></span>",
-            "\xee\x9a\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f464\x22></span></span>",
-            "\xf0\x9f\x91\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f465\x22></span></span>",
-            "\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f466\x22></span></span>",
-            "\xf3\xbe\x86\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f466\x22></span></span>",
-            "\xee\x80\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f466\x22></span></span>",
-            "\xee\x93\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
-            "\xf0\x9f\x91\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f467\x22></span></span>",
-            "\xf3\xbe\x86\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f467\x22></span></span>",
-            "\xee\x80\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f467\x22></span></span>",
-            "\xee\x93\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
-            "\xf0\x9f\x91\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
-            "\xf3\xbe\x86\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
-            "\xee\x80\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
-            "\xf0\x9f\x91\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
-            "\xf3\xbe\x86\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
-            "\xee\x80\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
-            "\xf0\x9f\x91\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
-            "\xf3\xbe\x86\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
-            "\xf0\x9f\x91\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46b\x22></span></span>",
-            "\xf3\xbe\x86\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46b\x22></span></span>",
-            "\xee\x90\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46b\x22></span></span>",
-            "\xf0\x9f\x91\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46c\x22></span></span>",
-            "\xf0\x9f\x91\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46d\x22></span></span>",
-            "\xf0\x9f\x91\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
-            "\xf3\xbe\x86\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
-            "\xee\x85\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
-            "\xee\x97\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
-            "\xf0\x9f\x91\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
-            "\xf3\xbe\x86\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
-            "\xee\x90\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
-            "\xee\xab\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
-            "\xf0\x9f\x91\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f470\x22></span></span>",
-            "\xf3\xbe\x86\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f470\x22></span></span>",
-            "\xee\xab\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f470\x22></span></span>",
-            "\xf0\x9f\x91\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f471\x22></span></span>",
-            "\xf3\xbe\x86\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f471\x22></span></span>",
-            "\xee\x94\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
-            "\xee\xac\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f471\x22></span></span>",
-            "\xf0\x9f\x91\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
-            "\xf3\xbe\x86\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
-            "\xee\xac\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
-            "\xf0\x9f\x91\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
-            "\xf3\xbe\x86\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
-            "\xee\xac\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
-            "\xf0\x9f\x91\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f474\x22></span></span>",
-            "\xf3\xbe\x86\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f474\x22></span></span>",
-            "\xee\x94\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50d\x22></span></span>",
-            "\xee\xac\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f474\x22></span></span>",
-            "\xf0\x9f\x91\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f475\x22></span></span>",
-            "\xf3\xbe\x86\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f475\x22></span></span>",
-            "\xee\x94\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
-            "\xee\xac\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f475\x22></span></span>",
-            "\xf0\x9f\x91\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f476\x22></span></span>",
-            "\xf3\xbe\x86\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f476\x22></span></span>",
-            "\xee\xac\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
-            "\xf0\x9f\x91\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f477\x22></span></span>",
-            "\xf3\xbe\x86\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f477\x22></span></span>",
-            "\xee\x94\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
-            "\xee\xac\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f477\x22></span></span>",
-            "\xf0\x9f\x91\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f478\x22></span></span>",
-            "\xf3\xbe\x86\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f478\x22></span></span>",
-            "\xee\x94\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
-            "\xee\xac\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f478\x22></span></span>",
-            "\xf0\x9f\x91\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f479\x22></span></span>",
-            "\xf3\xbe\x86\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f479\x22></span></span>",
-            "\xee\xad\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f479\x22></span></span>",
-            "\xf0\x9f\x91\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47a\x22></span></span>",
-            "\xf3\xbe\x86\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47a\x22></span></span>",
-            "\xee\xad\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47a\x22></span></span>",
-            "\xf0\x9f\x91\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
-            "\xf3\xbe\x86\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
-            "\xee\x84\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
-            "\xee\x93\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
-            "\xf0\x9f\x91\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
-            "\xf3\xbe\x86\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
-            "\xee\x81\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
-            "\xee\x96\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
-            "\xf0\x9f\x91\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47d\x22></span></span>",
-            "\xf3\xbe\x86\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47d\x22></span></span>",
-            "\xee\x84\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47d\x22></span></span>",
-            "\xee\x94\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
-            "\xf0\x9f\x91\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
-            "\xf3\xbe\x86\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
-            "\xee\x84\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
-            "\xee\x93\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
-            "\xf0\x9f\x91\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
-            "\xf3\xbe\x86\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
-            "\xee\x84\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
-            "\xee\x93\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
-            "\xf0\x9f\x92\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
-            "\xf3\xbe\x86\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
-            "\xee\x84\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
-            "\xee\x93\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
-            "\xf0\x9f\x92\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f481\x22></span></span>",
-            "\xf3\xbe\x86\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f481\x22></span></span>",
-            "\xee\x89\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f481\x22></span></span>",
-            "\xf0\x9f\x92\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f482\x22></span></span>",
-            "\xf3\xbe\x86\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f482\x22></span></span>",
-            "\xee\x94\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
-            "\xf0\x9f\x92\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f483\x22></span></span>",
-            "\xf3\xbe\x86\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f483\x22></span></span>",
-            "\xee\x94\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
-            "\xee\xac\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f483\x22></span></span>",
-            "\xf0\x9f\x92\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
-            "\xf3\xbe\x86\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
-            "\xee\x9c\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
-            "\xee\x8c\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
-            "\xee\x94\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
-            "\xf0\x9f\x92\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
-            "\xf3\xbe\x86\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
-            "\xee\x8c\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
-            "\xee\xaa\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
-            "\xf0\x9f\x92\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f486\x22></span></span>",
-            "\xf3\xbe\x86\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f486\x22></span></span>",
-            "\xee\x8c\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f486\x22></span></span>",
-            "\xee\x94\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
-            "\xf0\x9f\x92\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
-            "\xf3\xbe\x86\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
-            "\xee\x8c\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
-            "\xee\xaa\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
-            "\xf0\x9f\x92\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
-            "\xf3\xbe\x86\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
-            "\xee\x8c\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
-            "\xee\xaa\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
-            "\xf0\x9f\x92\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f489\x22></span></span>",
-            "\xf3\xbe\x94\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f489\x22></span></span>",
-            "\xee\x84\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f489\x22></span></span>",
-            "\xee\x94\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
-            "\xf0\x9f\x92\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
-            "\xf3\xbe\x94\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
-            "\xee\x8c\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
-            "\xee\xaa\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
-            "\xf0\x9f\x92\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
-            "\xf3\xbe\xa0\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
-            "\xee\x80\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
-            "\xee\x93\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
-            "\xf0\x9f\x92\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
-            "\xf3\xbe\xa0\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
-            "\xee\x9c\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
-            "\xee\x84\x83\xee\x8c\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
-            "\xee\xad\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
-            "\xf0\x9f\x92\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48d\x22></span></span>",
-            "\xf3\xbe\xa0\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48d\x22></span></span>",
-            "\xee\x9c\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
-            "\xee\x80\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48d\x22></span></span>",
-            "\xee\x94\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
-            "\xf0\x9f\x92\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
-            "\xf3\xbe\xa0\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
-            "\xee\x80\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
-            "\xf0\x9f\x92\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
-            "\xf3\xbe\xa0\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
-            "\xee\x84\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
-            "\xee\x97\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
-            "\xf0\x9f\x92\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
-            "\xf3\xbe\xa0\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
-            "\xee\x8c\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
-            "\xee\xaa\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
-            "\xf0\x9f\x92\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
-            "\xf3\xbe\xa0\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
-            "\xee\x9b\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
-            "\xee\x90\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
-            "\xee\xab\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
-            "\xf0\x9f\x92\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
-            "\xf3\xbe\xa0\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
-            "\xee\x90\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
-            "\xf0\x9f\x92\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f493\x22></span></span>",
-            "\xf3\xbe\xac\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f493\x22></span></span>",
-            "\xee\x8c\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
-            "\xee\xad\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
-            "\xf0\x9f\x92\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
-            "\xf3\xbe\xac\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
-            "\xee\x9b\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
-            "\xee\x80\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
-            "\xee\x91\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
-            "\xf0\x9f\x92\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
-            "\xf3\xbe\xac\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
-            "\xee\x9b\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
-            "\xee\x91\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
-            "\xf0\x9f\x92\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f496\x22></span></span>",
-            "\xf3\xbe\xac\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f496\x22></span></span>",
-            "\xee\xaa\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f496\x22></span></span>",
-            "\xf0\x9f\x92\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
-            "\xf3\xbe\xac\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
-            "\xee\x8c\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
-            "\xf0\x9f\x92\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
-            "\xf3\xbe\xac\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
-            "\xee\x8c\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
-            "\xee\x93\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
-            "\xf0\x9f\x92\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
-            "\xf3\xbe\xac\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
-            "\xee\x8c\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
-            "\xee\xaa\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
-            "\xf0\x9f\x92\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
-            "\xf3\xbe\xac\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
-            "\xee\x8c\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
-            "\xee\xaa\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
-            "\xf0\x9f\x92\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
-            "\xf3\xbe\xac\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
-            "\xee\x8c\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
-            "\xee\xaa\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
-            "\xf0\x9f\x92\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
-            "\xf3\xbe\xac\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
-            "\xee\x8c\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
-            "\xee\xaa\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
-            "\xf0\x9f\x92\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
-            "\xf3\xbe\xac\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
-            "\xee\x90\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
-            "\xee\xad\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
-            "\xf0\x9f\x92\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
-            "\xf3\xbe\xac\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
-            "\xee\x96\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
-            "\xf0\x9f\x92\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
-            "\xf3\xbe\xac\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
-            "\xee\x88\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
-            "\xf0\x9f\x92\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a0\x22></span></span>",
-            "\xf3\xbe\xad\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a0\x22></span></span>",
-            "\xf0\x9f\x92\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
-            "\xf3\xbe\xad\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
-            "\xee\x9b\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
-            "\xee\x84\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
-            "\xee\x91\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
-            "\xf0\x9f\x92\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
-            "\xf3\xbe\xad\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
-            "\xee\x9b\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
-            "\xee\x8c\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
-            "\xee\x93\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
-            "\xf0\x9f\x92\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
-            "\xf3\xbe\xad\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
-            "\xee\x9b\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
-            "\xee\x8c\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
-            "\xee\x91\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
-            "\xf0\x9f\x92\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
-            "\xf3\xbe\xad\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
-            "\xee\x9c\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
-            "\xee\x84\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
-            "\xee\x91\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
-            "\xf0\x9f\x92\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
-            "\xf3\xbe\xad\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
-            "\xee\x9c\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
-            "\xee\x96\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
-            "\xf0\x9f\x92\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
-            "\xf3\xbe\xad\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
-            "\xee\x9c\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
-            "\xee\x8c\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
-            "\xee\x96\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
-            "\xf0\x9f\x92\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
-            "\xf3\xbe\xad\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
-            "\xee\x9c\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
-            "\xee\x93\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
-            "\xf0\x9f\x92\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
-            "\xf3\xbe\xad\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
-            "\xee\x9c\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
-            "\xee\x8c\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
-            "\xee\x93\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
-            "\xf0\x9f\x92\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
-            "\xf3\xbe\x93\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
-            "\xee\x81\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
-            "\xee\x93\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
-            "\xf0\x9f\x92\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
-            "\xf3\xbe\xad\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
-            "\xee\x85\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
-            "\xee\x93\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
-            "\xf0\x9f\x92\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ab\x22></span></span>",
-            "\xf3\xbe\xad\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ab\x22></span></span>",
-            "\xee\x90\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
-            "\xee\xad\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ab\x22></span></span>",
-            "\xf0\x9f\x92\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ac\x22></span></span>",
-            "\xf3\xbe\x94\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ac\x22></span></span>",
-            "\xee\x93\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ac\x22></span></span>",
-            "\xf0\x9f\x92\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ad\x22></span></span>",
-            "\xf0\x9f\x92\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ae\x22></span></span>",
-            "\xf3\xbe\xad\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ae\x22></span></span>",
-            "\xee\x93\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ae\x22></span></span>",
-            "\xf0\x9f\x92\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4af\x22></span></span>",
-            "\xf3\xbe\xad\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4af\x22></span></span>",
-            "\xee\x93\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4af\x22></span></span>",
-            "\xf0\x9f\x92\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b0\x22></span></span>",
-            "\xf3\xbe\x93\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b0\x22></span></span>",
-            "\xee\x9c\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
-            "\xee\x84\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
-            "\xee\x93\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b0\x22></span></span>",
-            "\xf0\x9f\x92\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b1\x22></span></span>",
-            "\xf3\xbe\x93\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b1\x22></span></span>",
-            "\xee\x85\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b1\x22></span></span>",
-            "\xf0\x9f\x92\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b2\x22></span></span>",
-            "\xf3\xbe\x93\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b2\x22></span></span>",
-            "\xee\x95\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b2\x22></span></span>",
-            "\xf0\x9f\x92\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b3\x22></span></span>",
-            "\xf3\xbe\x93\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b3\x22></span></span>",
-            "\xee\x95\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b3\x22></span></span>",
-            "\xf0\x9f\x92\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
-            "\xf3\xbe\x93\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
-            "\xee\x9b\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
-            "\xee\x95\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
-            "\xf0\x9f\x92\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
-            "\xf3\xbe\x93\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
-            "\xee\x96\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
-            "\xf0\x9f\x92\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b6\x22></span></span>",
-            "\xf0\x9f\x92\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b7\x22></span></span>",
-            "\xf0\x9f\x92\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b8\x22></span></span>",
-            "\xf3\xbe\x93\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b8\x22></span></span>",
-            "\xee\xad\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b8\x22></span></span>",
-            "\xf0\x9f\x92\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b9\x22></span></span>",
-            "\xf3\xbe\x93\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b9\x22></span></span>",
-            "\xee\x85\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
-            "\xee\x97\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b9\x22></span></span>",
-            "\xf0\x9f\x92\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
-            "\xf3\xbe\x94\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
-            "\xee\x9a\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
-            "\xee\x84\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
-            "\xf0\x9f\x92\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
-            "\xf3\xbe\x94\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
-            "\xee\x9c\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
-            "\xee\x80\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
-            "\xee\x96\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
-            "\xf0\x9f\x92\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
-            "\xf3\xbe\x94\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
-            "\xee\x84\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
-            "\xee\x97\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
-            "\xf0\x9f\x92\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bd\x22></span></span>",
-            "\xf3\xbe\x94\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bd\x22></span></span>",
-            "\xee\x8c\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
-            "\xee\x96\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bd\x22></span></span>",
-            "\xf0\x9f\x92\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
-            "\xf3\xbe\x94\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
-            "\xee\x95\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
-            "\xf0\x9f\x92\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bf\x22></span></span>",
-            "\xf3\xbe\xa0\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bf\x22></span></span>",
-            "\xee\x9a\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
-            "\xee\x84\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bf\x22></span></span>",
-            "\xee\x94\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
-            "\xf0\x9f\x93\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
-            "\xf3\xbe\xa0\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
-            "\xee\x84\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
-            "\xf0\x9f\x93\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c1\x22></span></span>",
-            "\xf3\xbe\x95\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c1\x22></span></span>",
-            "\xee\x96\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c1\x22></span></span>",
-            "\xf0\x9f\x93\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c2\x22></span></span>",
-            "\xf3\xbe\x95\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c2\x22></span></span>",
-            "\xee\x96\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c2\x22></span></span>",
-            "\xf0\x9f\x93\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c3\x22></span></span>",
-            "\xf3\xbe\x95\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c3\x22></span></span>",
-            "\xee\x9a\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
-            "\xee\x95\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c3\x22></span></span>",
-            "\xf0\x9f\x93\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c4\x22></span></span>",
-            "\xf3\xbe\x95\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c4\x22></span></span>",
-            "\xee\x95\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c4\x22></span></span>",
-            "\xf0\x9f\x93\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c5\x22></span></span>",
-            "\xf3\xbe\x95\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c5\x22></span></span>",
-            "\xee\x95\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c5\x22></span></span>",
-            "\xf0\x9f\x93\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c6\x22></span></span>",
-            "\xf3\xbe\x95\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c6\x22></span></span>",
-            "\xee\x95\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c6\x22></span></span>",
-            "\xf0\x9f\x93\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c7\x22></span></span>",
-            "\xf3\xbe\x95\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c7\x22></span></span>",
-            "\xee\x9a\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
-            "\xee\x85\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
-            "\xee\x95\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c7\x22></span></span>",
-            "\xf0\x9f\x93\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c8\x22></span></span>",
-            "\xf3\xbe\x95\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c8\x22></span></span>",
-            "\xee\x95\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c8\x22></span></span>",
-            "\xf0\x9f\x93\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c9\x22></span></span>",
-            "\xf3\xbe\x95\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c9\x22></span></span>",
-            "\xee\x95\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c9\x22></span></span>",
-            "\xf0\x9f\x93\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
-            "\xf3\xbe\x95\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
-            "\xee\x95\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
-            "\xf0\x9f\x93\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cb\x22></span></span>",
-            "\xf3\xbe\x95\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cb\x22></span></span>",
-            "\xee\x95\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cb\x22></span></span>",
-            "\xf0\x9f\x93\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cc\x22></span></span>",
-            "\xf3\xbe\x95\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cc\x22></span></span>",
-            "\xee\x95\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cc\x22></span></span>",
-            "\xf0\x9f\x93\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cd\x22></span></span>",
-            "\xf3\xbe\x94\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cd\x22></span></span>",
-            "\xee\x95\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cd\x22></span></span>",
-            "\xf0\x9f\x93\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
-            "\xf3\xbe\x94\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
-            "\xee\x9c\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
-            "\xee\x92\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
-            "\xf0\x9f\x93\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cf\x22></span></span>",
-            "\xf3\xbe\x95\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cf\x22></span></span>",
-            "\xee\x95\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cf\x22></span></span>",
-            "\xf0\x9f\x93\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d0\x22></span></span>",
-            "\xf3\xbe\x95\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d0\x22></span></span>",
-            "\xee\x92\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d0\x22></span></span>",
-            "\xf0\x9f\x93\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d1\x22></span></span>",
-            "\xf3\xbe\x95\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d1\x22></span></span>",
-            "\xee\xac\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d1\x22></span></span>",
-            "\xf0\x9f\x93\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d2\x22></span></span>",
-            "\xf3\xbe\x95\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d2\x22></span></span>",
-            "\xee\x95\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d2\x22></span></span>",
-            "\xf0\x9f\x93\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d3\x22></span></span>",
-            "\xf3\xbe\x95\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d3\x22></span></span>",
-            "\xee\x95\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d3\x22></span></span>",
-            "\xf0\x9f\x93\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d4\x22></span></span>",
-            "\xf3\xbe\x95\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d4\x22></span></span>",
-            "\xee\x92\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d4\x22></span></span>",
-            "\xf0\x9f\x93\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d5\x22></span></span>",
-            "\xf3\xbe\x94\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d5\x22></span></span>",
-            "\xee\x95\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d5\x22></span></span>",
-            "\xf0\x9f\x93\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d6\x22></span></span>",
-            "\xf3\xbe\x95\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d6\x22></span></span>",
-            "\xee\x92\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d6\x22></span></span>",
-            "\xf0\x9f\x93\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d7\x22></span></span>",
-            "\xf3\xbe\x93\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d7\x22></span></span>",
-            "\xee\x95\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d7\x22></span></span>",
-            "\xf0\x9f\x93\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d8\x22></span></span>",
-            "\xf3\xbe\x94\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d8\x22></span></span>",
-            "\xee\x95\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d8\x22></span></span>",
-            "\xf0\x9f\x93\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d9\x22></span></span>",
-            "\xf3\xbe\x94\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d9\x22></span></span>",
-            "\xee\x95\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d9\x22></span></span>",
-            "\xf0\x9f\x93\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
-            "\xf3\xbe\x94\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
-            "\xee\x95\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
-            "\xf0\x9f\x93\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4db\x22></span></span>",
-            "\xf3\xbe\x94\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4db\x22></span></span>",
-            "\xee\x94\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fd\x22></span></span>",
-            "\xf0\x9f\x93\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
-            "\xf3\xbe\x93\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
-            "\xee\x95\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
-            "\xf0\x9f\x93\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
-            "\xf3\xbe\x94\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
-            "\xee\xaa\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
-            "\xf0\x9f\x93\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
-            "\xf3\xbe\x94\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
-            "\xf0\x9f\x93\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
-            "\xf3\xbe\x94\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
-            "\xee\x99\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
-            "\xee\x96\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
-            "\xf0\x9f\x93\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
-            "\xf3\xbe\x94\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
-            "\xee\x9b\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
-            "\xee\x80\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
-            "\xf0\x9f\x93\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
-            "\xf3\xbe\x94\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
-            "\xee\x85\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
-            "\xee\x92\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
-            "\xf0\x9f\x93\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e2\x22></span></span>",
-            "\xf3\xbe\x94\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e2\x22></span></span>",
-            "\xee\x85\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e2\x22></span></span>",
-            "\xee\x94\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
-            "\xf0\x9f\x93\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e3\x22></span></span>",
-            "\xf3\xbe\x94\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e3\x22></span></span>",
-            "\xee\x8c\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e3\x22></span></span>",
-            "\xf0\x9f\x93\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e4\x22></span></span>",
-            "\xf3\xbe\x94\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e4\x22></span></span>",
-            "\xee\x96\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e4\x22></span></span>",
-            "\xf0\x9f\x93\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e5\x22></span></span>",
-            "\xf3\xbe\x94\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e5\x22></span></span>",
-            "\xee\x96\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e5\x22></span></span>",
-            "\xf0\x9f\x93\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
-            "\xf3\xbe\x94\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
-            "\xf0\x9f\x93\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
-            "\xf3\xbe\xae\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
-            "\xee\xad\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
-            "\xf0\x9f\x93\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e8\x22></span></span>",
-            "\xf3\xbe\x94\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e8\x22></span></span>",
-            "\xee\x9b\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
-            "\xee\x96\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e8\x22></span></span>",
-            "\xf0\x9f\x93\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
-            "\xf3\xbe\x94\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
-            "\xee\xad\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
-            "\xf0\x9f\x93\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ea\x22></span></span>",
-            "\xf3\xbe\x94\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ea\x22></span></span>",
-            "\xee\x84\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
-            "\xf0\x9f\x93\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
-            "\xf3\xbe\x94\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
-            "\xee\xac\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
-            "\xf0\x9f\x93\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ec\x22></span></span>",
-            "\xf0\x9f\x93\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ed\x22></span></span>",
-            "\xf0\x9f\x93\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
-            "\xf3\xbe\x94\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
-            "\xee\x84\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
-            "\xf0\x9f\x93\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ef\x22></span></span>",
-            "\xf0\x9f\x93\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f0\x22></span></span>",
-            "\xf3\xbe\xa0\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f0\x22></span></span>",
-            "\xee\x96\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f0\x22></span></span>",
-            "\xf0\x9f\x93\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
-            "\xf3\xbe\x94\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
-            "\xee\x9a\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
-            "\xee\x80\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
-            "\xee\x96\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
-            "\xf0\x9f\x93\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
-            "\xf3\xbe\x94\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
-            "\xee\x9b\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
-            "\xee\x84\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
-            "\xee\xac\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
-            "\xf0\x9f\x93\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
-            "\xf3\xbe\xa0\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
-            "\xee\x89\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
-            "\xee\xaa\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
-            "\xf0\x9f\x93\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
-            "\xf3\xbe\xa0\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
-            "\xee\x89\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
-            "\xee\xaa\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
-            "\xf0\x9f\x93\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f5\x22></span></span>",
-            "\xf0\x9f\x93\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
-            "\xf3\xbe\xa0\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
-            "\xee\x88\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
-            "\xee\xaa\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
-            "\xf0\x9f\x93\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
-            "\xf3\xbe\x93\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
-            "\xee\x9a\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
-            "\xee\x80\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
-            "\xf0\x9f\x93\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f8\x22></span></span>",
-            "\xf0\x9f\x93\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
-            "\xf3\xbe\x93\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
-            "\xee\x95\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
-            "\xf0\x9f\x93\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
-            "\xf3\xbe\xa0\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
-            "\xee\x9a\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
-            "\xee\x84\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
-            "\xf0\x9f\x93\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
-            "\xf3\xbe\xa0\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
-            "\xee\x84\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
-            "\xee\x96\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
-            "\xf0\x9f\x93\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
-            "\xf3\xbe\xa0\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
-            "\xee\x84\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
-            "\xee\x96\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
-            "\xf0\x9f\x93\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fd\x22></span></span>",
-            "\xf0\x9f\x93\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ff\x22></span></span>",
-            "\xf0\x9f\x94\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f500\x22></span></span>",
-            "\xf0\x9f\x94\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f501\x22></span></span>",
-            "\xf0\x9f\x94\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f502\x22></span></span>",
-            "\xf0\x9f\x94\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
-            "\xf3\xbe\xae\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
-            "\xee\xac\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
-            "\xf0\x9f\x94\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f504\x22></span></span>",
-            "\xf0\x9f\x94\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f505\x22></span></span>",
-            "\xf0\x9f\x94\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f506\x22></span></span>",
-            "\xf0\x9f\x94\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f507\x22></span></span>",
-            "\xf0\x9f\x94\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f508\x22></span></span>",
-            "\xf0\x9f\x94\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f509\x22></span></span>",
-            "\xf0\x9f\x94\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50a\x22></span></span>",
-            "\xf3\xbe\xa0\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50a\x22></span></span>",
-            "\xee\x85\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50a\x22></span></span>",
-            "\xf0\x9f\x94\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50b\x22></span></span>",
-            "\xf3\xbe\x93\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50b\x22></span></span>",
-            "\xee\x96\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50b\x22></span></span>",
-            "\xf0\x9f\x94\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50c\x22></span></span>",
-            "\xf3\xbe\x93\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50c\x22></span></span>",
-            "\xee\x96\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50c\x22></span></span>",
-            "\xf0\x9f\x94\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50d\x22></span></span>",
-            "\xf3\xbe\xae\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50d\x22></span></span>",
-            "\xee\x9b\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
-            "\xee\x84\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
-            "\xf0\x9f\x94\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
-            "\xf3\xbe\xae\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
-            "\xee\xac\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
-            "\xf0\x9f\x94\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50f\x22></span></span>",
-            "\xf3\xbe\xae\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50f\x22></span></span>",
-            "\xee\x9b\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
-            "\xee\x85\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f512\x22></span></span>",
-            "\xee\xac\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50f\x22></span></span>",
-            "\xf0\x9f\x94\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f510\x22></span></span>",
-            "\xf3\xbe\xae\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f510\x22></span></span>",
-            "\xee\xab\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f510\x22></span></span>",
-            "\xf0\x9f\x94\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
-            "\xf3\xbe\xae\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
-            "\xee\x80\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
-            "\xf0\x9f\x94\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f512\x22></span></span>",
-            "\xf3\xbe\xae\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f512\x22></span></span>",
-            "\xf0\x9f\x94\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
-            "\xf3\xbe\xae\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
-            "\xee\x85\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
-            "\xf0\x9f\x94\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
-            "\xf3\xbe\x93\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
-            "\xee\x9c\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
-            "\xee\x8c\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
-            "\xee\x94\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
-            "\xf0\x9f\x94\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f515\x22></span></span>",
-            "\xf0\x9f\x94\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f516\x22></span></span>",
-            "\xf3\xbe\xae\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f516\x22></span></span>",
-            "\xee\xac\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f516\x22></span></span>",
-            "\xf0\x9f\x94\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f517\x22></span></span>",
-            "\xf3\xbe\xad\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f517\x22></span></span>",
-            "\xee\x96\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f517\x22></span></span>",
-            "\xf0\x9f\x94\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f518\x22></span></span>",
-            "\xf3\xbe\xae\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f518\x22></span></span>",
-            "\xee\xac\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f518\x22></span></span>",
-            "\xf0\x9f\x94\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
-            "\xf3\xbe\xae\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
-            "\xee\xac\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
-            "\xf0\x9f\x94\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51a\x22></span></span>",
-            "\xf3\xbe\x80\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51a\x22></span></span>",
-            "\xee\x9a\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51a\x22></span></span>",
-            "\xf0\x9f\x94\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51b\x22></span></span>",
-            "\xf3\xbe\x80\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51b\x22></span></span>",
-            "\xee\x9a\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51b\x22></span></span>",
-            "\xf0\x9f\x94\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51c\x22></span></span>",
-            "\xf3\xbe\x80\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51c\x22></span></span>",
-            "\xee\x9a\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51c\x22></span></span>",
-            "\xf0\x9f\x94\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51d\x22></span></span>",
-            "\xf3\xbe\xad\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51d\x22></span></span>",
-            "\xee\x89\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51d\x22></span></span>",
-            "\xf0\x9f\x94\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
-            "\xf3\xbe\xac\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
-            "\xee\x88\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
-            "\xee\xaa\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
-            "\xf0\x9f\x94\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51f\x22></span></span>",
-            "\xf3\xbe\xa0\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51f\x22></span></span>",
-            "\xf0\x9f\x94\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f520\x22></span></span>",
-            "\xf3\xbe\xad\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f520\x22></span></span>",
-            "\xee\xab\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f520\x22></span></span>",
-            "\xf0\x9f\x94\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f521\x22></span></span>",
-            "\xf3\xbe\xad\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f521\x22></span></span>",
-            "\xee\xab\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f521\x22></span></span>",
-            "\xf0\x9f\x94\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f522\x22></span></span>",
-            "\xf3\xbe\xad\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f522\x22></span></span>",
-            "\xee\xab\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f522\x22></span></span>",
-            "\xf0\x9f\x94\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f523\x22></span></span>",
-            "\xf3\xbe\xad\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f523\x22></span></span>",
-            "\xee\xac\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f523\x22></span></span>",
-            "\xf0\x9f\x94\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f524\x22></span></span>",
-            "\xf3\xbe\xae\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f524\x22></span></span>",
-            "\xee\xad\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f524\x22></span></span>",
-            "\xf0\x9f\x94\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
-            "\xf3\xbe\x93\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
-            "\xee\x84\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
-            "\xee\x91\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
-            "\xf0\x9f\x94\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
-            "\xf3\xbe\x93\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
-            "\xee\x96\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
-            "\xf0\x9f\x94\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
-            "\xf3\xbe\x93\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
-            "\xee\x9c\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
-            "\xee\x96\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
-            "\xf0\x9f\x94\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
-            "\xf3\xbe\x93\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
-            "\xee\x84\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
-            "\xee\x97\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
-            "\xf0\x9f\x94\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f529\x22></span></span>",
-            "\xf3\xbe\x93\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f529\x22></span></span>",
-            "\xee\x96\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f529\x22></span></span>",
-            "\xf0\x9f\x94\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52a\x22></span></span>",
-            "\xf3\xbe\x93\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52a\x22></span></span>",
-            "\xee\x95\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52a\x22></span></span>",
-            "\xf0\x9f\x94\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
-            "\xf3\xbe\x93\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
-            "\xee\x84\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
-            "\xee\x94\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
-            "\xf0\x9f\x94\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52c\x22></span></span>",
-            "\xf0\x9f\x94\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52d\x22></span></span>",
-            "\xf0\x9f\x94\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52e\x22></span></span>",
-            "\xf3\xbe\x93\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52e\x22></span></span>",
-            "\xee\x88\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
-            "\xee\xaa\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
-            "\xf0\x9f\x94\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
-            "\xf3\xbe\x93\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
-            "\xf0\x9f\x94\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
-            "\xf3\xbe\x81\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
-            "\xee\x88\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
-            "\xee\x92\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
-            "\xf0\x9f\x94\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
-            "\xf3\xbe\x93\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
-            "\xee\x80\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
-            "\xf0\x9f\x94\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f532\x22></span></span>",
-            "\xf3\xbe\xad\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
-            "\xee\x95\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
-            "\xf0\x9f\x94\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f533\x22></span></span>",
-            "\xf3\xbe\xad\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f533\x22></span></span>",
-            "\xf0\x9f\x94\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
-            "\xf3\xbe\xad\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
-            "\xee\x95\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
-            "\xf0\x9f\x94\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
-            "\xf0\x9f\x94\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f536\x22></span></span>",
-            "\xf3\xbe\xad\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f536\x22></span></span>",
-            "\xee\x95\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f536\x22></span></span>",
-            "\xf0\x9f\x94\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f537\x22></span></span>",
-            "\xf3\xbe\xad\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f537\x22></span></span>",
-            "\xee\x95\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f537\x22></span></span>",
-            "\xf0\x9f\x94\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f538\x22></span></span>",
-            "\xf3\xbe\xad\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f538\x22></span></span>",
-            "\xf0\x9f\x94\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
-            "\xf3\xbe\xad\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
-            "\xf0\x9f\x94\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53a\x22></span></span>",
-            "\xf3\xbe\xad\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53a\x22></span></span>",
-            "\xee\x95\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53a\x22></span></span>",
-            "\xf0\x9f\x94\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53b\x22></span></span>",
-            "\xf3\xbe\xad\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53b\x22></span></span>",
-            "\xee\x95\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53b\x22></span></span>",
-            "\xf0\x9f\x94\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53c\x22></span></span>",
-            "\xf3\xbe\xac\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53c\x22></span></span>",
-            "\xee\x95\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53c\x22></span></span>",
-            "\xf0\x9f\x94\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53d\x22></span></span>",
-            "\xf3\xbe\xac\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53d\x22></span></span>",
-            "\xee\x95\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53d\x22></span></span>",
-            "\xf0\x9f\x95\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f549\x22></span></span>",
-            "\xf0\x9f\x95\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54a\x22></span></span>",
-            "\xf0\x9f\x95\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54b\x22></span></span>",
-            "\xf0\x9f\x95\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54c\x22></span></span>",
-            "\xf0\x9f\x95\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54d\x22></span></span>",
-            "\xf0\x9f\x95\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54e\x22></span></span>",
-            "\xf0\x9f\x95\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f550\x22></span></span>",
-            "\xf3\xbe\x80\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f550\x22></span></span>",
-            "\xee\x80\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f550\x22></span></span>",
-            "\xf0\x9f\x95\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f551\x22></span></span>",
-            "\xf3\xbe\x80\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f551\x22></span></span>",
-            "\xee\x80\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f551\x22></span></span>",
-            "\xf0\x9f\x95\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f552\x22></span></span>",
-            "\xf3\xbe\x80\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f552\x22></span></span>",
-            "\xee\x80\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f552\x22></span></span>",
-            "\xf0\x9f\x95\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f553\x22></span></span>",
-            "\xf3\xbe\x80\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f553\x22></span></span>",
-            "\xee\x80\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f553\x22></span></span>",
-            "\xf0\x9f\x95\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f554\x22></span></span>",
-            "\xf3\xbe\x80\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f554\x22></span></span>",
-            "\xee\x80\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f554\x22></span></span>",
-            "\xf0\x9f\x95\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f555\x22></span></span>",
-            "\xf3\xbe\x80\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f555\x22></span></span>",
-            "\xee\x80\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f555\x22></span></span>",
-            "\xf0\x9f\x95\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f556\x22></span></span>",
-            "\xf3\xbe\x80\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f556\x22></span></span>",
-            "\xee\x80\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f556\x22></span></span>",
-            "\xf0\x9f\x95\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f557\x22></span></span>",
-            "\xf3\xbe\x80\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f557\x22></span></span>",
-            "\xee\x80\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f557\x22></span></span>",
-            "\xf0\x9f\x95\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f558\x22></span></span>",
-            "\xf3\xbe\x80\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f558\x22></span></span>",
-            "\xee\x80\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f558\x22></span></span>",
-            "\xf0\x9f\x95\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f559\x22></span></span>",
-            "\xf3\xbe\x80\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f559\x22></span></span>",
-            "\xf0\x9f\x95\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55a\x22></span></span>",
-            "\xf3\xbe\x80\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55a\x22></span></span>",
-            "\xee\x80\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55a\x22></span></span>",
-            "\xf0\x9f\x95\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
-            "\xf3\xbe\x80\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
-            "\xee\x80\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
-            "\xf0\x9f\x95\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55c\x22></span></span>",
-            "\xf0\x9f\x95\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55d\x22></span></span>",
-            "\xf0\x9f\x95\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55e\x22></span></span>",
-            "\xf0\x9f\x95\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55f\x22></span></span>",
-            "\xf0\x9f\x95\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f560\x22></span></span>",
-            "\xf0\x9f\x95\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f561\x22></span></span>",
-            "\xf0\x9f\x95\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f562\x22></span></span>",
-            "\xf0\x9f\x95\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f563\x22></span></span>",
-            "\xf0\x9f\x95\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f564\x22></span></span>",
-            "\xf0\x9f\x95\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f565\x22></span></span>",
-            "\xf0\x9f\x95\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f566\x22></span></span>",
-            "\xf0\x9f\x95\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f567\x22></span></span>",
-            "\xf0\x9f\x95\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f56f\x22></span></span>",
-            "\xf0\x9f\x95\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f570\x22></span></span>",
-            "\xf0\x9f\x95\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f573\x22></span></span>",
-            "\xf0\x9f\x95\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f574\x22></span></span>",
-            "\xf0\x9f\x95\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f575\x22></span></span>",
-            "\xf0\x9f\x95\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f576\x22></span></span>",
-            "\xf0\x9f\x95\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f577\x22></span></span>",
-            "\xf0\x9f\x95\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f578\x22></span></span>",
-            "\xf0\x9f\x95\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f579\x22></span></span>",
-            "\xf0\x9f\x96\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f587\x22></span></span>",
-            "\xf0\x9f\x96\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58a\x22></span></span>",
-            "\xf0\x9f\x96\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58b\x22></span></span>",
-            "\xf0\x9f\x96\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58c\x22></span></span>",
-            "\xf0\x9f\x96\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58d\x22></span></span>",
-            "\xf0\x9f\x96\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f590\x22></span></span>",
-            "\xf0\x9f\x96\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f595\x22></span></span>",
-            "\xf0\x9f\x96\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f596\x22></span></span>",
-            "\xf0\x9f\x96\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5a5\x22></span></span>",
-            "\xf0\x9f\x96\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5a8\x22></span></span>",
-            "\xf0\x9f\x96\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5b1\x22></span></span>",
-            "\xf0\x9f\x96\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5b2\x22></span></span>",
-            "\xf0\x9f\x96\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5bc\x22></span></span>",
-            "\xf0\x9f\x97\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5c2\x22></span></span>",
-            "\xf0\x9f\x97\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5c3\x22></span></span>",
-            "\xf0\x9f\x97\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5c4\x22></span></span>",
-            "\xf0\x9f\x97\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5d1\x22></span></span>",
-            "\xf0\x9f\x97\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5d2\x22></span></span>",
-            "\xf0\x9f\x97\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5d3\x22></span></span>",
-            "\xf0\x9f\x97\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5dc\x22></span></span>",
-            "\xf0\x9f\x97\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5dd\x22></span></span>",
-            "\xf0\x9f\x97\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5de\x22></span></span>",
-            "\xf0\x9f\x97\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5e1\x22></span></span>",
-            "\xf0\x9f\x97\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5e3\x22></span></span>",
-            "\xf0\x9f\x97\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5e8\x22></span></span>",
-            "\xf0\x9f\x97\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ef\x22></span></span>",
-            "\xf0\x9f\x97\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5f3\x22></span></span>",
-            "\xf0\x9f\x97\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fa\x22></span></span>",
-            "\xf0\x9f\x97\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
-            "\xf3\xbe\x93\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
-            "\xee\x9d\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
-            "\xee\x80\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
-            "\xee\x96\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
-            "\xf0\x9f\x97\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
-            "\xf3\xbe\x93\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
-            "\xee\x93\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
-            "\xf0\x9f\x97\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fd\x22></span></span>",
-            "\xf3\xbe\x93\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fd\x22></span></span>",
-            "\xf0\x9f\x97\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fe\x22></span></span>",
-            "\xf3\xbe\x93\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fe\x22></span></span>",
-            "\xee\x95\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fe\x22></span></span>",
-            "\xf0\x9f\x97\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ff\x22></span></span>",
-            "\xf3\xbe\x93\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ff\x22></span></span>",
-            "\xee\xad\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ff\x22></span></span>",
-            "\xf0\x9f\x98\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f600\x22></span></span>",
-            "\xf0\x9f\x98\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f601\x22></span></span>",
-            "\xf3\xbe\x8c\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f601\x22></span></span>",
-            "\xee\x9d\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
-            "\xee\x90\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
-            "\xee\xae\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f601\x22></span></span>",
-            "\xf0\x9f\x98\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f602\x22></span></span>",
-            "\xf3\xbe\x8c\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f602\x22></span></span>",
-            "\xee\x9c\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
-            "\xee\x90\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
-            "\xee\xad\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f602\x22></span></span>",
-            "\xf0\x9f\x98\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f603\x22></span></span>",
-            "\xf3\xbe\x8c\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f603\x22></span></span>",
-            "\xee\x81\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
-            "\xee\x91\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
-            "\xf0\x9f\x98\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
-            "\xf3\xbe\x8c\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
-            "\xee\x90\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
-            "\xf0\x9f\x98\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
-            "\xf3\xbe\x8c\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
-            "\xee\x9c\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
-            "\xee\x90\x95\xee\x8c\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
-            "\xee\x91\xb1\xee\x96\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
-            "\xf0\x9f\x98\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f606\x22></span></span>",
-            "\xf3\xbe\x8c\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f606\x22></span></span>",
-            "\xee\x90\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
-            "\xee\xab\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
-            "\xf0\x9f\x98\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f607\x22></span></span>",
-            "\xf0\x9f\x98\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f608\x22></span></span>",
-            "\xf0\x9f\x98\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
-            "\xf3\xbe\x8d\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
-            "\xee\x9c\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
-            "\xee\x90\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
-            "\xee\x97\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
-            "\xf0\x9f\x98\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60a\x22></span></span>",
-            "\xf3\xbe\x8c\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60a\x22></span></span>",
-            "\xee\x81\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
-            "\xee\xab\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
-            "\xf0\x9f\x98\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
-            "\xf3\xbe\x8c\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
-            "\xee\x9d\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
-            "\xf0\x9f\x98\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
-            "\xf3\xbe\x8c\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
-            "\xee\x9c\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
-            "\xf0\x9f\x98\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60d\x22></span></span>",
-            "\xf3\xbe\x8c\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60d\x22></span></span>",
-            "\xee\x9c\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
-            "\xee\x84\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
-            "\xee\x97\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60d\x22></span></span>",
-            "\xf0\x9f\x98\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60e\x22></span></span>",
-            "\xf0\x9f\x98\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
-            "\xf3\xbe\x8d\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
-            "\xee\x9c\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
-            "\xee\x90\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
-            "\xee\xaa\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
-            "\xf0\x9f\x98\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f610\x22></span></span>",
-            "\xf0\x9f\x98\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f611\x22></span></span>",
-            "\xf0\x9f\x98\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
-            "\xf3\xbe\x8c\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
-            "\xee\x9c\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
-            "\xee\x90\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
-            "\xee\xab\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
-            "\xf0\x9f\x98\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f613\x22></span></span>",
-            "\xf3\xbe\x8d\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f613\x22></span></span>",
-            "\xee\x9c\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
-            "\xee\x84\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f613\x22></span></span>",
-            "\xee\x97\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
-            "\xf0\x9f\x98\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f614\x22></span></span>",
-            "\xf3\xbe\x8d\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f614\x22></span></span>",
-            "\xee\x9c\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f614\x22></span></span>",
-            "\xee\x90\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
-            "\xee\xab\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
-            "\xf0\x9f\x98\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f615\x22></span></span>",
-            "\xf0\x9f\x98\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
-            "\xf3\xbe\x8c\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
-            "\xee\x9b\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
-            "\xee\xab\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
-            "\xf0\x9f\x98\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f617\x22></span></span>",
-            "\xf0\x9f\x98\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f618\x22></span></span>",
-            "\xf3\xbe\x8c\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f618\x22></span></span>",
-            "\xee\x90\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
-            "\xee\xab\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f618\x22></span></span>",
-            "\xf0\x9f\x98\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f619\x22></span></span>",
-            "\xf0\x9f\x98\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
-            "\xf3\xbe\x8c\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
-            "\xee\x90\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
-            "\xee\xab\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
-            "\xf0\x9f\x98\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61b\x22></span></span>",
-            "\xf0\x9f\x98\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61c\x22></span></span>",
-            "\xf3\xbe\x8c\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61c\x22></span></span>",
-            "\xee\x84\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61c\x22></span></span>",
-            "\xee\x93\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
-            "\xf0\x9f\x98\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
-            "\xf3\xbe\x8c\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
-            "\xf0\x9f\x98\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
-            "\xf3\xbe\x8c\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
-            "\xee\x9b\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
-            "\xee\x81\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
-            "\xf0\x9f\x98\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61f\x22></span></span>",
-            "\xf0\x9f\x98\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
-            "\xf3\xbe\x8c\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
-            "\xee\x9b\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
-            "\xee\x81\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
-            "\xee\x91\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
-            "\xf0\x9f\x98\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f621\x22></span></span>",
-            "\xf3\xbe\x8c\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f621\x22></span></span>",
-            "\xee\x9c\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
-            "\xee\x90\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
-            "\xee\xad\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f621\x22></span></span>",
-            "\xf0\x9f\x98\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f622\x22></span></span>",
-            "\xf3\xbe\x8c\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f622\x22></span></span>",
-            "\xee\x9c\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
-            "\xee\x90\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
-            "\xee\xad\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f622\x22></span></span>",
-            "\xf0\x9f\x98\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f623\x22></span></span>",
-            "\xf3\xbe\x8c\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f623\x22></span></span>",
-            "\xee\x9c\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
-            "\xee\x90\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
-            "\xee\xab\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f623\x22></span></span>",
-            "\xf0\x9f\x98\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f624\x22></span></span>",
-            "\xf3\xbe\x8c\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f624\x22></span></span>",
-            "\xee\xab\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f624\x22></span></span>",
-            "\xf0\x9f\x98\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
-            "\xf3\xbe\x8d\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
-            "\xee\x90\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
-            "\xf0\x9f\x98\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f626\x22></span></span>",
-            "\xf0\x9f\x98\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f627\x22></span></span>",
-            "\xf0\x9f\x98\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
-            "\xf3\xbe\x8c\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
-            "\xee\x9d\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
-            "\xee\x90\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
-            "\xee\xab\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
-            "\xf0\x9f\x98\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f629\x22></span></span>",
-            "\xf3\xbe\x8c\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f629\x22></span></span>",
-            "\xee\xad\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f629\x22></span></span>",
-            "\xf0\x9f\x98\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
-            "\xf3\xbe\x8d\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
-            "\xee\x90\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
-            "\xee\xab\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
-            "\xf0\x9f\x98\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
-            "\xf3\xbe\x8d\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
-            "\xee\x91\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
-            "\xf0\x9f\x98\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62c\x22></span></span>",
-            "\xf0\x9f\x98\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
-            "\xf3\xbe\x8c\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
-            "\xee\x9c\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
-            "\xee\x90\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
-            "\xee\x91\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
-            "\xf0\x9f\x98\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62e\x22></span></span>",
-            "\xf0\x9f\x98\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62f\x22></span></span>",
-            "\xf0\x9f\x98\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
-            "\xf3\xbe\x8c\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
-            "\xee\x90\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
-            "\xee\xab\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
-            "\xf0\x9f\x98\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
-            "\xf3\xbe\x8d\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
-            "\xee\x84\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
-            "\xee\x97\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
-            "\xf0\x9f\x98\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
-            "\xf3\xbe\x8c\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
-            "\xee\x9b\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
-            "\xee\x90\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
-            "\xee\xab\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
-            "\xf0\x9f\x98\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
-            "\xf3\xbe\x8c\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
-            "\xee\x90\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
-            "\xee\xab\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
-            "\xf0\x9f\x98\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f634\x22></span></span>",
-            "\xf0\x9f\x98\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
-            "\xf3\xbe\x8c\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
-            "\xee\x96\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
-            "\xf0\x9f\x98\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f636\x22></span></span>",
-            "\xf0\x9f\x98\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
-            "\xf3\xbe\x8c\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
-            "\xee\x90\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
-            "\xee\xab\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
-            "\xf0\x9f\x98\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f638\x22></span></span>",
-            "\xf3\xbe\x8d\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f638\x22></span></span>",
-            "\xee\xad\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f638\x22></span></span>",
-            "\xf0\x9f\x98\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
-            "\xf3\xbe\x8d\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
-            "\xee\xad\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
-            "\xf0\x9f\x98\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
-            "\xf3\xbe\x8d\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
-            "\xee\xad\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
-            "\xf0\x9f\x98\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
-            "\xf3\xbe\x8d\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
-            "\xee\xad\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
-            "\xf0\x9f\x98\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
-            "\xf3\xbe\x8d\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
-            "\xee\xad\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
-            "\xf0\x9f\x98\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
-            "\xf3\xbe\x8d\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
-            "\xee\xad\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
-            "\xf0\x9f\x98\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
-            "\xf3\xbe\x8d\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
-            "\xee\xad\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
-            "\xf0\x9f\x98\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
-            "\xf3\xbe\x8d\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
-            "\xee\xad\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
-            "\xf0\x9f\x99\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f640\x22></span></span>",
-            "\xf3\xbe\x8d\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f640\x22></span></span>",
-            "\xee\xad\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f640\x22></span></span>",
-            "\xf0\x9f\x99\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f641\x22></span></span>",
-            "\xf0\x9f\x99\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f642\x22></span></span>",
-            "\xf0\x9f\x99\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f643\x22></span></span>",
-            "\xf0\x9f\x99\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f644\x22></span></span>",
-            "\xf0\x9f\x99\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
-            "\xf3\xbe\x8d\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
-            "\xee\x90\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
-            "\xee\xab\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
-            "\xf0\x9f\x99\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
-            "\xf3\xbe\x8d\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
-            "\xee\x90\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
-            "\xee\xab\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
-            "\xf0\x9f\x99\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
-            "\xf3\xbe\x8d\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
-            "\xee\x90\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
-            "\xee\xab\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
-            "\xf0\x9f\x99\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f648\x22></span></span>",
-            "\xf3\xbe\x8d\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f648\x22></span></span>",
-            "\xee\xad\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f648\x22></span></span>",
-            "\xf0\x9f\x99\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f649\x22></span></span>",
-            "\xf3\xbe\x8d\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f649\x22></span></span>",
-            "\xee\xad\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f649\x22></span></span>",
-            "\xf0\x9f\x99\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64a\x22></span></span>",
-            "\xf3\xbe\x8d\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64a\x22></span></span>",
-            "\xee\xad\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64a\x22></span></span>",
-            "\xf0\x9f\x99\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
-            "\xf3\xbe\x8d\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
-            "\xee\xae\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
-            "\xf0\x9f\x99\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
-            "\xf3\xbe\x8d\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
-            "\xee\x90\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
-            "\xee\xae\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
-            "\xf0\x9f\x99\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
-            "\xf3\xbe\x8d\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
-            "\xee\xae\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
-            "\xf0\x9f\x99\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
-            "\xf3\xbe\x8d\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
-            "\xee\xae\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
-            "\xf0\x9f\x99\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
-            "\xf3\xbe\x8d\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
-            "\xee\x90\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
-            "\xee\xab\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
-            "\xf0\x9f\x9a\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
-            "\xf3\xbe\x9f\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
-            "\xee\x84\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
-            "\xee\x97\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
-            "\xf0\x9f\x9a\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f681\x22></span></span>",
-            "\xf0\x9f\x9a\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f682\x22></span></span>",
-            "\xf0\x9f\x9a\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
-            "\xf3\xbe\x9f\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
-            "\xee\x99\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
-            "\xee\x80\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
-            "\xee\x92\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
-            "\xf0\x9f\x9a\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f684\x22></span></span>",
-            "\xf3\xbe\x9f\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f684\x22></span></span>",
-            "\xee\x99\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
-            "\xee\x90\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f684\x22></span></span>",
-            "\xee\x92\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
-            "\xf0\x9f\x9a\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
-            "\xf3\xbe\x9f\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
-            "\xee\x80\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
-            "\xf0\x9f\x9a\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f686\x22></span></span>",
-            "\xf0\x9f\x9a\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
-            "\xf3\xbe\x9f\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
-            "\xf0\x9f\x9a\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f688\x22></span></span>",
-            "\xf0\x9f\x9a\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
-            "\xf3\xbe\x9f\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
-            "\xee\x80\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
-            "\xee\xad\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
-            "\xf0\x9f\x9a\x8a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68a\x22></span></span>",
-            "\xf0\x9f\x9a\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68b\x22></span></span>",
-            "\xf0\x9f\x9a\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
-            "\xf3\xbe\x9f\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
-            "\xee\x99\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
-            "\xee\x85\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
-            "\xee\x92\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
-            "\xf0\x9f\x9a\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68d\x22></span></span>",
-            "\xf0\x9f\x9a\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68e\x22></span></span>",
-            "\xf0\x9f\x9a\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
-            "\xf3\xbe\x9f\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
-            "\xee\x85\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
-            "\xee\x92\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
-            "\xf0\x9f\x9a\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f690\x22></span></span>",
-            "\xf0\x9f\x9a\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
-            "\xf3\xbe\x9f\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
-            "\xee\x90\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
-            "\xee\xab\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
-            "\xf0\x9f\x9a\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
-            "\xf3\xbe\x9f\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
-            "\xee\x90\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
-            "\xee\xab\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
-            "\xf0\x9f\x9a\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f693\x22></span></span>",
-            "\xf3\xbe\x9f\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f693\x22></span></span>",
-            "\xee\x90\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
-            "\xee\xab\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f693\x22></span></span>",
-            "\xf0\x9f\x9a\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f694\x22></span></span>",
-            "\xf0\x9f\x9a\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f695\x22></span></span>",
-            "\xf3\xbe\x9f\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f695\x22></span></span>",
-            "\xee\x99\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
-            "\xee\x85\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f695\x22></span></span>",
-            "\xee\x92\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
-            "\xf0\x9f\x9a\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f696\x22></span></span>",
-            "\xf0\x9f\x9a\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
-            "\xf3\xbe\x9f\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
-            "\xee\x80\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
-            "\xf0\x9f\x9a\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f698\x22></span></span>",
-            "\xf0\x9f\x9a\x99"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
-            "\xf3\xbe\x9f\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
-            "\xee\x99\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
-            "\xee\x90\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
-            "\xf0\x9f\x9a\x9a"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
-            "\xf3\xbe\x9f\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
-            "\xee\x90\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
-            "\xee\x92\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
-            "\xf0\x9f\x9a\x9b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69b\x22></span></span>",
-            "\xf0\x9f\x9a\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69c\x22></span></span>",
-            "\xf0\x9f\x9a\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69d\x22></span></span>",
-            "\xf0\x9f\x9a\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69e\x22></span></span>",
-            "\xf0\x9f\x9a\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69f\x22></span></span>",
-            "\xf0\x9f\x9a\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a0\x22></span></span>",
-            "\xf0\x9f\x9a\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a1\x22></span></span>",
-            "\xf0\x9f\x9a\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
-            "\xf3\xbe\x9f\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
-            "\xee\xaa\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
-            "\xf0\x9f\x9a\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a3\x22></span></span>",
-            "\xf0\x9f\x9a\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
-            "\xf3\xbe\x9f\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
-            "\xee\x84\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
-            "\xf0\x9f\x9a\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
-            "\xf3\xbe\x9f\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
-            "\xee\x99\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
-            "\xee\x85\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
-            "\xee\x91\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
-            "\xf0\x9f\x9a\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a6\x22></span></span>",
-            "\xf0\x9f\x9a\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
-            "\xf3\xbe\x9f\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
-            "\xee\x97\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
-            "\xf0\x9f\x9a\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
-            "\xf3\xbe\x9f\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
-            "\xee\xad\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
-            "\xf0\x9f\x9a\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
-            "\xf3\xbe\xac\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
-            "\xee\x9b\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
-            "\xee\xac\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
-            "\xf0\x9f\x9a\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6aa\x22></span></span>",
-            "\xf3\xbe\x93\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6aa\x22></span></span>",
-            "\xee\x9c\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6aa\x22></span></span>",
-            "\xf0\x9f\x9a\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
-            "\xf3\xbe\xad\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
-            "\xee\x95\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
-            "\xf0\x9f\x9a\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
-            "\xf3\xbe\xac\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
-            "\xee\x99\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
-            "\xee\x8c\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
-            "\xee\x91\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
-            "\xf0\x9f\x9a\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
-            "\xf3\xbe\xac\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
-            "\xee\x9a\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
-            "\xee\x88\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
-            "\xee\x91\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
-            "\xf0\x9f\x9a\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ae\x22></span></span>",
-            "\xf0\x9f\x9a\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6af\x22></span></span>",
-            "\xf0\x9f\x9a\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b0\x22></span></span>",
-            "\xf0\x9f\x9a\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b1\x22></span></span>",
-            "\xf0\x9f\x9a\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
-            "\xf3\xbe\x9f\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
-            "\xee\x9c\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
-            "\xee\x84\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
-            "\xee\x92\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
-            "\xf0\x9f\x9a\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b3\x22></span></span>",
-            "\xf0\x9f\x9a\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b4\x22></span></span>",
-            "\xf0\x9f\x9a\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b5\x22></span></span>",
-            "\xf0\x9f\x9a\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
-            "\xf3\xbe\x9f\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
-            "\xee\x88\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
-            "\xee\xad\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
-            "\xf0\x9f\x9a\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b7\x22></span></span>",
-            "\xf0\x9f\x9a\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b8\x22></span></span>",
-            "\xf0\x9f\x9a\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b9\x22></span></span>",
-            "\xf3\xbe\xac\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b9\x22></span></span>",
-            "\xee\x84\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b9\x22></span></span>",
-            "\xf0\x9f\x9a\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ba\x22></span></span>",
-            "\xf3\xbe\xac\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ba\x22></span></span>",
-            "\xee\x84\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ba\x22></span></span>",
-            "\xf0\x9f\x9a\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bb\x22></span></span>",
-            "\xf3\xbe\x94\x86"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bb\x22></span></span>",
-            "\xee\x99\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
-            "\xee\x85\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bb\x22></span></span>",
-            "\xee\x92\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
-            "\xf0\x9f\x9a\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
-            "\xf3\xbe\xac\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
-            "\xee\x84\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
-            "\xf0\x9f\x9a\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bd\x22></span></span>",
-            "\xf3\xbe\x94\x87"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bd\x22></span></span>",
-            "\xee\x85\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bd\x22></span></span>",
-            "\xf0\x9f\x9a\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
-            "\xf3\xbe\x94\x88"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
-            "\xee\x8c\x89"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
-            "\xf0\x9f\x9a\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bf\x22></span></span>",
-            "\xf0\x9f\x9b\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
-            "\xf3\xbe\x94\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
-            "\xee\x84\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
-            "\xee\x97\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
-            "\xf0\x9f\x9b\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c1\x22></span></span>",
-            "\xf0\x9f\x9b\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c2\x22></span></span>",
-            "\xf0\x9f\x9b\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c3\x22></span></span>",
-            "\xf0\x9f\x9b\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c4\x22></span></span>",
-            "\xf0\x9f\x9b\x85"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c5\x22></span></span>",
-            "\xf0\x9f\x9b\x8b"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cb\x22></span></span>",
-            "\xf0\x9f\x9b\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cc\x22></span></span>",
-            "\xf0\x9f\x9b\x8d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cd\x22></span></span>",
-            "\xf0\x9f\x9b\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ce\x22></span></span>",
-            "\xf0\x9f\x9b\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cf\x22></span></span>",
-            "\xf0\x9f\x9b\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6d0\x22></span></span>",
-            "\xf0\x9f\x9b\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e0\x22></span></span>",
-            "\xf0\x9f\x9b\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e1\x22></span></span>",
-            "\xf0\x9f\x9b\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e2\x22></span></span>",
-            "\xf0\x9f\x9b\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e3\x22></span></span>",
-            "\xf0\x9f\x9b\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e4\x22></span></span>",
-            "\xf0\x9f\x9b\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e5\x22></span></span>",
-            "\xf0\x9f\x9b\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e9\x22></span></span>",
-            "\xf0\x9f\x9b\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6eb\x22></span></span>",
-            "\xf0\x9f\x9b\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ec\x22></span></span>",
-            "\xf0\x9f\x9b\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6f0\x22></span></span>",
-            "\xf0\x9f\x9b\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6f3\x22></span></span>",
-            "\xf0\x9f\xa4\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f910\x22></span></span>",
-            "\xf0\x9f\xa4\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f911\x22></span></span>",
-            "\xf0\x9f\xa4\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f912\x22></span></span>",
-            "\xf0\x9f\xa4\x93"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f913\x22></span></span>",
-            "\xf0\x9f\xa4\x94"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f914\x22></span></span>",
-            "\xf0\x9f\xa4\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f915\x22></span></span>",
-            "\xf0\x9f\xa4\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f916\x22></span></span>",
-            "\xf0\x9f\xa4\x97"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f917\x22></span></span>",
-            "\xf0\x9f\xa4\x98"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f918\x22></span></span>",
-            "\xf0\x9f\xa6\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f980\x22></span></span>",
-            "\xf0\x9f\xa6\x81"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f981\x22></span></span>",
-            "\xf0\x9f\xa6\x82"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f982\x22></span></span>",
-            "\xf0\x9f\xa6\x83"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f983\x22></span></span>",
-            "\xf0\x9f\xa6\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f984\x22></span></span>",
-            "\xf0\x9f\xa7\x80"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f9c0\x22></span></span>",
-            "#\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
-            "\xf3\xbe\xa0\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
-            "\xee\x9b\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
-            "\xee\x88\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
-            "\xee\xae\x84"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
-            "#\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
-            "*\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2a20e3\x22></span></span>",
-            "0\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
-            "\xee\x9b\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
-            "\xee\x88\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
-            "\xee\x96\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
-            "0\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
-            "1\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
-            "\xf3\xbe\xa0\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
-            "\xee\x9b\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
-            "\xee\x88\x9c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
-            "1\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
-            "2\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
-            "\xf3\xbe\xa0\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
-            "\xee\x9b\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
-            "\xee\x88\x9d"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
-            "2\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
-            "3\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
-            "\xee\x9b\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
-            "\xee\x88\x9e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
-            "3\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
-            "4\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
-            "\xee\x9b\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
-            "\xee\x88\x9f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
-            "4\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
-            "5\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
-            "\xee\x9b\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
-            "\xee\x88\xa0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
-            "5\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
-            "6\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
-            "\xee\x9b\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
-            "\xee\x88\xa1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
-            "6\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
-            "7\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
-            "\xee\x9b\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
-            "\xee\x88\xa2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
-            "7\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
-            "8\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
-            "\xee\x9b\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
-            "\xee\x88\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
-            "8\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
-            "9\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
-            "\xf3\xbe\xa0\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
-            "\xee\x9b\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
-            "\xee\x88\xa4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
-            "9\xef\xb8\x8f\xe2\x83\xa3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f6\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1fd\x22></span></span>",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1e7\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ef\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f6\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1fb\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
-            "\xf3\xbe\x93\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
-            "\xee\xac\x91"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f5\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fb\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fd\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
-            "\xf3\xbe\x93\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
-            "\xee\xac\x8e"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ef\x22></span></span>",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
-            "\xf3\xbe\x93\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
-            "\xee\x97\x95"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1ef\x22></span></span>",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
-            "\xf3\xbe\x93\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
-            "\xee\xab\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
-            "\xf3\xbe\x93\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
-            "\xee\xac\x90"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f5\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f6\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f6\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
-            "\xf3\xbe\x93\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
-            "\xee\xac\x8f"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
-            "\xf3\xbe\x93\xa5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
-            "\xee\x93\x8c"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f5\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
-            "\xf3\xbe\x93\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
-            "\xee\xac\x92"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1e7\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1fb\x22></span></span>",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f5\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f6\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fb\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fd\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb5"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f5\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xb4\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f41f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xb6\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f61f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
-            "\xf3\xbe\x93\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
-            "\xee\x97\x96"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e7\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ef\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1fb\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbd"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1fd\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1e9\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xad"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ed\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xaf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ef\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb1"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f1\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb4"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f4\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f7\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbb"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1fb\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1fc\x22></span></span>",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
-            "\xf3\xbe\x93\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
-            "\xee\x95\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbe"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1fe\x22></span></span>",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbf"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1ff\x22></span></span>",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1e8\x22></span></span>",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xac"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1ec\x22></span></span>",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xae"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1ee\x22></span></span>",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xb3"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1f3\x22></span></span>",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xba"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1fa\x22></span></span>",
-            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xab"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fc1f1eb\x22></span></span>",
-            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xb8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fc1f1f8\x22></span></span>",
-            "\xf0\x9f\x87\xbd\xf0\x9f\x87\xb0"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fd1f1f0\x22></span></span>",
-            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xaa"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fe1f1ea\x22></span></span>",
-            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xb9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fe1f1f9\x22></span></span>",
-            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ff1f1e6\x22></span></span>",
-            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xb2"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ff1f1f2\x22></span></span>",
-            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xbc"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ff1f1fc\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f466200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f467\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f467200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f467200d1f467\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f466200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f467\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f467200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f467200d1f467\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d2764fe0f200d1f468\x22></span></span>",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa8"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d2764fe0f200d1f48b200d1f468\x22></span></span>",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f466200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f467\x22></span></span>",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f467200d1f466\x22></span></span>",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f467200d1f467\x22></span></span>",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d2764fe0f200d1f469\x22></span></span>",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9"=>"<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d2764fe0f200d1f48b200d1f469\x22></span></span>",
+class UnicodeToHtmlEmojiMap
+{
+    public static $map = [
+          "\xc2\xa9"                                                                                                       => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
+            "\xf3\xbe\xac\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
+            "\xee\x9c\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
+            "\xee\x89\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
+            "\xee\x95\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
+            "\xc2\xa9\xef\xb8\x8f"                                                                                         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojia9\x22></span></span>",
+            "\xc2\xae"                                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
+            "\xf3\xbe\xac\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
+            "\xee\x9c\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
+            "\xee\x89\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
+            "\xee\x95\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
+            "\xc2\xae\xef\xb8\x8f"                                                                                         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emojiae\x22></span></span>",
+            "\xe2\x80\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
+            "\xf3\xbe\xac\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
+            "\xee\x9c\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
+            "\xee\xac\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
+            "\xe2\x80\xbc\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji203c\x22></span></span>",
+            "\xe2\x81\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
+            "\xf3\xbe\xac\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
+            "\xee\x9c\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
+            "\xee\xac\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
+            "\xe2\x81\x89\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2049\x22></span></span>",
+            "\xe2\x84\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
+            "\xf3\xbe\xac\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
+            "\xee\x9c\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
+            "\xee\x94\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
+            "\xee\x95\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
+            "\xe2\x84\xa2\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2122\x22></span></span>",
+            "\xe2\x84\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2139\x22></span></span>",
+            "\xf3\xbe\xad\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2139\x22></span></span>",
+            "\xee\x94\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
+            "\xe2\x84\xb9\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2139\x22></span></span>",
+            "\xe2\x86\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
+            "\xf3\xbe\xab\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
+            "\xee\x9c\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
+            "\xee\xad\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
+            "\xe2\x86\x94\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2194\x22></span></span>",
+            "\xe2\x86\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
+            "\xf3\xbe\xab\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
+            "\xee\x9c\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
+            "\xee\xad\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
+            "\xe2\x86\x95\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2195\x22></span></span>",
+            "\xe2\x86\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
+            "\xf3\xbe\xab\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
+            "\xee\x9a\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
+            "\xee\x88\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
+            "\xee\x95\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
+            "\xe2\x86\x96\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2196\x22></span></span>",
+            "\xe2\x86\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
+            "\xf3\xbe\xab\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
+            "\xee\x99\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
+            "\xee\x88\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
+            "\xee\x95\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
+            "\xe2\x86\x97\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2197\x22></span></span>",
+            "\xe2\x86\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
+            "\xf3\xbe\xab\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
+            "\xee\x9a\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
+            "\xee\x88\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
+            "\xee\x95\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
+            "\xe2\x86\x98\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2198\x22></span></span>",
+            "\xe2\x86\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
+            "\xf3\xbe\xab\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
+            "\xee\x9a\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
+            "\xee\x88\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
+            "\xee\x95\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
+            "\xe2\x86\x99\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2199\x22></span></span>",
+            "\xe2\x86\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
+            "\xf3\xbe\xae\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
+            "\xee\x9b\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
+            "\xee\x95\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
+            "\xe2\x86\xa9\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21a9\x22></span></span>",
+            "\xe2\x86\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
+            "\xf3\xbe\xae\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
+            "\xee\x95\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
+            "\xe2\x86\xaa\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji21aa\x22></span></span>",
+            "\xe2\x8c\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
+            "\xf3\xbe\x80\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
+            "\xee\x9c\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
+            "\xee\x95\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
+            "\xe2\x8c\x9a\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231a\x22></span></span>",
+            "\xe2\x8c\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
+            "\xf3\xbe\x80\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
+            "\xee\x9c\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
+            "\xee\x95\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
+            "\xe2\x8c\x9b\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji231b\x22></span></span>",
+            "\xe2\x8c\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2328\x22></span></span>",
+            "\xe2\x8f\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23e9\x22></span></span>",
+            "\xf3\xbe\xab\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23e9\x22></span></span>",
+            "\xee\x88\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23e9\x22></span></span>",
+            "\xee\x94\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
+            "\xe2\x8f\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ea\x22></span></span>",
+            "\xf3\xbe\xab\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ea\x22></span></span>",
+            "\xee\x88\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ea\x22></span></span>",
+            "\xee\x94\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
+            "\xe2\x8f\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23eb\x22></span></span>",
+            "\xf3\xbe\xac\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23eb\x22></span></span>",
+            "\xee\x95\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23eb\x22></span></span>",
+            "\xe2\x8f\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ec\x22></span></span>",
+            "\xf3\xbe\xac\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ec\x22></span></span>",
+            "\xee\x95\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ec\x22></span></span>",
+            "\xe2\x8f\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ed\x22></span></span>",
+            "\xe2\x8f\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ee\x22></span></span>",
+            "\xe2\x8f\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23ef\x22></span></span>",
+            "\xe2\x8f\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f0\x22></span></span>",
+            "\xf3\xbe\x80\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f0\x22></span></span>",
+            "\xee\x9a\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
+            "\xee\x80\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f559\x22></span></span>",
+            "\xee\x96\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
+            "\xe2\x8f\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f1\x22></span></span>",
+            "\xe2\x8f\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f2\x22></span></span>",
+            "\xe2\x8f\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
+            "\xf3\xbe\x80\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
+            "\xee\x91\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f3\x22></span></span>",
+            "\xe2\x8f\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f8\x22></span></span>",
+            "\xe2\x8f\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23f9\x22></span></span>",
+            "\xe2\x8f\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji23fa\x22></span></span>",
+            "\xe2\x93\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji24c2\x22></span></span>",
+            "\xf3\xbe\x9f\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji24c2\x22></span></span>",
+            "\xee\x99\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
+            "\xee\x90\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
+            "\xee\x96\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
+            "\xe2\x93\x82\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji24c2\x22></span></span>",
+            "\xe2\x96\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25aa\x22></span></span>",
+            "\xf3\xbe\xad\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25aa\x22></span></span>",
+            "\xee\x88\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
+            "\xee\x94\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
+            "\xe2\x96\xaa\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25aa\x22></span></span>",
+            "\xe2\x96\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25ab\x22></span></span>",
+            "\xf3\xbe\xad\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25ab\x22></span></span>",
+            "\xee\x88\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
+            "\xee\x94\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
+            "\xe2\x96\xab\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25ab\x22></span></span>",
+            "\xe2\x96\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
+            "\xf3\xbe\xab\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
+            "\xee\x88\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
+            "\xee\x94\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
+            "\xe2\x96\xb6\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25b6\x22></span></span>",
+            "\xe2\x97\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
+            "\xf3\xbe\xab\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
+            "\xee\x88\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
+            "\xee\x94\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
+            "\xe2\x97\x80\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25c0\x22></span></span>",
+            "\xe2\x97\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
+            "\xf3\xbe\xad\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
+            "\xee\x94\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
+            "\xe2\x97\xbb\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fb\x22></span></span>",
+            "\xe2\x97\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
+            "\xf3\xbe\xad\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
+            "\xee\x94\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
+            "\xe2\x97\xbc\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fc\x22></span></span>",
+            "\xe2\x97\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fd\x22></span></span>",
+            "\xf3\xbe\xad\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fd\x22></span></span>",
+            "\xee\x94\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
+            "\xe2\x97\xbd\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fd\x22></span></span>",
+            "\xe2\x97\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fe\x22></span></span>",
+            "\xf3\xbe\xad\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fe\x22></span></span>",
+            "\xee\x94\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
+            "\xe2\x97\xbe\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji25fe\x22></span></span>",
+            "\xe2\x98\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
+            "\xf3\xbe\x80\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
+            "\xee\x98\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
+            "\xee\x81\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
+            "\xee\x92\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
+            "\xe2\x98\x80\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2600\x22></span></span>",
+            "\xe2\x98\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
+            "\xf3\xbe\x80\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
+            "\xee\x98\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
+            "\xee\x81\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
+            "\xee\x92\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
+            "\xe2\x98\x81\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2601\x22></span></span>",
+            "\xe2\x98\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2602\x22></span></span>",
+            "\xe2\x98\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2603\x22></span></span>",
+            "\xe2\x98\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2604\x22></span></span>",
+            "\xe2\x98\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
+            "\xf3\xbe\x94\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
+            "\xee\x9a\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
+            "\xee\x80\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
+            "\xee\x96\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
+            "\xe2\x98\x8e\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji260e\x22></span></span>",
+            "\xe2\x98\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
+            "\xf3\xbe\xae\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
+            "\xee\xac\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
+            "\xe2\x98\x91\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2611\x22></span></span>",
+            "\xe2\x98\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
+            "\xf3\xbe\x80\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
+            "\xee\x99\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
+            "\xee\x81\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
+            "\xee\x92\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
+            "\xe2\x98\x94\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2614\x22></span></span>",
+            "\xe2\x98\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
+            "\xf3\xbe\xa6\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
+            "\xee\x99\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
+            "\xee\x81\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
+            "\xee\x96\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
+            "\xe2\x98\x95\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2615\x22></span></span>",
+            "\xe2\x98\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2618\x22></span></span>",
+            "\xe2\x98\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
+            "\xf3\xbe\xae\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
+            "\xee\x80\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
+            "\xee\x93\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
+            "\xe2\x98\x9d\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji261d\x22></span></span>",
+            "\xe2\x98\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2620\x22></span></span>",
+            "\xe2\x98\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2622\x22></span></span>",
+            "\xe2\x98\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2623\x22></span></span>",
+            "\xe2\x98\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2626\x22></span></span>",
+            "\xe2\x98\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji262a\x22></span></span>",
+            "\xe2\x98\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji262e\x22></span></span>",
+            "\xe2\x98\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji262f\x22></span></span>",
+            "\xe2\x98\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2638\x22></span></span>",
+            "\xe2\x98\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2639\x22></span></span>",
+            "\xe2\x98\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
+            "\xf3\xbe\x8c\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
+            "\xee\x9b\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
+            "\xee\x90\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
+            "\xee\x93\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
+            "\xe2\x98\xba\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji263a\x22></span></span>",
+            "\xe2\x99\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
+            "\xf3\xbe\x80\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
+            "\xee\x99\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
+            "\xee\x88\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
+            "\xee\x92\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f411\x22></span></span>",
+            "\xe2\x99\x88\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2648\x22></span></span>",
+            "\xe2\x99\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
+            "\xf3\xbe\x80\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
+            "\xee\x99\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
+            "\xee\x89\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
+            "\xee\x92\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
+            "\xe2\x99\x89\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2649\x22></span></span>",
+            "\xe2\x99\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
+            "\xf3\xbe\x80\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
+            "\xee\x99\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
+            "\xee\x89\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
+            "\xee\x92\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
+            "\xe2\x99\x8a\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264a\x22></span></span>",
+            "\xe2\x99\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
+            "\xf3\xbe\x80\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
+            "\xee\x99\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
+            "\xee\x89\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
+            "\xee\x92\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
+            "\xe2\x99\x8b\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264b\x22></span></span>",
+            "\xe2\x99\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
+            "\xf3\xbe\x80\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
+            "\xee\x99\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
+            "\xee\x89\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
+            "\xee\x92\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
+            "\xe2\x99\x8c\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264c\x22></span></span>",
+            "\xe2\x99\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
+            "\xf3\xbe\x80\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
+            "\xee\x99\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
+            "\xee\x89\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
+            "\xee\x92\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
+            "\xe2\x99\x8d\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264d\x22></span></span>",
+            "\xe2\x99\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
+            "\xf3\xbe\x80\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
+            "\xee\x99\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
+            "\xee\x89\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
+            "\xee\x92\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
+            "\xe2\x99\x8e\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264e\x22></span></span>",
+            "\xe2\x99\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
+            "\xf3\xbe\x80\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
+            "\xee\x99\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
+            "\xee\x89\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
+            "\xee\x92\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
+            "\xe2\x99\x8f\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji264f\x22></span></span>",
+            "\xe2\x99\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
+            "\xf3\xbe\x80\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
+            "\xee\x99\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
+            "\xee\x89\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
+            "\xee\x92\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
+            "\xe2\x99\x90\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2650\x22></span></span>",
+            "\xe2\x99\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
+            "\xf3\xbe\x80\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
+            "\xee\x99\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
+            "\xee\x89\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
+            "\xee\x92\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
+            "\xe2\x99\x91\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2651\x22></span></span>",
+            "\xe2\x99\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
+            "\xf3\xbe\x80\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
+            "\xee\x99\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
+            "\xee\x89\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
+            "\xee\x92\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
+            "\xe2\x99\x92\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2652\x22></span></span>",
+            "\xe2\x99\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
+            "\xf3\xbe\x80\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
+            "\xee\x99\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
+            "\xee\x89\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
+            "\xee\x92\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41f\x22></span></span>",
+            "\xe2\x99\x93\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2653\x22></span></span>",
+            "\xe2\x99\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
+            "\xf3\xbe\xac\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
+            "\xee\x9a\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
+            "\xee\x88\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
+            "\xee\x96\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
+            "\xe2\x99\xa0\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2660\x22></span></span>",
+            "\xe2\x99\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
+            "\xf3\xbe\xac\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
+            "\xee\x9a\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
+            "\xee\x88\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
+            "\xee\x96\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
+            "\xe2\x99\xa3\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2663\x22></span></span>",
+            "\xe2\x99\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
+            "\xf3\xbe\xac\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
+            "\xee\x9a\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
+            "\xee\x88\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
+            "\xee\xaa\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
+            "\xe2\x99\xa5\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2665\x22></span></span>",
+            "\xe2\x99\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
+            "\xf3\xbe\xac\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
+            "\xee\x9a\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
+            "\xee\x88\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
+            "\xee\x96\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
+            "\xe2\x99\xa6\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2666\x22></span></span>",
+            "\xe2\x99\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
+            "\xf3\xbe\x9f\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
+            "\xee\x9b\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
+            "\xee\x84\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
+            "\xee\x92\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
+            "\xe2\x99\xa8\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2668\x22></span></span>",
+            "\xe2\x99\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
+            "\xf3\xbe\xac\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
+            "\xee\x9c\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
+            "\xee\xad\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
+            "\xe2\x99\xbb\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267b\x22></span></span>",
+            "\xe2\x99\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
+            "\xf3\xbe\xac\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
+            "\xee\x9a\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
+            "\xee\x88\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
+            "\xee\x91\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
+            "\xe2\x99\xbf\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji267f\x22></span></span>",
+            "\xe2\x9a\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2692\x22></span></span>",
+            "\xe2\x9a\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
+            "\xf3\xbe\x93\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
+            "\xee\x99\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
+            "\xee\x88\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
+            "\xee\x92\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
+            "\xe2\x9a\x93\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2693\x22></span></span>",
+            "\xe2\x9a\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2694\x22></span></span>",
+            "\xe2\x9a\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2696\x22></span></span>",
+            "\xe2\x9a\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2697\x22></span></span>",
+            "\xe2\x9a\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2699\x22></span></span>",
+            "\xe2\x9a\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji269b\x22></span></span>",
+            "\xe2\x9a\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji269c\x22></span></span>",
+            "\xe2\x9a\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
+            "\xf3\xbe\xac\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
+            "\xee\x9c\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
+            "\xee\x89\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
+            "\xee\x92\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
+            "\xe2\x9a\xa0\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a0\x22></span></span>",
+            "\xe2\x9a\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
+            "\xf3\xbe\x80\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
+            "\xee\x99\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
+            "\xee\x84\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
+            "\xee\x92\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
+            "\xe2\x9a\xa1\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26a1\x22></span></span>",
+            "\xe2\x9a\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
+            "\xf3\xbe\xad\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
+            "\xee\x9a\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
+            "\xee\x88\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
+            "\xee\x94\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
+            "\xe2\x9a\xaa\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26aa\x22></span></span>",
+            "\xe2\x9a\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
+            "\xf3\xbe\xad\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
+            "\xee\x94\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
+            "\xe2\x9a\xab\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ab\x22></span></span>",
+            "\xe2\x9a\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26b0\x22></span></span>",
+            "\xe2\x9a\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26b1\x22></span></span>",
+            "\xe2\x9a\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
+            "\xf3\xbe\x9f\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
+            "\xee\x99\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
+            "\xee\x80\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
+            "\xee\x92\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
+            "\xe2\x9a\xbd\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26bd\x22></span></span>",
+            "\xe2\x9a\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
+            "\xf3\xbe\x9f\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
+            "\xee\x99\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
+            "\xee\x80\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
+            "\xee\x92\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
+            "\xe2\x9a\xbe\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26be\x22></span></span>",
+            "\xe2\x9b\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
+            "\xf3\xbe\x80\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
+            "\xee\x99\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
+            "\xee\x81\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
+            "\xee\x92\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
+            "\xe2\x9b\x84\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c4\x22></span></span>",
+            "\xe2\x9b\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
+            "\xf3\xbe\x80\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
+            "\xee\x98\xbe\xee\x98\xbf"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
+            "\xee\x81\x8a\xee\x81\x89"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
+            "\xee\x92\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
+            "\xe2\x9b\x85\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c5\x22></span></span>",
+            "\xe2\x9b\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26c8\x22></span></span>",
+            "\xe2\x9b\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
+            "\xf3\xbe\x80\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
+            "\xee\x89\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
+            "\xee\x92\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ce\x22></span></span>",
+            "\xe2\x9b\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26cf\x22></span></span>",
+            "\xe2\x9b\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d1\x22></span></span>",
+            "\xe2\x9b\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d3\x22></span></span>",
+            "\xe2\x9b\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
+            "\xf3\xbe\xac\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
+            "\xee\x9c\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
+            "\xee\x84\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
+            "\xee\x92\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
+            "\xe2\x9b\x94\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26d4\x22></span></span>",
+            "\xe2\x9b\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26e9\x22></span></span>",
+            "\xe2\x9b\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
+            "\xf3\xbe\x92\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
+            "\xee\x80\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
+            "\xee\x96\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
+            "\xe2\x9b\xaa\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26ea\x22></span></span>",
+            "\xe2\x9b\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f0\x22></span></span>",
+            "\xe2\x9b\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f1\x22></span></span>",
+            "\xe2\x9b\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
+            "\xf3\xbe\x92\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
+            "\xee\x84\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
+            "\xee\x97\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
+            "\xe2\x9b\xb2\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f2\x22></span></span>",
+            "\xe2\x9b\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
+            "\xf3\xbe\x9f\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
+            "\xee\x99\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
+            "\xee\x80\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
+            "\xee\x96\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
+            "\xe2\x9b\xb3\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f3\x22></span></span>",
+            "\xe2\x9b\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f4\x22></span></span>",
+            "\xe2\x9b\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
+            "\xf3\xbe\x9f\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
+            "\xee\x9a\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
+            "\xee\x80\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
+            "\xee\x92\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
+            "\xe2\x9b\xb5\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f5\x22></span></span>",
+            "\xe2\x9b\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f7\x22></span></span>",
+            "\xe2\x9b\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f8\x22></span></span>",
+            "\xe2\x9b\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26f9\x22></span></span>",
+            "\xe2\x9b\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
+            "\xf3\xbe\x9f\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
+            "\xee\x84\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
+            "\xee\x97\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
+            "\xe2\x9b\xba\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fa\x22></span></span>",
+            "\xe2\x9b\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
+            "\xf3\xbe\x9f\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
+            "\xee\x99\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
+            "\xee\x80\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
+            "\xee\x95\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
+            "\xe2\x9b\xbd\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji26fd\x22></span></span>",
+            "\xe2\x9c\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
+            "\xf3\xbe\x94\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
+            "\xee\x99\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
+            "\xee\x8c\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
+            "\xee\x94\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
+            "\xe2\x9c\x82\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2702\x22></span></span>",
+            "\xe2\x9c\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2705\x22></span></span>",
+            "\xf3\xbe\xad\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2705\x22></span></span>",
+            "\xee\x95\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2705\x22></span></span>",
+            "\xe2\x9c\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
+            "\xf3\xbe\x9f\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
+            "\xee\x99\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
+            "\xee\x80\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
+            "\xee\x92\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
+            "\xe2\x9c\x88\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2708\x22></span></span>",
+            "\xe2\x9c\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2709\x22></span></span>",
+            "\xf3\xbe\x94\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2709\x22></span></span>",
+            "\xee\x9b\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
+            "\xee\x84\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
+            "\xee\x94\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
+            "\xe2\x9c\x89\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2709\x22></span></span>",
+            "\xe2\x9c\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
+            "\xf3\xbe\xae\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
+            "\xee\x9a\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
+            "\xee\x80\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
+            "\xee\xae\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270a\x22></span></span>",
+            "\xe2\x9c\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270b\x22></span></span>",
+            "\xf3\xbe\xae\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270b\x22></span></span>",
+            "\xee\x9a\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
+            "\xee\x80\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
+            "\xee\x96\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270b\x22></span></span>",
+            "\xe2\x9c\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
+            "\xf3\xbe\xae\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
+            "\xee\x9a\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
+            "\xee\x80\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
+            "\xee\x96\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
+            "\xe2\x9c\x8c\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270c\x22></span></span>",
+            "\xe2\x9c\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270d\x22></span></span>",
+            "\xe2\x9c\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
+            "\xf3\xbe\x94\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
+            "\xee\x9c\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
+            "\xee\x8c\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
+            "\xee\x92\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
+            "\xe2\x9c\x8f\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji270f\x22></span></span>",
+            "\xe2\x9c\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
+            "\xf3\xbe\x94\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
+            "\xee\x9a\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
+            "\xee\xac\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
+            "\xe2\x9c\x92\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2712\x22></span></span>",
+            "\xe2\x9c\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
+            "\xf3\xbe\xad\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
+            "\xee\x95\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
+            "\xe2\x9c\x94\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2714\x22></span></span>",
+            "\xe2\x9c\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
+            "\xf3\xbe\xad\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
+            "\xee\x8c\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
+            "\xee\x95\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
+            "\xe2\x9c\x96\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2716\x22></span></span>",
+            "\xe2\x9c\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji271d\x22></span></span>",
+            "\xe2\x9c\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2721\x22></span></span>",
+            "\xe2\x9c\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2728\x22></span></span>",
+            "\xf3\xbe\xad\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2728\x22></span></span>",
+            "\xee\x9b\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
+            "\xee\x8c\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
+            "\xee\xaa\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2728\x22></span></span>",
+            "\xe2\x9c\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
+            "\xf3\xbe\xad\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
+            "\xee\x9b\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a0\x22></span></span>",
+            "\xee\x88\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
+            "\xee\x94\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
+            "\xe2\x9c\xb3\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2733\x22></span></span>",
+            "\xe2\x9c\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
+            "\xf3\xbe\xad\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
+            "\xee\x88\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
+            "\xee\x91\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
+            "\xe2\x9c\xb4\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2734\x22></span></span>",
+            "\xe2\x9d\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
+            "\xf3\xbe\x80\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
+            "\xee\x92\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
+            "\xe2\x9d\x84\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2744\x22></span></span>",
+            "\xe2\x9d\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
+            "\xf3\xbe\xad\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
+            "\xee\x91\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
+            "\xe2\x9d\x87\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2747\x22></span></span>",
+            "\xe2\x9d\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274c\x22></span></span>",
+            "\xf3\xbe\xad\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274c\x22></span></span>",
+            "\xee\x95\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274c\x22></span></span>",
+            "\xe2\x9d\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
+            "\xf3\xbe\xad\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
+            "\xee\x95\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji274e\x22></span></span>",
+            "\xe2\x9d\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2753\x22></span></span>",
+            "\xf3\xbe\xac\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2753\x22></span></span>",
+            "\xee\x80\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2753\x22></span></span>",
+            "\xee\x92\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
+            "\xe2\x9d\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
+            "\xf3\xbe\xac\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
+            "\xee\x8c\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2754\x22></span></span>",
+            "\xe2\x9d\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2755\x22></span></span>",
+            "\xf3\xbe\xac\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2755\x22></span></span>",
+            "\xee\x9c\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
+            "\xee\x8c\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2755\x22></span></span>",
+            "\xee\x92\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
+            "\xe2\x9d\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
+            "\xf3\xbe\xac\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
+            "\xee\x80\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
+            "\xe2\x9d\x97\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2757\x22></span></span>",
+            "\xe2\x9d\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2763\x22></span></span>",
+            "\xe2\x9d\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
+            "\xf3\xbe\xac\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
+            "\xee\x9b\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
+            "\xee\x80\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
+            "\xee\x96\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
+            "\xe2\x9d\xa4\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2764\x22></span></span>",
+            "\xe2\x9e\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2795\x22></span></span>",
+            "\xf3\xbe\xad\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2795\x22></span></span>",
+            "\xee\x94\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2795\x22></span></span>",
+            "\xe2\x9e\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2796\x22></span></span>",
+            "\xf3\xbe\xad\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2796\x22></span></span>",
+            "\xee\x94\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2796\x22></span></span>",
+            "\xe2\x9e\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2797\x22></span></span>",
+            "\xf3\xbe\xad\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2797\x22></span></span>",
+            "\xee\x95\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2797\x22></span></span>",
+            "\xe2\x9e\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
+            "\xf3\xbe\xab\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
+            "\xee\x88\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
+            "\xee\x95\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
+            "\xe2\x9e\xa1\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27a1\x22></span></span>",
+            "\xe2\x9e\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27b0\x22></span></span>",
+            "\xf3\xbe\xac\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27b0\x22></span></span>",
+            "\xee\x9c\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
+            "\xee\xac\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27b0\x22></span></span>",
+            "\xe2\x9e\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
+            "\xf3\xbe\xa0\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
+            "\xee\x9b\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
+            "\xee\x88\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji27bf\x22></span></span>",
+            "\xe2\xa4\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
+            "\xf3\xbe\xab\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
+            "\xee\x9b\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
+            "\xee\xac\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
+            "\xe2\xa4\xb4\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2934\x22></span></span>",
+            "\xe2\xa4\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
+            "\xf3\xbe\xab\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
+            "\xee\x9c\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
+            "\xee\xac\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
+            "\xe2\xa4\xb5\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2935\x22></span></span>",
+            "\xe2\xac\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
+            "\xf3\xbe\xab\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
+            "\xee\x88\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
+            "\xee\x95\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
+            "\xe2\xac\x85\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b05\x22></span></span>",
+            "\xe2\xac\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
+            "\xf3\xbe\xab\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
+            "\xee\x88\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
+            "\xee\x94\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
+            "\xe2\xac\x86\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b06\x22></span></span>",
+            "\xe2\xac\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
+            "\xf3\xbe\xab\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
+            "\xee\x88\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
+            "\xee\x95\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
+            "\xe2\xac\x87\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b07\x22></span></span>",
+            "\xe2\xac\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
+            "\xf3\xbe\xad\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
+            "\xee\x95\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
+            "\xe2\xac\x9b\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1b\x22></span></span>",
+            "\xe2\xac\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
+            "\xf3\xbe\xad\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
+            "\xee\x95\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
+            "\xe2\xac\x9c\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b1c\x22></span></span>",
+            "\xe2\xad\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
+            "\xf3\xbe\xad\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
+            "\xee\x8c\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
+            "\xee\x92\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
+            "\xe2\xad\x90\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b50\x22></span></span>",
+            "\xe2\xad\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
+            "\xf3\xbe\xad\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
+            "\xee\x9a\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f315\x22></span></span>",
+            "\xee\x8c\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
+            "\xee\xaa\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
+            "\xe2\xad\x95\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2b55\x22></span></span>",
+            "\xe3\x80\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
+            "\xf3\xbe\xac\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
+            "\xee\x9c\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
+            "\xe3\x80\xb0\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3030\x22></span></span>",
+            "\xe3\x80\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
+            "\xf3\xbe\xa0\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
+            "\xee\x84\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
+            "\xe3\x80\xbd\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji303d\x22></span></span>",
+            "\xe3\x8a\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
+            "\xf3\xbe\xad\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
+            "\xee\x8c\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
+            "\xee\xaa\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
+            "\xe3\x8a\x97\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3297\x22></span></span>",
+            "\xe3\x8a\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
+            "\xf3\xbe\xac\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
+            "\xee\x9c\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
+            "\xee\x8c\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
+            "\xee\x93\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
+            "\xe3\x8a\x99\xef\xb8\x8f"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3299\x22></span></span>",
+            "\xf0\x9f\x80\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
+            "\xf3\xbe\xa0\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
+            "\xee\x84\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
+            "\xee\x97\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
+            "\xf0\x9f\x80\x84\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f004\x22></span></span>",
+            "\xf0\x9f\x83\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f0cf\x22></span></span>",
+            "\xf3\xbe\xa0\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f0cf\x22></span></span>",
+            "\xee\xad\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f0cf\x22></span></span>",
+            "\xf0\x9f\x85\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
+            "\xf3\xbe\x94\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
+            "\xee\xac\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
+            "\xf0\x9f\x85\xb0\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f170\x22></span></span>",
+            "\xf0\x9f\x85\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
+            "\xf3\xbe\x94\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
+            "\xee\xac\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
+            "\xf0\x9f\x85\xb1\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f171\x22></span></span>",
+            "\xf0\x9f\x85\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
+            "\xf3\xbe\x94\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
+            "\xee\xac\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
+            "\xf0\x9f\x85\xbe\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17e\x22></span></span>",
+            "\xf0\x9f\x85\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
+            "\xf3\xbe\x9f\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
+            "\xee\x99\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
+            "\xee\x85\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
+            "\xee\x92\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
+            "\xf0\x9f\x85\xbf\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f17f\x22></span></span>",
+            "\xf0\x9f\x86\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
+            "\xf3\xbe\x94\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
+            "\xee\xac\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f18e\x22></span></span>",
+            "\xf0\x9f\x86\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
+            "\xf3\xbe\xae\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
+            "\xee\x9b\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
+            "\xee\x96\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f191\x22></span></span>",
+            "\xf0\x9f\x86\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
+            "\xf3\xbe\xac\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
+            "\xee\x88\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
+            "\xee\xaa\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f192\x22></span></span>",
+            "\xf0\x9f\x86\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
+            "\xf3\xbe\xac\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
+            "\xee\x9b\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
+            "\xee\x95\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f193\x22></span></span>",
+            "\xf0\x9f\x86\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
+            "\xf3\xbe\xae\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
+            "\xee\x9b\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
+            "\xee\x88\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
+            "\xee\xaa\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f194\x22></span></span>",
+            "\xf0\x9f\x86\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
+            "\xf3\xbe\xac\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
+            "\xee\x9b\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
+            "\xee\x88\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
+            "\xee\x96\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f195\x22></span></span>",
+            "\xf0\x9f\x86\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f196\x22></span></span>",
+            "\xf3\xbe\xac\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f196\x22></span></span>",
+            "\xf0\x9f\x86\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
+            "\xf3\xbe\xac\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
+            "\xee\x9c\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
+            "\xee\x89\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
+            "\xee\x96\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f197\x22></span></span>",
+            "\xf0\x9f\x86\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f198\x22></span></span>",
+            "\xf3\xbe\xad\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f198\x22></span></span>",
+            "\xee\x93\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f198\x22></span></span>",
+            "\xf0\x9f\x86\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f199\x22></span></span>",
+            "\xf3\xbe\xac\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f199\x22></span></span>",
+            "\xee\x88\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f199\x22></span></span>",
+            "\xee\x94\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
+            "\xf0\x9f\x86\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
+            "\xf3\xbe\xac\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
+            "\xee\x84\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
+            "\xee\x97\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f19a\x22></span></span>",
+            "\xf0\x9f\x88\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f201\x22></span></span>",
+            "\xf3\xbe\xac\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f201\x22></span></span>",
+            "\xee\x88\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f201\x22></span></span>",
+            "\xf0\x9f\x88\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
+            "\xf3\xbe\xac\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
+            "\xee\x88\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
+            "\xee\xaa\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
+            "\xf0\x9f\x88\x82\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f202\x22></span></span>",
+            "\xf0\x9f\x88\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
+            "\xf3\xbe\xac\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
+            "\xee\x88\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
+            "\xf0\x9f\x88\x9a\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f21a\x22></span></span>",
+            "\xf0\x9f\x88\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
+            "\xf3\xbe\xad\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
+            "\xee\x88\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
+            "\xee\xaa\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
+            "\xf0\x9f\x88\xaf\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f22f\x22></span></span>",
+            "\xf0\x9f\x88\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f232\x22></span></span>",
+            "\xf3\xbe\xac\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f232\x22></span></span>",
+            "\xee\x9c\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
+            "\xf0\x9f\x88\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
+            "\xf3\xbe\xac\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
+            "\xee\x9c\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
+            "\xee\x88\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
+            "\xee\xaa\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f233\x22></span></span>",
+            "\xf0\x9f\x88\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f234\x22></span></span>",
+            "\xf3\xbe\xac\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f234\x22></span></span>",
+            "\xee\x9c\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f234\x22></span></span>",
+            "\xf0\x9f\x88\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
+            "\xf3\xbe\xac\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
+            "\xee\x9c\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
+            "\xee\x88\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
+            "\xee\xaa\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f235\x22></span></span>",
+            "\xf0\x9f\x88\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f236\x22></span></span>",
+            "\xf3\xbe\xac\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f236\x22></span></span>",
+            "\xee\x88\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f236\x22></span></span>",
+            "\xf0\x9f\x88\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
+            "\xf3\xbe\xac\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
+            "\xee\x88\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
+            "\xf0\x9f\x88\xb7\xef\xb8\x8f"                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f237\x22></span></span>",
+            "\xf0\x9f\x88\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f238\x22></span></span>",
+            "\xf3\xbe\xac\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f238\x22></span></span>",
+            "\xee\x88\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f238\x22></span></span>",
+            "\xf0\x9f\x88\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
+            "\xf3\xbe\xac\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
+            "\xee\x88\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
+            "\xee\xaa\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f239\x22></span></span>",
+            "\xf0\x9f\x88\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
+            "\xf3\xbe\xad\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
+            "\xee\x88\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
+            "\xee\xaa\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f23a\x22></span></span>",
+            "\xf0\x9f\x89\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
+            "\xf3\xbe\xac\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
+            "\xee\x88\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
+            "\xee\x93\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f250\x22></span></span>",
+            "\xf0\x9f\x89\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f251\x22></span></span>",
+            "\xf3\xbe\xad\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f251\x22></span></span>",
+            "\xee\xac\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f251\x22></span></span>",
+            "\xf0\x9f\x8c\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
+            "\xf3\xbe\x80\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
+            "\xee\x99\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
+            "\xee\x91\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
+            "\xee\x91\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f300\x22></span></span>",
+            "\xf0\x9f\x8c\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
+            "\xf3\xbe\x80\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
+            "\xee\x99\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
+            "\xee\x96\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f301\x22></span></span>",
+            "\xf0\x9f\x8c\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
+            "\xf3\xbe\x80\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
+            "\xee\x99\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
+            "\xee\x90\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
+            "\xee\xab\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f302\x22></span></span>",
+            "\xf0\x9f\x8c\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f303\x22></span></span>",
+            "\xf3\xbe\x80\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f303\x22></span></span>",
+            "\xee\x9a\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
+            "\xee\x91\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
+            "\xee\xab\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f303\x22></span></span>",
+            "\xf0\x9f\x8c\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f304\x22></span></span>",
+            "\xf3\xbe\x80\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f304\x22></span></span>",
+            "\xee\x81\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f304\x22></span></span>",
+            "\xee\xab\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
+            "\xf0\x9f\x8c\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
+            "\xf3\xbe\x80\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
+            "\xee\x91\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f305\x22></span></span>",
+            "\xf0\x9f\x8c\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f306\x22></span></span>",
+            "\xf3\xbe\x80\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f306\x22></span></span>",
+            "\xee\x85\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f306\x22></span></span>",
+            "\xee\x97\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
+            "\xf0\x9f\x8c\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
+            "\xf3\xbe\x80\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
+            "\xee\x91\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f307\x22></span></span>",
+            "\xf0\x9f\x8c\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
+            "\xf3\xbe\x80\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
+            "\xee\x91\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
+            "\xee\xab\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f308\x22></span></span>",
+            "\xf0\x9f\x8c\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f309\x22></span></span>",
+            "\xf3\xbe\x80\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f309\x22></span></span>",
+            "\xee\x92\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f309\x22></span></span>",
+            "\xf0\x9f\x8c\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
+            "\xf3\xbe\x80\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
+            "\xee\x9c\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
+            "\xee\x90\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
+            "\xee\xad\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30a\x22></span></span>",
+            "\xf0\x9f\x8c\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30b\x22></span></span>",
+            "\xf3\xbe\x80\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30b\x22></span></span>",
+            "\xee\xad\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30b\x22></span></span>",
+            "\xf0\x9f\x8c\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
+            "\xf3\xbe\x80\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
+            "\xee\xad\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30c\x22></span></span>",
+            "\xf0\x9f\x8c\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30d\x22></span></span>",
+            "\xf0\x9f\x8c\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30e\x22></span></span>",
+            "\xf0\x9f\x8c\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30f\x22></span></span>",
+            "\xf3\xbe\x80\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30f\x22></span></span>",
+            "\xee\x96\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f30f\x22></span></span>",
+            "\xf0\x9f\x8c\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f310\x22></span></span>",
+            "\xf0\x9f\x8c\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f311\x22></span></span>",
+            "\xf3\xbe\x80\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f311\x22></span></span>",
+            "\xee\x96\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f311\x22></span></span>",
+            "\xf0\x9f\x8c\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f312\x22></span></span>",
+            "\xf0\x9f\x8c\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f313\x22></span></span>",
+            "\xf3\xbe\x80\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f313\x22></span></span>",
+            "\xee\x9a\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
+            "\xee\x81\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
+            "\xee\x96\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f313\x22></span></span>",
+            "\xf0\x9f\x8c\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
+            "\xf3\xbe\x80\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
+            "\xee\x9a\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
+            "\xee\x96\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f314\x22></span></span>",
+            "\xf0\x9f\x8c\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f315\x22></span></span>",
+            "\xf3\xbe\x80\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f315\x22></span></span>",
+            "\xf0\x9f\x8c\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f316\x22></span></span>",
+            "\xf0\x9f\x8c\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f317\x22></span></span>",
+            "\xf0\x9f\x8c\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f318\x22></span></span>",
+            "\xf0\x9f\x8c\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
+            "\xf3\xbe\x80\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
+            "\xee\x9a\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
+            "\xee\x92\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f319\x22></span></span>",
+            "\xf0\x9f\x8c\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31a\x22></span></span>",
+            "\xf0\x9f\x8c\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
+            "\xf3\xbe\x80\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
+            "\xee\x92\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31b\x22></span></span>",
+            "\xf0\x9f\x8c\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31c\x22></span></span>",
+            "\xf0\x9f\x8c\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31d\x22></span></span>",
+            "\xf0\x9f\x8c\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31e\x22></span></span>",
+            "\xf0\x9f\x8c\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
+            "\xf3\xbe\xad\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
+            "\xee\x8c\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f31f\x22></span></span>",
+            "\xf0\x9f\x8c\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f320\x22></span></span>",
+            "\xf3\xbe\xad\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f320\x22></span></span>",
+            "\xee\x91\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f320\x22></span></span>",
+            "\xf0\x9f\x8c\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f321\x22></span></span>",
+            "\xf0\x9f\x8c\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f324\x22></span></span>",
+            "\xf0\x9f\x8c\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f325\x22></span></span>",
+            "\xf0\x9f\x8c\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f326\x22></span></span>",
+            "\xf0\x9f\x8c\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f327\x22></span></span>",
+            "\xf0\x9f\x8c\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f328\x22></span></span>",
+            "\xf0\x9f\x8c\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f329\x22></span></span>",
+            "\xf0\x9f\x8c\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32a\x22></span></span>",
+            "\xf0\x9f\x8c\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32b\x22></span></span>",
+            "\xf0\x9f\x8c\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32c\x22></span></span>",
+            "\xf0\x9f\x8c\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32d\x22></span></span>",
+            "\xf0\x9f\x8c\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32e\x22></span></span>",
+            "\xf0\x9f\x8c\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f32f\x22></span></span>",
+            "\xf0\x9f\x8c\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f330\x22></span></span>",
+            "\xf3\xbe\x81\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f330\x22></span></span>",
+            "\xee\xac\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f330\x22></span></span>",
+            "\xf0\x9f\x8c\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
+            "\xf3\xbe\x80\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
+            "\xee\x9d\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
+            "\xee\x84\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
+            "\xee\xad\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f331\x22></span></span>",
+            "\xf0\x9f\x8c\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f332\x22></span></span>",
+            "\xf0\x9f\x8c\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f333\x22></span></span>",
+            "\xf0\x9f\x8c\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
+            "\xf3\xbe\x81\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
+            "\xee\x8c\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
+            "\xee\x93\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f334\x22></span></span>",
+            "\xf0\x9f\x8c\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
+            "\xf3\xbe\x81\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
+            "\xee\x8c\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
+            "\xee\xaa\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f335\x22></span></span>",
+            "\xf0\x9f\x8c\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f336\x22></span></span>",
+            "\xf0\x9f\x8c\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
+            "\xf3\xbe\x80\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
+            "\xee\x9d\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
+            "\xee\x8c\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
+            "\xee\x93\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f337\x22></span></span>",
+            "\xf0\x9f\x8c\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
+            "\xf3\xbe\x81\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
+            "\xee\x9d\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
+            "\xee\x80\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
+            "\xee\x93\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f338\x22></span></span>",
+            "\xf0\x9f\x8c\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
+            "\xf3\xbe\x81\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
+            "\xee\x80\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
+            "\xee\x96\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f339\x22></span></span>",
+            "\xf0\x9f\x8c\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
+            "\xf3\xbe\x81\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
+            "\xee\x8c\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
+            "\xee\xaa\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33a\x22></span></span>",
+            "\xf0\x9f\x8c\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33b\x22></span></span>",
+            "\xf3\xbe\x81\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33b\x22></span></span>",
+            "\xee\x8c\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
+            "\xee\x93\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33b\x22></span></span>",
+            "\xf0\x9f\x8c\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
+            "\xf3\xbe\x81\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
+            "\xee\xad\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33c\x22></span></span>",
+            "\xf0\x9f\x8c\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33d\x22></span></span>",
+            "\xf3\xbe\x81\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33d\x22></span></span>",
+            "\xee\xac\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33d\x22></span></span>",
+            "\xf0\x9f\x8c\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33e\x22></span></span>",
+            "\xf3\xbe\x81\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33e\x22></span></span>",
+            "\xee\x91\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33e\x22></span></span>",
+            "\xf0\x9f\x8c\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33f\x22></span></span>",
+            "\xf3\xbe\x81\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33f\x22></span></span>",
+            "\xee\x9d\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
+            "\xee\xae\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f33f\x22></span></span>",
+            "\xf0\x9f\x8d\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
+            "\xf3\xbe\x80\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f340\x22></span></span>",
+            "\xee\x94\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
+            "\xf0\x9f\x8d\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
+            "\xf3\xbe\x80\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
+            "\xee\x9d\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
+            "\xee\x84\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
+            "\xee\x93\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f341\x22></span></span>",
+            "\xf0\x9f\x8d\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
+            "\xf3\xbe\x81\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
+            "\xee\x84\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f342\x22></span></span>",
+            "\xee\x97\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
+            "\xf0\x9f\x8d\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
+            "\xf3\xbe\x81\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
+            "\xee\x91\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f343\x22></span></span>",
+            "\xf0\x9f\x8d\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f344\x22></span></span>",
+            "\xf3\xbe\x81\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f344\x22></span></span>",
+            "\xee\xac\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f344\x22></span></span>",
+            "\xf0\x9f\x8d\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
+            "\xf3\xbe\x81\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
+            "\xee\x8d\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
+            "\xee\xaa\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f345\x22></span></span>",
+            "\xf0\x9f\x8d\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
+            "\xf3\xbe\x81\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
+            "\xee\x8d\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
+            "\xee\xaa\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f346\x22></span></span>",
+            "\xf0\x9f\x8d\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f347\x22></span></span>",
+            "\xf3\xbe\x81\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f347\x22></span></span>",
+            "\xee\xac\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f347\x22></span></span>",
+            "\xf0\x9f\x8d\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f348\x22></span></span>",
+            "\xf3\xbe\x81\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f348\x22></span></span>",
+            "\xee\xac\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f348\x22></span></span>",
+            "\xf0\x9f\x8d\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
+            "\xf3\xbe\x81\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
+            "\xee\x8d\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
+            "\xee\x93\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f349\x22></span></span>",
+            "\xf0\x9f\x8d\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
+            "\xf3\xbe\x81\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
+            "\xee\x8d\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
+            "\xee\xaa\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34a\x22></span></span>",
+            "\xf0\x9f\x8d\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34b\x22></span></span>",
+            "\xf0\x9f\x8d\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
+            "\xf3\xbe\x81\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
+            "\xee\x9d\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
+            "\xee\xac\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34c\x22></span></span>",
+            "\xf0\x9f\x8d\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34d\x22></span></span>",
+            "\xf3\xbe\x81\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34d\x22></span></span>",
+            "\xee\xac\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34d\x22></span></span>",
+            "\xf0\x9f\x8d\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34e\x22></span></span>",
+            "\xf3\xbe\x81\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34e\x22></span></span>",
+            "\xee\x9d\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
+            "\xee\x8d\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
+            "\xee\xaa\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34e\x22></span></span>",
+            "\xf0\x9f\x8d\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
+            "\xf3\xbe\x81\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
+            "\xee\xad\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f34f\x22></span></span>",
+            "\xf0\x9f\x8d\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f350\x22></span></span>",
+            "\xf0\x9f\x8d\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f351\x22></span></span>",
+            "\xf3\xbe\x81\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f351\x22></span></span>",
+            "\xee\xac\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f351\x22></span></span>",
+            "\xf0\x9f\x8d\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
+            "\xf3\xbe\x81\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
+            "\xee\x9d\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
+            "\xee\x93\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f352\x22></span></span>",
+            "\xf0\x9f\x8d\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
+            "\xf3\xbe\x81\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
+            "\xee\x8d\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
+            "\xee\x93\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f353\x22></span></span>",
+            "\xf0\x9f\x8d\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
+            "\xf3\xbe\xa5\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
+            "\xee\x99\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
+            "\xee\x84\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
+            "\xee\x93\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f354\x22></span></span>",
+            "\xf0\x9f\x8d\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f355\x22></span></span>",
+            "\xf3\xbe\xa5\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f355\x22></span></span>",
+            "\xee\xac\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f355\x22></span></span>",
+            "\xf0\x9f\x8d\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f356\x22></span></span>",
+            "\xf3\xbe\xa5\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f356\x22></span></span>",
+            "\xee\x93\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f356\x22></span></span>",
+            "\xf0\x9f\x8d\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f357\x22></span></span>",
+            "\xf3\xbe\xa5\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f357\x22></span></span>",
+            "\xee\xac\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f357\x22></span></span>",
+            "\xf0\x9f\x8d\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
+            "\xf3\xbe\xa5\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
+            "\xee\x8c\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
+            "\xee\xaa\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f358\x22></span></span>",
+            "\xf0\x9f\x8d\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
+            "\xf3\xbe\xa5\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
+            "\xee\x9d\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
+            "\xee\x8d\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
+            "\xee\x93\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f359\x22></span></span>",
+            "\xf0\x9f\x8d\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
+            "\xf3\xbe\xa5\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
+            "\xee\x9d\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
+            "\xee\x8c\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
+            "\xee\xaa\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35a\x22></span></span>",
+            "\xf0\x9f\x8d\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
+            "\xf3\xbe\xa5\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
+            "\xee\x8d\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
+            "\xee\xaa\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35b\x22></span></span>",
+            "\xf0\x9f\x8d\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
+            "\xf3\xbe\xa5\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
+            "\xee\x8d\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
+            "\xee\x96\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35c\x22></span></span>",
+            "\xf0\x9f\x8d\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
+            "\xf3\xbe\xa5\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
+            "\xee\x8c\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
+            "\xee\xaa\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35d\x22></span></span>",
+            "\xf0\x9f\x8d\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
+            "\xf3\xbe\xa5\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
+            "\xee\x9d\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
+            "\xee\x8c\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
+            "\xee\xaa\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35e\x22></span></span>",
+            "\xf0\x9f\x8d\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
+            "\xf3\xbe\xa5\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
+            "\xee\x8c\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
+            "\xee\xaa\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f35f\x22></span></span>",
+            "\xf0\x9f\x8d\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f360\x22></span></span>",
+            "\xf3\xbe\xa5\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f360\x22></span></span>",
+            "\xee\xac\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f360\x22></span></span>",
+            "\xf0\x9f\x8d\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
+            "\xf3\xbe\xa5\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
+            "\xee\x8c\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
+            "\xee\xaa\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f361\x22></span></span>",
+            "\xf0\x9f\x8d\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
+            "\xf3\xbe\xa5\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
+            "\xee\x8d\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
+            "\xee\xaa\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f362\x22></span></span>",
+            "\xf0\x9f\x8d\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
+            "\xf3\xbe\xa5\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
+            "\xee\x8d\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
+            "\xee\xaa\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f363\x22></span></span>",
+            "\xf0\x9f\x8d\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f364\x22></span></span>",
+            "\xf3\xbe\xa5\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f364\x22></span></span>",
+            "\xee\xad\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f364\x22></span></span>",
+            "\xf0\x9f\x8d\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
+            "\xf3\xbe\xa5\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
+            "\xee\x93\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f365\x22></span></span>",
+            "\xf0\x9f\x8d\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
+            "\xf3\xbe\xa5\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
+            "\xee\x8c\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
+            "\xee\xaa\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f366\x22></span></span>",
+            "\xf0\x9f\x8d\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
+            "\xf3\xbe\xa5\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
+            "\xee\x90\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
+            "\xee\xab\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f367\x22></span></span>",
+            "\xf0\x9f\x8d\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f368\x22></span></span>",
+            "\xf3\xbe\xa5\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f368\x22></span></span>",
+            "\xee\xad\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f368\x22></span></span>",
+            "\xf0\x9f\x8d\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f369\x22></span></span>",
+            "\xf3\xbe\xa5\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f369\x22></span></span>",
+            "\xee\xad\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f369\x22></span></span>",
+            "\xf0\x9f\x8d\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36a\x22></span></span>",
+            "\xf3\xbe\xa5\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36a\x22></span></span>",
+            "\xee\xad\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36a\x22></span></span>",
+            "\xf0\x9f\x8d\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36b\x22></span></span>",
+            "\xf3\xbe\xa5\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36b\x22></span></span>",
+            "\xee\xad\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36b\x22></span></span>",
+            "\xf0\x9f\x8d\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36c\x22></span></span>",
+            "\xf3\xbe\xa5\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36c\x22></span></span>",
+            "\xee\xad\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36c\x22></span></span>",
+            "\xf0\x9f\x8d\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36d\x22></span></span>",
+            "\xf3\xbe\xa5\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36d\x22></span></span>",
+            "\xee\xad\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36d\x22></span></span>",
+            "\xf0\x9f\x8d\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36e\x22></span></span>",
+            "\xf3\xbe\xa5\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36e\x22></span></span>",
+            "\xee\xad\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36e\x22></span></span>",
+            "\xf0\x9f\x8d\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36f\x22></span></span>",
+            "\xf3\xbe\xa5\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36f\x22></span></span>",
+            "\xee\xad\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f36f\x22></span></span>",
+            "\xf0\x9f\x8d\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
+            "\xf3\xbe\xa5\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
+            "\xee\x9d\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
+            "\xee\x81\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
+            "\xee\x93\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f370\x22></span></span>",
+            "\xf0\x9f\x8d\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
+            "\xf3\xbe\xa5\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
+            "\xee\x8d\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
+            "\xee\xaa\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f371\x22></span></span>",
+            "\xf0\x9f\x8d\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
+            "\xf3\xbe\xa5\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
+            "\xee\x8d\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
+            "\xee\xaa\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f372\x22></span></span>",
+            "\xf0\x9f\x8d\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
+            "\xf3\xbe\xa5\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
+            "\xee\x85\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
+            "\xee\x93\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f373\x22></span></span>",
+            "\xf0\x9f\x8d\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
+            "\xf3\xbe\xa6\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
+            "\xee\x99\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
+            "\xee\x81\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
+            "\xee\x92\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f374\x22></span></span>",
+            "\xf0\x9f\x8d\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
+            "\xf3\xbe\xa6\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
+            "\xee\x9c\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
+            "\xee\x8c\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
+            "\xee\xaa\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f375\x22></span></span>",
+            "\xf0\x9f\x8d\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f376\x22></span></span>",
+            "\xf3\xbe\xa6\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f376\x22></span></span>",
+            "\xee\x9d\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
+            "\xee\x8c\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
+            "\xee\xaa\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f376\x22></span></span>",
+            "\xf0\x9f\x8d\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
+            "\xf3\xbe\xa6\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
+            "\xee\x9d\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
+            "\xee\x81\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
+            "\xee\x93\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f377\x22></span></span>",
+            "\xf0\x9f\x8d\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f378\x22></span></span>",
+            "\xf3\xbe\xa6\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f378\x22></span></span>",
+            "\xee\x99\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
+            "\xee\x93\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f378\x22></span></span>",
+            "\xf0\x9f\x8d\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
+            "\xf3\xbe\xa6\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
+            "\xee\xac\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f379\x22></span></span>",
+            "\xf0\x9f\x8d\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
+            "\xf3\xbe\xa6\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
+            "\xee\x99\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
+            "\xee\x81\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
+            "\xee\x93\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37a\x22></span></span>",
+            "\xf0\x9f\x8d\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
+            "\xf3\xbe\xa6\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
+            "\xee\x8c\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
+            "\xee\xaa\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37b\x22></span></span>",
+            "\xf0\x9f\x8d\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37c\x22></span></span>",
+            "\xf0\x9f\x8d\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37d\x22></span></span>",
+            "\xf0\x9f\x8d\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37e\x22></span></span>",
+            "\xf0\x9f\x8d\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f37f\x22></span></span>",
+            "\xf0\x9f\x8e\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
+            "\xf3\xbe\x94\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
+            "\xee\x9a\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
+            "\xee\x8c\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
+            "\xee\x96\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f380\x22></span></span>",
+            "\xf0\x9f\x8e\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f381\x22></span></span>",
+            "\xf3\xbe\x94\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f381\x22></span></span>",
+            "\xee\x9a\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
+            "\xee\x84\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
+            "\xee\x93\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f381\x22></span></span>",
+            "\xf0\x9f\x8e\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
+            "\xf3\xbe\x94\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
+            "\xee\x9a\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
+            "\xee\x8d\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
+            "\xee\x96\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f382\x22></span></span>",
+            "\xf0\x9f\x8e\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
+            "\xf3\xbe\x94\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
+            "\xee\x91\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
+            "\xee\xab\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f383\x22></span></span>",
+            "\xf0\x9f\x8e\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
+            "\xf3\xbe\x94\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
+            "\xee\x9a\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
+            "\xee\x80\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
+            "\xee\x93\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f384\x22></span></span>",
+            "\xf0\x9f\x8e\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
+            "\xf3\xbe\x94\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
+            "\xee\x91\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
+            "\xee\xab\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f385\x22></span></span>",
+            "\xf0\x9f\x8e\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
+            "\xf3\xbe\x94\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
+            "\xee\x84\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
+            "\xee\x97\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f386\x22></span></span>",
+            "\xf0\x9f\x8e\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
+            "\xf3\xbe\x94\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
+            "\xee\x91\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
+            "\xee\xab\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f387\x22></span></span>",
+            "\xf0\x9f\x8e\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
+            "\xf3\xbe\x94\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
+            "\xee\x8c\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
+            "\xee\xaa\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f388\x22></span></span>",
+            "\xf0\x9f\x8e\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
+            "\xf3\xbe\x94\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
+            "\xee\x8c\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
+            "\xee\xaa\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f389\x22></span></span>",
+            "\xf0\x9f\x8e\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38a\x22></span></span>",
+            "\xf3\xbe\x94\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38a\x22></span></span>",
+            "\xee\x91\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38a\x22></span></span>",
+            "\xf0\x9f\x8e\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38b\x22></span></span>",
+            "\xf3\xbe\x94\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38b\x22></span></span>",
+            "\xee\xac\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38b\x22></span></span>",
+            "\xf0\x9f\x8e\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
+            "\xf3\xbe\x94\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
+            "\xee\x85\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
+            "\xee\x97\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38c\x22></span></span>",
+            "\xf0\x9f\x8e\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
+            "\xf3\xbe\x94\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
+            "\xee\x90\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
+            "\xee\xab\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38d\x22></span></span>",
+            "\xf0\x9f\x8e\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
+            "\xf3\xbe\x94\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
+            "\xee\x90\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
+            "\xee\xab\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38e\x22></span></span>",
+            "\xf0\x9f\x8e\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
+            "\xf3\xbe\x94\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
+            "\xee\x90\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
+            "\xee\xab\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f38f\x22></span></span>",
+            "\xf0\x9f\x8e\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
+            "\xf3\xbe\x94\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
+            "\xee\x91\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
+            "\xee\xab\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f390\x22></span></span>",
+            "\xf0\x9f\x8e\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
+            "\xf3\xbe\x80\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
+            "\xee\x91\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
+            "\xee\xab\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f391\x22></span></span>",
+            "\xf0\x9f\x8e\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
+            "\xf3\xbe\x94\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
+            "\xee\x90\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
+            "\xee\xab\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f392\x22></span></span>",
+            "\xf0\x9f\x8e\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
+            "\xf3\xbe\x94\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
+            "\xee\x90\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
+            "\xee\xab\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f393\x22></span></span>",
+            "\xf0\x9f\x8e\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f396\x22></span></span>",
+            "\xf0\x9f\x8e\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f397\x22></span></span>",
+            "\xf0\x9f\x8e\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f399\x22></span></span>",
+            "\xf0\x9f\x8e\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39a\x22></span></span>",
+            "\xf0\x9f\x8e\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39b\x22></span></span>",
+            "\xf0\x9f\x8e\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39e\x22></span></span>",
+            "\xf0\x9f\x8e\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f39f\x22></span></span>",
+            "\xf0\x9f\x8e\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a0\x22></span></span>",
+            "\xf3\xbe\x9f\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a0\x22></span></span>",
+            "\xee\x99\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a0\x22></span></span>",
+            "\xf0\x9f\x8e\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
+            "\xf3\xbe\x9f\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
+            "\xee\x84\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
+            "\xee\x91\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a1\x22></span></span>",
+            "\xf0\x9f\x8e\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
+            "\xf3\xbe\x9f\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
+            "\xee\x90\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
+            "\xee\xab\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a2\x22></span></span>",
+            "\xf0\x9f\x8e\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a3\x22></span></span>",
+            "\xf3\xbe\x9f\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a3\x22></span></span>",
+            "\xee\x9d\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
+            "\xee\x80\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
+            "\xee\xad\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a3\x22></span></span>",
+            "\xf0\x9f\x8e\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
+            "\xf3\xbe\xa0\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
+            "\xee\x99\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
+            "\xee\x80\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a4\x22></span></span>",
+            "\xee\x94\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
+            "\xf0\x9f\x8e\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a5\x22></span></span>",
+            "\xf3\xbe\xa0\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a5\x22></span></span>",
+            "\xee\x99\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
+            "\xee\x80\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
+            "\xee\x94\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
+            "\xf0\x9f\x8e\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a6\x22></span></span>",
+            "\xf3\xbe\xa0\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a6\x22></span></span>",
+            "\xee\x94\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bb\x22></span></span>",
+            "\xf0\x9f\x8e\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
+            "\xf3\xbe\xa0\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
+            "\xee\x99\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
+            "\xee\x8c\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a7\x22></span></span>",
+            "\xee\x94\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
+            "\xf0\x9f\x8e\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
+            "\xf3\xbe\xa0\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
+            "\xee\x99\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
+            "\xee\x94\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
+            "\xee\x96\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a8\x22></span></span>",
+            "\xf0\x9f\x8e\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
+            "\xf3\xbe\xa0\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
+            "\xee\x99\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
+            "\xee\xab\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3a9\x22></span></span>",
+            "\xf0\x9f\x8e\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
+            "\xf3\xbe\xa0\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
+            "\xee\x99\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
+            "\xee\x96\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3aa\x22></span></span>",
+            "\xf0\x9f\x8e\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
+            "\xf3\xbe\xa0\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
+            "\xee\x99\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
+            "\xee\x84\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
+            "\xee\x92\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ab\x22></span></span>",
+            "\xf0\x9f\x8e\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
+            "\xf3\xbe\xa0\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
+            "\xee\x9a\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
+            "\xee\x8c\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
+            "\xee\x92\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ac\x22></span></span>",
+            "\xf0\x9f\x8e\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
+            "\xf3\xbe\xa0\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
+            "\xee\x96\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ad\x22></span></span>",
+            "\xf0\x9f\x8e\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
+            "\xf3\xbe\xa0\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
+            "\xee\x9a\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
+            "\xee\x93\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ae\x22></span></span>",
+            "\xf0\x9f\x8e\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
+            "\xf3\xbe\xa0\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
+            "\xee\x84\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
+            "\xee\x93\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3af\x22></span></span>",
+            "\xf0\x9f\x8e\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
+            "\xf3\xbe\xa0\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
+            "\xee\x84\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
+            "\xee\x91\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b0\x22></span></span>",
+            "\xf0\x9f\x8e\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
+            "\xf3\xbe\xa0\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
+            "\xee\x90\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
+            "\xee\xab\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b1\x22></span></span>",
+            "\xf0\x9f\x8e\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b2\x22></span></span>",
+            "\xf3\xbe\xa0\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b2\x22></span></span>",
+            "\xee\x93\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b2\x22></span></span>",
+            "\xf0\x9f\x8e\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b3\x22></span></span>",
+            "\xf3\xbe\xa0\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b3\x22></span></span>",
+            "\xee\xad\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b3\x22></span></span>",
+            "\xf0\x9f\x8e\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b4\x22></span></span>",
+            "\xf3\xbe\xa0\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b4\x22></span></span>",
+            "\xee\xad\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b4\x22></span></span>",
+            "\xf0\x9f\x8e\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
+            "\xf3\xbe\xa0\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
+            "\xee\x9b\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
+            "\xee\x80\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
+            "\xee\x96\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b5\x22></span></span>",
+            "\xf0\x9f\x8e\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b6\x22></span></span>",
+            "\xf3\xbe\xa0\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b6\x22></span></span>",
+            "\xee\x9b\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
+            "\xee\x8c\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
+            "\xee\x94\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
+            "\xf0\x9f\x8e\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b7\x22></span></span>",
+            "\xf3\xbe\xa0\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b7\x22></span></span>",
+            "\xee\x81\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b7\x22></span></span>",
+            "\xf0\x9f\x8e\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b8\x22></span></span>",
+            "\xf3\xbe\xa0\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b8\x22></span></span>",
+            "\xee\x81\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b8\x22></span></span>",
+            "\xee\x94\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
+            "\xf0\x9f\x8e\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b9\x22></span></span>",
+            "\xf3\xbe\xa0\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b9\x22></span></span>",
+            "\xee\xad\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3b9\x22></span></span>",
+            "\xf0\x9f\x8e\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
+            "\xf3\xbe\xa0\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
+            "\xee\x81\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
+            "\xee\xab\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ba\x22></span></span>",
+            "\xf0\x9f\x8e\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bb\x22></span></span>",
+            "\xf3\xbe\xa0\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bb\x22></span></span>",
+            "\xf0\x9f\x8e\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
+            "\xf3\xbe\xa0\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
+            "\xee\xab\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bc\x22></span></span>",
+            "\xf0\x9f\x8e\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bd\x22></span></span>",
+            "\xf3\xbe\x9f\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bd\x22></span></span>",
+            "\xee\x99\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bd\x22></span></span>",
+            "\xf0\x9f\x8e\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
+            "\xf3\xbe\x9f\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
+            "\xee\x99\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
+            "\xee\x80\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
+            "\xee\x92\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3be\x22></span></span>",
+            "\xf0\x9f\x8e\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
+            "\xf3\xbe\x9f\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
+            "\xee\x99\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
+            "\xee\x80\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
+            "\xee\xaa\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3bf\x22></span></span>",
+            "\xf0\x9f\x8f\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
+            "\xf3\xbe\x9f\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
+            "\xee\x99\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
+            "\xee\x90\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
+            "\xee\x96\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c0\x22></span></span>",
+            "\xf0\x9f\x8f\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
+            "\xf3\xbe\x9f\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
+            "\xee\x99\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
+            "\xee\x84\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
+            "\xee\x92\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c1\x22></span></span>",
+            "\xf0\x9f\x8f\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c2\x22></span></span>",
+            "\xf3\xbe\x9f\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c2\x22></span></span>",
+            "\xee\x9c\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
+            "\xee\x92\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c2\x22></span></span>",
+            "\xf0\x9f\x8f\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
+            "\xf3\xbe\x9f\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
+            "\xee\x9c\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
+            "\xee\x84\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
+            "\xee\x91\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c3\x22></span></span>",
+            "\xf0\x9f\x8f\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
+            "\xf3\xbe\x9f\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
+            "\xee\x80\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
+            "\xee\xad\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c4\x22></span></span>",
+            "\xf0\x9f\x8f\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c5\x22></span></span>",
+            "\xf0\x9f\x8f\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
+            "\xf3\xbe\x9f\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
+            "\xee\x84\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
+            "\xee\x97\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c6\x22></span></span>",
+            "\xf0\x9f\x8f\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c7\x22></span></span>",
+            "\xf0\x9f\x8f\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
+            "\xf3\xbe\x9f\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
+            "\xee\x90\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
+            "\xee\x92\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c8\x22></span></span>",
+            "\xf0\x9f\x8f\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3c9\x22></span></span>",
+            "\xf0\x9f\x8f\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
+            "\xf3\xbe\x9f\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
+            "\xee\x90\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
+            "\xee\xab\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ca\x22></span></span>",
+            "\xf0\x9f\x8f\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cb\x22></span></span>",
+            "\xf0\x9f\x8f\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cc\x22></span></span>",
+            "\xf0\x9f\x8f\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cd\x22></span></span>",
+            "\xf0\x9f\x8f\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ce\x22></span></span>",
+            "\xf0\x9f\x8f\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3cf\x22></span></span>",
+            "\xf0\x9f\x8f\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d0\x22></span></span>",
+            "\xf0\x9f\x8f\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d1\x22></span></span>",
+            "\xf0\x9f\x8f\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d2\x22></span></span>",
+            "\xf0\x9f\x8f\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d3\x22></span></span>",
+            "\xf0\x9f\x8f\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d4\x22></span></span>",
+            "\xf0\x9f\x8f\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d5\x22></span></span>",
+            "\xf0\x9f\x8f\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d6\x22></span></span>",
+            "\xf0\x9f\x8f\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d7\x22></span></span>",
+            "\xf0\x9f\x8f\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d8\x22></span></span>",
+            "\xf0\x9f\x8f\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3d9\x22></span></span>",
+            "\xf0\x9f\x8f\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3da\x22></span></span>",
+            "\xf0\x9f\x8f\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3db\x22></span></span>",
+            "\xf0\x9f\x8f\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3dc\x22></span></span>",
+            "\xf0\x9f\x8f\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3dd\x22></span></span>",
+            "\xf0\x9f\x8f\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3de\x22></span></span>",
+            "\xf0\x9f\x8f\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3df\x22></span></span>",
+            "\xf0\x9f\x8f\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e0\x22></span></span>",
+            "\xf3\xbe\x92\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e0\x22></span></span>",
+            "\xee\x99\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
+            "\xee\x80\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
+            "\xee\x92\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e0\x22></span></span>",
+            "\xf0\x9f\x8f\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
+            "\xf3\xbe\x92\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
+            "\xee\xac\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e1\x22></span></span>",
+            "\xf0\x9f\x8f\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
+            "\xf3\xbe\x92\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
+            "\xee\x99\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
+            "\xee\x80\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
+            "\xee\x92\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e2\x22></span></span>",
+            "\xf0\x9f\x8f\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
+            "\xf3\xbe\x92\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
+            "\xee\x99\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
+            "\xee\x85\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
+            "\xee\x97\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e3\x22></span></span>",
+            "\xf0\x9f\x8f\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e4\x22></span></span>",
+            "\xf0\x9f\x8f\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
+            "\xf3\xbe\x92\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
+            "\xee\x99\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
+            "\xee\x85\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
+            "\xee\x97\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e5\x22></span></span>",
+            "\xf0\x9f\x8f\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
+            "\xf3\xbe\x92\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
+            "\xee\x99\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
+            "\xee\x85\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
+            "\xee\x92\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e6\x22></span></span>",
+            "\xf0\x9f\x8f\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
+            "\xf3\xbe\x92\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
+            "\xee\x99\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
+            "\xee\x85\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
+            "\xee\x92\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e7\x22></span></span>",
+            "\xf0\x9f\x8f\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
+            "\xf3\xbe\x92\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
+            "\xee\x99\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
+            "\xee\x85\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
+            "\xee\xaa\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e8\x22></span></span>",
+            "\xf0\x9f\x8f\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
+            "\xf3\xbe\x92\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
+            "\xee\x99\xa9\xee\x9b\xaf"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
+            "\xee\x94\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
+            "\xee\xab\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3e9\x22></span></span>",
+            "\xf0\x9f\x8f\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
+            "\xf3\xbe\x92\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
+            "\xee\x99\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
+            "\xee\x85\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
+            "\xee\x92\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ea\x22></span></span>",
+            "\xf0\x9f\x8f\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
+            "\xf3\xbe\x92\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
+            "\xee\x9c\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
+            "\xee\x85\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
+            "\xee\xaa\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3eb\x22></span></span>",
+            "\xf0\x9f\x8f\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ec\x22></span></span>",
+            "\xf3\xbe\x92\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ec\x22></span></span>",
+            "\xee\x94\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
+            "\xee\xab\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ec\x22></span></span>",
+            "\xf0\x9f\x8f\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
+            "\xf3\xbe\x93\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
+            "\xee\xab\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ed\x22></span></span>",
+            "\xf0\x9f\x8f\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
+            "\xf3\xbe\x93\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
+            "\xee\x92\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ee\x22></span></span>",
+            "\xf0\x9f\x8f\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
+            "\xf3\xbe\x92\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
+            "\xee\xab\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ef\x22></span></span>",
+            "\xf0\x9f\x8f\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
+            "\xf3\xbe\x92\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
+            "\xee\xab\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f0\x22></span></span>",
+            "\xf0\x9f\x8f\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f3\x22></span></span>",
+            "\xf0\x9f\x8f\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f4\x22></span></span>",
+            "\xf0\x9f\x8f\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f5\x22></span></span>",
+            "\xf0\x9f\x8f\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f7\x22></span></span>",
+            "\xf0\x9f\x8f\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f8\x22></span></span>",
+            "\xf0\x9f\x8f\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3f9\x22></span></span>",
+            "\xf0\x9f\x8f\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fa\x22></span></span>",
+            "\xf0\x9f\x8f\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fb\x22></span></span>",
+            "\xf0\x9f\x8f\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fc\x22></span></span>",
+            "\xf0\x9f\x8f\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fd\x22></span></span>",
+            "\xf0\x9f\x8f\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3fe\x22></span></span>",
+            "\xf0\x9f\x8f\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f3ff\x22></span></span>",
+            "\xf0\x9f\x90\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f400\x22></span></span>",
+            "\xf0\x9f\x90\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f401\x22></span></span>",
+            "\xf0\x9f\x90\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f402\x22></span></span>",
+            "\xf0\x9f\x90\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f403\x22></span></span>",
+            "\xf0\x9f\x90\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f404\x22></span></span>",
+            "\xf0\x9f\x90\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f405\x22></span></span>",
+            "\xf0\x9f\x90\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f406\x22></span></span>",
+            "\xf0\x9f\x90\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f407\x22></span></span>",
+            "\xf0\x9f\x90\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f408\x22></span></span>",
+            "\xf0\x9f\x90\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f409\x22></span></span>",
+            "\xf0\x9f\x90\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40a\x22></span></span>",
+            "\xf0\x9f\x90\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40b\x22></span></span>",
+            "\xf0\x9f\x90\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
+            "\xf3\xbe\x86\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
+            "\xee\x9d\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
+            "\xee\xad\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40c\x22></span></span>",
+            "\xf0\x9f\x90\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
+            "\xf3\xbe\x87\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
+            "\xee\xac\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40d\x22></span></span>",
+            "\xf0\x9f\x90\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40e\x22></span></span>",
+            "\xf3\xbe\x9f\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40e\x22></span></span>",
+            "\xee\x9d\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
+            "\xee\x84\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40e\x22></span></span>",
+            "\xee\x93\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
+            "\xf0\x9f\x90\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f40f\x22></span></span>",
+            "\xf0\x9f\x90\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f410\x22></span></span>",
+            "\xf0\x9f\x90\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f411\x22></span></span>",
+            "\xf3\xbe\x87\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f411\x22></span></span>",
+            "\xee\x94\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
+            "\xf0\x9f\x90\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f412\x22></span></span>",
+            "\xf3\xbe\x87\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f412\x22></span></span>",
+            "\xee\x94\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
+            "\xee\x93\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
+            "\xf0\x9f\x90\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f413\x22></span></span>",
+            "\xf0\x9f\x90\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
+            "\xf3\xbe\x87\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
+            "\xee\xac\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f414\x22></span></span>",
+            "\xf0\x9f\x90\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f415\x22></span></span>",
+            "\xf0\x9f\x90\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f416\x22></span></span>",
+            "\xf0\x9f\x90\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
+            "\xf3\xbe\x87\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
+            "\xee\xac\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f417\x22></span></span>",
+            "\xf0\x9f\x90\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f418\x22></span></span>",
+            "\xf3\xbe\x87\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f418\x22></span></span>",
+            "\xee\x94\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
+            "\xee\xac\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f418\x22></span></span>",
+            "\xf0\x9f\x90\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
+            "\xf3\xbe\x87\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
+            "\xee\x84\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
+            "\xee\x97\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f419\x22></span></span>",
+            "\xf0\x9f\x90\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
+            "\xf3\xbe\x87\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
+            "\xee\x91\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
+            "\xee\xab\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41a\x22></span></span>",
+            "\xf0\x9f\x90\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41b\x22></span></span>",
+            "\xf3\xbe\x87\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41b\x22></span></span>",
+            "\xee\x94\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
+            "\xee\xac\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41b\x22></span></span>",
+            "\xf0\x9f\x90\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41c\x22></span></span>",
+            "\xf3\xbe\x87\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41c\x22></span></span>",
+            "\xee\x93\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41c\x22></span></span>",
+            "\xf0\x9f\x90\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41d\x22></span></span>",
+            "\xf3\xbe\x87\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41d\x22></span></span>",
+            "\xee\xad\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41d\x22></span></span>",
+            "\xf0\x9f\x90\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41e\x22></span></span>",
+            "\xf3\xbe\x87\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41e\x22></span></span>",
+            "\xee\xad\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41e\x22></span></span>",
+            "\xf0\x9f\x90\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41f\x22></span></span>",
+            "\xf3\xbe\x86\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f41f\x22></span></span>",
+            "\xf0\x9f\x90\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f420\x22></span></span>",
+            "\xf3\xbe\x87\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f420\x22></span></span>",
+            "\xee\x94\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
+            "\xee\xac\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f420\x22></span></span>",
+            "\xf0\x9f\x90\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
+            "\xf3\xbe\x87\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
+            "\xee\x93\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f421\x22></span></span>",
+            "\xf0\x9f\x90\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f422\x22></span></span>",
+            "\xf3\xbe\x87\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f422\x22></span></span>",
+            "\xee\x97\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f422\x22></span></span>",
+            "\xf0\x9f\x90\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f423\x22></span></span>",
+            "\xf3\xbe\x87\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f423\x22></span></span>",
+            "\xee\x9d\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
+            "\xee\x94\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
+            "\xee\x97\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f423\x22></span></span>",
+            "\xf0\x9f\x90\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f424\x22></span></span>",
+            "\xf3\xbe\x86\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f424\x22></span></span>",
+            "\xee\x93\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
+            "\xf0\x9f\x90\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f425\x22></span></span>",
+            "\xf3\xbe\x86\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f425\x22></span></span>",
+            "\xee\xad\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f425\x22></span></span>",
+            "\xf0\x9f\x90\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
+            "\xf3\xbe\x87\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f426\x22></span></span>",
+            "\xf0\x9f\x90\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
+            "\xf3\xbe\x86\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
+            "\xee\x9d\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
+            "\xee\x81\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
+            "\xee\x93\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f427\x22></span></span>",
+            "\xf0\x9f\x90\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f428\x22></span></span>",
+            "\xf3\xbe\x87\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f428\x22></span></span>",
+            "\xee\x94\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
+            "\xee\xac\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f428\x22></span></span>",
+            "\xf0\x9f\x90\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f429\x22></span></span>",
+            "\xf3\xbe\x87\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f429\x22></span></span>",
+            "\xee\x9a\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
+            "\xee\x81\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f436\x22></span></span>",
+            "\xee\x93\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f429\x22></span></span>",
+            "\xf0\x9f\x90\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42a\x22></span></span>",
+            "\xf0\x9f\x90\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
+            "\xf3\xbe\x87\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
+            "\xee\xac\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42b\x22></span></span>",
+            "\xf0\x9f\x90\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42c\x22></span></span>",
+            "\xf3\xbe\x87\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42c\x22></span></span>",
+            "\xee\x94\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
+            "\xee\xac\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42c\x22></span></span>",
+            "\xf0\x9f\x90\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
+            "\xf3\xbe\x87\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
+            "\xee\x81\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
+            "\xee\x97\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42d\x22></span></span>",
+            "\xf0\x9f\x90\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42e\x22></span></span>",
+            "\xf3\xbe\x87\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42e\x22></span></span>",
+            "\xee\x94\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51f\x22></span></span>",
+            "\xee\xac\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42e\x22></span></span>",
+            "\xf0\x9f\x90\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
+            "\xf3\xbe\x87\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
+            "\xee\x81\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
+            "\xee\x97\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f42f\x22></span></span>",
+            "\xf0\x9f\x90\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
+            "\xf3\xbe\x87\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
+            "\xee\x94\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
+            "\xee\x93\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f430\x22></span></span>",
+            "\xf0\x9f\x90\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
+            "\xf3\xbe\x86\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
+            "\xee\x9a\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
+            "\xee\x81\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
+            "\xee\x93\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f431\x22></span></span>",
+            "\xf0\x9f\x90\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f432\x22></span></span>",
+            "\xf3\xbe\x87\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f432\x22></span></span>",
+            "\xee\xac\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f432\x22></span></span>",
+            "\xf0\x9f\x90\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
+            "\xf3\xbe\x87\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
+            "\xee\x81\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
+            "\xee\x91\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f433\x22></span></span>",
+            "\xf0\x9f\x90\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
+            "\xf3\xbe\x86\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
+            "\xee\x80\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f434\x22></span></span>",
+            "\xf0\x9f\x90\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
+            "\xf3\xbe\x87\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
+            "\xee\x84\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f435\x22></span></span>",
+            "\xf0\x9f\x90\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f436\x22></span></span>",
+            "\xf3\xbe\x86\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f436\x22></span></span>",
+            "\xee\x93\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
+            "\xf0\x9f\x90\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f437\x22></span></span>",
+            "\xf3\xbe\x86\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f437\x22></span></span>",
+            "\xee\x9d\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
+            "\xee\x84\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
+            "\xee\x93\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f437\x22></span></span>",
+            "\xf0\x9f\x90\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
+            "\xf3\xbe\x87\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
+            "\xee\x93\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f438\x22></span></span>",
+            "\xf0\x9f\x90\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f439\x22></span></span>",
+            "\xf3\xbe\x87\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f439\x22></span></span>",
+            "\xee\x94\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
+            "\xf0\x9f\x90\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
+            "\xf3\xbe\x87\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43a\x22></span></span>",
+            "\xee\x94\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
+            "\xf0\x9f\x90\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
+            "\xf3\xbe\x87\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
+            "\xee\x81\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
+            "\xee\x97\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43b\x22></span></span>",
+            "\xf0\x9f\x90\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43c\x22></span></span>",
+            "\xf3\xbe\x87\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43c\x22></span></span>",
+            "\xee\xad\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43c\x22></span></span>",
+            "\xf0\x9f\x90\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
+            "\xf3\xbe\x87\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
+            "\xee\xad\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43d\x22></span></span>",
+            "\xf0\x9f\x90\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43e\x22></span></span>",
+            "\xf3\xbe\x87\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43e\x22></span></span>",
+            "\xee\x9a\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
+            "\xee\x94\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f538\x22></span></span>",
+            "\xee\x93\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43e\x22></span></span>",
+            "\xf0\x9f\x90\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f43f\x22></span></span>",
+            "\xf0\x9f\x91\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
+            "\xf3\xbe\x86\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
+            "\xee\x9a\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
+            "\xee\x90\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
+            "\xee\x96\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f440\x22></span></span>",
+            "\xf0\x9f\x91\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f441\x22></span></span>",
+            "\xf0\x9f\x91\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
+            "\xf3\xbe\x86\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
+            "\xee\x9a\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
+            "\xee\x90\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
+            "\xee\x96\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f442\x22></span></span>",
+            "\xf0\x9f\x91\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
+            "\xf3\xbe\x86\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
+            "\xee\x90\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
+            "\xee\xab\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f443\x22></span></span>",
+            "\xf0\x9f\x91\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
+            "\xf3\xbe\x86\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
+            "\xee\x9b\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
+            "\xee\x90\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
+            "\xee\xab\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f444\x22></span></span>",
+            "\xf0\x9f\x91\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f445\x22></span></span>",
+            "\xf3\xbe\x86\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f445\x22></span></span>",
+            "\xee\x9c\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
+            "\xee\x90\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
+            "\xee\xad\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f445\x22></span></span>",
+            "\xf0\x9f\x91\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
+            "\xf3\xbe\xae\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
+            "\xee\x88\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
+            "\xee\xaa\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f446\x22></span></span>",
+            "\xf0\x9f\x91\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
+            "\xf3\xbe\xae\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
+            "\xee\x88\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
+            "\xee\xaa\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f447\x22></span></span>",
+            "\xf0\x9f\x91\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
+            "\xf3\xbe\xae\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
+            "\xee\x88\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
+            "\xee\x93\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f448\x22></span></span>",
+            "\xf0\x9f\x91\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
+            "\xf3\xbe\xae\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
+            "\xee\x88\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
+            "\xee\x94\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f449\x22></span></span>",
+            "\xf0\x9f\x91\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
+            "\xf3\xbe\xae\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
+            "\xee\x9b\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
+            "\xee\x80\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
+            "\xee\x93\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44a\x22></span></span>",
+            "\xf0\x9f\x91\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44b\x22></span></span>",
+            "\xf3\xbe\xae\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44b\x22></span></span>",
+            "\xee\x90\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44b\x22></span></span>",
+            "\xee\xab\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
+            "\xf0\x9f\x91\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
+            "\xf3\xbe\xae\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
+            "\xee\x90\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
+            "\xee\xab\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44c\x22></span></span>",
+            "\xf0\x9f\x91\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
+            "\xf3\xbe\xae\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
+            "\xee\x9c\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
+            "\xee\x80\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
+            "\xee\x93\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44d\x22></span></span>",
+            "\xf0\x9f\x91\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
+            "\xf3\xbe\xae\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
+            "\xee\x90\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
+            "\xee\xab\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44e\x22></span></span>",
+            "\xf0\x9f\x91\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
+            "\xf3\xbe\xae\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
+            "\xee\x90\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
+            "\xee\xab\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f44f\x22></span></span>",
+            "\xf0\x9f\x91\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
+            "\xf3\xbe\xae\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
+            "\xee\x90\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f450\x22></span></span>",
+            "\xf0\x9f\x91\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f451\x22></span></span>",
+            "\xf3\xbe\x93\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f451\x22></span></span>",
+            "\xee\x9c\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
+            "\xee\x84\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f451\x22></span></span>",
+            "\xee\x97\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
+            "\xf0\x9f\x91\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
+            "\xf3\xbe\x93\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
+            "\xee\x8c\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
+            "\xee\xaa\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f452\x22></span></span>",
+            "\xf0\x9f\x91\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
+            "\xf3\xbe\x93\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
+            "\xee\x9a\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
+            "\xee\x93\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f453\x22></span></span>",
+            "\xf0\x9f\x91\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
+            "\xf3\xbe\x93\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
+            "\xee\x8c\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
+            "\xee\xaa\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f454\x22></span></span>",
+            "\xf0\x9f\x91\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f455\x22></span></span>",
+            "\xf3\xbe\x93\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f455\x22></span></span>",
+            "\xee\x9c\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
+            "\xee\x80\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
+            "\xee\x96\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f455\x22></span></span>",
+            "\xf0\x9f\x91\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
+            "\xf3\xbe\x93\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
+            "\xee\x9c\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
+            "\xee\xad\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f456\x22></span></span>",
+            "\xf0\x9f\x91\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
+            "\xf3\xbe\x93\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
+            "\xee\x8c\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
+            "\xee\xad\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f457\x22></span></span>",
+            "\xf0\x9f\x91\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
+            "\xf3\xbe\x93\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
+            "\xee\x8c\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
+            "\xee\xaa\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f458\x22></span></span>",
+            "\xf0\x9f\x91\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
+            "\xf3\xbe\x93\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
+            "\xee\x8c\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
+            "\xee\xaa\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f459\x22></span></span>",
+            "\xf0\x9f\x91\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
+            "\xf3\xbe\x93\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45a\x22></span></span>",
+            "\xee\x94\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
+            "\xf0\x9f\x91\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
+            "\xf3\xbe\x93\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
+            "\xee\x9c\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45b\x22></span></span>",
+            "\xf0\x9f\x91\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
+            "\xf3\xbe\x93\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
+            "\xee\x9a\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
+            "\xee\x8c\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
+            "\xee\x92\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45c\x22></span></span>",
+            "\xf0\x9f\x91\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45d\x22></span></span>",
+            "\xf3\xbe\x93\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45d\x22></span></span>",
+            "\xee\x9a\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45d\x22></span></span>",
+            "\xf0\x9f\x91\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45e\x22></span></span>",
+            "\xf3\xbe\x93\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45e\x22></span></span>",
+            "\xee\x9a\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
+            "\xee\x80\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
+            "\xee\x96\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45e\x22></span></span>",
+            "\xf0\x9f\x91\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
+            "\xf3\xbe\x93\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
+            "\xee\xac\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f45f\x22></span></span>",
+            "\xf0\x9f\x91\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f460\x22></span></span>",
+            "\xf3\xbe\x93\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f460\x22></span></span>",
+            "\xee\x99\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
+            "\xee\x84\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f460\x22></span></span>",
+            "\xee\x94\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f476\x22></span></span>",
+            "\xf0\x9f\x91\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
+            "\xf3\xbe\x93\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
+            "\xee\x8c\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f461\x22></span></span>",
+            "\xf0\x9f\x91\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
+            "\xf3\xbe\x93\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
+            "\xee\x8c\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
+            "\xee\xaa\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f462\x22></span></span>",
+            "\xf0\x9f\x91\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
+            "\xf3\xbe\x95\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
+            "\xee\xac\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f463\x22></span></span>",
+            "\xf0\x9f\x91\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f464\x22></span></span>",
+            "\xf3\xbe\x86\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f464\x22></span></span>",
+            "\xee\x9a\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f464\x22></span></span>",
+            "\xf0\x9f\x91\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f465\x22></span></span>",
+            "\xf0\x9f\x91\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f466\x22></span></span>",
+            "\xf3\xbe\x86\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f466\x22></span></span>",
+            "\xee\x80\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f466\x22></span></span>",
+            "\xee\x93\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
+            "\xf0\x9f\x91\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f467\x22></span></span>",
+            "\xf3\xbe\x86\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f467\x22></span></span>",
+            "\xee\x80\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f467\x22></span></span>",
+            "\xee\x93\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
+            "\xf0\x9f\x91\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
+            "\xf3\xbe\x86\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
+            "\xee\x80\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468\x22></span></span>",
+            "\xf0\x9f\x91\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
+            "\xf3\xbe\x86\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
+            "\xee\x80\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469\x22></span></span>",
+            "\xf0\x9f\x91\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
+            "\xf3\xbe\x86\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46a\x22></span></span>",
+            "\xf0\x9f\x91\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46b\x22></span></span>",
+            "\xf3\xbe\x86\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46b\x22></span></span>",
+            "\xee\x90\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46b\x22></span></span>",
+            "\xf0\x9f\x91\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46c\x22></span></span>",
+            "\xf0\x9f\x91\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46d\x22></span></span>",
+            "\xf0\x9f\x91\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
+            "\xf3\xbe\x86\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
+            "\xee\x85\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
+            "\xee\x97\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46e\x22></span></span>",
+            "\xf0\x9f\x91\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
+            "\xf3\xbe\x86\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
+            "\xee\x90\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
+            "\xee\xab\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f46f\x22></span></span>",
+            "\xf0\x9f\x91\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f470\x22></span></span>",
+            "\xf3\xbe\x86\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f470\x22></span></span>",
+            "\xee\xab\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f470\x22></span></span>",
+            "\xf0\x9f\x91\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f471\x22></span></span>",
+            "\xf3\xbe\x86\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f471\x22></span></span>",
+            "\xee\x94\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
+            "\xee\xac\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f471\x22></span></span>",
+            "\xf0\x9f\x91\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
+            "\xf3\xbe\x86\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
+            "\xee\xac\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f472\x22></span></span>",
+            "\xf0\x9f\x91\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
+            "\xf3\xbe\x86\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
+            "\xee\xac\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f473\x22></span></span>",
+            "\xf0\x9f\x91\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f474\x22></span></span>",
+            "\xf3\xbe\x86\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f474\x22></span></span>",
+            "\xee\x94\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50d\x22></span></span>",
+            "\xee\xac\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f474\x22></span></span>",
+            "\xf0\x9f\x91\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f475\x22></span></span>",
+            "\xf3\xbe\x86\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f475\x22></span></span>",
+            "\xee\x94\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
+            "\xee\xac\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f475\x22></span></span>",
+            "\xf0\x9f\x91\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f476\x22></span></span>",
+            "\xf3\xbe\x86\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f476\x22></span></span>",
+            "\xee\xac\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
+            "\xf0\x9f\x91\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f477\x22></span></span>",
+            "\xf3\xbe\x86\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f477\x22></span></span>",
+            "\xee\x94\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
+            "\xee\xac\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f477\x22></span></span>",
+            "\xf0\x9f\x91\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f478\x22></span></span>",
+            "\xf3\xbe\x86\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f478\x22></span></span>",
+            "\xee\x94\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
+            "\xee\xac\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f478\x22></span></span>",
+            "\xf0\x9f\x91\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f479\x22></span></span>",
+            "\xf3\xbe\x86\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f479\x22></span></span>",
+            "\xee\xad\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f479\x22></span></span>",
+            "\xf0\x9f\x91\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47a\x22></span></span>",
+            "\xf3\xbe\x86\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47a\x22></span></span>",
+            "\xee\xad\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47a\x22></span></span>",
+            "\xf0\x9f\x91\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
+            "\xf3\xbe\x86\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
+            "\xee\x84\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
+            "\xee\x93\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47b\x22></span></span>",
+            "\xf0\x9f\x91\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
+            "\xf3\xbe\x86\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
+            "\xee\x81\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
+            "\xee\x96\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47c\x22></span></span>",
+            "\xf0\x9f\x91\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47d\x22></span></span>",
+            "\xf3\xbe\x86\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47d\x22></span></span>",
+            "\xee\x84\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47d\x22></span></span>",
+            "\xee\x94\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
+            "\xf0\x9f\x91\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
+            "\xf3\xbe\x86\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
+            "\xee\x84\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
+            "\xee\x93\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47e\x22></span></span>",
+            "\xf0\x9f\x91\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
+            "\xf3\xbe\x86\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
+            "\xee\x84\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
+            "\xee\x93\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f47f\x22></span></span>",
+            "\xf0\x9f\x92\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
+            "\xf3\xbe\x86\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
+            "\xee\x84\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
+            "\xee\x93\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f480\x22></span></span>",
+            "\xf0\x9f\x92\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f481\x22></span></span>",
+            "\xf3\xbe\x86\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f481\x22></span></span>",
+            "\xee\x89\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f481\x22></span></span>",
+            "\xf0\x9f\x92\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f482\x22></span></span>",
+            "\xf3\xbe\x86\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f482\x22></span></span>",
+            "\xee\x94\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
+            "\xf0\x9f\x92\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f483\x22></span></span>",
+            "\xf3\xbe\x86\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f483\x22></span></span>",
+            "\xee\x94\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
+            "\xee\xac\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f483\x22></span></span>",
+            "\xf0\x9f\x92\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
+            "\xf3\xbe\x86\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
+            "\xee\x9c\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
+            "\xee\x8c\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f484\x22></span></span>",
+            "\xee\x94\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
+            "\xf0\x9f\x92\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
+            "\xf3\xbe\x86\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
+            "\xee\x8c\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
+            "\xee\xaa\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f485\x22></span></span>",
+            "\xf0\x9f\x92\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f486\x22></span></span>",
+            "\xf3\xbe\x86\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f486\x22></span></span>",
+            "\xee\x8c\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f486\x22></span></span>",
+            "\xee\x94\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
+            "\xf0\x9f\x92\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
+            "\xf3\xbe\x86\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
+            "\xee\x8c\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
+            "\xee\xaa\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f487\x22></span></span>",
+            "\xf0\x9f\x92\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
+            "\xf3\xbe\x86\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
+            "\xee\x8c\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
+            "\xee\xaa\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f488\x22></span></span>",
+            "\xf0\x9f\x92\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f489\x22></span></span>",
+            "\xf3\xbe\x94\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f489\x22></span></span>",
+            "\xee\x84\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f489\x22></span></span>",
+            "\xee\x94\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
+            "\xf0\x9f\x92\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
+            "\xf3\xbe\x94\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
+            "\xee\x8c\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
+            "\xee\xaa\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48a\x22></span></span>",
+            "\xf0\x9f\x92\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
+            "\xf3\xbe\xa0\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
+            "\xee\x80\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
+            "\xee\x93\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48b\x22></span></span>",
+            "\xf0\x9f\x92\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
+            "\xf3\xbe\xa0\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
+            "\xee\x9c\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
+            "\xee\x84\x83\xee\x8c\xa8"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
+            "\xee\xad\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48c\x22></span></span>",
+            "\xf0\x9f\x92\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48d\x22></span></span>",
+            "\xf3\xbe\xa0\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48d\x22></span></span>",
+            "\xee\x9c\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
+            "\xee\x80\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48d\x22></span></span>",
+            "\xee\x94\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
+            "\xf0\x9f\x92\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
+            "\xf3\xbe\xa0\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
+            "\xee\x80\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48e\x22></span></span>",
+            "\xf0\x9f\x92\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
+            "\xf3\xbe\xa0\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
+            "\xee\x84\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
+            "\xee\x97\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f48f\x22></span></span>",
+            "\xf0\x9f\x92\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
+            "\xf3\xbe\xa0\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
+            "\xee\x8c\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
+            "\xee\xaa\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f490\x22></span></span>",
+            "\xf0\x9f\x92\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
+            "\xf3\xbe\xa0\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
+            "\xee\x9b\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
+            "\xee\x90\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
+            "\xee\xab\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f491\x22></span></span>",
+            "\xf0\x9f\x92\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
+            "\xf3\xbe\xa0\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
+            "\xee\x90\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f492\x22></span></span>",
+            "\xf0\x9f\x92\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f493\x22></span></span>",
+            "\xf3\xbe\xac\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f493\x22></span></span>",
+            "\xee\x8c\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
+            "\xee\xad\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
+            "\xf0\x9f\x92\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
+            "\xf3\xbe\xac\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
+            "\xee\x9b\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
+            "\xee\x80\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
+            "\xee\x91\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f494\x22></span></span>",
+            "\xf0\x9f\x92\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
+            "\xf3\xbe\xac\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
+            "\xee\x9b\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
+            "\xee\x91\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f495\x22></span></span>",
+            "\xf0\x9f\x92\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f496\x22></span></span>",
+            "\xf3\xbe\xac\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f496\x22></span></span>",
+            "\xee\xaa\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f496\x22></span></span>",
+            "\xf0\x9f\x92\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
+            "\xf3\xbe\xac\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
+            "\xee\x8c\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f497\x22></span></span>",
+            "\xf0\x9f\x92\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
+            "\xf3\xbe\xac\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
+            "\xee\x8c\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
+            "\xee\x93\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f498\x22></span></span>",
+            "\xf0\x9f\x92\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
+            "\xf3\xbe\xac\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
+            "\xee\x8c\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
+            "\xee\xaa\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f499\x22></span></span>",
+            "\xf0\x9f\x92\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
+            "\xf3\xbe\xac\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
+            "\xee\x8c\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
+            "\xee\xaa\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49a\x22></span></span>",
+            "\xf0\x9f\x92\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
+            "\xf3\xbe\xac\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
+            "\xee\x8c\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
+            "\xee\xaa\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49b\x22></span></span>",
+            "\xf0\x9f\x92\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
+            "\xf3\xbe\xac\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
+            "\xee\x8c\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
+            "\xee\xaa\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49c\x22></span></span>",
+            "\xf0\x9f\x92\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
+            "\xf3\xbe\xac\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
+            "\xee\x90\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
+            "\xee\xad\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49d\x22></span></span>",
+            "\xf0\x9f\x92\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
+            "\xf3\xbe\xac\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
+            "\xee\x96\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49e\x22></span></span>",
+            "\xf0\x9f\x92\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
+            "\xf3\xbe\xac\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
+            "\xee\x88\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f49f\x22></span></span>",
+            "\xf0\x9f\x92\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a0\x22></span></span>",
+            "\xf3\xbe\xad\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a0\x22></span></span>",
+            "\xf0\x9f\x92\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
+            "\xf3\xbe\xad\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
+            "\xee\x9b\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
+            "\xee\x84\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
+            "\xee\x91\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a1\x22></span></span>",
+            "\xf0\x9f\x92\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
+            "\xf3\xbe\xad\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
+            "\xee\x9b\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
+            "\xee\x8c\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
+            "\xee\x93\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a2\x22></span></span>",
+            "\xf0\x9f\x92\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
+            "\xf3\xbe\xad\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
+            "\xee\x9b\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
+            "\xee\x8c\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
+            "\xee\x91\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a3\x22></span></span>",
+            "\xf0\x9f\x92\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
+            "\xf3\xbe\xad\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
+            "\xee\x9c\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
+            "\xee\x84\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
+            "\xee\x91\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a4\x22></span></span>",
+            "\xf0\x9f\x92\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
+            "\xf3\xbe\xad\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
+            "\xee\x9c\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
+            "\xee\x96\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a5\x22></span></span>",
+            "\xf0\x9f\x92\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
+            "\xf3\xbe\xad\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
+            "\xee\x9c\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
+            "\xee\x8c\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
+            "\xee\x96\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a6\x22></span></span>",
+            "\xf0\x9f\x92\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
+            "\xf3\xbe\xad\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
+            "\xee\x9c\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
+            "\xee\x93\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a7\x22></span></span>",
+            "\xf0\x9f\x92\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
+            "\xf3\xbe\xad\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
+            "\xee\x9c\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
+            "\xee\x8c\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
+            "\xee\x93\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a8\x22></span></span>",
+            "\xf0\x9f\x92\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
+            "\xf3\xbe\x93\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
+            "\xee\x81\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
+            "\xee\x93\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4a9\x22></span></span>",
+            "\xf0\x9f\x92\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
+            "\xf3\xbe\xad\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
+            "\xee\x85\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
+            "\xee\x93\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4aa\x22></span></span>",
+            "\xf0\x9f\x92\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ab\x22></span></span>",
+            "\xf3\xbe\xad\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ab\x22></span></span>",
+            "\xee\x90\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
+            "\xee\xad\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ab\x22></span></span>",
+            "\xf0\x9f\x92\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ac\x22></span></span>",
+            "\xf3\xbe\x94\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ac\x22></span></span>",
+            "\xee\x93\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ac\x22></span></span>",
+            "\xf0\x9f\x92\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ad\x22></span></span>",
+            "\xf0\x9f\x92\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ae\x22></span></span>",
+            "\xf3\xbe\xad\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ae\x22></span></span>",
+            "\xee\x93\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ae\x22></span></span>",
+            "\xf0\x9f\x92\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4af\x22></span></span>",
+            "\xf3\xbe\xad\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4af\x22></span></span>",
+            "\xee\x93\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4af\x22></span></span>",
+            "\xf0\x9f\x92\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b0\x22></span></span>",
+            "\xf3\xbe\x93\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b0\x22></span></span>",
+            "\xee\x9c\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
+            "\xee\x84\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
+            "\xee\x93\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b0\x22></span></span>",
+            "\xf0\x9f\x92\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b1\x22></span></span>",
+            "\xf3\xbe\x93\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b1\x22></span></span>",
+            "\xee\x85\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b1\x22></span></span>",
+            "\xf0\x9f\x92\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b2\x22></span></span>",
+            "\xf3\xbe\x93\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b2\x22></span></span>",
+            "\xee\x95\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b2\x22></span></span>",
+            "\xf0\x9f\x92\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b3\x22></span></span>",
+            "\xf3\xbe\x93\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b3\x22></span></span>",
+            "\xee\x95\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b3\x22></span></span>",
+            "\xf0\x9f\x92\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
+            "\xf3\xbe\x93\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
+            "\xee\x9b\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
+            "\xee\x95\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b4\x22></span></span>",
+            "\xf0\x9f\x92\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
+            "\xf3\xbe\x93\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
+            "\xee\x96\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b5\x22></span></span>",
+            "\xf0\x9f\x92\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b6\x22></span></span>",
+            "\xf0\x9f\x92\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b7\x22></span></span>",
+            "\xf0\x9f\x92\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b8\x22></span></span>",
+            "\xf3\xbe\x93\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b8\x22></span></span>",
+            "\xee\xad\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b8\x22></span></span>",
+            "\xf0\x9f\x92\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b9\x22></span></span>",
+            "\xf3\xbe\x93\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b9\x22></span></span>",
+            "\xee\x85\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
+            "\xee\x97\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4b9\x22></span></span>",
+            "\xf0\x9f\x92\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
+            "\xf3\xbe\x94\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
+            "\xee\x9a\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
+            "\xee\x84\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ba\x22></span></span>",
+            "\xf0\x9f\x92\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
+            "\xf3\xbe\x94\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
+            "\xee\x9c\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
+            "\xee\x80\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
+            "\xee\x96\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bb\x22></span></span>",
+            "\xf0\x9f\x92\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
+            "\xf3\xbe\x94\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
+            "\xee\x84\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
+            "\xee\x97\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bc\x22></span></span>",
+            "\xf0\x9f\x92\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bd\x22></span></span>",
+            "\xf3\xbe\x94\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bd\x22></span></span>",
+            "\xee\x8c\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
+            "\xee\x96\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bd\x22></span></span>",
+            "\xf0\x9f\x92\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
+            "\xf3\xbe\x94\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
+            "\xee\x95\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4be\x22></span></span>",
+            "\xf0\x9f\x92\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bf\x22></span></span>",
+            "\xf3\xbe\xa0\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bf\x22></span></span>",
+            "\xee\x9a\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
+            "\xee\x84\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4bf\x22></span></span>",
+            "\xee\x94\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
+            "\xf0\x9f\x93\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
+            "\xf3\xbe\xa0\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
+            "\xee\x84\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c0\x22></span></span>",
+            "\xf0\x9f\x93\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c1\x22></span></span>",
+            "\xf3\xbe\x95\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c1\x22></span></span>",
+            "\xee\x96\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c1\x22></span></span>",
+            "\xf0\x9f\x93\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c2\x22></span></span>",
+            "\xf3\xbe\x95\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c2\x22></span></span>",
+            "\xee\x96\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c2\x22></span></span>",
+            "\xf0\x9f\x93\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c3\x22></span></span>",
+            "\xf3\xbe\x95\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c3\x22></span></span>",
+            "\xee\x9a\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
+            "\xee\x95\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c3\x22></span></span>",
+            "\xf0\x9f\x93\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c4\x22></span></span>",
+            "\xf3\xbe\x95\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c4\x22></span></span>",
+            "\xee\x95\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c4\x22></span></span>",
+            "\xf0\x9f\x93\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c5\x22></span></span>",
+            "\xf3\xbe\x95\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c5\x22></span></span>",
+            "\xee\x95\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c5\x22></span></span>",
+            "\xf0\x9f\x93\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c6\x22></span></span>",
+            "\xf3\xbe\x95\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c6\x22></span></span>",
+            "\xee\x95\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c6\x22></span></span>",
+            "\xf0\x9f\x93\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c7\x22></span></span>",
+            "\xf3\xbe\x95\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c7\x22></span></span>",
+            "\xee\x9a\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
+            "\xee\x85\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
+            "\xee\x95\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c7\x22></span></span>",
+            "\xf0\x9f\x93\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c8\x22></span></span>",
+            "\xf3\xbe\x95\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c8\x22></span></span>",
+            "\xee\x95\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c8\x22></span></span>",
+            "\xf0\x9f\x93\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c9\x22></span></span>",
+            "\xf3\xbe\x95\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c9\x22></span></span>",
+            "\xee\x95\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4c9\x22></span></span>",
+            "\xf0\x9f\x93\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
+            "\xf3\xbe\x95\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
+            "\xee\x95\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ca\x22></span></span>",
+            "\xf0\x9f\x93\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cb\x22></span></span>",
+            "\xf3\xbe\x95\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cb\x22></span></span>",
+            "\xee\x95\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cb\x22></span></span>",
+            "\xf0\x9f\x93\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cc\x22></span></span>",
+            "\xf3\xbe\x95\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cc\x22></span></span>",
+            "\xee\x95\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cc\x22></span></span>",
+            "\xf0\x9f\x93\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cd\x22></span></span>",
+            "\xf3\xbe\x94\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cd\x22></span></span>",
+            "\xee\x95\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cd\x22></span></span>",
+            "\xf0\x9f\x93\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
+            "\xf3\xbe\x94\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
+            "\xee\x9c\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
+            "\xee\x92\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ce\x22></span></span>",
+            "\xf0\x9f\x93\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cf\x22></span></span>",
+            "\xf3\xbe\x95\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cf\x22></span></span>",
+            "\xee\x95\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4cf\x22></span></span>",
+            "\xf0\x9f\x93\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d0\x22></span></span>",
+            "\xf3\xbe\x95\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d0\x22></span></span>",
+            "\xee\x92\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d0\x22></span></span>",
+            "\xf0\x9f\x93\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d1\x22></span></span>",
+            "\xf3\xbe\x95\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d1\x22></span></span>",
+            "\xee\xac\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d1\x22></span></span>",
+            "\xf0\x9f\x93\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d2\x22></span></span>",
+            "\xf3\xbe\x95\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d2\x22></span></span>",
+            "\xee\x95\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d2\x22></span></span>",
+            "\xf0\x9f\x93\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d3\x22></span></span>",
+            "\xf3\xbe\x95\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d3\x22></span></span>",
+            "\xee\x95\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d3\x22></span></span>",
+            "\xf0\x9f\x93\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d4\x22></span></span>",
+            "\xf3\xbe\x95\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d4\x22></span></span>",
+            "\xee\x92\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d4\x22></span></span>",
+            "\xf0\x9f\x93\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d5\x22></span></span>",
+            "\xf3\xbe\x94\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d5\x22></span></span>",
+            "\xee\x95\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d5\x22></span></span>",
+            "\xf0\x9f\x93\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d6\x22></span></span>",
+            "\xf3\xbe\x95\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d6\x22></span></span>",
+            "\xee\x92\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d6\x22></span></span>",
+            "\xf0\x9f\x93\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d7\x22></span></span>",
+            "\xf3\xbe\x93\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d7\x22></span></span>",
+            "\xee\x95\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d7\x22></span></span>",
+            "\xf0\x9f\x93\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d8\x22></span></span>",
+            "\xf3\xbe\x94\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d8\x22></span></span>",
+            "\xee\x95\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d8\x22></span></span>",
+            "\xf0\x9f\x93\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d9\x22></span></span>",
+            "\xf3\xbe\x94\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d9\x22></span></span>",
+            "\xee\x95\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4d9\x22></span></span>",
+            "\xf0\x9f\x93\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
+            "\xf3\xbe\x94\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
+            "\xee\x95\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4da\x22></span></span>",
+            "\xf0\x9f\x93\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4db\x22></span></span>",
+            "\xf3\xbe\x94\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4db\x22></span></span>",
+            "\xee\x94\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fd\x22></span></span>",
+            "\xf0\x9f\x93\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
+            "\xf3\xbe\x93\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
+            "\xee\x95\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dc\x22></span></span>",
+            "\xf0\x9f\x93\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
+            "\xf3\xbe\x94\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
+            "\xee\xaa\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4dd\x22></span></span>",
+            "\xf0\x9f\x93\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
+            "\xf3\xbe\x94\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4de\x22></span></span>",
+            "\xf0\x9f\x93\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
+            "\xf3\xbe\x94\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
+            "\xee\x99\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
+            "\xee\x96\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4df\x22></span></span>",
+            "\xf0\x9f\x93\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
+            "\xf3\xbe\x94\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
+            "\xee\x9b\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
+            "\xee\x80\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e0\x22></span></span>",
+            "\xf0\x9f\x93\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
+            "\xf3\xbe\x94\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
+            "\xee\x85\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
+            "\xee\x92\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e1\x22></span></span>",
+            "\xf0\x9f\x93\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e2\x22></span></span>",
+            "\xf3\xbe\x94\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e2\x22></span></span>",
+            "\xee\x85\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e2\x22></span></span>",
+            "\xee\x94\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
+            "\xf0\x9f\x93\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e3\x22></span></span>",
+            "\xf3\xbe\x94\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e3\x22></span></span>",
+            "\xee\x8c\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e3\x22></span></span>",
+            "\xf0\x9f\x93\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e4\x22></span></span>",
+            "\xf3\xbe\x94\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e4\x22></span></span>",
+            "\xee\x96\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e4\x22></span></span>",
+            "\xf0\x9f\x93\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e5\x22></span></span>",
+            "\xf3\xbe\x94\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e5\x22></span></span>",
+            "\xee\x96\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e5\x22></span></span>",
+            "\xf0\x9f\x93\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
+            "\xf3\xbe\x94\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e6\x22></span></span>",
+            "\xf0\x9f\x93\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
+            "\xf3\xbe\xae\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
+            "\xee\xad\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e7\x22></span></span>",
+            "\xf0\x9f\x93\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e8\x22></span></span>",
+            "\xf3\xbe\x94\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e8\x22></span></span>",
+            "\xee\x9b\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
+            "\xee\x96\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e8\x22></span></span>",
+            "\xf0\x9f\x93\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
+            "\xf3\xbe\x94\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
+            "\xee\xad\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4e9\x22></span></span>",
+            "\xf0\x9f\x93\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ea\x22></span></span>",
+            "\xf3\xbe\x94\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ea\x22></span></span>",
+            "\xee\x84\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
+            "\xf0\x9f\x93\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
+            "\xf3\xbe\x94\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
+            "\xee\xac\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4eb\x22></span></span>",
+            "\xf0\x9f\x93\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ec\x22></span></span>",
+            "\xf0\x9f\x93\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ed\x22></span></span>",
+            "\xf0\x9f\x93\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
+            "\xf3\xbe\x94\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
+            "\xee\x84\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ee\x22></span></span>",
+            "\xf0\x9f\x93\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ef\x22></span></span>",
+            "\xf0\x9f\x93\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f0\x22></span></span>",
+            "\xf3\xbe\xa0\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f0\x22></span></span>",
+            "\xee\x96\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f0\x22></span></span>",
+            "\xf0\x9f\x93\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
+            "\xf3\xbe\x94\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
+            "\xee\x9a\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
+            "\xee\x80\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
+            "\xee\x96\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f1\x22></span></span>",
+            "\xf0\x9f\x93\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
+            "\xf3\xbe\x94\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
+            "\xee\x9b\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
+            "\xee\x84\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
+            "\xee\xac\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f2\x22></span></span>",
+            "\xf0\x9f\x93\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
+            "\xf3\xbe\xa0\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
+            "\xee\x89\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
+            "\xee\xaa\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f3\x22></span></span>",
+            "\xf0\x9f\x93\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
+            "\xf3\xbe\xa0\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
+            "\xee\x89\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
+            "\xee\xaa\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f4\x22></span></span>",
+            "\xf0\x9f\x93\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f5\x22></span></span>",
+            "\xf0\x9f\x93\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
+            "\xf3\xbe\xa0\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
+            "\xee\x88\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
+            "\xee\xaa\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f6\x22></span></span>",
+            "\xf0\x9f\x93\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
+            "\xf3\xbe\x93\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
+            "\xee\x9a\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
+            "\xee\x80\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f7\x22></span></span>",
+            "\xf0\x9f\x93\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f8\x22></span></span>",
+            "\xf0\x9f\x93\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
+            "\xf3\xbe\x93\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
+            "\xee\x95\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4f9\x22></span></span>",
+            "\xf0\x9f\x93\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
+            "\xf3\xbe\xa0\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
+            "\xee\x9a\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
+            "\xee\x84\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fa\x22></span></span>",
+            "\xf0\x9f\x93\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
+            "\xf3\xbe\xa0\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
+            "\xee\x84\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
+            "\xee\x96\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fb\x22></span></span>",
+            "\xf0\x9f\x93\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
+            "\xf3\xbe\xa0\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
+            "\xee\x84\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
+            "\xee\x96\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fc\x22></span></span>",
+            "\xf0\x9f\x93\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4fd\x22></span></span>",
+            "\xf0\x9f\x93\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f4ff\x22></span></span>",
+            "\xf0\x9f\x94\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f500\x22></span></span>",
+            "\xf0\x9f\x94\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f501\x22></span></span>",
+            "\xf0\x9f\x94\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f502\x22></span></span>",
+            "\xf0\x9f\x94\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
+            "\xf3\xbe\xae\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
+            "\xee\xac\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f503\x22></span></span>",
+            "\xf0\x9f\x94\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f504\x22></span></span>",
+            "\xf0\x9f\x94\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f505\x22></span></span>",
+            "\xf0\x9f\x94\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f506\x22></span></span>",
+            "\xf0\x9f\x94\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f507\x22></span></span>",
+            "\xf0\x9f\x94\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f508\x22></span></span>",
+            "\xf0\x9f\x94\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f509\x22></span></span>",
+            "\xf0\x9f\x94\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50a\x22></span></span>",
+            "\xf3\xbe\xa0\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50a\x22></span></span>",
+            "\xee\x85\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50a\x22></span></span>",
+            "\xf0\x9f\x94\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50b\x22></span></span>",
+            "\xf3\xbe\x93\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50b\x22></span></span>",
+            "\xee\x96\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50b\x22></span></span>",
+            "\xf0\x9f\x94\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50c\x22></span></span>",
+            "\xf3\xbe\x93\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50c\x22></span></span>",
+            "\xee\x96\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50c\x22></span></span>",
+            "\xf0\x9f\x94\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50d\x22></span></span>",
+            "\xf3\xbe\xae\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50d\x22></span></span>",
+            "\xee\x9b\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
+            "\xee\x84\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
+            "\xf0\x9f\x94\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
+            "\xf3\xbe\xae\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
+            "\xee\xac\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50e\x22></span></span>",
+            "\xf0\x9f\x94\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50f\x22></span></span>",
+            "\xf3\xbe\xae\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50f\x22></span></span>",
+            "\xee\x9b\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
+            "\xee\x85\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f512\x22></span></span>",
+            "\xee\xac\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f50f\x22></span></span>",
+            "\xf0\x9f\x94\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f510\x22></span></span>",
+            "\xf3\xbe\xae\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f510\x22></span></span>",
+            "\xee\xab\xbc"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f510\x22></span></span>",
+            "\xf0\x9f\x94\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
+            "\xf3\xbe\xae\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
+            "\xee\x80\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f511\x22></span></span>",
+            "\xf0\x9f\x94\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f512\x22></span></span>",
+            "\xf3\xbe\xae\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f512\x22></span></span>",
+            "\xf0\x9f\x94\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
+            "\xf3\xbe\xae\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
+            "\xee\x85\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f513\x22></span></span>",
+            "\xf0\x9f\x94\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
+            "\xf3\xbe\x93\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
+            "\xee\x9c\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
+            "\xee\x8c\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f514\x22></span></span>",
+            "\xee\x94\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
+            "\xf0\x9f\x94\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f515\x22></span></span>",
+            "\xf0\x9f\x94\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f516\x22></span></span>",
+            "\xf3\xbe\xae\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f516\x22></span></span>",
+            "\xee\xac\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f516\x22></span></span>",
+            "\xf0\x9f\x94\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f517\x22></span></span>",
+            "\xf3\xbe\xad\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f517\x22></span></span>",
+            "\xee\x96\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f517\x22></span></span>",
+            "\xf0\x9f\x94\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f518\x22></span></span>",
+            "\xf3\xbe\xae\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f518\x22></span></span>",
+            "\xee\xac\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f518\x22></span></span>",
+            "\xf0\x9f\x94\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
+            "\xf3\xbe\xae\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
+            "\xee\xac\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f519\x22></span></span>",
+            "\xf0\x9f\x94\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51a\x22></span></span>",
+            "\xf3\xbe\x80\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51a\x22></span></span>",
+            "\xee\x9a\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51a\x22></span></span>",
+            "\xf0\x9f\x94\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51b\x22></span></span>",
+            "\xf3\xbe\x80\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51b\x22></span></span>",
+            "\xee\x9a\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51b\x22></span></span>",
+            "\xf0\x9f\x94\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51c\x22></span></span>",
+            "\xf3\xbe\x80\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51c\x22></span></span>",
+            "\xee\x9a\xb7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51c\x22></span></span>",
+            "\xf0\x9f\x94\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51d\x22></span></span>",
+            "\xf3\xbe\xad\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51d\x22></span></span>",
+            "\xee\x89\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51d\x22></span></span>",
+            "\xf0\x9f\x94\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
+            "\xf3\xbe\xac\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
+            "\xee\x88\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
+            "\xee\xaa\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51e\x22></span></span>",
+            "\xf0\x9f\x94\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51f\x22></span></span>",
+            "\xf3\xbe\xa0\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f51f\x22></span></span>",
+            "\xf0\x9f\x94\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f520\x22></span></span>",
+            "\xf3\xbe\xad\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f520\x22></span></span>",
+            "\xee\xab\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f520\x22></span></span>",
+            "\xf0\x9f\x94\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f521\x22></span></span>",
+            "\xf3\xbe\xad\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f521\x22></span></span>",
+            "\xee\xab\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f521\x22></span></span>",
+            "\xf0\x9f\x94\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f522\x22></span></span>",
+            "\xf3\xbe\xad\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f522\x22></span></span>",
+            "\xee\xab\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f522\x22></span></span>",
+            "\xf0\x9f\x94\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f523\x22></span></span>",
+            "\xf3\xbe\xad\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f523\x22></span></span>",
+            "\xee\xac\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f523\x22></span></span>",
+            "\xf0\x9f\x94\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f524\x22></span></span>",
+            "\xf3\xbe\xae\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f524\x22></span></span>",
+            "\xee\xad\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f524\x22></span></span>",
+            "\xf0\x9f\x94\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
+            "\xf3\xbe\x93\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
+            "\xee\x84\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
+            "\xee\x91\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f525\x22></span></span>",
+            "\xf0\x9f\x94\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
+            "\xf3\xbe\x93\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
+            "\xee\x96\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f526\x22></span></span>",
+            "\xf0\x9f\x94\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
+            "\xf3\xbe\x93\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
+            "\xee\x9c\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
+            "\xee\x96\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f527\x22></span></span>",
+            "\xf0\x9f\x94\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
+            "\xf3\xbe\x93\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
+            "\xee\x84\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
+            "\xee\x97\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f528\x22></span></span>",
+            "\xf0\x9f\x94\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f529\x22></span></span>",
+            "\xf3\xbe\x93\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f529\x22></span></span>",
+            "\xee\x96\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f529\x22></span></span>",
+            "\xf0\x9f\x94\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52a\x22></span></span>",
+            "\xf3\xbe\x93\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52a\x22></span></span>",
+            "\xee\x95\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52a\x22></span></span>",
+            "\xf0\x9f\x94\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
+            "\xf3\xbe\x93\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
+            "\xee\x84\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
+            "\xee\x94\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52b\x22></span></span>",
+            "\xf0\x9f\x94\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52c\x22></span></span>",
+            "\xf0\x9f\x94\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52d\x22></span></span>",
+            "\xf0\x9f\x94\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52e\x22></span></span>",
+            "\xf3\xbe\x93\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52e\x22></span></span>",
+            "\xee\x88\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
+            "\xee\xaa\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
+            "\xf0\x9f\x94\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
+            "\xf3\xbe\x93\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f52f\x22></span></span>",
+            "\xf0\x9f\x94\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
+            "\xf3\xbe\x81\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
+            "\xee\x88\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
+            "\xee\x92\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f530\x22></span></span>",
+            "\xf0\x9f\x94\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
+            "\xf3\xbe\x93\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
+            "\xee\x80\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f531\x22></span></span>",
+            "\xf0\x9f\x94\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f532\x22></span></span>",
+            "\xf3\xbe\xad\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
+            "\xee\x95\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
+            "\xf0\x9f\x94\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f533\x22></span></span>",
+            "\xf3\xbe\xad\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f533\x22></span></span>",
+            "\xf0\x9f\x94\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
+            "\xf3\xbe\xad\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
+            "\xee\x95\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f534\x22></span></span>",
+            "\xf0\x9f\x94\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f535\x22></span></span>",
+            "\xf0\x9f\x94\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f536\x22></span></span>",
+            "\xf3\xbe\xad\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f536\x22></span></span>",
+            "\xee\x95\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f536\x22></span></span>",
+            "\xf0\x9f\x94\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f537\x22></span></span>",
+            "\xf3\xbe\xad\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f537\x22></span></span>",
+            "\xee\x95\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f537\x22></span></span>",
+            "\xf0\x9f\x94\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f538\x22></span></span>",
+            "\xf3\xbe\xad\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f538\x22></span></span>",
+            "\xf0\x9f\x94\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
+            "\xf3\xbe\xad\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f539\x22></span></span>",
+            "\xf0\x9f\x94\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53a\x22></span></span>",
+            "\xf3\xbe\xad\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53a\x22></span></span>",
+            "\xee\x95\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53a\x22></span></span>",
+            "\xf0\x9f\x94\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53b\x22></span></span>",
+            "\xf3\xbe\xad\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53b\x22></span></span>",
+            "\xee\x95\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53b\x22></span></span>",
+            "\xf0\x9f\x94\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53c\x22></span></span>",
+            "\xf3\xbe\xac\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53c\x22></span></span>",
+            "\xee\x95\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53c\x22></span></span>",
+            "\xf0\x9f\x94\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53d\x22></span></span>",
+            "\xf3\xbe\xac\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53d\x22></span></span>",
+            "\xee\x95\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f53d\x22></span></span>",
+            "\xf0\x9f\x95\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f549\x22></span></span>",
+            "\xf0\x9f\x95\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54a\x22></span></span>",
+            "\xf0\x9f\x95\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54b\x22></span></span>",
+            "\xf0\x9f\x95\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54c\x22></span></span>",
+            "\xf0\x9f\x95\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54d\x22></span></span>",
+            "\xf0\x9f\x95\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f54e\x22></span></span>",
+            "\xf0\x9f\x95\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f550\x22></span></span>",
+            "\xf3\xbe\x80\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f550\x22></span></span>",
+            "\xee\x80\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f550\x22></span></span>",
+            "\xf0\x9f\x95\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f551\x22></span></span>",
+            "\xf3\xbe\x80\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f551\x22></span></span>",
+            "\xee\x80\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f551\x22></span></span>",
+            "\xf0\x9f\x95\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f552\x22></span></span>",
+            "\xf3\xbe\x80\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f552\x22></span></span>",
+            "\xee\x80\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f552\x22></span></span>",
+            "\xf0\x9f\x95\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f553\x22></span></span>",
+            "\xf3\xbe\x80\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f553\x22></span></span>",
+            "\xee\x80\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f553\x22></span></span>",
+            "\xf0\x9f\x95\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f554\x22></span></span>",
+            "\xf3\xbe\x80\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f554\x22></span></span>",
+            "\xee\x80\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f554\x22></span></span>",
+            "\xf0\x9f\x95\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f555\x22></span></span>",
+            "\xf3\xbe\x80\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f555\x22></span></span>",
+            "\xee\x80\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f555\x22></span></span>",
+            "\xf0\x9f\x95\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f556\x22></span></span>",
+            "\xf3\xbe\x80\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f556\x22></span></span>",
+            "\xee\x80\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f556\x22></span></span>",
+            "\xf0\x9f\x95\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f557\x22></span></span>",
+            "\xf3\xbe\x80\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f557\x22></span></span>",
+            "\xee\x80\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f557\x22></span></span>",
+            "\xf0\x9f\x95\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f558\x22></span></span>",
+            "\xf3\xbe\x80\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f558\x22></span></span>",
+            "\xee\x80\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f558\x22></span></span>",
+            "\xf0\x9f\x95\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f559\x22></span></span>",
+            "\xf3\xbe\x80\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f559\x22></span></span>",
+            "\xf0\x9f\x95\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55a\x22></span></span>",
+            "\xf3\xbe\x80\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55a\x22></span></span>",
+            "\xee\x80\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55a\x22></span></span>",
+            "\xf0\x9f\x95\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
+            "\xf3\xbe\x80\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
+            "\xee\x80\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55b\x22></span></span>",
+            "\xf0\x9f\x95\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55c\x22></span></span>",
+            "\xf0\x9f\x95\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55d\x22></span></span>",
+            "\xf0\x9f\x95\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55e\x22></span></span>",
+            "\xf0\x9f\x95\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f55f\x22></span></span>",
+            "\xf0\x9f\x95\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f560\x22></span></span>",
+            "\xf0\x9f\x95\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f561\x22></span></span>",
+            "\xf0\x9f\x95\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f562\x22></span></span>",
+            "\xf0\x9f\x95\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f563\x22></span></span>",
+            "\xf0\x9f\x95\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f564\x22></span></span>",
+            "\xf0\x9f\x95\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f565\x22></span></span>",
+            "\xf0\x9f\x95\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f566\x22></span></span>",
+            "\xf0\x9f\x95\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f567\x22></span></span>",
+            "\xf0\x9f\x95\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f56f\x22></span></span>",
+            "\xf0\x9f\x95\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f570\x22></span></span>",
+            "\xf0\x9f\x95\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f573\x22></span></span>",
+            "\xf0\x9f\x95\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f574\x22></span></span>",
+            "\xf0\x9f\x95\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f575\x22></span></span>",
+            "\xf0\x9f\x95\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f576\x22></span></span>",
+            "\xf0\x9f\x95\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f577\x22></span></span>",
+            "\xf0\x9f\x95\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f578\x22></span></span>",
+            "\xf0\x9f\x95\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f579\x22></span></span>",
+            "\xf0\x9f\x96\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f587\x22></span></span>",
+            "\xf0\x9f\x96\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58a\x22></span></span>",
+            "\xf0\x9f\x96\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58b\x22></span></span>",
+            "\xf0\x9f\x96\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58c\x22></span></span>",
+            "\xf0\x9f\x96\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f58d\x22></span></span>",
+            "\xf0\x9f\x96\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f590\x22></span></span>",
+            "\xf0\x9f\x96\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f595\x22></span></span>",
+            "\xf0\x9f\x96\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f596\x22></span></span>",
+            "\xf0\x9f\x96\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5a5\x22></span></span>",
+            "\xf0\x9f\x96\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5a8\x22></span></span>",
+            "\xf0\x9f\x96\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5b1\x22></span></span>",
+            "\xf0\x9f\x96\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5b2\x22></span></span>",
+            "\xf0\x9f\x96\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5bc\x22></span></span>",
+            "\xf0\x9f\x97\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5c2\x22></span></span>",
+            "\xf0\x9f\x97\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5c3\x22></span></span>",
+            "\xf0\x9f\x97\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5c4\x22></span></span>",
+            "\xf0\x9f\x97\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5d1\x22></span></span>",
+            "\xf0\x9f\x97\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5d2\x22></span></span>",
+            "\xf0\x9f\x97\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5d3\x22></span></span>",
+            "\xf0\x9f\x97\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5dc\x22></span></span>",
+            "\xf0\x9f\x97\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5dd\x22></span></span>",
+            "\xf0\x9f\x97\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5de\x22></span></span>",
+            "\xf0\x9f\x97\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5e1\x22></span></span>",
+            "\xf0\x9f\x97\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5e3\x22></span></span>",
+            "\xf0\x9f\x97\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5e8\x22></span></span>",
+            "\xf0\x9f\x97\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ef\x22></span></span>",
+            "\xf0\x9f\x97\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5f3\x22></span></span>",
+            "\xf0\x9f\x97\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fa\x22></span></span>",
+            "\xf0\x9f\x97\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
+            "\xf3\xbe\x93\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
+            "\xee\x9d\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
+            "\xee\x80\xbb"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
+            "\xee\x96\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fb\x22></span></span>",
+            "\xf0\x9f\x97\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
+            "\xf3\xbe\x93\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
+            "\xee\x93\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fc\x22></span></span>",
+            "\xf0\x9f\x97\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fd\x22></span></span>",
+            "\xf3\xbe\x93\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fd\x22></span></span>",
+            "\xf0\x9f\x97\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fe\x22></span></span>",
+            "\xf3\xbe\x93\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fe\x22></span></span>",
+            "\xee\x95\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5fe\x22></span></span>",
+            "\xf0\x9f\x97\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ff\x22></span></span>",
+            "\xf3\xbe\x93\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ff\x22></span></span>",
+            "\xee\xad\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f5ff\x22></span></span>",
+            "\xf0\x9f\x98\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f600\x22></span></span>",
+            "\xf0\x9f\x98\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f601\x22></span></span>",
+            "\xf3\xbe\x8c\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f601\x22></span></span>",
+            "\xee\x9d\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
+            "\xee\x90\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
+            "\xee\xae\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f601\x22></span></span>",
+            "\xf0\x9f\x98\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f602\x22></span></span>",
+            "\xf3\xbe\x8c\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f602\x22></span></span>",
+            "\xee\x9c\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
+            "\xee\x90\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
+            "\xee\xad\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f602\x22></span></span>",
+            "\xf0\x9f\x98\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f603\x22></span></span>",
+            "\xf3\xbe\x8c\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f603\x22></span></span>",
+            "\xee\x81\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
+            "\xee\x91\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
+            "\xf0\x9f\x98\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
+            "\xf3\xbe\x8c\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
+            "\xee\x90\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f604\x22></span></span>",
+            "\xf0\x9f\x98\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
+            "\xf3\xbe\x8c\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
+            "\xee\x9c\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
+            "\xee\x90\x95\xee\x8c\xb1"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
+            "\xee\x91\xb1\xee\x96\xb1"                                                                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f605\x22></span></span>",
+            "\xf0\x9f\x98\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f606\x22></span></span>",
+            "\xf3\xbe\x8c\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f606\x22></span></span>",
+            "\xee\x90\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
+            "\xee\xab\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
+            "\xf0\x9f\x98\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f607\x22></span></span>",
+            "\xf0\x9f\x98\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f608\x22></span></span>",
+            "\xf0\x9f\x98\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
+            "\xf3\xbe\x8d\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
+            "\xee\x9c\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
+            "\xee\x90\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
+            "\xee\x97\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f609\x22></span></span>",
+            "\xf0\x9f\x98\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60a\x22></span></span>",
+            "\xf3\xbe\x8c\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60a\x22></span></span>",
+            "\xee\x81\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
+            "\xee\xab\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
+            "\xf0\x9f\x98\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
+            "\xf3\xbe\x8c\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
+            "\xee\x9d\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60b\x22></span></span>",
+            "\xf0\x9f\x98\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
+            "\xf3\xbe\x8c\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
+            "\xee\x9c\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60c\x22></span></span>",
+            "\xf0\x9f\x98\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60d\x22></span></span>",
+            "\xf3\xbe\x8c\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60d\x22></span></span>",
+            "\xee\x9c\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
+            "\xee\x84\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
+            "\xee\x97\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60d\x22></span></span>",
+            "\xf0\x9f\x98\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60e\x22></span></span>",
+            "\xf0\x9f\x98\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
+            "\xf3\xbe\x8d\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
+            "\xee\x9c\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
+            "\xee\x90\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
+            "\xee\xaa\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f60f\x22></span></span>",
+            "\xf0\x9f\x98\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f610\x22></span></span>",
+            "\xf0\x9f\x98\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f611\x22></span></span>",
+            "\xf0\x9f\x98\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
+            "\xf3\xbe\x8c\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
+            "\xee\x9c\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
+            "\xee\x90\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
+            "\xee\xab\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f612\x22></span></span>",
+            "\xf0\x9f\x98\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f613\x22></span></span>",
+            "\xf3\xbe\x8d\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f613\x22></span></span>",
+            "\xee\x9c\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
+            "\xee\x84\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f613\x22></span></span>",
+            "\xee\x97\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
+            "\xf0\x9f\x98\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f614\x22></span></span>",
+            "\xf3\xbe\x8d\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f614\x22></span></span>",
+            "\xee\x9c\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f614\x22></span></span>",
+            "\xee\x90\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
+            "\xee\xab\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
+            "\xf0\x9f\x98\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f615\x22></span></span>",
+            "\xf0\x9f\x98\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
+            "\xf3\xbe\x8c\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
+            "\xee\x9b\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
+            "\xee\xab\x83"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f616\x22></span></span>",
+            "\xf0\x9f\x98\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f617\x22></span></span>",
+            "\xf0\x9f\x98\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f618\x22></span></span>",
+            "\xf3\xbe\x8c\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f618\x22></span></span>",
+            "\xee\x90\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
+            "\xee\xab\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f618\x22></span></span>",
+            "\xf0\x9f\x98\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f619\x22></span></span>",
+            "\xf0\x9f\x98\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
+            "\xf3\xbe\x8c\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
+            "\xee\x90\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
+            "\xee\xab\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61a\x22></span></span>",
+            "\xf0\x9f\x98\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61b\x22></span></span>",
+            "\xf0\x9f\x98\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61c\x22></span></span>",
+            "\xf3\xbe\x8c\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61c\x22></span></span>",
+            "\xee\x84\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61c\x22></span></span>",
+            "\xee\x93\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
+            "\xf0\x9f\x98\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
+            "\xf3\xbe\x8c\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61d\x22></span></span>",
+            "\xf0\x9f\x98\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
+            "\xf3\xbe\x8c\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
+            "\xee\x9b\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
+            "\xee\x81\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61e\x22></span></span>",
+            "\xf0\x9f\x98\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f61f\x22></span></span>",
+            "\xf0\x9f\x98\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
+            "\xf3\xbe\x8c\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
+            "\xee\x9b\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
+            "\xee\x81\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
+            "\xee\x91\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f620\x22></span></span>",
+            "\xf0\x9f\x98\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f621\x22></span></span>",
+            "\xf3\xbe\x8c\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f621\x22></span></span>",
+            "\xee\x9c\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
+            "\xee\x90\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
+            "\xee\xad\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f621\x22></span></span>",
+            "\xf0\x9f\x98\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f622\x22></span></span>",
+            "\xf3\xbe\x8c\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f622\x22></span></span>",
+            "\xee\x9c\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
+            "\xee\x90\x93"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
+            "\xee\xad\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f622\x22></span></span>",
+            "\xf0\x9f\x98\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f623\x22></span></span>",
+            "\xf3\xbe\x8c\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f623\x22></span></span>",
+            "\xee\x9c\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
+            "\xee\x90\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
+            "\xee\xab\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f623\x22></span></span>",
+            "\xf0\x9f\x98\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f624\x22></span></span>",
+            "\xf3\xbe\x8c\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f624\x22></span></span>",
+            "\xee\xab\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f624\x22></span></span>",
+            "\xf0\x9f\x98\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
+            "\xf3\xbe\x8d\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
+            "\xee\x90\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f625\x22></span></span>",
+            "\xf0\x9f\x98\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f626\x22></span></span>",
+            "\xf0\x9f\x98\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f627\x22></span></span>",
+            "\xf0\x9f\x98\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
+            "\xf3\xbe\x8c\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
+            "\xee\x9d\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
+            "\xee\x90\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
+            "\xee\xab\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f628\x22></span></span>",
+            "\xf0\x9f\x98\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f629\x22></span></span>",
+            "\xf3\xbe\x8c\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f629\x22></span></span>",
+            "\xee\xad\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f629\x22></span></span>",
+            "\xf0\x9f\x98\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
+            "\xf3\xbe\x8d\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
+            "\xee\x90\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
+            "\xee\xab\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62a\x22></span></span>",
+            "\xf0\x9f\x98\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
+            "\xf3\xbe\x8d\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
+            "\xee\x91\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62b\x22></span></span>",
+            "\xf0\x9f\x98\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62c\x22></span></span>",
+            "\xf0\x9f\x98\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
+            "\xf3\xbe\x8c\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
+            "\xee\x9c\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
+            "\xee\x90\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
+            "\xee\x91\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62d\x22></span></span>",
+            "\xf0\x9f\x98\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62e\x22></span></span>",
+            "\xf0\x9f\x98\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f62f\x22></span></span>",
+            "\xf0\x9f\x98\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
+            "\xf3\xbe\x8c\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
+            "\xee\x90\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
+            "\xee\xab\x8b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f630\x22></span></span>",
+            "\xf0\x9f\x98\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
+            "\xf3\xbe\x8d\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
+            "\xee\x84\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
+            "\xee\x97\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f631\x22></span></span>",
+            "\xf0\x9f\x98\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
+            "\xf3\xbe\x8c\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
+            "\xee\x9b\xb4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
+            "\xee\x90\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
+            "\xee\xab\x8a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f632\x22></span></span>",
+            "\xf0\x9f\x98\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
+            "\xf3\xbe\x8c\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
+            "\xee\x90\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
+            "\xee\xab\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f633\x22></span></span>",
+            "\xf0\x9f\x98\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f634\x22></span></span>",
+            "\xf0\x9f\x98\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
+            "\xf3\xbe\x8c\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
+            "\xee\x96\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f635\x22></span></span>",
+            "\xf0\x9f\x98\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f636\x22></span></span>",
+            "\xf0\x9f\x98\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
+            "\xf3\xbe\x8c\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
+            "\xee\x90\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
+            "\xee\xab\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f637\x22></span></span>",
+            "\xf0\x9f\x98\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f638\x22></span></span>",
+            "\xf3\xbe\x8d\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f638\x22></span></span>",
+            "\xee\xad\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f638\x22></span></span>",
+            "\xf0\x9f\x98\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
+            "\xf3\xbe\x8d\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
+            "\xee\xad\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f639\x22></span></span>",
+            "\xf0\x9f\x98\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
+            "\xf3\xbe\x8d\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
+            "\xee\xad\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63a\x22></span></span>",
+            "\xf0\x9f\x98\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
+            "\xf3\xbe\x8d\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
+            "\xee\xad\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63b\x22></span></span>",
+            "\xf0\x9f\x98\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
+            "\xf3\xbe\x8d\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
+            "\xee\xad\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63c\x22></span></span>",
+            "\xf0\x9f\x98\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
+            "\xf3\xbe\x8d\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
+            "\xee\xad\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63d\x22></span></span>",
+            "\xf0\x9f\x98\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
+            "\xf3\xbe\x8d\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
+            "\xee\xad\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63e\x22></span></span>",
+            "\xf0\x9f\x98\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
+            "\xf3\xbe\x8d\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
+            "\xee\xad\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f63f\x22></span></span>",
+            "\xf0\x9f\x99\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f640\x22></span></span>",
+            "\xf3\xbe\x8d\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f640\x22></span></span>",
+            "\xee\xad\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f640\x22></span></span>",
+            "\xf0\x9f\x99\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f641\x22></span></span>",
+            "\xf0\x9f\x99\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f642\x22></span></span>",
+            "\xf0\x9f\x99\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f643\x22></span></span>",
+            "\xf0\x9f\x99\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f644\x22></span></span>",
+            "\xf0\x9f\x99\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
+            "\xf3\xbe\x8d\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
+            "\xee\x90\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
+            "\xee\xab\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f645\x22></span></span>",
+            "\xf0\x9f\x99\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
+            "\xf3\xbe\x8d\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
+            "\xee\x90\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
+            "\xee\xab\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f646\x22></span></span>",
+            "\xf0\x9f\x99\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
+            "\xf3\xbe\x8d\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
+            "\xee\x90\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
+            "\xee\xab\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f647\x22></span></span>",
+            "\xf0\x9f\x99\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f648\x22></span></span>",
+            "\xf3\xbe\x8d\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f648\x22></span></span>",
+            "\xee\xad\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f648\x22></span></span>",
+            "\xf0\x9f\x99\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f649\x22></span></span>",
+            "\xf3\xbe\x8d\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f649\x22></span></span>",
+            "\xee\xad\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f649\x22></span></span>",
+            "\xf0\x9f\x99\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64a\x22></span></span>",
+            "\xf3\xbe\x8d\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64a\x22></span></span>",
+            "\xee\xad\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64a\x22></span></span>",
+            "\xf0\x9f\x99\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
+            "\xf3\xbe\x8d\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
+            "\xee\xae\x85"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64b\x22></span></span>",
+            "\xf0\x9f\x99\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
+            "\xf3\xbe\x8d\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
+            "\xee\x90\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
+            "\xee\xae\x86"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64c\x22></span></span>",
+            "\xf0\x9f\x99\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
+            "\xf3\xbe\x8d\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
+            "\xee\xae\x87"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64d\x22></span></span>",
+            "\xf0\x9f\x99\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
+            "\xf3\xbe\x8d\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
+            "\xee\xae\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64e\x22></span></span>",
+            "\xf0\x9f\x99\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
+            "\xf3\xbe\x8d\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
+            "\xee\x90\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
+            "\xee\xab\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f64f\x22></span></span>",
+            "\xf0\x9f\x9a\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
+            "\xf3\xbe\x9f\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
+            "\xee\x84\x8d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
+            "\xee\x97\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f680\x22></span></span>",
+            "\xf0\x9f\x9a\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f681\x22></span></span>",
+            "\xf0\x9f\x9a\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f682\x22></span></span>",
+            "\xf0\x9f\x9a\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
+            "\xf3\xbe\x9f\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
+            "\xee\x99\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
+            "\xee\x80\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
+            "\xee\x92\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f683\x22></span></span>",
+            "\xf0\x9f\x9a\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f684\x22></span></span>",
+            "\xf3\xbe\x9f\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f684\x22></span></span>",
+            "\xee\x99\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
+            "\xee\x90\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f684\x22></span></span>",
+            "\xee\x92\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
+            "\xf0\x9f\x9a\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
+            "\xf3\xbe\x9f\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
+            "\xee\x80\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f685\x22></span></span>",
+            "\xf0\x9f\x9a\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f686\x22></span></span>",
+            "\xf0\x9f\x9a\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
+            "\xf3\xbe\x9f\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f687\x22></span></span>",
+            "\xf0\x9f\x9a\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f688\x22></span></span>",
+            "\xf0\x9f\x9a\x89"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
+            "\xf3\xbe\x9f\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
+            "\xee\x80\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
+            "\xee\xad\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f689\x22></span></span>",
+            "\xf0\x9f\x9a\x8a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68a\x22></span></span>",
+            "\xf0\x9f\x9a\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68b\x22></span></span>",
+            "\xf0\x9f\x9a\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
+            "\xf3\xbe\x9f\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
+            "\xee\x99\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
+            "\xee\x85\x99"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
+            "\xee\x92\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68c\x22></span></span>",
+            "\xf0\x9f\x9a\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68d\x22></span></span>",
+            "\xf0\x9f\x9a\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68e\x22></span></span>",
+            "\xf0\x9f\x9a\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
+            "\xf3\xbe\x9f\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
+            "\xee\x85\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
+            "\xee\x92\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f68f\x22></span></span>",
+            "\xf0\x9f\x9a\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f690\x22></span></span>",
+            "\xf0\x9f\x9a\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
+            "\xf3\xbe\x9f\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
+            "\xee\x90\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
+            "\xee\xab\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f691\x22></span></span>",
+            "\xf0\x9f\x9a\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
+            "\xf3\xbe\x9f\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
+            "\xee\x90\xb0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
+            "\xee\xab\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f692\x22></span></span>",
+            "\xf0\x9f\x9a\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f693\x22></span></span>",
+            "\xf3\xbe\x9f\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f693\x22></span></span>",
+            "\xee\x90\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
+            "\xee\xab\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f693\x22></span></span>",
+            "\xf0\x9f\x9a\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f694\x22></span></span>",
+            "\xf0\x9f\x9a\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f695\x22></span></span>",
+            "\xf3\xbe\x9f\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f695\x22></span></span>",
+            "\xee\x99\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
+            "\xee\x85\x9a"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f695\x22></span></span>",
+            "\xee\x92\xb1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
+            "\xf0\x9f\x9a\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f696\x22></span></span>",
+            "\xf0\x9f\x9a\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
+            "\xf3\xbe\x9f\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
+            "\xee\x80\x9b"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f697\x22></span></span>",
+            "\xf0\x9f\x9a\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f698\x22></span></span>",
+            "\xf0\x9f\x9a\x99"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
+            "\xf3\xbe\x9f\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
+            "\xee\x99\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
+            "\xee\x90\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f699\x22></span></span>",
+            "\xf0\x9f\x9a\x9a"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
+            "\xf3\xbe\x9f\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
+            "\xee\x90\xaf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
+            "\xee\x92\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69a\x22></span></span>",
+            "\xf0\x9f\x9a\x9b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69b\x22></span></span>",
+            "\xf0\x9f\x9a\x9c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69c\x22></span></span>",
+            "\xf0\x9f\x9a\x9d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69d\x22></span></span>",
+            "\xf0\x9f\x9a\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69e\x22></span></span>",
+            "\xf0\x9f\x9a\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f69f\x22></span></span>",
+            "\xf0\x9f\x9a\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a0\x22></span></span>",
+            "\xf0\x9f\x9a\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a1\x22></span></span>",
+            "\xf0\x9f\x9a\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
+            "\xf3\xbe\x9f\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
+            "\xee\xaa\x82"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a2\x22></span></span>",
+            "\xf0\x9f\x9a\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a3\x22></span></span>",
+            "\xf0\x9f\x9a\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
+            "\xf3\xbe\x9f\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
+            "\xee\x84\xb5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a4\x22></span></span>",
+            "\xf0\x9f\x9a\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
+            "\xf3\xbe\x9f\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
+            "\xee\x99\xad"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
+            "\xee\x85\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
+            "\xee\x91\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a5\x22></span></span>",
+            "\xf0\x9f\x9a\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a6\x22></span></span>",
+            "\xf0\x9f\x9a\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
+            "\xf3\xbe\x9f\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
+            "\xee\x97\x97"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a7\x22></span></span>",
+            "\xf0\x9f\x9a\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
+            "\xf3\xbe\x9f\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
+            "\xee\xad\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a8\x22></span></span>",
+            "\xf0\x9f\x9a\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
+            "\xf3\xbe\xac\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
+            "\xee\x9b\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
+            "\xee\xac\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6a9\x22></span></span>",
+            "\xf0\x9f\x9a\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6aa\x22></span></span>",
+            "\xf3\xbe\x93\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6aa\x22></span></span>",
+            "\xee\x9c\x94"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6aa\x22></span></span>",
+            "\xf0\x9f\x9a\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
+            "\xf3\xbe\xad\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
+            "\xee\x95\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ab\x22></span></span>",
+            "\xf0\x9f\x9a\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
+            "\xf3\xbe\xac\x9e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
+            "\xee\x99\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
+            "\xee\x8c\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
+            "\xee\x91\xbd"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ac\x22></span></span>",
+            "\xf0\x9f\x9a\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
+            "\xf3\xbe\xac\x9f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
+            "\xee\x9a\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
+            "\xee\x88\x88"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
+            "\xee\x91\xbe"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ad\x22></span></span>",
+            "\xf0\x9f\x9a\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ae\x22></span></span>",
+            "\xf0\x9f\x9a\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6af\x22></span></span>",
+            "\xf0\x9f\x9a\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b0\x22></span></span>",
+            "\xf0\x9f\x9a\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b1\x22></span></span>",
+            "\xf0\x9f\x9a\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
+            "\xf3\xbe\x9f\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
+            "\xee\x9c\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
+            "\xee\x84\xb6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
+            "\xee\x92\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b2\x22></span></span>",
+            "\xf0\x9f\x9a\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b3\x22></span></span>",
+            "\xf0\x9f\x9a\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b4\x22></span></span>",
+            "\xf0\x9f\x9a\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b5\x22></span></span>",
+            "\xf0\x9f\x9a\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
+            "\xf3\xbe\x9f\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
+            "\xee\x88\x81"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
+            "\xee\xad\xb2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b6\x22></span></span>",
+            "\xf0\x9f\x9a\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b7\x22></span></span>",
+            "\xf0\x9f\x9a\xb8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b8\x22></span></span>",
+            "\xf0\x9f\x9a\xb9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b9\x22></span></span>",
+            "\xf3\xbe\xac\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b9\x22></span></span>",
+            "\xee\x84\xb8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6b9\x22></span></span>",
+            "\xf0\x9f\x9a\xba"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ba\x22></span></span>",
+            "\xf3\xbe\xac\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ba\x22></span></span>",
+            "\xee\x84\xb9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ba\x22></span></span>",
+            "\xf0\x9f\x9a\xbb"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bb\x22></span></span>",
+            "\xf3\xbe\x94\x86"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bb\x22></span></span>",
+            "\xee\x99\xae"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
+            "\xee\x85\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bb\x22></span></span>",
+            "\xee\x92\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
+            "\xf0\x9f\x9a\xbc"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
+            "\xf3\xbe\xac\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
+            "\xee\x84\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bc\x22></span></span>",
+            "\xf0\x9f\x9a\xbd"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bd\x22></span></span>",
+            "\xf3\xbe\x94\x87"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bd\x22></span></span>",
+            "\xee\x85\x80"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bd\x22></span></span>",
+            "\xf0\x9f\x9a\xbe"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
+            "\xf3\xbe\x94\x88"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
+            "\xee\x8c\x89"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6be\x22></span></span>",
+            "\xf0\x9f\x9a\xbf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6bf\x22></span></span>",
+            "\xf0\x9f\x9b\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
+            "\xf3\xbe\x94\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
+            "\xee\x84\xbf"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
+            "\xee\x97\x98"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c0\x22></span></span>",
+            "\xf0\x9f\x9b\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c1\x22></span></span>",
+            "\xf0\x9f\x9b\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c2\x22></span></span>",
+            "\xf0\x9f\x9b\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c3\x22></span></span>",
+            "\xf0\x9f\x9b\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c4\x22></span></span>",
+            "\xf0\x9f\x9b\x85"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6c5\x22></span></span>",
+            "\xf0\x9f\x9b\x8b"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cb\x22></span></span>",
+            "\xf0\x9f\x9b\x8c"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cc\x22></span></span>",
+            "\xf0\x9f\x9b\x8d"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cd\x22></span></span>",
+            "\xf0\x9f\x9b\x8e"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ce\x22></span></span>",
+            "\xf0\x9f\x9b\x8f"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6cf\x22></span></span>",
+            "\xf0\x9f\x9b\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6d0\x22></span></span>",
+            "\xf0\x9f\x9b\xa0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e0\x22></span></span>",
+            "\xf0\x9f\x9b\xa1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e1\x22></span></span>",
+            "\xf0\x9f\x9b\xa2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e2\x22></span></span>",
+            "\xf0\x9f\x9b\xa3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e3\x22></span></span>",
+            "\xf0\x9f\x9b\xa4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e4\x22></span></span>",
+            "\xf0\x9f\x9b\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e5\x22></span></span>",
+            "\xf0\x9f\x9b\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6e9\x22></span></span>",
+            "\xf0\x9f\x9b\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6eb\x22></span></span>",
+            "\xf0\x9f\x9b\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6ec\x22></span></span>",
+            "\xf0\x9f\x9b\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6f0\x22></span></span>",
+            "\xf0\x9f\x9b\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f6f3\x22></span></span>",
+            "\xf0\x9f\xa4\x90"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f910\x22></span></span>",
+            "\xf0\x9f\xa4\x91"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f911\x22></span></span>",
+            "\xf0\x9f\xa4\x92"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f912\x22></span></span>",
+            "\xf0\x9f\xa4\x93"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f913\x22></span></span>",
+            "\xf0\x9f\xa4\x94"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f914\x22></span></span>",
+            "\xf0\x9f\xa4\x95"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f915\x22></span></span>",
+            "\xf0\x9f\xa4\x96"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f916\x22></span></span>",
+            "\xf0\x9f\xa4\x97"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f917\x22></span></span>",
+            "\xf0\x9f\xa4\x98"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f918\x22></span></span>",
+            "\xf0\x9f\xa6\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f980\x22></span></span>",
+            "\xf0\x9f\xa6\x81"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f981\x22></span></span>",
+            "\xf0\x9f\xa6\x82"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f982\x22></span></span>",
+            "\xf0\x9f\xa6\x83"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f983\x22></span></span>",
+            "\xf0\x9f\xa6\x84"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f984\x22></span></span>",
+            "\xf0\x9f\xa7\x80"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f9c0\x22></span></span>",
+            "#\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
+            "\xf3\xbe\xa0\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
+            "\xee\x9b\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
+            "\xee\x88\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
+            "\xee\xae\x84"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
+            "#\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2320e3\x22></span></span>",
+            "*\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji2a20e3\x22></span></span>",
+            "0\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
+            "\xee\x9b\xab"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
+            "\xee\x88\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
+            "\xee\x96\xac"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
+            "0\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3020e3\x22></span></span>",
+            "1\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
+            "\xf3\xbe\xa0\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
+            "\xee\x9b\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
+            "\xee\x88\x9c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
+            "1\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3120e3\x22></span></span>",
+            "2\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
+            "\xf3\xbe\xa0\xaf"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
+            "\xee\x9b\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
+            "\xee\x88\x9d"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
+            "2\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3220e3\x22></span></span>",
+            "3\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb0"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
+            "\xee\x9b\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
+            "\xee\x88\x9e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
+            "3\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3320e3\x22></span></span>",
+            "4\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb1"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
+            "\xee\x9b\xa5"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
+            "\xee\x88\x9f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
+            "4\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3420e3\x22></span></span>",
+            "5\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb2"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
+            "\xee\x9b\xa6"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
+            "\xee\x88\xa0"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
+            "5\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3520e3\x22></span></span>",
+            "6\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb3"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
+            "\xee\x9b\xa7"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
+            "\xee\x88\xa1"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
+            "6\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3620e3\x22></span></span>",
+            "7\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb4"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
+            "\xee\x9b\xa8"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
+            "\xee\x88\xa2"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
+            "7\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3720e3\x22></span></span>",
+            "8\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
+            "\xee\x9b\xa9"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
+            "\xee\x88\xa3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
+            "8\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3820e3\x22></span></span>",
+            "9\xe2\x83\xa3"                                                                                                => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
+            "\xf3\xbe\xa0\xb6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
+            "\xee\x9b\xaa"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
+            "\xee\x88\xa4"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
+            "9\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji3920e3\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f6\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbd"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1fd\x22></span></span>",
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e61f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1e7\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ef\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f6\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbb"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1fb\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e71f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
+            "\xf3\xbe\x93\xad"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
+            "\xee\xac\x91"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb5"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f5\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbb"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fb\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbd"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fd\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e81f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
+            "\xf3\xbe\x93\xa8"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
+            "\xee\xac\x8e"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ef\x22></span></span>",
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1e91f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
+            "\xf3\xbe\x93\xab"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
+            "\xee\x97\x95"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ea1f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xaf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1ef\x22></span></span>",
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
+            "\xf3\xbe\x93\xa7"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
+            "\xee\xab\xba"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1eb1f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
+            "\xf3\xbe\x93\xaa"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
+            "\xee\xac\x90"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e7\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb5"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f5\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f6\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ec1f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ed1f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f6\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
+            "\xf3\xbe\x93\xa9"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
+            "\xee\xac\x8f"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ee1f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
+            "\xf3\xbe\x93\xa5"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
+            "\xee\x93\x8c"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ef1f1f5\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb5"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f5\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
+            "\xf3\xbe\x93\xae"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
+            "\xee\xac\x92"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f01f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1e7\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbb"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1fb\x22></span></span>",
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f11f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb5"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f5\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f6\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbb"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fb\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbd"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fd\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f21f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb5"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f5\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f31f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xb4\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f41f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f51f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xb6\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f61f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
+            "\xf3\xbe\x93\xac"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
+            "\xee\x97\x96"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f71f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e7\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ef\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbb"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1fb\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbd"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1fd\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f81f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1e9\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xad"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ed\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xaf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ef\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb1"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f1\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb4"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f4\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb7"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f7\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbb"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1fb\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1fc\x22></span></span>",
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1f91f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
+            "\xf3\xbe\x93\xa6"                                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
+            "\xee\x95\xb3"                                                                                                 => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbe"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1fe\x22></span></span>",
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbf"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fa1f1ff\x22></span></span>",
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1e8\x22></span></span>",
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xac"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1ec\x22></span></span>",
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xae"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1ee\x22></span></span>",
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xb3"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1f3\x22></span></span>",
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xba"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fb1f1fa\x22></span></span>",
+            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xab"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fc1f1eb\x22></span></span>",
+            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xb8"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fc1f1f8\x22></span></span>",
+            "\xf0\x9f\x87\xbd\xf0\x9f\x87\xb0"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fd1f1f0\x22></span></span>",
+            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xaa"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fe1f1ea\x22></span></span>",
+            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xb9"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1fe1f1f9\x22></span></span>",
+            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xa6"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ff1f1e6\x22></span></span>",
+            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xb2"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ff1f1f2\x22></span></span>",
+            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xbc"                                                                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f1ff1f1fc\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6"                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f466200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7"                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f467\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f467200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f468200d1f467200d1f467\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f466200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f467\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f467200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d1f469200d1f467200d1f467\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8"                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d2764fe0f200d1f468\x22></span></span>",
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa8" => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f468200d2764fe0f200d1f48b200d1f468\x22></span></span>",
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f466200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"                                     => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f467\x22></span></span>",
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f467200d1f466\x22></span></span>",
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"         => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d1f469200d1f467200d1f467\x22></span></span>",
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9"                             => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d2764fe0f200d1f469\x22></span></span>",
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9" => "<span class=\x22emoji-outer emoji-sizer\x22><span class=\x22emoji-inner emoji1f469200d2764fe0f200d1f48b200d1f469\x22></span></span>",
             ];
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToShortEmojiMap.php b/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToShortEmojiMap.php
index fe7df860e36..e925fd6bd71 100644
--- a/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToShortEmojiMap.php
+++ b/app/bundles/CoreBundle/Helper/EmojiMap/UnicodeToShortEmojiMap.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * This class will kill some IDEs so best to not parse these as PHP
@@ -11,3440 +12,3441 @@
 
 namespace Mautic\CoreBundle\Helper\EmojiMap;
 
-class UnicodeToShortEmojiMap {
-	static public $map = [
-            "\xc2\xa9"=>":copyright:",
-            "\xf3\xbe\xac\xa9"=>":copyright:",
-            "\xee\x9c\xb1"=>":copyright:",
-            "\xee\x89\x8e"=>":copyright:",
-            "\xee\x95\x98"=>":copyright:",
-            "\xc2\xa9\xef\xb8\x8f"=>":copyright:",
-            "\xc2\xae"=>":registered:",
-            "\xf3\xbe\xac\xad"=>":registered:",
-            "\xee\x9c\xb6"=>":registered:",
-            "\xee\x89\x8f"=>":registered:",
-            "\xee\x95\x99"=>":registered:",
-            "\xc2\xae\xef\xb8\x8f"=>":registered:",
-            "\xe2\x80\xbc"=>":bangbang:",
-            "\xf3\xbe\xac\x86"=>":bangbang:",
-            "\xee\x9c\x84"=>":bangbang:",
-            "\xee\xac\xb0"=>":bangbang:",
-            "\xe2\x80\xbc\xef\xb8\x8f"=>":bangbang:",
-            "\xe2\x81\x89"=>":interrobang:",
-            "\xf3\xbe\xac\x85"=>":interrobang:",
-            "\xee\x9c\x83"=>":interrobang:",
-            "\xee\xac\xaf"=>":interrobang:",
-            "\xe2\x81\x89\xef\xb8\x8f"=>":interrobang:",
-            "\xe2\x84\xa2"=>":tm:",
-            "\xf3\xbe\xac\xaa"=>":tm:",
-            "\xee\x9c\xb2"=>":tm:",
-            "\xee\x94\xb7"=>":small_blue_diamond:",
-            "\xee\x95\x8e"=>":tm:",
-            "\xe2\x84\xa2\xef\xb8\x8f"=>":tm:",
-            "\xe2\x84\xb9"=>":information_source:",
-            "\xf3\xbe\xad\x87"=>":information_source:",
-            "\xee\x94\xb3"=>":b:",
-            "\xe2\x84\xb9\xef\xb8\x8f"=>":information_source:",
-            "\xe2\x86\x94"=>":left_right_arrow:",
-            "\xf3\xbe\xab\xb6"=>":left_right_arrow:",
-            "\xee\x9c\xbc"=>":left_right_arrow:",
-            "\xee\xad\xba"=>":left_right_arrow:",
-            "\xe2\x86\x94\xef\xb8\x8f"=>":left_right_arrow:",
-            "\xe2\x86\x95"=>":arrow_up_down:",
-            "\xf3\xbe\xab\xb7"=>":arrow_up_down:",
-            "\xee\x9c\xbd"=>":arrow_up_down:",
-            "\xee\xad\xbb"=>":arrow_up_down:",
-            "\xe2\x86\x95\xef\xb8\x8f"=>":arrow_up_down:",
-            "\xe2\x86\x96"=>":arrow_upper_left:",
-            "\xf3\xbe\xab\xb2"=>":arrow_upper_left:",
-            "\xee\x9a\x97"=>":arrow_upper_left:",
-            "\xee\x88\xb7"=>":arrow_upper_left:",
-            "\xee\x95\x8c"=>":arrow_upper_left:",
-            "\xe2\x86\x96\xef\xb8\x8f"=>":arrow_upper_left:",
-            "\xe2\x86\x97"=>":arrow_upper_right:",
-            "\xf3\xbe\xab\xb0"=>":arrow_upper_right:",
-            "\xee\x99\xb8"=>":arrow_upper_right:",
-            "\xee\x88\xb6"=>":arrow_heading_up:",
-            "\xee\x95\x95"=>":arrow_upper_right:",
-            "\xe2\x86\x97\xef\xb8\x8f"=>":arrow_upper_right:",
-            "\xe2\x86\x98"=>":arrow_lower_right:",
-            "\xf3\xbe\xab\xb1"=>":arrow_lower_right:",
-            "\xee\x9a\x96"=>":arrow_lower_right:",
-            "\xee\x88\xb8"=>":arrow_heading_down:",
-            "\xee\x95\x8d"=>":arrow_lower_right:",
-            "\xe2\x86\x98\xef\xb8\x8f"=>":arrow_lower_right:",
-            "\xe2\x86\x99"=>":arrow_lower_left:",
-            "\xf3\xbe\xab\xb3"=>":arrow_lower_left:",
-            "\xee\x9a\xa5"=>":arrow_lower_left:",
-            "\xee\x88\xb9"=>":arrow_lower_left:",
-            "\xee\x95\x96"=>":arrow_lower_left:",
-            "\xe2\x86\x99\xef\xb8\x8f"=>":arrow_lower_left:",
-            "\xe2\x86\xa9"=>":leftwards_arrow_with_hook:",
-            "\xf3\xbe\xae\x83"=>":leftwards_arrow_with_hook:",
-            "\xee\x9b\x9a"=>":leftwards_arrow_with_hook:",
-            "\xee\x95\x9d"=>":leftwards_arrow_with_hook:",
-            "\xe2\x86\xa9\xef\xb8\x8f"=>":leftwards_arrow_with_hook:",
-            "\xe2\x86\xaa"=>":arrow_right_hook:",
-            "\xf3\xbe\xae\x88"=>":arrow_right_hook:",
-            "\xee\x95\x9c"=>":arrow_right_hook:",
-            "\xe2\x86\xaa\xef\xb8\x8f"=>":arrow_right_hook:",
-            "\xe2\x8c\x9a"=>":watch:",
-            "\xf3\xbe\x80\x9d"=>":watch:",
-            "\xee\x9c\x9f"=>":watch:",
-            "\xee\x95\xba"=>":watch:",
-            "\xe2\x8c\x9a\xef\xb8\x8f"=>":watch:",
-            "\xe2\x8c\x9b"=>":hourglass:",
-            "\xf3\xbe\x80\x9c"=>":hourglass:",
-            "\xee\x9c\x9c"=>":hourglass_flowing_sand:",
-            "\xee\x95\xbb"=>":hourglass:",
-            "\xe2\x8c\x9b\xef\xb8\x8f"=>":hourglass:",
-            "\xe2\x8c\xa8"=>":keyboard:",
-            "\xe2\x8f\xa9"=>":fast_forward:",
-            "\xf3\xbe\xab\xbe"=>":fast_forward:",
-            "\xee\x88\xbc"=>":fast_forward:",
-            "\xee\x94\xb0"=>":camel:",
-            "\xe2\x8f\xaa"=>":rewind:",
-            "\xf3\xbe\xab\xbf"=>":rewind:",
-            "\xee\x88\xbd"=>":rewind:",
-            "\xee\x94\xaf"=>":boar:",
-            "\xe2\x8f\xab"=>":arrow_double_up:",
-            "\xf3\xbe\xac\x83"=>":arrow_double_up:",
-            "\xee\x95\x85"=>":arrow_double_up:",
-            "\xe2\x8f\xac"=>":arrow_double_down:",
-            "\xf3\xbe\xac\x82"=>":arrow_double_down:",
-            "\xee\x95\x84"=>":arrow_double_down:",
-            "\xe2\x8f\xad"=>":black_right_pointing_double_triangle_with_vertical_bar:",
-            "\xe2\x8f\xae"=>":black_left_pointing_double_triangle_with_vertical_bar:",
-            "\xe2\x8f\xaf"=>":black_right_pointing_triangle_with_double_vertical_bar:",
-            "\xe2\x8f\xb0"=>":alarm_clock:",
-            "\xf3\xbe\x80\xaa"=>":alarm_clock:",
-            "\xee\x9a\xba"=>":clock12:",
-            "\xee\x80\xad"=>":clock10:",
-            "\xee\x96\x94"=>":clock12:",
-            "\xe2\x8f\xb1"=>":stopwatch:",
-            "\xe2\x8f\xb2"=>":timer_clock:",
-            "\xe2\x8f\xb3"=>":hourglass_flowing_sand:",
-            "\xf3\xbe\x80\x9b"=>":hourglass_flowing_sand:",
-            "\xee\x91\xbc"=>":hourglass_flowing_sand:",
-            "\xe2\x8f\xb8"=>":double_vertical_bar:",
-            "\xe2\x8f\xb9"=>":black_square_for_stop:",
-            "\xe2\x8f\xba"=>":black_circle_for_record:",
-            "\xe2\x93\x82"=>":m:",
-            "\xf3\xbe\x9f\xa1"=>":m:",
-            "\xee\x99\x9c"=>":metro:",
-            "\xee\x90\xb4"=>":metro:",
-            "\xee\x96\xbc"=>":metro:",
-            "\xe2\x93\x82\xef\xb8\x8f"=>":m:",
-            "\xe2\x96\xaa"=>":black_small_square:",
-            "\xf3\xbe\xad\xae"=>":black_small_square:",
-            "\xee\x88\x9a"=>":large_blue_circle:",
-            "\xee\x94\xb2"=>":a:",
-            "\xe2\x96\xaa\xef\xb8\x8f"=>":black_small_square:",
-            "\xe2\x96\xab"=>":white_small_square:",
-            "\xf3\xbe\xad\xad"=>":white_small_square:",
-            "\xee\x88\x9b"=>":small_blue_diamond:",
-            "\xee\x94\xb1"=>":frog:",
-            "\xe2\x96\xab\xef\xb8\x8f"=>":white_small_square:",
-            "\xe2\x96\xb6"=>":arrow_forward:",
-            "\xf3\xbe\xab\xbc"=>":arrow_forward:",
-            "\xee\x88\xba"=>":arrow_forward:",
-            "\xee\x94\xae"=>":chicken:",
-            "\xe2\x96\xb6\xef\xb8\x8f"=>":arrow_forward:",
-            "\xe2\x97\x80"=>":arrow_backward:",
-            "\xf3\xbe\xab\xbd"=>":arrow_backward:",
-            "\xee\x88\xbb"=>":arrow_backward:",
-            "\xee\x94\xad"=>":snake:",
-            "\xe2\x97\x80\xef\xb8\x8f"=>":arrow_backward:",
-            "\xe2\x97\xbb"=>":white_medium_square:",
-            "\xf3\xbe\xad\xb1"=>":white_medium_square:",
-            "\xee\x94\xb8"=>":white_medium_square:",
-            "\xe2\x97\xbb\xef\xb8\x8f"=>":white_medium_square:",
-            "\xe2\x97\xbc"=>":black_medium_square:",
-            "\xf3\xbe\xad\xb2"=>":black_medium_square:",
-            "\xee\x94\xb9"=>":black_medium_square:",
-            "\xe2\x97\xbc\xef\xb8\x8f"=>":black_medium_square:",
-            "\xe2\x97\xbd"=>":white_medium_small_square:",
-            "\xf3\xbe\xad\xaf"=>":white_medium_small_square:",
-            "\xee\x94\xb4"=>":ab:",
-            "\xe2\x97\xbd\xef\xb8\x8f"=>":white_medium_small_square:",
-            "\xe2\x97\xbe"=>":black_medium_small_square:",
-            "\xf3\xbe\xad\xb0"=>":black_medium_small_square:",
-            "\xee\x94\xb5"=>":o2:",
-            "\xe2\x97\xbe\xef\xb8\x8f"=>":black_medium_small_square:",
-            "\xe2\x98\x80"=>":sunny:",
-            "\xf3\xbe\x80\x80"=>":sunny:",
-            "\xee\x98\xbe"=>":city_sunrise:",
-            "\xee\x81\x8a"=>":sunny:",
-            "\xee\x92\x88"=>":sunny:",
-            "\xe2\x98\x80\xef\xb8\x8f"=>":sunny:",
-            "\xe2\x98\x81"=>":cloud:",
-            "\xf3\xbe\x80\x81"=>":cloud:",
-            "\xee\x98\xbf"=>":cloud:",
-            "\xee\x81\x89"=>":cloud:",
-            "\xee\x92\x8d"=>":cloud:",
-            "\xe2\x98\x81\xef\xb8\x8f"=>":cloud:",
-            "\xe2\x98\x82"=>":umbrella:",
-            "\xe2\x98\x83"=>":showman:",
-            "\xe2\x98\x84"=>":comet:",
-            "\xe2\x98\x8e"=>":telephone:",
-            "\xf3\xbe\x94\xa3"=>":telephone:",
-            "\xee\x9a\x87"=>":telephone_receiver:",
-            "\xee\x80\x89"=>":telephone_receiver:",
-            "\xee\x96\x96"=>":telephone:",
-            "\xe2\x98\x8e\xef\xb8\x8f"=>":telephone:",
-            "\xe2\x98\x91"=>":ballot_box_with_check:",
-            "\xf3\xbe\xae\x8b"=>":ballot_box_with_check:",
-            "\xee\xac\x82"=>":ballot_box_with_check:",
-            "\xe2\x98\x91\xef\xb8\x8f"=>":ballot_box_with_check:",
-            "\xe2\x98\x94"=>":umbrella:",
-            "\xf3\xbe\x80\x82"=>":umbrella:",
-            "\xee\x99\x80"=>":umbrella:",
-            "\xee\x81\x8b"=>":umbrella:",
-            "\xee\x92\x8c"=>":umbrella:",
-            "\xe2\x98\x94\xef\xb8\x8f"=>":umbrella:",
-            "\xe2\x98\x95"=>":coffee:",
-            "\xf3\xbe\xa6\x81"=>":coffee:",
-            "\xee\x99\xb0"=>":coffee:",
-            "\xee\x81\x85"=>":coffee:",
-            "\xee\x96\x97"=>":coffee:",
-            "\xe2\x98\x95\xef\xb8\x8f"=>":coffee:",
-            "\xe2\x98\x98"=>":shamrock:",
-            "\xe2\x98\x9d"=>":point_up:",
-            "\xf3\xbe\xae\x98"=>":point_up:",
-            "\xee\x80\x8f"=>":point_up:",
-            "\xee\x93\xb6"=>":point_up:",
-            "\xe2\x98\x9d\xef\xb8\x8f"=>":point_up:",
-            "\xe2\x98\xa0"=>":skull_and_crossbones:",
-            "\xe2\x98\xa2"=>":radioactive_sign:",
-            "\xe2\x98\xa3"=>":biohazard_sign:",
-            "\xe2\x98\xa6"=>":orthodox_cross:",
-            "\xe2\x98\xaa"=>":star_and_crescent:",
-            "\xe2\x98\xae"=>":peace_symbol:",
-            "\xe2\x98\xaf"=>":yin_yang:",
-            "\xe2\x98\xb8"=>":wheel_of_dharma:",
-            "\xe2\x98\xb9"=>":white_frowning_face:",
-            "\xe2\x98\xba"=>":relaxed:",
-            "\xf3\xbe\x8c\xb6"=>":relaxed:",
-            "\xee\x9b\xb0"=>":smiley_cat:",
-            "\xee\x90\x94"=>":relaxed:",
-            "\xee\x93\xbb"=>":relaxed:",
-            "\xe2\x98\xba\xef\xb8\x8f"=>":relaxed:",
-            "\xe2\x99\x88"=>":aries:",
-            "\xf3\xbe\x80\xab"=>":aries:",
-            "\xee\x99\x86"=>":aries:",
-            "\xee\x88\xbf"=>":aries:",
-            "\xee\x92\x8f"=>":sheep:",
-            "\xe2\x99\x88\xef\xb8\x8f"=>":aries:",
-            "\xe2\x99\x89"=>":taurus:",
-            "\xf3\xbe\x80\xac"=>":taurus:",
-            "\xee\x99\x87"=>":taurus:",
-            "\xee\x89\x80"=>":taurus:",
-            "\xee\x92\x90"=>":taurus:",
-            "\xe2\x99\x89\xef\xb8\x8f"=>":taurus:",
-            "\xe2\x99\x8a"=>":gemini:",
-            "\xf3\xbe\x80\xad"=>":gemini:",
-            "\xee\x99\x88"=>":gemini:",
-            "\xee\x89\x81"=>":gemini:",
-            "\xee\x92\x91"=>":gemini:",
-            "\xe2\x99\x8a\xef\xb8\x8f"=>":gemini:",
-            "\xe2\x99\x8b"=>":cancer:",
-            "\xf3\xbe\x80\xae"=>":cancer:",
-            "\xee\x99\x89"=>":cancer:",
-            "\xee\x89\x82"=>":cancer:",
-            "\xee\x92\x92"=>":cancer:",
-            "\xe2\x99\x8b\xef\xb8\x8f"=>":cancer:",
-            "\xe2\x99\x8c"=>":leo:",
-            "\xf3\xbe\x80\xaf"=>":leo:",
-            "\xee\x99\x8a"=>":leo:",
-            "\xee\x89\x83"=>":leo:",
-            "\xee\x92\x93"=>":leo:",
-            "\xe2\x99\x8c\xef\xb8\x8f"=>":leo:",
-            "\xe2\x99\x8d"=>":virgo:",
-            "\xf3\xbe\x80\xb0"=>":virgo:",
-            "\xee\x99\x8b"=>":virgo:",
-            "\xee\x89\x84"=>":virgo:",
-            "\xee\x92\x94"=>":virgo:",
-            "\xe2\x99\x8d\xef\xb8\x8f"=>":virgo:",
-            "\xe2\x99\x8e"=>":libra:",
-            "\xf3\xbe\x80\xb1"=>":libra:",
-            "\xee\x99\x8c"=>":libra:",
-            "\xee\x89\x85"=>":libra:",
-            "\xee\x92\x95"=>":libra:",
-            "\xe2\x99\x8e\xef\xb8\x8f"=>":libra:",
-            "\xe2\x99\x8f"=>":scorpius:",
-            "\xf3\xbe\x80\xb2"=>":scorpius:",
-            "\xee\x99\x8d"=>":scorpius:",
-            "\xee\x89\x86"=>":scorpius:",
-            "\xee\x92\x96"=>":scorpius:",
-            "\xe2\x99\x8f\xef\xb8\x8f"=>":scorpius:",
-            "\xe2\x99\x90"=>":sagittarius:",
-            "\xf3\xbe\x80\xb3"=>":sagittarius:",
-            "\xee\x99\x8e"=>":sagittarius:",
-            "\xee\x89\x87"=>":sagittarius:",
-            "\xee\x92\x97"=>":sagittarius:",
-            "\xe2\x99\x90\xef\xb8\x8f"=>":sagittarius:",
-            "\xe2\x99\x91"=>":capricorn:",
-            "\xf3\xbe\x80\xb4"=>":capricorn:",
-            "\xee\x99\x8f"=>":capricorn:",
-            "\xee\x89\x88"=>":capricorn:",
-            "\xee\x92\x98"=>":capricorn:",
-            "\xe2\x99\x91\xef\xb8\x8f"=>":capricorn:",
-            "\xe2\x99\x92"=>":aquarius:",
-            "\xf3\xbe\x80\xb5"=>":aquarius:",
-            "\xee\x99\x90"=>":aquarius:",
-            "\xee\x89\x89"=>":aquarius:",
-            "\xee\x92\x99"=>":aquarius:",
-            "\xe2\x99\x92\xef\xb8\x8f"=>":aquarius:",
-            "\xe2\x99\x93"=>":pisces:",
-            "\xf3\xbe\x80\xb6"=>":pisces:",
-            "\xee\x99\x91"=>":pisces:",
-            "\xee\x89\x8a"=>":pisces:",
-            "\xee\x92\x9a"=>":fish:",
-            "\xe2\x99\x93\xef\xb8\x8f"=>":pisces:",
-            "\xe2\x99\xa0"=>":spades:",
-            "\xf3\xbe\xac\x9b"=>":spades:",
-            "\xee\x9a\x8e"=>":spades:",
-            "\xee\x88\x8e"=>":spades:",
-            "\xee\x96\xa1"=>":spades:",
-            "\xe2\x99\xa0\xef\xb8\x8f"=>":spades:",
-            "\xe2\x99\xa3"=>":clubs:",
-            "\xf3\xbe\xac\x9d"=>":clubs:",
-            "\xee\x9a\x90"=>":clubs:",
-            "\xee\x88\x8f"=>":clubs:",
-            "\xee\x96\xa3"=>":clubs:",
-            "\xe2\x99\xa3\xef\xb8\x8f"=>":clubs:",
-            "\xe2\x99\xa5"=>":hearts:",
-            "\xf3\xbe\xac\x9a"=>":hearts:",
-            "\xee\x9a\x8d"=>":hearts:",
-            "\xee\x88\x8c"=>":hearts:",
-            "\xee\xaa\xa5"=>":hearts:",
-            "\xe2\x99\xa5\xef\xb8\x8f"=>":hearts:",
-            "\xe2\x99\xa6"=>":diamonds:",
-            "\xf3\xbe\xac\x9c"=>":diamonds:",
-            "\xee\x9a\x8f"=>":diamonds:",
-            "\xee\x88\x8d"=>":diamonds:",
-            "\xee\x96\xa2"=>":diamonds:",
-            "\xe2\x99\xa6\xef\xb8\x8f"=>":diamonds:",
-            "\xe2\x99\xa8"=>":hotsprings:",
-            "\xf3\xbe\x9f\xba"=>":hotsprings:",
-            "\xee\x9b\xb7"=>":bath:",
-            "\xee\x84\xa3"=>":hotsprings:",
-            "\xee\x92\xbc"=>":hotsprings:",
-            "\xe2\x99\xa8\xef\xb8\x8f"=>":hotsprings:",
-            "\xe2\x99\xbb"=>":recycle:",
-            "\xf3\xbe\xac\xac"=>":recycle:",
-            "\xee\x9c\xb5"=>":arrows_clockwise:",
-            "\xee\xad\xb9"=>":recycle:",
-            "\xe2\x99\xbb\xef\xb8\x8f"=>":recycle:",
-            "\xe2\x99\xbf"=>":wheelchair:",
-            "\xf3\xbe\xac\xa0"=>":wheelchair:",
-            "\xee\x9a\x9b"=>":wheelchair:",
-            "\xee\x88\x8a"=>":wheelchair:",
-            "\xee\x91\xbf"=>":wheelchair:",
-            "\xe2\x99\xbf\xef\xb8\x8f"=>":wheelchair:",
-            "\xe2\x9a\x92"=>":hammer_and_pick:",
-            "\xe2\x9a\x93"=>":anchor:",
-            "\xf3\xbe\x93\x81"=>":anchor:",
-            "\xee\x99\xa1"=>":ship:",
-            "\xee\x88\x82"=>":ship:",
-            "\xee\x92\xa9"=>":anchor:",
-            "\xe2\x9a\x93\xef\xb8\x8f"=>":anchor:",
-            "\xe2\x9a\x94"=>":crossed_swords:",
-            "\xe2\x9a\x96"=>":scales:",
-            "\xe2\x9a\x97"=>":alembic:",
-            "\xe2\x9a\x99"=>":gear:",
-            "\xe2\x9a\x9b"=>":atom_symbol:",
-            "\xe2\x9a\x9c"=>":fleur_de_lis:",
-            "\xe2\x9a\xa0"=>":warning:",
-            "\xf3\xbe\xac\xa3"=>":warning:",
-            "\xee\x9c\xb7"=>":warning:",
-            "\xee\x89\x92"=>":warning:",
-            "\xee\x92\x81"=>":warning:",
-            "\xe2\x9a\xa0\xef\xb8\x8f"=>":warning:",
-            "\xe2\x9a\xa1"=>":zap:",
-            "\xf3\xbe\x80\x84"=>":zap:",
-            "\xee\x99\x82"=>":zap:",
-            "\xee\x84\xbd"=>":zap:",
-            "\xee\x92\x87"=>":zap:",
-            "\xe2\x9a\xa1\xef\xb8\x8f"=>":zap:",
-            "\xe2\x9a\xaa"=>":white_circle:",
-            "\xf3\xbe\xad\xa5"=>":white_circle:",
-            "\xee\x9a\x9c"=>":large_blue_circle:",
-            "\xee\x88\x99"=>":red_circle:",
-            "\xee\x94\xba"=>":white_circle:",
-            "\xe2\x9a\xaa\xef\xb8\x8f"=>":white_circle:",
-            "\xe2\x9a\xab"=>":black_circle:",
-            "\xf3\xbe\xad\xa6"=>":black_circle:",
-            "\xee\x94\xbb"=>":black_circle:",
-            "\xe2\x9a\xab\xef\xb8\x8f"=>":black_circle:",
-            "\xe2\x9a\xb0"=>":coffin:",
-            "\xe2\x9a\xb1"=>":funeral_urn:",
-            "\xe2\x9a\xbd"=>":soccer:",
-            "\xf3\xbe\x9f\x94"=>":soccer:",
-            "\xee\x99\x96"=>":soccer:",
-            "\xee\x80\x98"=>":soccer:",
-            "\xee\x92\xb6"=>":soccer:",
-            "\xe2\x9a\xbd\xef\xb8\x8f"=>":soccer:",
-            "\xe2\x9a\xbe"=>":baseball:",
-            "\xf3\xbe\x9f\x91"=>":baseball:",
-            "\xee\x99\x93"=>":baseball:",
-            "\xee\x80\x96"=>":baseball:",
-            "\xee\x92\xba"=>":baseball:",
-            "\xe2\x9a\xbe\xef\xb8\x8f"=>":baseball:",
-            "\xe2\x9b\x84"=>":snowman:",
-            "\xf3\xbe\x80\x83"=>":snowman:",
-            "\xee\x99\x81"=>":snowman:",
-            "\xee\x81\x88"=>":snowman:",
-            "\xee\x92\x85"=>":snowman:",
-            "\xe2\x9b\x84\xef\xb8\x8f"=>":snowman:",
-            "\xe2\x9b\x85"=>":partly_sunny:",
-            "\xf3\xbe\x80\x8f"=>":partly_sunny:",
-            "\xee\x98\xbe\xee\x98\xbf"=>":partly_sunny:",
-            "\xee\x81\x8a\xee\x81\x89"=>":partly_sunny:",
-            "\xee\x92\x8e"=>":partly_sunny:",
-            "\xe2\x9b\x85\xef\xb8\x8f"=>":partly_sunny:",
-            "\xe2\x9b\x88"=>":thunder_cloud_and_rain:",
-            "\xe2\x9b\x8e"=>":ophiuchus:",
-            "\xf3\xbe\x80\xb7"=>":ophiuchus:",
-            "\xee\x89\x8b"=>":ophiuchus:",
-            "\xee\x92\x9b"=>":ophiuchus:",
-            "\xe2\x9b\x8f"=>":pick:",
-            "\xe2\x9b\x91"=>":helmet_with_white_cross:",
-            "\xe2\x9b\x93"=>":chains:",
-            "\xe2\x9b\x94"=>":no_entry:",
-            "\xf3\xbe\xac\xa6"=>":no_entry:",
-            "\xee\x9c\xaf"=>":no_good:",
-            "\xee\x84\xb7"=>":construction:",
-            "\xee\x92\x84"=>":no_entry:",
-            "\xe2\x9b\x94\xef\xb8\x8f"=>":no_entry:",
-            "\xe2\x9b\xa9"=>":shinto_shrine:",
-            "\xe2\x9b\xaa"=>":church:",
-            "\xf3\xbe\x92\xbb"=>":church:",
-            "\xee\x80\xb7"=>":church:",
-            "\xee\x96\xbb"=>":wedding:",
-            "\xe2\x9b\xaa\xef\xb8\x8f"=>":church:",
-            "\xe2\x9b\xb0"=>":mountain:",
-            "\xe2\x9b\xb1"=>":umbrella_on_ground:",
-            "\xe2\x9b\xb2"=>":fountain:",
-            "\xf3\xbe\x92\xbc"=>":fountain:",
-            "\xee\x84\xa1"=>":fountain:",
-            "\xee\x97\x8f"=>":fountain:",
-            "\xe2\x9b\xb2\xef\xb8\x8f"=>":fountain:",
-            "\xe2\x9b\xb3"=>":golf:",
-            "\xf3\xbe\x9f\x92"=>":golf:",
-            "\xee\x99\x94"=>":golf:",
-            "\xee\x80\x94"=>":golf:",
-            "\xee\x96\x99"=>":golf:",
-            "\xe2\x9b\xb3\xef\xb8\x8f"=>":golf:",
-            "\xe2\x9b\xb4"=>":ferry:",
-            "\xe2\x9b\xb5"=>":sailboat:",
-            "\xf3\xbe\x9f\xaa"=>":sailboat:",
-            "\xee\x9a\xa3"=>":speedboat:",
-            "\xee\x80\x9c"=>":sailboat:",
-            "\xee\x92\xb4"=>":speedboat:",
-            "\xe2\x9b\xb5\xef\xb8\x8f"=>":sailboat:",
-            "\xe2\x9b\xb7"=>":skier:",
-            "\xe2\x9b\xb8"=>":ice_skate:",
-            "\xe2\x9b\xb9"=>":person_with_ball:",
-            "\xe2\x9b\xba"=>":tent:",
-            "\xf3\xbe\x9f\xbb"=>":tent:",
-            "\xee\x84\xa2"=>":tent:",
-            "\xee\x97\x90"=>":tent:",
-            "\xe2\x9b\xba\xef\xb8\x8f"=>":tent:",
-            "\xe2\x9b\xbd"=>":fuelpump:",
-            "\xf3\xbe\x9f\xb5"=>":fuelpump:",
-            "\xee\x99\xab"=>":fuelpump:",
-            "\xee\x80\xba"=>":fuelpump:",
-            "\xee\x95\xb1"=>":fuelpump:",
-            "\xe2\x9b\xbd\xef\xb8\x8f"=>":fuelpump:",
-            "\xe2\x9c\x82"=>":scissors:",
-            "\xf3\xbe\x94\xbe"=>":scissors:",
-            "\xee\x99\xb5"=>":haircut:",
-            "\xee\x8c\x93"=>":scissors:",
-            "\xee\x94\x96"=>":man_with_gua_pi_mao:",
-            "\xe2\x9c\x82\xef\xb8\x8f"=>":scissors:",
-            "\xe2\x9c\x85"=>":white_check_mark:",
-            "\xf3\xbe\xad\x8a"=>":white_check_mark:",
-            "\xee\x95\x9e"=>":white_check_mark:",
-            "\xe2\x9c\x88"=>":airplane:",
-            "\xf3\xbe\x9f\xa9"=>":airplane:",
-            "\xee\x99\xa2"=>":airplane:",
-            "\xee\x80\x9d"=>":airplane:",
-            "\xee\x92\xb3"=>":airplane:",
-            "\xe2\x9c\x88\xef\xb8\x8f"=>":airplane:",
-            "\xe2\x9c\x89"=>":envelope:",
-            "\xf3\xbe\x94\xa9"=>":envelope:",
-            "\xee\x9b\x93"=>":e-mail:",
-            "\xee\x84\x83"=>":envelope_with_arrow:",
-            "\xee\x94\xa1"=>":bird:",
-            "\xe2\x9c\x89\xef\xb8\x8f"=>":envelope:",
-            "\xe2\x9c\x8a"=>":fist:",
-            "\xf3\xbe\xae\x93"=>":fist:",
-            "\xee\x9a\x93"=>":fist:",
-            "\xee\x80\x90"=>":fist:",
-            "\xee\xae\x83"=>":fist:",
-            "\xe2\x9c\x8b"=>":raised_hand:",
-            "\xf3\xbe\xae\x95"=>":raised_hand:",
-            "\xee\x9a\x95"=>":open_hands:",
-            "\xee\x80\x92"=>":raising_hand:",
-            "\xee\x96\xa7"=>":raised_hand:",
-            "\xe2\x9c\x8c"=>":v:",
-            "\xf3\xbe\xae\x94"=>":v:",
-            "\xee\x9a\x94"=>":v:",
-            "\xee\x80\x91"=>":v:",
-            "\xee\x96\xa6"=>":v:",
-            "\xe2\x9c\x8c\xef\xb8\x8f"=>":v:",
-            "\xe2\x9c\x8d"=>":writing_hand:",
-            "\xe2\x9c\x8f"=>":pencil2:",
-            "\xf3\xbe\x94\xb9"=>":pencil2:",
-            "\xee\x9c\x99"=>":pencil2:",
-            "\xee\x8c\x81"=>":pencil:",
-            "\xee\x92\xa1"=>":pencil2:",
-            "\xe2\x9c\x8f\xef\xb8\x8f"=>":pencil2:",
-            "\xe2\x9c\x92"=>":black_nib:",
-            "\xf3\xbe\x94\xb6"=>":black_nib:",
-            "\xee\x9a\xae"=>":black_nib:",
-            "\xee\xac\x83"=>":black_nib:",
-            "\xe2\x9c\x92\xef\xb8\x8f"=>":black_nib:",
-            "\xe2\x9c\x94"=>":heavy_check_mark:",
-            "\xf3\xbe\xad\x89"=>":heavy_check_mark:",
-            "\xee\x95\x97"=>":heavy_check_mark:",
-            "\xe2\x9c\x94\xef\xb8\x8f"=>":heavy_check_mark:",
-            "\xe2\x9c\x96"=>":heavy_multiplication_x:",
-            "\xf3\xbe\xad\x93"=>":heavy_multiplication_x:",
-            "\xee\x8c\xb3"=>":negative_squared_cross_mark:",
-            "\xee\x95\x8f"=>":heavy_multiplication_x:",
-            "\xe2\x9c\x96\xef\xb8\x8f"=>":heavy_multiplication_x:",
-            "\xe2\x9c\x9d"=>":latin_cross:",
-            "\xe2\x9c\xa1"=>":star_of_david:",
-            "\xe2\x9c\xa8"=>":sparkles:",
-            "\xf3\xbe\xad\xa0"=>":sparkles:",
-            "\xee\x9b\xba"=>":sparkle:",
-            "\xee\x8c\xae"=>":sparkle:",
-            "\xee\xaa\xab"=>":sparkles:",
-            "\xe2\x9c\xb3"=>":eight_spoked_asterisk:",
-            "\xf3\xbe\xad\xa2"=>":eight_spoked_asterisk:",
-            "\xee\x9b\xb8"=>":diamond_shape_with_a_dot_inside:",
-            "\xee\x88\x86"=>":eight_spoked_asterisk:",
-            "\xee\x94\xbe"=>":eight_spoked_asterisk:",
-            "\xe2\x9c\xb3\xef\xb8\x8f"=>":eight_spoked_asterisk:",
-            "\xe2\x9c\xb4"=>":eight_pointed_black_star:",
-            "\xf3\xbe\xad\xa1"=>":eight_pointed_black_star:",
-            "\xee\x88\x85"=>":eight_pointed_black_star:",
-            "\xee\x91\xb9"=>":eight_pointed_black_star:",
-            "\xe2\x9c\xb4\xef\xb8\x8f"=>":eight_pointed_black_star:",
-            "\xe2\x9d\x84"=>":snowflake:",
-            "\xf3\xbe\x80\x8e"=>":snowflake:",
-            "\xee\x92\x8a"=>":snowflake:",
-            "\xe2\x9d\x84\xef\xb8\x8f"=>":snowflake:",
-            "\xe2\x9d\x87"=>":sparkle:",
-            "\xf3\xbe\xad\xb7"=>":sparkle:",
-            "\xee\x91\xac"=>":sparkle:",
-            "\xe2\x9d\x87\xef\xb8\x8f"=>":sparkle:",
-            "\xe2\x9d\x8c"=>":x:",
-            "\xf3\xbe\xad\x85"=>":x:",
-            "\xee\x95\x90"=>":x:",
-            "\xe2\x9d\x8e"=>":negative_squared_cross_mark:",
-            "\xf3\xbe\xad\x86"=>":negative_squared_cross_mark:",
-            "\xee\x95\x91"=>":negative_squared_cross_mark:",
-            "\xe2\x9d\x93"=>":question:",
-            "\xf3\xbe\xac\x89"=>":question:",
-            "\xee\x80\xa0"=>":question:",
-            "\xee\x92\x83"=>":grey_question:",
-            "\xe2\x9d\x94"=>":grey_question:",
-            "\xf3\xbe\xac\x8a"=>":grey_question:",
-            "\xee\x8c\xb6"=>":grey_question:",
-            "\xe2\x9d\x95"=>":grey_exclamation:",
-            "\xf3\xbe\xac\x8b"=>":grey_exclamation:",
-            "\xee\x9c\x82"=>":heavy_exclamation_mark:",
-            "\xee\x8c\xb7"=>":grey_exclamation:",
-            "\xee\x92\x82"=>":heavy_exclamation_mark:",
-            "\xe2\x9d\x97"=>":heavy_exclamation_mark:",
-            "\xf3\xbe\xac\x84"=>":heavy_exclamation_mark:",
-            "\xee\x80\xa1"=>":heavy_exclamation_mark:",
-            "\xe2\x9d\x97\xef\xb8\x8f"=>":heavy_exclamation_mark:",
-            "\xe2\x9d\xa3"=>":heavy_heart_exclamation_mark_ornament:",
-            "\xe2\x9d\xa4"=>":heart:",
-            "\xf3\xbe\xac\x8c"=>":heart:",
-            "\xee\x9b\xac"=>":gift_heart:",
-            "\xee\x80\xa2"=>":heart:",
-            "\xee\x96\x95"=>":heart_decoration:",
-            "\xe2\x9d\xa4\xef\xb8\x8f"=>":heart:",
-            "\xe2\x9e\x95"=>":heavy_plus_sign:",
-            "\xf3\xbe\xad\x91"=>":heavy_plus_sign:",
-            "\xee\x94\xbc"=>":heavy_plus_sign:",
-            "\xe2\x9e\x96"=>":heavy_minus_sign:",
-            "\xf3\xbe\xad\x92"=>":heavy_minus_sign:",
-            "\xee\x94\xbd"=>":heavy_minus_sign:",
-            "\xe2\x9e\x97"=>":heavy_division_sign:",
-            "\xf3\xbe\xad\x94"=>":heavy_division_sign:",
-            "\xee\x95\x94"=>":heavy_division_sign:",
-            "\xe2\x9e\xa1"=>":arrow_right:",
-            "\xf3\xbe\xab\xba"=>":arrow_right:",
-            "\xee\x88\xb4"=>":arrow_right:",
-            "\xee\x95\x92"=>":arrow_right:",
-            "\xe2\x9e\xa1\xef\xb8\x8f"=>":arrow_right:",
-            "\xe2\x9e\xb0"=>":curly_loop:",
-            "\xf3\xbe\xac\x88"=>":curly_loop:",
-            "\xee\x9c\x8a"=>":scroll:",
-            "\xee\xac\xb1"=>":curly_loop:",
-            "\xe2\x9e\xbf"=>":loop:",
-            "\xf3\xbe\xa0\xab"=>":loop:",
-            "\xee\x9b\x9f"=>":loop:",
-            "\xee\x88\x91"=>":loop:",
-            "\xe2\xa4\xb4"=>":arrow_heading_up:",
-            "\xf3\xbe\xab\xb4"=>":arrow_heading_up:",
-            "\xee\x9b\xb5"=>":arrow_heading_up:",
-            "\xee\xac\xad"=>":arrow_heading_up:",
-            "\xe2\xa4\xb4\xef\xb8\x8f"=>":arrow_heading_up:",
-            "\xe2\xa4\xb5"=>":arrow_heading_down:",
-            "\xf3\xbe\xab\xb5"=>":arrow_heading_down:",
-            "\xee\x9c\x80"=>":thumbsdown:",
-            "\xee\xac\xae"=>":arrow_heading_down:",
-            "\xe2\xa4\xb5\xef\xb8\x8f"=>":arrow_heading_down:",
-            "\xe2\xac\x85"=>":arrow_left:",
-            "\xf3\xbe\xab\xbb"=>":arrow_left:",
-            "\xee\x88\xb5"=>":back:",
-            "\xee\x95\x93"=>":arrow_left:",
-            "\xe2\xac\x85\xef\xb8\x8f"=>":arrow_left:",
-            "\xe2\xac\x86"=>":arrow_up:",
-            "\xf3\xbe\xab\xb8"=>":arrow_up:",
-            "\xee\x88\xb2"=>":arrow_up:",
-            "\xee\x94\xbf"=>":arrow_up:",
-            "\xe2\xac\x86\xef\xb8\x8f"=>":arrow_up:",
-            "\xe2\xac\x87"=>":arrow_down:",
-            "\xf3\xbe\xab\xb9"=>":arrow_down:",
-            "\xee\x88\xb3"=>":arrow_down:",
-            "\xee\x95\x80"=>":arrow_down:",
-            "\xe2\xac\x87\xef\xb8\x8f"=>":arrow_down:",
-            "\xe2\xac\x9b"=>":black_large_square:",
-            "\xf3\xbe\xad\xac"=>":black_large_square:",
-            "\xee\x95\x89"=>":black_large_square:",
-            "\xe2\xac\x9b\xef\xb8\x8f"=>":black_large_square:",
-            "\xe2\xac\x9c"=>":white_large_square:",
-            "\xf3\xbe\xad\xab"=>":white_large_square:",
-            "\xee\x95\x88"=>":white_large_square:",
-            "\xe2\xac\x9c\xef\xb8\x8f"=>":white_large_square:",
-            "\xe2\xad\x90"=>":star:",
-            "\xf3\xbe\xad\xa8"=>":star:",
-            "\xee\x8c\xaf"=>":star:",
-            "\xee\x92\x8b"=>":star2:",
-            "\xe2\xad\x90\xef\xb8\x8f"=>":star:",
-            "\xe2\xad\x95"=>":o:",
-            "\xf3\xbe\xad\x84"=>":o:",
-            "\xee\x9a\xa0"=>":full_moon:",
-            "\xee\x8c\xb2"=>":o:",
-            "\xee\xaa\xad"=>":o:",
-            "\xe2\xad\x95\xef\xb8\x8f"=>":o:",
-            "\xe3\x80\xb0"=>":wavy_dash:",
-            "\xf3\xbe\xac\x87"=>":wavy_dash:",
-            "\xee\x9c\x89"=>":wavy_dash:",
-            "\xe3\x80\xb0\xef\xb8\x8f"=>":wavy_dash:",
-            "\xe3\x80\xbd"=>":part_alternation_mark:",
-            "\xf3\xbe\xa0\x9b"=>":part_alternation_mark:",
-            "\xee\x84\xac"=>":part_alternation_mark:",
-            "\xe3\x80\xbd\xef\xb8\x8f"=>":part_alternation_mark:",
-            "\xe3\x8a\x97"=>":congratulations:",
-            "\xf3\xbe\xad\x83"=>":congratulations:",
-            "\xee\x8c\x8d"=>":congratulations:",
-            "\xee\xaa\x99"=>":congratulations:",
-            "\xe3\x8a\x97\xef\xb8\x8f"=>":congratulations:",
-            "\xe3\x8a\x99"=>":secret:",
-            "\xf3\xbe\xac\xab"=>":secret:",
-            "\xee\x9c\xb4"=>":secret:",
-            "\xee\x8c\x95"=>":secret:",
-            "\xee\x93\xb1"=>":secret:",
-            "\xe3\x8a\x99\xef\xb8\x8f"=>":secret:",
-            "\xf0\x9f\x80\x84"=>":mahjong:",
-            "\xf3\xbe\xa0\x8b"=>":mahjong:",
-            "\xee\x84\xad"=>":mahjong:",
-            "\xee\x97\x91"=>":mahjong:",
-            "\xf0\x9f\x80\x84\xef\xb8\x8f"=>":mahjong:",
-            "\xf0\x9f\x83\x8f"=>":black_joker:",
-            "\xf3\xbe\xa0\x92"=>":black_joker:",
-            "\xee\xad\xaf"=>":black_joker:",
-            "\xf0\x9f\x85\xb0"=>":a:",
-            "\xf3\xbe\x94\x8b"=>":a:",
-            "\xee\xac\xa6"=>":a:",
-            "\xf0\x9f\x85\xb0\xef\xb8\x8f"=>":a:",
-            "\xf0\x9f\x85\xb1"=>":b:",
-            "\xf3\xbe\x94\x8c"=>":b:",
-            "\xee\xac\xa7"=>":b:",
-            "\xf0\x9f\x85\xb1\xef\xb8\x8f"=>":b:",
-            "\xf0\x9f\x85\xbe"=>":o2:",
-            "\xf3\xbe\x94\x8e"=>":o2:",
-            "\xee\xac\xa8"=>":o2:",
-            "\xf0\x9f\x85\xbe\xef\xb8\x8f"=>":o2:",
-            "\xf0\x9f\x85\xbf"=>":parking:",
-            "\xf3\xbe\x9f\xb6"=>":parking:",
-            "\xee\x99\xac"=>":parking:",
-            "\xee\x85\x8f"=>":parking:",
-            "\xee\x92\xa6"=>":parking:",
-            "\xf0\x9f\x85\xbf\xef\xb8\x8f"=>":parking:",
-            "\xf0\x9f\x86\x8e"=>":ab:",
-            "\xf3\xbe\x94\x8d"=>":ab:",
-            "\xee\xac\xa9"=>":ab:",
-            "\xf0\x9f\x86\x91"=>":cl:",
-            "\xf3\xbe\xae\x84"=>":cl:",
-            "\xee\x9b\x9b"=>":cl:",
-            "\xee\x96\xab"=>":cl:",
-            "\xf0\x9f\x86\x92"=>":cool:",
-            "\xf3\xbe\xac\xb8"=>":cool:",
-            "\xee\x88\x94"=>":cool:",
-            "\xee\xaa\x85"=>":cool:",
-            "\xf0\x9f\x86\x93"=>":free:",
-            "\xf3\xbe\xac\xa1"=>":free:",
-            "\xee\x9b\x97"=>":free:",
-            "\xee\x95\xb8"=>":free:",
-            "\xf0\x9f\x86\x94"=>":id:",
-            "\xf3\xbe\xae\x81"=>":id:",
-            "\xee\x9b\x98"=>":id:",
-            "\xee\x88\xa9"=>":id:",
-            "\xee\xaa\x88"=>":id:",
-            "\xf0\x9f\x86\x95"=>":new:",
-            "\xf3\xbe\xac\xb6"=>":new:",
-            "\xee\x9b\x9d"=>":new:",
-            "\xee\x88\x92"=>":new:",
-            "\xee\x96\xb5"=>":new:",
-            "\xf0\x9f\x86\x96"=>":ng:",
-            "\xf3\xbe\xac\xa8"=>":ng:",
-            "\xf0\x9f\x86\x97"=>":ok:",
-            "\xf3\xbe\xac\xa7"=>":ok:",
-            "\xee\x9c\x8b"=>":ok_woman:",
-            "\xee\x89\x8d"=>":ok:",
-            "\xee\x96\xad"=>":ok:",
-            "\xf0\x9f\x86\x98"=>":sos:",
-            "\xf3\xbe\xad\x8f"=>":sos:",
-            "\xee\x93\xa8"=>":sos:",
-            "\xf0\x9f\x86\x99"=>":up:",
-            "\xf3\xbe\xac\xb7"=>":up:",
-            "\xee\x88\x93"=>":up:",
-            "\xee\x94\x8f"=>":it:",
-            "\xf0\x9f\x86\x9a"=>":vs:",
-            "\xf3\xbe\xac\xb2"=>":vs:",
-            "\xee\x84\xae"=>":vs:",
-            "\xee\x97\x92"=>":vs:",
-            "\xf0\x9f\x88\x81"=>":koko:",
-            "\xf3\xbe\xac\xa4"=>":koko:",
-            "\xee\x88\x83"=>":koko:",
-            "\xf0\x9f\x88\x82"=>":sa:",
-            "\xf3\xbe\xac\xbf"=>":sa:",
-            "\xee\x88\xa8"=>":sa:",
-            "\xee\xaa\x87"=>":sa:",
-            "\xf0\x9f\x88\x82\xef\xb8\x8f"=>":sa:",
-            "\xf0\x9f\x88\x9a"=>":u7121:",
-            "\xf3\xbe\xac\xba"=>":u7121:",
-            "\xee\x88\x96"=>":u7121:",
-            "\xf0\x9f\x88\x9a\xef\xb8\x8f"=>":u7121:",
-            "\xf0\x9f\x88\xaf"=>":u6307:",
-            "\xf3\xbe\xad\x80"=>":u6307:",
-            "\xee\x88\xac"=>":u6307:",
-            "\xee\xaa\x8b"=>":u6307:",
-            "\xf0\x9f\x88\xaf\xef\xb8\x8f"=>":u6307:",
-            "\xf0\x9f\x88\xb2"=>":u7981:",
-            "\xf3\xbe\xac\xae"=>":u7981:",
-            "\xee\x9c\xb8"=>":no_entry_sign:",
-            "\xf0\x9f\x88\xb3"=>":u7a7a:",
-            "\xf3\xbe\xac\xaf"=>":u7a7a:",
-            "\xee\x9c\xb9"=>":u7a7a:",
-            "\xee\x88\xab"=>":u7a7a:",
-            "\xee\xaa\x8a"=>":u7a7a:",
-            "\xf0\x9f\x88\xb4"=>":u5408:",
-            "\xf3\xbe\xac\xb0"=>":u5408:",
-            "\xee\x9c\xba"=>":u5408:",
-            "\xf0\x9f\x88\xb5"=>":u6e80:",
-            "\xf3\xbe\xac\xb1"=>":u6e80:",
-            "\xee\x9c\xbb"=>":u6e80:",
-            "\xee\x88\xaa"=>":u6e80:",
-            "\xee\xaa\x89"=>":u6e80:",
-            "\xf0\x9f\x88\xb6"=>":u6709:",
-            "\xf3\xbe\xac\xb9"=>":u6709:",
-            "\xee\x88\x95"=>":u6709:",
-            "\xf0\x9f\x88\xb7"=>":u6708:",
-            "\xf3\xbe\xac\xbb"=>":u6708:",
-            "\xee\x88\x97"=>":u6708:",
-            "\xf0\x9f\x88\xb7\xef\xb8\x8f"=>":u6708:",
-            "\xf0\x9f\x88\xb8"=>":u7533:",
-            "\xf3\xbe\xac\xbc"=>":u7533:",
-            "\xee\x88\x98"=>":u7533:",
-            "\xf0\x9f\x88\xb9"=>":u5272:",
-            "\xf3\xbe\xac\xbe"=>":u5272:",
-            "\xee\x88\xa7"=>":u5272:",
-            "\xee\xaa\x86"=>":u5272:",
-            "\xf0\x9f\x88\xba"=>":u55b6:",
-            "\xf3\xbe\xad\x81"=>":u55b6:",
-            "\xee\x88\xad"=>":u55b6:",
-            "\xee\xaa\x8c"=>":u55b6:",
-            "\xf0\x9f\x89\x90"=>":ideograph_advantage:",
-            "\xf3\xbe\xac\xbd"=>":ideograph_advantage:",
-            "\xee\x88\xa6"=>":ideograph_advantage:",
-            "\xee\x93\xb7"=>":ideograph_advantage:",
-            "\xf0\x9f\x89\x91"=>":accept:",
-            "\xf3\xbe\xad\x90"=>":accept:",
-            "\xee\xac\x81"=>":accept:",
-            "\xf0\x9f\x8c\x80"=>":cyclone:",
-            "\xf3\xbe\x80\x85"=>":cyclone:",
-            "\xee\x99\x83"=>":fish_cake:",
-            "\xee\x91\x83"=>":cyclone:",
-            "\xee\x91\xa9"=>":cyclone:",
-            "\xf0\x9f\x8c\x81"=>":foggy:",
-            "\xf3\xbe\x80\x86"=>":foggy:",
-            "\xee\x99\x84"=>":foggy:",
-            "\xee\x96\x98"=>":foggy:",
-            "\xf0\x9f\x8c\x82"=>":closed_umbrella:",
-            "\xf3\xbe\x80\x87"=>":closed_umbrella:",
-            "\xee\x99\x85"=>":closed_umbrella:",
-            "\xee\x90\xbc"=>":closed_umbrella:",
-            "\xee\xab\xa8"=>":closed_umbrella:",
-            "\xf0\x9f\x8c\x83"=>":night_with_stars:",
-            "\xf3\xbe\x80\x88"=>":night_with_stars:",
-            "\xee\x9a\xb3"=>":milky_way:",
-            "\xee\x91\x8b"=>":milky_way:",
-            "\xee\xab\xb1"=>":night_with_stars:",
-            "\xf0\x9f\x8c\x84"=>":sunrise_over_mountains:",
-            "\xf3\xbe\x80\x89"=>":sunrise_over_mountains:",
-            "\xee\x81\x8d"=>":sunrise_over_mountains:",
-            "\xee\xab\xb4"=>":sunrise:",
-            "\xf0\x9f\x8c\x85"=>":sunrise:",
-            "\xf3\xbe\x80\x8a"=>":sunrise:",
-            "\xee\x91\x89"=>":sunrise:",
-            "\xf0\x9f\x8c\x86"=>":city_sunset:",
-            "\xf3\xbe\x80\x8b"=>":city_sunset:",
-            "\xee\x85\x86"=>":city_sunset:",
-            "\xee\x97\x9a"=>":city_sunrise:",
-            "\xf0\x9f\x8c\x87"=>":city_sunrise:",
-            "\xf3\xbe\x80\x8c"=>":city_sunrise:",
-            "\xee\x91\x8a"=>":city_sunrise:",
-            "\xf0\x9f\x8c\x88"=>":rainbow:",
-            "\xf3\xbe\x80\x8d"=>":rainbow:",
-            "\xee\x91\x8c"=>":rainbow:",
-            "\xee\xab\xb2"=>":rainbow:",
-            "\xf0\x9f\x8c\x89"=>":bridge_at_night:",
-            "\xf3\xbe\x80\x90"=>":bridge_at_night:",
-            "\xee\x92\xbf"=>":bridge_at_night:",
-            "\xf0\x9f\x8c\x8a"=>":ocean:",
-            "\xf3\xbe\x80\xb8"=>":ocean:",
-            "\xee\x9c\xbf"=>":ocean:",
-            "\xee\x90\xbe"=>":ocean:",
-            "\xee\xad\xbc"=>":ocean:",
-            "\xf0\x9f\x8c\x8b"=>":volcano:",
-            "\xf3\xbe\x80\xba"=>":volcano:",
-            "\xee\xad\x93"=>":volcano:",
-            "\xf0\x9f\x8c\x8c"=>":milky_way:",
-            "\xf3\xbe\x80\xbb"=>":milky_way:",
-            "\xee\xad\x9f"=>":milky_way:",
-            "\xf0\x9f\x8c\x8d"=>":earth_africa:",
-            "\xf0\x9f\x8c\x8e"=>":earth_americas:",
-            "\xf0\x9f\x8c\x8f"=>":earth_asia:",
-            "\xf3\xbe\x80\xb9"=>":earth_asia:",
-            "\xee\x96\xb3"=>":earth_asia:",
-            "\xf0\x9f\x8c\x90"=>":globe_with_meridians:",
-            "\xf0\x9f\x8c\x91"=>":new_moon:",
-            "\xf3\xbe\x80\x91"=>":new_moon:",
-            "\xee\x96\xa8"=>":new_moon:",
-            "\xf0\x9f\x8c\x92"=>":waxing_crescent_moon:",
-            "\xf0\x9f\x8c\x93"=>":first_quarter_moon:",
-            "\xf3\xbe\x80\x93"=>":first_quarter_moon:",
-            "\xee\x9a\x9e"=>":first_quarter_moon_with_face:",
-            "\xee\x81\x8c"=>":first_quarter_moon_with_face:",
-            "\xee\x96\xaa"=>":first_quarter_moon:",
-            "\xf0\x9f\x8c\x94"=>":waxing_gibbous_moon:",
-            "\xf3\xbe\x80\x92"=>":waxing_gibbous_moon:",
-            "\xee\x9a\x9d"=>":waxing_gibbous_moon:",
-            "\xee\x96\xa9"=>":waxing_gibbous_moon:",
-            "\xf0\x9f\x8c\x95"=>":full_moon:",
-            "\xf3\xbe\x80\x95"=>":full_moon:",
-            "\xf0\x9f\x8c\x96"=>":waning_gibbous_moon:",
-            "\xf0\x9f\x8c\x97"=>":last_quarter_moon:",
-            "\xf0\x9f\x8c\x98"=>":waning_crescent_moon:",
-            "\xf0\x9f\x8c\x99"=>":crescent_moon:",
-            "\xf3\xbe\x80\x94"=>":crescent_moon:",
-            "\xee\x9a\x9f"=>":crescent_moon:",
-            "\xee\x92\x86"=>":crescent_moon:",
-            "\xf0\x9f\x8c\x9a"=>":new_moon_with_face:",
-            "\xf0\x9f\x8c\x9b"=>":first_quarter_moon_with_face:",
-            "\xf3\xbe\x80\x96"=>":first_quarter_moon_with_face:",
-            "\xee\x92\x89"=>":first_quarter_moon_with_face:",
-            "\xf0\x9f\x8c\x9c"=>":last_quarter_moon_with_face:",
-            "\xf0\x9f\x8c\x9d"=>":full_moon_with_face:",
-            "\xf0\x9f\x8c\x9e"=>":sun_with_face:",
-            "\xf0\x9f\x8c\x9f"=>":star2:",
-            "\xf3\xbe\xad\xa9"=>":star2:",
-            "\xee\x8c\xb5"=>":star2:",
-            "\xf0\x9f\x8c\xa0"=>":stars:",
-            "\xf3\xbe\xad\xaa"=>":stars:",
-            "\xee\x91\xa8"=>":stars:",
-            "\xf0\x9f\x8c\xa1"=>":thermometer:",
-            "\xf0\x9f\x8c\xa4"=>":sun_small_cloud:",
-            "\xf0\x9f\x8c\xa5"=>":sun_behind_cloud:",
-            "\xf0\x9f\x8c\xa6"=>":sun_behind_rain_cloud:",
-            "\xf0\x9f\x8c\xa7"=>":rain_cloud:",
-            "\xf0\x9f\x8c\xa8"=>":snow_cloud:",
-            "\xf0\x9f\x8c\xa9"=>":lightning_cloud:",
-            "\xf0\x9f\x8c\xaa"=>":tornado_cloud:",
-            "\xf0\x9f\x8c\xab"=>":fog:",
-            "\xf0\x9f\x8c\xac"=>":wind_blowing_face:",
-            "\xf0\x9f\x8c\xad"=>":hotdog:",
-            "\xf0\x9f\x8c\xae"=>":taco:",
-            "\xf0\x9f\x8c\xaf"=>":burrito:",
-            "\xf0\x9f\x8c\xb0"=>":chestnut:",
-            "\xf3\xbe\x81\x8c"=>":chestnut:",
-            "\xee\xac\xb8"=>":chestnut:",
-            "\xf0\x9f\x8c\xb1"=>":seedling:",
-            "\xf3\xbe\x80\xbe"=>":seedling:",
-            "\xee\x9d\x86"=>":seedling:",
-            "\xee\x84\x90"=>":four_leaf_clover:",
-            "\xee\xad\xbd"=>":seedling:",
-            "\xf0\x9f\x8c\xb2"=>":evergreen_tree:",
-            "\xf0\x9f\x8c\xb3"=>":deciduous_tree:",
-            "\xf0\x9f\x8c\xb4"=>":palm_tree:",
-            "\xf3\xbe\x81\x87"=>":palm_tree:",
-            "\xee\x8c\x87"=>":palm_tree:",
-            "\xee\x93\xa2"=>":palm_tree:",
-            "\xf0\x9f\x8c\xb5"=>":cactus:",
-            "\xf3\xbe\x81\x88"=>":cactus:",
-            "\xee\x8c\x88"=>":cactus:",
-            "\xee\xaa\x96"=>":cactus:",
-            "\xf0\x9f\x8c\xb6"=>":hot_pepper:",
-            "\xf0\x9f\x8c\xb7"=>":tulip:",
-            "\xf3\xbe\x80\xbd"=>":tulip:",
-            "\xee\x9d\x83"=>":tulip:",
-            "\xee\x8c\x84"=>":tulip:",
-            "\xee\x93\xa4"=>":tulip:",
-            "\xf0\x9f\x8c\xb8"=>":cherry_blossom:",
-            "\xf3\xbe\x81\x80"=>":cherry_blossom:",
-            "\xee\x9d\x88"=>":cherry_blossom:",
-            "\xee\x80\xb0"=>":cherry_blossom:",
-            "\xee\x93\x8a"=>":cherry_blossom:",
-            "\xf0\x9f\x8c\xb9"=>":rose:",
-            "\xf3\xbe\x81\x81"=>":rose:",
-            "\xee\x80\xb2"=>":rose:",
-            "\xee\x96\xba"=>":rose:",
-            "\xf0\x9f\x8c\xba"=>":hibiscus:",
-            "\xf3\xbe\x81\x85"=>":hibiscus:",
-            "\xee\x8c\x83"=>":hibiscus:",
-            "\xee\xaa\x94"=>":hibiscus:",
-            "\xf0\x9f\x8c\xbb"=>":sunflower:",
-            "\xf3\xbe\x81\x86"=>":sunflower:",
-            "\xee\x8c\x85"=>":blossom:",
-            "\xee\x93\xa3"=>":sunflower:",
-            "\xf0\x9f\x8c\xbc"=>":blossom:",
-            "\xf3\xbe\x81\x8d"=>":blossom:",
-            "\xee\xad\x89"=>":blossom:",
-            "\xf0\x9f\x8c\xbd"=>":corn:",
-            "\xf3\xbe\x81\x8a"=>":corn:",
-            "\xee\xac\xb6"=>":corn:",
-            "\xf0\x9f\x8c\xbe"=>":ear_of_rice:",
-            "\xf3\xbe\x81\x89"=>":ear_of_rice:",
-            "\xee\x91\x84"=>":ear_of_rice:",
-            "\xf0\x9f\x8c\xbf"=>":herb:",
-            "\xf3\xbe\x81\x8e"=>":herb:",
-            "\xee\x9d\x81"=>":four_leaf_clover:",
-            "\xee\xae\x82"=>":herb:",
-            "\xf0\x9f\x8d\x80"=>":four_leaf_clover:",
-            "\xf3\xbe\x80\xbc"=>":four_leaf_clover:",
-            "\xee\x94\x93"=>":cn:",
-            "\xf0\x9f\x8d\x81"=>":maple_leaf:",
-            "\xf3\xbe\x80\xbf"=>":maple_leaf:",
-            "\xee\x9d\x87"=>":fallen_leaf:",
-            "\xee\x84\x98"=>":maple_leaf:",
-            "\xee\x93\x8e"=>":maple_leaf:",
-            "\xf0\x9f\x8d\x82"=>":fallen_leaf:",
-            "\xf3\xbe\x81\x82"=>":fallen_leaf:",
-            "\xee\x84\x99"=>":fallen_leaf:",
-            "\xee\x97\x8d"=>":leaves:",
-            "\xf0\x9f\x8d\x83"=>":leaves:",
-            "\xf3\xbe\x81\x83"=>":leaves:",
-            "\xee\x91\x87"=>":leaves:",
-            "\xf0\x9f\x8d\x84"=>":mushroom:",
-            "\xf3\xbe\x81\x8b"=>":mushroom:",
-            "\xee\xac\xb7"=>":mushroom:",
-            "\xf0\x9f\x8d\x85"=>":tomato:",
-            "\xf3\xbe\x81\x95"=>":tomato:",
-            "\xee\x8d\x89"=>":tomato:",
-            "\xee\xaa\xbb"=>":tomato:",
-            "\xf0\x9f\x8d\x86"=>":eggplant:",
-            "\xf3\xbe\x81\x96"=>":eggplant:",
-            "\xee\x8d\x8a"=>":eggplant:",
-            "\xee\xaa\xbc"=>":eggplant:",
-            "\xf0\x9f\x8d\x87"=>":grapes:",
-            "\xf3\xbe\x81\x99"=>":grapes:",
-            "\xee\xac\xb4"=>":grapes:",
-            "\xf0\x9f\x8d\x88"=>":melon:",
-            "\xf3\xbe\x81\x97"=>":melon:",
-            "\xee\xac\xb2"=>":melon:",
-            "\xf0\x9f\x8d\x89"=>":watermelon:",
-            "\xf3\xbe\x81\x94"=>":watermelon:",
-            "\xee\x8d\x88"=>":watermelon:",
-            "\xee\x93\x8d"=>":watermelon:",
-            "\xf0\x9f\x8d\x8a"=>":tangerine:",
-            "\xf3\xbe\x81\x92"=>":tangerine:",
-            "\xee\x8d\x86"=>":tangerine:",
-            "\xee\xaa\xba"=>":tangerine:",
-            "\xf0\x9f\x8d\x8b"=>":lemon:",
-            "\xf0\x9f\x8d\x8c"=>":banana:",
-            "\xf3\xbe\x81\x90"=>":banana:",
-            "\xee\x9d\x84"=>":banana:",
-            "\xee\xac\xb5"=>":banana:",
-            "\xf0\x9f\x8d\x8d"=>":pineapple:",
-            "\xf3\xbe\x81\x98"=>":pineapple:",
-            "\xee\xac\xb3"=>":pineapple:",
-            "\xf0\x9f\x8d\x8e"=>":apple:",
-            "\xf3\xbe\x81\x91"=>":apple:",
-            "\xee\x9d\x85"=>":green_apple:",
-            "\xee\x8d\x85"=>":green_apple:",
-            "\xee\xaa\xb9"=>":apple:",
-            "\xf0\x9f\x8d\x8f"=>":green_apple:",
-            "\xf3\xbe\x81\x9b"=>":green_apple:",
-            "\xee\xad\x9a"=>":green_apple:",
-            "\xf0\x9f\x8d\x90"=>":pear:",
-            "\xf0\x9f\x8d\x91"=>":peach:",
-            "\xf3\xbe\x81\x9a"=>":peach:",
-            "\xee\xac\xb9"=>":peach:",
-            "\xf0\x9f\x8d\x92"=>":cherries:",
-            "\xf3\xbe\x81\x8f"=>":cherries:",
-            "\xee\x9d\x82"=>":cherries:",
-            "\xee\x93\x92"=>":cherries:",
-            "\xf0\x9f\x8d\x93"=>":strawberry:",
-            "\xf3\xbe\x81\x93"=>":strawberry:",
-            "\xee\x8d\x87"=>":strawberry:",
-            "\xee\x93\x94"=>":strawberry:",
-            "\xf0\x9f\x8d\x94"=>":hamburger:",
-            "\xf3\xbe\xa5\xa0"=>":hamburger:",
-            "\xee\x99\xb3"=>":hamburger:",
-            "\xee\x84\xa0"=>":hamburger:",
-            "\xee\x93\x96"=>":hamburger:",
-            "\xf0\x9f\x8d\x95"=>":pizza:",
-            "\xf3\xbe\xa5\xb5"=>":pizza:",
-            "\xee\xac\xbb"=>":pizza:",
-            "\xf0\x9f\x8d\x96"=>":meat_on_bone:",
-            "\xf3\xbe\xa5\xb2"=>":meat_on_bone:",
-            "\xee\x93\x84"=>":meat_on_bone:",
-            "\xf0\x9f\x8d\x97"=>":poultry_leg:",
-            "\xf3\xbe\xa5\xb6"=>":poultry_leg:",
-            "\xee\xac\xbc"=>":poultry_leg:",
-            "\xf0\x9f\x8d\x98"=>":rice_cracker:",
-            "\xf3\xbe\xa5\xa9"=>":rice_cracker:",
-            "\xee\x8c\xbd"=>":rice_cracker:",
-            "\xee\xaa\xb3"=>":rice_cracker:",
-            "\xf0\x9f\x8d\x99"=>":rice_ball:",
-            "\xf3\xbe\xa5\xa1"=>":rice_ball:",
-            "\xee\x9d\x89"=>":rice_ball:",
-            "\xee\x8d\x82"=>":rice_ball:",
-            "\xee\x93\x95"=>":rice_ball:",
-            "\xf0\x9f\x8d\x9a"=>":rice:",
-            "\xf3\xbe\xa5\xaa"=>":rice:",
-            "\xee\x9d\x8c"=>":ramen:",
-            "\xee\x8c\xbe"=>":rice:",
-            "\xee\xaa\xb4"=>":rice:",
-            "\xf0\x9f\x8d\x9b"=>":curry:",
-            "\xf3\xbe\xa5\xac"=>":curry:",
-            "\xee\x8d\x81"=>":curry:",
-            "\xee\xaa\xb6"=>":curry:",
-            "\xf0\x9f\x8d\x9c"=>":ramen:",
-            "\xf3\xbe\xa5\xa3"=>":ramen:",
-            "\xee\x8d\x80"=>":ramen:",
-            "\xee\x96\xb4"=>":ramen:",
-            "\xf0\x9f\x8d\x9d"=>":spaghetti:",
-            "\xf3\xbe\xa5\xab"=>":spaghetti:",
-            "\xee\x8c\xbf"=>":spaghetti:",
-            "\xee\xaa\xb5"=>":spaghetti:",
-            "\xf0\x9f\x8d\x9e"=>":bread:",
-            "\xf3\xbe\xa5\xa4"=>":bread:",
-            "\xee\x9d\x8d"=>":bread:",
-            "\xee\x8c\xb9"=>":bread:",
-            "\xee\xaa\xaf"=>":bread:",
-            "\xf0\x9f\x8d\x9f"=>":fries:",
-            "\xf3\xbe\xa5\xa7"=>":fries:",
-            "\xee\x8c\xbb"=>":fries:",
-            "\xee\xaa\xb1"=>":fries:",
-            "\xf0\x9f\x8d\xa0"=>":sweet_potato:",
-            "\xf3\xbe\xa5\xb4"=>":sweet_potato:",
-            "\xee\xac\xba"=>":sweet_potato:",
-            "\xf0\x9f\x8d\xa1"=>":dango:",
-            "\xf3\xbe\xa5\xa8"=>":dango:",
-            "\xee\x8c\xbc"=>":dango:",
-            "\xee\xaa\xb2"=>":dango:",
-            "\xf0\x9f\x8d\xa2"=>":oden:",
-            "\xf3\xbe\xa5\xad"=>":oden:",
-            "\xee\x8d\x83"=>":oden:",
-            "\xee\xaa\xb7"=>":oden:",
-            "\xf0\x9f\x8d\xa3"=>":sushi:",
-            "\xf3\xbe\xa5\xae"=>":sushi:",
-            "\xee\x8d\x84"=>":sushi:",
-            "\xee\xaa\xb8"=>":sushi:",
-            "\xf0\x9f\x8d\xa4"=>":fried_shrimp:",
-            "\xf3\xbe\xa5\xbf"=>":fried_shrimp:",
-            "\xee\xad\xb0"=>":fried_shrimp:",
-            "\xf0\x9f\x8d\xa5"=>":fish_cake:",
-            "\xf3\xbe\xa5\xb3"=>":fish_cake:",
-            "\xee\x93\xad"=>":fish_cake:",
-            "\xf0\x9f\x8d\xa6"=>":icecream:",
-            "\xf3\xbe\xa5\xa6"=>":icecream:",
-            "\xee\x8c\xba"=>":icecream:",
-            "\xee\xaa\xb0"=>":icecream:",
-            "\xf0\x9f\x8d\xa7"=>":shaved_ice:",
-            "\xf3\xbe\xa5\xb1"=>":shaved_ice:",
-            "\xee\x90\xbf"=>":shaved_ice:",
-            "\xee\xab\xaa"=>":shaved_ice:",
-            "\xf0\x9f\x8d\xa8"=>":ice_cream:",
-            "\xf3\xbe\xa5\xb7"=>":ice_cream:",
-            "\xee\xad\x8a"=>":ice_cream:",
-            "\xf0\x9f\x8d\xa9"=>":doughnut:",
-            "\xf3\xbe\xa5\xb8"=>":doughnut:",
-            "\xee\xad\x8b"=>":doughnut:",
-            "\xf0\x9f\x8d\xaa"=>":cookie:",
-            "\xf3\xbe\xa5\xb9"=>":cookie:",
-            "\xee\xad\x8c"=>":cookie:",
-            "\xf0\x9f\x8d\xab"=>":chocolate_bar:",
-            "\xf3\xbe\xa5\xba"=>":chocolate_bar:",
-            "\xee\xad\x8d"=>":chocolate_bar:",
-            "\xf0\x9f\x8d\xac"=>":candy:",
-            "\xf3\xbe\xa5\xbb"=>":candy:",
-            "\xee\xad\x8e"=>":candy:",
-            "\xf0\x9f\x8d\xad"=>":lollipop:",
-            "\xf3\xbe\xa5\xbc"=>":lollipop:",
-            "\xee\xad\x8f"=>":lollipop:",
-            "\xf0\x9f\x8d\xae"=>":custard:",
-            "\xf3\xbe\xa5\xbd"=>":custard:",
-            "\xee\xad\x96"=>":custard:",
-            "\xf0\x9f\x8d\xaf"=>":honey_pot:",
-            "\xf3\xbe\xa5\xbe"=>":honey_pot:",
-            "\xee\xad\x99"=>":honey_pot:",
-            "\xf0\x9f\x8d\xb0"=>":cake:",
-            "\xf3\xbe\xa5\xa2"=>":cake:",
-            "\xee\x9d\x8a"=>":cake:",
-            "\xee\x81\x86"=>":cake:",
-            "\xee\x93\x90"=>":cake:",
-            "\xf0\x9f\x8d\xb1"=>":bento:",
-            "\xf3\xbe\xa5\xaf"=>":bento:",
-            "\xee\x8d\x8c"=>":bento:",
-            "\xee\xaa\xbd"=>":bento:",
-            "\xf0\x9f\x8d\xb2"=>":stew:",
-            "\xf3\xbe\xa5\xb0"=>":stew:",
-            "\xee\x8d\x8d"=>":stew:",
-            "\xee\xaa\xbe"=>":stew:",
-            "\xf0\x9f\x8d\xb3"=>":egg:",
-            "\xf3\xbe\xa5\xa5"=>":egg:",
-            "\xee\x85\x87"=>":egg:",
-            "\xee\x93\x91"=>":egg:",
-            "\xf0\x9f\x8d\xb4"=>":fork_and_knife:",
-            "\xf3\xbe\xa6\x80"=>":fork_and_knife:",
-            "\xee\x99\xaf"=>":fork_and_knife:",
-            "\xee\x81\x83"=>":fork_and_knife:",
-            "\xee\x92\xac"=>":fork_and_knife:",
-            "\xf0\x9f\x8d\xb5"=>":tea:",
-            "\xf3\xbe\xa6\x84"=>":tea:",
-            "\xee\x9c\x9e"=>":tea:",
-            "\xee\x8c\xb8"=>":tea:",
-            "\xee\xaa\xae"=>":tea:",
-            "\xf0\x9f\x8d\xb6"=>":sake:",
-            "\xf3\xbe\xa6\x85"=>":sake:",
-            "\xee\x9d\x8b"=>":lantern:",
-            "\xee\x8c\x8b"=>":lantern:",
-            "\xee\xaa\x97"=>":sake:",
-            "\xf0\x9f\x8d\xb7"=>":wine_glass:",
-            "\xf3\xbe\xa6\x86"=>":wine_glass:",
-            "\xee\x9d\x96"=>":wine_glass:",
-            "\xee\x81\x84"=>":tropical_drink:",
-            "\xee\x93\x81"=>":wine_glass:",
-            "\xf0\x9f\x8d\xb8"=>":cocktail:",
-            "\xf3\xbe\xa6\x82"=>":cocktail:",
-            "\xee\x99\xb1"=>":tropical_drink:",
-            "\xee\x93\x82"=>":cocktail:",
-            "\xf0\x9f\x8d\xb9"=>":tropical_drink:",
-            "\xf3\xbe\xa6\x88"=>":tropical_drink:",
-            "\xee\xac\xbe"=>":tropical_drink:",
-            "\xf0\x9f\x8d\xba"=>":beer:",
-            "\xf3\xbe\xa6\x83"=>":beer:",
-            "\xee\x99\xb2"=>":beers:",
-            "\xee\x81\x87"=>":beer:",
-            "\xee\x93\x83"=>":beer:",
-            "\xf0\x9f\x8d\xbb"=>":beers:",
-            "\xf3\xbe\xa6\x87"=>":beers:",
-            "\xee\x8c\x8c"=>":beers:",
-            "\xee\xaa\x98"=>":beers:",
-            "\xf0\x9f\x8d\xbc"=>":baby_bottle:",
-            "\xf0\x9f\x8d\xbd"=>":knife_fork_plate:",
-            "\xf0\x9f\x8d\xbe"=>":champagne:",
-            "\xf0\x9f\x8d\xbf"=>":popcorn:",
-            "\xf0\x9f\x8e\x80"=>":ribbon:",
-            "\xf3\xbe\x94\x8f"=>":ribbon:",
-            "\xee\x9a\x84"=>":ribbon:",
-            "\xee\x8c\x94"=>":ribbon:",
-            "\xee\x96\x9f"=>":ribbon:",
-            "\xf0\x9f\x8e\x81"=>":gift:",
-            "\xf3\xbe\x94\x90"=>":gift:",
-            "\xee\x9a\x85"=>":package:",
-            "\xee\x84\x92"=>":package:",
-            "\xee\x93\x8f"=>":gift:",
-            "\xf0\x9f\x8e\x82"=>":birthday:",
-            "\xf3\xbe\x94\x91"=>":birthday:",
-            "\xee\x9a\x86"=>":birthday:",
-            "\xee\x8d\x8b"=>":birthday:",
-            "\xee\x96\xa0"=>":birthday:",
-            "\xf0\x9f\x8e\x83"=>":jack_o_lantern:",
-            "\xf3\xbe\x94\x9f"=>":jack_o_lantern:",
-            "\xee\x91\x85"=>":jack_o_lantern:",
-            "\xee\xab\xae"=>":jack_o_lantern:",
-            "\xf0\x9f\x8e\x84"=>":christmas_tree:",
-            "\xf3\xbe\x94\x92"=>":christmas_tree:",
-            "\xee\x9a\xa4"=>":christmas_tree:",
-            "\xee\x80\xb3"=>":christmas_tree:",
-            "\xee\x93\x89"=>":christmas_tree:",
-            "\xf0\x9f\x8e\x85"=>":santa:",
-            "\xf3\xbe\x94\x93"=>":santa:",
-            "\xee\x91\x88"=>":santa:",
-            "\xee\xab\xb0"=>":santa:",
-            "\xf0\x9f\x8e\x86"=>":fireworks:",
-            "\xf3\xbe\x94\x95"=>":fireworks:",
-            "\xee\x84\x97"=>":fireworks:",
-            "\xee\x97\x8c"=>":fireworks:",
-            "\xf0\x9f\x8e\x87"=>":sparkler:",
-            "\xf3\xbe\x94\x9d"=>":sparkler:",
-            "\xee\x91\x80"=>":sparkler:",
-            "\xee\xab\xab"=>":sparkler:",
-            "\xf0\x9f\x8e\x88"=>":balloon:",
-            "\xf3\xbe\x94\x96"=>":balloon:",
-            "\xee\x8c\x90"=>":balloon:",
-            "\xee\xaa\x9b"=>":balloon:",
-            "\xf0\x9f\x8e\x89"=>":tada:",
-            "\xf3\xbe\x94\x97"=>":tada:",
-            "\xee\x8c\x92"=>":tada:",
-            "\xee\xaa\x9c"=>":tada:",
-            "\xf0\x9f\x8e\x8a"=>":confetti_ball:",
-            "\xf3\xbe\x94\xa0"=>":confetti_ball:",
-            "\xee\x91\xaf"=>":confetti_ball:",
-            "\xf0\x9f\x8e\x8b"=>":tanabata_tree:",
-            "\xf3\xbe\x94\xa1"=>":tanabata_tree:",
-            "\xee\xac\xbd"=>":tanabata_tree:",
-            "\xf0\x9f\x8e\x8c"=>":crossed_flags:",
-            "\xf3\xbe\x94\x94"=>":crossed_flags:",
-            "\xee\x85\x83"=>":crossed_flags:",
-            "\xee\x97\x99"=>":crossed_flags:",
-            "\xf0\x9f\x8e\x8d"=>":bamboo:",
-            "\xf3\xbe\x94\x98"=>":bamboo:",
-            "\xee\x90\xb6"=>":bamboo:",
-            "\xee\xab\xa3"=>":bamboo:",
-            "\xf0\x9f\x8e\x8e"=>":dolls:",
-            "\xf3\xbe\x94\x99"=>":dolls:",
-            "\xee\x90\xb8"=>":dolls:",
-            "\xee\xab\xa4"=>":dolls:",
-            "\xf0\x9f\x8e\x8f"=>":flags:",
-            "\xf3\xbe\x94\x9c"=>":flags:",
-            "\xee\x90\xbb"=>":flags:",
-            "\xee\xab\xa7"=>":flags:",
-            "\xf0\x9f\x8e\x90"=>":wind_chime:",
-            "\xf3\xbe\x94\x9e"=>":wind_chime:",
-            "\xee\x91\x82"=>":wind_chime:",
-            "\xee\xab\xad"=>":wind_chime:",
-            "\xf0\x9f\x8e\x91"=>":rice_scene:",
-            "\xf3\xbe\x80\x97"=>":rice_scene:",
-            "\xee\x91\x86"=>":rice_scene:",
-            "\xee\xab\xaf"=>":rice_scene:",
-            "\xf0\x9f\x8e\x92"=>":school_satchel:",
-            "\xf3\xbe\x94\x9b"=>":school_satchel:",
-            "\xee\x90\xba"=>":school_satchel:",
-            "\xee\xab\xa6"=>":school_satchel:",
-            "\xf0\x9f\x8e\x93"=>":mortar_board:",
-            "\xf3\xbe\x94\x9a"=>":mortar_board:",
-            "\xee\x90\xb9"=>":mortar_board:",
-            "\xee\xab\xa5"=>":mortar_board:",
-            "\xf0\x9f\x8e\x96"=>":medal:",
-            "\xf0\x9f\x8e\x97"=>":reminder_ribbon:",
-            "\xf0\x9f\x8e\x99"=>":studio_microphone:",
-            "\xf0\x9f\x8e\x9a"=>":level_slider:",
-            "\xf0\x9f\x8e\x9b"=>":control_knobs:",
-            "\xf0\x9f\x8e\x9e"=>":film_frames:",
-            "\xf0\x9f\x8e\x9f"=>":admission_tickets:",
-            "\xf0\x9f\x8e\xa0"=>":carousel_horse:",
-            "\xf3\xbe\x9f\xbc"=>":carousel_horse:",
-            "\xee\x99\xb9"=>":carousel_horse:",
-            "\xf0\x9f\x8e\xa1"=>":ferris_wheel:",
-            "\xf3\xbe\x9f\xbd"=>":ferris_wheel:",
-            "\xee\x84\xa4"=>":ferris_wheel:",
-            "\xee\x91\xad"=>":ferris_wheel:",
-            "\xf0\x9f\x8e\xa2"=>":roller_coaster:",
-            "\xf3\xbe\x9f\xbe"=>":roller_coaster:",
-            "\xee\x90\xb3"=>":roller_coaster:",
-            "\xee\xab\xa2"=>":roller_coaster:",
-            "\xf0\x9f\x8e\xa3"=>":fishing_pole_and_fish:",
-            "\xf3\xbe\x9f\xbf"=>":fishing_pole_and_fish:",
-            "\xee\x9d\x91"=>":blowfish:",
-            "\xee\x80\x99"=>":blowfish:",
-            "\xee\xad\x82"=>":fishing_pole_and_fish:",
-            "\xf0\x9f\x8e\xa4"=>":microphone:",
-            "\xf3\xbe\xa0\x80"=>":microphone:",
-            "\xee\x99\xb6"=>":microphone:",
-            "\xee\x80\xbc"=>":microphone:",
-            "\xee\x94\x83"=>":performing_arts:",
-            "\xf0\x9f\x8e\xa5"=>":movie_camera:",
-            "\xf3\xbe\xa0\x81"=>":movie_camera:",
-            "\xee\x99\xb7"=>":video_camera:",
-            "\xee\x80\xbd"=>":video_camera:",
-            "\xee\x94\x97"=>":man_with_turban:",
-            "\xf0\x9f\x8e\xa6"=>":cinema:",
-            "\xf3\xbe\xa0\x82"=>":cinema:",
-            "\xee\x94\x87"=>":violin:",
-            "\xf0\x9f\x8e\xa7"=>":headphones:",
-            "\xf3\xbe\xa0\x83"=>":headphones:",
-            "\xee\x99\xba"=>":headphones:",
-            "\xee\x8c\x8a"=>":headphones:",
-            "\xee\x94\x88"=>":factory:",
-            "\xf0\x9f\x8e\xa8"=>":art:",
-            "\xf3\xbe\xa0\x84"=>":art:",
-            "\xee\x99\xbb"=>":art:",
-            "\xee\x94\x82"=>":tv:",
-            "\xee\x96\x9c"=>":art:",
-            "\xf0\x9f\x8e\xa9"=>":tophat:",
-            "\xf3\xbe\xa0\x85"=>":tophat:",
-            "\xee\x99\xbc"=>":tophat:",
-            "\xee\xab\xb5"=>":tophat:",
-            "\xf0\x9f\x8e\xaa"=>":circus_tent:",
-            "\xf3\xbe\xa0\x86"=>":circus_tent:",
-            "\xee\x99\xbd"=>":circus_tent:",
-            "\xee\x96\x9e"=>":circus_tent:",
-            "\xf0\x9f\x8e\xab"=>":ticket:",
-            "\xf3\xbe\xa0\x87"=>":ticket:",
-            "\xee\x99\xbe"=>":ticket:",
-            "\xee\x84\xa5"=>":ticket:",
-            "\xee\x92\x9e"=>":ticket:",
-            "\xf0\x9f\x8e\xac"=>":clapper:",
-            "\xf3\xbe\xa0\x88"=>":clapper:",
-            "\xee\x9a\xac"=>":clapper:",
-            "\xee\x8c\xa4"=>":clapper:",
-            "\xee\x92\xbe"=>":clapper:",
-            "\xf0\x9f\x8e\xad"=>":performing_arts:",
-            "\xf3\xbe\xa0\x89"=>":performing_arts:",
-            "\xee\x96\x9d"=>":performing_arts:",
-            "\xf0\x9f\x8e\xae"=>":video_game:",
-            "\xf3\xbe\xa0\x8a"=>":video_game:",
-            "\xee\x9a\x8b"=>":video_game:",
-            "\xee\x93\x86"=>":video_game:",
-            "\xf0\x9f\x8e\xaf"=>":dart:",
-            "\xf3\xbe\xa0\x8c"=>":dart:",
-            "\xee\x84\xb0"=>":dart:",
-            "\xee\x93\x85"=>":dart:",
-            "\xf0\x9f\x8e\xb0"=>":slot_machine:",
-            "\xf3\xbe\xa0\x8d"=>":slot_machine:",
-            "\xee\x84\xb3"=>":slot_machine:",
-            "\xee\x91\xae"=>":slot_machine:",
-            "\xf0\x9f\x8e\xb1"=>":8ball:",
-            "\xf3\xbe\xa0\x8e"=>":8ball:",
-            "\xee\x90\xac"=>":8ball:",
-            "\xee\xab\x9d"=>":8ball:",
-            "\xf0\x9f\x8e\xb2"=>":game_die:",
-            "\xf3\xbe\xa0\x8f"=>":game_die:",
-            "\xee\x93\x88"=>":game_die:",
-            "\xf0\x9f\x8e\xb3"=>":bowling:",
-            "\xf3\xbe\xa0\x90"=>":bowling:",
-            "\xee\xad\x83"=>":bowling:",
-            "\xf0\x9f\x8e\xb4"=>":flower_playing_cards:",
-            "\xf3\xbe\xa0\x91"=>":flower_playing_cards:",
-            "\xee\xad\xae"=>":flower_playing_cards:",
-            "\xf0\x9f\x8e\xb5"=>":musical_note:",
-            "\xf3\xbe\xa0\x93"=>":musical_note:",
-            "\xee\x9b\xb6"=>":musical_note:",
-            "\xee\x80\xbe"=>":musical_note:",
-            "\xee\x96\xbe"=>":musical_note:",
-            "\xf0\x9f\x8e\xb6"=>":notes:",
-            "\xf3\xbe\xa0\x94"=>":notes:",
-            "\xee\x9b\xbf"=>":musical_score:",
-            "\xee\x8c\xa6"=>":musical_score:",
-            "\xee\x94\x85"=>":japanese_castle:",
-            "\xf0\x9f\x8e\xb7"=>":saxophone:",
-            "\xf3\xbe\xa0\x95"=>":saxophone:",
-            "\xee\x81\x80"=>":saxophone:",
-            "\xf0\x9f\x8e\xb8"=>":guitar:",
-            "\xf3\xbe\xa0\x96"=>":guitar:",
-            "\xee\x81\x81"=>":guitar:",
-            "\xee\x94\x86"=>":european_castle:",
-            "\xf0\x9f\x8e\xb9"=>":musical_keyboard:",
-            "\xf3\xbe\xa0\x97"=>":musical_keyboard:",
-            "\xee\xad\x80"=>":musical_keyboard:",
-            "\xf0\x9f\x8e\xba"=>":trumpet:",
-            "\xf3\xbe\xa0\x98"=>":trumpet:",
-            "\xee\x81\x82"=>":trumpet:",
-            "\xee\xab\x9c"=>":trumpet:",
-            "\xf0\x9f\x8e\xbb"=>":violin:",
-            "\xf3\xbe\xa0\x99"=>":violin:",
-            "\xf0\x9f\x8e\xbc"=>":musical_score:",
-            "\xf3\xbe\xa0\x9a"=>":musical_score:",
-            "\xee\xab\x8c"=>":musical_score:",
-            "\xf0\x9f\x8e\xbd"=>":running_shirt_with_sash:",
-            "\xf3\xbe\x9f\x90"=>":running_shirt_with_sash:",
-            "\xee\x99\x92"=>":running_shirt_with_sash:",
-            "\xf0\x9f\x8e\xbe"=>":tennis:",
-            "\xf3\xbe\x9f\x93"=>":tennis:",
-            "\xee\x99\x95"=>":tennis:",
-            "\xee\x80\x95"=>":tennis:",
-            "\xee\x92\xb7"=>":tennis:",
-            "\xf0\x9f\x8e\xbf"=>":ski:",
-            "\xf3\xbe\x9f\x95"=>":ski:",
-            "\xee\x99\x97"=>":ski:",
-            "\xee\x80\x93"=>":ski:",
-            "\xee\xaa\xac"=>":ski:",
-            "\xf0\x9f\x8f\x80"=>":basketball:",
-            "\xf3\xbe\x9f\x96"=>":basketball:",
-            "\xee\x99\x98"=>":basketball:",
-            "\xee\x90\xaa"=>":basketball:",
-            "\xee\x96\x9a"=>":basketball:",
-            "\xf0\x9f\x8f\x81"=>":checkered_flag:",
-            "\xf3\xbe\x9f\x97"=>":checkered_flag:",
-            "\xee\x99\x99"=>":checkered_flag:",
-            "\xee\x84\xb2"=>":checkered_flag:",
-            "\xee\x92\xb9"=>":checkered_flag:",
-            "\xf0\x9f\x8f\x82"=>":snowboarder:",
-            "\xf3\xbe\x9f\x98"=>":snowboarder:",
-            "\xee\x9c\x92"=>":surfer:",
-            "\xee\x92\xb8"=>":snowboarder:",
-            "\xf0\x9f\x8f\x83"=>":running:",
-            "\xf3\xbe\x9f\x99"=>":running:",
-            "\xee\x9c\xb3"=>":walking:",
-            "\xee\x84\x95"=>":running:",
-            "\xee\x91\xab"=>":running:",
-            "\xf0\x9f\x8f\x84"=>":surfer:",
-            "\xf3\xbe\x9f\x9a"=>":surfer:",
-            "\xee\x80\x97"=>":surfer:",
-            "\xee\xad\x81"=>":surfer:",
-            "\xf0\x9f\x8f\x85"=>":sports_medal:",
-            "\xf0\x9f\x8f\x86"=>":trophy:",
-            "\xf3\xbe\x9f\x9b"=>":trophy:",
-            "\xee\x84\xb1"=>":trophy:",
-            "\xee\x97\x93"=>":trophy:",
-            "\xf0\x9f\x8f\x87"=>":horse_racing:",
-            "\xf0\x9f\x8f\x88"=>":football:",
-            "\xf3\xbe\x9f\x9d"=>":football:",
-            "\xee\x90\xab"=>":football:",
-            "\xee\x92\xbb"=>":football:",
-            "\xf0\x9f\x8f\x89"=>":rugby_football:",
-            "\xf0\x9f\x8f\x8a"=>":swimmer:",
-            "\xf3\xbe\x9f\x9e"=>":swimmer:",
-            "\xee\x90\xad"=>":swimmer:",
-            "\xee\xab\x9e"=>":swimmer:",
-            "\xf0\x9f\x8f\x8b"=>":weight_lifter:",
-            "\xf0\x9f\x8f\x8c"=>":golfer:",
-            "\xf0\x9f\x8f\x8d"=>":racing_motorcycle:",
-            "\xf0\x9f\x8f\x8e"=>":racing_car:",
-            "\xf0\x9f\x8f\x8f"=>":cricket_bat_and_ball:",
-            "\xf0\x9f\x8f\x90"=>":volleyball:",
-            "\xf0\x9f\x8f\x91"=>":field_hockey_stick_and_ball:",
-            "\xf0\x9f\x8f\x92"=>":ice_hockey_stick_and_puck:",
-            "\xf0\x9f\x8f\x93"=>":table_tennis_paddle_and_ball:",
-            "\xf0\x9f\x8f\x94"=>":snow_capped_mountain:",
-            "\xf0\x9f\x8f\x95"=>":camping:",
-            "\xf0\x9f\x8f\x96"=>":beach_with_umbrella:",
-            "\xf0\x9f\x8f\x97"=>":building_construction:",
-            "\xf0\x9f\x8f\x98"=>":house_buildings:",
-            "\xf0\x9f\x8f\x99"=>":cityscape:",
-            "\xf0\x9f\x8f\x9a"=>":derelict_house_building:",
-            "\xf0\x9f\x8f\x9b"=>":classical_building:",
-            "\xf0\x9f\x8f\x9c"=>":desert:",
-            "\xf0\x9f\x8f\x9d"=>":desert_island:",
-            "\xf0\x9f\x8f\x9e"=>":national_park:",
-            "\xf0\x9f\x8f\x9f"=>":stadium:",
-            "\xf0\x9f\x8f\xa0"=>":house:",
-            "\xf3\xbe\x92\xb0"=>":house:",
-            "\xee\x99\xa3"=>":house_with_garden:",
-            "\xee\x80\xb6"=>":house_with_garden:",
-            "\xee\x92\xab"=>":house:",
-            "\xf0\x9f\x8f\xa1"=>":house_with_garden:",
-            "\xf3\xbe\x92\xb1"=>":house_with_garden:",
-            "\xee\xac\x89"=>":house_with_garden:",
-            "\xf0\x9f\x8f\xa2"=>":office:",
-            "\xf3\xbe\x92\xb2"=>":office:",
-            "\xee\x99\xa4"=>":office:",
-            "\xee\x80\xb8"=>":office:",
-            "\xee\x92\xad"=>":office:",
-            "\xf0\x9f\x8f\xa3"=>":post_office:",
-            "\xf3\xbe\x92\xb3"=>":post_office:",
-            "\xee\x99\xa5"=>":postbox:",
-            "\xee\x85\x93"=>":post_office:",
-            "\xee\x97\x9e"=>":post_office:",
-            "\xf0\x9f\x8f\xa4"=>":european_post_office:",
-            "\xf0\x9f\x8f\xa5"=>":hospital:",
-            "\xf3\xbe\x92\xb4"=>":hospital:",
-            "\xee\x99\xa6"=>":hospital:",
-            "\xee\x85\x95"=>":hospital:",
-            "\xee\x97\x9f"=>":hospital:",
-            "\xf0\x9f\x8f\xa6"=>":bank:",
-            "\xf3\xbe\x92\xb5"=>":bank:",
-            "\xee\x99\xa7"=>":bank:",
-            "\xee\x85\x8d"=>":bank:",
-            "\xee\x92\xaa"=>":bank:",
-            "\xf0\x9f\x8f\xa7"=>":atm:",
-            "\xf3\xbe\x92\xb6"=>":atm:",
-            "\xee\x99\xa8"=>":atm:",
-            "\xee\x85\x94"=>":atm:",
-            "\xee\x92\xa3"=>":atm:",
-            "\xf0\x9f\x8f\xa8"=>":hotel:",
-            "\xf3\xbe\x92\xb7"=>":hotel:",
-            "\xee\x99\xa9"=>":hotel:",
-            "\xee\x85\x98"=>":hotel:",
-            "\xee\xaa\x81"=>":hotel:",
-            "\xf0\x9f\x8f\xa9"=>":love_hotel:",
-            "\xf3\xbe\x92\xb8"=>":love_hotel:",
-            "\xee\x99\xa9\xee\x9b\xaf"=>":love_hotel:",
-            "\xee\x94\x81"=>":man-woman-boy:",
-            "\xee\xab\xb3"=>":love_hotel:",
-            "\xf0\x9f\x8f\xaa"=>":convenience_store:",
-            "\xf3\xbe\x92\xb9"=>":convenience_store:",
-            "\xee\x99\xaa"=>":convenience_store:",
-            "\xee\x85\x96"=>":convenience_store:",
-            "\xee\x92\xa4"=>":convenience_store:",
-            "\xf0\x9f\x8f\xab"=>":school:",
-            "\xf3\xbe\x92\xba"=>":school:",
-            "\xee\x9c\xbe"=>":school:",
-            "\xee\x85\x97"=>":school:",
-            "\xee\xaa\x80"=>":school:",
-            "\xf0\x9f\x8f\xac"=>":department_store:",
-            "\xf3\xbe\x92\xbd"=>":department_store:",
-            "\xee\x94\x84"=>":purse:",
-            "\xee\xab\xb6"=>":department_store:",
-            "\xf0\x9f\x8f\xad"=>":factory:",
-            "\xf3\xbe\x93\x80"=>":factory:",
-            "\xee\xab\xb9"=>":factory:",
-            "\xf0\x9f\x8f\xae"=>":lantern:",
-            "\xf3\xbe\x93\x82"=>":lantern:",
-            "\xee\x92\xbd"=>":lantern:",
-            "\xf0\x9f\x8f\xaf"=>":japanese_castle:",
-            "\xf3\xbe\x92\xbe"=>":japanese_castle:",
-            "\xee\xab\xb7"=>":japanese_castle:",
-            "\xf0\x9f\x8f\xb0"=>":european_castle:",
-            "\xf3\xbe\x92\xbf"=>":european_castle:",
-            "\xee\xab\xb8"=>":european_castle:",
-            "\xf0\x9f\x8f\xb3"=>":waving_white_flag:",
-            "\xf0\x9f\x8f\xb4"=>":waving_black_flag:",
-            "\xf0\x9f\x8f\xb5"=>":rosette:",
-            "\xf0\x9f\x8f\xb7"=>":label:",
-            "\xf0\x9f\x8f\xb8"=>":badminton_racquet_and_shuttlecock:",
-            "\xf0\x9f\x8f\xb9"=>":bow_and_arrow:",
-            "\xf0\x9f\x8f\xba"=>":amphora:",
-            "\xf0\x9f\x8f\xbb"=>":skin-tone-2:",
-            "\xf0\x9f\x8f\xbc"=>":skin-tone-3:",
-            "\xf0\x9f\x8f\xbd"=>":skin-tone-4:",
-            "\xf0\x9f\x8f\xbe"=>":skin-tone-5:",
-            "\xf0\x9f\x8f\xbf"=>":skin-tone-6:",
-            "\xf0\x9f\x90\x80"=>":rat:",
-            "\xf0\x9f\x90\x81"=>":mouse2:",
-            "\xf0\x9f\x90\x82"=>":ox:",
-            "\xf0\x9f\x90\x83"=>":water_buffalo:",
-            "\xf0\x9f\x90\x84"=>":cow2:",
-            "\xf0\x9f\x90\x85"=>":tiger2:",
-            "\xf0\x9f\x90\x86"=>":leopard:",
-            "\xf0\x9f\x90\x87"=>":rabbit2:",
-            "\xf0\x9f\x90\x88"=>":cat2:",
-            "\xf0\x9f\x90\x89"=>":dragon:",
-            "\xf0\x9f\x90\x8a"=>":crocodile:",
-            "\xf0\x9f\x90\x8b"=>":whale2:",
-            "\xf0\x9f\x90\x8c"=>":snail:",
-            "\xf3\xbe\x86\xb9"=>":snail:",
-            "\xee\x9d\x8e"=>":snail:",
-            "\xee\xad\xbe"=>":snail:",
-            "\xf0\x9f\x90\x8d"=>":snake:",
-            "\xf3\xbe\x87\x93"=>":snake:",
-            "\xee\xac\xa2"=>":snake:",
-            "\xf0\x9f\x90\x8e"=>":racehorse:",
-            "\xf3\xbe\x9f\x9c"=>":racehorse:",
-            "\xee\x9d\x94"=>":horse:",
-            "\xee\x84\xb4"=>":racehorse:",
-            "\xee\x93\x98"=>":horse:",
-            "\xf0\x9f\x90\x8f"=>":ram:",
-            "\xf0\x9f\x90\x90"=>":goat:",
-            "\xf0\x9f\x90\x91"=>":sheep:",
-            "\xf3\xbe\x87\x8f"=>":sheep:",
-            "\xee\x94\xa9"=>":eight:",
-            "\xf0\x9f\x90\x92"=>":monkey:",
-            "\xf3\xbe\x87\x8e"=>":monkey:",
-            "\xee\x94\xa8"=>":seven:",
-            "\xee\x93\x99"=>":monkey_face:",
-            "\xf0\x9f\x90\x93"=>":rooster:",
-            "\xf0\x9f\x90\x94"=>":chicken:",
-            "\xf3\xbe\x87\x94"=>":chicken:",
-            "\xee\xac\xa3"=>":chicken:",
-            "\xf0\x9f\x90\x95"=>":dog2:",
-            "\xf0\x9f\x90\x96"=>":pig2:",
-            "\xf0\x9f\x90\x97"=>":boar:",
-            "\xf3\xbe\x87\x95"=>":boar:",
-            "\xee\xac\xa4"=>":boar:",
-            "\xf0\x9f\x90\x98"=>":elephant:",
-            "\xf3\xbe\x87\x8c"=>":elephant:",
-            "\xee\x94\xa6"=>":five:",
-            "\xee\xac\x9f"=>":elephant:",
-            "\xf0\x9f\x90\x99"=>":octopus:",
-            "\xf3\xbe\x87\x85"=>":octopus:",
-            "\xee\x84\x8a"=>":octopus:",
-            "\xee\x97\x87"=>":octopus:",
-            "\xf0\x9f\x90\x9a"=>":shell:",
-            "\xf3\xbe\x87\x86"=>":shell:",
-            "\xee\x91\x81"=>":shell:",
-            "\xee\xab\xac"=>":shell:",
-            "\xf0\x9f\x90\x9b"=>":bug:",
-            "\xf3\xbe\x87\x8b"=>":bug:",
-            "\xee\x94\xa5"=>":four:",
-            "\xee\xac\x9e"=>":bug:",
-            "\xf0\x9f\x90\x9c"=>":ant:",
-            "\xf3\xbe\x87\x9a"=>":ant:",
-            "\xee\x93\x9d"=>":ant:",
-            "\xf0\x9f\x90\x9d"=>":honeybee:",
-            "\xf3\xbe\x87\xa1"=>":honeybee:",
-            "\xee\xad\x97"=>":honeybee:",
-            "\xf0\x9f\x90\x9e"=>":beetle:",
-            "\xf3\xbe\x87\xa2"=>":beetle:",
-            "\xee\xad\x98"=>":beetle:",
-            "\xf0\x9f\x90\x9f"=>":fish:",
-            "\xf3\xbe\x86\xbd"=>":fish:",
-            "\xf0\x9f\x90\xa0"=>":tropical_fish:",
-            "\xf3\xbe\x87\x89"=>":tropical_fish:",
-            "\xee\x94\xa2"=>":one:",
-            "\xee\xac\x9d"=>":tropical_fish:",
-            "\xf0\x9f\x90\xa1"=>":blowfish:",
-            "\xf3\xbe\x87\x99"=>":blowfish:",
-            "\xee\x93\x93"=>":blowfish:",
-            "\xf0\x9f\x90\xa2"=>":turtle:",
-            "\xf3\xbe\x87\x9c"=>":turtle:",
-            "\xee\x97\x94"=>":turtle:",
-            "\xf0\x9f\x90\xa3"=>":hatching_chick:",
-            "\xf3\xbe\x87\x9d"=>":hatching_chick:",
-            "\xee\x9d\x8f"=>":bird:",
-            "\xee\x94\xa3"=>":two:",
-            "\xee\x97\x9b"=>":hatching_chick:",
-            "\xf0\x9f\x90\xa4"=>":baby_chick:",
-            "\xf3\xbe\x86\xba"=>":baby_chick:",
-            "\xee\x93\xa0"=>":bird:",
-            "\xf0\x9f\x90\xa5"=>":hatched_chick:",
-            "\xf3\xbe\x86\xbb"=>":hatched_chick:",
-            "\xee\xad\xb6"=>":hatched_chick:",
-            "\xf0\x9f\x90\xa6"=>":bird:",
-            "\xf3\xbe\x87\x88"=>":bird:",
-            "\xf0\x9f\x90\xa7"=>":penguin:",
-            "\xf3\xbe\x86\xbc"=>":penguin:",
-            "\xee\x9d\x90"=>":penguin:",
-            "\xee\x81\x95"=>":penguin:",
-            "\xee\x93\x9c"=>":penguin:",
-            "\xf0\x9f\x90\xa8"=>":koala:",
-            "\xf3\xbe\x87\x8d"=>":koala:",
-            "\xee\x94\xa7"=>":six:",
-            "\xee\xac\xa0"=>":koala:",
-            "\xf0\x9f\x90\xa9"=>":poodle:",
-            "\xf3\xbe\x87\x98"=>":poodle:",
-            "\xee\x9a\xa1"=>":wolf:",
-            "\xee\x81\x92"=>":dog:",
-            "\xee\x93\x9f"=>":poodle:",
-            "\xf0\x9f\x90\xaa"=>":dromedary_camel:",
-            "\xf0\x9f\x90\xab"=>":camel:",
-            "\xf3\xbe\x87\x96"=>":camel:",
-            "\xee\xac\xa5"=>":camel:",
-            "\xf0\x9f\x90\xac"=>":flipper:",
-            "\xf3\xbe\x87\x87"=>":flipper:",
-            "\xee\x94\xa0"=>":fax:",
-            "\xee\xac\x9b"=>":flipper:",
-            "\xf0\x9f\x90\xad"=>":mouse:",
-            "\xf3\xbe\x87\x82"=>":mouse:",
-            "\xee\x81\x93"=>":mouse:",
-            "\xee\x97\x82"=>":mouse:",
-            "\xf0\x9f\x90\xae"=>":cow:",
-            "\xf3\xbe\x87\x91"=>":cow:",
-            "\xee\x94\xab"=>":keycap_ten:",
-            "\xee\xac\xa1"=>":cow:",
-            "\xf0\x9f\x90\xaf"=>":tiger:",
-            "\xf3\xbe\x87\x80"=>":tiger:",
-            "\xee\x81\x90"=>":tiger:",
-            "\xee\x97\x80"=>":tiger:",
-            "\xf0\x9f\x90\xb0"=>":rabbit:",
-            "\xf3\xbe\x87\x92"=>":rabbit:",
-            "\xee\x94\xac"=>":rabbit:",
-            "\xee\x93\x97"=>":rabbit:",
-            "\xf0\x9f\x90\xb1"=>":cat:",
-            "\xf3\xbe\x86\xb8"=>":cat:",
-            "\xee\x9a\xa2"=>":cat:",
-            "\xee\x81\x8f"=>":cat:",
-            "\xee\x93\x9b"=>":cat:",
-            "\xf0\x9f\x90\xb2"=>":dragon_face:",
-            "\xf3\xbe\x87\x9e"=>":dragon_face:",
-            "\xee\xac\xbf"=>":dragon_face:",
-            "\xf0\x9f\x90\xb3"=>":whale:",
-            "\xf3\xbe\x87\x83"=>":whale:",
-            "\xee\x81\x94"=>":whale:",
-            "\xee\x91\xb0"=>":whale:",
-            "\xf0\x9f\x90\xb4"=>":horse:",
-            "\xf3\xbe\x86\xbe"=>":horse:",
-            "\xee\x80\x9a"=>":horse:",
-            "\xf0\x9f\x90\xb5"=>":monkey_face:",
-            "\xf3\xbe\x87\x84"=>":monkey_face:",
-            "\xee\x84\x89"=>":monkey_face:",
-            "\xf0\x9f\x90\xb6"=>":dog:",
-            "\xf3\xbe\x86\xb7"=>":dog:",
-            "\xee\x93\xa1"=>":wolf:",
-            "\xf0\x9f\x90\xb7"=>":pig:",
-            "\xf3\xbe\x86\xbf"=>":pig:",
-            "\xee\x9d\x95"=>":pig_nose:",
-            "\xee\x84\x8b"=>":pig_nose:",
-            "\xee\x93\x9e"=>":pig:",
-            "\xf0\x9f\x90\xb8"=>":frog:",
-            "\xf3\xbe\x87\x97"=>":frog:",
-            "\xee\x93\x9a"=>":frog:",
-            "\xf0\x9f\x90\xb9"=>":hamster:",
-            "\xf3\xbe\x87\x8a"=>":hamster:",
-            "\xee\x94\xa4"=>":three:",
-            "\xf0\x9f\x90\xba"=>":wolf:",
-            "\xf3\xbe\x87\x90"=>":wolf:",
-            "\xee\x94\xaa"=>":nine:",
-            "\xf0\x9f\x90\xbb"=>":bear:",
-            "\xf3\xbe\x87\x81"=>":bear:",
-            "\xee\x81\x91"=>":bear:",
-            "\xee\x97\x81"=>":bear:",
-            "\xf0\x9f\x90\xbc"=>":panda_face:",
-            "\xf3\xbe\x87\x9f"=>":panda_face:",
-            "\xee\xad\x86"=>":panda_face:",
-            "\xf0\x9f\x90\xbd"=>":pig_nose:",
-            "\xf3\xbe\x87\xa0"=>":pig_nose:",
-            "\xee\xad\x88"=>":pig_nose:",
-            "\xf0\x9f\x90\xbe"=>":paw_prints:",
-            "\xf3\xbe\x87\x9b"=>":paw_prints:",
-            "\xee\x9a\x98"=>":footprints:",
-            "\xee\x94\xb6"=>":small_orange_diamond:",
-            "\xee\x93\xae"=>":paw_prints:",
-            "\xf0\x9f\x90\xbf"=>":chipmunk:",
-            "\xf0\x9f\x91\x80"=>":eyes:",
-            "\xf3\xbe\x86\x90"=>":eyes:",
-            "\xee\x9a\x91"=>":eyes:",
-            "\xee\x90\x99"=>":eyes:",
-            "\xee\x96\xa4"=>":eyes:",
-            "\xf0\x9f\x91\x81"=>":eye:",
-            "\xf0\x9f\x91\x82"=>":ear:",
-            "\xf3\xbe\x86\x91"=>":ear:",
-            "\xee\x9a\x92"=>":ear:",
-            "\xee\x90\x9b"=>":ear:",
-            "\xee\x96\xa5"=>":ear:",
-            "\xf0\x9f\x91\x83"=>":nose:",
-            "\xf3\xbe\x86\x92"=>":nose:",
-            "\xee\x90\x9a"=>":nose:",
-            "\xee\xab\x90"=>":nose:",
-            "\xf0\x9f\x91\x84"=>":lips:",
-            "\xf3\xbe\x86\x93"=>":lips:",
-            "\xee\x9b\xb9"=>":couplekiss:",
-            "\xee\x90\x9c"=>":lips:",
-            "\xee\xab\x91"=>":lips:",
-            "\xf0\x9f\x91\x85"=>":tongue:",
-            "\xf3\xbe\x86\x94"=>":tongue:",
-            "\xee\x9c\xa8"=>":stuck_out_tongue_closed_eyes:",
-            "\xee\x90\x89"=>":stuck_out_tongue_closed_eyes:",
-            "\xee\xad\x87"=>":tongue:",
-            "\xf0\x9f\x91\x86"=>":point_up_2:",
-            "\xf3\xbe\xae\x99"=>":point_up_2:",
-            "\xee\x88\xae"=>":point_up_2:",
-            "\xee\xaa\x8d"=>":point_up_2:",
-            "\xf0\x9f\x91\x87"=>":point_down:",
-            "\xf3\xbe\xae\x9a"=>":point_down:",
-            "\xee\x88\xaf"=>":point_down:",
-            "\xee\xaa\x8e"=>":point_down:",
-            "\xf0\x9f\x91\x88"=>":point_left:",
-            "\xf3\xbe\xae\x9b"=>":point_left:",
-            "\xee\x88\xb0"=>":point_left:",
-            "\xee\x93\xbf"=>":point_left:",
-            "\xf0\x9f\x91\x89"=>":point_right:",
-            "\xf3\xbe\xae\x9c"=>":point_right:",
-            "\xee\x88\xb1"=>":point_right:",
-            "\xee\x94\x80"=>":point_right:",
-            "\xf0\x9f\x91\x8a"=>":punch:",
-            "\xf3\xbe\xae\x96"=>":punch:",
-            "\xee\x9b\xbd"=>":punch:",
-            "\xee\x80\x8d"=>":punch:",
-            "\xee\x93\xb3"=>":punch:",
-            "\xf0\x9f\x91\x8b"=>":wave:",
-            "\xf3\xbe\xae\x9d"=>":wave:",
-            "\xee\x90\x9e"=>":wave:",
-            "\xee\xab\x96"=>":open_hands:",
-            "\xf0\x9f\x91\x8c"=>":ok_hand:",
-            "\xf3\xbe\xae\x9f"=>":ok_hand:",
-            "\xee\x90\xa0"=>":ok_hand:",
-            "\xee\xab\x94"=>":ok_hand:",
-            "\xf0\x9f\x91\x8d"=>":thumbsup:",
-            "\xf3\xbe\xae\x97"=>":thumbsup:",
-            "\xee\x9c\xa7"=>":thumbsup:",
-            "\xee\x80\x8e"=>":thumbsup:",
-            "\xee\x93\xb9"=>":thumbsup:",
-            "\xf0\x9f\x91\x8e"=>":thumbsdown:",
-            "\xf3\xbe\xae\xa0"=>":thumbsdown:",
-            "\xee\x90\xa1"=>":thumbsdown:",
-            "\xee\xab\x95"=>":thumbsdown:",
-            "\xf0\x9f\x91\x8f"=>":clap:",
-            "\xf3\xbe\xae\x9e"=>":clap:",
-            "\xee\x90\x9f"=>":clap:",
-            "\xee\xab\x93"=>":clap:",
-            "\xf0\x9f\x91\x90"=>":open_hands:",
-            "\xf3\xbe\xae\xa1"=>":open_hands:",
-            "\xee\x90\xa2"=>":open_hands:",
-            "\xf0\x9f\x91\x91"=>":crown:",
-            "\xf3\xbe\x93\x91"=>":crown:",
-            "\xee\x9c\x9a"=>":trident:",
-            "\xee\x84\x8e"=>":crown:",
-            "\xee\x97\x89"=>":trident:",
-            "\xf0\x9f\x91\x92"=>":womans_hat:",
-            "\xf3\xbe\x93\x94"=>":womans_hat:",
-            "\xee\x8c\x98"=>":womans_hat:",
-            "\xee\xaa\x9e"=>":womans_hat:",
-            "\xf0\x9f\x91\x93"=>":eyeglasses:",
-            "\xf3\xbe\x93\x8e"=>":eyeglasses:",
-            "\xee\x9a\x9a"=>":eyeglasses:",
-            "\xee\x93\xbe"=>":eyeglasses:",
-            "\xf0\x9f\x91\x94"=>":necktie:",
-            "\xf3\xbe\x93\x93"=>":necktie:",
-            "\xee\x8c\x82"=>":necktie:",
-            "\xee\xaa\x93"=>":necktie:",
-            "\xf0\x9f\x91\x95"=>":tshirt:",
-            "\xf3\xbe\x93\x8f"=>":tshirt:",
-            "\xee\x9c\x8e"=>":womans_clothes:",
-            "\xee\x80\x86"=>":womans_clothes:",
-            "\xee\x96\xb6"=>":tshirt:",
-            "\xf0\x9f\x91\x96"=>":jeans:",
-            "\xf3\xbe\x93\x90"=>":jeans:",
-            "\xee\x9c\x91"=>":jeans:",
-            "\xee\xad\xb7"=>":jeans:",
-            "\xf0\x9f\x91\x97"=>":dress:",
-            "\xf3\xbe\x93\x95"=>":dress:",
-            "\xee\x8c\x99"=>":dress:",
-            "\xee\xad\xab"=>":dress:",
-            "\xf0\x9f\x91\x98"=>":kimono:",
-            "\xf3\xbe\x93\x99"=>":kimono:",
-            "\xee\x8c\xa1"=>":kimono:",
-            "\xee\xaa\xa3"=>":kimono:",
-            "\xf0\x9f\x91\x99"=>":bikini:",
-            "\xf3\xbe\x93\x9a"=>":bikini:",
-            "\xee\x8c\xa2"=>":bikini:",
-            "\xee\xaa\xa4"=>":bikini:",
-            "\xf0\x9f\x91\x9a"=>":womans_clothes:",
-            "\xf3\xbe\x93\x9b"=>":womans_clothes:",
-            "\xee\x94\x8d"=>":fr:",
-            "\xf0\x9f\x91\x9b"=>":purse:",
-            "\xf3\xbe\x93\x9c"=>":purse:",
-            "\xee\x9c\x8f"=>":purse:",
-            "\xf0\x9f\x91\x9c"=>":handbag:",
-            "\xf3\xbe\x93\xb0"=>":handbag:",
-            "\xee\x9a\x82"=>":briefcase:",
-            "\xee\x8c\xa3"=>":handbag:",
-            "\xee\x92\x9c"=>":handbag:",
-            "\xf0\x9f\x91\x9d"=>":pouch:",
-            "\xf3\xbe\x93\xb1"=>":pouch:",
-            "\xee\x9a\xad"=>":pouch:",
-            "\xf0\x9f\x91\x9e"=>":shoe:",
-            "\xf3\xbe\x93\x8c"=>":shoe:",
-            "\xee\x9a\x99"=>":athletic_shoe:",
-            "\xee\x80\x87"=>":athletic_shoe:",
-            "\xee\x96\xb7"=>":shoe:",
-            "\xf0\x9f\x91\x9f"=>":athletic_shoe:",
-            "\xf3\xbe\x93\x8d"=>":athletic_shoe:",
-            "\xee\xac\xab"=>":athletic_shoe:",
-            "\xf0\x9f\x91\xa0"=>":high_heel:",
-            "\xf3\xbe\x93\x96"=>":high_heel:",
-            "\xee\x99\xb4"=>":sandal:",
-            "\xee\x84\xbe"=>":high_heel:",
-            "\xee\x94\x9a"=>":baby:",
-            "\xf0\x9f\x91\xa1"=>":sandal:",
-            "\xf3\xbe\x93\x97"=>":sandal:",
-            "\xee\x8c\x9a"=>":sandal:",
-            "\xf0\x9f\x91\xa2"=>":boot:",
-            "\xf3\xbe\x93\x98"=>":boot:",
-            "\xee\x8c\x9b"=>":boot:",
-            "\xee\xaa\x9f"=>":boot:",
-            "\xf0\x9f\x91\xa3"=>":footprints:",
-            "\xf3\xbe\x95\x93"=>":footprints:",
-            "\xee\xac\xaa"=>":footprints:",
-            "\xf0\x9f\x91\xa4"=>":bust_in_silhouette:",
-            "\xf3\xbe\x86\x9a"=>":bust_in_silhouette:",
-            "\xee\x9a\xb1"=>":bust_in_silhouette:",
-            "\xf0\x9f\x91\xa5"=>":busts_in_silhouette:",
-            "\xf0\x9f\x91\xa6"=>":boy:",
-            "\xf3\xbe\x86\x9b"=>":boy:",
-            "\xee\x80\x81"=>":boy:",
-            "\xee\x93\xbc"=>":man:",
-            "\xf0\x9f\x91\xa7"=>":girl:",
-            "\xf3\xbe\x86\x9c"=>":girl:",
-            "\xee\x80\x82"=>":girl:",
-            "\xee\x93\xba"=>":woman:",
-            "\xf0\x9f\x91\xa8"=>":man:",
-            "\xf3\xbe\x86\x9d"=>":man:",
-            "\xee\x80\x84"=>":man:",
-            "\xf0\x9f\x91\xa9"=>":woman:",
-            "\xf3\xbe\x86\x9e"=>":woman:",
-            "\xee\x80\x85"=>":woman:",
-            "\xf0\x9f\x91\xaa"=>":man-woman-boy:",
-            "\xf3\xbe\x86\x9f"=>":man-woman-boy:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":man-woman-boy:",
-            "\xf0\x9f\x91\xab"=>":man_and_woman_holding_hands:",
-            "\xf3\xbe\x86\xa0"=>":man_and_woman_holding_hands:",
-            "\xee\x90\xa8"=>":man_and_woman_holding_hands:",
-            "\xf0\x9f\x91\xac"=>":two_men_holding_hands:",
-            "\xf0\x9f\x91\xad"=>":two_women_holding_hands:",
-            "\xf0\x9f\x91\xae"=>":cop:",
-            "\xf3\xbe\x86\xa1"=>":cop:",
-            "\xee\x85\x92"=>":cop:",
-            "\xee\x97\x9d"=>":cop:",
-            "\xf0\x9f\x91\xaf"=>":dancers:",
-            "\xf3\xbe\x86\xa2"=>":dancers:",
-            "\xee\x90\xa9"=>":dancers:",
-            "\xee\xab\x9b"=>":dancers:",
-            "\xf0\x9f\x91\xb0"=>":bride_with_veil:",
-            "\xf3\xbe\x86\xa3"=>":bride_with_veil:",
-            "\xee\xab\xa9"=>":bride_with_veil:",
-            "\xf0\x9f\x91\xb1"=>":person_with_blond_hair:",
-            "\xf3\xbe\x86\xa4"=>":person_with_blond_hair:",
-            "\xee\x94\x95"=>":camera:",
-            "\xee\xac\x93"=>":person_with_blond_hair:",
-            "\xf0\x9f\x91\xb2"=>":man_with_gua_pi_mao:",
-            "\xf3\xbe\x86\xa5"=>":man_with_gua_pi_mao:",
-            "\xee\xac\x94"=>":man_with_gua_pi_mao:",
-            "\xf0\x9f\x91\xb3"=>":man_with_turban:",
-            "\xf3\xbe\x86\xa6"=>":man_with_turban:",
-            "\xee\xac\x95"=>":man_with_turban:",
-            "\xf0\x9f\x91\xb4"=>":older_man:",
-            "\xf3\xbe\x86\xa7"=>":older_man:",
-            "\xee\x94\x98"=>":mag:",
-            "\xee\xac\x96"=>":older_man:",
-            "\xf0\x9f\x91\xb5"=>":older_woman:",
-            "\xf3\xbe\x86\xa8"=>":older_woman:",
-            "\xee\x94\x99"=>":key:",
-            "\xee\xac\x97"=>":older_woman:",
-            "\xf0\x9f\x91\xb6"=>":baby:",
-            "\xf3\xbe\x86\xa9"=>":baby:",
-            "\xee\xac\x98"=>":baby_symbol:",
-            "\xf0\x9f\x91\xb7"=>":construction_worker:",
-            "\xf3\xbe\x86\xaa"=>":construction_worker:",
-            "\xee\x94\x9b"=>":postbox:",
-            "\xee\xac\x99"=>":construction_worker:",
-            "\xf0\x9f\x91\xb8"=>":princess:",
-            "\xf3\xbe\x86\xab"=>":princess:",
-            "\xee\x94\x9c"=>":unlock:",
-            "\xee\xac\x9a"=>":princess:",
-            "\xf0\x9f\x91\xb9"=>":japanese_ogre:",
-            "\xf3\xbe\x86\xac"=>":japanese_ogre:",
-            "\xee\xad\x84"=>":japanese_ogre:",
-            "\xf0\x9f\x91\xba"=>":japanese_goblin:",
-            "\xf3\xbe\x86\xad"=>":japanese_goblin:",
-            "\xee\xad\x85"=>":japanese_goblin:",
-            "\xf0\x9f\x91\xbb"=>":ghost:",
-            "\xf3\xbe\x86\xae"=>":ghost:",
-            "\xee\x84\x9b"=>":ghost:",
-            "\xee\x93\x8b"=>":ghost:",
-            "\xf0\x9f\x91\xbc"=>":angel:",
-            "\xf3\xbe\x86\xaf"=>":angel:",
-            "\xee\x81\x8e"=>":angel:",
-            "\xee\x96\xbf"=>":angel:",
-            "\xf0\x9f\x91\xbd"=>":alien:",
-            "\xf3\xbe\x86\xb0"=>":alien:",
-            "\xee\x84\x8c"=>":alien:",
-            "\xee\x94\x8e"=>":de:",
-            "\xf0\x9f\x91\xbe"=>":space_invader:",
-            "\xf3\xbe\x86\xb1"=>":space_invader:",
-            "\xee\x84\xab"=>":space_invader:",
-            "\xee\x93\xac"=>":space_invader:",
-            "\xf0\x9f\x91\xbf"=>":imp:",
-            "\xf3\xbe\x86\xb2"=>":imp:",
-            "\xee\x84\x9a"=>":imp:",
-            "\xee\x93\xaf"=>":imp:",
-            "\xf0\x9f\x92\x80"=>":skull:",
-            "\xf3\xbe\x86\xb3"=>":skull:",
-            "\xee\x84\x9c"=>":skull:",
-            "\xee\x93\xb8"=>":skull:",
-            "\xf0\x9f\x92\x81"=>":information_desk_person:",
-            "\xf3\xbe\x86\xb4"=>":information_desk_person:",
-            "\xee\x89\x93"=>":information_desk_person:",
-            "\xf0\x9f\x92\x82"=>":guardsman:",
-            "\xf3\xbe\x86\xb5"=>":guardsman:",
-            "\xee\x94\x9e"=>":telephone_receiver:",
-            "\xf0\x9f\x92\x83"=>":dancer:",
-            "\xf3\xbe\x86\xb6"=>":dancer:",
-            "\xee\x94\x9f"=>":package:",
-            "\xee\xac\x9c"=>":dancer:",
-            "\xf0\x9f\x92\x84"=>":lipstick:",
-            "\xf3\xbe\x86\x95"=>":lipstick:",
-            "\xee\x9c\x90"=>":lipstick:",
-            "\xee\x8c\x9c"=>":lipstick:",
-            "\xee\x94\x89"=>":tokyo_tower:",
-            "\xf0\x9f\x92\x85"=>":nail_care:",
-            "\xf3\xbe\x86\x96"=>":nail_care:",
-            "\xee\x8c\x9d"=>":nail_care:",
-            "\xee\xaa\xa0"=>":nail_care:",
-            "\xf0\x9f\x92\x86"=>":massage:",
-            "\xf3\xbe\x86\x97"=>":massage:",
-            "\xee\x8c\x9e"=>":massage:",
-            "\xee\x94\x8b"=>":jp:",
-            "\xf0\x9f\x92\x87"=>":haircut:",
-            "\xf3\xbe\x86\x98"=>":haircut:",
-            "\xee\x8c\x9f"=>":haircut:",
-            "\xee\xaa\xa1"=>":haircut:",
-            "\xf0\x9f\x92\x88"=>":barber:",
-            "\xf3\xbe\x86\x99"=>":barber:",
-            "\xee\x8c\xa0"=>":barber:",
-            "\xee\xaa\xa2"=>":barber:",
-            "\xf0\x9f\x92\x89"=>":syringe:",
-            "\xf3\xbe\x94\x89"=>":syringe:",
-            "\xee\x84\xbb"=>":syringe:",
-            "\xee\x94\x90"=>":uk:",
-            "\xf0\x9f\x92\x8a"=>":pill:",
-            "\xf3\xbe\x94\x8a"=>":pill:",
-            "\xee\x8c\x8f"=>":pill:",
-            "\xee\xaa\x9a"=>":pill:",
-            "\xf0\x9f\x92\x8b"=>":kiss:",
-            "\xf3\xbe\xa0\xa3"=>":kiss:",
-            "\xee\x80\x83"=>":kiss:",
-            "\xee\x93\xab"=>":kiss:",
-            "\xf0\x9f\x92\x8c"=>":love_letter:",
-            "\xf3\xbe\xa0\xa4"=>":love_letter:",
-            "\xee\x9c\x97"=>":love_letter:",
-            "\xee\x84\x83\xee\x8c\xa8"=>":love_letter:",
-            "\xee\xad\xb8"=>":love_letter:",
-            "\xf0\x9f\x92\x8d"=>":ring:",
-            "\xf3\xbe\xa0\xa5"=>":ring:",
-            "\xee\x9c\x9b"=>":gem:",
-            "\xee\x80\xb4"=>":ring:",
-            "\xee\x94\x94"=>":kr:",
-            "\xf0\x9f\x92\x8e"=>":gem:",
-            "\xf3\xbe\xa0\xa6"=>":gem:",
-            "\xee\x80\xb5"=>":gem:",
-            "\xf0\x9f\x92\x8f"=>":couplekiss:",
-            "\xf3\xbe\xa0\xa7"=>":couplekiss:",
-            "\xee\x84\x91"=>":couplekiss:",
-            "\xee\x97\x8a"=>":couplekiss:",
-            "\xf0\x9f\x92\x90"=>":bouquet:",
-            "\xf3\xbe\xa0\xa8"=>":bouquet:",
-            "\xee\x8c\x86"=>":bouquet:",
-            "\xee\xaa\x95"=>":bouquet:",
-            "\xf0\x9f\x92\x91"=>":couple_with_heart:",
-            "\xf3\xbe\xa0\xa9"=>":couple_with_heart:",
-            "\xee\x9b\xad"=>":revolving_hearts:",
-            "\xee\x90\xa5"=>":couple_with_heart:",
-            "\xee\xab\x9a"=>":couple_with_heart:",
-            "\xf0\x9f\x92\x92"=>":wedding:",
-            "\xf3\xbe\xa0\xaa"=>":wedding:",
-            "\xee\x90\xbd"=>":wedding:",
-            "\xf0\x9f\x92\x93"=>":heartbeat:",
-            "\xf3\xbe\xac\x8d"=>":heartbeat:",
-            "\xee\x8c\xa7"=>":revolving_hearts:",
-            "\xee\xad\xb5"=>":heartpulse:",
-            "\xf0\x9f\x92\x94"=>":broken_heart:",
-            "\xf3\xbe\xac\x8e"=>":broken_heart:",
-            "\xee\x9b\xae"=>":broken_heart:",
-            "\xee\x80\xa3"=>":broken_heart:",
-            "\xee\x91\xb7"=>":broken_heart:",
-            "\xf0\x9f\x92\x95"=>":two_hearts:",
-            "\xf3\xbe\xac\x8f"=>":two_hearts:",
-            "\xee\x9b\xaf"=>":two_hearts:",
-            "\xee\x91\xb8"=>":two_hearts:",
-            "\xf0\x9f\x92\x96"=>":sparkling_heart:",
-            "\xf3\xbe\xac\x90"=>":sparkling_heart:",
-            "\xee\xaa\xa6"=>":sparkling_heart:",
-            "\xf0\x9f\x92\x97"=>":heartpulse:",
-            "\xf3\xbe\xac\x91"=>":heartpulse:",
-            "\xee\x8c\xa8"=>":heartpulse:",
-            "\xf0\x9f\x92\x98"=>":cupid:",
-            "\xf3\xbe\xac\x92"=>":cupid:",
-            "\xee\x8c\xa9"=>":cupid:",
-            "\xee\x93\xaa"=>":cupid:",
-            "\xf0\x9f\x92\x99"=>":blue_heart:",
-            "\xf3\xbe\xac\x93"=>":blue_heart:",
-            "\xee\x8c\xaa"=>":blue_heart:",
-            "\xee\xaa\xa7"=>":blue_heart:",
-            "\xf0\x9f\x92\x9a"=>":green_heart:",
-            "\xf3\xbe\xac\x94"=>":green_heart:",
-            "\xee\x8c\xab"=>":green_heart:",
-            "\xee\xaa\xa8"=>":green_heart:",
-            "\xf0\x9f\x92\x9b"=>":yellow_heart:",
-            "\xf3\xbe\xac\x95"=>":yellow_heart:",
-            "\xee\x8c\xac"=>":yellow_heart:",
-            "\xee\xaa\xa9"=>":yellow_heart:",
-            "\xf0\x9f\x92\x9c"=>":purple_heart:",
-            "\xf3\xbe\xac\x96"=>":purple_heart:",
-            "\xee\x8c\xad"=>":purple_heart:",
-            "\xee\xaa\xaa"=>":purple_heart:",
-            "\xf0\x9f\x92\x9d"=>":gift_heart:",
-            "\xf3\xbe\xac\x97"=>":gift_heart:",
-            "\xee\x90\xb7"=>":gift_heart:",
-            "\xee\xad\x94"=>":gift_heart:",
-            "\xf0\x9f\x92\x9e"=>":revolving_hearts:",
-            "\xf3\xbe\xac\x98"=>":revolving_hearts:",
-            "\xee\x96\xaf"=>":revolving_hearts:",
-            "\xf0\x9f\x92\x9f"=>":heart_decoration:",
-            "\xf3\xbe\xac\x99"=>":heart_decoration:",
-            "\xee\x88\x84"=>":heart_decoration:",
-            "\xf0\x9f\x92\xa0"=>":diamond_shape_with_a_dot_inside:",
-            "\xf3\xbe\xad\x95"=>":diamond_shape_with_a_dot_inside:",
-            "\xf0\x9f\x92\xa1"=>":bulb:",
-            "\xf3\xbe\xad\x96"=>":bulb:",
-            "\xee\x9b\xbb"=>":flashlight:",
-            "\xee\x84\x8f"=>":bulb:",
-            "\xee\x91\xb6"=>":bulb:",
-            "\xf0\x9f\x92\xa2"=>":anger:",
-            "\xf3\xbe\xad\x97"=>":anger:",
-            "\xee\x9b\xbc"=>":anger:",
-            "\xee\x8c\xb4"=>":anger:",
-            "\xee\x93\xa5"=>":anger:",
-            "\xf0\x9f\x92\xa3"=>":bomb:",
-            "\xf3\xbe\xad\x98"=>":bomb:",
-            "\xee\x9b\xbe"=>":bomb:",
-            "\xee\x8c\x91"=>":bomb:",
-            "\xee\x91\xba"=>":bomb:",
-            "\xf0\x9f\x92\xa4"=>":zzz:",
-            "\xf3\xbe\xad\x99"=>":zzz:",
-            "\xee\x9c\x81"=>":sleepy:",
-            "\xee\x84\xbc"=>":zzz:",
-            "\xee\x91\xb5"=>":zzz:",
-            "\xf0\x9f\x92\xa5"=>":collision:",
-            "\xf3\xbe\xad\x9a"=>":collision:",
-            "\xee\x9c\x85"=>":collision:",
-            "\xee\x96\xb0"=>":collision:",
-            "\xf0\x9f\x92\xa6"=>":sweat_drops:",
-            "\xf3\xbe\xad\x9b"=>":sweat_drops:",
-            "\xee\x9c\x86"=>":sweat_drops:",
-            "\xee\x8c\xb1"=>":droplet:",
-            "\xee\x96\xb1"=>":sweat_drops:",
-            "\xf0\x9f\x92\xa7"=>":droplet:",
-            "\xf3\xbe\xad\x9c"=>":droplet:",
-            "\xee\x9c\x87"=>":droplet:",
-            "\xee\x93\xa6"=>":droplet:",
-            "\xf0\x9f\x92\xa8"=>":dash:",
-            "\xf3\xbe\xad\x9d"=>":dash:",
-            "\xee\x9c\x88"=>":dash:",
-            "\xee\x8c\xb0"=>":dash:",
-            "\xee\x93\xb4"=>":dash:",
-            "\xf0\x9f\x92\xa9"=>":shit:",
-            "\xf3\xbe\x93\xb4"=>":shit:",
-            "\xee\x81\x9a"=>":shit:",
-            "\xee\x93\xb5"=>":shit:",
-            "\xf0\x9f\x92\xaa"=>":muscle:",
-            "\xf3\xbe\xad\x9e"=>":muscle:",
-            "\xee\x85\x8c"=>":muscle:",
-            "\xee\x93\xa9"=>":muscle:",
-            "\xf0\x9f\x92\xab"=>":dizzy:",
-            "\xf3\xbe\xad\x9f"=>":dizzy:",
-            "\xee\x90\x87"=>":confounded:",
-            "\xee\xad\x9c"=>":dizzy:",
-            "\xf0\x9f\x92\xac"=>":speech_balloon:",
-            "\xf3\xbe\x94\xb2"=>":speech_balloon:",
-            "\xee\x93\xbd"=>":speech_balloon:",
-            "\xf0\x9f\x92\xad"=>":thought_balloon:",
-            "\xf0\x9f\x92\xae"=>":white_flower:",
-            "\xf3\xbe\xad\xba"=>":white_flower:",
-            "\xee\x93\xb0"=>":white_flower:",
-            "\xf0\x9f\x92\xaf"=>":100:",
-            "\xf3\xbe\xad\xbb"=>":100:",
-            "\xee\x93\xb2"=>":100:",
-            "\xf0\x9f\x92\xb0"=>":moneybag:",
-            "\xf3\xbe\x93\x9d"=>":moneybag:",
-            "\xee\x9c\x95"=>":dollar:",
-            "\xee\x84\xaf"=>":dollar:",
-            "\xee\x93\x87"=>":moneybag:",
-            "\xf0\x9f\x92\xb1"=>":currency_exchange:",
-            "\xf3\xbe\x93\x9e"=>":currency_exchange:",
-            "\xee\x85\x89"=>":currency_exchange:",
-            "\xf0\x9f\x92\xb2"=>":heavy_dollar_sign:",
-            "\xf3\xbe\x93\xa0"=>":heavy_dollar_sign:",
-            "\xee\x95\xb9"=>":heavy_dollar_sign:",
-            "\xf0\x9f\x92\xb3"=>":credit_card:",
-            "\xf3\xbe\x93\xa1"=>":credit_card:",
-            "\xee\x95\xbc"=>":credit_card:",
-            "\xf0\x9f\x92\xb4"=>":yen:",
-            "\xf3\xbe\x93\xa2"=>":yen:",
-            "\xee\x9b\x96"=>":yen:",
-            "\xee\x95\xbd"=>":yen:",
-            "\xf0\x9f\x92\xb5"=>":dollar:",
-            "\xf3\xbe\x93\xa3"=>":dollar:",
-            "\xee\x96\x85"=>":dollar:",
-            "\xf0\x9f\x92\xb6"=>":euro:",
-            "\xf0\x9f\x92\xb7"=>":pound:",
-            "\xf0\x9f\x92\xb8"=>":money_with_wings:",
-            "\xf3\xbe\x93\xa4"=>":money_with_wings:",
-            "\xee\xad\x9b"=>":money_with_wings:",
-            "\xf0\x9f\x92\xb9"=>":chart:",
-            "\xf3\xbe\x93\x9f"=>":chart:",
-            "\xee\x85\x8a"=>":bar_chart:",
-            "\xee\x97\x9c"=>":chart:",
-            "\xf0\x9f\x92\xba"=>":seat:",
-            "\xf3\xbe\x94\xb7"=>":seat:",
-            "\xee\x9a\xb2"=>":seat:",
-            "\xee\x84\x9f"=>":seat:",
-            "\xf0\x9f\x92\xbb"=>":computer:",
-            "\xf3\xbe\x94\xb8"=>":computer:",
-            "\xee\x9c\x96"=>":computer:",
-            "\xee\x80\x8c"=>":computer:",
-            "\xee\x96\xb8"=>":computer:",
-            "\xf0\x9f\x92\xbc"=>":briefcase:",
-            "\xf3\xbe\x94\xbb"=>":briefcase:",
-            "\xee\x84\x9e"=>":briefcase:",
-            "\xee\x97\x8e"=>":briefcase:",
-            "\xf0\x9f\x92\xbd"=>":minidisc:",
-            "\xf3\xbe\x94\xbc"=>":minidisc:",
-            "\xee\x8c\x96"=>":floppy_disk:",
-            "\xee\x96\x82"=>":minidisc:",
-            "\xf0\x9f\x92\xbe"=>":floppy_disk:",
-            "\xf3\xbe\x94\xbd"=>":floppy_disk:",
-            "\xee\x95\xa2"=>":floppy_disk:",
-            "\xf0\x9f\x92\xbf"=>":cd:",
-            "\xf3\xbe\xa0\x9d"=>":cd:",
-            "\xee\x9a\x8c"=>":dvd:",
-            "\xee\x84\xa6"=>":cd:",
-            "\xee\x94\x8c"=>":us:",
-            "\xf0\x9f\x93\x80"=>":dvd:",
-            "\xf3\xbe\xa0\x9e"=>":dvd:",
-            "\xee\x84\xa7"=>":dvd:",
-            "\xf0\x9f\x93\x81"=>":file_folder:",
-            "\xf3\xbe\x95\x83"=>":file_folder:",
-            "\xee\x96\x8f"=>":file_folder:",
-            "\xf0\x9f\x93\x82"=>":open_file_folder:",
-            "\xf3\xbe\x95\x84"=>":open_file_folder:",
-            "\xee\x96\x90"=>":open_file_folder:",
-            "\xf0\x9f\x93\x83"=>":page_with_curl:",
-            "\xf3\xbe\x95\x80"=>":page_with_curl:",
-            "\xee\x9a\x89"=>":pencil:",
-            "\xee\x95\xa1"=>":page_with_curl:",
-            "\xf0\x9f\x93\x84"=>":page_facing_up:",
-            "\xf3\xbe\x95\x81"=>":page_facing_up:",
-            "\xee\x95\xa9"=>":page_facing_up:",
-            "\xf0\x9f\x93\x85"=>":date:",
-            "\xf3\xbe\x95\x82"=>":date:",
-            "\xee\x95\xa3"=>":date:",
-            "\xf0\x9f\x93\x86"=>":calendar:",
-            "\xf3\xbe\x95\x89"=>":calendar:",
-            "\xee\x95\xaa"=>":calendar:",
-            "\xf0\x9f\x93\x87"=>":card_index:",
-            "\xf3\xbe\x95\x8d"=>":card_index:",
-            "\xee\x9a\x83"=>":books:",
-            "\xee\x85\x88"=>":books:",
-            "\xee\x95\xac"=>":card_index:",
-            "\xf0\x9f\x93\x88"=>":chart_with_upwards_trend:",
-            "\xf3\xbe\x95\x8b"=>":chart_with_upwards_trend:",
-            "\xee\x95\xb5"=>":chart_with_upwards_trend:",
-            "\xf0\x9f\x93\x89"=>":chart_with_downwards_trend:",
-            "\xf3\xbe\x95\x8c"=>":chart_with_downwards_trend:",
-            "\xee\x95\xb6"=>":chart_with_downwards_trend:",
-            "\xf0\x9f\x93\x8a"=>":bar_chart:",
-            "\xf3\xbe\x95\x8a"=>":bar_chart:",
-            "\xee\x95\xb4"=>":bar_chart:",
-            "\xf0\x9f\x93\x8b"=>":clipboard:",
-            "\xf3\xbe\x95\x88"=>":clipboard:",
-            "\xee\x95\xa4"=>":clipboard:",
-            "\xf0\x9f\x93\x8c"=>":pushpin:",
-            "\xf3\xbe\x95\x8e"=>":pushpin:",
-            "\xee\x95\xad"=>":pushpin:",
-            "\xf0\x9f\x93\x8d"=>":round_pushpin:",
-            "\xf3\xbe\x94\xbf"=>":round_pushpin:",
-            "\xee\x95\xa0"=>":round_pushpin:",
-            "\xf0\x9f\x93\x8e"=>":paperclip:",
-            "\xf3\xbe\x94\xba"=>":paperclip:",
-            "\xee\x9c\xb0"=>":paperclip:",
-            "\xee\x92\xa0"=>":paperclip:",
-            "\xf0\x9f\x93\x8f"=>":straight_ruler:",
-            "\xf3\xbe\x95\x90"=>":straight_ruler:",
-            "\xee\x95\xb0"=>":straight_ruler:",
-            "\xf0\x9f\x93\x90"=>":triangular_ruler:",
-            "\xf3\xbe\x95\x91"=>":triangular_ruler:",
-            "\xee\x92\xa2"=>":triangular_ruler:",
-            "\xf0\x9f\x93\x91"=>":bookmark_tabs:",
-            "\xf3\xbe\x95\x92"=>":bookmark_tabs:",
-            "\xee\xac\x8b"=>":bookmark_tabs:",
-            "\xf0\x9f\x93\x92"=>":ledger:",
-            "\xf3\xbe\x95\x8f"=>":ledger:",
-            "\xee\x95\xae"=>":ledger:",
-            "\xf0\x9f\x93\x93"=>":notebook:",
-            "\xf3\xbe\x95\x85"=>":notebook:",
-            "\xee\x95\xab"=>":notebook:",
-            "\xf0\x9f\x93\x94"=>":notebook_with_decorative_cover:",
-            "\xf3\xbe\x95\x87"=>":notebook_with_decorative_cover:",
-            "\xee\x92\x9d"=>":notebook_with_decorative_cover:",
-            "\xf0\x9f\x93\x95"=>":closed_book:",
-            "\xf3\xbe\x94\x82"=>":closed_book:",
-            "\xee\x95\xa8"=>":closed_book:",
-            "\xf0\x9f\x93\x96"=>":open_book:",
-            "\xf3\xbe\x95\x86"=>":open_book:",
-            "\xee\x92\x9f"=>":open_book:",
-            "\xf0\x9f\x93\x97"=>":green_book:",
-            "\xf3\xbe\x93\xbf"=>":green_book:",
-            "\xee\x95\xa5"=>":green_book:",
-            "\xf0\x9f\x93\x98"=>":blue_book:",
-            "\xf3\xbe\x94\x80"=>":blue_book:",
-            "\xee\x95\xa6"=>":blue_book:",
-            "\xf0\x9f\x93\x99"=>":orange_book:",
-            "\xf3\xbe\x94\x81"=>":orange_book:",
-            "\xee\x95\xa7"=>":orange_book:",
-            "\xf0\x9f\x93\x9a"=>":books:",
-            "\xf3\xbe\x94\x83"=>":books:",
-            "\xee\x95\xaf"=>":books:",
-            "\xf0\x9f\x93\x9b"=>":name_badge:",
-            "\xf3\xbe\x94\x84"=>":name_badge:",
-            "\xee\x94\x9d"=>":statue_of_liberty:",
-            "\xf0\x9f\x93\x9c"=>":scroll:",
-            "\xf3\xbe\x93\xbd"=>":scroll:",
-            "\xee\x95\x9f"=>":scroll:",
-            "\xf0\x9f\x93\x9d"=>":pencil:",
-            "\xf3\xbe\x94\xa7"=>":pencil:",
-            "\xee\xaa\x92"=>":pencil:",
-            "\xf0\x9f\x93\x9e"=>":telephone_receiver:",
-            "\xf3\xbe\x94\xa4"=>":telephone_receiver:",
-            "\xf0\x9f\x93\x9f"=>":pager:",
-            "\xf3\xbe\x94\xa2"=>":pager:",
-            "\xee\x99\x9a"=>":pager:",
-            "\xee\x96\x9b"=>":pager:",
-            "\xf0\x9f\x93\xa0"=>":fax:",
-            "\xf3\xbe\x94\xa8"=>":fax:",
-            "\xee\x9b\x90"=>":fax:",
-            "\xee\x80\x8b"=>":fax:",
-            "\xf0\x9f\x93\xa1"=>":satellite_antenna:",
-            "\xf3\xbe\x94\xb1"=>":satellite_antenna:",
-            "\xee\x85\x8b"=>":satellite_antenna:",
-            "\xee\x92\xa8"=>":satellite_antenna:",
-            "\xf0\x9f\x93\xa2"=>":loudspeaker:",
-            "\xf3\xbe\x94\xaf"=>":loudspeaker:",
-            "\xee\x85\x82"=>":loudspeaker:",
-            "\xee\x94\x91"=>":es:",
-            "\xf0\x9f\x93\xa3"=>":mega:",
-            "\xf3\xbe\x94\xb0"=>":mega:",
-            "\xee\x8c\x97"=>":mega:",
-            "\xf0\x9f\x93\xa4"=>":outbox_tray:",
-            "\xf3\xbe\x94\xb3"=>":outbox_tray:",
-            "\xee\x96\x92"=>":outbox_tray:",
-            "\xf0\x9f\x93\xa5"=>":inbox_tray:",
-            "\xf3\xbe\x94\xb4"=>":inbox_tray:",
-            "\xee\x96\x93"=>":inbox_tray:",
-            "\xf0\x9f\x93\xa6"=>":package:",
-            "\xf3\xbe\x94\xb5"=>":package:",
-            "\xf0\x9f\x93\xa7"=>":e-mail:",
-            "\xf3\xbe\xae\x92"=>":e-mail:",
-            "\xee\xad\xb1"=>":e-mail:",
-            "\xf0\x9f\x93\xa8"=>":incoming_envelope:",
-            "\xf3\xbe\x94\xaa"=>":incoming_envelope:",
-            "\xee\x9b\x8f"=>":envelope_with_arrow:",
-            "\xee\x96\x91"=>":incoming_envelope:",
-            "\xf0\x9f\x93\xa9"=>":envelope_with_arrow:",
-            "\xf3\xbe\x94\xab"=>":envelope_with_arrow:",
-            "\xee\xad\xa2"=>":envelope_with_arrow:",
-            "\xf0\x9f\x93\xaa"=>":mailbox_closed:",
-            "\xf3\xbe\x94\xac"=>":mailbox_closed:",
-            "\xee\x84\x81"=>":mailbox:",
-            "\xf0\x9f\x93\xab"=>":mailbox:",
-            "\xf3\xbe\x94\xad"=>":mailbox:",
-            "\xee\xac\x8a"=>":mailbox:",
-            "\xf0\x9f\x93\xac"=>":mailbox_with_mail:",
-            "\xf0\x9f\x93\xad"=>":mailbox_with_no_mail:",
-            "\xf0\x9f\x93\xae"=>":postbox:",
-            "\xf3\xbe\x94\xae"=>":postbox:",
-            "\xee\x84\x82"=>":postbox:",
-            "\xf0\x9f\x93\xaf"=>":postal_horn:",
-            "\xf0\x9f\x93\xb0"=>":newspaper:",
-            "\xf3\xbe\xa0\xa2"=>":newspaper:",
-            "\xee\x96\x8b"=>":newspaper:",
-            "\xf0\x9f\x93\xb1"=>":iphone:",
-            "\xf3\xbe\x94\xa5"=>":iphone:",
-            "\xee\x9a\x88"=>":iphone:",
-            "\xee\x80\x8a"=>":iphone:",
-            "\xee\x96\x88"=>":iphone:",
-            "\xf0\x9f\x93\xb2"=>":calling:",
-            "\xf3\xbe\x94\xa6"=>":calling:",
-            "\xee\x9b\x8e"=>":calling:",
-            "\xee\x84\x84"=>":calling:",
-            "\xee\xac\x88"=>":calling:",
-            "\xf0\x9f\x93\xb3"=>":vibration_mode:",
-            "\xf3\xbe\xa0\xb9"=>":vibration_mode:",
-            "\xee\x89\x90"=>":vibration_mode:",
-            "\xee\xaa\x90"=>":vibration_mode:",
-            "\xf0\x9f\x93\xb4"=>":mobile_phone_off:",
-            "\xf3\xbe\xa0\xba"=>":mobile_phone_off:",
-            "\xee\x89\x91"=>":mobile_phone_off:",
-            "\xee\xaa\x91"=>":mobile_phone_off:",
-            "\xf0\x9f\x93\xb5"=>":no_mobile_phones:",
-            "\xf0\x9f\x93\xb6"=>":signal_strength:",
-            "\xf3\xbe\xa0\xb8"=>":signal_strength:",
-            "\xee\x88\x8b"=>":signal_strength:",
-            "\xee\xaa\x84"=>":signal_strength:",
-            "\xf0\x9f\x93\xb7"=>":camera:",
-            "\xf3\xbe\x93\xaf"=>":camera:",
-            "\xee\x9a\x81"=>":camera:",
-            "\xee\x80\x88"=>":camera:",
-            "\xf0\x9f\x93\xb8"=>":camera_with_flash:",
-            "\xf0\x9f\x93\xb9"=>":video_camera:",
-            "\xf3\xbe\x93\xb9"=>":video_camera:",
-            "\xee\x95\xbe"=>":video_camera:",
-            "\xf0\x9f\x93\xba"=>":tv:",
-            "\xf3\xbe\xa0\x9c"=>":tv:",
-            "\xee\x9a\x8a"=>":tv:",
-            "\xee\x84\xaa"=>":tv:",
-            "\xf0\x9f\x93\xbb"=>":radio:",
-            "\xf3\xbe\xa0\x9f"=>":radio:",
-            "\xee\x84\xa8"=>":radio:",
-            "\xee\x96\xb9"=>":radio:",
-            "\xf0\x9f\x93\xbc"=>":vhs:",
-            "\xf3\xbe\xa0\xa0"=>":vhs:",
-            "\xee\x84\xa9"=>":vhs:",
-            "\xee\x96\x80"=>":vhs:",
-            "\xf0\x9f\x93\xbd"=>":film_projector:",
-            "\xf0\x9f\x93\xbf"=>":prayer_beads:",
-            "\xf0\x9f\x94\x80"=>":twisted_rightwards_arrows:",
-            "\xf0\x9f\x94\x81"=>":repeat:",
-            "\xf0\x9f\x94\x82"=>":repeat_one:",
-            "\xf0\x9f\x94\x83"=>":arrows_clockwise:",
-            "\xf3\xbe\xae\x91"=>":arrows_clockwise:",
-            "\xee\xac\x8d"=>":arrows_clockwise:",
-            "\xf0\x9f\x94\x84"=>":arrows_counterclockwise:",
-            "\xf0\x9f\x94\x85"=>":low_brightness:",
-            "\xf0\x9f\x94\x86"=>":high_brightness:",
-            "\xf0\x9f\x94\x87"=>":mute:",
-            "\xf0\x9f\x94\x88"=>":speaker:",
-            "\xf0\x9f\x94\x89"=>":sound:",
-            "\xf0\x9f\x94\x8a"=>":loud_sound:",
-            "\xf3\xbe\xa0\xa1"=>":loud_sound:",
-            "\xee\x85\x81"=>":loud_sound:",
-            "\xf0\x9f\x94\x8b"=>":battery:",
-            "\xf3\xbe\x93\xbc"=>":battery:",
-            "\xee\x96\x84"=>":battery:",
-            "\xf0\x9f\x94\x8c"=>":electric_plug:",
-            "\xf3\xbe\x93\xbe"=>":electric_plug:",
-            "\xee\x96\x89"=>":electric_plug:",
-            "\xf0\x9f\x94\x8d"=>":mag:",
-            "\xf3\xbe\xae\x85"=>":mag:",
-            "\xee\x9b\x9c"=>":mag_right:",
-            "\xee\x84\x94"=>":mag_right:",
-            "\xf0\x9f\x94\x8e"=>":mag_right:",
-            "\xf3\xbe\xae\x8d"=>":mag_right:",
-            "\xee\xac\x85"=>":mag_right:",
-            "\xf0\x9f\x94\x8f"=>":lock_with_ink_pen:",
-            "\xf3\xbe\xae\x90"=>":lock_with_ink_pen:",
-            "\xee\x9b\x99"=>":unlock:",
-            "\xee\x85\x84"=>":lock:",
-            "\xee\xac\x8c"=>":lock_with_ink_pen:",
-            "\xf0\x9f\x94\x90"=>":closed_lock_with_key:",
-            "\xf3\xbe\xae\x8a"=>":closed_lock_with_key:",
-            "\xee\xab\xbc"=>":closed_lock_with_key:",
-            "\xf0\x9f\x94\x91"=>":key:",
-            "\xf3\xbe\xae\x82"=>":key:",
-            "\xee\x80\xbf"=>":key:",
-            "\xf0\x9f\x94\x92"=>":lock:",
-            "\xf3\xbe\xae\x86"=>":lock:",
-            "\xf0\x9f\x94\x93"=>":unlock:",
-            "\xf3\xbe\xae\x87"=>":unlock:",
-            "\xee\x85\x85"=>":unlock:",
-            "\xf0\x9f\x94\x94"=>":bell:",
-            "\xf3\xbe\x93\xb2"=>":bell:",
-            "\xee\x9c\x93"=>":bell:",
-            "\xee\x8c\xa5"=>":bell:",
-            "\xee\x94\x92"=>":ru:",
-            "\xf0\x9f\x94\x95"=>":no_bell:",
-            "\xf0\x9f\x94\x96"=>":bookmark:",
-            "\xf3\xbe\xae\x8f"=>":bookmark:",
-            "\xee\xac\x87"=>":bookmark:",
-            "\xf0\x9f\x94\x97"=>":link:",
-            "\xf3\xbe\xad\x8b"=>":link:",
-            "\xee\x96\x8a"=>":link:",
-            "\xf0\x9f\x94\x98"=>":radio_button:",
-            "\xf3\xbe\xae\x8c"=>":radio_button:",
-            "\xee\xac\x84"=>":radio_button:",
-            "\xf0\x9f\x94\x99"=>":back:",
-            "\xf3\xbe\xae\x8e"=>":back:",
-            "\xee\xac\x86"=>":back:",
-            "\xf0\x9f\x94\x9a"=>":end:",
-            "\xf3\xbe\x80\x9a"=>":end:",
-            "\xee\x9a\xb9"=>":end:",
-            "\xf0\x9f\x94\x9b"=>":on:",
-            "\xf3\xbe\x80\x99"=>":on:",
-            "\xee\x9a\xb8"=>":on:",
-            "\xf0\x9f\x94\x9c"=>":soon:",
-            "\xf3\xbe\x80\x98"=>":soon:",
-            "\xee\x9a\xb7"=>":soon:",
-            "\xf0\x9f\x94\x9d"=>":top:",
-            "\xf3\xbe\xad\x82"=>":top:",
-            "\xee\x89\x8c"=>":top:",
-            "\xf0\x9f\x94\x9e"=>":underage:",
-            "\xf3\xbe\xac\xa5"=>":underage:",
-            "\xee\x88\x87"=>":underage:",
-            "\xee\xaa\x83"=>":underage:",
-            "\xf0\x9f\x94\x9f"=>":keycap_ten:",
-            "\xf3\xbe\xa0\xbb"=>":keycap_ten:",
-            "\xf0\x9f\x94\xa0"=>":capital_abcd:",
-            "\xf3\xbe\xad\xbc"=>":capital_abcd:",
-            "\xee\xab\xbd"=>":capital_abcd:",
-            "\xf0\x9f\x94\xa1"=>":abcd:",
-            "\xf3\xbe\xad\xbd"=>":abcd:",
-            "\xee\xab\xbe"=>":abcd:",
-            "\xf0\x9f\x94\xa2"=>":1234:",
-            "\xf3\xbe\xad\xbe"=>":1234:",
-            "\xee\xab\xbf"=>":1234:",
-            "\xf0\x9f\x94\xa3"=>":symbols:",
-            "\xf3\xbe\xad\xbf"=>":symbols:",
-            "\xee\xac\x80"=>":symbols:",
-            "\xf0\x9f\x94\xa4"=>":abc:",
-            "\xf3\xbe\xae\x80"=>":abc:",
-            "\xee\xad\x95"=>":abc:",
-            "\xf0\x9f\x94\xa5"=>":fire:",
-            "\xf3\xbe\x93\xb6"=>":fire:",
-            "\xee\x84\x9d"=>":fire:",
-            "\xee\x91\xbb"=>":fire:",
-            "\xf0\x9f\x94\xa6"=>":flashlight:",
-            "\xf3\xbe\x93\xbb"=>":flashlight:",
-            "\xee\x96\x83"=>":flashlight:",
-            "\xf0\x9f\x94\xa7"=>":wrench:",
-            "\xf3\xbe\x93\x89"=>":wrench:",
-            "\xee\x9c\x98"=>":wrench:",
-            "\xee\x96\x87"=>":wrench:",
-            "\xf0\x9f\x94\xa8"=>":hammer:",
-            "\xf3\xbe\x93\x8a"=>":hammer:",
-            "\xee\x84\x96"=>":hammer:",
-            "\xee\x97\x8b"=>":hammer:",
-            "\xf0\x9f\x94\xa9"=>":nut_and_bolt:",
-            "\xf3\xbe\x93\x8b"=>":nut_and_bolt:",
-            "\xee\x96\x81"=>":nut_and_bolt:",
-            "\xf0\x9f\x94\xaa"=>":knife:",
-            "\xf3\xbe\x93\xba"=>":knife:",
-            "\xee\x95\xbf"=>":knife:",
-            "\xf0\x9f\x94\xab"=>":gun:",
-            "\xf3\xbe\x93\xb5"=>":gun:",
-            "\xee\x84\x93"=>":gun:",
-            "\xee\x94\x8a"=>":gun:",
-            "\xf0\x9f\x94\xac"=>":microscope:",
-            "\xf0\x9f\x94\xad"=>":telescope:",
-            "\xf0\x9f\x94\xae"=>":crystal_ball:",
-            "\xf3\xbe\x93\xb7"=>":crystal_ball:",
-            "\xee\x88\xbe"=>":six_pointed_star:",
-            "\xee\xaa\x8f"=>":six_pointed_star:",
-            "\xf0\x9f\x94\xaf"=>":six_pointed_star:",
-            "\xf3\xbe\x93\xb8"=>":six_pointed_star:",
-            "\xf0\x9f\x94\xb0"=>":beginner:",
-            "\xf3\xbe\x81\x84"=>":beginner:",
-            "\xee\x88\x89"=>":beginner:",
-            "\xee\x92\x80"=>":beginner:",
-            "\xf0\x9f\x94\xb1"=>":trident:",
-            "\xf3\xbe\x93\x92"=>":trident:",
-            "\xee\x80\xb1"=>":trident:",
-            "\xf0\x9f\x94\xb2"=>":black_square_button:",
-            "\xf3\xbe\xad\xa4"=>":large_blue_circle:",
-            "\xee\x95\x8b"=>":large_blue_circle:",
-            "\xf0\x9f\x94\xb3"=>":white_square_button:",
-            "\xf3\xbe\xad\xa7"=>":white_square_button:",
-            "\xf0\x9f\x94\xb4"=>":red_circle:",
-            "\xf3\xbe\xad\xa3"=>":red_circle:",
-            "\xee\x95\x8a"=>":red_circle:",
-            "\xf0\x9f\x94\xb5"=>":large_blue_circle:",
-            "\xf0\x9f\x94\xb6"=>":large_orange_diamond:",
-            "\xf3\xbe\xad\xb3"=>":large_orange_diamond:",
-            "\xee\x95\x86"=>":large_orange_diamond:",
-            "\xf0\x9f\x94\xb7"=>":large_blue_diamond:",
-            "\xf3\xbe\xad\xb4"=>":large_blue_diamond:",
-            "\xee\x95\x87"=>":large_blue_diamond:",
-            "\xf0\x9f\x94\xb8"=>":small_orange_diamond:",
-            "\xf3\xbe\xad\xb5"=>":small_orange_diamond:",
-            "\xf0\x9f\x94\xb9"=>":small_blue_diamond:",
-            "\xf3\xbe\xad\xb6"=>":small_blue_diamond:",
-            "\xf0\x9f\x94\xba"=>":small_red_triangle:",
-            "\xf3\xbe\xad\xb8"=>":small_red_triangle:",
-            "\xee\x95\x9a"=>":small_red_triangle:",
-            "\xf0\x9f\x94\xbb"=>":small_red_triangle_down:",
-            "\xf3\xbe\xad\xb9"=>":small_red_triangle_down:",
-            "\xee\x95\x9b"=>":small_red_triangle_down:",
-            "\xf0\x9f\x94\xbc"=>":arrow_up_small:",
-            "\xf3\xbe\xac\x81"=>":arrow_up_small:",
-            "\xee\x95\x83"=>":arrow_up_small:",
-            "\xf0\x9f\x94\xbd"=>":arrow_down_small:",
-            "\xf3\xbe\xac\x80"=>":arrow_down_small:",
-            "\xee\x95\x82"=>":arrow_down_small:",
-            "\xf0\x9f\x95\x89"=>":om_symbol:",
-            "\xf0\x9f\x95\x8a"=>":dove_of_peace:",
-            "\xf0\x9f\x95\x8b"=>":kaaba:",
-            "\xf0\x9f\x95\x8c"=>":mosque:",
-            "\xf0\x9f\x95\x8d"=>":synagogue:",
-            "\xf0\x9f\x95\x8e"=>":menorah_with_nine_branches:",
-            "\xf0\x9f\x95\x90"=>":clock1:",
-            "\xf3\xbe\x80\x9e"=>":clock1:",
-            "\xee\x80\xa4"=>":clock1:",
-            "\xf0\x9f\x95\x91"=>":clock2:",
-            "\xf3\xbe\x80\x9f"=>":clock2:",
-            "\xee\x80\xa5"=>":clock2:",
-            "\xf0\x9f\x95\x92"=>":clock3:",
-            "\xf3\xbe\x80\xa0"=>":clock3:",
-            "\xee\x80\xa6"=>":clock3:",
-            "\xf0\x9f\x95\x93"=>":clock4:",
-            "\xf3\xbe\x80\xa1"=>":clock4:",
-            "\xee\x80\xa7"=>":clock4:",
-            "\xf0\x9f\x95\x94"=>":clock5:",
-            "\xf3\xbe\x80\xa2"=>":clock5:",
-            "\xee\x80\xa8"=>":clock5:",
-            "\xf0\x9f\x95\x95"=>":clock6:",
-            "\xf3\xbe\x80\xa3"=>":clock6:",
-            "\xee\x80\xa9"=>":clock6:",
-            "\xf0\x9f\x95\x96"=>":clock7:",
-            "\xf3\xbe\x80\xa4"=>":clock7:",
-            "\xee\x80\xaa"=>":clock7:",
-            "\xf0\x9f\x95\x97"=>":clock8:",
-            "\xf3\xbe\x80\xa5"=>":clock8:",
-            "\xee\x80\xab"=>":clock8:",
-            "\xf0\x9f\x95\x98"=>":clock9:",
-            "\xf3\xbe\x80\xa6"=>":clock9:",
-            "\xee\x80\xac"=>":clock9:",
-            "\xf0\x9f\x95\x99"=>":clock10:",
-            "\xf3\xbe\x80\xa7"=>":clock10:",
-            "\xf0\x9f\x95\x9a"=>":clock11:",
-            "\xf3\xbe\x80\xa8"=>":clock11:",
-            "\xee\x80\xae"=>":clock11:",
-            "\xf0\x9f\x95\x9b"=>":clock12:",
-            "\xf3\xbe\x80\xa9"=>":clock12:",
-            "\xee\x80\xaf"=>":clock12:",
-            "\xf0\x9f\x95\x9c"=>":clock130:",
-            "\xf0\x9f\x95\x9d"=>":clock230:",
-            "\xf0\x9f\x95\x9e"=>":clock330:",
-            "\xf0\x9f\x95\x9f"=>":clock430:",
-            "\xf0\x9f\x95\xa0"=>":clock530:",
-            "\xf0\x9f\x95\xa1"=>":clock630:",
-            "\xf0\x9f\x95\xa2"=>":clock730:",
-            "\xf0\x9f\x95\xa3"=>":clock830:",
-            "\xf0\x9f\x95\xa4"=>":clock930:",
-            "\xf0\x9f\x95\xa5"=>":clock1030:",
-            "\xf0\x9f\x95\xa6"=>":clock1130:",
-            "\xf0\x9f\x95\xa7"=>":clock1230:",
-            "\xf0\x9f\x95\xaf"=>":candle:",
-            "\xf0\x9f\x95\xb0"=>":mantelpiece_clock:",
-            "\xf0\x9f\x95\xb3"=>":hole:",
-            "\xf0\x9f\x95\xb4"=>":man_in_business_suit_levitating:",
-            "\xf0\x9f\x95\xb5"=>":sleuth_or_spy:",
-            "\xf0\x9f\x95\xb6"=>":dark_sunglasses:",
-            "\xf0\x9f\x95\xb7"=>":spider:",
-            "\xf0\x9f\x95\xb8"=>":spider_web:",
-            "\xf0\x9f\x95\xb9"=>":joystick:",
-            "\xf0\x9f\x96\x87"=>":linked_paperclips:",
-            "\xf0\x9f\x96\x8a"=>":lower_left_ballpoint_pen:",
-            "\xf0\x9f\x96\x8b"=>":lower_left_fountain_pen:",
-            "\xf0\x9f\x96\x8c"=>":lower_left_paintbrush:",
-            "\xf0\x9f\x96\x8d"=>":lower_left_crayon:",
-            "\xf0\x9f\x96\x90"=>":raised_hand_with_fingers_splayed:",
-            "\xf0\x9f\x96\x95"=>":reversed_hand_with_middle_finger_extended:",
-            "\xf0\x9f\x96\x96"=>":spock-hand:",
-            "\xf0\x9f\x96\xa5"=>":desktop_computer:",
-            "\xf0\x9f\x96\xa8"=>":printer:",
-            "\xf0\x9f\x96\xb1"=>":three_button_mouse:",
-            "\xf0\x9f\x96\xb2"=>":trackball:",
-            "\xf0\x9f\x96\xbc"=>":frame_with_picture:",
-            "\xf0\x9f\x97\x82"=>":card_index_dividers:",
-            "\xf0\x9f\x97\x83"=>":card_file_box:",
-            "\xf0\x9f\x97\x84"=>":file_cabinet:",
-            "\xf0\x9f\x97\x91"=>":wastebasket:",
-            "\xf0\x9f\x97\x92"=>":spiral_note_pad:",
-            "\xf0\x9f\x97\x93"=>":spiral_calendar_pad:",
-            "\xf0\x9f\x97\x9c"=>":compression:",
-            "\xf0\x9f\x97\x9d"=>":old_key:",
-            "\xf0\x9f\x97\x9e"=>":rolled_up_newspaper:",
-            "\xf0\x9f\x97\xa1"=>":dagger_knife:",
-            "\xf0\x9f\x97\xa3"=>":speaking_head_in_silhouette:",
-            "\xf0\x9f\x97\xa8"=>":left_speech_bubble:",
-            "\xf0\x9f\x97\xaf"=>":right_anger_bubble:",
-            "\xf0\x9f\x97\xb3"=>":ballot_box_with_ballot:",
-            "\xf0\x9f\x97\xba"=>":world_map:",
-            "\xf0\x9f\x97\xbb"=>":mount_fuji:",
-            "\xf3\xbe\x93\x83"=>":mount_fuji:",
-            "\xee\x9d\x80"=>":mount_fuji:",
-            "\xee\x80\xbb"=>":mount_fuji:",
-            "\xee\x96\xbd"=>":mount_fuji:",
-            "\xf0\x9f\x97\xbc"=>":tokyo_tower:",
-            "\xf3\xbe\x93\x84"=>":tokyo_tower:",
-            "\xee\x93\x80"=>":tokyo_tower:",
-            "\xf0\x9f\x97\xbd"=>":statue_of_liberty:",
-            "\xf3\xbe\x93\x86"=>":statue_of_liberty:",
-            "\xf0\x9f\x97\xbe"=>":japan:",
-            "\xf3\xbe\x93\x87"=>":japan:",
-            "\xee\x95\xb2"=>":japan:",
-            "\xf0\x9f\x97\xbf"=>":moyai:",
-            "\xf3\xbe\x93\x88"=>":moyai:",
-            "\xee\xad\xac"=>":moyai:",
-            "\xf0\x9f\x98\x80"=>":grinning:",
-            "\xf0\x9f\x98\x81"=>":grin:",
-            "\xf3\xbe\x8c\xb3"=>":grin:",
-            "\xee\x9d\x93"=>":smirk_cat:",
-            "\xee\x90\x84"=>":smirk_cat:",
-            "\xee\xae\x80"=>":grin:",
-            "\xf0\x9f\x98\x82"=>":joy:",
-            "\xf3\xbe\x8c\xb4"=>":joy:",
-            "\xee\x9c\xaa"=>":joy_cat:",
-            "\xee\x90\x92"=>":joy_cat:",
-            "\xee\xad\xa4"=>":joy:",
-            "\xf0\x9f\x98\x83"=>":smiley:",
-            "\xf3\xbe\x8c\xb0"=>":smiley:",
-            "\xee\x81\x97"=>":smiley_cat:",
-            "\xee\x91\xb1"=>":smile:",
-            "\xf0\x9f\x98\x84"=>":smile:",
-            "\xf3\xbe\x8c\xb8"=>":smile:",
-            "\xee\x90\x95"=>":smile:",
-            "\xf0\x9f\x98\x85"=>":sweat_smile:",
-            "\xf3\xbe\x8c\xb1"=>":sweat_smile:",
-            "\xee\x9c\xa2"=>":sweat_smile:",
-            "\xee\x90\x95\xee\x8c\xb1"=>":sweat_smile:",
-            "\xee\x91\xb1\xee\x96\xb1"=>":sweat_smile:",
-            "\xf0\x9f\x98\x86"=>":satisfied:",
-            "\xf3\xbe\x8c\xb2"=>":satisfied:",
-            "\xee\x90\x8a"=>":relieved:",
-            "\xee\xab\x85"=>":relieved:",
-            "\xf0\x9f\x98\x87"=>":innocent:",
-            "\xf0\x9f\x98\x88"=>":smiling_imp:",
-            "\xf0\x9f\x98\x89"=>":wink:",
-            "\xf3\xbe\x8d\x87"=>":wink:",
-            "\xee\x9c\xa9"=>":wink:",
-            "\xee\x90\x85"=>":wink:",
-            "\xee\x97\x83"=>":wink:",
-            "\xf0\x9f\x98\x8a"=>":blush:",
-            "\xf3\xbe\x8c\xb5"=>":blush:",
-            "\xee\x81\x96"=>":yum:",
-            "\xee\xab\x8d"=>":yum:",
-            "\xf0\x9f\x98\x8b"=>":yum:",
-            "\xf3\xbe\x8c\xab"=>":yum:",
-            "\xee\x9d\x92"=>":yum:",
-            "\xf0\x9f\x98\x8c"=>":relieved:",
-            "\xf3\xbe\x8c\xbe"=>":relieved:",
-            "\xee\x9c\xa1"=>":relieved:",
-            "\xf0\x9f\x98\x8d"=>":heart_eyes:",
-            "\xf3\xbe\x8c\xa7"=>":heart_eyes:",
-            "\xee\x9c\xa6"=>":kissing_cat:",
-            "\xee\x84\x86"=>":heart_eyes_cat:",
-            "\xee\x97\x84"=>":heart_eyes:",
-            "\xf0\x9f\x98\x8e"=>":sunglasses:",
-            "\xf0\x9f\x98\x8f"=>":smirk:",
-            "\xf3\xbe\x8d\x83"=>":smirk:",
-            "\xee\x9c\xac"=>":smirk:",
-            "\xee\x90\x82"=>":smirk:",
-            "\xee\xaa\xbf"=>":smirk:",
-            "\xf0\x9f\x98\x90"=>":neutral_face:",
-            "\xf0\x9f\x98\x91"=>":expressionless:",
-            "\xf0\x9f\x98\x92"=>":unamused:",
-            "\xf3\xbe\x8c\xa6"=>":unamused:",
-            "\xee\x9c\xa5"=>":unamused:",
-            "\xee\x90\x8e"=>":unamused:",
-            "\xee\xab\x89"=>":unamused:",
-            "\xf0\x9f\x98\x93"=>":sweat:",
-            "\xf3\xbe\x8d\x84"=>":sweat:",
-            "\xee\x9c\xa3"=>":cold_sweat:",
-            "\xee\x84\x88"=>":sweat:",
-            "\xee\x97\x86"=>":disappointed_relieved:",
-            "\xf0\x9f\x98\x94"=>":pensive:",
-            "\xf3\xbe\x8d\x80"=>":pensive:",
-            "\xee\x9c\xa0"=>":pensive:",
-            "\xee\x90\x83"=>":person_frowning:",
-            "\xee\xab\x80"=>":disappointed:",
-            "\xf0\x9f\x98\x95"=>":confused:",
-            "\xf0\x9f\x98\x96"=>":confounded:",
-            "\xf3\xbe\x8c\xbf"=>":confounded:",
-            "\xee\x9b\xb3"=>":person_frowning:",
-            "\xee\xab\x83"=>":confounded:",
-            "\xf0\x9f\x98\x97"=>":kissing:",
-            "\xf0\x9f\x98\x98"=>":kissing_heart:",
-            "\xf3\xbe\x8c\xac"=>":kissing_heart:",
-            "\xee\x90\x98"=>":kissing_cat:",
-            "\xee\xab\x8f"=>":kissing_heart:",
-            "\xf0\x9f\x98\x99"=>":kissing_smiling_eyes:",
-            "\xf0\x9f\x98\x9a"=>":kissing_closed_eyes:",
-            "\xf3\xbe\x8c\xad"=>":kissing_closed_eyes:",
-            "\xee\x90\x97"=>":kissing_closed_eyes:",
-            "\xee\xab\x8e"=>":kissing_closed_eyes:",
-            "\xf0\x9f\x98\x9b"=>":stuck_out_tongue:",
-            "\xf0\x9f\x98\x9c"=>":stuck_out_tongue_winking_eye:",
-            "\xf3\xbe\x8c\xa9"=>":stuck_out_tongue_winking_eye:",
-            "\xee\x84\x85"=>":stuck_out_tongue_winking_eye:",
-            "\xee\x93\xa7"=>":stuck_out_tongue_closed_eyes:",
-            "\xf0\x9f\x98\x9d"=>":stuck_out_tongue_closed_eyes:",
-            "\xf3\xbe\x8c\xaa"=>":stuck_out_tongue_closed_eyes:",
-            "\xf0\x9f\x98\x9e"=>":disappointed:",
-            "\xf3\xbe\x8c\xa3"=>":disappointed:",
-            "\xee\x9b\xb2"=>":disappointed:",
-            "\xee\x81\x98"=>":disappointed:",
-            "\xf0\x9f\x98\x9f"=>":worried:",
-            "\xf0\x9f\x98\xa0"=>":angry:",
-            "\xf3\xbe\x8c\xa0"=>":angry:",
-            "\xee\x9b\xb1"=>":person_with_pouting_face:",
-            "\xee\x81\x99"=>":angry:",
-            "\xee\x91\xb2"=>":angry:",
-            "\xf0\x9f\x98\xa1"=>":rage:",
-            "\xf3\xbe\x8c\xbd"=>":rage:",
-            "\xee\x9c\xa4"=>":pouting_cat:",
-            "\xee\x90\x96"=>":person_with_pouting_face:",
-            "\xee\xad\x9d"=>":rage:",
-            "\xf0\x9f\x98\xa2"=>":cry:",
-            "\xf3\xbe\x8c\xb9"=>":cry:",
-            "\xee\x9c\xae"=>":crying_cat_face:",
-            "\xee\x90\x93"=>":crying_cat_face:",
-            "\xee\xad\xa9"=>":cry:",
-            "\xf0\x9f\x98\xa3"=>":persevere:",
-            "\xf3\xbe\x8c\xbc"=>":persevere:",
-            "\xee\x9c\xab"=>":tired_face:",
-            "\xee\x90\x86"=>":dizzy_face:",
-            "\xee\xab\x82"=>":persevere:",
-            "\xf0\x9f\x98\xa4"=>":triumph:",
-            "\xf3\xbe\x8c\xa8"=>":triumph:",
-            "\xee\xab\x81"=>":triumph:",
-            "\xf0\x9f\x98\xa5"=>":disappointed_relieved:",
-            "\xf3\xbe\x8d\x85"=>":disappointed_relieved:",
-            "\xee\x90\x81"=>":disappointed_relieved:",
-            "\xf0\x9f\x98\xa6"=>":frowning:",
-            "\xf0\x9f\x98\xa7"=>":anguished:",
-            "\xf0\x9f\x98\xa8"=>":fearful:",
-            "\xf3\xbe\x8c\xbb"=>":fearful:",
-            "\xee\x9d\x97"=>":scream:",
-            "\xee\x90\x8b"=>":fearful:",
-            "\xee\xab\x86"=>":fearful:",
-            "\xf0\x9f\x98\xa9"=>":weary:",
-            "\xf3\xbe\x8c\xa1"=>":weary:",
-            "\xee\xad\xa7"=>":weary:",
-            "\xf0\x9f\x98\xaa"=>":sleepy:",
-            "\xf3\xbe\x8d\x82"=>":sleepy:",
-            "\xee\x90\x88"=>":sleepy:",
-            "\xee\xab\x84"=>":sleepy:",
-            "\xf0\x9f\x98\xab"=>":tired_face:",
-            "\xf3\xbe\x8d\x86"=>":tired_face:",
-            "\xee\x91\xb4"=>":tired_face:",
-            "\xf0\x9f\x98\xac"=>":grimacing:",
-            "\xf0\x9f\x98\xad"=>":sob:",
-            "\xf3\xbe\x8c\xba"=>":sob:",
-            "\xee\x9c\xad"=>":sob:",
-            "\xee\x90\x91"=>":sob:",
-            "\xee\x91\xb3"=>":sob:",
-            "\xf0\x9f\x98\xae"=>":open_mouth:",
-            "\xf0\x9f\x98\xaf"=>":hushed:",
-            "\xf0\x9f\x98\xb0"=>":cold_sweat:",
-            "\xf3\xbe\x8c\xa5"=>":cold_sweat:",
-            "\xee\x90\x8f"=>":cold_sweat:",
-            "\xee\xab\x8b"=>":cold_sweat:",
-            "\xf0\x9f\x98\xb1"=>":scream:",
-            "\xf3\xbe\x8d\x81"=>":scream:",
-            "\xee\x84\x87"=>":scream:",
-            "\xee\x97\x85"=>":scream:",
-            "\xf0\x9f\x98\xb2"=>":astonished:",
-            "\xf3\xbe\x8c\xa2"=>":astonished:",
-            "\xee\x9b\xb4"=>":dizzy_face:",
-            "\xee\x90\x90"=>":astonished:",
-            "\xee\xab\x8a"=>":astonished:",
-            "\xf0\x9f\x98\xb3"=>":flushed:",
-            "\xf3\xbe\x8c\xaf"=>":flushed:",
-            "\xee\x90\x8d"=>":flushed:",
-            "\xee\xab\x88"=>":flushed:",
-            "\xf0\x9f\x98\xb4"=>":sleeping:",
-            "\xf0\x9f\x98\xb5"=>":dizzy_face:",
-            "\xf3\xbe\x8c\xa4"=>":dizzy_face:",
-            "\xee\x96\xae"=>":dizzy_face:",
-            "\xf0\x9f\x98\xb6"=>":no_mouth:",
-            "\xf0\x9f\x98\xb7"=>":mask:",
-            "\xf3\xbe\x8c\xae"=>":mask:",
-            "\xee\x90\x8c"=>":mask:",
-            "\xee\xab\x87"=>":mask:",
-            "\xf0\x9f\x98\xb8"=>":smile_cat:",
-            "\xf3\xbe\x8d\x89"=>":smile_cat:",
-            "\xee\xad\xbf"=>":smile_cat:",
-            "\xf0\x9f\x98\xb9"=>":joy_cat:",
-            "\xf3\xbe\x8d\x8a"=>":joy_cat:",
-            "\xee\xad\xa3"=>":joy_cat:",
-            "\xf0\x9f\x98\xba"=>":smiley_cat:",
-            "\xf3\xbe\x8d\x88"=>":smiley_cat:",
-            "\xee\xad\xa1"=>":smiley_cat:",
-            "\xf0\x9f\x98\xbb"=>":heart_eyes_cat:",
-            "\xf3\xbe\x8d\x8c"=>":heart_eyes_cat:",
-            "\xee\xad\xa5"=>":heart_eyes_cat:",
-            "\xf0\x9f\x98\xbc"=>":smirk_cat:",
-            "\xf3\xbe\x8d\x8f"=>":smirk_cat:",
-            "\xee\xad\xaa"=>":smirk_cat:",
-            "\xf0\x9f\x98\xbd"=>":kissing_cat:",
-            "\xf3\xbe\x8d\x8b"=>":kissing_cat:",
-            "\xee\xad\xa0"=>":kissing_cat:",
-            "\xf0\x9f\x98\xbe"=>":pouting_cat:",
-            "\xf3\xbe\x8d\x8e"=>":pouting_cat:",
-            "\xee\xad\x9e"=>":pouting_cat:",
-            "\xf0\x9f\x98\xbf"=>":crying_cat_face:",
-            "\xf3\xbe\x8d\x8d"=>":crying_cat_face:",
-            "\xee\xad\xa8"=>":crying_cat_face:",
-            "\xf0\x9f\x99\x80"=>":scream_cat:",
-            "\xf3\xbe\x8d\x90"=>":scream_cat:",
-            "\xee\xad\xa6"=>":scream_cat:",
-            "\xf0\x9f\x99\x81"=>":slightly_frowning_face:",
-            "\xf0\x9f\x99\x82"=>":slightly_smiling_face:",
-            "\xf0\x9f\x99\x83"=>":upside_down_face:",
-            "\xf0\x9f\x99\x84"=>":face_with_rolling_eyes:",
-            "\xf0\x9f\x99\x85"=>":no_good:",
-            "\xf3\xbe\x8d\x91"=>":no_good:",
-            "\xee\x90\xa3"=>":no_good:",
-            "\xee\xab\x97"=>":no_good:",
-            "\xf0\x9f\x99\x86"=>":ok_woman:",
-            "\xf3\xbe\x8d\x92"=>":ok_woman:",
-            "\xee\x90\xa4"=>":ok_woman:",
-            "\xee\xab\x98"=>":ok_woman:",
-            "\xf0\x9f\x99\x87"=>":bow:",
-            "\xf3\xbe\x8d\x93"=>":bow:",
-            "\xee\x90\xa6"=>":bow:",
-            "\xee\xab\x99"=>":bow:",
-            "\xf0\x9f\x99\x88"=>":see_no_evil:",
-            "\xf3\xbe\x8d\x94"=>":see_no_evil:",
-            "\xee\xad\x90"=>":see_no_evil:",
-            "\xf0\x9f\x99\x89"=>":hear_no_evil:",
-            "\xf3\xbe\x8d\x96"=>":hear_no_evil:",
-            "\xee\xad\x92"=>":hear_no_evil:",
-            "\xf0\x9f\x99\x8a"=>":speak_no_evil:",
-            "\xf3\xbe\x8d\x95"=>":speak_no_evil:",
-            "\xee\xad\x91"=>":speak_no_evil:",
-            "\xf0\x9f\x99\x8b"=>":raising_hand:",
-            "\xf3\xbe\x8d\x97"=>":raising_hand:",
-            "\xee\xae\x85"=>":raising_hand:",
-            "\xf0\x9f\x99\x8c"=>":raised_hands:",
-            "\xf3\xbe\x8d\x98"=>":raised_hands:",
-            "\xee\x90\xa7"=>":raised_hands:",
-            "\xee\xae\x86"=>":raised_hands:",
-            "\xf0\x9f\x99\x8d"=>":person_frowning:",
-            "\xf3\xbe\x8d\x99"=>":person_frowning:",
-            "\xee\xae\x87"=>":person_frowning:",
-            "\xf0\x9f\x99\x8e"=>":person_with_pouting_face:",
-            "\xf3\xbe\x8d\x9a"=>":person_with_pouting_face:",
-            "\xee\xae\x88"=>":person_with_pouting_face:",
-            "\xf0\x9f\x99\x8f"=>":pray:",
-            "\xf3\xbe\x8d\x9b"=>":pray:",
-            "\xee\x90\x9d"=>":pray:",
-            "\xee\xab\x92"=>":pray:",
-            "\xf0\x9f\x9a\x80"=>":rocket:",
-            "\xf3\xbe\x9f\xad"=>":rocket:",
-            "\xee\x84\x8d"=>":rocket:",
-            "\xee\x97\x88"=>":rocket:",
-            "\xf0\x9f\x9a\x81"=>":helicopter:",
-            "\xf0\x9f\x9a\x82"=>":steam_locomotive:",
-            "\xf0\x9f\x9a\x83"=>":railway_car:",
-            "\xf3\xbe\x9f\x9f"=>":railway_car:",
-            "\xee\x99\x9b"=>":railway_car:",
-            "\xee\x80\x9e"=>":railway_car:",
-            "\xee\x92\xb5"=>":railway_car:",
-            "\xf0\x9f\x9a\x84"=>":bullettrain_side:",
-            "\xf3\xbe\x9f\xa2"=>":bullettrain_side:",
-            "\xee\x99\x9d"=>":bullettrain_front:",
-            "\xee\x90\xb5"=>":bullettrain_side:",
-            "\xee\x92\xb0"=>":bullettrain_front:",
-            "\xf0\x9f\x9a\x85"=>":bullettrain_front:",
-            "\xf3\xbe\x9f\xa3"=>":bullettrain_front:",
-            "\xee\x80\x9f"=>":bullettrain_front:",
-            "\xf0\x9f\x9a\x86"=>":train2:",
-            "\xf0\x9f\x9a\x87"=>":metro:",
-            "\xf3\xbe\x9f\xa0"=>":metro:",
-            "\xf0\x9f\x9a\x88"=>":light_rail:",
-            "\xf0\x9f\x9a\x89"=>":station:",
-            "\xf3\xbe\x9f\xac"=>":station:",
-            "\xee\x80\xb9"=>":station:",
-            "\xee\xad\xad"=>":station:",
-            "\xf0\x9f\x9a\x8a"=>":tram:",
-            "\xf0\x9f\x9a\x8b"=>":train:",
-            "\xf0\x9f\x9a\x8c"=>":bus:",
-            "\xf3\xbe\x9f\xa6"=>":bus:",
-            "\xee\x99\xa0"=>":bus:",
-            "\xee\x85\x99"=>":bus:",
-            "\xee\x92\xaf"=>":bus:",
-            "\xf0\x9f\x9a\x8d"=>":oncoming_bus:",
-            "\xf0\x9f\x9a\x8e"=>":trolleybus:",
-            "\xf0\x9f\x9a\x8f"=>":busstop:",
-            "\xf3\xbe\x9f\xa7"=>":busstop:",
-            "\xee\x85\x90"=>":busstop:",
-            "\xee\x92\xa7"=>":busstop:",
-            "\xf0\x9f\x9a\x90"=>":minibus:",
-            "\xf0\x9f\x9a\x91"=>":ambulance:",
-            "\xf3\xbe\x9f\xb3"=>":ambulance:",
-            "\xee\x90\xb1"=>":ambulance:",
-            "\xee\xab\xa0"=>":ambulance:",
-            "\xf0\x9f\x9a\x92"=>":fire_engine:",
-            "\xf3\xbe\x9f\xb2"=>":fire_engine:",
-            "\xee\x90\xb0"=>":fire_engine:",
-            "\xee\xab\x9f"=>":fire_engine:",
-            "\xf0\x9f\x9a\x93"=>":police_car:",
-            "\xf3\xbe\x9f\xb4"=>":police_car:",
-            "\xee\x90\xb2"=>":rotating_light:",
-            "\xee\xab\xa1"=>":police_car:",
-            "\xf0\x9f\x9a\x94"=>":oncoming_police_car:",
-            "\xf0\x9f\x9a\x95"=>":taxi:",
-            "\xf3\xbe\x9f\xaf"=>":taxi:",
-            "\xee\x99\x9e"=>":red_car:",
-            "\xee\x85\x9a"=>":taxi:",
-            "\xee\x92\xb1"=>":blue_car:",
-            "\xf0\x9f\x9a\x96"=>":oncoming_taxi:",
-            "\xf0\x9f\x9a\x97"=>":red_car:",
-            "\xf3\xbe\x9f\xa4"=>":red_car:",
-            "\xee\x80\x9b"=>":red_car:",
-            "\xf0\x9f\x9a\x98"=>":oncoming_automobile:",
-            "\xf0\x9f\x9a\x99"=>":blue_car:",
-            "\xf3\xbe\x9f\xa5"=>":blue_car:",
-            "\xee\x99\x9f"=>":blue_car:",
-            "\xee\x90\xae"=>":blue_car:",
-            "\xf0\x9f\x9a\x9a"=>":truck:",
-            "\xf3\xbe\x9f\xb1"=>":truck:",
-            "\xee\x90\xaf"=>":truck:",
-            "\xee\x92\xb2"=>":truck:",
-            "\xf0\x9f\x9a\x9b"=>":articulated_lorry:",
-            "\xf0\x9f\x9a\x9c"=>":tractor:",
-            "\xf0\x9f\x9a\x9d"=>":monorail:",
-            "\xf0\x9f\x9a\x9e"=>":mountain_railway:",
-            "\xf0\x9f\x9a\x9f"=>":suspension_railway:",
-            "\xf0\x9f\x9a\xa0"=>":mountain_cableway:",
-            "\xf0\x9f\x9a\xa1"=>":aerial_tramway:",
-            "\xf0\x9f\x9a\xa2"=>":ship:",
-            "\xf3\xbe\x9f\xa8"=>":ship:",
-            "\xee\xaa\x82"=>":ship:",
-            "\xf0\x9f\x9a\xa3"=>":rowboat:",
-            "\xf0\x9f\x9a\xa4"=>":speedboat:",
-            "\xf3\xbe\x9f\xae"=>":speedboat:",
-            "\xee\x84\xb5"=>":speedboat:",
-            "\xf0\x9f\x9a\xa5"=>":traffic_light:",
-            "\xf3\xbe\x9f\xb7"=>":traffic_light:",
-            "\xee\x99\xad"=>":traffic_light:",
-            "\xee\x85\x8e"=>":traffic_light:",
-            "\xee\x91\xaa"=>":traffic_light:",
-            "\xf0\x9f\x9a\xa6"=>":vertical_traffic_light:",
-            "\xf0\x9f\x9a\xa7"=>":construction:",
-            "\xf3\xbe\x9f\xb8"=>":construction:",
-            "\xee\x97\x97"=>":construction:",
-            "\xf0\x9f\x9a\xa8"=>":rotating_light:",
-            "\xf3\xbe\x9f\xb9"=>":rotating_light:",
-            "\xee\xad\xb3"=>":rotating_light:",
-            "\xf0\x9f\x9a\xa9"=>":triangular_flag_on_post:",
-            "\xf3\xbe\xac\xa2"=>":triangular_flag_on_post:",
-            "\xee\x9b\x9e"=>":triangular_flag_on_post:",
-            "\xee\xac\xac"=>":triangular_flag_on_post:",
-            "\xf0\x9f\x9a\xaa"=>":door:",
-            "\xf3\xbe\x93\xb3"=>":door:",
-            "\xee\x9c\x94"=>":door:",
-            "\xf0\x9f\x9a\xab"=>":no_entry_sign:",
-            "\xf3\xbe\xad\x88"=>":no_entry_sign:",
-            "\xee\x95\x81"=>":no_entry_sign:",
-            "\xf0\x9f\x9a\xac"=>":smoking:",
-            "\xf3\xbe\xac\x9e"=>":smoking:",
-            "\xee\x99\xbf"=>":smoking:",
-            "\xee\x8c\x8e"=>":smoking:",
-            "\xee\x91\xbd"=>":smoking:",
-            "\xf0\x9f\x9a\xad"=>":no_smoking:",
-            "\xf3\xbe\xac\x9f"=>":no_smoking:",
-            "\xee\x9a\x80"=>":no_smoking:",
-            "\xee\x88\x88"=>":no_smoking:",
-            "\xee\x91\xbe"=>":no_smoking:",
-            "\xf0\x9f\x9a\xae"=>":put_litter_in_its_place:",
-            "\xf0\x9f\x9a\xaf"=>":do_not_litter:",
-            "\xf0\x9f\x9a\xb0"=>":potable_water:",
-            "\xf0\x9f\x9a\xb1"=>":non-potable_water:",
-            "\xf0\x9f\x9a\xb2"=>":bike:",
-            "\xf3\xbe\x9f\xab"=>":bike:",
-            "\xee\x9c\x9d"=>":bike:",
-            "\xee\x84\xb6"=>":bike:",
-            "\xee\x92\xae"=>":bike:",
-            "\xf0\x9f\x9a\xb3"=>":no_bicycles:",
-            "\xf0\x9f\x9a\xb4"=>":bicyclist:",
-            "\xf0\x9f\x9a\xb5"=>":mountain_bicyclist:",
-            "\xf0\x9f\x9a\xb6"=>":walking:",
-            "\xf3\xbe\x9f\xb0"=>":walking:",
-            "\xee\x88\x81"=>":walking:",
-            "\xee\xad\xb2"=>":walking:",
-            "\xf0\x9f\x9a\xb7"=>":no_pedestrians:",
-            "\xf0\x9f\x9a\xb8"=>":children_crossing:",
-            "\xf0\x9f\x9a\xb9"=>":mens:",
-            "\xf3\xbe\xac\xb3"=>":mens:",
-            "\xee\x84\xb8"=>":mens:",
-            "\xf0\x9f\x9a\xba"=>":womens:",
-            "\xf3\xbe\xac\xb4"=>":womens:",
-            "\xee\x84\xb9"=>":womens:",
-            "\xf0\x9f\x9a\xbb"=>":restroom:",
-            "\xf3\xbe\x94\x86"=>":restroom:",
-            "\xee\x99\xae"=>":wc:",
-            "\xee\x85\x91"=>":restroom:",
-            "\xee\x92\xa5"=>":wc:",
-            "\xf0\x9f\x9a\xbc"=>":baby_symbol:",
-            "\xf3\xbe\xac\xb5"=>":baby_symbol:",
-            "\xee\x84\xba"=>":baby_symbol:",
-            "\xf0\x9f\x9a\xbd"=>":toilet:",
-            "\xf3\xbe\x94\x87"=>":toilet:",
-            "\xee\x85\x80"=>":toilet:",
-            "\xf0\x9f\x9a\xbe"=>":wc:",
-            "\xf3\xbe\x94\x88"=>":wc:",
-            "\xee\x8c\x89"=>":wc:",
-            "\xf0\x9f\x9a\xbf"=>":shower:",
-            "\xf0\x9f\x9b\x80"=>":bath:",
-            "\xf3\xbe\x94\x85"=>":bath:",
-            "\xee\x84\xbf"=>":bath:",
-            "\xee\x97\x98"=>":bath:",
-            "\xf0\x9f\x9b\x81"=>":bathtub:",
-            "\xf0\x9f\x9b\x82"=>":passport_control:",
-            "\xf0\x9f\x9b\x83"=>":customs:",
-            "\xf0\x9f\x9b\x84"=>":baggage_claim:",
-            "\xf0\x9f\x9b\x85"=>":left_luggage:",
-            "\xf0\x9f\x9b\x8b"=>":couch_and_lamp:",
-            "\xf0\x9f\x9b\x8c"=>":sleeping_accommodation:",
-            "\xf0\x9f\x9b\x8d"=>":shopping_bags:",
-            "\xf0\x9f\x9b\x8e"=>":bellhop_bell:",
-            "\xf0\x9f\x9b\x8f"=>":bed:",
-            "\xf0\x9f\x9b\x90"=>":place_of_worship:",
-            "\xf0\x9f\x9b\xa0"=>":hammer_and_wrench:",
-            "\xf0\x9f\x9b\xa1"=>":shield:",
-            "\xf0\x9f\x9b\xa2"=>":oil_drum:",
-            "\xf0\x9f\x9b\xa3"=>":motorway:",
-            "\xf0\x9f\x9b\xa4"=>":railway_track:",
-            "\xf0\x9f\x9b\xa5"=>":motor_boat:",
-            "\xf0\x9f\x9b\xa9"=>":small_airplane:",
-            "\xf0\x9f\x9b\xab"=>":airplane_departure:",
-            "\xf0\x9f\x9b\xac"=>":airplane_arriving:",
-            "\xf0\x9f\x9b\xb0"=>":satellite:",
-            "\xf0\x9f\x9b\xb3"=>":passenger_ship:",
-            "\xf0\x9f\xa4\x90"=>":zipper_mouth_face:",
-            "\xf0\x9f\xa4\x91"=>":money_mouth_face:",
-            "\xf0\x9f\xa4\x92"=>":face_with_thermometer:",
-            "\xf0\x9f\xa4\x93"=>":nerd_face:",
-            "\xf0\x9f\xa4\x94"=>":thinking_face:",
-            "\xf0\x9f\xa4\x95"=>":face_with_head_bandage:",
-            "\xf0\x9f\xa4\x96"=>":robot_face:",
-            "\xf0\x9f\xa4\x97"=>":hugging_face:",
-            "\xf0\x9f\xa4\x98"=>":sign_of_the_horns:",
-            "\xf0\x9f\xa6\x80"=>":crab:",
-            "\xf0\x9f\xa6\x81"=>":lion_face:",
-            "\xf0\x9f\xa6\x82"=>":scorpion:",
-            "\xf0\x9f\xa6\x83"=>":turkey:",
-            "\xf0\x9f\xa6\x84"=>":unicorn_face:",
-            "\xf0\x9f\xa7\x80"=>":cheese_wedge:",
-            "#\xe2\x83\xa3"=>":hash:",
-            "\xf3\xbe\xa0\xac"=>":hash:",
-            "\xee\x9b\xa0"=>":hash:",
-            "\xee\x88\x90"=>":hash:",
-            "\xee\xae\x84"=>":hash:",
-            "#\xef\xb8\x8f\xe2\x83\xa3"=>":hash:",
-            "*\xe2\x83\xa3"=>":keycap_star:",
-            "0\xe2\x83\xa3"=>":zero:",
-            "\xf3\xbe\xa0\xb7"=>":zero:",
-            "\xee\x9b\xab"=>":zero:",
-            "\xee\x88\xa5"=>":zero:",
-            "\xee\x96\xac"=>":zero:",
-            "0\xef\xb8\x8f\xe2\x83\xa3"=>":zero:",
-            "1\xe2\x83\xa3"=>":one:",
-            "\xf3\xbe\xa0\xae"=>":one:",
-            "\xee\x9b\xa2"=>":one:",
-            "\xee\x88\x9c"=>":one:",
-            "1\xef\xb8\x8f\xe2\x83\xa3"=>":one:",
-            "2\xe2\x83\xa3"=>":two:",
-            "\xf3\xbe\xa0\xaf"=>":two:",
-            "\xee\x9b\xa3"=>":two:",
-            "\xee\x88\x9d"=>":two:",
-            "2\xef\xb8\x8f\xe2\x83\xa3"=>":two:",
-            "3\xe2\x83\xa3"=>":three:",
-            "\xf3\xbe\xa0\xb0"=>":three:",
-            "\xee\x9b\xa4"=>":three:",
-            "\xee\x88\x9e"=>":three:",
-            "3\xef\xb8\x8f\xe2\x83\xa3"=>":three:",
-            "4\xe2\x83\xa3"=>":four:",
-            "\xf3\xbe\xa0\xb1"=>":four:",
-            "\xee\x9b\xa5"=>":four:",
-            "\xee\x88\x9f"=>":four:",
-            "4\xef\xb8\x8f\xe2\x83\xa3"=>":four:",
-            "5\xe2\x83\xa3"=>":five:",
-            "\xf3\xbe\xa0\xb2"=>":five:",
-            "\xee\x9b\xa6"=>":five:",
-            "\xee\x88\xa0"=>":five:",
-            "5\xef\xb8\x8f\xe2\x83\xa3"=>":five:",
-            "6\xe2\x83\xa3"=>":six:",
-            "\xf3\xbe\xa0\xb3"=>":six:",
-            "\xee\x9b\xa7"=>":six:",
-            "\xee\x88\xa1"=>":six:",
-            "6\xef\xb8\x8f\xe2\x83\xa3"=>":six:",
-            "7\xe2\x83\xa3"=>":seven:",
-            "\xf3\xbe\xa0\xb4"=>":seven:",
-            "\xee\x9b\xa8"=>":seven:",
-            "\xee\x88\xa2"=>":seven:",
-            "7\xef\xb8\x8f\xe2\x83\xa3"=>":seven:",
-            "8\xe2\x83\xa3"=>":eight:",
-            "\xf3\xbe\xa0\xb5"=>":eight:",
-            "\xee\x9b\xa9"=>":eight:",
-            "\xee\x88\xa3"=>":eight:",
-            "8\xef\xb8\x8f\xe2\x83\xa3"=>":eight:",
-            "9\xe2\x83\xa3"=>":nine:",
-            "\xf3\xbe\xa0\xb6"=>":nine:",
-            "\xee\x9b\xaa"=>":nine:",
-            "\xee\x88\xa4"=>":nine:",
-            "9\xef\xb8\x8f\xe2\x83\xa3"=>":nine:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa8"=>":flag-ac:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa9"=>":flag-ad:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xaa"=>":flag-ae:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xab"=>":flag-af:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xac"=>":flag-ag:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xae"=>":flag-ai:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb1"=>":flag-al:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb2"=>":flag-am:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb4"=>":flag-ao:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb6"=>":flag-aq:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb7"=>":flag-ar:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb8"=>":flag-as:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb9"=>":flag-at:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xba"=>":flag-au:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbc"=>":flag-aw:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbd"=>":flag-ax:",
-            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbf"=>":flag-az:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa6"=>":flag-ba:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa7"=>":flag-bb:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa9"=>":flag-bd:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaa"=>":flag-be:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xab"=>":flag-bf:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xac"=>":flag-bg:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xad"=>":flag-bh:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xae"=>":flag-bi:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaf"=>":flag-bj:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb1"=>":flag-bl:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb2"=>":flag-bm:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb3"=>":flag-bn:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb4"=>":flag-bo:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb6"=>":flag-bq:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb7"=>":flag-br:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb8"=>":flag-bs:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb9"=>":flag-bt:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbb"=>":flag-bv:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbc"=>":flag-bw:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbe"=>":flag-by:",
-            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbf"=>":flag-bz:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa6"=>":flag-ca:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa8"=>":flag-cc:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa9"=>":flag-cd:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xab"=>":flag-cf:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xac"=>":flag-cg:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xad"=>":flag-ch:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xae"=>":flag-ci:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb0"=>":flag-ck:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb1"=>":flag-cl:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb2"=>":flag-cm:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3"=>":cn:",
-            "\xf3\xbe\x93\xad"=>":cn:",
-            "\xee\xac\x91"=>":cn:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb4"=>":flag-co:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb5"=>":flag-cp:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb7"=>":flag-cr:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xba"=>":flag-cu:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbb"=>":flag-cv:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbc"=>":flag-cw:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbd"=>":flag-cx:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbe"=>":flag-cy:",
-            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbf"=>":flag-cz:",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa"=>":de:",
-            "\xf3\xbe\x93\xa8"=>":de:",
-            "\xee\xac\x8e"=>":de:",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xac"=>":flag-dg:",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaf"=>":flag-dj:",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb0"=>":flag-dk:",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb2"=>":flag-dm:",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb4"=>":flag-do:",
-            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xbf"=>":flag-dz:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa6"=>":flag-ea:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa8"=>":flag-ec:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xaa"=>":flag-ee:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xac"=>":flag-eg:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xad"=>":flag-eh:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb7"=>":flag-er:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8"=>":es:",
-            "\xf3\xbe\x93\xab"=>":es:",
-            "\xee\x97\x95"=>":es:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb9"=>":flag-et:",
-            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xba"=>":flag-eu:",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xae"=>":flag-fi:",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xaf"=>":flag-fj:",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb0"=>":flag-fk:",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb2"=>":flag-fm:",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb4"=>":flag-fo:",
-            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb7"=>":fr:",
-            "\xf3\xbe\x93\xa7"=>":fr:",
-            "\xee\xab\xba"=>":fr:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa6"=>":flag-ga:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa7"=>":uk:",
-            "\xf3\xbe\x93\xaa"=>":uk:",
-            "\xee\xac\x90"=>":uk:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa9"=>":flag-gd:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xaa"=>":flag-ge:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xab"=>":flag-gf:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xac"=>":flag-gg:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xad"=>":flag-gh:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xae"=>":flag-gi:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb1"=>":flag-gl:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb2"=>":flag-gm:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb3"=>":flag-gn:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb5"=>":flag-gp:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb6"=>":flag-gq:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb7"=>":flag-gr:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb8"=>":flag-gs:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb9"=>":flag-gt:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xba"=>":flag-gu:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbc"=>":flag-gw:",
-            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbe"=>":flag-gy:",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb0"=>":flag-hk:",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb2"=>":flag-hm:",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb3"=>":flag-hn:",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb7"=>":flag-hr:",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb9"=>":flag-ht:",
-            "\xf0\x9f\x87\xad\xf0\x9f\x87\xba"=>":flag-hu:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa8"=>":flag-ic:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa9"=>":flag-id:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xaa"=>":flag-ie:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb1"=>":flag-il:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb2"=>":flag-im:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb3"=>":flag-in:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb4"=>":flag-io:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb6"=>":flag-iq:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb7"=>":flag-ir:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb8"=>":flag-is:",
-            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb9"=>":it:",
-            "\xf3\xbe\x93\xa9"=>":it:",
-            "\xee\xac\x8f"=>":it:",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xaa"=>":flag-je:",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb2"=>":flag-jm:",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb4"=>":flag-jo:",
-            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5"=>":jp:",
-            "\xf3\xbe\x93\xa5"=>":jp:",
-            "\xee\x93\x8c"=>":jp:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xaa"=>":flag-ke:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xac"=>":flag-kg:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xad"=>":flag-kh:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xae"=>":flag-ki:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb2"=>":flag-km:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb3"=>":flag-kn:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb5"=>":flag-kp:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7"=>":kr:",
-            "\xf3\xbe\x93\xae"=>":kr:",
-            "\xee\xac\x92"=>":kr:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbc"=>":flag-kw:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbe"=>":flag-ky:",
-            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbf"=>":flag-kz:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa6"=>":flag-la:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa7"=>":flag-lb:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa8"=>":flag-lc:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xae"=>":flag-li:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb0"=>":flag-lk:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb7"=>":flag-lr:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb8"=>":flag-ls:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb9"=>":flag-lt:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xba"=>":flag-lu:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbb"=>":flag-lv:",
-            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbe"=>":flag-ly:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa6"=>":flag-ma:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa8"=>":flag-mc:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa9"=>":flag-md:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xaa"=>":flag-me:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xab"=>":flag-mf:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xac"=>":flag-mg:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xad"=>":flag-mh:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb0"=>":flag-mk:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb1"=>":flag-ml:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb2"=>":flag-mm:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb3"=>":flag-mn:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb4"=>":flag-mo:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb5"=>":flag-mp:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb6"=>":flag-mq:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb7"=>":flag-mr:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb8"=>":flag-ms:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb9"=>":flag-mt:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xba"=>":flag-mu:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbb"=>":flag-mv:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbc"=>":flag-mw:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbd"=>":flag-mx:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbe"=>":flag-my:",
-            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbf"=>":flag-mz:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa6"=>":flag-na:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa8"=>":flag-nc:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xaa"=>":flag-ne:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xab"=>":flag-nf:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xac"=>":flag-ng:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xae"=>":flag-ni:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb1"=>":flag-nl:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb4"=>":flag-no:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb5"=>":flag-np:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb7"=>":flag-nr:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xba"=>":flag-nu:",
-            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xbf"=>":flag-nz:",
-            "\xf0\x9f\x87\xb4\xf0\x9f\x87\xb2"=>":flag-om:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xa6"=>":flag-pa:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xaa"=>":flag-pe:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xab"=>":flag-pf:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xac"=>":flag-pg:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xad"=>":flag-ph:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb0"=>":flag-pk:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb1"=>":flag-pl:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb2"=>":flag-pm:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb3"=>":flag-pn:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb7"=>":flag-pr:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb8"=>":flag-ps:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb9"=>":flag-pt:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbc"=>":flag-pw:",
-            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbe"=>":flag-py:",
-            "\xf0\x9f\x87\xb6\xf0\x9f\x87\xa6"=>":flag-qa:",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xaa"=>":flag-re:",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb4"=>":flag-ro:",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb8"=>":flag-rs:",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xba"=>":ru:",
-            "\xf3\xbe\x93\xac"=>":ru:",
-            "\xee\x97\x96"=>":ru:",
-            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xbc"=>":flag-rw:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa6"=>":flag-sa:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa7"=>":flag-sb:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa8"=>":flag-sc:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa9"=>":flag-sd:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaa"=>":flag-se:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xac"=>":flag-sg:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xad"=>":flag-sh:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xae"=>":flag-si:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaf"=>":flag-sj:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb0"=>":flag-sk:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb1"=>":flag-sl:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb2"=>":flag-sm:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb3"=>":flag-sn:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb4"=>":flag-so:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb7"=>":flag-sr:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb8"=>":flag-ss:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb9"=>":flag-st:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbb"=>":flag-sv:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbd"=>":flag-sx:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbe"=>":flag-sy:",
-            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbf"=>":flag-sz:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa6"=>":flag-ta:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa8"=>":flag-tc:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa9"=>":flag-td:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xab"=>":flag-tf:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xac"=>":flag-tg:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xad"=>":flag-th:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xaf"=>":flag-tj:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb0"=>":flag-tk:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb1"=>":flag-tl:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb2"=>":flag-tm:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb3"=>":flag-tn:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb4"=>":flag-to:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb7"=>":flag-tr:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb9"=>":flag-tt:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbb"=>":flag-tv:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbc"=>":flag-tw:",
-            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbf"=>":flag-tz:",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xa6"=>":flag-ua:",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xac"=>":flag-ug:",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb2"=>":flag-um:",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb8"=>":us:",
-            "\xf3\xbe\x93\xa6"=>":us:",
-            "\xee\x95\xb3"=>":us:",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbe"=>":flag-uy:",
-            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbf"=>":flag-uz:",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa6"=>":flag-va:",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa8"=>":flag-vc:",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xaa"=>":flag-ve:",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xac"=>":flag-vg:",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xae"=>":flag-vi:",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xb3"=>":flag-vn:",
-            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xba"=>":flag-vu:",
-            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xab"=>":flag-wf:",
-            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xb8"=>":flag-ws:",
-            "\xf0\x9f\x87\xbd\xf0\x9f\x87\xb0"=>":flag-xk:",
-            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xaa"=>":flag-ye:",
-            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xb9"=>":flag-yt:",
-            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xa6"=>":flag-za:",
-            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xb2"=>":flag-zm:",
-            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xbc"=>":flag-zw:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":man-man-boy:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":man-man-boy-boy:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7"=>":man-man-girl:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":man-man-girl-boy:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"=>":man-man-girl-girl:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":man-woman-boy-boy:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"=>":man-woman-girl:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":man-woman-girl-boy:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"=>":man-woman-girl-girl:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8"=>":man-heart-man:",
-            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa8"=>":man-kiss-man:",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":woman-woman-boy:",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":woman-woman-boy-boy:",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"=>":woman-woman-girl:",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"=>":woman-woman-girl-boy:",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"=>":woman-woman-girl-girl:",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9"=>":woman-heart-woman:",
-            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9"=>":woman-kiss-woman:",
-	];
-}
\ No newline at end of file
+class UnicodeToShortEmojiMap
+{
+    public static $map = [
+            "\xc2\xa9"                                                                                                     => ':copyright:',
+            "\xf3\xbe\xac\xa9"                                                                                             => ':copyright:',
+            "\xee\x9c\xb1"                                                                                                 => ':copyright:',
+            "\xee\x89\x8e"                                                                                                 => ':copyright:',
+            "\xee\x95\x98"                                                                                                 => ':copyright:',
+            "\xc2\xa9\xef\xb8\x8f"                                                                                         => ':copyright:',
+            "\xc2\xae"                                                                                                     => ':registered:',
+            "\xf3\xbe\xac\xad"                                                                                             => ':registered:',
+            "\xee\x9c\xb6"                                                                                                 => ':registered:',
+            "\xee\x89\x8f"                                                                                                 => ':registered:',
+            "\xee\x95\x99"                                                                                                 => ':registered:',
+            "\xc2\xae\xef\xb8\x8f"                                                                                         => ':registered:',
+            "\xe2\x80\xbc"                                                                                                 => ':bangbang:',
+            "\xf3\xbe\xac\x86"                                                                                             => ':bangbang:',
+            "\xee\x9c\x84"                                                                                                 => ':bangbang:',
+            "\xee\xac\xb0"                                                                                                 => ':bangbang:',
+            "\xe2\x80\xbc\xef\xb8\x8f"                                                                                     => ':bangbang:',
+            "\xe2\x81\x89"                                                                                                 => ':interrobang:',
+            "\xf3\xbe\xac\x85"                                                                                             => ':interrobang:',
+            "\xee\x9c\x83"                                                                                                 => ':interrobang:',
+            "\xee\xac\xaf"                                                                                                 => ':interrobang:',
+            "\xe2\x81\x89\xef\xb8\x8f"                                                                                     => ':interrobang:',
+            "\xe2\x84\xa2"                                                                                                 => ':tm:',
+            "\xf3\xbe\xac\xaa"                                                                                             => ':tm:',
+            "\xee\x9c\xb2"                                                                                                 => ':tm:',
+            "\xee\x94\xb7"                                                                                                 => ':small_blue_diamond:',
+            "\xee\x95\x8e"                                                                                                 => ':tm:',
+            "\xe2\x84\xa2\xef\xb8\x8f"                                                                                     => ':tm:',
+            "\xe2\x84\xb9"                                                                                                 => ':information_source:',
+            "\xf3\xbe\xad\x87"                                                                                             => ':information_source:',
+            "\xee\x94\xb3"                                                                                                 => ':b:',
+            "\xe2\x84\xb9\xef\xb8\x8f"                                                                                     => ':information_source:',
+            "\xe2\x86\x94"                                                                                                 => ':left_right_arrow:',
+            "\xf3\xbe\xab\xb6"                                                                                             => ':left_right_arrow:',
+            "\xee\x9c\xbc"                                                                                                 => ':left_right_arrow:',
+            "\xee\xad\xba"                                                                                                 => ':left_right_arrow:',
+            "\xe2\x86\x94\xef\xb8\x8f"                                                                                     => ':left_right_arrow:',
+            "\xe2\x86\x95"                                                                                                 => ':arrow_up_down:',
+            "\xf3\xbe\xab\xb7"                                                                                             => ':arrow_up_down:',
+            "\xee\x9c\xbd"                                                                                                 => ':arrow_up_down:',
+            "\xee\xad\xbb"                                                                                                 => ':arrow_up_down:',
+            "\xe2\x86\x95\xef\xb8\x8f"                                                                                     => ':arrow_up_down:',
+            "\xe2\x86\x96"                                                                                                 => ':arrow_upper_left:',
+            "\xf3\xbe\xab\xb2"                                                                                             => ':arrow_upper_left:',
+            "\xee\x9a\x97"                                                                                                 => ':arrow_upper_left:',
+            "\xee\x88\xb7"                                                                                                 => ':arrow_upper_left:',
+            "\xee\x95\x8c"                                                                                                 => ':arrow_upper_left:',
+            "\xe2\x86\x96\xef\xb8\x8f"                                                                                     => ':arrow_upper_left:',
+            "\xe2\x86\x97"                                                                                                 => ':arrow_upper_right:',
+            "\xf3\xbe\xab\xb0"                                                                                             => ':arrow_upper_right:',
+            "\xee\x99\xb8"                                                                                                 => ':arrow_upper_right:',
+            "\xee\x88\xb6"                                                                                                 => ':arrow_heading_up:',
+            "\xee\x95\x95"                                                                                                 => ':arrow_upper_right:',
+            "\xe2\x86\x97\xef\xb8\x8f"                                                                                     => ':arrow_upper_right:',
+            "\xe2\x86\x98"                                                                                                 => ':arrow_lower_right:',
+            "\xf3\xbe\xab\xb1"                                                                                             => ':arrow_lower_right:',
+            "\xee\x9a\x96"                                                                                                 => ':arrow_lower_right:',
+            "\xee\x88\xb8"                                                                                                 => ':arrow_heading_down:',
+            "\xee\x95\x8d"                                                                                                 => ':arrow_lower_right:',
+            "\xe2\x86\x98\xef\xb8\x8f"                                                                                     => ':arrow_lower_right:',
+            "\xe2\x86\x99"                                                                                                 => ':arrow_lower_left:',
+            "\xf3\xbe\xab\xb3"                                                                                             => ':arrow_lower_left:',
+            "\xee\x9a\xa5"                                                                                                 => ':arrow_lower_left:',
+            "\xee\x88\xb9"                                                                                                 => ':arrow_lower_left:',
+            "\xee\x95\x96"                                                                                                 => ':arrow_lower_left:',
+            "\xe2\x86\x99\xef\xb8\x8f"                                                                                     => ':arrow_lower_left:',
+            "\xe2\x86\xa9"                                                                                                 => ':leftwards_arrow_with_hook:',
+            "\xf3\xbe\xae\x83"                                                                                             => ':leftwards_arrow_with_hook:',
+            "\xee\x9b\x9a"                                                                                                 => ':leftwards_arrow_with_hook:',
+            "\xee\x95\x9d"                                                                                                 => ':leftwards_arrow_with_hook:',
+            "\xe2\x86\xa9\xef\xb8\x8f"                                                                                     => ':leftwards_arrow_with_hook:',
+            "\xe2\x86\xaa"                                                                                                 => ':arrow_right_hook:',
+            "\xf3\xbe\xae\x88"                                                                                             => ':arrow_right_hook:',
+            "\xee\x95\x9c"                                                                                                 => ':arrow_right_hook:',
+            "\xe2\x86\xaa\xef\xb8\x8f"                                                                                     => ':arrow_right_hook:',
+            "\xe2\x8c\x9a"                                                                                                 => ':watch:',
+            "\xf3\xbe\x80\x9d"                                                                                             => ':watch:',
+            "\xee\x9c\x9f"                                                                                                 => ':watch:',
+            "\xee\x95\xba"                                                                                                 => ':watch:',
+            "\xe2\x8c\x9a\xef\xb8\x8f"                                                                                     => ':watch:',
+            "\xe2\x8c\x9b"                                                                                                 => ':hourglass:',
+            "\xf3\xbe\x80\x9c"                                                                                             => ':hourglass:',
+            "\xee\x9c\x9c"                                                                                                 => ':hourglass_flowing_sand:',
+            "\xee\x95\xbb"                                                                                                 => ':hourglass:',
+            "\xe2\x8c\x9b\xef\xb8\x8f"                                                                                     => ':hourglass:',
+            "\xe2\x8c\xa8"                                                                                                 => ':keyboard:',
+            "\xe2\x8f\xa9"                                                                                                 => ':fast_forward:',
+            "\xf3\xbe\xab\xbe"                                                                                             => ':fast_forward:',
+            "\xee\x88\xbc"                                                                                                 => ':fast_forward:',
+            "\xee\x94\xb0"                                                                                                 => ':camel:',
+            "\xe2\x8f\xaa"                                                                                                 => ':rewind:',
+            "\xf3\xbe\xab\xbf"                                                                                             => ':rewind:',
+            "\xee\x88\xbd"                                                                                                 => ':rewind:',
+            "\xee\x94\xaf"                                                                                                 => ':boar:',
+            "\xe2\x8f\xab"                                                                                                 => ':arrow_double_up:',
+            "\xf3\xbe\xac\x83"                                                                                             => ':arrow_double_up:',
+            "\xee\x95\x85"                                                                                                 => ':arrow_double_up:',
+            "\xe2\x8f\xac"                                                                                                 => ':arrow_double_down:',
+            "\xf3\xbe\xac\x82"                                                                                             => ':arrow_double_down:',
+            "\xee\x95\x84"                                                                                                 => ':arrow_double_down:',
+            "\xe2\x8f\xad"                                                                                                 => ':black_right_pointing_double_triangle_with_vertical_bar:',
+            "\xe2\x8f\xae"                                                                                                 => ':black_left_pointing_double_triangle_with_vertical_bar:',
+            "\xe2\x8f\xaf"                                                                                                 => ':black_right_pointing_triangle_with_double_vertical_bar:',
+            "\xe2\x8f\xb0"                                                                                                 => ':alarm_clock:',
+            "\xf3\xbe\x80\xaa"                                                                                             => ':alarm_clock:',
+            "\xee\x9a\xba"                                                                                                 => ':clock12:',
+            "\xee\x80\xad"                                                                                                 => ':clock10:',
+            "\xee\x96\x94"                                                                                                 => ':clock12:',
+            "\xe2\x8f\xb1"                                                                                                 => ':stopwatch:',
+            "\xe2\x8f\xb2"                                                                                                 => ':timer_clock:',
+            "\xe2\x8f\xb3"                                                                                                 => ':hourglass_flowing_sand:',
+            "\xf3\xbe\x80\x9b"                                                                                             => ':hourglass_flowing_sand:',
+            "\xee\x91\xbc"                                                                                                 => ':hourglass_flowing_sand:',
+            "\xe2\x8f\xb8"                                                                                                 => ':double_vertical_bar:',
+            "\xe2\x8f\xb9"                                                                                                 => ':black_square_for_stop:',
+            "\xe2\x8f\xba"                                                                                                 => ':black_circle_for_record:',
+            "\xe2\x93\x82"                                                                                                 => ':m:',
+            "\xf3\xbe\x9f\xa1"                                                                                             => ':m:',
+            "\xee\x99\x9c"                                                                                                 => ':metro:',
+            "\xee\x90\xb4"                                                                                                 => ':metro:',
+            "\xee\x96\xbc"                                                                                                 => ':metro:',
+            "\xe2\x93\x82\xef\xb8\x8f"                                                                                     => ':m:',
+            "\xe2\x96\xaa"                                                                                                 => ':black_small_square:',
+            "\xf3\xbe\xad\xae"                                                                                             => ':black_small_square:',
+            "\xee\x88\x9a"                                                                                                 => ':large_blue_circle:',
+            "\xee\x94\xb2"                                                                                                 => ':a:',
+            "\xe2\x96\xaa\xef\xb8\x8f"                                                                                     => ':black_small_square:',
+            "\xe2\x96\xab"                                                                                                 => ':white_small_square:',
+            "\xf3\xbe\xad\xad"                                                                                             => ':white_small_square:',
+            "\xee\x88\x9b"                                                                                                 => ':small_blue_diamond:',
+            "\xee\x94\xb1"                                                                                                 => ':frog:',
+            "\xe2\x96\xab\xef\xb8\x8f"                                                                                     => ':white_small_square:',
+            "\xe2\x96\xb6"                                                                                                 => ':arrow_forward:',
+            "\xf3\xbe\xab\xbc"                                                                                             => ':arrow_forward:',
+            "\xee\x88\xba"                                                                                                 => ':arrow_forward:',
+            "\xee\x94\xae"                                                                                                 => ':chicken:',
+            "\xe2\x96\xb6\xef\xb8\x8f"                                                                                     => ':arrow_forward:',
+            "\xe2\x97\x80"                                                                                                 => ':arrow_backward:',
+            "\xf3\xbe\xab\xbd"                                                                                             => ':arrow_backward:',
+            "\xee\x88\xbb"                                                                                                 => ':arrow_backward:',
+            "\xee\x94\xad"                                                                                                 => ':snake:',
+            "\xe2\x97\x80\xef\xb8\x8f"                                                                                     => ':arrow_backward:',
+            "\xe2\x97\xbb"                                                                                                 => ':white_medium_square:',
+            "\xf3\xbe\xad\xb1"                                                                                             => ':white_medium_square:',
+            "\xee\x94\xb8"                                                                                                 => ':white_medium_square:',
+            "\xe2\x97\xbb\xef\xb8\x8f"                                                                                     => ':white_medium_square:',
+            "\xe2\x97\xbc"                                                                                                 => ':black_medium_square:',
+            "\xf3\xbe\xad\xb2"                                                                                             => ':black_medium_square:',
+            "\xee\x94\xb9"                                                                                                 => ':black_medium_square:',
+            "\xe2\x97\xbc\xef\xb8\x8f"                                                                                     => ':black_medium_square:',
+            "\xe2\x97\xbd"                                                                                                 => ':white_medium_small_square:',
+            "\xf3\xbe\xad\xaf"                                                                                             => ':white_medium_small_square:',
+            "\xee\x94\xb4"                                                                                                 => ':ab:',
+            "\xe2\x97\xbd\xef\xb8\x8f"                                                                                     => ':white_medium_small_square:',
+            "\xe2\x97\xbe"                                                                                                 => ':black_medium_small_square:',
+            "\xf3\xbe\xad\xb0"                                                                                             => ':black_medium_small_square:',
+            "\xee\x94\xb5"                                                                                                 => ':o2:',
+            "\xe2\x97\xbe\xef\xb8\x8f"                                                                                     => ':black_medium_small_square:',
+            "\xe2\x98\x80"                                                                                                 => ':sunny:',
+            "\xf3\xbe\x80\x80"                                                                                             => ':sunny:',
+            "\xee\x98\xbe"                                                                                                 => ':city_sunrise:',
+            "\xee\x81\x8a"                                                                                                 => ':sunny:',
+            "\xee\x92\x88"                                                                                                 => ':sunny:',
+            "\xe2\x98\x80\xef\xb8\x8f"                                                                                     => ':sunny:',
+            "\xe2\x98\x81"                                                                                                 => ':cloud:',
+            "\xf3\xbe\x80\x81"                                                                                             => ':cloud:',
+            "\xee\x98\xbf"                                                                                                 => ':cloud:',
+            "\xee\x81\x89"                                                                                                 => ':cloud:',
+            "\xee\x92\x8d"                                                                                                 => ':cloud:',
+            "\xe2\x98\x81\xef\xb8\x8f"                                                                                     => ':cloud:',
+            "\xe2\x98\x82"                                                                                                 => ':umbrella:',
+            "\xe2\x98\x83"                                                                                                 => ':showman:',
+            "\xe2\x98\x84"                                                                                                 => ':comet:',
+            "\xe2\x98\x8e"                                                                                                 => ':telephone:',
+            "\xf3\xbe\x94\xa3"                                                                                             => ':telephone:',
+            "\xee\x9a\x87"                                                                                                 => ':telephone_receiver:',
+            "\xee\x80\x89"                                                                                                 => ':telephone_receiver:',
+            "\xee\x96\x96"                                                                                                 => ':telephone:',
+            "\xe2\x98\x8e\xef\xb8\x8f"                                                                                     => ':telephone:',
+            "\xe2\x98\x91"                                                                                                 => ':ballot_box_with_check:',
+            "\xf3\xbe\xae\x8b"                                                                                             => ':ballot_box_with_check:',
+            "\xee\xac\x82"                                                                                                 => ':ballot_box_with_check:',
+            "\xe2\x98\x91\xef\xb8\x8f"                                                                                     => ':ballot_box_with_check:',
+            "\xe2\x98\x94"                                                                                                 => ':umbrella:',
+            "\xf3\xbe\x80\x82"                                                                                             => ':umbrella:',
+            "\xee\x99\x80"                                                                                                 => ':umbrella:',
+            "\xee\x81\x8b"                                                                                                 => ':umbrella:',
+            "\xee\x92\x8c"                                                                                                 => ':umbrella:',
+            "\xe2\x98\x94\xef\xb8\x8f"                                                                                     => ':umbrella:',
+            "\xe2\x98\x95"                                                                                                 => ':coffee:',
+            "\xf3\xbe\xa6\x81"                                                                                             => ':coffee:',
+            "\xee\x99\xb0"                                                                                                 => ':coffee:',
+            "\xee\x81\x85"                                                                                                 => ':coffee:',
+            "\xee\x96\x97"                                                                                                 => ':coffee:',
+            "\xe2\x98\x95\xef\xb8\x8f"                                                                                     => ':coffee:',
+            "\xe2\x98\x98"                                                                                                 => ':shamrock:',
+            "\xe2\x98\x9d"                                                                                                 => ':point_up:',
+            "\xf3\xbe\xae\x98"                                                                                             => ':point_up:',
+            "\xee\x80\x8f"                                                                                                 => ':point_up:',
+            "\xee\x93\xb6"                                                                                                 => ':point_up:',
+            "\xe2\x98\x9d\xef\xb8\x8f"                                                                                     => ':point_up:',
+            "\xe2\x98\xa0"                                                                                                 => ':skull_and_crossbones:',
+            "\xe2\x98\xa2"                                                                                                 => ':radioactive_sign:',
+            "\xe2\x98\xa3"                                                                                                 => ':biohazard_sign:',
+            "\xe2\x98\xa6"                                                                                                 => ':orthodox_cross:',
+            "\xe2\x98\xaa"                                                                                                 => ':star_and_crescent:',
+            "\xe2\x98\xae"                                                                                                 => ':peace_symbol:',
+            "\xe2\x98\xaf"                                                                                                 => ':yin_yang:',
+            "\xe2\x98\xb8"                                                                                                 => ':wheel_of_dharma:',
+            "\xe2\x98\xb9"                                                                                                 => ':white_frowning_face:',
+            "\xe2\x98\xba"                                                                                                 => ':relaxed:',
+            "\xf3\xbe\x8c\xb6"                                                                                             => ':relaxed:',
+            "\xee\x9b\xb0"                                                                                                 => ':smiley_cat:',
+            "\xee\x90\x94"                                                                                                 => ':relaxed:',
+            "\xee\x93\xbb"                                                                                                 => ':relaxed:',
+            "\xe2\x98\xba\xef\xb8\x8f"                                                                                     => ':relaxed:',
+            "\xe2\x99\x88"                                                                                                 => ':aries:',
+            "\xf3\xbe\x80\xab"                                                                                             => ':aries:',
+            "\xee\x99\x86"                                                                                                 => ':aries:',
+            "\xee\x88\xbf"                                                                                                 => ':aries:',
+            "\xee\x92\x8f"                                                                                                 => ':sheep:',
+            "\xe2\x99\x88\xef\xb8\x8f"                                                                                     => ':aries:',
+            "\xe2\x99\x89"                                                                                                 => ':taurus:',
+            "\xf3\xbe\x80\xac"                                                                                             => ':taurus:',
+            "\xee\x99\x87"                                                                                                 => ':taurus:',
+            "\xee\x89\x80"                                                                                                 => ':taurus:',
+            "\xee\x92\x90"                                                                                                 => ':taurus:',
+            "\xe2\x99\x89\xef\xb8\x8f"                                                                                     => ':taurus:',
+            "\xe2\x99\x8a"                                                                                                 => ':gemini:',
+            "\xf3\xbe\x80\xad"                                                                                             => ':gemini:',
+            "\xee\x99\x88"                                                                                                 => ':gemini:',
+            "\xee\x89\x81"                                                                                                 => ':gemini:',
+            "\xee\x92\x91"                                                                                                 => ':gemini:',
+            "\xe2\x99\x8a\xef\xb8\x8f"                                                                                     => ':gemini:',
+            "\xe2\x99\x8b"                                                                                                 => ':cancer:',
+            "\xf3\xbe\x80\xae"                                                                                             => ':cancer:',
+            "\xee\x99\x89"                                                                                                 => ':cancer:',
+            "\xee\x89\x82"                                                                                                 => ':cancer:',
+            "\xee\x92\x92"                                                                                                 => ':cancer:',
+            "\xe2\x99\x8b\xef\xb8\x8f"                                                                                     => ':cancer:',
+            "\xe2\x99\x8c"                                                                                                 => ':leo:',
+            "\xf3\xbe\x80\xaf"                                                                                             => ':leo:',
+            "\xee\x99\x8a"                                                                                                 => ':leo:',
+            "\xee\x89\x83"                                                                                                 => ':leo:',
+            "\xee\x92\x93"                                                                                                 => ':leo:',
+            "\xe2\x99\x8c\xef\xb8\x8f"                                                                                     => ':leo:',
+            "\xe2\x99\x8d"                                                                                                 => ':virgo:',
+            "\xf3\xbe\x80\xb0"                                                                                             => ':virgo:',
+            "\xee\x99\x8b"                                                                                                 => ':virgo:',
+            "\xee\x89\x84"                                                                                                 => ':virgo:',
+            "\xee\x92\x94"                                                                                                 => ':virgo:',
+            "\xe2\x99\x8d\xef\xb8\x8f"                                                                                     => ':virgo:',
+            "\xe2\x99\x8e"                                                                                                 => ':libra:',
+            "\xf3\xbe\x80\xb1"                                                                                             => ':libra:',
+            "\xee\x99\x8c"                                                                                                 => ':libra:',
+            "\xee\x89\x85"                                                                                                 => ':libra:',
+            "\xee\x92\x95"                                                                                                 => ':libra:',
+            "\xe2\x99\x8e\xef\xb8\x8f"                                                                                     => ':libra:',
+            "\xe2\x99\x8f"                                                                                                 => ':scorpius:',
+            "\xf3\xbe\x80\xb2"                                                                                             => ':scorpius:',
+            "\xee\x99\x8d"                                                                                                 => ':scorpius:',
+            "\xee\x89\x86"                                                                                                 => ':scorpius:',
+            "\xee\x92\x96"                                                                                                 => ':scorpius:',
+            "\xe2\x99\x8f\xef\xb8\x8f"                                                                                     => ':scorpius:',
+            "\xe2\x99\x90"                                                                                                 => ':sagittarius:',
+            "\xf3\xbe\x80\xb3"                                                                                             => ':sagittarius:',
+            "\xee\x99\x8e"                                                                                                 => ':sagittarius:',
+            "\xee\x89\x87"                                                                                                 => ':sagittarius:',
+            "\xee\x92\x97"                                                                                                 => ':sagittarius:',
+            "\xe2\x99\x90\xef\xb8\x8f"                                                                                     => ':sagittarius:',
+            "\xe2\x99\x91"                                                                                                 => ':capricorn:',
+            "\xf3\xbe\x80\xb4"                                                                                             => ':capricorn:',
+            "\xee\x99\x8f"                                                                                                 => ':capricorn:',
+            "\xee\x89\x88"                                                                                                 => ':capricorn:',
+            "\xee\x92\x98"                                                                                                 => ':capricorn:',
+            "\xe2\x99\x91\xef\xb8\x8f"                                                                                     => ':capricorn:',
+            "\xe2\x99\x92"                                                                                                 => ':aquarius:',
+            "\xf3\xbe\x80\xb5"                                                                                             => ':aquarius:',
+            "\xee\x99\x90"                                                                                                 => ':aquarius:',
+            "\xee\x89\x89"                                                                                                 => ':aquarius:',
+            "\xee\x92\x99"                                                                                                 => ':aquarius:',
+            "\xe2\x99\x92\xef\xb8\x8f"                                                                                     => ':aquarius:',
+            "\xe2\x99\x93"                                                                                                 => ':pisces:',
+            "\xf3\xbe\x80\xb6"                                                                                             => ':pisces:',
+            "\xee\x99\x91"                                                                                                 => ':pisces:',
+            "\xee\x89\x8a"                                                                                                 => ':pisces:',
+            "\xee\x92\x9a"                                                                                                 => ':fish:',
+            "\xe2\x99\x93\xef\xb8\x8f"                                                                                     => ':pisces:',
+            "\xe2\x99\xa0"                                                                                                 => ':spades:',
+            "\xf3\xbe\xac\x9b"                                                                                             => ':spades:',
+            "\xee\x9a\x8e"                                                                                                 => ':spades:',
+            "\xee\x88\x8e"                                                                                                 => ':spades:',
+            "\xee\x96\xa1"                                                                                                 => ':spades:',
+            "\xe2\x99\xa0\xef\xb8\x8f"                                                                                     => ':spades:',
+            "\xe2\x99\xa3"                                                                                                 => ':clubs:',
+            "\xf3\xbe\xac\x9d"                                                                                             => ':clubs:',
+            "\xee\x9a\x90"                                                                                                 => ':clubs:',
+            "\xee\x88\x8f"                                                                                                 => ':clubs:',
+            "\xee\x96\xa3"                                                                                                 => ':clubs:',
+            "\xe2\x99\xa3\xef\xb8\x8f"                                                                                     => ':clubs:',
+            "\xe2\x99\xa5"                                                                                                 => ':hearts:',
+            "\xf3\xbe\xac\x9a"                                                                                             => ':hearts:',
+            "\xee\x9a\x8d"                                                                                                 => ':hearts:',
+            "\xee\x88\x8c"                                                                                                 => ':hearts:',
+            "\xee\xaa\xa5"                                                                                                 => ':hearts:',
+            "\xe2\x99\xa5\xef\xb8\x8f"                                                                                     => ':hearts:',
+            "\xe2\x99\xa6"                                                                                                 => ':diamonds:',
+            "\xf3\xbe\xac\x9c"                                                                                             => ':diamonds:',
+            "\xee\x9a\x8f"                                                                                                 => ':diamonds:',
+            "\xee\x88\x8d"                                                                                                 => ':diamonds:',
+            "\xee\x96\xa2"                                                                                                 => ':diamonds:',
+            "\xe2\x99\xa6\xef\xb8\x8f"                                                                                     => ':diamonds:',
+            "\xe2\x99\xa8"                                                                                                 => ':hotsprings:',
+            "\xf3\xbe\x9f\xba"                                                                                             => ':hotsprings:',
+            "\xee\x9b\xb7"                                                                                                 => ':bath:',
+            "\xee\x84\xa3"                                                                                                 => ':hotsprings:',
+            "\xee\x92\xbc"                                                                                                 => ':hotsprings:',
+            "\xe2\x99\xa8\xef\xb8\x8f"                                                                                     => ':hotsprings:',
+            "\xe2\x99\xbb"                                                                                                 => ':recycle:',
+            "\xf3\xbe\xac\xac"                                                                                             => ':recycle:',
+            "\xee\x9c\xb5"                                                                                                 => ':arrows_clockwise:',
+            "\xee\xad\xb9"                                                                                                 => ':recycle:',
+            "\xe2\x99\xbb\xef\xb8\x8f"                                                                                     => ':recycle:',
+            "\xe2\x99\xbf"                                                                                                 => ':wheelchair:',
+            "\xf3\xbe\xac\xa0"                                                                                             => ':wheelchair:',
+            "\xee\x9a\x9b"                                                                                                 => ':wheelchair:',
+            "\xee\x88\x8a"                                                                                                 => ':wheelchair:',
+            "\xee\x91\xbf"                                                                                                 => ':wheelchair:',
+            "\xe2\x99\xbf\xef\xb8\x8f"                                                                                     => ':wheelchair:',
+            "\xe2\x9a\x92"                                                                                                 => ':hammer_and_pick:',
+            "\xe2\x9a\x93"                                                                                                 => ':anchor:',
+            "\xf3\xbe\x93\x81"                                                                                             => ':anchor:',
+            "\xee\x99\xa1"                                                                                                 => ':ship:',
+            "\xee\x88\x82"                                                                                                 => ':ship:',
+            "\xee\x92\xa9"                                                                                                 => ':anchor:',
+            "\xe2\x9a\x93\xef\xb8\x8f"                                                                                     => ':anchor:',
+            "\xe2\x9a\x94"                                                                                                 => ':crossed_swords:',
+            "\xe2\x9a\x96"                                                                                                 => ':scales:',
+            "\xe2\x9a\x97"                                                                                                 => ':alembic:',
+            "\xe2\x9a\x99"                                                                                                 => ':gear:',
+            "\xe2\x9a\x9b"                                                                                                 => ':atom_symbol:',
+            "\xe2\x9a\x9c"                                                                                                 => ':fleur_de_lis:',
+            "\xe2\x9a\xa0"                                                                                                 => ':warning:',
+            "\xf3\xbe\xac\xa3"                                                                                             => ':warning:',
+            "\xee\x9c\xb7"                                                                                                 => ':warning:',
+            "\xee\x89\x92"                                                                                                 => ':warning:',
+            "\xee\x92\x81"                                                                                                 => ':warning:',
+            "\xe2\x9a\xa0\xef\xb8\x8f"                                                                                     => ':warning:',
+            "\xe2\x9a\xa1"                                                                                                 => ':zap:',
+            "\xf3\xbe\x80\x84"                                                                                             => ':zap:',
+            "\xee\x99\x82"                                                                                                 => ':zap:',
+            "\xee\x84\xbd"                                                                                                 => ':zap:',
+            "\xee\x92\x87"                                                                                                 => ':zap:',
+            "\xe2\x9a\xa1\xef\xb8\x8f"                                                                                     => ':zap:',
+            "\xe2\x9a\xaa"                                                                                                 => ':white_circle:',
+            "\xf3\xbe\xad\xa5"                                                                                             => ':white_circle:',
+            "\xee\x9a\x9c"                                                                                                 => ':large_blue_circle:',
+            "\xee\x88\x99"                                                                                                 => ':red_circle:',
+            "\xee\x94\xba"                                                                                                 => ':white_circle:',
+            "\xe2\x9a\xaa\xef\xb8\x8f"                                                                                     => ':white_circle:',
+            "\xe2\x9a\xab"                                                                                                 => ':black_circle:',
+            "\xf3\xbe\xad\xa6"                                                                                             => ':black_circle:',
+            "\xee\x94\xbb"                                                                                                 => ':black_circle:',
+            "\xe2\x9a\xab\xef\xb8\x8f"                                                                                     => ':black_circle:',
+            "\xe2\x9a\xb0"                                                                                                 => ':coffin:',
+            "\xe2\x9a\xb1"                                                                                                 => ':funeral_urn:',
+            "\xe2\x9a\xbd"                                                                                                 => ':soccer:',
+            "\xf3\xbe\x9f\x94"                                                                                             => ':soccer:',
+            "\xee\x99\x96"                                                                                                 => ':soccer:',
+            "\xee\x80\x98"                                                                                                 => ':soccer:',
+            "\xee\x92\xb6"                                                                                                 => ':soccer:',
+            "\xe2\x9a\xbd\xef\xb8\x8f"                                                                                     => ':soccer:',
+            "\xe2\x9a\xbe"                                                                                                 => ':baseball:',
+            "\xf3\xbe\x9f\x91"                                                                                             => ':baseball:',
+            "\xee\x99\x93"                                                                                                 => ':baseball:',
+            "\xee\x80\x96"                                                                                                 => ':baseball:',
+            "\xee\x92\xba"                                                                                                 => ':baseball:',
+            "\xe2\x9a\xbe\xef\xb8\x8f"                                                                                     => ':baseball:',
+            "\xe2\x9b\x84"                                                                                                 => ':snowman:',
+            "\xf3\xbe\x80\x83"                                                                                             => ':snowman:',
+            "\xee\x99\x81"                                                                                                 => ':snowman:',
+            "\xee\x81\x88"                                                                                                 => ':snowman:',
+            "\xee\x92\x85"                                                                                                 => ':snowman:',
+            "\xe2\x9b\x84\xef\xb8\x8f"                                                                                     => ':snowman:',
+            "\xe2\x9b\x85"                                                                                                 => ':partly_sunny:',
+            "\xf3\xbe\x80\x8f"                                                                                             => ':partly_sunny:',
+            "\xee\x98\xbe\xee\x98\xbf"                                                                                     => ':partly_sunny:',
+            "\xee\x81\x8a\xee\x81\x89"                                                                                     => ':partly_sunny:',
+            "\xee\x92\x8e"                                                                                                 => ':partly_sunny:',
+            "\xe2\x9b\x85\xef\xb8\x8f"                                                                                     => ':partly_sunny:',
+            "\xe2\x9b\x88"                                                                                                 => ':thunder_cloud_and_rain:',
+            "\xe2\x9b\x8e"                                                                                                 => ':ophiuchus:',
+            "\xf3\xbe\x80\xb7"                                                                                             => ':ophiuchus:',
+            "\xee\x89\x8b"                                                                                                 => ':ophiuchus:',
+            "\xee\x92\x9b"                                                                                                 => ':ophiuchus:',
+            "\xe2\x9b\x8f"                                                                                                 => ':pick:',
+            "\xe2\x9b\x91"                                                                                                 => ':helmet_with_white_cross:',
+            "\xe2\x9b\x93"                                                                                                 => ':chains:',
+            "\xe2\x9b\x94"                                                                                                 => ':no_entry:',
+            "\xf3\xbe\xac\xa6"                                                                                             => ':no_entry:',
+            "\xee\x9c\xaf"                                                                                                 => ':no_good:',
+            "\xee\x84\xb7"                                                                                                 => ':construction:',
+            "\xee\x92\x84"                                                                                                 => ':no_entry:',
+            "\xe2\x9b\x94\xef\xb8\x8f"                                                                                     => ':no_entry:',
+            "\xe2\x9b\xa9"                                                                                                 => ':shinto_shrine:',
+            "\xe2\x9b\xaa"                                                                                                 => ':church:',
+            "\xf3\xbe\x92\xbb"                                                                                             => ':church:',
+            "\xee\x80\xb7"                                                                                                 => ':church:',
+            "\xee\x96\xbb"                                                                                                 => ':wedding:',
+            "\xe2\x9b\xaa\xef\xb8\x8f"                                                                                     => ':church:',
+            "\xe2\x9b\xb0"                                                                                                 => ':mountain:',
+            "\xe2\x9b\xb1"                                                                                                 => ':umbrella_on_ground:',
+            "\xe2\x9b\xb2"                                                                                                 => ':fountain:',
+            "\xf3\xbe\x92\xbc"                                                                                             => ':fountain:',
+            "\xee\x84\xa1"                                                                                                 => ':fountain:',
+            "\xee\x97\x8f"                                                                                                 => ':fountain:',
+            "\xe2\x9b\xb2\xef\xb8\x8f"                                                                                     => ':fountain:',
+            "\xe2\x9b\xb3"                                                                                                 => ':golf:',
+            "\xf3\xbe\x9f\x92"                                                                                             => ':golf:',
+            "\xee\x99\x94"                                                                                                 => ':golf:',
+            "\xee\x80\x94"                                                                                                 => ':golf:',
+            "\xee\x96\x99"                                                                                                 => ':golf:',
+            "\xe2\x9b\xb3\xef\xb8\x8f"                                                                                     => ':golf:',
+            "\xe2\x9b\xb4"                                                                                                 => ':ferry:',
+            "\xe2\x9b\xb5"                                                                                                 => ':sailboat:',
+            "\xf3\xbe\x9f\xaa"                                                                                             => ':sailboat:',
+            "\xee\x9a\xa3"                                                                                                 => ':speedboat:',
+            "\xee\x80\x9c"                                                                                                 => ':sailboat:',
+            "\xee\x92\xb4"                                                                                                 => ':speedboat:',
+            "\xe2\x9b\xb5\xef\xb8\x8f"                                                                                     => ':sailboat:',
+            "\xe2\x9b\xb7"                                                                                                 => ':skier:',
+            "\xe2\x9b\xb8"                                                                                                 => ':ice_skate:',
+            "\xe2\x9b\xb9"                                                                                                 => ':person_with_ball:',
+            "\xe2\x9b\xba"                                                                                                 => ':tent:',
+            "\xf3\xbe\x9f\xbb"                                                                                             => ':tent:',
+            "\xee\x84\xa2"                                                                                                 => ':tent:',
+            "\xee\x97\x90"                                                                                                 => ':tent:',
+            "\xe2\x9b\xba\xef\xb8\x8f"                                                                                     => ':tent:',
+            "\xe2\x9b\xbd"                                                                                                 => ':fuelpump:',
+            "\xf3\xbe\x9f\xb5"                                                                                             => ':fuelpump:',
+            "\xee\x99\xab"                                                                                                 => ':fuelpump:',
+            "\xee\x80\xba"                                                                                                 => ':fuelpump:',
+            "\xee\x95\xb1"                                                                                                 => ':fuelpump:',
+            "\xe2\x9b\xbd\xef\xb8\x8f"                                                                                     => ':fuelpump:',
+            "\xe2\x9c\x82"                                                                                                 => ':scissors:',
+            "\xf3\xbe\x94\xbe"                                                                                             => ':scissors:',
+            "\xee\x99\xb5"                                                                                                 => ':haircut:',
+            "\xee\x8c\x93"                                                                                                 => ':scissors:',
+            "\xee\x94\x96"                                                                                                 => ':man_with_gua_pi_mao:',
+            "\xe2\x9c\x82\xef\xb8\x8f"                                                                                     => ':scissors:',
+            "\xe2\x9c\x85"                                                                                                 => ':white_check_mark:',
+            "\xf3\xbe\xad\x8a"                                                                                             => ':white_check_mark:',
+            "\xee\x95\x9e"                                                                                                 => ':white_check_mark:',
+            "\xe2\x9c\x88"                                                                                                 => ':airplane:',
+            "\xf3\xbe\x9f\xa9"                                                                                             => ':airplane:',
+            "\xee\x99\xa2"                                                                                                 => ':airplane:',
+            "\xee\x80\x9d"                                                                                                 => ':airplane:',
+            "\xee\x92\xb3"                                                                                                 => ':airplane:',
+            "\xe2\x9c\x88\xef\xb8\x8f"                                                                                     => ':airplane:',
+            "\xe2\x9c\x89"                                                                                                 => ':envelope:',
+            "\xf3\xbe\x94\xa9"                                                                                             => ':envelope:',
+            "\xee\x9b\x93"                                                                                                 => ':e-mail:',
+            "\xee\x84\x83"                                                                                                 => ':envelope_with_arrow:',
+            "\xee\x94\xa1"                                                                                                 => ':bird:',
+            "\xe2\x9c\x89\xef\xb8\x8f"                                                                                     => ':envelope:',
+            "\xe2\x9c\x8a"                                                                                                 => ':fist:',
+            "\xf3\xbe\xae\x93"                                                                                             => ':fist:',
+            "\xee\x9a\x93"                                                                                                 => ':fist:',
+            "\xee\x80\x90"                                                                                                 => ':fist:',
+            "\xee\xae\x83"                                                                                                 => ':fist:',
+            "\xe2\x9c\x8b"                                                                                                 => ':raised_hand:',
+            "\xf3\xbe\xae\x95"                                                                                             => ':raised_hand:',
+            "\xee\x9a\x95"                                                                                                 => ':open_hands:',
+            "\xee\x80\x92"                                                                                                 => ':raising_hand:',
+            "\xee\x96\xa7"                                                                                                 => ':raised_hand:',
+            "\xe2\x9c\x8c"                                                                                                 => ':v:',
+            "\xf3\xbe\xae\x94"                                                                                             => ':v:',
+            "\xee\x9a\x94"                                                                                                 => ':v:',
+            "\xee\x80\x91"                                                                                                 => ':v:',
+            "\xee\x96\xa6"                                                                                                 => ':v:',
+            "\xe2\x9c\x8c\xef\xb8\x8f"                                                                                     => ':v:',
+            "\xe2\x9c\x8d"                                                                                                 => ':writing_hand:',
+            "\xe2\x9c\x8f"                                                                                                 => ':pencil2:',
+            "\xf3\xbe\x94\xb9"                                                                                             => ':pencil2:',
+            "\xee\x9c\x99"                                                                                                 => ':pencil2:',
+            "\xee\x8c\x81"                                                                                                 => ':pencil:',
+            "\xee\x92\xa1"                                                                                                 => ':pencil2:',
+            "\xe2\x9c\x8f\xef\xb8\x8f"                                                                                     => ':pencil2:',
+            "\xe2\x9c\x92"                                                                                                 => ':black_nib:',
+            "\xf3\xbe\x94\xb6"                                                                                             => ':black_nib:',
+            "\xee\x9a\xae"                                                                                                 => ':black_nib:',
+            "\xee\xac\x83"                                                                                                 => ':black_nib:',
+            "\xe2\x9c\x92\xef\xb8\x8f"                                                                                     => ':black_nib:',
+            "\xe2\x9c\x94"                                                                                                 => ':heavy_check_mark:',
+            "\xf3\xbe\xad\x89"                                                                                             => ':heavy_check_mark:',
+            "\xee\x95\x97"                                                                                                 => ':heavy_check_mark:',
+            "\xe2\x9c\x94\xef\xb8\x8f"                                                                                     => ':heavy_check_mark:',
+            "\xe2\x9c\x96"                                                                                                 => ':heavy_multiplication_x:',
+            "\xf3\xbe\xad\x93"                                                                                             => ':heavy_multiplication_x:',
+            "\xee\x8c\xb3"                                                                                                 => ':negative_squared_cross_mark:',
+            "\xee\x95\x8f"                                                                                                 => ':heavy_multiplication_x:',
+            "\xe2\x9c\x96\xef\xb8\x8f"                                                                                     => ':heavy_multiplication_x:',
+            "\xe2\x9c\x9d"                                                                                                 => ':latin_cross:',
+            "\xe2\x9c\xa1"                                                                                                 => ':star_of_david:',
+            "\xe2\x9c\xa8"                                                                                                 => ':sparkles:',
+            "\xf3\xbe\xad\xa0"                                                                                             => ':sparkles:',
+            "\xee\x9b\xba"                                                                                                 => ':sparkle:',
+            "\xee\x8c\xae"                                                                                                 => ':sparkle:',
+            "\xee\xaa\xab"                                                                                                 => ':sparkles:',
+            "\xe2\x9c\xb3"                                                                                                 => ':eight_spoked_asterisk:',
+            "\xf3\xbe\xad\xa2"                                                                                             => ':eight_spoked_asterisk:',
+            "\xee\x9b\xb8"                                                                                                 => ':diamond_shape_with_a_dot_inside:',
+            "\xee\x88\x86"                                                                                                 => ':eight_spoked_asterisk:',
+            "\xee\x94\xbe"                                                                                                 => ':eight_spoked_asterisk:',
+            "\xe2\x9c\xb3\xef\xb8\x8f"                                                                                     => ':eight_spoked_asterisk:',
+            "\xe2\x9c\xb4"                                                                                                 => ':eight_pointed_black_star:',
+            "\xf3\xbe\xad\xa1"                                                                                             => ':eight_pointed_black_star:',
+            "\xee\x88\x85"                                                                                                 => ':eight_pointed_black_star:',
+            "\xee\x91\xb9"                                                                                                 => ':eight_pointed_black_star:',
+            "\xe2\x9c\xb4\xef\xb8\x8f"                                                                                     => ':eight_pointed_black_star:',
+            "\xe2\x9d\x84"                                                                                                 => ':snowflake:',
+            "\xf3\xbe\x80\x8e"                                                                                             => ':snowflake:',
+            "\xee\x92\x8a"                                                                                                 => ':snowflake:',
+            "\xe2\x9d\x84\xef\xb8\x8f"                                                                                     => ':snowflake:',
+            "\xe2\x9d\x87"                                                                                                 => ':sparkle:',
+            "\xf3\xbe\xad\xb7"                                                                                             => ':sparkle:',
+            "\xee\x91\xac"                                                                                                 => ':sparkle:',
+            "\xe2\x9d\x87\xef\xb8\x8f"                                                                                     => ':sparkle:',
+            "\xe2\x9d\x8c"                                                                                                 => ':x:',
+            "\xf3\xbe\xad\x85"                                                                                             => ':x:',
+            "\xee\x95\x90"                                                                                                 => ':x:',
+            "\xe2\x9d\x8e"                                                                                                 => ':negative_squared_cross_mark:',
+            "\xf3\xbe\xad\x86"                                                                                             => ':negative_squared_cross_mark:',
+            "\xee\x95\x91"                                                                                                 => ':negative_squared_cross_mark:',
+            "\xe2\x9d\x93"                                                                                                 => ':question:',
+            "\xf3\xbe\xac\x89"                                                                                             => ':question:',
+            "\xee\x80\xa0"                                                                                                 => ':question:',
+            "\xee\x92\x83"                                                                                                 => ':grey_question:',
+            "\xe2\x9d\x94"                                                                                                 => ':grey_question:',
+            "\xf3\xbe\xac\x8a"                                                                                             => ':grey_question:',
+            "\xee\x8c\xb6"                                                                                                 => ':grey_question:',
+            "\xe2\x9d\x95"                                                                                                 => ':grey_exclamation:',
+            "\xf3\xbe\xac\x8b"                                                                                             => ':grey_exclamation:',
+            "\xee\x9c\x82"                                                                                                 => ':heavy_exclamation_mark:',
+            "\xee\x8c\xb7"                                                                                                 => ':grey_exclamation:',
+            "\xee\x92\x82"                                                                                                 => ':heavy_exclamation_mark:',
+            "\xe2\x9d\x97"                                                                                                 => ':heavy_exclamation_mark:',
+            "\xf3\xbe\xac\x84"                                                                                             => ':heavy_exclamation_mark:',
+            "\xee\x80\xa1"                                                                                                 => ':heavy_exclamation_mark:',
+            "\xe2\x9d\x97\xef\xb8\x8f"                                                                                     => ':heavy_exclamation_mark:',
+            "\xe2\x9d\xa3"                                                                                                 => ':heavy_heart_exclamation_mark_ornament:',
+            "\xe2\x9d\xa4"                                                                                                 => ':heart:',
+            "\xf3\xbe\xac\x8c"                                                                                             => ':heart:',
+            "\xee\x9b\xac"                                                                                                 => ':gift_heart:',
+            "\xee\x80\xa2"                                                                                                 => ':heart:',
+            "\xee\x96\x95"                                                                                                 => ':heart_decoration:',
+            "\xe2\x9d\xa4\xef\xb8\x8f"                                                                                     => ':heart:',
+            "\xe2\x9e\x95"                                                                                                 => ':heavy_plus_sign:',
+            "\xf3\xbe\xad\x91"                                                                                             => ':heavy_plus_sign:',
+            "\xee\x94\xbc"                                                                                                 => ':heavy_plus_sign:',
+            "\xe2\x9e\x96"                                                                                                 => ':heavy_minus_sign:',
+            "\xf3\xbe\xad\x92"                                                                                             => ':heavy_minus_sign:',
+            "\xee\x94\xbd"                                                                                                 => ':heavy_minus_sign:',
+            "\xe2\x9e\x97"                                                                                                 => ':heavy_division_sign:',
+            "\xf3\xbe\xad\x94"                                                                                             => ':heavy_division_sign:',
+            "\xee\x95\x94"                                                                                                 => ':heavy_division_sign:',
+            "\xe2\x9e\xa1"                                                                                                 => ':arrow_right:',
+            "\xf3\xbe\xab\xba"                                                                                             => ':arrow_right:',
+            "\xee\x88\xb4"                                                                                                 => ':arrow_right:',
+            "\xee\x95\x92"                                                                                                 => ':arrow_right:',
+            "\xe2\x9e\xa1\xef\xb8\x8f"                                                                                     => ':arrow_right:',
+            "\xe2\x9e\xb0"                                                                                                 => ':curly_loop:',
+            "\xf3\xbe\xac\x88"                                                                                             => ':curly_loop:',
+            "\xee\x9c\x8a"                                                                                                 => ':scroll:',
+            "\xee\xac\xb1"                                                                                                 => ':curly_loop:',
+            "\xe2\x9e\xbf"                                                                                                 => ':loop:',
+            "\xf3\xbe\xa0\xab"                                                                                             => ':loop:',
+            "\xee\x9b\x9f"                                                                                                 => ':loop:',
+            "\xee\x88\x91"                                                                                                 => ':loop:',
+            "\xe2\xa4\xb4"                                                                                                 => ':arrow_heading_up:',
+            "\xf3\xbe\xab\xb4"                                                                                             => ':arrow_heading_up:',
+            "\xee\x9b\xb5"                                                                                                 => ':arrow_heading_up:',
+            "\xee\xac\xad"                                                                                                 => ':arrow_heading_up:',
+            "\xe2\xa4\xb4\xef\xb8\x8f"                                                                                     => ':arrow_heading_up:',
+            "\xe2\xa4\xb5"                                                                                                 => ':arrow_heading_down:',
+            "\xf3\xbe\xab\xb5"                                                                                             => ':arrow_heading_down:',
+            "\xee\x9c\x80"                                                                                                 => ':thumbsdown:',
+            "\xee\xac\xae"                                                                                                 => ':arrow_heading_down:',
+            "\xe2\xa4\xb5\xef\xb8\x8f"                                                                                     => ':arrow_heading_down:',
+            "\xe2\xac\x85"                                                                                                 => ':arrow_left:',
+            "\xf3\xbe\xab\xbb"                                                                                             => ':arrow_left:',
+            "\xee\x88\xb5"                                                                                                 => ':back:',
+            "\xee\x95\x93"                                                                                                 => ':arrow_left:',
+            "\xe2\xac\x85\xef\xb8\x8f"                                                                                     => ':arrow_left:',
+            "\xe2\xac\x86"                                                                                                 => ':arrow_up:',
+            "\xf3\xbe\xab\xb8"                                                                                             => ':arrow_up:',
+            "\xee\x88\xb2"                                                                                                 => ':arrow_up:',
+            "\xee\x94\xbf"                                                                                                 => ':arrow_up:',
+            "\xe2\xac\x86\xef\xb8\x8f"                                                                                     => ':arrow_up:',
+            "\xe2\xac\x87"                                                                                                 => ':arrow_down:',
+            "\xf3\xbe\xab\xb9"                                                                                             => ':arrow_down:',
+            "\xee\x88\xb3"                                                                                                 => ':arrow_down:',
+            "\xee\x95\x80"                                                                                                 => ':arrow_down:',
+            "\xe2\xac\x87\xef\xb8\x8f"                                                                                     => ':arrow_down:',
+            "\xe2\xac\x9b"                                                                                                 => ':black_large_square:',
+            "\xf3\xbe\xad\xac"                                                                                             => ':black_large_square:',
+            "\xee\x95\x89"                                                                                                 => ':black_large_square:',
+            "\xe2\xac\x9b\xef\xb8\x8f"                                                                                     => ':black_large_square:',
+            "\xe2\xac\x9c"                                                                                                 => ':white_large_square:',
+            "\xf3\xbe\xad\xab"                                                                                             => ':white_large_square:',
+            "\xee\x95\x88"                                                                                                 => ':white_large_square:',
+            "\xe2\xac\x9c\xef\xb8\x8f"                                                                                     => ':white_large_square:',
+            "\xe2\xad\x90"                                                                                                 => ':star:',
+            "\xf3\xbe\xad\xa8"                                                                                             => ':star:',
+            "\xee\x8c\xaf"                                                                                                 => ':star:',
+            "\xee\x92\x8b"                                                                                                 => ':star2:',
+            "\xe2\xad\x90\xef\xb8\x8f"                                                                                     => ':star:',
+            "\xe2\xad\x95"                                                                                                 => ':o:',
+            "\xf3\xbe\xad\x84"                                                                                             => ':o:',
+            "\xee\x9a\xa0"                                                                                                 => ':full_moon:',
+            "\xee\x8c\xb2"                                                                                                 => ':o:',
+            "\xee\xaa\xad"                                                                                                 => ':o:',
+            "\xe2\xad\x95\xef\xb8\x8f"                                                                                     => ':o:',
+            "\xe3\x80\xb0"                                                                                                 => ':wavy_dash:',
+            "\xf3\xbe\xac\x87"                                                                                             => ':wavy_dash:',
+            "\xee\x9c\x89"                                                                                                 => ':wavy_dash:',
+            "\xe3\x80\xb0\xef\xb8\x8f"                                                                                     => ':wavy_dash:',
+            "\xe3\x80\xbd"                                                                                                 => ':part_alternation_mark:',
+            "\xf3\xbe\xa0\x9b"                                                                                             => ':part_alternation_mark:',
+            "\xee\x84\xac"                                                                                                 => ':part_alternation_mark:',
+            "\xe3\x80\xbd\xef\xb8\x8f"                                                                                     => ':part_alternation_mark:',
+            "\xe3\x8a\x97"                                                                                                 => ':congratulations:',
+            "\xf3\xbe\xad\x83"                                                                                             => ':congratulations:',
+            "\xee\x8c\x8d"                                                                                                 => ':congratulations:',
+            "\xee\xaa\x99"                                                                                                 => ':congratulations:',
+            "\xe3\x8a\x97\xef\xb8\x8f"                                                                                     => ':congratulations:',
+            "\xe3\x8a\x99"                                                                                                 => ':secret:',
+            "\xf3\xbe\xac\xab"                                                                                             => ':secret:',
+            "\xee\x9c\xb4"                                                                                                 => ':secret:',
+            "\xee\x8c\x95"                                                                                                 => ':secret:',
+            "\xee\x93\xb1"                                                                                                 => ':secret:',
+            "\xe3\x8a\x99\xef\xb8\x8f"                                                                                     => ':secret:',
+            "\xf0\x9f\x80\x84"                                                                                             => ':mahjong:',
+            "\xf3\xbe\xa0\x8b"                                                                                             => ':mahjong:',
+            "\xee\x84\xad"                                                                                                 => ':mahjong:',
+            "\xee\x97\x91"                                                                                                 => ':mahjong:',
+            "\xf0\x9f\x80\x84\xef\xb8\x8f"                                                                                 => ':mahjong:',
+            "\xf0\x9f\x83\x8f"                                                                                             => ':black_joker:',
+            "\xf3\xbe\xa0\x92"                                                                                             => ':black_joker:',
+            "\xee\xad\xaf"                                                                                                 => ':black_joker:',
+            "\xf0\x9f\x85\xb0"                                                                                             => ':a:',
+            "\xf3\xbe\x94\x8b"                                                                                             => ':a:',
+            "\xee\xac\xa6"                                                                                                 => ':a:',
+            "\xf0\x9f\x85\xb0\xef\xb8\x8f"                                                                                 => ':a:',
+            "\xf0\x9f\x85\xb1"                                                                                             => ':b:',
+            "\xf3\xbe\x94\x8c"                                                                                             => ':b:',
+            "\xee\xac\xa7"                                                                                                 => ':b:',
+            "\xf0\x9f\x85\xb1\xef\xb8\x8f"                                                                                 => ':b:',
+            "\xf0\x9f\x85\xbe"                                                                                             => ':o2:',
+            "\xf3\xbe\x94\x8e"                                                                                             => ':o2:',
+            "\xee\xac\xa8"                                                                                                 => ':o2:',
+            "\xf0\x9f\x85\xbe\xef\xb8\x8f"                                                                                 => ':o2:',
+            "\xf0\x9f\x85\xbf"                                                                                             => ':parking:',
+            "\xf3\xbe\x9f\xb6"                                                                                             => ':parking:',
+            "\xee\x99\xac"                                                                                                 => ':parking:',
+            "\xee\x85\x8f"                                                                                                 => ':parking:',
+            "\xee\x92\xa6"                                                                                                 => ':parking:',
+            "\xf0\x9f\x85\xbf\xef\xb8\x8f"                                                                                 => ':parking:',
+            "\xf0\x9f\x86\x8e"                                                                                             => ':ab:',
+            "\xf3\xbe\x94\x8d"                                                                                             => ':ab:',
+            "\xee\xac\xa9"                                                                                                 => ':ab:',
+            "\xf0\x9f\x86\x91"                                                                                             => ':cl:',
+            "\xf3\xbe\xae\x84"                                                                                             => ':cl:',
+            "\xee\x9b\x9b"                                                                                                 => ':cl:',
+            "\xee\x96\xab"                                                                                                 => ':cl:',
+            "\xf0\x9f\x86\x92"                                                                                             => ':cool:',
+            "\xf3\xbe\xac\xb8"                                                                                             => ':cool:',
+            "\xee\x88\x94"                                                                                                 => ':cool:',
+            "\xee\xaa\x85"                                                                                                 => ':cool:',
+            "\xf0\x9f\x86\x93"                                                                                             => ':free:',
+            "\xf3\xbe\xac\xa1"                                                                                             => ':free:',
+            "\xee\x9b\x97"                                                                                                 => ':free:',
+            "\xee\x95\xb8"                                                                                                 => ':free:',
+            "\xf0\x9f\x86\x94"                                                                                             => ':id:',
+            "\xf3\xbe\xae\x81"                                                                                             => ':id:',
+            "\xee\x9b\x98"                                                                                                 => ':id:',
+            "\xee\x88\xa9"                                                                                                 => ':id:',
+            "\xee\xaa\x88"                                                                                                 => ':id:',
+            "\xf0\x9f\x86\x95"                                                                                             => ':new:',
+            "\xf3\xbe\xac\xb6"                                                                                             => ':new:',
+            "\xee\x9b\x9d"                                                                                                 => ':new:',
+            "\xee\x88\x92"                                                                                                 => ':new:',
+            "\xee\x96\xb5"                                                                                                 => ':new:',
+            "\xf0\x9f\x86\x96"                                                                                             => ':ng:',
+            "\xf3\xbe\xac\xa8"                                                                                             => ':ng:',
+            "\xf0\x9f\x86\x97"                                                                                             => ':ok:',
+            "\xf3\xbe\xac\xa7"                                                                                             => ':ok:',
+            "\xee\x9c\x8b"                                                                                                 => ':ok_woman:',
+            "\xee\x89\x8d"                                                                                                 => ':ok:',
+            "\xee\x96\xad"                                                                                                 => ':ok:',
+            "\xf0\x9f\x86\x98"                                                                                             => ':sos:',
+            "\xf3\xbe\xad\x8f"                                                                                             => ':sos:',
+            "\xee\x93\xa8"                                                                                                 => ':sos:',
+            "\xf0\x9f\x86\x99"                                                                                             => ':up:',
+            "\xf3\xbe\xac\xb7"                                                                                             => ':up:',
+            "\xee\x88\x93"                                                                                                 => ':up:',
+            "\xee\x94\x8f"                                                                                                 => ':it:',
+            "\xf0\x9f\x86\x9a"                                                                                             => ':vs:',
+            "\xf3\xbe\xac\xb2"                                                                                             => ':vs:',
+            "\xee\x84\xae"                                                                                                 => ':vs:',
+            "\xee\x97\x92"                                                                                                 => ':vs:',
+            "\xf0\x9f\x88\x81"                                                                                             => ':koko:',
+            "\xf3\xbe\xac\xa4"                                                                                             => ':koko:',
+            "\xee\x88\x83"                                                                                                 => ':koko:',
+            "\xf0\x9f\x88\x82"                                                                                             => ':sa:',
+            "\xf3\xbe\xac\xbf"                                                                                             => ':sa:',
+            "\xee\x88\xa8"                                                                                                 => ':sa:',
+            "\xee\xaa\x87"                                                                                                 => ':sa:',
+            "\xf0\x9f\x88\x82\xef\xb8\x8f"                                                                                 => ':sa:',
+            "\xf0\x9f\x88\x9a"                                                                                             => ':u7121:',
+            "\xf3\xbe\xac\xba"                                                                                             => ':u7121:',
+            "\xee\x88\x96"                                                                                                 => ':u7121:',
+            "\xf0\x9f\x88\x9a\xef\xb8\x8f"                                                                                 => ':u7121:',
+            "\xf0\x9f\x88\xaf"                                                                                             => ':u6307:',
+            "\xf3\xbe\xad\x80"                                                                                             => ':u6307:',
+            "\xee\x88\xac"                                                                                                 => ':u6307:',
+            "\xee\xaa\x8b"                                                                                                 => ':u6307:',
+            "\xf0\x9f\x88\xaf\xef\xb8\x8f"                                                                                 => ':u6307:',
+            "\xf0\x9f\x88\xb2"                                                                                             => ':u7981:',
+            "\xf3\xbe\xac\xae"                                                                                             => ':u7981:',
+            "\xee\x9c\xb8"                                                                                                 => ':no_entry_sign:',
+            "\xf0\x9f\x88\xb3"                                                                                             => ':u7a7a:',
+            "\xf3\xbe\xac\xaf"                                                                                             => ':u7a7a:',
+            "\xee\x9c\xb9"                                                                                                 => ':u7a7a:',
+            "\xee\x88\xab"                                                                                                 => ':u7a7a:',
+            "\xee\xaa\x8a"                                                                                                 => ':u7a7a:',
+            "\xf0\x9f\x88\xb4"                                                                                             => ':u5408:',
+            "\xf3\xbe\xac\xb0"                                                                                             => ':u5408:',
+            "\xee\x9c\xba"                                                                                                 => ':u5408:',
+            "\xf0\x9f\x88\xb5"                                                                                             => ':u6e80:',
+            "\xf3\xbe\xac\xb1"                                                                                             => ':u6e80:',
+            "\xee\x9c\xbb"                                                                                                 => ':u6e80:',
+            "\xee\x88\xaa"                                                                                                 => ':u6e80:',
+            "\xee\xaa\x89"                                                                                                 => ':u6e80:',
+            "\xf0\x9f\x88\xb6"                                                                                             => ':u6709:',
+            "\xf3\xbe\xac\xb9"                                                                                             => ':u6709:',
+            "\xee\x88\x95"                                                                                                 => ':u6709:',
+            "\xf0\x9f\x88\xb7"                                                                                             => ':u6708:',
+            "\xf3\xbe\xac\xbb"                                                                                             => ':u6708:',
+            "\xee\x88\x97"                                                                                                 => ':u6708:',
+            "\xf0\x9f\x88\xb7\xef\xb8\x8f"                                                                                 => ':u6708:',
+            "\xf0\x9f\x88\xb8"                                                                                             => ':u7533:',
+            "\xf3\xbe\xac\xbc"                                                                                             => ':u7533:',
+            "\xee\x88\x98"                                                                                                 => ':u7533:',
+            "\xf0\x9f\x88\xb9"                                                                                             => ':u5272:',
+            "\xf3\xbe\xac\xbe"                                                                                             => ':u5272:',
+            "\xee\x88\xa7"                                                                                                 => ':u5272:',
+            "\xee\xaa\x86"                                                                                                 => ':u5272:',
+            "\xf0\x9f\x88\xba"                                                                                             => ':u55b6:',
+            "\xf3\xbe\xad\x81"                                                                                             => ':u55b6:',
+            "\xee\x88\xad"                                                                                                 => ':u55b6:',
+            "\xee\xaa\x8c"                                                                                                 => ':u55b6:',
+            "\xf0\x9f\x89\x90"                                                                                             => ':ideograph_advantage:',
+            "\xf3\xbe\xac\xbd"                                                                                             => ':ideograph_advantage:',
+            "\xee\x88\xa6"                                                                                                 => ':ideograph_advantage:',
+            "\xee\x93\xb7"                                                                                                 => ':ideograph_advantage:',
+            "\xf0\x9f\x89\x91"                                                                                             => ':accept:',
+            "\xf3\xbe\xad\x90"                                                                                             => ':accept:',
+            "\xee\xac\x81"                                                                                                 => ':accept:',
+            "\xf0\x9f\x8c\x80"                                                                                             => ':cyclone:',
+            "\xf3\xbe\x80\x85"                                                                                             => ':cyclone:',
+            "\xee\x99\x83"                                                                                                 => ':fish_cake:',
+            "\xee\x91\x83"                                                                                                 => ':cyclone:',
+            "\xee\x91\xa9"                                                                                                 => ':cyclone:',
+            "\xf0\x9f\x8c\x81"                                                                                             => ':foggy:',
+            "\xf3\xbe\x80\x86"                                                                                             => ':foggy:',
+            "\xee\x99\x84"                                                                                                 => ':foggy:',
+            "\xee\x96\x98"                                                                                                 => ':foggy:',
+            "\xf0\x9f\x8c\x82"                                                                                             => ':closed_umbrella:',
+            "\xf3\xbe\x80\x87"                                                                                             => ':closed_umbrella:',
+            "\xee\x99\x85"                                                                                                 => ':closed_umbrella:',
+            "\xee\x90\xbc"                                                                                                 => ':closed_umbrella:',
+            "\xee\xab\xa8"                                                                                                 => ':closed_umbrella:',
+            "\xf0\x9f\x8c\x83"                                                                                             => ':night_with_stars:',
+            "\xf3\xbe\x80\x88"                                                                                             => ':night_with_stars:',
+            "\xee\x9a\xb3"                                                                                                 => ':milky_way:',
+            "\xee\x91\x8b"                                                                                                 => ':milky_way:',
+            "\xee\xab\xb1"                                                                                                 => ':night_with_stars:',
+            "\xf0\x9f\x8c\x84"                                                                                             => ':sunrise_over_mountains:',
+            "\xf3\xbe\x80\x89"                                                                                             => ':sunrise_over_mountains:',
+            "\xee\x81\x8d"                                                                                                 => ':sunrise_over_mountains:',
+            "\xee\xab\xb4"                                                                                                 => ':sunrise:',
+            "\xf0\x9f\x8c\x85"                                                                                             => ':sunrise:',
+            "\xf3\xbe\x80\x8a"                                                                                             => ':sunrise:',
+            "\xee\x91\x89"                                                                                                 => ':sunrise:',
+            "\xf0\x9f\x8c\x86"                                                                                             => ':city_sunset:',
+            "\xf3\xbe\x80\x8b"                                                                                             => ':city_sunset:',
+            "\xee\x85\x86"                                                                                                 => ':city_sunset:',
+            "\xee\x97\x9a"                                                                                                 => ':city_sunrise:',
+            "\xf0\x9f\x8c\x87"                                                                                             => ':city_sunrise:',
+            "\xf3\xbe\x80\x8c"                                                                                             => ':city_sunrise:',
+            "\xee\x91\x8a"                                                                                                 => ':city_sunrise:',
+            "\xf0\x9f\x8c\x88"                                                                                             => ':rainbow:',
+            "\xf3\xbe\x80\x8d"                                                                                             => ':rainbow:',
+            "\xee\x91\x8c"                                                                                                 => ':rainbow:',
+            "\xee\xab\xb2"                                                                                                 => ':rainbow:',
+            "\xf0\x9f\x8c\x89"                                                                                             => ':bridge_at_night:',
+            "\xf3\xbe\x80\x90"                                                                                             => ':bridge_at_night:',
+            "\xee\x92\xbf"                                                                                                 => ':bridge_at_night:',
+            "\xf0\x9f\x8c\x8a"                                                                                             => ':ocean:',
+            "\xf3\xbe\x80\xb8"                                                                                             => ':ocean:',
+            "\xee\x9c\xbf"                                                                                                 => ':ocean:',
+            "\xee\x90\xbe"                                                                                                 => ':ocean:',
+            "\xee\xad\xbc"                                                                                                 => ':ocean:',
+            "\xf0\x9f\x8c\x8b"                                                                                             => ':volcano:',
+            "\xf3\xbe\x80\xba"                                                                                             => ':volcano:',
+            "\xee\xad\x93"                                                                                                 => ':volcano:',
+            "\xf0\x9f\x8c\x8c"                                                                                             => ':milky_way:',
+            "\xf3\xbe\x80\xbb"                                                                                             => ':milky_way:',
+            "\xee\xad\x9f"                                                                                                 => ':milky_way:',
+            "\xf0\x9f\x8c\x8d"                                                                                             => ':earth_africa:',
+            "\xf0\x9f\x8c\x8e"                                                                                             => ':earth_americas:',
+            "\xf0\x9f\x8c\x8f"                                                                                             => ':earth_asia:',
+            "\xf3\xbe\x80\xb9"                                                                                             => ':earth_asia:',
+            "\xee\x96\xb3"                                                                                                 => ':earth_asia:',
+            "\xf0\x9f\x8c\x90"                                                                                             => ':globe_with_meridians:',
+            "\xf0\x9f\x8c\x91"                                                                                             => ':new_moon:',
+            "\xf3\xbe\x80\x91"                                                                                             => ':new_moon:',
+            "\xee\x96\xa8"                                                                                                 => ':new_moon:',
+            "\xf0\x9f\x8c\x92"                                                                                             => ':waxing_crescent_moon:',
+            "\xf0\x9f\x8c\x93"                                                                                             => ':first_quarter_moon:',
+            "\xf3\xbe\x80\x93"                                                                                             => ':first_quarter_moon:',
+            "\xee\x9a\x9e"                                                                                                 => ':first_quarter_moon_with_face:',
+            "\xee\x81\x8c"                                                                                                 => ':first_quarter_moon_with_face:',
+            "\xee\x96\xaa"                                                                                                 => ':first_quarter_moon:',
+            "\xf0\x9f\x8c\x94"                                                                                             => ':waxing_gibbous_moon:',
+            "\xf3\xbe\x80\x92"                                                                                             => ':waxing_gibbous_moon:',
+            "\xee\x9a\x9d"                                                                                                 => ':waxing_gibbous_moon:',
+            "\xee\x96\xa9"                                                                                                 => ':waxing_gibbous_moon:',
+            "\xf0\x9f\x8c\x95"                                                                                             => ':full_moon:',
+            "\xf3\xbe\x80\x95"                                                                                             => ':full_moon:',
+            "\xf0\x9f\x8c\x96"                                                                                             => ':waning_gibbous_moon:',
+            "\xf0\x9f\x8c\x97"                                                                                             => ':last_quarter_moon:',
+            "\xf0\x9f\x8c\x98"                                                                                             => ':waning_crescent_moon:',
+            "\xf0\x9f\x8c\x99"                                                                                             => ':crescent_moon:',
+            "\xf3\xbe\x80\x94"                                                                                             => ':crescent_moon:',
+            "\xee\x9a\x9f"                                                                                                 => ':crescent_moon:',
+            "\xee\x92\x86"                                                                                                 => ':crescent_moon:',
+            "\xf0\x9f\x8c\x9a"                                                                                             => ':new_moon_with_face:',
+            "\xf0\x9f\x8c\x9b"                                                                                             => ':first_quarter_moon_with_face:',
+            "\xf3\xbe\x80\x96"                                                                                             => ':first_quarter_moon_with_face:',
+            "\xee\x92\x89"                                                                                                 => ':first_quarter_moon_with_face:',
+            "\xf0\x9f\x8c\x9c"                                                                                             => ':last_quarter_moon_with_face:',
+            "\xf0\x9f\x8c\x9d"                                                                                             => ':full_moon_with_face:',
+            "\xf0\x9f\x8c\x9e"                                                                                             => ':sun_with_face:',
+            "\xf0\x9f\x8c\x9f"                                                                                             => ':star2:',
+            "\xf3\xbe\xad\xa9"                                                                                             => ':star2:',
+            "\xee\x8c\xb5"                                                                                                 => ':star2:',
+            "\xf0\x9f\x8c\xa0"                                                                                             => ':stars:',
+            "\xf3\xbe\xad\xaa"                                                                                             => ':stars:',
+            "\xee\x91\xa8"                                                                                                 => ':stars:',
+            "\xf0\x9f\x8c\xa1"                                                                                             => ':thermometer:',
+            "\xf0\x9f\x8c\xa4"                                                                                             => ':sun_small_cloud:',
+            "\xf0\x9f\x8c\xa5"                                                                                             => ':sun_behind_cloud:',
+            "\xf0\x9f\x8c\xa6"                                                                                             => ':sun_behind_rain_cloud:',
+            "\xf0\x9f\x8c\xa7"                                                                                             => ':rain_cloud:',
+            "\xf0\x9f\x8c\xa8"                                                                                             => ':snow_cloud:',
+            "\xf0\x9f\x8c\xa9"                                                                                             => ':lightning_cloud:',
+            "\xf0\x9f\x8c\xaa"                                                                                             => ':tornado_cloud:',
+            "\xf0\x9f\x8c\xab"                                                                                             => ':fog:',
+            "\xf0\x9f\x8c\xac"                                                                                             => ':wind_blowing_face:',
+            "\xf0\x9f\x8c\xad"                                                                                             => ':hotdog:',
+            "\xf0\x9f\x8c\xae"                                                                                             => ':taco:',
+            "\xf0\x9f\x8c\xaf"                                                                                             => ':burrito:',
+            "\xf0\x9f\x8c\xb0"                                                                                             => ':chestnut:',
+            "\xf3\xbe\x81\x8c"                                                                                             => ':chestnut:',
+            "\xee\xac\xb8"                                                                                                 => ':chestnut:',
+            "\xf0\x9f\x8c\xb1"                                                                                             => ':seedling:',
+            "\xf3\xbe\x80\xbe"                                                                                             => ':seedling:',
+            "\xee\x9d\x86"                                                                                                 => ':seedling:',
+            "\xee\x84\x90"                                                                                                 => ':four_leaf_clover:',
+            "\xee\xad\xbd"                                                                                                 => ':seedling:',
+            "\xf0\x9f\x8c\xb2"                                                                                             => ':evergreen_tree:',
+            "\xf0\x9f\x8c\xb3"                                                                                             => ':deciduous_tree:',
+            "\xf0\x9f\x8c\xb4"                                                                                             => ':palm_tree:',
+            "\xf3\xbe\x81\x87"                                                                                             => ':palm_tree:',
+            "\xee\x8c\x87"                                                                                                 => ':palm_tree:',
+            "\xee\x93\xa2"                                                                                                 => ':palm_tree:',
+            "\xf0\x9f\x8c\xb5"                                                                                             => ':cactus:',
+            "\xf3\xbe\x81\x88"                                                                                             => ':cactus:',
+            "\xee\x8c\x88"                                                                                                 => ':cactus:',
+            "\xee\xaa\x96"                                                                                                 => ':cactus:',
+            "\xf0\x9f\x8c\xb6"                                                                                             => ':hot_pepper:',
+            "\xf0\x9f\x8c\xb7"                                                                                             => ':tulip:',
+            "\xf3\xbe\x80\xbd"                                                                                             => ':tulip:',
+            "\xee\x9d\x83"                                                                                                 => ':tulip:',
+            "\xee\x8c\x84"                                                                                                 => ':tulip:',
+            "\xee\x93\xa4"                                                                                                 => ':tulip:',
+            "\xf0\x9f\x8c\xb8"                                                                                             => ':cherry_blossom:',
+            "\xf3\xbe\x81\x80"                                                                                             => ':cherry_blossom:',
+            "\xee\x9d\x88"                                                                                                 => ':cherry_blossom:',
+            "\xee\x80\xb0"                                                                                                 => ':cherry_blossom:',
+            "\xee\x93\x8a"                                                                                                 => ':cherry_blossom:',
+            "\xf0\x9f\x8c\xb9"                                                                                             => ':rose:',
+            "\xf3\xbe\x81\x81"                                                                                             => ':rose:',
+            "\xee\x80\xb2"                                                                                                 => ':rose:',
+            "\xee\x96\xba"                                                                                                 => ':rose:',
+            "\xf0\x9f\x8c\xba"                                                                                             => ':hibiscus:',
+            "\xf3\xbe\x81\x85"                                                                                             => ':hibiscus:',
+            "\xee\x8c\x83"                                                                                                 => ':hibiscus:',
+            "\xee\xaa\x94"                                                                                                 => ':hibiscus:',
+            "\xf0\x9f\x8c\xbb"                                                                                             => ':sunflower:',
+            "\xf3\xbe\x81\x86"                                                                                             => ':sunflower:',
+            "\xee\x8c\x85"                                                                                                 => ':blossom:',
+            "\xee\x93\xa3"                                                                                                 => ':sunflower:',
+            "\xf0\x9f\x8c\xbc"                                                                                             => ':blossom:',
+            "\xf3\xbe\x81\x8d"                                                                                             => ':blossom:',
+            "\xee\xad\x89"                                                                                                 => ':blossom:',
+            "\xf0\x9f\x8c\xbd"                                                                                             => ':corn:',
+            "\xf3\xbe\x81\x8a"                                                                                             => ':corn:',
+            "\xee\xac\xb6"                                                                                                 => ':corn:',
+            "\xf0\x9f\x8c\xbe"                                                                                             => ':ear_of_rice:',
+            "\xf3\xbe\x81\x89"                                                                                             => ':ear_of_rice:',
+            "\xee\x91\x84"                                                                                                 => ':ear_of_rice:',
+            "\xf0\x9f\x8c\xbf"                                                                                             => ':herb:',
+            "\xf3\xbe\x81\x8e"                                                                                             => ':herb:',
+            "\xee\x9d\x81"                                                                                                 => ':four_leaf_clover:',
+            "\xee\xae\x82"                                                                                                 => ':herb:',
+            "\xf0\x9f\x8d\x80"                                                                                             => ':four_leaf_clover:',
+            "\xf3\xbe\x80\xbc"                                                                                             => ':four_leaf_clover:',
+            "\xee\x94\x93"                                                                                                 => ':cn:',
+            "\xf0\x9f\x8d\x81"                                                                                             => ':maple_leaf:',
+            "\xf3\xbe\x80\xbf"                                                                                             => ':maple_leaf:',
+            "\xee\x9d\x87"                                                                                                 => ':fallen_leaf:',
+            "\xee\x84\x98"                                                                                                 => ':maple_leaf:',
+            "\xee\x93\x8e"                                                                                                 => ':maple_leaf:',
+            "\xf0\x9f\x8d\x82"                                                                                             => ':fallen_leaf:',
+            "\xf3\xbe\x81\x82"                                                                                             => ':fallen_leaf:',
+            "\xee\x84\x99"                                                                                                 => ':fallen_leaf:',
+            "\xee\x97\x8d"                                                                                                 => ':leaves:',
+            "\xf0\x9f\x8d\x83"                                                                                             => ':leaves:',
+            "\xf3\xbe\x81\x83"                                                                                             => ':leaves:',
+            "\xee\x91\x87"                                                                                                 => ':leaves:',
+            "\xf0\x9f\x8d\x84"                                                                                             => ':mushroom:',
+            "\xf3\xbe\x81\x8b"                                                                                             => ':mushroom:',
+            "\xee\xac\xb7"                                                                                                 => ':mushroom:',
+            "\xf0\x9f\x8d\x85"                                                                                             => ':tomato:',
+            "\xf3\xbe\x81\x95"                                                                                             => ':tomato:',
+            "\xee\x8d\x89"                                                                                                 => ':tomato:',
+            "\xee\xaa\xbb"                                                                                                 => ':tomato:',
+            "\xf0\x9f\x8d\x86"                                                                                             => ':eggplant:',
+            "\xf3\xbe\x81\x96"                                                                                             => ':eggplant:',
+            "\xee\x8d\x8a"                                                                                                 => ':eggplant:',
+            "\xee\xaa\xbc"                                                                                                 => ':eggplant:',
+            "\xf0\x9f\x8d\x87"                                                                                             => ':grapes:',
+            "\xf3\xbe\x81\x99"                                                                                             => ':grapes:',
+            "\xee\xac\xb4"                                                                                                 => ':grapes:',
+            "\xf0\x9f\x8d\x88"                                                                                             => ':melon:',
+            "\xf3\xbe\x81\x97"                                                                                             => ':melon:',
+            "\xee\xac\xb2"                                                                                                 => ':melon:',
+            "\xf0\x9f\x8d\x89"                                                                                             => ':watermelon:',
+            "\xf3\xbe\x81\x94"                                                                                             => ':watermelon:',
+            "\xee\x8d\x88"                                                                                                 => ':watermelon:',
+            "\xee\x93\x8d"                                                                                                 => ':watermelon:',
+            "\xf0\x9f\x8d\x8a"                                                                                             => ':tangerine:',
+            "\xf3\xbe\x81\x92"                                                                                             => ':tangerine:',
+            "\xee\x8d\x86"                                                                                                 => ':tangerine:',
+            "\xee\xaa\xba"                                                                                                 => ':tangerine:',
+            "\xf0\x9f\x8d\x8b"                                                                                             => ':lemon:',
+            "\xf0\x9f\x8d\x8c"                                                                                             => ':banana:',
+            "\xf3\xbe\x81\x90"                                                                                             => ':banana:',
+            "\xee\x9d\x84"                                                                                                 => ':banana:',
+            "\xee\xac\xb5"                                                                                                 => ':banana:',
+            "\xf0\x9f\x8d\x8d"                                                                                             => ':pineapple:',
+            "\xf3\xbe\x81\x98"                                                                                             => ':pineapple:',
+            "\xee\xac\xb3"                                                                                                 => ':pineapple:',
+            "\xf0\x9f\x8d\x8e"                                                                                             => ':apple:',
+            "\xf3\xbe\x81\x91"                                                                                             => ':apple:',
+            "\xee\x9d\x85"                                                                                                 => ':green_apple:',
+            "\xee\x8d\x85"                                                                                                 => ':green_apple:',
+            "\xee\xaa\xb9"                                                                                                 => ':apple:',
+            "\xf0\x9f\x8d\x8f"                                                                                             => ':green_apple:',
+            "\xf3\xbe\x81\x9b"                                                                                             => ':green_apple:',
+            "\xee\xad\x9a"                                                                                                 => ':green_apple:',
+            "\xf0\x9f\x8d\x90"                                                                                             => ':pear:',
+            "\xf0\x9f\x8d\x91"                                                                                             => ':peach:',
+            "\xf3\xbe\x81\x9a"                                                                                             => ':peach:',
+            "\xee\xac\xb9"                                                                                                 => ':peach:',
+            "\xf0\x9f\x8d\x92"                                                                                             => ':cherries:',
+            "\xf3\xbe\x81\x8f"                                                                                             => ':cherries:',
+            "\xee\x9d\x82"                                                                                                 => ':cherries:',
+            "\xee\x93\x92"                                                                                                 => ':cherries:',
+            "\xf0\x9f\x8d\x93"                                                                                             => ':strawberry:',
+            "\xf3\xbe\x81\x93"                                                                                             => ':strawberry:',
+            "\xee\x8d\x87"                                                                                                 => ':strawberry:',
+            "\xee\x93\x94"                                                                                                 => ':strawberry:',
+            "\xf0\x9f\x8d\x94"                                                                                             => ':hamburger:',
+            "\xf3\xbe\xa5\xa0"                                                                                             => ':hamburger:',
+            "\xee\x99\xb3"                                                                                                 => ':hamburger:',
+            "\xee\x84\xa0"                                                                                                 => ':hamburger:',
+            "\xee\x93\x96"                                                                                                 => ':hamburger:',
+            "\xf0\x9f\x8d\x95"                                                                                             => ':pizza:',
+            "\xf3\xbe\xa5\xb5"                                                                                             => ':pizza:',
+            "\xee\xac\xbb"                                                                                                 => ':pizza:',
+            "\xf0\x9f\x8d\x96"                                                                                             => ':meat_on_bone:',
+            "\xf3\xbe\xa5\xb2"                                                                                             => ':meat_on_bone:',
+            "\xee\x93\x84"                                                                                                 => ':meat_on_bone:',
+            "\xf0\x9f\x8d\x97"                                                                                             => ':poultry_leg:',
+            "\xf3\xbe\xa5\xb6"                                                                                             => ':poultry_leg:',
+            "\xee\xac\xbc"                                                                                                 => ':poultry_leg:',
+            "\xf0\x9f\x8d\x98"                                                                                             => ':rice_cracker:',
+            "\xf3\xbe\xa5\xa9"                                                                                             => ':rice_cracker:',
+            "\xee\x8c\xbd"                                                                                                 => ':rice_cracker:',
+            "\xee\xaa\xb3"                                                                                                 => ':rice_cracker:',
+            "\xf0\x9f\x8d\x99"                                                                                             => ':rice_ball:',
+            "\xf3\xbe\xa5\xa1"                                                                                             => ':rice_ball:',
+            "\xee\x9d\x89"                                                                                                 => ':rice_ball:',
+            "\xee\x8d\x82"                                                                                                 => ':rice_ball:',
+            "\xee\x93\x95"                                                                                                 => ':rice_ball:',
+            "\xf0\x9f\x8d\x9a"                                                                                             => ':rice:',
+            "\xf3\xbe\xa5\xaa"                                                                                             => ':rice:',
+            "\xee\x9d\x8c"                                                                                                 => ':ramen:',
+            "\xee\x8c\xbe"                                                                                                 => ':rice:',
+            "\xee\xaa\xb4"                                                                                                 => ':rice:',
+            "\xf0\x9f\x8d\x9b"                                                                                             => ':curry:',
+            "\xf3\xbe\xa5\xac"                                                                                             => ':curry:',
+            "\xee\x8d\x81"                                                                                                 => ':curry:',
+            "\xee\xaa\xb6"                                                                                                 => ':curry:',
+            "\xf0\x9f\x8d\x9c"                                                                                             => ':ramen:',
+            "\xf3\xbe\xa5\xa3"                                                                                             => ':ramen:',
+            "\xee\x8d\x80"                                                                                                 => ':ramen:',
+            "\xee\x96\xb4"                                                                                                 => ':ramen:',
+            "\xf0\x9f\x8d\x9d"                                                                                             => ':spaghetti:',
+            "\xf3\xbe\xa5\xab"                                                                                             => ':spaghetti:',
+            "\xee\x8c\xbf"                                                                                                 => ':spaghetti:',
+            "\xee\xaa\xb5"                                                                                                 => ':spaghetti:',
+            "\xf0\x9f\x8d\x9e"                                                                                             => ':bread:',
+            "\xf3\xbe\xa5\xa4"                                                                                             => ':bread:',
+            "\xee\x9d\x8d"                                                                                                 => ':bread:',
+            "\xee\x8c\xb9"                                                                                                 => ':bread:',
+            "\xee\xaa\xaf"                                                                                                 => ':bread:',
+            "\xf0\x9f\x8d\x9f"                                                                                             => ':fries:',
+            "\xf3\xbe\xa5\xa7"                                                                                             => ':fries:',
+            "\xee\x8c\xbb"                                                                                                 => ':fries:',
+            "\xee\xaa\xb1"                                                                                                 => ':fries:',
+            "\xf0\x9f\x8d\xa0"                                                                                             => ':sweet_potato:',
+            "\xf3\xbe\xa5\xb4"                                                                                             => ':sweet_potato:',
+            "\xee\xac\xba"                                                                                                 => ':sweet_potato:',
+            "\xf0\x9f\x8d\xa1"                                                                                             => ':dango:',
+            "\xf3\xbe\xa5\xa8"                                                                                             => ':dango:',
+            "\xee\x8c\xbc"                                                                                                 => ':dango:',
+            "\xee\xaa\xb2"                                                                                                 => ':dango:',
+            "\xf0\x9f\x8d\xa2"                                                                                             => ':oden:',
+            "\xf3\xbe\xa5\xad"                                                                                             => ':oden:',
+            "\xee\x8d\x83"                                                                                                 => ':oden:',
+            "\xee\xaa\xb7"                                                                                                 => ':oden:',
+            "\xf0\x9f\x8d\xa3"                                                                                             => ':sushi:',
+            "\xf3\xbe\xa5\xae"                                                                                             => ':sushi:',
+            "\xee\x8d\x84"                                                                                                 => ':sushi:',
+            "\xee\xaa\xb8"                                                                                                 => ':sushi:',
+            "\xf0\x9f\x8d\xa4"                                                                                             => ':fried_shrimp:',
+            "\xf3\xbe\xa5\xbf"                                                                                             => ':fried_shrimp:',
+            "\xee\xad\xb0"                                                                                                 => ':fried_shrimp:',
+            "\xf0\x9f\x8d\xa5"                                                                                             => ':fish_cake:',
+            "\xf3\xbe\xa5\xb3"                                                                                             => ':fish_cake:',
+            "\xee\x93\xad"                                                                                                 => ':fish_cake:',
+            "\xf0\x9f\x8d\xa6"                                                                                             => ':icecream:',
+            "\xf3\xbe\xa5\xa6"                                                                                             => ':icecream:',
+            "\xee\x8c\xba"                                                                                                 => ':icecream:',
+            "\xee\xaa\xb0"                                                                                                 => ':icecream:',
+            "\xf0\x9f\x8d\xa7"                                                                                             => ':shaved_ice:',
+            "\xf3\xbe\xa5\xb1"                                                                                             => ':shaved_ice:',
+            "\xee\x90\xbf"                                                                                                 => ':shaved_ice:',
+            "\xee\xab\xaa"                                                                                                 => ':shaved_ice:',
+            "\xf0\x9f\x8d\xa8"                                                                                             => ':ice_cream:',
+            "\xf3\xbe\xa5\xb7"                                                                                             => ':ice_cream:',
+            "\xee\xad\x8a"                                                                                                 => ':ice_cream:',
+            "\xf0\x9f\x8d\xa9"                                                                                             => ':doughnut:',
+            "\xf3\xbe\xa5\xb8"                                                                                             => ':doughnut:',
+            "\xee\xad\x8b"                                                                                                 => ':doughnut:',
+            "\xf0\x9f\x8d\xaa"                                                                                             => ':cookie:',
+            "\xf3\xbe\xa5\xb9"                                                                                             => ':cookie:',
+            "\xee\xad\x8c"                                                                                                 => ':cookie:',
+            "\xf0\x9f\x8d\xab"                                                                                             => ':chocolate_bar:',
+            "\xf3\xbe\xa5\xba"                                                                                             => ':chocolate_bar:',
+            "\xee\xad\x8d"                                                                                                 => ':chocolate_bar:',
+            "\xf0\x9f\x8d\xac"                                                                                             => ':candy:',
+            "\xf3\xbe\xa5\xbb"                                                                                             => ':candy:',
+            "\xee\xad\x8e"                                                                                                 => ':candy:',
+            "\xf0\x9f\x8d\xad"                                                                                             => ':lollipop:',
+            "\xf3\xbe\xa5\xbc"                                                                                             => ':lollipop:',
+            "\xee\xad\x8f"                                                                                                 => ':lollipop:',
+            "\xf0\x9f\x8d\xae"                                                                                             => ':custard:',
+            "\xf3\xbe\xa5\xbd"                                                                                             => ':custard:',
+            "\xee\xad\x96"                                                                                                 => ':custard:',
+            "\xf0\x9f\x8d\xaf"                                                                                             => ':honey_pot:',
+            "\xf3\xbe\xa5\xbe"                                                                                             => ':honey_pot:',
+            "\xee\xad\x99"                                                                                                 => ':honey_pot:',
+            "\xf0\x9f\x8d\xb0"                                                                                             => ':cake:',
+            "\xf3\xbe\xa5\xa2"                                                                                             => ':cake:',
+            "\xee\x9d\x8a"                                                                                                 => ':cake:',
+            "\xee\x81\x86"                                                                                                 => ':cake:',
+            "\xee\x93\x90"                                                                                                 => ':cake:',
+            "\xf0\x9f\x8d\xb1"                                                                                             => ':bento:',
+            "\xf3\xbe\xa5\xaf"                                                                                             => ':bento:',
+            "\xee\x8d\x8c"                                                                                                 => ':bento:',
+            "\xee\xaa\xbd"                                                                                                 => ':bento:',
+            "\xf0\x9f\x8d\xb2"                                                                                             => ':stew:',
+            "\xf3\xbe\xa5\xb0"                                                                                             => ':stew:',
+            "\xee\x8d\x8d"                                                                                                 => ':stew:',
+            "\xee\xaa\xbe"                                                                                                 => ':stew:',
+            "\xf0\x9f\x8d\xb3"                                                                                             => ':egg:',
+            "\xf3\xbe\xa5\xa5"                                                                                             => ':egg:',
+            "\xee\x85\x87"                                                                                                 => ':egg:',
+            "\xee\x93\x91"                                                                                                 => ':egg:',
+            "\xf0\x9f\x8d\xb4"                                                                                             => ':fork_and_knife:',
+            "\xf3\xbe\xa6\x80"                                                                                             => ':fork_and_knife:',
+            "\xee\x99\xaf"                                                                                                 => ':fork_and_knife:',
+            "\xee\x81\x83"                                                                                                 => ':fork_and_knife:',
+            "\xee\x92\xac"                                                                                                 => ':fork_and_knife:',
+            "\xf0\x9f\x8d\xb5"                                                                                             => ':tea:',
+            "\xf3\xbe\xa6\x84"                                                                                             => ':tea:',
+            "\xee\x9c\x9e"                                                                                                 => ':tea:',
+            "\xee\x8c\xb8"                                                                                                 => ':tea:',
+            "\xee\xaa\xae"                                                                                                 => ':tea:',
+            "\xf0\x9f\x8d\xb6"                                                                                             => ':sake:',
+            "\xf3\xbe\xa6\x85"                                                                                             => ':sake:',
+            "\xee\x9d\x8b"                                                                                                 => ':lantern:',
+            "\xee\x8c\x8b"                                                                                                 => ':lantern:',
+            "\xee\xaa\x97"                                                                                                 => ':sake:',
+            "\xf0\x9f\x8d\xb7"                                                                                             => ':wine_glass:',
+            "\xf3\xbe\xa6\x86"                                                                                             => ':wine_glass:',
+            "\xee\x9d\x96"                                                                                                 => ':wine_glass:',
+            "\xee\x81\x84"                                                                                                 => ':tropical_drink:',
+            "\xee\x93\x81"                                                                                                 => ':wine_glass:',
+            "\xf0\x9f\x8d\xb8"                                                                                             => ':cocktail:',
+            "\xf3\xbe\xa6\x82"                                                                                             => ':cocktail:',
+            "\xee\x99\xb1"                                                                                                 => ':tropical_drink:',
+            "\xee\x93\x82"                                                                                                 => ':cocktail:',
+            "\xf0\x9f\x8d\xb9"                                                                                             => ':tropical_drink:',
+            "\xf3\xbe\xa6\x88"                                                                                             => ':tropical_drink:',
+            "\xee\xac\xbe"                                                                                                 => ':tropical_drink:',
+            "\xf0\x9f\x8d\xba"                                                                                             => ':beer:',
+            "\xf3\xbe\xa6\x83"                                                                                             => ':beer:',
+            "\xee\x99\xb2"                                                                                                 => ':beers:',
+            "\xee\x81\x87"                                                                                                 => ':beer:',
+            "\xee\x93\x83"                                                                                                 => ':beer:',
+            "\xf0\x9f\x8d\xbb"                                                                                             => ':beers:',
+            "\xf3\xbe\xa6\x87"                                                                                             => ':beers:',
+            "\xee\x8c\x8c"                                                                                                 => ':beers:',
+            "\xee\xaa\x98"                                                                                                 => ':beers:',
+            "\xf0\x9f\x8d\xbc"                                                                                             => ':baby_bottle:',
+            "\xf0\x9f\x8d\xbd"                                                                                             => ':knife_fork_plate:',
+            "\xf0\x9f\x8d\xbe"                                                                                             => ':champagne:',
+            "\xf0\x9f\x8d\xbf"                                                                                             => ':popcorn:',
+            "\xf0\x9f\x8e\x80"                                                                                             => ':ribbon:',
+            "\xf3\xbe\x94\x8f"                                                                                             => ':ribbon:',
+            "\xee\x9a\x84"                                                                                                 => ':ribbon:',
+            "\xee\x8c\x94"                                                                                                 => ':ribbon:',
+            "\xee\x96\x9f"                                                                                                 => ':ribbon:',
+            "\xf0\x9f\x8e\x81"                                                                                             => ':gift:',
+            "\xf3\xbe\x94\x90"                                                                                             => ':gift:',
+            "\xee\x9a\x85"                                                                                                 => ':package:',
+            "\xee\x84\x92"                                                                                                 => ':package:',
+            "\xee\x93\x8f"                                                                                                 => ':gift:',
+            "\xf0\x9f\x8e\x82"                                                                                             => ':birthday:',
+            "\xf3\xbe\x94\x91"                                                                                             => ':birthday:',
+            "\xee\x9a\x86"                                                                                                 => ':birthday:',
+            "\xee\x8d\x8b"                                                                                                 => ':birthday:',
+            "\xee\x96\xa0"                                                                                                 => ':birthday:',
+            "\xf0\x9f\x8e\x83"                                                                                             => ':jack_o_lantern:',
+            "\xf3\xbe\x94\x9f"                                                                                             => ':jack_o_lantern:',
+            "\xee\x91\x85"                                                                                                 => ':jack_o_lantern:',
+            "\xee\xab\xae"                                                                                                 => ':jack_o_lantern:',
+            "\xf0\x9f\x8e\x84"                                                                                             => ':christmas_tree:',
+            "\xf3\xbe\x94\x92"                                                                                             => ':christmas_tree:',
+            "\xee\x9a\xa4"                                                                                                 => ':christmas_tree:',
+            "\xee\x80\xb3"                                                                                                 => ':christmas_tree:',
+            "\xee\x93\x89"                                                                                                 => ':christmas_tree:',
+            "\xf0\x9f\x8e\x85"                                                                                             => ':santa:',
+            "\xf3\xbe\x94\x93"                                                                                             => ':santa:',
+            "\xee\x91\x88"                                                                                                 => ':santa:',
+            "\xee\xab\xb0"                                                                                                 => ':santa:',
+            "\xf0\x9f\x8e\x86"                                                                                             => ':fireworks:',
+            "\xf3\xbe\x94\x95"                                                                                             => ':fireworks:',
+            "\xee\x84\x97"                                                                                                 => ':fireworks:',
+            "\xee\x97\x8c"                                                                                                 => ':fireworks:',
+            "\xf0\x9f\x8e\x87"                                                                                             => ':sparkler:',
+            "\xf3\xbe\x94\x9d"                                                                                             => ':sparkler:',
+            "\xee\x91\x80"                                                                                                 => ':sparkler:',
+            "\xee\xab\xab"                                                                                                 => ':sparkler:',
+            "\xf0\x9f\x8e\x88"                                                                                             => ':balloon:',
+            "\xf3\xbe\x94\x96"                                                                                             => ':balloon:',
+            "\xee\x8c\x90"                                                                                                 => ':balloon:',
+            "\xee\xaa\x9b"                                                                                                 => ':balloon:',
+            "\xf0\x9f\x8e\x89"                                                                                             => ':tada:',
+            "\xf3\xbe\x94\x97"                                                                                             => ':tada:',
+            "\xee\x8c\x92"                                                                                                 => ':tada:',
+            "\xee\xaa\x9c"                                                                                                 => ':tada:',
+            "\xf0\x9f\x8e\x8a"                                                                                             => ':confetti_ball:',
+            "\xf3\xbe\x94\xa0"                                                                                             => ':confetti_ball:',
+            "\xee\x91\xaf"                                                                                                 => ':confetti_ball:',
+            "\xf0\x9f\x8e\x8b"                                                                                             => ':tanabata_tree:',
+            "\xf3\xbe\x94\xa1"                                                                                             => ':tanabata_tree:',
+            "\xee\xac\xbd"                                                                                                 => ':tanabata_tree:',
+            "\xf0\x9f\x8e\x8c"                                                                                             => ':crossed_flags:',
+            "\xf3\xbe\x94\x94"                                                                                             => ':crossed_flags:',
+            "\xee\x85\x83"                                                                                                 => ':crossed_flags:',
+            "\xee\x97\x99"                                                                                                 => ':crossed_flags:',
+            "\xf0\x9f\x8e\x8d"                                                                                             => ':bamboo:',
+            "\xf3\xbe\x94\x98"                                                                                             => ':bamboo:',
+            "\xee\x90\xb6"                                                                                                 => ':bamboo:',
+            "\xee\xab\xa3"                                                                                                 => ':bamboo:',
+            "\xf0\x9f\x8e\x8e"                                                                                             => ':dolls:',
+            "\xf3\xbe\x94\x99"                                                                                             => ':dolls:',
+            "\xee\x90\xb8"                                                                                                 => ':dolls:',
+            "\xee\xab\xa4"                                                                                                 => ':dolls:',
+            "\xf0\x9f\x8e\x8f"                                                                                             => ':flags:',
+            "\xf3\xbe\x94\x9c"                                                                                             => ':flags:',
+            "\xee\x90\xbb"                                                                                                 => ':flags:',
+            "\xee\xab\xa7"                                                                                                 => ':flags:',
+            "\xf0\x9f\x8e\x90"                                                                                             => ':wind_chime:',
+            "\xf3\xbe\x94\x9e"                                                                                             => ':wind_chime:',
+            "\xee\x91\x82"                                                                                                 => ':wind_chime:',
+            "\xee\xab\xad"                                                                                                 => ':wind_chime:',
+            "\xf0\x9f\x8e\x91"                                                                                             => ':rice_scene:',
+            "\xf3\xbe\x80\x97"                                                                                             => ':rice_scene:',
+            "\xee\x91\x86"                                                                                                 => ':rice_scene:',
+            "\xee\xab\xaf"                                                                                                 => ':rice_scene:',
+            "\xf0\x9f\x8e\x92"                                                                                             => ':school_satchel:',
+            "\xf3\xbe\x94\x9b"                                                                                             => ':school_satchel:',
+            "\xee\x90\xba"                                                                                                 => ':school_satchel:',
+            "\xee\xab\xa6"                                                                                                 => ':school_satchel:',
+            "\xf0\x9f\x8e\x93"                                                                                             => ':mortar_board:',
+            "\xf3\xbe\x94\x9a"                                                                                             => ':mortar_board:',
+            "\xee\x90\xb9"                                                                                                 => ':mortar_board:',
+            "\xee\xab\xa5"                                                                                                 => ':mortar_board:',
+            "\xf0\x9f\x8e\x96"                                                                                             => ':medal:',
+            "\xf0\x9f\x8e\x97"                                                                                             => ':reminder_ribbon:',
+            "\xf0\x9f\x8e\x99"                                                                                             => ':studio_microphone:',
+            "\xf0\x9f\x8e\x9a"                                                                                             => ':level_slider:',
+            "\xf0\x9f\x8e\x9b"                                                                                             => ':control_knobs:',
+            "\xf0\x9f\x8e\x9e"                                                                                             => ':film_frames:',
+            "\xf0\x9f\x8e\x9f"                                                                                             => ':admission_tickets:',
+            "\xf0\x9f\x8e\xa0"                                                                                             => ':carousel_horse:',
+            "\xf3\xbe\x9f\xbc"                                                                                             => ':carousel_horse:',
+            "\xee\x99\xb9"                                                                                                 => ':carousel_horse:',
+            "\xf0\x9f\x8e\xa1"                                                                                             => ':ferris_wheel:',
+            "\xf3\xbe\x9f\xbd"                                                                                             => ':ferris_wheel:',
+            "\xee\x84\xa4"                                                                                                 => ':ferris_wheel:',
+            "\xee\x91\xad"                                                                                                 => ':ferris_wheel:',
+            "\xf0\x9f\x8e\xa2"                                                                                             => ':roller_coaster:',
+            "\xf3\xbe\x9f\xbe"                                                                                             => ':roller_coaster:',
+            "\xee\x90\xb3"                                                                                                 => ':roller_coaster:',
+            "\xee\xab\xa2"                                                                                                 => ':roller_coaster:',
+            "\xf0\x9f\x8e\xa3"                                                                                             => ':fishing_pole_and_fish:',
+            "\xf3\xbe\x9f\xbf"                                                                                             => ':fishing_pole_and_fish:',
+            "\xee\x9d\x91"                                                                                                 => ':blowfish:',
+            "\xee\x80\x99"                                                                                                 => ':blowfish:',
+            "\xee\xad\x82"                                                                                                 => ':fishing_pole_and_fish:',
+            "\xf0\x9f\x8e\xa4"                                                                                             => ':microphone:',
+            "\xf3\xbe\xa0\x80"                                                                                             => ':microphone:',
+            "\xee\x99\xb6"                                                                                                 => ':microphone:',
+            "\xee\x80\xbc"                                                                                                 => ':microphone:',
+            "\xee\x94\x83"                                                                                                 => ':performing_arts:',
+            "\xf0\x9f\x8e\xa5"                                                                                             => ':movie_camera:',
+            "\xf3\xbe\xa0\x81"                                                                                             => ':movie_camera:',
+            "\xee\x99\xb7"                                                                                                 => ':video_camera:',
+            "\xee\x80\xbd"                                                                                                 => ':video_camera:',
+            "\xee\x94\x97"                                                                                                 => ':man_with_turban:',
+            "\xf0\x9f\x8e\xa6"                                                                                             => ':cinema:',
+            "\xf3\xbe\xa0\x82"                                                                                             => ':cinema:',
+            "\xee\x94\x87"                                                                                                 => ':violin:',
+            "\xf0\x9f\x8e\xa7"                                                                                             => ':headphones:',
+            "\xf3\xbe\xa0\x83"                                                                                             => ':headphones:',
+            "\xee\x99\xba"                                                                                                 => ':headphones:',
+            "\xee\x8c\x8a"                                                                                                 => ':headphones:',
+            "\xee\x94\x88"                                                                                                 => ':factory:',
+            "\xf0\x9f\x8e\xa8"                                                                                             => ':art:',
+            "\xf3\xbe\xa0\x84"                                                                                             => ':art:',
+            "\xee\x99\xbb"                                                                                                 => ':art:',
+            "\xee\x94\x82"                                                                                                 => ':tv:',
+            "\xee\x96\x9c"                                                                                                 => ':art:',
+            "\xf0\x9f\x8e\xa9"                                                                                             => ':tophat:',
+            "\xf3\xbe\xa0\x85"                                                                                             => ':tophat:',
+            "\xee\x99\xbc"                                                                                                 => ':tophat:',
+            "\xee\xab\xb5"                                                                                                 => ':tophat:',
+            "\xf0\x9f\x8e\xaa"                                                                                             => ':circus_tent:',
+            "\xf3\xbe\xa0\x86"                                                                                             => ':circus_tent:',
+            "\xee\x99\xbd"                                                                                                 => ':circus_tent:',
+            "\xee\x96\x9e"                                                                                                 => ':circus_tent:',
+            "\xf0\x9f\x8e\xab"                                                                                             => ':ticket:',
+            "\xf3\xbe\xa0\x87"                                                                                             => ':ticket:',
+            "\xee\x99\xbe"                                                                                                 => ':ticket:',
+            "\xee\x84\xa5"                                                                                                 => ':ticket:',
+            "\xee\x92\x9e"                                                                                                 => ':ticket:',
+            "\xf0\x9f\x8e\xac"                                                                                             => ':clapper:',
+            "\xf3\xbe\xa0\x88"                                                                                             => ':clapper:',
+            "\xee\x9a\xac"                                                                                                 => ':clapper:',
+            "\xee\x8c\xa4"                                                                                                 => ':clapper:',
+            "\xee\x92\xbe"                                                                                                 => ':clapper:',
+            "\xf0\x9f\x8e\xad"                                                                                             => ':performing_arts:',
+            "\xf3\xbe\xa0\x89"                                                                                             => ':performing_arts:',
+            "\xee\x96\x9d"                                                                                                 => ':performing_arts:',
+            "\xf0\x9f\x8e\xae"                                                                                             => ':video_game:',
+            "\xf3\xbe\xa0\x8a"                                                                                             => ':video_game:',
+            "\xee\x9a\x8b"                                                                                                 => ':video_game:',
+            "\xee\x93\x86"                                                                                                 => ':video_game:',
+            "\xf0\x9f\x8e\xaf"                                                                                             => ':dart:',
+            "\xf3\xbe\xa0\x8c"                                                                                             => ':dart:',
+            "\xee\x84\xb0"                                                                                                 => ':dart:',
+            "\xee\x93\x85"                                                                                                 => ':dart:',
+            "\xf0\x9f\x8e\xb0"                                                                                             => ':slot_machine:',
+            "\xf3\xbe\xa0\x8d"                                                                                             => ':slot_machine:',
+            "\xee\x84\xb3"                                                                                                 => ':slot_machine:',
+            "\xee\x91\xae"                                                                                                 => ':slot_machine:',
+            "\xf0\x9f\x8e\xb1"                                                                                             => ':8ball:',
+            "\xf3\xbe\xa0\x8e"                                                                                             => ':8ball:',
+            "\xee\x90\xac"                                                                                                 => ':8ball:',
+            "\xee\xab\x9d"                                                                                                 => ':8ball:',
+            "\xf0\x9f\x8e\xb2"                                                                                             => ':game_die:',
+            "\xf3\xbe\xa0\x8f"                                                                                             => ':game_die:',
+            "\xee\x93\x88"                                                                                                 => ':game_die:',
+            "\xf0\x9f\x8e\xb3"                                                                                             => ':bowling:',
+            "\xf3\xbe\xa0\x90"                                                                                             => ':bowling:',
+            "\xee\xad\x83"                                                                                                 => ':bowling:',
+            "\xf0\x9f\x8e\xb4"                                                                                             => ':flower_playing_cards:',
+            "\xf3\xbe\xa0\x91"                                                                                             => ':flower_playing_cards:',
+            "\xee\xad\xae"                                                                                                 => ':flower_playing_cards:',
+            "\xf0\x9f\x8e\xb5"                                                                                             => ':musical_note:',
+            "\xf3\xbe\xa0\x93"                                                                                             => ':musical_note:',
+            "\xee\x9b\xb6"                                                                                                 => ':musical_note:',
+            "\xee\x80\xbe"                                                                                                 => ':musical_note:',
+            "\xee\x96\xbe"                                                                                                 => ':musical_note:',
+            "\xf0\x9f\x8e\xb6"                                                                                             => ':notes:',
+            "\xf3\xbe\xa0\x94"                                                                                             => ':notes:',
+            "\xee\x9b\xbf"                                                                                                 => ':musical_score:',
+            "\xee\x8c\xa6"                                                                                                 => ':musical_score:',
+            "\xee\x94\x85"                                                                                                 => ':japanese_castle:',
+            "\xf0\x9f\x8e\xb7"                                                                                             => ':saxophone:',
+            "\xf3\xbe\xa0\x95"                                                                                             => ':saxophone:',
+            "\xee\x81\x80"                                                                                                 => ':saxophone:',
+            "\xf0\x9f\x8e\xb8"                                                                                             => ':guitar:',
+            "\xf3\xbe\xa0\x96"                                                                                             => ':guitar:',
+            "\xee\x81\x81"                                                                                                 => ':guitar:',
+            "\xee\x94\x86"                                                                                                 => ':european_castle:',
+            "\xf0\x9f\x8e\xb9"                                                                                             => ':musical_keyboard:',
+            "\xf3\xbe\xa0\x97"                                                                                             => ':musical_keyboard:',
+            "\xee\xad\x80"                                                                                                 => ':musical_keyboard:',
+            "\xf0\x9f\x8e\xba"                                                                                             => ':trumpet:',
+            "\xf3\xbe\xa0\x98"                                                                                             => ':trumpet:',
+            "\xee\x81\x82"                                                                                                 => ':trumpet:',
+            "\xee\xab\x9c"                                                                                                 => ':trumpet:',
+            "\xf0\x9f\x8e\xbb"                                                                                             => ':violin:',
+            "\xf3\xbe\xa0\x99"                                                                                             => ':violin:',
+            "\xf0\x9f\x8e\xbc"                                                                                             => ':musical_score:',
+            "\xf3\xbe\xa0\x9a"                                                                                             => ':musical_score:',
+            "\xee\xab\x8c"                                                                                                 => ':musical_score:',
+            "\xf0\x9f\x8e\xbd"                                                                                             => ':running_shirt_with_sash:',
+            "\xf3\xbe\x9f\x90"                                                                                             => ':running_shirt_with_sash:',
+            "\xee\x99\x92"                                                                                                 => ':running_shirt_with_sash:',
+            "\xf0\x9f\x8e\xbe"                                                                                             => ':tennis:',
+            "\xf3\xbe\x9f\x93"                                                                                             => ':tennis:',
+            "\xee\x99\x95"                                                                                                 => ':tennis:',
+            "\xee\x80\x95"                                                                                                 => ':tennis:',
+            "\xee\x92\xb7"                                                                                                 => ':tennis:',
+            "\xf0\x9f\x8e\xbf"                                                                                             => ':ski:',
+            "\xf3\xbe\x9f\x95"                                                                                             => ':ski:',
+            "\xee\x99\x97"                                                                                                 => ':ski:',
+            "\xee\x80\x93"                                                                                                 => ':ski:',
+            "\xee\xaa\xac"                                                                                                 => ':ski:',
+            "\xf0\x9f\x8f\x80"                                                                                             => ':basketball:',
+            "\xf3\xbe\x9f\x96"                                                                                             => ':basketball:',
+            "\xee\x99\x98"                                                                                                 => ':basketball:',
+            "\xee\x90\xaa"                                                                                                 => ':basketball:',
+            "\xee\x96\x9a"                                                                                                 => ':basketball:',
+            "\xf0\x9f\x8f\x81"                                                                                             => ':checkered_flag:',
+            "\xf3\xbe\x9f\x97"                                                                                             => ':checkered_flag:',
+            "\xee\x99\x99"                                                                                                 => ':checkered_flag:',
+            "\xee\x84\xb2"                                                                                                 => ':checkered_flag:',
+            "\xee\x92\xb9"                                                                                                 => ':checkered_flag:',
+            "\xf0\x9f\x8f\x82"                                                                                             => ':snowboarder:',
+            "\xf3\xbe\x9f\x98"                                                                                             => ':snowboarder:',
+            "\xee\x9c\x92"                                                                                                 => ':surfer:',
+            "\xee\x92\xb8"                                                                                                 => ':snowboarder:',
+            "\xf0\x9f\x8f\x83"                                                                                             => ':running:',
+            "\xf3\xbe\x9f\x99"                                                                                             => ':running:',
+            "\xee\x9c\xb3"                                                                                                 => ':walking:',
+            "\xee\x84\x95"                                                                                                 => ':running:',
+            "\xee\x91\xab"                                                                                                 => ':running:',
+            "\xf0\x9f\x8f\x84"                                                                                             => ':surfer:',
+            "\xf3\xbe\x9f\x9a"                                                                                             => ':surfer:',
+            "\xee\x80\x97"                                                                                                 => ':surfer:',
+            "\xee\xad\x81"                                                                                                 => ':surfer:',
+            "\xf0\x9f\x8f\x85"                                                                                             => ':sports_medal:',
+            "\xf0\x9f\x8f\x86"                                                                                             => ':trophy:',
+            "\xf3\xbe\x9f\x9b"                                                                                             => ':trophy:',
+            "\xee\x84\xb1"                                                                                                 => ':trophy:',
+            "\xee\x97\x93"                                                                                                 => ':trophy:',
+            "\xf0\x9f\x8f\x87"                                                                                             => ':horse_racing:',
+            "\xf0\x9f\x8f\x88"                                                                                             => ':football:',
+            "\xf3\xbe\x9f\x9d"                                                                                             => ':football:',
+            "\xee\x90\xab"                                                                                                 => ':football:',
+            "\xee\x92\xbb"                                                                                                 => ':football:',
+            "\xf0\x9f\x8f\x89"                                                                                             => ':rugby_football:',
+            "\xf0\x9f\x8f\x8a"                                                                                             => ':swimmer:',
+            "\xf3\xbe\x9f\x9e"                                                                                             => ':swimmer:',
+            "\xee\x90\xad"                                                                                                 => ':swimmer:',
+            "\xee\xab\x9e"                                                                                                 => ':swimmer:',
+            "\xf0\x9f\x8f\x8b"                                                                                             => ':weight_lifter:',
+            "\xf0\x9f\x8f\x8c"                                                                                             => ':golfer:',
+            "\xf0\x9f\x8f\x8d"                                                                                             => ':racing_motorcycle:',
+            "\xf0\x9f\x8f\x8e"                                                                                             => ':racing_car:',
+            "\xf0\x9f\x8f\x8f"                                                                                             => ':cricket_bat_and_ball:',
+            "\xf0\x9f\x8f\x90"                                                                                             => ':volleyball:',
+            "\xf0\x9f\x8f\x91"                                                                                             => ':field_hockey_stick_and_ball:',
+            "\xf0\x9f\x8f\x92"                                                                                             => ':ice_hockey_stick_and_puck:',
+            "\xf0\x9f\x8f\x93"                                                                                             => ':table_tennis_paddle_and_ball:',
+            "\xf0\x9f\x8f\x94"                                                                                             => ':snow_capped_mountain:',
+            "\xf0\x9f\x8f\x95"                                                                                             => ':camping:',
+            "\xf0\x9f\x8f\x96"                                                                                             => ':beach_with_umbrella:',
+            "\xf0\x9f\x8f\x97"                                                                                             => ':building_construction:',
+            "\xf0\x9f\x8f\x98"                                                                                             => ':house_buildings:',
+            "\xf0\x9f\x8f\x99"                                                                                             => ':cityscape:',
+            "\xf0\x9f\x8f\x9a"                                                                                             => ':derelict_house_building:',
+            "\xf0\x9f\x8f\x9b"                                                                                             => ':classical_building:',
+            "\xf0\x9f\x8f\x9c"                                                                                             => ':desert:',
+            "\xf0\x9f\x8f\x9d"                                                                                             => ':desert_island:',
+            "\xf0\x9f\x8f\x9e"                                                                                             => ':national_park:',
+            "\xf0\x9f\x8f\x9f"                                                                                             => ':stadium:',
+            "\xf0\x9f\x8f\xa0"                                                                                             => ':house:',
+            "\xf3\xbe\x92\xb0"                                                                                             => ':house:',
+            "\xee\x99\xa3"                                                                                                 => ':house_with_garden:',
+            "\xee\x80\xb6"                                                                                                 => ':house_with_garden:',
+            "\xee\x92\xab"                                                                                                 => ':house:',
+            "\xf0\x9f\x8f\xa1"                                                                                             => ':house_with_garden:',
+            "\xf3\xbe\x92\xb1"                                                                                             => ':house_with_garden:',
+            "\xee\xac\x89"                                                                                                 => ':house_with_garden:',
+            "\xf0\x9f\x8f\xa2"                                                                                             => ':office:',
+            "\xf3\xbe\x92\xb2"                                                                                             => ':office:',
+            "\xee\x99\xa4"                                                                                                 => ':office:',
+            "\xee\x80\xb8"                                                                                                 => ':office:',
+            "\xee\x92\xad"                                                                                                 => ':office:',
+            "\xf0\x9f\x8f\xa3"                                                                                             => ':post_office:',
+            "\xf3\xbe\x92\xb3"                                                                                             => ':post_office:',
+            "\xee\x99\xa5"                                                                                                 => ':postbox:',
+            "\xee\x85\x93"                                                                                                 => ':post_office:',
+            "\xee\x97\x9e"                                                                                                 => ':post_office:',
+            "\xf0\x9f\x8f\xa4"                                                                                             => ':european_post_office:',
+            "\xf0\x9f\x8f\xa5"                                                                                             => ':hospital:',
+            "\xf3\xbe\x92\xb4"                                                                                             => ':hospital:',
+            "\xee\x99\xa6"                                                                                                 => ':hospital:',
+            "\xee\x85\x95"                                                                                                 => ':hospital:',
+            "\xee\x97\x9f"                                                                                                 => ':hospital:',
+            "\xf0\x9f\x8f\xa6"                                                                                             => ':bank:',
+            "\xf3\xbe\x92\xb5"                                                                                             => ':bank:',
+            "\xee\x99\xa7"                                                                                                 => ':bank:',
+            "\xee\x85\x8d"                                                                                                 => ':bank:',
+            "\xee\x92\xaa"                                                                                                 => ':bank:',
+            "\xf0\x9f\x8f\xa7"                                                                                             => ':atm:',
+            "\xf3\xbe\x92\xb6"                                                                                             => ':atm:',
+            "\xee\x99\xa8"                                                                                                 => ':atm:',
+            "\xee\x85\x94"                                                                                                 => ':atm:',
+            "\xee\x92\xa3"                                                                                                 => ':atm:',
+            "\xf0\x9f\x8f\xa8"                                                                                             => ':hotel:',
+            "\xf3\xbe\x92\xb7"                                                                                             => ':hotel:',
+            "\xee\x99\xa9"                                                                                                 => ':hotel:',
+            "\xee\x85\x98"                                                                                                 => ':hotel:',
+            "\xee\xaa\x81"                                                                                                 => ':hotel:',
+            "\xf0\x9f\x8f\xa9"                                                                                             => ':love_hotel:',
+            "\xf3\xbe\x92\xb8"                                                                                             => ':love_hotel:',
+            "\xee\x99\xa9\xee\x9b\xaf"                                                                                     => ':love_hotel:',
+            "\xee\x94\x81"                                                                                                 => ':man-woman-boy:',
+            "\xee\xab\xb3"                                                                                                 => ':love_hotel:',
+            "\xf0\x9f\x8f\xaa"                                                                                             => ':convenience_store:',
+            "\xf3\xbe\x92\xb9"                                                                                             => ':convenience_store:',
+            "\xee\x99\xaa"                                                                                                 => ':convenience_store:',
+            "\xee\x85\x96"                                                                                                 => ':convenience_store:',
+            "\xee\x92\xa4"                                                                                                 => ':convenience_store:',
+            "\xf0\x9f\x8f\xab"                                                                                             => ':school:',
+            "\xf3\xbe\x92\xba"                                                                                             => ':school:',
+            "\xee\x9c\xbe"                                                                                                 => ':school:',
+            "\xee\x85\x97"                                                                                                 => ':school:',
+            "\xee\xaa\x80"                                                                                                 => ':school:',
+            "\xf0\x9f\x8f\xac"                                                                                             => ':department_store:',
+            "\xf3\xbe\x92\xbd"                                                                                             => ':department_store:',
+            "\xee\x94\x84"                                                                                                 => ':purse:',
+            "\xee\xab\xb6"                                                                                                 => ':department_store:',
+            "\xf0\x9f\x8f\xad"                                                                                             => ':factory:',
+            "\xf3\xbe\x93\x80"                                                                                             => ':factory:',
+            "\xee\xab\xb9"                                                                                                 => ':factory:',
+            "\xf0\x9f\x8f\xae"                                                                                             => ':lantern:',
+            "\xf3\xbe\x93\x82"                                                                                             => ':lantern:',
+            "\xee\x92\xbd"                                                                                                 => ':lantern:',
+            "\xf0\x9f\x8f\xaf"                                                                                             => ':japanese_castle:',
+            "\xf3\xbe\x92\xbe"                                                                                             => ':japanese_castle:',
+            "\xee\xab\xb7"                                                                                                 => ':japanese_castle:',
+            "\xf0\x9f\x8f\xb0"                                                                                             => ':european_castle:',
+            "\xf3\xbe\x92\xbf"                                                                                             => ':european_castle:',
+            "\xee\xab\xb8"                                                                                                 => ':european_castle:',
+            "\xf0\x9f\x8f\xb3"                                                                                             => ':waving_white_flag:',
+            "\xf0\x9f\x8f\xb4"                                                                                             => ':waving_black_flag:',
+            "\xf0\x9f\x8f\xb5"                                                                                             => ':rosette:',
+            "\xf0\x9f\x8f\xb7"                                                                                             => ':label:',
+            "\xf0\x9f\x8f\xb8"                                                                                             => ':badminton_racquet_and_shuttlecock:',
+            "\xf0\x9f\x8f\xb9"                                                                                             => ':bow_and_arrow:',
+            "\xf0\x9f\x8f\xba"                                                                                             => ':amphora:',
+            "\xf0\x9f\x8f\xbb"                                                                                             => ':skin-tone-2:',
+            "\xf0\x9f\x8f\xbc"                                                                                             => ':skin-tone-3:',
+            "\xf0\x9f\x8f\xbd"                                                                                             => ':skin-tone-4:',
+            "\xf0\x9f\x8f\xbe"                                                                                             => ':skin-tone-5:',
+            "\xf0\x9f\x8f\xbf"                                                                                             => ':skin-tone-6:',
+            "\xf0\x9f\x90\x80"                                                                                             => ':rat:',
+            "\xf0\x9f\x90\x81"                                                                                             => ':mouse2:',
+            "\xf0\x9f\x90\x82"                                                                                             => ':ox:',
+            "\xf0\x9f\x90\x83"                                                                                             => ':water_buffalo:',
+            "\xf0\x9f\x90\x84"                                                                                             => ':cow2:',
+            "\xf0\x9f\x90\x85"                                                                                             => ':tiger2:',
+            "\xf0\x9f\x90\x86"                                                                                             => ':leopard:',
+            "\xf0\x9f\x90\x87"                                                                                             => ':rabbit2:',
+            "\xf0\x9f\x90\x88"                                                                                             => ':cat2:',
+            "\xf0\x9f\x90\x89"                                                                                             => ':dragon:',
+            "\xf0\x9f\x90\x8a"                                                                                             => ':crocodile:',
+            "\xf0\x9f\x90\x8b"                                                                                             => ':whale2:',
+            "\xf0\x9f\x90\x8c"                                                                                             => ':snail:',
+            "\xf3\xbe\x86\xb9"                                                                                             => ':snail:',
+            "\xee\x9d\x8e"                                                                                                 => ':snail:',
+            "\xee\xad\xbe"                                                                                                 => ':snail:',
+            "\xf0\x9f\x90\x8d"                                                                                             => ':snake:',
+            "\xf3\xbe\x87\x93"                                                                                             => ':snake:',
+            "\xee\xac\xa2"                                                                                                 => ':snake:',
+            "\xf0\x9f\x90\x8e"                                                                                             => ':racehorse:',
+            "\xf3\xbe\x9f\x9c"                                                                                             => ':racehorse:',
+            "\xee\x9d\x94"                                                                                                 => ':horse:',
+            "\xee\x84\xb4"                                                                                                 => ':racehorse:',
+            "\xee\x93\x98"                                                                                                 => ':horse:',
+            "\xf0\x9f\x90\x8f"                                                                                             => ':ram:',
+            "\xf0\x9f\x90\x90"                                                                                             => ':goat:',
+            "\xf0\x9f\x90\x91"                                                                                             => ':sheep:',
+            "\xf3\xbe\x87\x8f"                                                                                             => ':sheep:',
+            "\xee\x94\xa9"                                                                                                 => ':eight:',
+            "\xf0\x9f\x90\x92"                                                                                             => ':monkey:',
+            "\xf3\xbe\x87\x8e"                                                                                             => ':monkey:',
+            "\xee\x94\xa8"                                                                                                 => ':seven:',
+            "\xee\x93\x99"                                                                                                 => ':monkey_face:',
+            "\xf0\x9f\x90\x93"                                                                                             => ':rooster:',
+            "\xf0\x9f\x90\x94"                                                                                             => ':chicken:',
+            "\xf3\xbe\x87\x94"                                                                                             => ':chicken:',
+            "\xee\xac\xa3"                                                                                                 => ':chicken:',
+            "\xf0\x9f\x90\x95"                                                                                             => ':dog2:',
+            "\xf0\x9f\x90\x96"                                                                                             => ':pig2:',
+            "\xf0\x9f\x90\x97"                                                                                             => ':boar:',
+            "\xf3\xbe\x87\x95"                                                                                             => ':boar:',
+            "\xee\xac\xa4"                                                                                                 => ':boar:',
+            "\xf0\x9f\x90\x98"                                                                                             => ':elephant:',
+            "\xf3\xbe\x87\x8c"                                                                                             => ':elephant:',
+            "\xee\x94\xa6"                                                                                                 => ':five:',
+            "\xee\xac\x9f"                                                                                                 => ':elephant:',
+            "\xf0\x9f\x90\x99"                                                                                             => ':octopus:',
+            "\xf3\xbe\x87\x85"                                                                                             => ':octopus:',
+            "\xee\x84\x8a"                                                                                                 => ':octopus:',
+            "\xee\x97\x87"                                                                                                 => ':octopus:',
+            "\xf0\x9f\x90\x9a"                                                                                             => ':shell:',
+            "\xf3\xbe\x87\x86"                                                                                             => ':shell:',
+            "\xee\x91\x81"                                                                                                 => ':shell:',
+            "\xee\xab\xac"                                                                                                 => ':shell:',
+            "\xf0\x9f\x90\x9b"                                                                                             => ':bug:',
+            "\xf3\xbe\x87\x8b"                                                                                             => ':bug:',
+            "\xee\x94\xa5"                                                                                                 => ':four:',
+            "\xee\xac\x9e"                                                                                                 => ':bug:',
+            "\xf0\x9f\x90\x9c"                                                                                             => ':ant:',
+            "\xf3\xbe\x87\x9a"                                                                                             => ':ant:',
+            "\xee\x93\x9d"                                                                                                 => ':ant:',
+            "\xf0\x9f\x90\x9d"                                                                                             => ':honeybee:',
+            "\xf3\xbe\x87\xa1"                                                                                             => ':honeybee:',
+            "\xee\xad\x97"                                                                                                 => ':honeybee:',
+            "\xf0\x9f\x90\x9e"                                                                                             => ':beetle:',
+            "\xf3\xbe\x87\xa2"                                                                                             => ':beetle:',
+            "\xee\xad\x98"                                                                                                 => ':beetle:',
+            "\xf0\x9f\x90\x9f"                                                                                             => ':fish:',
+            "\xf3\xbe\x86\xbd"                                                                                             => ':fish:',
+            "\xf0\x9f\x90\xa0"                                                                                             => ':tropical_fish:',
+            "\xf3\xbe\x87\x89"                                                                                             => ':tropical_fish:',
+            "\xee\x94\xa2"                                                                                                 => ':one:',
+            "\xee\xac\x9d"                                                                                                 => ':tropical_fish:',
+            "\xf0\x9f\x90\xa1"                                                                                             => ':blowfish:',
+            "\xf3\xbe\x87\x99"                                                                                             => ':blowfish:',
+            "\xee\x93\x93"                                                                                                 => ':blowfish:',
+            "\xf0\x9f\x90\xa2"                                                                                             => ':turtle:',
+            "\xf3\xbe\x87\x9c"                                                                                             => ':turtle:',
+            "\xee\x97\x94"                                                                                                 => ':turtle:',
+            "\xf0\x9f\x90\xa3"                                                                                             => ':hatching_chick:',
+            "\xf3\xbe\x87\x9d"                                                                                             => ':hatching_chick:',
+            "\xee\x9d\x8f"                                                                                                 => ':bird:',
+            "\xee\x94\xa3"                                                                                                 => ':two:',
+            "\xee\x97\x9b"                                                                                                 => ':hatching_chick:',
+            "\xf0\x9f\x90\xa4"                                                                                             => ':baby_chick:',
+            "\xf3\xbe\x86\xba"                                                                                             => ':baby_chick:',
+            "\xee\x93\xa0"                                                                                                 => ':bird:',
+            "\xf0\x9f\x90\xa5"                                                                                             => ':hatched_chick:',
+            "\xf3\xbe\x86\xbb"                                                                                             => ':hatched_chick:',
+            "\xee\xad\xb6"                                                                                                 => ':hatched_chick:',
+            "\xf0\x9f\x90\xa6"                                                                                             => ':bird:',
+            "\xf3\xbe\x87\x88"                                                                                             => ':bird:',
+            "\xf0\x9f\x90\xa7"                                                                                             => ':penguin:',
+            "\xf3\xbe\x86\xbc"                                                                                             => ':penguin:',
+            "\xee\x9d\x90"                                                                                                 => ':penguin:',
+            "\xee\x81\x95"                                                                                                 => ':penguin:',
+            "\xee\x93\x9c"                                                                                                 => ':penguin:',
+            "\xf0\x9f\x90\xa8"                                                                                             => ':koala:',
+            "\xf3\xbe\x87\x8d"                                                                                             => ':koala:',
+            "\xee\x94\xa7"                                                                                                 => ':six:',
+            "\xee\xac\xa0"                                                                                                 => ':koala:',
+            "\xf0\x9f\x90\xa9"                                                                                             => ':poodle:',
+            "\xf3\xbe\x87\x98"                                                                                             => ':poodle:',
+            "\xee\x9a\xa1"                                                                                                 => ':wolf:',
+            "\xee\x81\x92"                                                                                                 => ':dog:',
+            "\xee\x93\x9f"                                                                                                 => ':poodle:',
+            "\xf0\x9f\x90\xaa"                                                                                             => ':dromedary_camel:',
+            "\xf0\x9f\x90\xab"                                                                                             => ':camel:',
+            "\xf3\xbe\x87\x96"                                                                                             => ':camel:',
+            "\xee\xac\xa5"                                                                                                 => ':camel:',
+            "\xf0\x9f\x90\xac"                                                                                             => ':flipper:',
+            "\xf3\xbe\x87\x87"                                                                                             => ':flipper:',
+            "\xee\x94\xa0"                                                                                                 => ':fax:',
+            "\xee\xac\x9b"                                                                                                 => ':flipper:',
+            "\xf0\x9f\x90\xad"                                                                                             => ':mouse:',
+            "\xf3\xbe\x87\x82"                                                                                             => ':mouse:',
+            "\xee\x81\x93"                                                                                                 => ':mouse:',
+            "\xee\x97\x82"                                                                                                 => ':mouse:',
+            "\xf0\x9f\x90\xae"                                                                                             => ':cow:',
+            "\xf3\xbe\x87\x91"                                                                                             => ':cow:',
+            "\xee\x94\xab"                                                                                                 => ':keycap_ten:',
+            "\xee\xac\xa1"                                                                                                 => ':cow:',
+            "\xf0\x9f\x90\xaf"                                                                                             => ':tiger:',
+            "\xf3\xbe\x87\x80"                                                                                             => ':tiger:',
+            "\xee\x81\x90"                                                                                                 => ':tiger:',
+            "\xee\x97\x80"                                                                                                 => ':tiger:',
+            "\xf0\x9f\x90\xb0"                                                                                             => ':rabbit:',
+            "\xf3\xbe\x87\x92"                                                                                             => ':rabbit:',
+            "\xee\x94\xac"                                                                                                 => ':rabbit:',
+            "\xee\x93\x97"                                                                                                 => ':rabbit:',
+            "\xf0\x9f\x90\xb1"                                                                                             => ':cat:',
+            "\xf3\xbe\x86\xb8"                                                                                             => ':cat:',
+            "\xee\x9a\xa2"                                                                                                 => ':cat:',
+            "\xee\x81\x8f"                                                                                                 => ':cat:',
+            "\xee\x93\x9b"                                                                                                 => ':cat:',
+            "\xf0\x9f\x90\xb2"                                                                                             => ':dragon_face:',
+            "\xf3\xbe\x87\x9e"                                                                                             => ':dragon_face:',
+            "\xee\xac\xbf"                                                                                                 => ':dragon_face:',
+            "\xf0\x9f\x90\xb3"                                                                                             => ':whale:',
+            "\xf3\xbe\x87\x83"                                                                                             => ':whale:',
+            "\xee\x81\x94"                                                                                                 => ':whale:',
+            "\xee\x91\xb0"                                                                                                 => ':whale:',
+            "\xf0\x9f\x90\xb4"                                                                                             => ':horse:',
+            "\xf3\xbe\x86\xbe"                                                                                             => ':horse:',
+            "\xee\x80\x9a"                                                                                                 => ':horse:',
+            "\xf0\x9f\x90\xb5"                                                                                             => ':monkey_face:',
+            "\xf3\xbe\x87\x84"                                                                                             => ':monkey_face:',
+            "\xee\x84\x89"                                                                                                 => ':monkey_face:',
+            "\xf0\x9f\x90\xb6"                                                                                             => ':dog:',
+            "\xf3\xbe\x86\xb7"                                                                                             => ':dog:',
+            "\xee\x93\xa1"                                                                                                 => ':wolf:',
+            "\xf0\x9f\x90\xb7"                                                                                             => ':pig:',
+            "\xf3\xbe\x86\xbf"                                                                                             => ':pig:',
+            "\xee\x9d\x95"                                                                                                 => ':pig_nose:',
+            "\xee\x84\x8b"                                                                                                 => ':pig_nose:',
+            "\xee\x93\x9e"                                                                                                 => ':pig:',
+            "\xf0\x9f\x90\xb8"                                                                                             => ':frog:',
+            "\xf3\xbe\x87\x97"                                                                                             => ':frog:',
+            "\xee\x93\x9a"                                                                                                 => ':frog:',
+            "\xf0\x9f\x90\xb9"                                                                                             => ':hamster:',
+            "\xf3\xbe\x87\x8a"                                                                                             => ':hamster:',
+            "\xee\x94\xa4"                                                                                                 => ':three:',
+            "\xf0\x9f\x90\xba"                                                                                             => ':wolf:',
+            "\xf3\xbe\x87\x90"                                                                                             => ':wolf:',
+            "\xee\x94\xaa"                                                                                                 => ':nine:',
+            "\xf0\x9f\x90\xbb"                                                                                             => ':bear:',
+            "\xf3\xbe\x87\x81"                                                                                             => ':bear:',
+            "\xee\x81\x91"                                                                                                 => ':bear:',
+            "\xee\x97\x81"                                                                                                 => ':bear:',
+            "\xf0\x9f\x90\xbc"                                                                                             => ':panda_face:',
+            "\xf3\xbe\x87\x9f"                                                                                             => ':panda_face:',
+            "\xee\xad\x86"                                                                                                 => ':panda_face:',
+            "\xf0\x9f\x90\xbd"                                                                                             => ':pig_nose:',
+            "\xf3\xbe\x87\xa0"                                                                                             => ':pig_nose:',
+            "\xee\xad\x88"                                                                                                 => ':pig_nose:',
+            "\xf0\x9f\x90\xbe"                                                                                             => ':paw_prints:',
+            "\xf3\xbe\x87\x9b"                                                                                             => ':paw_prints:',
+            "\xee\x9a\x98"                                                                                                 => ':footprints:',
+            "\xee\x94\xb6"                                                                                                 => ':small_orange_diamond:',
+            "\xee\x93\xae"                                                                                                 => ':paw_prints:',
+            "\xf0\x9f\x90\xbf"                                                                                             => ':chipmunk:',
+            "\xf0\x9f\x91\x80"                                                                                             => ':eyes:',
+            "\xf3\xbe\x86\x90"                                                                                             => ':eyes:',
+            "\xee\x9a\x91"                                                                                                 => ':eyes:',
+            "\xee\x90\x99"                                                                                                 => ':eyes:',
+            "\xee\x96\xa4"                                                                                                 => ':eyes:',
+            "\xf0\x9f\x91\x81"                                                                                             => ':eye:',
+            "\xf0\x9f\x91\x82"                                                                                             => ':ear:',
+            "\xf3\xbe\x86\x91"                                                                                             => ':ear:',
+            "\xee\x9a\x92"                                                                                                 => ':ear:',
+            "\xee\x90\x9b"                                                                                                 => ':ear:',
+            "\xee\x96\xa5"                                                                                                 => ':ear:',
+            "\xf0\x9f\x91\x83"                                                                                             => ':nose:',
+            "\xf3\xbe\x86\x92"                                                                                             => ':nose:',
+            "\xee\x90\x9a"                                                                                                 => ':nose:',
+            "\xee\xab\x90"                                                                                                 => ':nose:',
+            "\xf0\x9f\x91\x84"                                                                                             => ':lips:',
+            "\xf3\xbe\x86\x93"                                                                                             => ':lips:',
+            "\xee\x9b\xb9"                                                                                                 => ':couplekiss:',
+            "\xee\x90\x9c"                                                                                                 => ':lips:',
+            "\xee\xab\x91"                                                                                                 => ':lips:',
+            "\xf0\x9f\x91\x85"                                                                                             => ':tongue:',
+            "\xf3\xbe\x86\x94"                                                                                             => ':tongue:',
+            "\xee\x9c\xa8"                                                                                                 => ':stuck_out_tongue_closed_eyes:',
+            "\xee\x90\x89"                                                                                                 => ':stuck_out_tongue_closed_eyes:',
+            "\xee\xad\x87"                                                                                                 => ':tongue:',
+            "\xf0\x9f\x91\x86"                                                                                             => ':point_up_2:',
+            "\xf3\xbe\xae\x99"                                                                                             => ':point_up_2:',
+            "\xee\x88\xae"                                                                                                 => ':point_up_2:',
+            "\xee\xaa\x8d"                                                                                                 => ':point_up_2:',
+            "\xf0\x9f\x91\x87"                                                                                             => ':point_down:',
+            "\xf3\xbe\xae\x9a"                                                                                             => ':point_down:',
+            "\xee\x88\xaf"                                                                                                 => ':point_down:',
+            "\xee\xaa\x8e"                                                                                                 => ':point_down:',
+            "\xf0\x9f\x91\x88"                                                                                             => ':point_left:',
+            "\xf3\xbe\xae\x9b"                                                                                             => ':point_left:',
+            "\xee\x88\xb0"                                                                                                 => ':point_left:',
+            "\xee\x93\xbf"                                                                                                 => ':point_left:',
+            "\xf0\x9f\x91\x89"                                                                                             => ':point_right:',
+            "\xf3\xbe\xae\x9c"                                                                                             => ':point_right:',
+            "\xee\x88\xb1"                                                                                                 => ':point_right:',
+            "\xee\x94\x80"                                                                                                 => ':point_right:',
+            "\xf0\x9f\x91\x8a"                                                                                             => ':punch:',
+            "\xf3\xbe\xae\x96"                                                                                             => ':punch:',
+            "\xee\x9b\xbd"                                                                                                 => ':punch:',
+            "\xee\x80\x8d"                                                                                                 => ':punch:',
+            "\xee\x93\xb3"                                                                                                 => ':punch:',
+            "\xf0\x9f\x91\x8b"                                                                                             => ':wave:',
+            "\xf3\xbe\xae\x9d"                                                                                             => ':wave:',
+            "\xee\x90\x9e"                                                                                                 => ':wave:',
+            "\xee\xab\x96"                                                                                                 => ':open_hands:',
+            "\xf0\x9f\x91\x8c"                                                                                             => ':ok_hand:',
+            "\xf3\xbe\xae\x9f"                                                                                             => ':ok_hand:',
+            "\xee\x90\xa0"                                                                                                 => ':ok_hand:',
+            "\xee\xab\x94"                                                                                                 => ':ok_hand:',
+            "\xf0\x9f\x91\x8d"                                                                                             => ':thumbsup:',
+            "\xf3\xbe\xae\x97"                                                                                             => ':thumbsup:',
+            "\xee\x9c\xa7"                                                                                                 => ':thumbsup:',
+            "\xee\x80\x8e"                                                                                                 => ':thumbsup:',
+            "\xee\x93\xb9"                                                                                                 => ':thumbsup:',
+            "\xf0\x9f\x91\x8e"                                                                                             => ':thumbsdown:',
+            "\xf3\xbe\xae\xa0"                                                                                             => ':thumbsdown:',
+            "\xee\x90\xa1"                                                                                                 => ':thumbsdown:',
+            "\xee\xab\x95"                                                                                                 => ':thumbsdown:',
+            "\xf0\x9f\x91\x8f"                                                                                             => ':clap:',
+            "\xf3\xbe\xae\x9e"                                                                                             => ':clap:',
+            "\xee\x90\x9f"                                                                                                 => ':clap:',
+            "\xee\xab\x93"                                                                                                 => ':clap:',
+            "\xf0\x9f\x91\x90"                                                                                             => ':open_hands:',
+            "\xf3\xbe\xae\xa1"                                                                                             => ':open_hands:',
+            "\xee\x90\xa2"                                                                                                 => ':open_hands:',
+            "\xf0\x9f\x91\x91"                                                                                             => ':crown:',
+            "\xf3\xbe\x93\x91"                                                                                             => ':crown:',
+            "\xee\x9c\x9a"                                                                                                 => ':trident:',
+            "\xee\x84\x8e"                                                                                                 => ':crown:',
+            "\xee\x97\x89"                                                                                                 => ':trident:',
+            "\xf0\x9f\x91\x92"                                                                                             => ':womans_hat:',
+            "\xf3\xbe\x93\x94"                                                                                             => ':womans_hat:',
+            "\xee\x8c\x98"                                                                                                 => ':womans_hat:',
+            "\xee\xaa\x9e"                                                                                                 => ':womans_hat:',
+            "\xf0\x9f\x91\x93"                                                                                             => ':eyeglasses:',
+            "\xf3\xbe\x93\x8e"                                                                                             => ':eyeglasses:',
+            "\xee\x9a\x9a"                                                                                                 => ':eyeglasses:',
+            "\xee\x93\xbe"                                                                                                 => ':eyeglasses:',
+            "\xf0\x9f\x91\x94"                                                                                             => ':necktie:',
+            "\xf3\xbe\x93\x93"                                                                                             => ':necktie:',
+            "\xee\x8c\x82"                                                                                                 => ':necktie:',
+            "\xee\xaa\x93"                                                                                                 => ':necktie:',
+            "\xf0\x9f\x91\x95"                                                                                             => ':tshirt:',
+            "\xf3\xbe\x93\x8f"                                                                                             => ':tshirt:',
+            "\xee\x9c\x8e"                                                                                                 => ':womans_clothes:',
+            "\xee\x80\x86"                                                                                                 => ':womans_clothes:',
+            "\xee\x96\xb6"                                                                                                 => ':tshirt:',
+            "\xf0\x9f\x91\x96"                                                                                             => ':jeans:',
+            "\xf3\xbe\x93\x90"                                                                                             => ':jeans:',
+            "\xee\x9c\x91"                                                                                                 => ':jeans:',
+            "\xee\xad\xb7"                                                                                                 => ':jeans:',
+            "\xf0\x9f\x91\x97"                                                                                             => ':dress:',
+            "\xf3\xbe\x93\x95"                                                                                             => ':dress:',
+            "\xee\x8c\x99"                                                                                                 => ':dress:',
+            "\xee\xad\xab"                                                                                                 => ':dress:',
+            "\xf0\x9f\x91\x98"                                                                                             => ':kimono:',
+            "\xf3\xbe\x93\x99"                                                                                             => ':kimono:',
+            "\xee\x8c\xa1"                                                                                                 => ':kimono:',
+            "\xee\xaa\xa3"                                                                                                 => ':kimono:',
+            "\xf0\x9f\x91\x99"                                                                                             => ':bikini:',
+            "\xf3\xbe\x93\x9a"                                                                                             => ':bikini:',
+            "\xee\x8c\xa2"                                                                                                 => ':bikini:',
+            "\xee\xaa\xa4"                                                                                                 => ':bikini:',
+            "\xf0\x9f\x91\x9a"                                                                                             => ':womans_clothes:',
+            "\xf3\xbe\x93\x9b"                                                                                             => ':womans_clothes:',
+            "\xee\x94\x8d"                                                                                                 => ':fr:',
+            "\xf0\x9f\x91\x9b"                                                                                             => ':purse:',
+            "\xf3\xbe\x93\x9c"                                                                                             => ':purse:',
+            "\xee\x9c\x8f"                                                                                                 => ':purse:',
+            "\xf0\x9f\x91\x9c"                                                                                             => ':handbag:',
+            "\xf3\xbe\x93\xb0"                                                                                             => ':handbag:',
+            "\xee\x9a\x82"                                                                                                 => ':briefcase:',
+            "\xee\x8c\xa3"                                                                                                 => ':handbag:',
+            "\xee\x92\x9c"                                                                                                 => ':handbag:',
+            "\xf0\x9f\x91\x9d"                                                                                             => ':pouch:',
+            "\xf3\xbe\x93\xb1"                                                                                             => ':pouch:',
+            "\xee\x9a\xad"                                                                                                 => ':pouch:',
+            "\xf0\x9f\x91\x9e"                                                                                             => ':shoe:',
+            "\xf3\xbe\x93\x8c"                                                                                             => ':shoe:',
+            "\xee\x9a\x99"                                                                                                 => ':athletic_shoe:',
+            "\xee\x80\x87"                                                                                                 => ':athletic_shoe:',
+            "\xee\x96\xb7"                                                                                                 => ':shoe:',
+            "\xf0\x9f\x91\x9f"                                                                                             => ':athletic_shoe:',
+            "\xf3\xbe\x93\x8d"                                                                                             => ':athletic_shoe:',
+            "\xee\xac\xab"                                                                                                 => ':athletic_shoe:',
+            "\xf0\x9f\x91\xa0"                                                                                             => ':high_heel:',
+            "\xf3\xbe\x93\x96"                                                                                             => ':high_heel:',
+            "\xee\x99\xb4"                                                                                                 => ':sandal:',
+            "\xee\x84\xbe"                                                                                                 => ':high_heel:',
+            "\xee\x94\x9a"                                                                                                 => ':baby:',
+            "\xf0\x9f\x91\xa1"                                                                                             => ':sandal:',
+            "\xf3\xbe\x93\x97"                                                                                             => ':sandal:',
+            "\xee\x8c\x9a"                                                                                                 => ':sandal:',
+            "\xf0\x9f\x91\xa2"                                                                                             => ':boot:',
+            "\xf3\xbe\x93\x98"                                                                                             => ':boot:',
+            "\xee\x8c\x9b"                                                                                                 => ':boot:',
+            "\xee\xaa\x9f"                                                                                                 => ':boot:',
+            "\xf0\x9f\x91\xa3"                                                                                             => ':footprints:',
+            "\xf3\xbe\x95\x93"                                                                                             => ':footprints:',
+            "\xee\xac\xaa"                                                                                                 => ':footprints:',
+            "\xf0\x9f\x91\xa4"                                                                                             => ':bust_in_silhouette:',
+            "\xf3\xbe\x86\x9a"                                                                                             => ':bust_in_silhouette:',
+            "\xee\x9a\xb1"                                                                                                 => ':bust_in_silhouette:',
+            "\xf0\x9f\x91\xa5"                                                                                             => ':busts_in_silhouette:',
+            "\xf0\x9f\x91\xa6"                                                                                             => ':boy:',
+            "\xf3\xbe\x86\x9b"                                                                                             => ':boy:',
+            "\xee\x80\x81"                                                                                                 => ':boy:',
+            "\xee\x93\xbc"                                                                                                 => ':man:',
+            "\xf0\x9f\x91\xa7"                                                                                             => ':girl:',
+            "\xf3\xbe\x86\x9c"                                                                                             => ':girl:',
+            "\xee\x80\x82"                                                                                                 => ':girl:',
+            "\xee\x93\xba"                                                                                                 => ':woman:',
+            "\xf0\x9f\x91\xa8"                                                                                             => ':man:',
+            "\xf3\xbe\x86\x9d"                                                                                             => ':man:',
+            "\xee\x80\x84"                                                                                                 => ':man:',
+            "\xf0\x9f\x91\xa9"                                                                                             => ':woman:',
+            "\xf3\xbe\x86\x9e"                                                                                             => ':woman:',
+            "\xee\x80\x85"                                                                                                 => ':woman:',
+            "\xf0\x9f\x91\xaa"                                                                                             => ':man-woman-boy:',
+            "\xf3\xbe\x86\x9f"                                                                                             => ':man-woman-boy:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"                                     => ':man-woman-boy:',
+            "\xf0\x9f\x91\xab"                                                                                             => ':man_and_woman_holding_hands:',
+            "\xf3\xbe\x86\xa0"                                                                                             => ':man_and_woman_holding_hands:',
+            "\xee\x90\xa8"                                                                                                 => ':man_and_woman_holding_hands:',
+            "\xf0\x9f\x91\xac"                                                                                             => ':two_men_holding_hands:',
+            "\xf0\x9f\x91\xad"                                                                                             => ':two_women_holding_hands:',
+            "\xf0\x9f\x91\xae"                                                                                             => ':cop:',
+            "\xf3\xbe\x86\xa1"                                                                                             => ':cop:',
+            "\xee\x85\x92"                                                                                                 => ':cop:',
+            "\xee\x97\x9d"                                                                                                 => ':cop:',
+            "\xf0\x9f\x91\xaf"                                                                                             => ':dancers:',
+            "\xf3\xbe\x86\xa2"                                                                                             => ':dancers:',
+            "\xee\x90\xa9"                                                                                                 => ':dancers:',
+            "\xee\xab\x9b"                                                                                                 => ':dancers:',
+            "\xf0\x9f\x91\xb0"                                                                                             => ':bride_with_veil:',
+            "\xf3\xbe\x86\xa3"                                                                                             => ':bride_with_veil:',
+            "\xee\xab\xa9"                                                                                                 => ':bride_with_veil:',
+            "\xf0\x9f\x91\xb1"                                                                                             => ':person_with_blond_hair:',
+            "\xf3\xbe\x86\xa4"                                                                                             => ':person_with_blond_hair:',
+            "\xee\x94\x95"                                                                                                 => ':camera:',
+            "\xee\xac\x93"                                                                                                 => ':person_with_blond_hair:',
+            "\xf0\x9f\x91\xb2"                                                                                             => ':man_with_gua_pi_mao:',
+            "\xf3\xbe\x86\xa5"                                                                                             => ':man_with_gua_pi_mao:',
+            "\xee\xac\x94"                                                                                                 => ':man_with_gua_pi_mao:',
+            "\xf0\x9f\x91\xb3"                                                                                             => ':man_with_turban:',
+            "\xf3\xbe\x86\xa6"                                                                                             => ':man_with_turban:',
+            "\xee\xac\x95"                                                                                                 => ':man_with_turban:',
+            "\xf0\x9f\x91\xb4"                                                                                             => ':older_man:',
+            "\xf3\xbe\x86\xa7"                                                                                             => ':older_man:',
+            "\xee\x94\x98"                                                                                                 => ':mag:',
+            "\xee\xac\x96"                                                                                                 => ':older_man:',
+            "\xf0\x9f\x91\xb5"                                                                                             => ':older_woman:',
+            "\xf3\xbe\x86\xa8"                                                                                             => ':older_woman:',
+            "\xee\x94\x99"                                                                                                 => ':key:',
+            "\xee\xac\x97"                                                                                                 => ':older_woman:',
+            "\xf0\x9f\x91\xb6"                                                                                             => ':baby:',
+            "\xf3\xbe\x86\xa9"                                                                                             => ':baby:',
+            "\xee\xac\x98"                                                                                                 => ':baby_symbol:',
+            "\xf0\x9f\x91\xb7"                                                                                             => ':construction_worker:',
+            "\xf3\xbe\x86\xaa"                                                                                             => ':construction_worker:',
+            "\xee\x94\x9b"                                                                                                 => ':postbox:',
+            "\xee\xac\x99"                                                                                                 => ':construction_worker:',
+            "\xf0\x9f\x91\xb8"                                                                                             => ':princess:',
+            "\xf3\xbe\x86\xab"                                                                                             => ':princess:',
+            "\xee\x94\x9c"                                                                                                 => ':unlock:',
+            "\xee\xac\x9a"                                                                                                 => ':princess:',
+            "\xf0\x9f\x91\xb9"                                                                                             => ':japanese_ogre:',
+            "\xf3\xbe\x86\xac"                                                                                             => ':japanese_ogre:',
+            "\xee\xad\x84"                                                                                                 => ':japanese_ogre:',
+            "\xf0\x9f\x91\xba"                                                                                             => ':japanese_goblin:',
+            "\xf3\xbe\x86\xad"                                                                                             => ':japanese_goblin:',
+            "\xee\xad\x85"                                                                                                 => ':japanese_goblin:',
+            "\xf0\x9f\x91\xbb"                                                                                             => ':ghost:',
+            "\xf3\xbe\x86\xae"                                                                                             => ':ghost:',
+            "\xee\x84\x9b"                                                                                                 => ':ghost:',
+            "\xee\x93\x8b"                                                                                                 => ':ghost:',
+            "\xf0\x9f\x91\xbc"                                                                                             => ':angel:',
+            "\xf3\xbe\x86\xaf"                                                                                             => ':angel:',
+            "\xee\x81\x8e"                                                                                                 => ':angel:',
+            "\xee\x96\xbf"                                                                                                 => ':angel:',
+            "\xf0\x9f\x91\xbd"                                                                                             => ':alien:',
+            "\xf3\xbe\x86\xb0"                                                                                             => ':alien:',
+            "\xee\x84\x8c"                                                                                                 => ':alien:',
+            "\xee\x94\x8e"                                                                                                 => ':de:',
+            "\xf0\x9f\x91\xbe"                                                                                             => ':space_invader:',
+            "\xf3\xbe\x86\xb1"                                                                                             => ':space_invader:',
+            "\xee\x84\xab"                                                                                                 => ':space_invader:',
+            "\xee\x93\xac"                                                                                                 => ':space_invader:',
+            "\xf0\x9f\x91\xbf"                                                                                             => ':imp:',
+            "\xf3\xbe\x86\xb2"                                                                                             => ':imp:',
+            "\xee\x84\x9a"                                                                                                 => ':imp:',
+            "\xee\x93\xaf"                                                                                                 => ':imp:',
+            "\xf0\x9f\x92\x80"                                                                                             => ':skull:',
+            "\xf3\xbe\x86\xb3"                                                                                             => ':skull:',
+            "\xee\x84\x9c"                                                                                                 => ':skull:',
+            "\xee\x93\xb8"                                                                                                 => ':skull:',
+            "\xf0\x9f\x92\x81"                                                                                             => ':information_desk_person:',
+            "\xf3\xbe\x86\xb4"                                                                                             => ':information_desk_person:',
+            "\xee\x89\x93"                                                                                                 => ':information_desk_person:',
+            "\xf0\x9f\x92\x82"                                                                                             => ':guardsman:',
+            "\xf3\xbe\x86\xb5"                                                                                             => ':guardsman:',
+            "\xee\x94\x9e"                                                                                                 => ':telephone_receiver:',
+            "\xf0\x9f\x92\x83"                                                                                             => ':dancer:',
+            "\xf3\xbe\x86\xb6"                                                                                             => ':dancer:',
+            "\xee\x94\x9f"                                                                                                 => ':package:',
+            "\xee\xac\x9c"                                                                                                 => ':dancer:',
+            "\xf0\x9f\x92\x84"                                                                                             => ':lipstick:',
+            "\xf3\xbe\x86\x95"                                                                                             => ':lipstick:',
+            "\xee\x9c\x90"                                                                                                 => ':lipstick:',
+            "\xee\x8c\x9c"                                                                                                 => ':lipstick:',
+            "\xee\x94\x89"                                                                                                 => ':tokyo_tower:',
+            "\xf0\x9f\x92\x85"                                                                                             => ':nail_care:',
+            "\xf3\xbe\x86\x96"                                                                                             => ':nail_care:',
+            "\xee\x8c\x9d"                                                                                                 => ':nail_care:',
+            "\xee\xaa\xa0"                                                                                                 => ':nail_care:',
+            "\xf0\x9f\x92\x86"                                                                                             => ':massage:',
+            "\xf3\xbe\x86\x97"                                                                                             => ':massage:',
+            "\xee\x8c\x9e"                                                                                                 => ':massage:',
+            "\xee\x94\x8b"                                                                                                 => ':jp:',
+            "\xf0\x9f\x92\x87"                                                                                             => ':haircut:',
+            "\xf3\xbe\x86\x98"                                                                                             => ':haircut:',
+            "\xee\x8c\x9f"                                                                                                 => ':haircut:',
+            "\xee\xaa\xa1"                                                                                                 => ':haircut:',
+            "\xf0\x9f\x92\x88"                                                                                             => ':barber:',
+            "\xf3\xbe\x86\x99"                                                                                             => ':barber:',
+            "\xee\x8c\xa0"                                                                                                 => ':barber:',
+            "\xee\xaa\xa2"                                                                                                 => ':barber:',
+            "\xf0\x9f\x92\x89"                                                                                             => ':syringe:',
+            "\xf3\xbe\x94\x89"                                                                                             => ':syringe:',
+            "\xee\x84\xbb"                                                                                                 => ':syringe:',
+            "\xee\x94\x90"                                                                                                 => ':uk:',
+            "\xf0\x9f\x92\x8a"                                                                                             => ':pill:',
+            "\xf3\xbe\x94\x8a"                                                                                             => ':pill:',
+            "\xee\x8c\x8f"                                                                                                 => ':pill:',
+            "\xee\xaa\x9a"                                                                                                 => ':pill:',
+            "\xf0\x9f\x92\x8b"                                                                                             => ':kiss:',
+            "\xf3\xbe\xa0\xa3"                                                                                             => ':kiss:',
+            "\xee\x80\x83"                                                                                                 => ':kiss:',
+            "\xee\x93\xab"                                                                                                 => ':kiss:',
+            "\xf0\x9f\x92\x8c"                                                                                             => ':love_letter:',
+            "\xf3\xbe\xa0\xa4"                                                                                             => ':love_letter:',
+            "\xee\x9c\x97"                                                                                                 => ':love_letter:',
+            "\xee\x84\x83\xee\x8c\xa8"                                                                                     => ':love_letter:',
+            "\xee\xad\xb8"                                                                                                 => ':love_letter:',
+            "\xf0\x9f\x92\x8d"                                                                                             => ':ring:',
+            "\xf3\xbe\xa0\xa5"                                                                                             => ':ring:',
+            "\xee\x9c\x9b"                                                                                                 => ':gem:',
+            "\xee\x80\xb4"                                                                                                 => ':ring:',
+            "\xee\x94\x94"                                                                                                 => ':kr:',
+            "\xf0\x9f\x92\x8e"                                                                                             => ':gem:',
+            "\xf3\xbe\xa0\xa6"                                                                                             => ':gem:',
+            "\xee\x80\xb5"                                                                                                 => ':gem:',
+            "\xf0\x9f\x92\x8f"                                                                                             => ':couplekiss:',
+            "\xf3\xbe\xa0\xa7"                                                                                             => ':couplekiss:',
+            "\xee\x84\x91"                                                                                                 => ':couplekiss:',
+            "\xee\x97\x8a"                                                                                                 => ':couplekiss:',
+            "\xf0\x9f\x92\x90"                                                                                             => ':bouquet:',
+            "\xf3\xbe\xa0\xa8"                                                                                             => ':bouquet:',
+            "\xee\x8c\x86"                                                                                                 => ':bouquet:',
+            "\xee\xaa\x95"                                                                                                 => ':bouquet:',
+            "\xf0\x9f\x92\x91"                                                                                             => ':couple_with_heart:',
+            "\xf3\xbe\xa0\xa9"                                                                                             => ':couple_with_heart:',
+            "\xee\x9b\xad"                                                                                                 => ':revolving_hearts:',
+            "\xee\x90\xa5"                                                                                                 => ':couple_with_heart:',
+            "\xee\xab\x9a"                                                                                                 => ':couple_with_heart:',
+            "\xf0\x9f\x92\x92"                                                                                             => ':wedding:',
+            "\xf3\xbe\xa0\xaa"                                                                                             => ':wedding:',
+            "\xee\x90\xbd"                                                                                                 => ':wedding:',
+            "\xf0\x9f\x92\x93"                                                                                             => ':heartbeat:',
+            "\xf3\xbe\xac\x8d"                                                                                             => ':heartbeat:',
+            "\xee\x8c\xa7"                                                                                                 => ':revolving_hearts:',
+            "\xee\xad\xb5"                                                                                                 => ':heartpulse:',
+            "\xf0\x9f\x92\x94"                                                                                             => ':broken_heart:',
+            "\xf3\xbe\xac\x8e"                                                                                             => ':broken_heart:',
+            "\xee\x9b\xae"                                                                                                 => ':broken_heart:',
+            "\xee\x80\xa3"                                                                                                 => ':broken_heart:',
+            "\xee\x91\xb7"                                                                                                 => ':broken_heart:',
+            "\xf0\x9f\x92\x95"                                                                                             => ':two_hearts:',
+            "\xf3\xbe\xac\x8f"                                                                                             => ':two_hearts:',
+            "\xee\x9b\xaf"                                                                                                 => ':two_hearts:',
+            "\xee\x91\xb8"                                                                                                 => ':two_hearts:',
+            "\xf0\x9f\x92\x96"                                                                                             => ':sparkling_heart:',
+            "\xf3\xbe\xac\x90"                                                                                             => ':sparkling_heart:',
+            "\xee\xaa\xa6"                                                                                                 => ':sparkling_heart:',
+            "\xf0\x9f\x92\x97"                                                                                             => ':heartpulse:',
+            "\xf3\xbe\xac\x91"                                                                                             => ':heartpulse:',
+            "\xee\x8c\xa8"                                                                                                 => ':heartpulse:',
+            "\xf0\x9f\x92\x98"                                                                                             => ':cupid:',
+            "\xf3\xbe\xac\x92"                                                                                             => ':cupid:',
+            "\xee\x8c\xa9"                                                                                                 => ':cupid:',
+            "\xee\x93\xaa"                                                                                                 => ':cupid:',
+            "\xf0\x9f\x92\x99"                                                                                             => ':blue_heart:',
+            "\xf3\xbe\xac\x93"                                                                                             => ':blue_heart:',
+            "\xee\x8c\xaa"                                                                                                 => ':blue_heart:',
+            "\xee\xaa\xa7"                                                                                                 => ':blue_heart:',
+            "\xf0\x9f\x92\x9a"                                                                                             => ':green_heart:',
+            "\xf3\xbe\xac\x94"                                                                                             => ':green_heart:',
+            "\xee\x8c\xab"                                                                                                 => ':green_heart:',
+            "\xee\xaa\xa8"                                                                                                 => ':green_heart:',
+            "\xf0\x9f\x92\x9b"                                                                                             => ':yellow_heart:',
+            "\xf3\xbe\xac\x95"                                                                                             => ':yellow_heart:',
+            "\xee\x8c\xac"                                                                                                 => ':yellow_heart:',
+            "\xee\xaa\xa9"                                                                                                 => ':yellow_heart:',
+            "\xf0\x9f\x92\x9c"                                                                                             => ':purple_heart:',
+            "\xf3\xbe\xac\x96"                                                                                             => ':purple_heart:',
+            "\xee\x8c\xad"                                                                                                 => ':purple_heart:',
+            "\xee\xaa\xaa"                                                                                                 => ':purple_heart:',
+            "\xf0\x9f\x92\x9d"                                                                                             => ':gift_heart:',
+            "\xf3\xbe\xac\x97"                                                                                             => ':gift_heart:',
+            "\xee\x90\xb7"                                                                                                 => ':gift_heart:',
+            "\xee\xad\x94"                                                                                                 => ':gift_heart:',
+            "\xf0\x9f\x92\x9e"                                                                                             => ':revolving_hearts:',
+            "\xf3\xbe\xac\x98"                                                                                             => ':revolving_hearts:',
+            "\xee\x96\xaf"                                                                                                 => ':revolving_hearts:',
+            "\xf0\x9f\x92\x9f"                                                                                             => ':heart_decoration:',
+            "\xf3\xbe\xac\x99"                                                                                             => ':heart_decoration:',
+            "\xee\x88\x84"                                                                                                 => ':heart_decoration:',
+            "\xf0\x9f\x92\xa0"                                                                                             => ':diamond_shape_with_a_dot_inside:',
+            "\xf3\xbe\xad\x95"                                                                                             => ':diamond_shape_with_a_dot_inside:',
+            "\xf0\x9f\x92\xa1"                                                                                             => ':bulb:',
+            "\xf3\xbe\xad\x96"                                                                                             => ':bulb:',
+            "\xee\x9b\xbb"                                                                                                 => ':flashlight:',
+            "\xee\x84\x8f"                                                                                                 => ':bulb:',
+            "\xee\x91\xb6"                                                                                                 => ':bulb:',
+            "\xf0\x9f\x92\xa2"                                                                                             => ':anger:',
+            "\xf3\xbe\xad\x97"                                                                                             => ':anger:',
+            "\xee\x9b\xbc"                                                                                                 => ':anger:',
+            "\xee\x8c\xb4"                                                                                                 => ':anger:',
+            "\xee\x93\xa5"                                                                                                 => ':anger:',
+            "\xf0\x9f\x92\xa3"                                                                                             => ':bomb:',
+            "\xf3\xbe\xad\x98"                                                                                             => ':bomb:',
+            "\xee\x9b\xbe"                                                                                                 => ':bomb:',
+            "\xee\x8c\x91"                                                                                                 => ':bomb:',
+            "\xee\x91\xba"                                                                                                 => ':bomb:',
+            "\xf0\x9f\x92\xa4"                                                                                             => ':zzz:',
+            "\xf3\xbe\xad\x99"                                                                                             => ':zzz:',
+            "\xee\x9c\x81"                                                                                                 => ':sleepy:',
+            "\xee\x84\xbc"                                                                                                 => ':zzz:',
+            "\xee\x91\xb5"                                                                                                 => ':zzz:',
+            "\xf0\x9f\x92\xa5"                                                                                             => ':collision:',
+            "\xf3\xbe\xad\x9a"                                                                                             => ':collision:',
+            "\xee\x9c\x85"                                                                                                 => ':collision:',
+            "\xee\x96\xb0"                                                                                                 => ':collision:',
+            "\xf0\x9f\x92\xa6"                                                                                             => ':sweat_drops:',
+            "\xf3\xbe\xad\x9b"                                                                                             => ':sweat_drops:',
+            "\xee\x9c\x86"                                                                                                 => ':sweat_drops:',
+            "\xee\x8c\xb1"                                                                                                 => ':droplet:',
+            "\xee\x96\xb1"                                                                                                 => ':sweat_drops:',
+            "\xf0\x9f\x92\xa7"                                                                                             => ':droplet:',
+            "\xf3\xbe\xad\x9c"                                                                                             => ':droplet:',
+            "\xee\x9c\x87"                                                                                                 => ':droplet:',
+            "\xee\x93\xa6"                                                                                                 => ':droplet:',
+            "\xf0\x9f\x92\xa8"                                                                                             => ':dash:',
+            "\xf3\xbe\xad\x9d"                                                                                             => ':dash:',
+            "\xee\x9c\x88"                                                                                                 => ':dash:',
+            "\xee\x8c\xb0"                                                                                                 => ':dash:',
+            "\xee\x93\xb4"                                                                                                 => ':dash:',
+            "\xf0\x9f\x92\xa9"                                                                                             => ':shit:',
+            "\xf3\xbe\x93\xb4"                                                                                             => ':shit:',
+            "\xee\x81\x9a"                                                                                                 => ':shit:',
+            "\xee\x93\xb5"                                                                                                 => ':shit:',
+            "\xf0\x9f\x92\xaa"                                                                                             => ':muscle:',
+            "\xf3\xbe\xad\x9e"                                                                                             => ':muscle:',
+            "\xee\x85\x8c"                                                                                                 => ':muscle:',
+            "\xee\x93\xa9"                                                                                                 => ':muscle:',
+            "\xf0\x9f\x92\xab"                                                                                             => ':dizzy:',
+            "\xf3\xbe\xad\x9f"                                                                                             => ':dizzy:',
+            "\xee\x90\x87"                                                                                                 => ':confounded:',
+            "\xee\xad\x9c"                                                                                                 => ':dizzy:',
+            "\xf0\x9f\x92\xac"                                                                                             => ':speech_balloon:',
+            "\xf3\xbe\x94\xb2"                                                                                             => ':speech_balloon:',
+            "\xee\x93\xbd"                                                                                                 => ':speech_balloon:',
+            "\xf0\x9f\x92\xad"                                                                                             => ':thought_balloon:',
+            "\xf0\x9f\x92\xae"                                                                                             => ':white_flower:',
+            "\xf3\xbe\xad\xba"                                                                                             => ':white_flower:',
+            "\xee\x93\xb0"                                                                                                 => ':white_flower:',
+            "\xf0\x9f\x92\xaf"                                                                                             => ':100:',
+            "\xf3\xbe\xad\xbb"                                                                                             => ':100:',
+            "\xee\x93\xb2"                                                                                                 => ':100:',
+            "\xf0\x9f\x92\xb0"                                                                                             => ':moneybag:',
+            "\xf3\xbe\x93\x9d"                                                                                             => ':moneybag:',
+            "\xee\x9c\x95"                                                                                                 => ':dollar:',
+            "\xee\x84\xaf"                                                                                                 => ':dollar:',
+            "\xee\x93\x87"                                                                                                 => ':moneybag:',
+            "\xf0\x9f\x92\xb1"                                                                                             => ':currency_exchange:',
+            "\xf3\xbe\x93\x9e"                                                                                             => ':currency_exchange:',
+            "\xee\x85\x89"                                                                                                 => ':currency_exchange:',
+            "\xf0\x9f\x92\xb2"                                                                                             => ':heavy_dollar_sign:',
+            "\xf3\xbe\x93\xa0"                                                                                             => ':heavy_dollar_sign:',
+            "\xee\x95\xb9"                                                                                                 => ':heavy_dollar_sign:',
+            "\xf0\x9f\x92\xb3"                                                                                             => ':credit_card:',
+            "\xf3\xbe\x93\xa1"                                                                                             => ':credit_card:',
+            "\xee\x95\xbc"                                                                                                 => ':credit_card:',
+            "\xf0\x9f\x92\xb4"                                                                                             => ':yen:',
+            "\xf3\xbe\x93\xa2"                                                                                             => ':yen:',
+            "\xee\x9b\x96"                                                                                                 => ':yen:',
+            "\xee\x95\xbd"                                                                                                 => ':yen:',
+            "\xf0\x9f\x92\xb5"                                                                                             => ':dollar:',
+            "\xf3\xbe\x93\xa3"                                                                                             => ':dollar:',
+            "\xee\x96\x85"                                                                                                 => ':dollar:',
+            "\xf0\x9f\x92\xb6"                                                                                             => ':euro:',
+            "\xf0\x9f\x92\xb7"                                                                                             => ':pound:',
+            "\xf0\x9f\x92\xb8"                                                                                             => ':money_with_wings:',
+            "\xf3\xbe\x93\xa4"                                                                                             => ':money_with_wings:',
+            "\xee\xad\x9b"                                                                                                 => ':money_with_wings:',
+            "\xf0\x9f\x92\xb9"                                                                                             => ':chart:',
+            "\xf3\xbe\x93\x9f"                                                                                             => ':chart:',
+            "\xee\x85\x8a"                                                                                                 => ':bar_chart:',
+            "\xee\x97\x9c"                                                                                                 => ':chart:',
+            "\xf0\x9f\x92\xba"                                                                                             => ':seat:',
+            "\xf3\xbe\x94\xb7"                                                                                             => ':seat:',
+            "\xee\x9a\xb2"                                                                                                 => ':seat:',
+            "\xee\x84\x9f"                                                                                                 => ':seat:',
+            "\xf0\x9f\x92\xbb"                                                                                             => ':computer:',
+            "\xf3\xbe\x94\xb8"                                                                                             => ':computer:',
+            "\xee\x9c\x96"                                                                                                 => ':computer:',
+            "\xee\x80\x8c"                                                                                                 => ':computer:',
+            "\xee\x96\xb8"                                                                                                 => ':computer:',
+            "\xf0\x9f\x92\xbc"                                                                                             => ':briefcase:',
+            "\xf3\xbe\x94\xbb"                                                                                             => ':briefcase:',
+            "\xee\x84\x9e"                                                                                                 => ':briefcase:',
+            "\xee\x97\x8e"                                                                                                 => ':briefcase:',
+            "\xf0\x9f\x92\xbd"                                                                                             => ':minidisc:',
+            "\xf3\xbe\x94\xbc"                                                                                             => ':minidisc:',
+            "\xee\x8c\x96"                                                                                                 => ':floppy_disk:',
+            "\xee\x96\x82"                                                                                                 => ':minidisc:',
+            "\xf0\x9f\x92\xbe"                                                                                             => ':floppy_disk:',
+            "\xf3\xbe\x94\xbd"                                                                                             => ':floppy_disk:',
+            "\xee\x95\xa2"                                                                                                 => ':floppy_disk:',
+            "\xf0\x9f\x92\xbf"                                                                                             => ':cd:',
+            "\xf3\xbe\xa0\x9d"                                                                                             => ':cd:',
+            "\xee\x9a\x8c"                                                                                                 => ':dvd:',
+            "\xee\x84\xa6"                                                                                                 => ':cd:',
+            "\xee\x94\x8c"                                                                                                 => ':us:',
+            "\xf0\x9f\x93\x80"                                                                                             => ':dvd:',
+            "\xf3\xbe\xa0\x9e"                                                                                             => ':dvd:',
+            "\xee\x84\xa7"                                                                                                 => ':dvd:',
+            "\xf0\x9f\x93\x81"                                                                                             => ':file_folder:',
+            "\xf3\xbe\x95\x83"                                                                                             => ':file_folder:',
+            "\xee\x96\x8f"                                                                                                 => ':file_folder:',
+            "\xf0\x9f\x93\x82"                                                                                             => ':open_file_folder:',
+            "\xf3\xbe\x95\x84"                                                                                             => ':open_file_folder:',
+            "\xee\x96\x90"                                                                                                 => ':open_file_folder:',
+            "\xf0\x9f\x93\x83"                                                                                             => ':page_with_curl:',
+            "\xf3\xbe\x95\x80"                                                                                             => ':page_with_curl:',
+            "\xee\x9a\x89"                                                                                                 => ':pencil:',
+            "\xee\x95\xa1"                                                                                                 => ':page_with_curl:',
+            "\xf0\x9f\x93\x84"                                                                                             => ':page_facing_up:',
+            "\xf3\xbe\x95\x81"                                                                                             => ':page_facing_up:',
+            "\xee\x95\xa9"                                                                                                 => ':page_facing_up:',
+            "\xf0\x9f\x93\x85"                                                                                             => ':date:',
+            "\xf3\xbe\x95\x82"                                                                                             => ':date:',
+            "\xee\x95\xa3"                                                                                                 => ':date:',
+            "\xf0\x9f\x93\x86"                                                                                             => ':calendar:',
+            "\xf3\xbe\x95\x89"                                                                                             => ':calendar:',
+            "\xee\x95\xaa"                                                                                                 => ':calendar:',
+            "\xf0\x9f\x93\x87"                                                                                             => ':card_index:',
+            "\xf3\xbe\x95\x8d"                                                                                             => ':card_index:',
+            "\xee\x9a\x83"                                                                                                 => ':books:',
+            "\xee\x85\x88"                                                                                                 => ':books:',
+            "\xee\x95\xac"                                                                                                 => ':card_index:',
+            "\xf0\x9f\x93\x88"                                                                                             => ':chart_with_upwards_trend:',
+            "\xf3\xbe\x95\x8b"                                                                                             => ':chart_with_upwards_trend:',
+            "\xee\x95\xb5"                                                                                                 => ':chart_with_upwards_trend:',
+            "\xf0\x9f\x93\x89"                                                                                             => ':chart_with_downwards_trend:',
+            "\xf3\xbe\x95\x8c"                                                                                             => ':chart_with_downwards_trend:',
+            "\xee\x95\xb6"                                                                                                 => ':chart_with_downwards_trend:',
+            "\xf0\x9f\x93\x8a"                                                                                             => ':bar_chart:',
+            "\xf3\xbe\x95\x8a"                                                                                             => ':bar_chart:',
+            "\xee\x95\xb4"                                                                                                 => ':bar_chart:',
+            "\xf0\x9f\x93\x8b"                                                                                             => ':clipboard:',
+            "\xf3\xbe\x95\x88"                                                                                             => ':clipboard:',
+            "\xee\x95\xa4"                                                                                                 => ':clipboard:',
+            "\xf0\x9f\x93\x8c"                                                                                             => ':pushpin:',
+            "\xf3\xbe\x95\x8e"                                                                                             => ':pushpin:',
+            "\xee\x95\xad"                                                                                                 => ':pushpin:',
+            "\xf0\x9f\x93\x8d"                                                                                             => ':round_pushpin:',
+            "\xf3\xbe\x94\xbf"                                                                                             => ':round_pushpin:',
+            "\xee\x95\xa0"                                                                                                 => ':round_pushpin:',
+            "\xf0\x9f\x93\x8e"                                                                                             => ':paperclip:',
+            "\xf3\xbe\x94\xba"                                                                                             => ':paperclip:',
+            "\xee\x9c\xb0"                                                                                                 => ':paperclip:',
+            "\xee\x92\xa0"                                                                                                 => ':paperclip:',
+            "\xf0\x9f\x93\x8f"                                                                                             => ':straight_ruler:',
+            "\xf3\xbe\x95\x90"                                                                                             => ':straight_ruler:',
+            "\xee\x95\xb0"                                                                                                 => ':straight_ruler:',
+            "\xf0\x9f\x93\x90"                                                                                             => ':triangular_ruler:',
+            "\xf3\xbe\x95\x91"                                                                                             => ':triangular_ruler:',
+            "\xee\x92\xa2"                                                                                                 => ':triangular_ruler:',
+            "\xf0\x9f\x93\x91"                                                                                             => ':bookmark_tabs:',
+            "\xf3\xbe\x95\x92"                                                                                             => ':bookmark_tabs:',
+            "\xee\xac\x8b"                                                                                                 => ':bookmark_tabs:',
+            "\xf0\x9f\x93\x92"                                                                                             => ':ledger:',
+            "\xf3\xbe\x95\x8f"                                                                                             => ':ledger:',
+            "\xee\x95\xae"                                                                                                 => ':ledger:',
+            "\xf0\x9f\x93\x93"                                                                                             => ':notebook:',
+            "\xf3\xbe\x95\x85"                                                                                             => ':notebook:',
+            "\xee\x95\xab"                                                                                                 => ':notebook:',
+            "\xf0\x9f\x93\x94"                                                                                             => ':notebook_with_decorative_cover:',
+            "\xf3\xbe\x95\x87"                                                                                             => ':notebook_with_decorative_cover:',
+            "\xee\x92\x9d"                                                                                                 => ':notebook_with_decorative_cover:',
+            "\xf0\x9f\x93\x95"                                                                                             => ':closed_book:',
+            "\xf3\xbe\x94\x82"                                                                                             => ':closed_book:',
+            "\xee\x95\xa8"                                                                                                 => ':closed_book:',
+            "\xf0\x9f\x93\x96"                                                                                             => ':open_book:',
+            "\xf3\xbe\x95\x86"                                                                                             => ':open_book:',
+            "\xee\x92\x9f"                                                                                                 => ':open_book:',
+            "\xf0\x9f\x93\x97"                                                                                             => ':green_book:',
+            "\xf3\xbe\x93\xbf"                                                                                             => ':green_book:',
+            "\xee\x95\xa5"                                                                                                 => ':green_book:',
+            "\xf0\x9f\x93\x98"                                                                                             => ':blue_book:',
+            "\xf3\xbe\x94\x80"                                                                                             => ':blue_book:',
+            "\xee\x95\xa6"                                                                                                 => ':blue_book:',
+            "\xf0\x9f\x93\x99"                                                                                             => ':orange_book:',
+            "\xf3\xbe\x94\x81"                                                                                             => ':orange_book:',
+            "\xee\x95\xa7"                                                                                                 => ':orange_book:',
+            "\xf0\x9f\x93\x9a"                                                                                             => ':books:',
+            "\xf3\xbe\x94\x83"                                                                                             => ':books:',
+            "\xee\x95\xaf"                                                                                                 => ':books:',
+            "\xf0\x9f\x93\x9b"                                                                                             => ':name_badge:',
+            "\xf3\xbe\x94\x84"                                                                                             => ':name_badge:',
+            "\xee\x94\x9d"                                                                                                 => ':statue_of_liberty:',
+            "\xf0\x9f\x93\x9c"                                                                                             => ':scroll:',
+            "\xf3\xbe\x93\xbd"                                                                                             => ':scroll:',
+            "\xee\x95\x9f"                                                                                                 => ':scroll:',
+            "\xf0\x9f\x93\x9d"                                                                                             => ':pencil:',
+            "\xf3\xbe\x94\xa7"                                                                                             => ':pencil:',
+            "\xee\xaa\x92"                                                                                                 => ':pencil:',
+            "\xf0\x9f\x93\x9e"                                                                                             => ':telephone_receiver:',
+            "\xf3\xbe\x94\xa4"                                                                                             => ':telephone_receiver:',
+            "\xf0\x9f\x93\x9f"                                                                                             => ':pager:',
+            "\xf3\xbe\x94\xa2"                                                                                             => ':pager:',
+            "\xee\x99\x9a"                                                                                                 => ':pager:',
+            "\xee\x96\x9b"                                                                                                 => ':pager:',
+            "\xf0\x9f\x93\xa0"                                                                                             => ':fax:',
+            "\xf3\xbe\x94\xa8"                                                                                             => ':fax:',
+            "\xee\x9b\x90"                                                                                                 => ':fax:',
+            "\xee\x80\x8b"                                                                                                 => ':fax:',
+            "\xf0\x9f\x93\xa1"                                                                                             => ':satellite_antenna:',
+            "\xf3\xbe\x94\xb1"                                                                                             => ':satellite_antenna:',
+            "\xee\x85\x8b"                                                                                                 => ':satellite_antenna:',
+            "\xee\x92\xa8"                                                                                                 => ':satellite_antenna:',
+            "\xf0\x9f\x93\xa2"                                                                                             => ':loudspeaker:',
+            "\xf3\xbe\x94\xaf"                                                                                             => ':loudspeaker:',
+            "\xee\x85\x82"                                                                                                 => ':loudspeaker:',
+            "\xee\x94\x91"                                                                                                 => ':es:',
+            "\xf0\x9f\x93\xa3"                                                                                             => ':mega:',
+            "\xf3\xbe\x94\xb0"                                                                                             => ':mega:',
+            "\xee\x8c\x97"                                                                                                 => ':mega:',
+            "\xf0\x9f\x93\xa4"                                                                                             => ':outbox_tray:',
+            "\xf3\xbe\x94\xb3"                                                                                             => ':outbox_tray:',
+            "\xee\x96\x92"                                                                                                 => ':outbox_tray:',
+            "\xf0\x9f\x93\xa5"                                                                                             => ':inbox_tray:',
+            "\xf3\xbe\x94\xb4"                                                                                             => ':inbox_tray:',
+            "\xee\x96\x93"                                                                                                 => ':inbox_tray:',
+            "\xf0\x9f\x93\xa6"                                                                                             => ':package:',
+            "\xf3\xbe\x94\xb5"                                                                                             => ':package:',
+            "\xf0\x9f\x93\xa7"                                                                                             => ':e-mail:',
+            "\xf3\xbe\xae\x92"                                                                                             => ':e-mail:',
+            "\xee\xad\xb1"                                                                                                 => ':e-mail:',
+            "\xf0\x9f\x93\xa8"                                                                                             => ':incoming_envelope:',
+            "\xf3\xbe\x94\xaa"                                                                                             => ':incoming_envelope:',
+            "\xee\x9b\x8f"                                                                                                 => ':envelope_with_arrow:',
+            "\xee\x96\x91"                                                                                                 => ':incoming_envelope:',
+            "\xf0\x9f\x93\xa9"                                                                                             => ':envelope_with_arrow:',
+            "\xf3\xbe\x94\xab"                                                                                             => ':envelope_with_arrow:',
+            "\xee\xad\xa2"                                                                                                 => ':envelope_with_arrow:',
+            "\xf0\x9f\x93\xaa"                                                                                             => ':mailbox_closed:',
+            "\xf3\xbe\x94\xac"                                                                                             => ':mailbox_closed:',
+            "\xee\x84\x81"                                                                                                 => ':mailbox:',
+            "\xf0\x9f\x93\xab"                                                                                             => ':mailbox:',
+            "\xf3\xbe\x94\xad"                                                                                             => ':mailbox:',
+            "\xee\xac\x8a"                                                                                                 => ':mailbox:',
+            "\xf0\x9f\x93\xac"                                                                                             => ':mailbox_with_mail:',
+            "\xf0\x9f\x93\xad"                                                                                             => ':mailbox_with_no_mail:',
+            "\xf0\x9f\x93\xae"                                                                                             => ':postbox:',
+            "\xf3\xbe\x94\xae"                                                                                             => ':postbox:',
+            "\xee\x84\x82"                                                                                                 => ':postbox:',
+            "\xf0\x9f\x93\xaf"                                                                                             => ':postal_horn:',
+            "\xf0\x9f\x93\xb0"                                                                                             => ':newspaper:',
+            "\xf3\xbe\xa0\xa2"                                                                                             => ':newspaper:',
+            "\xee\x96\x8b"                                                                                                 => ':newspaper:',
+            "\xf0\x9f\x93\xb1"                                                                                             => ':iphone:',
+            "\xf3\xbe\x94\xa5"                                                                                             => ':iphone:',
+            "\xee\x9a\x88"                                                                                                 => ':iphone:',
+            "\xee\x80\x8a"                                                                                                 => ':iphone:',
+            "\xee\x96\x88"                                                                                                 => ':iphone:',
+            "\xf0\x9f\x93\xb2"                                                                                             => ':calling:',
+            "\xf3\xbe\x94\xa6"                                                                                             => ':calling:',
+            "\xee\x9b\x8e"                                                                                                 => ':calling:',
+            "\xee\x84\x84"                                                                                                 => ':calling:',
+            "\xee\xac\x88"                                                                                                 => ':calling:',
+            "\xf0\x9f\x93\xb3"                                                                                             => ':vibration_mode:',
+            "\xf3\xbe\xa0\xb9"                                                                                             => ':vibration_mode:',
+            "\xee\x89\x90"                                                                                                 => ':vibration_mode:',
+            "\xee\xaa\x90"                                                                                                 => ':vibration_mode:',
+            "\xf0\x9f\x93\xb4"                                                                                             => ':mobile_phone_off:',
+            "\xf3\xbe\xa0\xba"                                                                                             => ':mobile_phone_off:',
+            "\xee\x89\x91"                                                                                                 => ':mobile_phone_off:',
+            "\xee\xaa\x91"                                                                                                 => ':mobile_phone_off:',
+            "\xf0\x9f\x93\xb5"                                                                                             => ':no_mobile_phones:',
+            "\xf0\x9f\x93\xb6"                                                                                             => ':signal_strength:',
+            "\xf3\xbe\xa0\xb8"                                                                                             => ':signal_strength:',
+            "\xee\x88\x8b"                                                                                                 => ':signal_strength:',
+            "\xee\xaa\x84"                                                                                                 => ':signal_strength:',
+            "\xf0\x9f\x93\xb7"                                                                                             => ':camera:',
+            "\xf3\xbe\x93\xaf"                                                                                             => ':camera:',
+            "\xee\x9a\x81"                                                                                                 => ':camera:',
+            "\xee\x80\x88"                                                                                                 => ':camera:',
+            "\xf0\x9f\x93\xb8"                                                                                             => ':camera_with_flash:',
+            "\xf0\x9f\x93\xb9"                                                                                             => ':video_camera:',
+            "\xf3\xbe\x93\xb9"                                                                                             => ':video_camera:',
+            "\xee\x95\xbe"                                                                                                 => ':video_camera:',
+            "\xf0\x9f\x93\xba"                                                                                             => ':tv:',
+            "\xf3\xbe\xa0\x9c"                                                                                             => ':tv:',
+            "\xee\x9a\x8a"                                                                                                 => ':tv:',
+            "\xee\x84\xaa"                                                                                                 => ':tv:',
+            "\xf0\x9f\x93\xbb"                                                                                             => ':radio:',
+            "\xf3\xbe\xa0\x9f"                                                                                             => ':radio:',
+            "\xee\x84\xa8"                                                                                                 => ':radio:',
+            "\xee\x96\xb9"                                                                                                 => ':radio:',
+            "\xf0\x9f\x93\xbc"                                                                                             => ':vhs:',
+            "\xf3\xbe\xa0\xa0"                                                                                             => ':vhs:',
+            "\xee\x84\xa9"                                                                                                 => ':vhs:',
+            "\xee\x96\x80"                                                                                                 => ':vhs:',
+            "\xf0\x9f\x93\xbd"                                                                                             => ':film_projector:',
+            "\xf0\x9f\x93\xbf"                                                                                             => ':prayer_beads:',
+            "\xf0\x9f\x94\x80"                                                                                             => ':twisted_rightwards_arrows:',
+            "\xf0\x9f\x94\x81"                                                                                             => ':repeat:',
+            "\xf0\x9f\x94\x82"                                                                                             => ':repeat_one:',
+            "\xf0\x9f\x94\x83"                                                                                             => ':arrows_clockwise:',
+            "\xf3\xbe\xae\x91"                                                                                             => ':arrows_clockwise:',
+            "\xee\xac\x8d"                                                                                                 => ':arrows_clockwise:',
+            "\xf0\x9f\x94\x84"                                                                                             => ':arrows_counterclockwise:',
+            "\xf0\x9f\x94\x85"                                                                                             => ':low_brightness:',
+            "\xf0\x9f\x94\x86"                                                                                             => ':high_brightness:',
+            "\xf0\x9f\x94\x87"                                                                                             => ':mute:',
+            "\xf0\x9f\x94\x88"                                                                                             => ':speaker:',
+            "\xf0\x9f\x94\x89"                                                                                             => ':sound:',
+            "\xf0\x9f\x94\x8a"                                                                                             => ':loud_sound:',
+            "\xf3\xbe\xa0\xa1"                                                                                             => ':loud_sound:',
+            "\xee\x85\x81"                                                                                                 => ':loud_sound:',
+            "\xf0\x9f\x94\x8b"                                                                                             => ':battery:',
+            "\xf3\xbe\x93\xbc"                                                                                             => ':battery:',
+            "\xee\x96\x84"                                                                                                 => ':battery:',
+            "\xf0\x9f\x94\x8c"                                                                                             => ':electric_plug:',
+            "\xf3\xbe\x93\xbe"                                                                                             => ':electric_plug:',
+            "\xee\x96\x89"                                                                                                 => ':electric_plug:',
+            "\xf0\x9f\x94\x8d"                                                                                             => ':mag:',
+            "\xf3\xbe\xae\x85"                                                                                             => ':mag:',
+            "\xee\x9b\x9c"                                                                                                 => ':mag_right:',
+            "\xee\x84\x94"                                                                                                 => ':mag_right:',
+            "\xf0\x9f\x94\x8e"                                                                                             => ':mag_right:',
+            "\xf3\xbe\xae\x8d"                                                                                             => ':mag_right:',
+            "\xee\xac\x85"                                                                                                 => ':mag_right:',
+            "\xf0\x9f\x94\x8f"                                                                                             => ':lock_with_ink_pen:',
+            "\xf3\xbe\xae\x90"                                                                                             => ':lock_with_ink_pen:',
+            "\xee\x9b\x99"                                                                                                 => ':unlock:',
+            "\xee\x85\x84"                                                                                                 => ':lock:',
+            "\xee\xac\x8c"                                                                                                 => ':lock_with_ink_pen:',
+            "\xf0\x9f\x94\x90"                                                                                             => ':closed_lock_with_key:',
+            "\xf3\xbe\xae\x8a"                                                                                             => ':closed_lock_with_key:',
+            "\xee\xab\xbc"                                                                                                 => ':closed_lock_with_key:',
+            "\xf0\x9f\x94\x91"                                                                                             => ':key:',
+            "\xf3\xbe\xae\x82"                                                                                             => ':key:',
+            "\xee\x80\xbf"                                                                                                 => ':key:',
+            "\xf0\x9f\x94\x92"                                                                                             => ':lock:',
+            "\xf3\xbe\xae\x86"                                                                                             => ':lock:',
+            "\xf0\x9f\x94\x93"                                                                                             => ':unlock:',
+            "\xf3\xbe\xae\x87"                                                                                             => ':unlock:',
+            "\xee\x85\x85"                                                                                                 => ':unlock:',
+            "\xf0\x9f\x94\x94"                                                                                             => ':bell:',
+            "\xf3\xbe\x93\xb2"                                                                                             => ':bell:',
+            "\xee\x9c\x93"                                                                                                 => ':bell:',
+            "\xee\x8c\xa5"                                                                                                 => ':bell:',
+            "\xee\x94\x92"                                                                                                 => ':ru:',
+            "\xf0\x9f\x94\x95"                                                                                             => ':no_bell:',
+            "\xf0\x9f\x94\x96"                                                                                             => ':bookmark:',
+            "\xf3\xbe\xae\x8f"                                                                                             => ':bookmark:',
+            "\xee\xac\x87"                                                                                                 => ':bookmark:',
+            "\xf0\x9f\x94\x97"                                                                                             => ':link:',
+            "\xf3\xbe\xad\x8b"                                                                                             => ':link:',
+            "\xee\x96\x8a"                                                                                                 => ':link:',
+            "\xf0\x9f\x94\x98"                                                                                             => ':radio_button:',
+            "\xf3\xbe\xae\x8c"                                                                                             => ':radio_button:',
+            "\xee\xac\x84"                                                                                                 => ':radio_button:',
+            "\xf0\x9f\x94\x99"                                                                                             => ':back:',
+            "\xf3\xbe\xae\x8e"                                                                                             => ':back:',
+            "\xee\xac\x86"                                                                                                 => ':back:',
+            "\xf0\x9f\x94\x9a"                                                                                             => ':end:',
+            "\xf3\xbe\x80\x9a"                                                                                             => ':end:',
+            "\xee\x9a\xb9"                                                                                                 => ':end:',
+            "\xf0\x9f\x94\x9b"                                                                                             => ':on:',
+            "\xf3\xbe\x80\x99"                                                                                             => ':on:',
+            "\xee\x9a\xb8"                                                                                                 => ':on:',
+            "\xf0\x9f\x94\x9c"                                                                                             => ':soon:',
+            "\xf3\xbe\x80\x98"                                                                                             => ':soon:',
+            "\xee\x9a\xb7"                                                                                                 => ':soon:',
+            "\xf0\x9f\x94\x9d"                                                                                             => ':top:',
+            "\xf3\xbe\xad\x82"                                                                                             => ':top:',
+            "\xee\x89\x8c"                                                                                                 => ':top:',
+            "\xf0\x9f\x94\x9e"                                                                                             => ':underage:',
+            "\xf3\xbe\xac\xa5"                                                                                             => ':underage:',
+            "\xee\x88\x87"                                                                                                 => ':underage:',
+            "\xee\xaa\x83"                                                                                                 => ':underage:',
+            "\xf0\x9f\x94\x9f"                                                                                             => ':keycap_ten:',
+            "\xf3\xbe\xa0\xbb"                                                                                             => ':keycap_ten:',
+            "\xf0\x9f\x94\xa0"                                                                                             => ':capital_abcd:',
+            "\xf3\xbe\xad\xbc"                                                                                             => ':capital_abcd:',
+            "\xee\xab\xbd"                                                                                                 => ':capital_abcd:',
+            "\xf0\x9f\x94\xa1"                                                                                             => ':abcd:',
+            "\xf3\xbe\xad\xbd"                                                                                             => ':abcd:',
+            "\xee\xab\xbe"                                                                                                 => ':abcd:',
+            "\xf0\x9f\x94\xa2"                                                                                             => ':1234:',
+            "\xf3\xbe\xad\xbe"                                                                                             => ':1234:',
+            "\xee\xab\xbf"                                                                                                 => ':1234:',
+            "\xf0\x9f\x94\xa3"                                                                                             => ':symbols:',
+            "\xf3\xbe\xad\xbf"                                                                                             => ':symbols:',
+            "\xee\xac\x80"                                                                                                 => ':symbols:',
+            "\xf0\x9f\x94\xa4"                                                                                             => ':abc:',
+            "\xf3\xbe\xae\x80"                                                                                             => ':abc:',
+            "\xee\xad\x95"                                                                                                 => ':abc:',
+            "\xf0\x9f\x94\xa5"                                                                                             => ':fire:',
+            "\xf3\xbe\x93\xb6"                                                                                             => ':fire:',
+            "\xee\x84\x9d"                                                                                                 => ':fire:',
+            "\xee\x91\xbb"                                                                                                 => ':fire:',
+            "\xf0\x9f\x94\xa6"                                                                                             => ':flashlight:',
+            "\xf3\xbe\x93\xbb"                                                                                             => ':flashlight:',
+            "\xee\x96\x83"                                                                                                 => ':flashlight:',
+            "\xf0\x9f\x94\xa7"                                                                                             => ':wrench:',
+            "\xf3\xbe\x93\x89"                                                                                             => ':wrench:',
+            "\xee\x9c\x98"                                                                                                 => ':wrench:',
+            "\xee\x96\x87"                                                                                                 => ':wrench:',
+            "\xf0\x9f\x94\xa8"                                                                                             => ':hammer:',
+            "\xf3\xbe\x93\x8a"                                                                                             => ':hammer:',
+            "\xee\x84\x96"                                                                                                 => ':hammer:',
+            "\xee\x97\x8b"                                                                                                 => ':hammer:',
+            "\xf0\x9f\x94\xa9"                                                                                             => ':nut_and_bolt:',
+            "\xf3\xbe\x93\x8b"                                                                                             => ':nut_and_bolt:',
+            "\xee\x96\x81"                                                                                                 => ':nut_and_bolt:',
+            "\xf0\x9f\x94\xaa"                                                                                             => ':knife:',
+            "\xf3\xbe\x93\xba"                                                                                             => ':knife:',
+            "\xee\x95\xbf"                                                                                                 => ':knife:',
+            "\xf0\x9f\x94\xab"                                                                                             => ':gun:',
+            "\xf3\xbe\x93\xb5"                                                                                             => ':gun:',
+            "\xee\x84\x93"                                                                                                 => ':gun:',
+            "\xee\x94\x8a"                                                                                                 => ':gun:',
+            "\xf0\x9f\x94\xac"                                                                                             => ':microscope:',
+            "\xf0\x9f\x94\xad"                                                                                             => ':telescope:',
+            "\xf0\x9f\x94\xae"                                                                                             => ':crystal_ball:',
+            "\xf3\xbe\x93\xb7"                                                                                             => ':crystal_ball:',
+            "\xee\x88\xbe"                                                                                                 => ':six_pointed_star:',
+            "\xee\xaa\x8f"                                                                                                 => ':six_pointed_star:',
+            "\xf0\x9f\x94\xaf"                                                                                             => ':six_pointed_star:',
+            "\xf3\xbe\x93\xb8"                                                                                             => ':six_pointed_star:',
+            "\xf0\x9f\x94\xb0"                                                                                             => ':beginner:',
+            "\xf3\xbe\x81\x84"                                                                                             => ':beginner:',
+            "\xee\x88\x89"                                                                                                 => ':beginner:',
+            "\xee\x92\x80"                                                                                                 => ':beginner:',
+            "\xf0\x9f\x94\xb1"                                                                                             => ':trident:',
+            "\xf3\xbe\x93\x92"                                                                                             => ':trident:',
+            "\xee\x80\xb1"                                                                                                 => ':trident:',
+            "\xf0\x9f\x94\xb2"                                                                                             => ':black_square_button:',
+            "\xf3\xbe\xad\xa4"                                                                                             => ':large_blue_circle:',
+            "\xee\x95\x8b"                                                                                                 => ':large_blue_circle:',
+            "\xf0\x9f\x94\xb3"                                                                                             => ':white_square_button:',
+            "\xf3\xbe\xad\xa7"                                                                                             => ':white_square_button:',
+            "\xf0\x9f\x94\xb4"                                                                                             => ':red_circle:',
+            "\xf3\xbe\xad\xa3"                                                                                             => ':red_circle:',
+            "\xee\x95\x8a"                                                                                                 => ':red_circle:',
+            "\xf0\x9f\x94\xb5"                                                                                             => ':large_blue_circle:',
+            "\xf0\x9f\x94\xb6"                                                                                             => ':large_orange_diamond:',
+            "\xf3\xbe\xad\xb3"                                                                                             => ':large_orange_diamond:',
+            "\xee\x95\x86"                                                                                                 => ':large_orange_diamond:',
+            "\xf0\x9f\x94\xb7"                                                                                             => ':large_blue_diamond:',
+            "\xf3\xbe\xad\xb4"                                                                                             => ':large_blue_diamond:',
+            "\xee\x95\x87"                                                                                                 => ':large_blue_diamond:',
+            "\xf0\x9f\x94\xb8"                                                                                             => ':small_orange_diamond:',
+            "\xf3\xbe\xad\xb5"                                                                                             => ':small_orange_diamond:',
+            "\xf0\x9f\x94\xb9"                                                                                             => ':small_blue_diamond:',
+            "\xf3\xbe\xad\xb6"                                                                                             => ':small_blue_diamond:',
+            "\xf0\x9f\x94\xba"                                                                                             => ':small_red_triangle:',
+            "\xf3\xbe\xad\xb8"                                                                                             => ':small_red_triangle:',
+            "\xee\x95\x9a"                                                                                                 => ':small_red_triangle:',
+            "\xf0\x9f\x94\xbb"                                                                                             => ':small_red_triangle_down:',
+            "\xf3\xbe\xad\xb9"                                                                                             => ':small_red_triangle_down:',
+            "\xee\x95\x9b"                                                                                                 => ':small_red_triangle_down:',
+            "\xf0\x9f\x94\xbc"                                                                                             => ':arrow_up_small:',
+            "\xf3\xbe\xac\x81"                                                                                             => ':arrow_up_small:',
+            "\xee\x95\x83"                                                                                                 => ':arrow_up_small:',
+            "\xf0\x9f\x94\xbd"                                                                                             => ':arrow_down_small:',
+            "\xf3\xbe\xac\x80"                                                                                             => ':arrow_down_small:',
+            "\xee\x95\x82"                                                                                                 => ':arrow_down_small:',
+            "\xf0\x9f\x95\x89"                                                                                             => ':om_symbol:',
+            "\xf0\x9f\x95\x8a"                                                                                             => ':dove_of_peace:',
+            "\xf0\x9f\x95\x8b"                                                                                             => ':kaaba:',
+            "\xf0\x9f\x95\x8c"                                                                                             => ':mosque:',
+            "\xf0\x9f\x95\x8d"                                                                                             => ':synagogue:',
+            "\xf0\x9f\x95\x8e"                                                                                             => ':menorah_with_nine_branches:',
+            "\xf0\x9f\x95\x90"                                                                                             => ':clock1:',
+            "\xf3\xbe\x80\x9e"                                                                                             => ':clock1:',
+            "\xee\x80\xa4"                                                                                                 => ':clock1:',
+            "\xf0\x9f\x95\x91"                                                                                             => ':clock2:',
+            "\xf3\xbe\x80\x9f"                                                                                             => ':clock2:',
+            "\xee\x80\xa5"                                                                                                 => ':clock2:',
+            "\xf0\x9f\x95\x92"                                                                                             => ':clock3:',
+            "\xf3\xbe\x80\xa0"                                                                                             => ':clock3:',
+            "\xee\x80\xa6"                                                                                                 => ':clock3:',
+            "\xf0\x9f\x95\x93"                                                                                             => ':clock4:',
+            "\xf3\xbe\x80\xa1"                                                                                             => ':clock4:',
+            "\xee\x80\xa7"                                                                                                 => ':clock4:',
+            "\xf0\x9f\x95\x94"                                                                                             => ':clock5:',
+            "\xf3\xbe\x80\xa2"                                                                                             => ':clock5:',
+            "\xee\x80\xa8"                                                                                                 => ':clock5:',
+            "\xf0\x9f\x95\x95"                                                                                             => ':clock6:',
+            "\xf3\xbe\x80\xa3"                                                                                             => ':clock6:',
+            "\xee\x80\xa9"                                                                                                 => ':clock6:',
+            "\xf0\x9f\x95\x96"                                                                                             => ':clock7:',
+            "\xf3\xbe\x80\xa4"                                                                                             => ':clock7:',
+            "\xee\x80\xaa"                                                                                                 => ':clock7:',
+            "\xf0\x9f\x95\x97"                                                                                             => ':clock8:',
+            "\xf3\xbe\x80\xa5"                                                                                             => ':clock8:',
+            "\xee\x80\xab"                                                                                                 => ':clock8:',
+            "\xf0\x9f\x95\x98"                                                                                             => ':clock9:',
+            "\xf3\xbe\x80\xa6"                                                                                             => ':clock9:',
+            "\xee\x80\xac"                                                                                                 => ':clock9:',
+            "\xf0\x9f\x95\x99"                                                                                             => ':clock10:',
+            "\xf3\xbe\x80\xa7"                                                                                             => ':clock10:',
+            "\xf0\x9f\x95\x9a"                                                                                             => ':clock11:',
+            "\xf3\xbe\x80\xa8"                                                                                             => ':clock11:',
+            "\xee\x80\xae"                                                                                                 => ':clock11:',
+            "\xf0\x9f\x95\x9b"                                                                                             => ':clock12:',
+            "\xf3\xbe\x80\xa9"                                                                                             => ':clock12:',
+            "\xee\x80\xaf"                                                                                                 => ':clock12:',
+            "\xf0\x9f\x95\x9c"                                                                                             => ':clock130:',
+            "\xf0\x9f\x95\x9d"                                                                                             => ':clock230:',
+            "\xf0\x9f\x95\x9e"                                                                                             => ':clock330:',
+            "\xf0\x9f\x95\x9f"                                                                                             => ':clock430:',
+            "\xf0\x9f\x95\xa0"                                                                                             => ':clock530:',
+            "\xf0\x9f\x95\xa1"                                                                                             => ':clock630:',
+            "\xf0\x9f\x95\xa2"                                                                                             => ':clock730:',
+            "\xf0\x9f\x95\xa3"                                                                                             => ':clock830:',
+            "\xf0\x9f\x95\xa4"                                                                                             => ':clock930:',
+            "\xf0\x9f\x95\xa5"                                                                                             => ':clock1030:',
+            "\xf0\x9f\x95\xa6"                                                                                             => ':clock1130:',
+            "\xf0\x9f\x95\xa7"                                                                                             => ':clock1230:',
+            "\xf0\x9f\x95\xaf"                                                                                             => ':candle:',
+            "\xf0\x9f\x95\xb0"                                                                                             => ':mantelpiece_clock:',
+            "\xf0\x9f\x95\xb3"                                                                                             => ':hole:',
+            "\xf0\x9f\x95\xb4"                                                                                             => ':man_in_business_suit_levitating:',
+            "\xf0\x9f\x95\xb5"                                                                                             => ':sleuth_or_spy:',
+            "\xf0\x9f\x95\xb6"                                                                                             => ':dark_sunglasses:',
+            "\xf0\x9f\x95\xb7"                                                                                             => ':spider:',
+            "\xf0\x9f\x95\xb8"                                                                                             => ':spider_web:',
+            "\xf0\x9f\x95\xb9"                                                                                             => ':joystick:',
+            "\xf0\x9f\x96\x87"                                                                                             => ':linked_paperclips:',
+            "\xf0\x9f\x96\x8a"                                                                                             => ':lower_left_ballpoint_pen:',
+            "\xf0\x9f\x96\x8b"                                                                                             => ':lower_left_fountain_pen:',
+            "\xf0\x9f\x96\x8c"                                                                                             => ':lower_left_paintbrush:',
+            "\xf0\x9f\x96\x8d"                                                                                             => ':lower_left_crayon:',
+            "\xf0\x9f\x96\x90"                                                                                             => ':raised_hand_with_fingers_splayed:',
+            "\xf0\x9f\x96\x95"                                                                                             => ':reversed_hand_with_middle_finger_extended:',
+            "\xf0\x9f\x96\x96"                                                                                             => ':spock-hand:',
+            "\xf0\x9f\x96\xa5"                                                                                             => ':desktop_computer:',
+            "\xf0\x9f\x96\xa8"                                                                                             => ':printer:',
+            "\xf0\x9f\x96\xb1"                                                                                             => ':three_button_mouse:',
+            "\xf0\x9f\x96\xb2"                                                                                             => ':trackball:',
+            "\xf0\x9f\x96\xbc"                                                                                             => ':frame_with_picture:',
+            "\xf0\x9f\x97\x82"                                                                                             => ':card_index_dividers:',
+            "\xf0\x9f\x97\x83"                                                                                             => ':card_file_box:',
+            "\xf0\x9f\x97\x84"                                                                                             => ':file_cabinet:',
+            "\xf0\x9f\x97\x91"                                                                                             => ':wastebasket:',
+            "\xf0\x9f\x97\x92"                                                                                             => ':spiral_note_pad:',
+            "\xf0\x9f\x97\x93"                                                                                             => ':spiral_calendar_pad:',
+            "\xf0\x9f\x97\x9c"                                                                                             => ':compression:',
+            "\xf0\x9f\x97\x9d"                                                                                             => ':old_key:',
+            "\xf0\x9f\x97\x9e"                                                                                             => ':rolled_up_newspaper:',
+            "\xf0\x9f\x97\xa1"                                                                                             => ':dagger_knife:',
+            "\xf0\x9f\x97\xa3"                                                                                             => ':speaking_head_in_silhouette:',
+            "\xf0\x9f\x97\xa8"                                                                                             => ':left_speech_bubble:',
+            "\xf0\x9f\x97\xaf"                                                                                             => ':right_anger_bubble:',
+            "\xf0\x9f\x97\xb3"                                                                                             => ':ballot_box_with_ballot:',
+            "\xf0\x9f\x97\xba"                                                                                             => ':world_map:',
+            "\xf0\x9f\x97\xbb"                                                                                             => ':mount_fuji:',
+            "\xf3\xbe\x93\x83"                                                                                             => ':mount_fuji:',
+            "\xee\x9d\x80"                                                                                                 => ':mount_fuji:',
+            "\xee\x80\xbb"                                                                                                 => ':mount_fuji:',
+            "\xee\x96\xbd"                                                                                                 => ':mount_fuji:',
+            "\xf0\x9f\x97\xbc"                                                                                             => ':tokyo_tower:',
+            "\xf3\xbe\x93\x84"                                                                                             => ':tokyo_tower:',
+            "\xee\x93\x80"                                                                                                 => ':tokyo_tower:',
+            "\xf0\x9f\x97\xbd"                                                                                             => ':statue_of_liberty:',
+            "\xf3\xbe\x93\x86"                                                                                             => ':statue_of_liberty:',
+            "\xf0\x9f\x97\xbe"                                                                                             => ':japan:',
+            "\xf3\xbe\x93\x87"                                                                                             => ':japan:',
+            "\xee\x95\xb2"                                                                                                 => ':japan:',
+            "\xf0\x9f\x97\xbf"                                                                                             => ':moyai:',
+            "\xf3\xbe\x93\x88"                                                                                             => ':moyai:',
+            "\xee\xad\xac"                                                                                                 => ':moyai:',
+            "\xf0\x9f\x98\x80"                                                                                             => ':grinning:',
+            "\xf0\x9f\x98\x81"                                                                                             => ':grin:',
+            "\xf3\xbe\x8c\xb3"                                                                                             => ':grin:',
+            "\xee\x9d\x93"                                                                                                 => ':smirk_cat:',
+            "\xee\x90\x84"                                                                                                 => ':smirk_cat:',
+            "\xee\xae\x80"                                                                                                 => ':grin:',
+            "\xf0\x9f\x98\x82"                                                                                             => ':joy:',
+            "\xf3\xbe\x8c\xb4"                                                                                             => ':joy:',
+            "\xee\x9c\xaa"                                                                                                 => ':joy_cat:',
+            "\xee\x90\x92"                                                                                                 => ':joy_cat:',
+            "\xee\xad\xa4"                                                                                                 => ':joy:',
+            "\xf0\x9f\x98\x83"                                                                                             => ':smiley:',
+            "\xf3\xbe\x8c\xb0"                                                                                             => ':smiley:',
+            "\xee\x81\x97"                                                                                                 => ':smiley_cat:',
+            "\xee\x91\xb1"                                                                                                 => ':smile:',
+            "\xf0\x9f\x98\x84"                                                                                             => ':smile:',
+            "\xf3\xbe\x8c\xb8"                                                                                             => ':smile:',
+            "\xee\x90\x95"                                                                                                 => ':smile:',
+            "\xf0\x9f\x98\x85"                                                                                             => ':sweat_smile:',
+            "\xf3\xbe\x8c\xb1"                                                                                             => ':sweat_smile:',
+            "\xee\x9c\xa2"                                                                                                 => ':sweat_smile:',
+            "\xee\x90\x95\xee\x8c\xb1"                                                                                     => ':sweat_smile:',
+            "\xee\x91\xb1\xee\x96\xb1"                                                                                     => ':sweat_smile:',
+            "\xf0\x9f\x98\x86"                                                                                             => ':satisfied:',
+            "\xf3\xbe\x8c\xb2"                                                                                             => ':satisfied:',
+            "\xee\x90\x8a"                                                                                                 => ':relieved:',
+            "\xee\xab\x85"                                                                                                 => ':relieved:',
+            "\xf0\x9f\x98\x87"                                                                                             => ':innocent:',
+            "\xf0\x9f\x98\x88"                                                                                             => ':smiling_imp:',
+            "\xf0\x9f\x98\x89"                                                                                             => ':wink:',
+            "\xf3\xbe\x8d\x87"                                                                                             => ':wink:',
+            "\xee\x9c\xa9"                                                                                                 => ':wink:',
+            "\xee\x90\x85"                                                                                                 => ':wink:',
+            "\xee\x97\x83"                                                                                                 => ':wink:',
+            "\xf0\x9f\x98\x8a"                                                                                             => ':blush:',
+            "\xf3\xbe\x8c\xb5"                                                                                             => ':blush:',
+            "\xee\x81\x96"                                                                                                 => ':yum:',
+            "\xee\xab\x8d"                                                                                                 => ':yum:',
+            "\xf0\x9f\x98\x8b"                                                                                             => ':yum:',
+            "\xf3\xbe\x8c\xab"                                                                                             => ':yum:',
+            "\xee\x9d\x92"                                                                                                 => ':yum:',
+            "\xf0\x9f\x98\x8c"                                                                                             => ':relieved:',
+            "\xf3\xbe\x8c\xbe"                                                                                             => ':relieved:',
+            "\xee\x9c\xa1"                                                                                                 => ':relieved:',
+            "\xf0\x9f\x98\x8d"                                                                                             => ':heart_eyes:',
+            "\xf3\xbe\x8c\xa7"                                                                                             => ':heart_eyes:',
+            "\xee\x9c\xa6"                                                                                                 => ':kissing_cat:',
+            "\xee\x84\x86"                                                                                                 => ':heart_eyes_cat:',
+            "\xee\x97\x84"                                                                                                 => ':heart_eyes:',
+            "\xf0\x9f\x98\x8e"                                                                                             => ':sunglasses:',
+            "\xf0\x9f\x98\x8f"                                                                                             => ':smirk:',
+            "\xf3\xbe\x8d\x83"                                                                                             => ':smirk:',
+            "\xee\x9c\xac"                                                                                                 => ':smirk:',
+            "\xee\x90\x82"                                                                                                 => ':smirk:',
+            "\xee\xaa\xbf"                                                                                                 => ':smirk:',
+            "\xf0\x9f\x98\x90"                                                                                             => ':neutral_face:',
+            "\xf0\x9f\x98\x91"                                                                                             => ':expressionless:',
+            "\xf0\x9f\x98\x92"                                                                                             => ':unamused:',
+            "\xf3\xbe\x8c\xa6"                                                                                             => ':unamused:',
+            "\xee\x9c\xa5"                                                                                                 => ':unamused:',
+            "\xee\x90\x8e"                                                                                                 => ':unamused:',
+            "\xee\xab\x89"                                                                                                 => ':unamused:',
+            "\xf0\x9f\x98\x93"                                                                                             => ':sweat:',
+            "\xf3\xbe\x8d\x84"                                                                                             => ':sweat:',
+            "\xee\x9c\xa3"                                                                                                 => ':cold_sweat:',
+            "\xee\x84\x88"                                                                                                 => ':sweat:',
+            "\xee\x97\x86"                                                                                                 => ':disappointed_relieved:',
+            "\xf0\x9f\x98\x94"                                                                                             => ':pensive:',
+            "\xf3\xbe\x8d\x80"                                                                                             => ':pensive:',
+            "\xee\x9c\xa0"                                                                                                 => ':pensive:',
+            "\xee\x90\x83"                                                                                                 => ':person_frowning:',
+            "\xee\xab\x80"                                                                                                 => ':disappointed:',
+            "\xf0\x9f\x98\x95"                                                                                             => ':confused:',
+            "\xf0\x9f\x98\x96"                                                                                             => ':confounded:',
+            "\xf3\xbe\x8c\xbf"                                                                                             => ':confounded:',
+            "\xee\x9b\xb3"                                                                                                 => ':person_frowning:',
+            "\xee\xab\x83"                                                                                                 => ':confounded:',
+            "\xf0\x9f\x98\x97"                                                                                             => ':kissing:',
+            "\xf0\x9f\x98\x98"                                                                                             => ':kissing_heart:',
+            "\xf3\xbe\x8c\xac"                                                                                             => ':kissing_heart:',
+            "\xee\x90\x98"                                                                                                 => ':kissing_cat:',
+            "\xee\xab\x8f"                                                                                                 => ':kissing_heart:',
+            "\xf0\x9f\x98\x99"                                                                                             => ':kissing_smiling_eyes:',
+            "\xf0\x9f\x98\x9a"                                                                                             => ':kissing_closed_eyes:',
+            "\xf3\xbe\x8c\xad"                                                                                             => ':kissing_closed_eyes:',
+            "\xee\x90\x97"                                                                                                 => ':kissing_closed_eyes:',
+            "\xee\xab\x8e"                                                                                                 => ':kissing_closed_eyes:',
+            "\xf0\x9f\x98\x9b"                                                                                             => ':stuck_out_tongue:',
+            "\xf0\x9f\x98\x9c"                                                                                             => ':stuck_out_tongue_winking_eye:',
+            "\xf3\xbe\x8c\xa9"                                                                                             => ':stuck_out_tongue_winking_eye:',
+            "\xee\x84\x85"                                                                                                 => ':stuck_out_tongue_winking_eye:',
+            "\xee\x93\xa7"                                                                                                 => ':stuck_out_tongue_closed_eyes:',
+            "\xf0\x9f\x98\x9d"                                                                                             => ':stuck_out_tongue_closed_eyes:',
+            "\xf3\xbe\x8c\xaa"                                                                                             => ':stuck_out_tongue_closed_eyes:',
+            "\xf0\x9f\x98\x9e"                                                                                             => ':disappointed:',
+            "\xf3\xbe\x8c\xa3"                                                                                             => ':disappointed:',
+            "\xee\x9b\xb2"                                                                                                 => ':disappointed:',
+            "\xee\x81\x98"                                                                                                 => ':disappointed:',
+            "\xf0\x9f\x98\x9f"                                                                                             => ':worried:',
+            "\xf0\x9f\x98\xa0"                                                                                             => ':angry:',
+            "\xf3\xbe\x8c\xa0"                                                                                             => ':angry:',
+            "\xee\x9b\xb1"                                                                                                 => ':person_with_pouting_face:',
+            "\xee\x81\x99"                                                                                                 => ':angry:',
+            "\xee\x91\xb2"                                                                                                 => ':angry:',
+            "\xf0\x9f\x98\xa1"                                                                                             => ':rage:',
+            "\xf3\xbe\x8c\xbd"                                                                                             => ':rage:',
+            "\xee\x9c\xa4"                                                                                                 => ':pouting_cat:',
+            "\xee\x90\x96"                                                                                                 => ':person_with_pouting_face:',
+            "\xee\xad\x9d"                                                                                                 => ':rage:',
+            "\xf0\x9f\x98\xa2"                                                                                             => ':cry:',
+            "\xf3\xbe\x8c\xb9"                                                                                             => ':cry:',
+            "\xee\x9c\xae"                                                                                                 => ':crying_cat_face:',
+            "\xee\x90\x93"                                                                                                 => ':crying_cat_face:',
+            "\xee\xad\xa9"                                                                                                 => ':cry:',
+            "\xf0\x9f\x98\xa3"                                                                                             => ':persevere:',
+            "\xf3\xbe\x8c\xbc"                                                                                             => ':persevere:',
+            "\xee\x9c\xab"                                                                                                 => ':tired_face:',
+            "\xee\x90\x86"                                                                                                 => ':dizzy_face:',
+            "\xee\xab\x82"                                                                                                 => ':persevere:',
+            "\xf0\x9f\x98\xa4"                                                                                             => ':triumph:',
+            "\xf3\xbe\x8c\xa8"                                                                                             => ':triumph:',
+            "\xee\xab\x81"                                                                                                 => ':triumph:',
+            "\xf0\x9f\x98\xa5"                                                                                             => ':disappointed_relieved:',
+            "\xf3\xbe\x8d\x85"                                                                                             => ':disappointed_relieved:',
+            "\xee\x90\x81"                                                                                                 => ':disappointed_relieved:',
+            "\xf0\x9f\x98\xa6"                                                                                             => ':frowning:',
+            "\xf0\x9f\x98\xa7"                                                                                             => ':anguished:',
+            "\xf0\x9f\x98\xa8"                                                                                             => ':fearful:',
+            "\xf3\xbe\x8c\xbb"                                                                                             => ':fearful:',
+            "\xee\x9d\x97"                                                                                                 => ':scream:',
+            "\xee\x90\x8b"                                                                                                 => ':fearful:',
+            "\xee\xab\x86"                                                                                                 => ':fearful:',
+            "\xf0\x9f\x98\xa9"                                                                                             => ':weary:',
+            "\xf3\xbe\x8c\xa1"                                                                                             => ':weary:',
+            "\xee\xad\xa7"                                                                                                 => ':weary:',
+            "\xf0\x9f\x98\xaa"                                                                                             => ':sleepy:',
+            "\xf3\xbe\x8d\x82"                                                                                             => ':sleepy:',
+            "\xee\x90\x88"                                                                                                 => ':sleepy:',
+            "\xee\xab\x84"                                                                                                 => ':sleepy:',
+            "\xf0\x9f\x98\xab"                                                                                             => ':tired_face:',
+            "\xf3\xbe\x8d\x86"                                                                                             => ':tired_face:',
+            "\xee\x91\xb4"                                                                                                 => ':tired_face:',
+            "\xf0\x9f\x98\xac"                                                                                             => ':grimacing:',
+            "\xf0\x9f\x98\xad"                                                                                             => ':sob:',
+            "\xf3\xbe\x8c\xba"                                                                                             => ':sob:',
+            "\xee\x9c\xad"                                                                                                 => ':sob:',
+            "\xee\x90\x91"                                                                                                 => ':sob:',
+            "\xee\x91\xb3"                                                                                                 => ':sob:',
+            "\xf0\x9f\x98\xae"                                                                                             => ':open_mouth:',
+            "\xf0\x9f\x98\xaf"                                                                                             => ':hushed:',
+            "\xf0\x9f\x98\xb0"                                                                                             => ':cold_sweat:',
+            "\xf3\xbe\x8c\xa5"                                                                                             => ':cold_sweat:',
+            "\xee\x90\x8f"                                                                                                 => ':cold_sweat:',
+            "\xee\xab\x8b"                                                                                                 => ':cold_sweat:',
+            "\xf0\x9f\x98\xb1"                                                                                             => ':scream:',
+            "\xf3\xbe\x8d\x81"                                                                                             => ':scream:',
+            "\xee\x84\x87"                                                                                                 => ':scream:',
+            "\xee\x97\x85"                                                                                                 => ':scream:',
+            "\xf0\x9f\x98\xb2"                                                                                             => ':astonished:',
+            "\xf3\xbe\x8c\xa2"                                                                                             => ':astonished:',
+            "\xee\x9b\xb4"                                                                                                 => ':dizzy_face:',
+            "\xee\x90\x90"                                                                                                 => ':astonished:',
+            "\xee\xab\x8a"                                                                                                 => ':astonished:',
+            "\xf0\x9f\x98\xb3"                                                                                             => ':flushed:',
+            "\xf3\xbe\x8c\xaf"                                                                                             => ':flushed:',
+            "\xee\x90\x8d"                                                                                                 => ':flushed:',
+            "\xee\xab\x88"                                                                                                 => ':flushed:',
+            "\xf0\x9f\x98\xb4"                                                                                             => ':sleeping:',
+            "\xf0\x9f\x98\xb5"                                                                                             => ':dizzy_face:',
+            "\xf3\xbe\x8c\xa4"                                                                                             => ':dizzy_face:',
+            "\xee\x96\xae"                                                                                                 => ':dizzy_face:',
+            "\xf0\x9f\x98\xb6"                                                                                             => ':no_mouth:',
+            "\xf0\x9f\x98\xb7"                                                                                             => ':mask:',
+            "\xf3\xbe\x8c\xae"                                                                                             => ':mask:',
+            "\xee\x90\x8c"                                                                                                 => ':mask:',
+            "\xee\xab\x87"                                                                                                 => ':mask:',
+            "\xf0\x9f\x98\xb8"                                                                                             => ':smile_cat:',
+            "\xf3\xbe\x8d\x89"                                                                                             => ':smile_cat:',
+            "\xee\xad\xbf"                                                                                                 => ':smile_cat:',
+            "\xf0\x9f\x98\xb9"                                                                                             => ':joy_cat:',
+            "\xf3\xbe\x8d\x8a"                                                                                             => ':joy_cat:',
+            "\xee\xad\xa3"                                                                                                 => ':joy_cat:',
+            "\xf0\x9f\x98\xba"                                                                                             => ':smiley_cat:',
+            "\xf3\xbe\x8d\x88"                                                                                             => ':smiley_cat:',
+            "\xee\xad\xa1"                                                                                                 => ':smiley_cat:',
+            "\xf0\x9f\x98\xbb"                                                                                             => ':heart_eyes_cat:',
+            "\xf3\xbe\x8d\x8c"                                                                                             => ':heart_eyes_cat:',
+            "\xee\xad\xa5"                                                                                                 => ':heart_eyes_cat:',
+            "\xf0\x9f\x98\xbc"                                                                                             => ':smirk_cat:',
+            "\xf3\xbe\x8d\x8f"                                                                                             => ':smirk_cat:',
+            "\xee\xad\xaa"                                                                                                 => ':smirk_cat:',
+            "\xf0\x9f\x98\xbd"                                                                                             => ':kissing_cat:',
+            "\xf3\xbe\x8d\x8b"                                                                                             => ':kissing_cat:',
+            "\xee\xad\xa0"                                                                                                 => ':kissing_cat:',
+            "\xf0\x9f\x98\xbe"                                                                                             => ':pouting_cat:',
+            "\xf3\xbe\x8d\x8e"                                                                                             => ':pouting_cat:',
+            "\xee\xad\x9e"                                                                                                 => ':pouting_cat:',
+            "\xf0\x9f\x98\xbf"                                                                                             => ':crying_cat_face:',
+            "\xf3\xbe\x8d\x8d"                                                                                             => ':crying_cat_face:',
+            "\xee\xad\xa8"                                                                                                 => ':crying_cat_face:',
+            "\xf0\x9f\x99\x80"                                                                                             => ':scream_cat:',
+            "\xf3\xbe\x8d\x90"                                                                                             => ':scream_cat:',
+            "\xee\xad\xa6"                                                                                                 => ':scream_cat:',
+            "\xf0\x9f\x99\x81"                                                                                             => ':slightly_frowning_face:',
+            "\xf0\x9f\x99\x82"                                                                                             => ':slightly_smiling_face:',
+            "\xf0\x9f\x99\x83"                                                                                             => ':upside_down_face:',
+            "\xf0\x9f\x99\x84"                                                                                             => ':face_with_rolling_eyes:',
+            "\xf0\x9f\x99\x85"                                                                                             => ':no_good:',
+            "\xf3\xbe\x8d\x91"                                                                                             => ':no_good:',
+            "\xee\x90\xa3"                                                                                                 => ':no_good:',
+            "\xee\xab\x97"                                                                                                 => ':no_good:',
+            "\xf0\x9f\x99\x86"                                                                                             => ':ok_woman:',
+            "\xf3\xbe\x8d\x92"                                                                                             => ':ok_woman:',
+            "\xee\x90\xa4"                                                                                                 => ':ok_woman:',
+            "\xee\xab\x98"                                                                                                 => ':ok_woman:',
+            "\xf0\x9f\x99\x87"                                                                                             => ':bow:',
+            "\xf3\xbe\x8d\x93"                                                                                             => ':bow:',
+            "\xee\x90\xa6"                                                                                                 => ':bow:',
+            "\xee\xab\x99"                                                                                                 => ':bow:',
+            "\xf0\x9f\x99\x88"                                                                                             => ':see_no_evil:',
+            "\xf3\xbe\x8d\x94"                                                                                             => ':see_no_evil:',
+            "\xee\xad\x90"                                                                                                 => ':see_no_evil:',
+            "\xf0\x9f\x99\x89"                                                                                             => ':hear_no_evil:',
+            "\xf3\xbe\x8d\x96"                                                                                             => ':hear_no_evil:',
+            "\xee\xad\x92"                                                                                                 => ':hear_no_evil:',
+            "\xf0\x9f\x99\x8a"                                                                                             => ':speak_no_evil:',
+            "\xf3\xbe\x8d\x95"                                                                                             => ':speak_no_evil:',
+            "\xee\xad\x91"                                                                                                 => ':speak_no_evil:',
+            "\xf0\x9f\x99\x8b"                                                                                             => ':raising_hand:',
+            "\xf3\xbe\x8d\x97"                                                                                             => ':raising_hand:',
+            "\xee\xae\x85"                                                                                                 => ':raising_hand:',
+            "\xf0\x9f\x99\x8c"                                                                                             => ':raised_hands:',
+            "\xf3\xbe\x8d\x98"                                                                                             => ':raised_hands:',
+            "\xee\x90\xa7"                                                                                                 => ':raised_hands:',
+            "\xee\xae\x86"                                                                                                 => ':raised_hands:',
+            "\xf0\x9f\x99\x8d"                                                                                             => ':person_frowning:',
+            "\xf3\xbe\x8d\x99"                                                                                             => ':person_frowning:',
+            "\xee\xae\x87"                                                                                                 => ':person_frowning:',
+            "\xf0\x9f\x99\x8e"                                                                                             => ':person_with_pouting_face:',
+            "\xf3\xbe\x8d\x9a"                                                                                             => ':person_with_pouting_face:',
+            "\xee\xae\x88"                                                                                                 => ':person_with_pouting_face:',
+            "\xf0\x9f\x99\x8f"                                                                                             => ':pray:',
+            "\xf3\xbe\x8d\x9b"                                                                                             => ':pray:',
+            "\xee\x90\x9d"                                                                                                 => ':pray:',
+            "\xee\xab\x92"                                                                                                 => ':pray:',
+            "\xf0\x9f\x9a\x80"                                                                                             => ':rocket:',
+            "\xf3\xbe\x9f\xad"                                                                                             => ':rocket:',
+            "\xee\x84\x8d"                                                                                                 => ':rocket:',
+            "\xee\x97\x88"                                                                                                 => ':rocket:',
+            "\xf0\x9f\x9a\x81"                                                                                             => ':helicopter:',
+            "\xf0\x9f\x9a\x82"                                                                                             => ':steam_locomotive:',
+            "\xf0\x9f\x9a\x83"                                                                                             => ':railway_car:',
+            "\xf3\xbe\x9f\x9f"                                                                                             => ':railway_car:',
+            "\xee\x99\x9b"                                                                                                 => ':railway_car:',
+            "\xee\x80\x9e"                                                                                                 => ':railway_car:',
+            "\xee\x92\xb5"                                                                                                 => ':railway_car:',
+            "\xf0\x9f\x9a\x84"                                                                                             => ':bullettrain_side:',
+            "\xf3\xbe\x9f\xa2"                                                                                             => ':bullettrain_side:',
+            "\xee\x99\x9d"                                                                                                 => ':bullettrain_front:',
+            "\xee\x90\xb5"                                                                                                 => ':bullettrain_side:',
+            "\xee\x92\xb0"                                                                                                 => ':bullettrain_front:',
+            "\xf0\x9f\x9a\x85"                                                                                             => ':bullettrain_front:',
+            "\xf3\xbe\x9f\xa3"                                                                                             => ':bullettrain_front:',
+            "\xee\x80\x9f"                                                                                                 => ':bullettrain_front:',
+            "\xf0\x9f\x9a\x86"                                                                                             => ':train2:',
+            "\xf0\x9f\x9a\x87"                                                                                             => ':metro:',
+            "\xf3\xbe\x9f\xa0"                                                                                             => ':metro:',
+            "\xf0\x9f\x9a\x88"                                                                                             => ':light_rail:',
+            "\xf0\x9f\x9a\x89"                                                                                             => ':station:',
+            "\xf3\xbe\x9f\xac"                                                                                             => ':station:',
+            "\xee\x80\xb9"                                                                                                 => ':station:',
+            "\xee\xad\xad"                                                                                                 => ':station:',
+            "\xf0\x9f\x9a\x8a"                                                                                             => ':tram:',
+            "\xf0\x9f\x9a\x8b"                                                                                             => ':train:',
+            "\xf0\x9f\x9a\x8c"                                                                                             => ':bus:',
+            "\xf3\xbe\x9f\xa6"                                                                                             => ':bus:',
+            "\xee\x99\xa0"                                                                                                 => ':bus:',
+            "\xee\x85\x99"                                                                                                 => ':bus:',
+            "\xee\x92\xaf"                                                                                                 => ':bus:',
+            "\xf0\x9f\x9a\x8d"                                                                                             => ':oncoming_bus:',
+            "\xf0\x9f\x9a\x8e"                                                                                             => ':trolleybus:',
+            "\xf0\x9f\x9a\x8f"                                                                                             => ':busstop:',
+            "\xf3\xbe\x9f\xa7"                                                                                             => ':busstop:',
+            "\xee\x85\x90"                                                                                                 => ':busstop:',
+            "\xee\x92\xa7"                                                                                                 => ':busstop:',
+            "\xf0\x9f\x9a\x90"                                                                                             => ':minibus:',
+            "\xf0\x9f\x9a\x91"                                                                                             => ':ambulance:',
+            "\xf3\xbe\x9f\xb3"                                                                                             => ':ambulance:',
+            "\xee\x90\xb1"                                                                                                 => ':ambulance:',
+            "\xee\xab\xa0"                                                                                                 => ':ambulance:',
+            "\xf0\x9f\x9a\x92"                                                                                             => ':fire_engine:',
+            "\xf3\xbe\x9f\xb2"                                                                                             => ':fire_engine:',
+            "\xee\x90\xb0"                                                                                                 => ':fire_engine:',
+            "\xee\xab\x9f"                                                                                                 => ':fire_engine:',
+            "\xf0\x9f\x9a\x93"                                                                                             => ':police_car:',
+            "\xf3\xbe\x9f\xb4"                                                                                             => ':police_car:',
+            "\xee\x90\xb2"                                                                                                 => ':rotating_light:',
+            "\xee\xab\xa1"                                                                                                 => ':police_car:',
+            "\xf0\x9f\x9a\x94"                                                                                             => ':oncoming_police_car:',
+            "\xf0\x9f\x9a\x95"                                                                                             => ':taxi:',
+            "\xf3\xbe\x9f\xaf"                                                                                             => ':taxi:',
+            "\xee\x99\x9e"                                                                                                 => ':red_car:',
+            "\xee\x85\x9a"                                                                                                 => ':taxi:',
+            "\xee\x92\xb1"                                                                                                 => ':blue_car:',
+            "\xf0\x9f\x9a\x96"                                                                                             => ':oncoming_taxi:',
+            "\xf0\x9f\x9a\x97"                                                                                             => ':red_car:',
+            "\xf3\xbe\x9f\xa4"                                                                                             => ':red_car:',
+            "\xee\x80\x9b"                                                                                                 => ':red_car:',
+            "\xf0\x9f\x9a\x98"                                                                                             => ':oncoming_automobile:',
+            "\xf0\x9f\x9a\x99"                                                                                             => ':blue_car:',
+            "\xf3\xbe\x9f\xa5"                                                                                             => ':blue_car:',
+            "\xee\x99\x9f"                                                                                                 => ':blue_car:',
+            "\xee\x90\xae"                                                                                                 => ':blue_car:',
+            "\xf0\x9f\x9a\x9a"                                                                                             => ':truck:',
+            "\xf3\xbe\x9f\xb1"                                                                                             => ':truck:',
+            "\xee\x90\xaf"                                                                                                 => ':truck:',
+            "\xee\x92\xb2"                                                                                                 => ':truck:',
+            "\xf0\x9f\x9a\x9b"                                                                                             => ':articulated_lorry:',
+            "\xf0\x9f\x9a\x9c"                                                                                             => ':tractor:',
+            "\xf0\x9f\x9a\x9d"                                                                                             => ':monorail:',
+            "\xf0\x9f\x9a\x9e"                                                                                             => ':mountain_railway:',
+            "\xf0\x9f\x9a\x9f"                                                                                             => ':suspension_railway:',
+            "\xf0\x9f\x9a\xa0"                                                                                             => ':mountain_cableway:',
+            "\xf0\x9f\x9a\xa1"                                                                                             => ':aerial_tramway:',
+            "\xf0\x9f\x9a\xa2"                                                                                             => ':ship:',
+            "\xf3\xbe\x9f\xa8"                                                                                             => ':ship:',
+            "\xee\xaa\x82"                                                                                                 => ':ship:',
+            "\xf0\x9f\x9a\xa3"                                                                                             => ':rowboat:',
+            "\xf0\x9f\x9a\xa4"                                                                                             => ':speedboat:',
+            "\xf3\xbe\x9f\xae"                                                                                             => ':speedboat:',
+            "\xee\x84\xb5"                                                                                                 => ':speedboat:',
+            "\xf0\x9f\x9a\xa5"                                                                                             => ':traffic_light:',
+            "\xf3\xbe\x9f\xb7"                                                                                             => ':traffic_light:',
+            "\xee\x99\xad"                                                                                                 => ':traffic_light:',
+            "\xee\x85\x8e"                                                                                                 => ':traffic_light:',
+            "\xee\x91\xaa"                                                                                                 => ':traffic_light:',
+            "\xf0\x9f\x9a\xa6"                                                                                             => ':vertical_traffic_light:',
+            "\xf0\x9f\x9a\xa7"                                                                                             => ':construction:',
+            "\xf3\xbe\x9f\xb8"                                                                                             => ':construction:',
+            "\xee\x97\x97"                                                                                                 => ':construction:',
+            "\xf0\x9f\x9a\xa8"                                                                                             => ':rotating_light:',
+            "\xf3\xbe\x9f\xb9"                                                                                             => ':rotating_light:',
+            "\xee\xad\xb3"                                                                                                 => ':rotating_light:',
+            "\xf0\x9f\x9a\xa9"                                                                                             => ':triangular_flag_on_post:',
+            "\xf3\xbe\xac\xa2"                                                                                             => ':triangular_flag_on_post:',
+            "\xee\x9b\x9e"                                                                                                 => ':triangular_flag_on_post:',
+            "\xee\xac\xac"                                                                                                 => ':triangular_flag_on_post:',
+            "\xf0\x9f\x9a\xaa"                                                                                             => ':door:',
+            "\xf3\xbe\x93\xb3"                                                                                             => ':door:',
+            "\xee\x9c\x94"                                                                                                 => ':door:',
+            "\xf0\x9f\x9a\xab"                                                                                             => ':no_entry_sign:',
+            "\xf3\xbe\xad\x88"                                                                                             => ':no_entry_sign:',
+            "\xee\x95\x81"                                                                                                 => ':no_entry_sign:',
+            "\xf0\x9f\x9a\xac"                                                                                             => ':smoking:',
+            "\xf3\xbe\xac\x9e"                                                                                             => ':smoking:',
+            "\xee\x99\xbf"                                                                                                 => ':smoking:',
+            "\xee\x8c\x8e"                                                                                                 => ':smoking:',
+            "\xee\x91\xbd"                                                                                                 => ':smoking:',
+            "\xf0\x9f\x9a\xad"                                                                                             => ':no_smoking:',
+            "\xf3\xbe\xac\x9f"                                                                                             => ':no_smoking:',
+            "\xee\x9a\x80"                                                                                                 => ':no_smoking:',
+            "\xee\x88\x88"                                                                                                 => ':no_smoking:',
+            "\xee\x91\xbe"                                                                                                 => ':no_smoking:',
+            "\xf0\x9f\x9a\xae"                                                                                             => ':put_litter_in_its_place:',
+            "\xf0\x9f\x9a\xaf"                                                                                             => ':do_not_litter:',
+            "\xf0\x9f\x9a\xb0"                                                                                             => ':potable_water:',
+            "\xf0\x9f\x9a\xb1"                                                                                             => ':non-potable_water:',
+            "\xf0\x9f\x9a\xb2"                                                                                             => ':bike:',
+            "\xf3\xbe\x9f\xab"                                                                                             => ':bike:',
+            "\xee\x9c\x9d"                                                                                                 => ':bike:',
+            "\xee\x84\xb6"                                                                                                 => ':bike:',
+            "\xee\x92\xae"                                                                                                 => ':bike:',
+            "\xf0\x9f\x9a\xb3"                                                                                             => ':no_bicycles:',
+            "\xf0\x9f\x9a\xb4"                                                                                             => ':bicyclist:',
+            "\xf0\x9f\x9a\xb5"                                                                                             => ':mountain_bicyclist:',
+            "\xf0\x9f\x9a\xb6"                                                                                             => ':walking:',
+            "\xf3\xbe\x9f\xb0"                                                                                             => ':walking:',
+            "\xee\x88\x81"                                                                                                 => ':walking:',
+            "\xee\xad\xb2"                                                                                                 => ':walking:',
+            "\xf0\x9f\x9a\xb7"                                                                                             => ':no_pedestrians:',
+            "\xf0\x9f\x9a\xb8"                                                                                             => ':children_crossing:',
+            "\xf0\x9f\x9a\xb9"                                                                                             => ':mens:',
+            "\xf3\xbe\xac\xb3"                                                                                             => ':mens:',
+            "\xee\x84\xb8"                                                                                                 => ':mens:',
+            "\xf0\x9f\x9a\xba"                                                                                             => ':womens:',
+            "\xf3\xbe\xac\xb4"                                                                                             => ':womens:',
+            "\xee\x84\xb9"                                                                                                 => ':womens:',
+            "\xf0\x9f\x9a\xbb"                                                                                             => ':restroom:',
+            "\xf3\xbe\x94\x86"                                                                                             => ':restroom:',
+            "\xee\x99\xae"                                                                                                 => ':wc:',
+            "\xee\x85\x91"                                                                                                 => ':restroom:',
+            "\xee\x92\xa5"                                                                                                 => ':wc:',
+            "\xf0\x9f\x9a\xbc"                                                                                             => ':baby_symbol:',
+            "\xf3\xbe\xac\xb5"                                                                                             => ':baby_symbol:',
+            "\xee\x84\xba"                                                                                                 => ':baby_symbol:',
+            "\xf0\x9f\x9a\xbd"                                                                                             => ':toilet:',
+            "\xf3\xbe\x94\x87"                                                                                             => ':toilet:',
+            "\xee\x85\x80"                                                                                                 => ':toilet:',
+            "\xf0\x9f\x9a\xbe"                                                                                             => ':wc:',
+            "\xf3\xbe\x94\x88"                                                                                             => ':wc:',
+            "\xee\x8c\x89"                                                                                                 => ':wc:',
+            "\xf0\x9f\x9a\xbf"                                                                                             => ':shower:',
+            "\xf0\x9f\x9b\x80"                                                                                             => ':bath:',
+            "\xf3\xbe\x94\x85"                                                                                             => ':bath:',
+            "\xee\x84\xbf"                                                                                                 => ':bath:',
+            "\xee\x97\x98"                                                                                                 => ':bath:',
+            "\xf0\x9f\x9b\x81"                                                                                             => ':bathtub:',
+            "\xf0\x9f\x9b\x82"                                                                                             => ':passport_control:',
+            "\xf0\x9f\x9b\x83"                                                                                             => ':customs:',
+            "\xf0\x9f\x9b\x84"                                                                                             => ':baggage_claim:',
+            "\xf0\x9f\x9b\x85"                                                                                             => ':left_luggage:',
+            "\xf0\x9f\x9b\x8b"                                                                                             => ':couch_and_lamp:',
+            "\xf0\x9f\x9b\x8c"                                                                                             => ':sleeping_accommodation:',
+            "\xf0\x9f\x9b\x8d"                                                                                             => ':shopping_bags:',
+            "\xf0\x9f\x9b\x8e"                                                                                             => ':bellhop_bell:',
+            "\xf0\x9f\x9b\x8f"                                                                                             => ':bed:',
+            "\xf0\x9f\x9b\x90"                                                                                             => ':place_of_worship:',
+            "\xf0\x9f\x9b\xa0"                                                                                             => ':hammer_and_wrench:',
+            "\xf0\x9f\x9b\xa1"                                                                                             => ':shield:',
+            "\xf0\x9f\x9b\xa2"                                                                                             => ':oil_drum:',
+            "\xf0\x9f\x9b\xa3"                                                                                             => ':motorway:',
+            "\xf0\x9f\x9b\xa4"                                                                                             => ':railway_track:',
+            "\xf0\x9f\x9b\xa5"                                                                                             => ':motor_boat:',
+            "\xf0\x9f\x9b\xa9"                                                                                             => ':small_airplane:',
+            "\xf0\x9f\x9b\xab"                                                                                             => ':airplane_departure:',
+            "\xf0\x9f\x9b\xac"                                                                                             => ':airplane_arriving:',
+            "\xf0\x9f\x9b\xb0"                                                                                             => ':satellite:',
+            "\xf0\x9f\x9b\xb3"                                                                                             => ':passenger_ship:',
+            "\xf0\x9f\xa4\x90"                                                                                             => ':zipper_mouth_face:',
+            "\xf0\x9f\xa4\x91"                                                                                             => ':money_mouth_face:',
+            "\xf0\x9f\xa4\x92"                                                                                             => ':face_with_thermometer:',
+            "\xf0\x9f\xa4\x93"                                                                                             => ':nerd_face:',
+            "\xf0\x9f\xa4\x94"                                                                                             => ':thinking_face:',
+            "\xf0\x9f\xa4\x95"                                                                                             => ':face_with_head_bandage:',
+            "\xf0\x9f\xa4\x96"                                                                                             => ':robot_face:',
+            "\xf0\x9f\xa4\x97"                                                                                             => ':hugging_face:',
+            "\xf0\x9f\xa4\x98"                                                                                             => ':sign_of_the_horns:',
+            "\xf0\x9f\xa6\x80"                                                                                             => ':crab:',
+            "\xf0\x9f\xa6\x81"                                                                                             => ':lion_face:',
+            "\xf0\x9f\xa6\x82"                                                                                             => ':scorpion:',
+            "\xf0\x9f\xa6\x83"                                                                                             => ':turkey:',
+            "\xf0\x9f\xa6\x84"                                                                                             => ':unicorn_face:',
+            "\xf0\x9f\xa7\x80"                                                                                             => ':cheese_wedge:',
+            "#\xe2\x83\xa3"                                                                                                => ':hash:',
+            "\xf3\xbe\xa0\xac"                                                                                             => ':hash:',
+            "\xee\x9b\xa0"                                                                                                 => ':hash:',
+            "\xee\x88\x90"                                                                                                 => ':hash:',
+            "\xee\xae\x84"                                                                                                 => ':hash:',
+            "#\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':hash:',
+            "*\xe2\x83\xa3"                                                                                                => ':keycap_star:',
+            "0\xe2\x83\xa3"                                                                                                => ':zero:',
+            "\xf3\xbe\xa0\xb7"                                                                                             => ':zero:',
+            "\xee\x9b\xab"                                                                                                 => ':zero:',
+            "\xee\x88\xa5"                                                                                                 => ':zero:',
+            "\xee\x96\xac"                                                                                                 => ':zero:',
+            "0\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':zero:',
+            "1\xe2\x83\xa3"                                                                                                => ':one:',
+            "\xf3\xbe\xa0\xae"                                                                                             => ':one:',
+            "\xee\x9b\xa2"                                                                                                 => ':one:',
+            "\xee\x88\x9c"                                                                                                 => ':one:',
+            "1\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':one:',
+            "2\xe2\x83\xa3"                                                                                                => ':two:',
+            "\xf3\xbe\xa0\xaf"                                                                                             => ':two:',
+            "\xee\x9b\xa3"                                                                                                 => ':two:',
+            "\xee\x88\x9d"                                                                                                 => ':two:',
+            "2\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':two:',
+            "3\xe2\x83\xa3"                                                                                                => ':three:',
+            "\xf3\xbe\xa0\xb0"                                                                                             => ':three:',
+            "\xee\x9b\xa4"                                                                                                 => ':three:',
+            "\xee\x88\x9e"                                                                                                 => ':three:',
+            "3\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':three:',
+            "4\xe2\x83\xa3"                                                                                                => ':four:',
+            "\xf3\xbe\xa0\xb1"                                                                                             => ':four:',
+            "\xee\x9b\xa5"                                                                                                 => ':four:',
+            "\xee\x88\x9f"                                                                                                 => ':four:',
+            "4\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':four:',
+            "5\xe2\x83\xa3"                                                                                                => ':five:',
+            "\xf3\xbe\xa0\xb2"                                                                                             => ':five:',
+            "\xee\x9b\xa6"                                                                                                 => ':five:',
+            "\xee\x88\xa0"                                                                                                 => ':five:',
+            "5\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':five:',
+            "6\xe2\x83\xa3"                                                                                                => ':six:',
+            "\xf3\xbe\xa0\xb3"                                                                                             => ':six:',
+            "\xee\x9b\xa7"                                                                                                 => ':six:',
+            "\xee\x88\xa1"                                                                                                 => ':six:',
+            "6\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':six:',
+            "7\xe2\x83\xa3"                                                                                                => ':seven:',
+            "\xf3\xbe\xa0\xb4"                                                                                             => ':seven:',
+            "\xee\x9b\xa8"                                                                                                 => ':seven:',
+            "\xee\x88\xa2"                                                                                                 => ':seven:',
+            "7\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':seven:',
+            "8\xe2\x83\xa3"                                                                                                => ':eight:',
+            "\xf3\xbe\xa0\xb5"                                                                                             => ':eight:',
+            "\xee\x9b\xa9"                                                                                                 => ':eight:',
+            "\xee\x88\xa3"                                                                                                 => ':eight:',
+            "8\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':eight:',
+            "9\xe2\x83\xa3"                                                                                                => ':nine:',
+            "\xf3\xbe\xa0\xb6"                                                                                             => ':nine:',
+            "\xee\x9b\xaa"                                                                                                 => ':nine:',
+            "\xee\x88\xa4"                                                                                                 => ':nine:',
+            "9\xef\xb8\x8f\xe2\x83\xa3"                                                                                    => ':nine:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa8"                                                                             => ':flag-ac:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xa9"                                                                             => ':flag-ad:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xaa"                                                                             => ':flag-ae:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xab"                                                                             => ':flag-af:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xac"                                                                             => ':flag-ag:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xae"                                                                             => ':flag-ai:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb1"                                                                             => ':flag-al:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb2"                                                                             => ':flag-am:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb4"                                                                             => ':flag-ao:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb6"                                                                             => ':flag-aq:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb7"                                                                             => ':flag-ar:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb8"                                                                             => ':flag-as:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xb9"                                                                             => ':flag-at:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xba"                                                                             => ':flag-au:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbc"                                                                             => ':flag-aw:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbd"                                                                             => ':flag-ax:',
+            "\xf0\x9f\x87\xa6\xf0\x9f\x87\xbf"                                                                             => ':flag-az:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa6"                                                                             => ':flag-ba:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa7"                                                                             => ':flag-bb:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xa9"                                                                             => ':flag-bd:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaa"                                                                             => ':flag-be:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xab"                                                                             => ':flag-bf:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xac"                                                                             => ':flag-bg:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xad"                                                                             => ':flag-bh:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xae"                                                                             => ':flag-bi:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xaf"                                                                             => ':flag-bj:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb1"                                                                             => ':flag-bl:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb2"                                                                             => ':flag-bm:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb3"                                                                             => ':flag-bn:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb4"                                                                             => ':flag-bo:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb6"                                                                             => ':flag-bq:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb7"                                                                             => ':flag-br:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb8"                                                                             => ':flag-bs:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xb9"                                                                             => ':flag-bt:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbb"                                                                             => ':flag-bv:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbc"                                                                             => ':flag-bw:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbe"                                                                             => ':flag-by:',
+            "\xf0\x9f\x87\xa7\xf0\x9f\x87\xbf"                                                                             => ':flag-bz:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa6"                                                                             => ':flag-ca:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa8"                                                                             => ':flag-cc:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xa9"                                                                             => ':flag-cd:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xab"                                                                             => ':flag-cf:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xac"                                                                             => ':flag-cg:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xad"                                                                             => ':flag-ch:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xae"                                                                             => ':flag-ci:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb0"                                                                             => ':flag-ck:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb1"                                                                             => ':flag-cl:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb2"                                                                             => ':flag-cm:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb3"                                                                             => ':cn:',
+            "\xf3\xbe\x93\xad"                                                                                             => ':cn:',
+            "\xee\xac\x91"                                                                                                 => ':cn:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb4"                                                                             => ':flag-co:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb5"                                                                             => ':flag-cp:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xb7"                                                                             => ':flag-cr:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xba"                                                                             => ':flag-cu:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbb"                                                                             => ':flag-cv:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbc"                                                                             => ':flag-cw:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbd"                                                                             => ':flag-cx:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbe"                                                                             => ':flag-cy:',
+            "\xf0\x9f\x87\xa8\xf0\x9f\x87\xbf"                                                                             => ':flag-cz:',
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaa"                                                                             => ':de:',
+            "\xf3\xbe\x93\xa8"                                                                                             => ':de:',
+            "\xee\xac\x8e"                                                                                                 => ':de:',
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xac"                                                                             => ':flag-dg:',
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xaf"                                                                             => ':flag-dj:',
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb0"                                                                             => ':flag-dk:',
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb2"                                                                             => ':flag-dm:',
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xb4"                                                                             => ':flag-do:',
+            "\xf0\x9f\x87\xa9\xf0\x9f\x87\xbf"                                                                             => ':flag-dz:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa6"                                                                             => ':flag-ea:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xa8"                                                                             => ':flag-ec:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xaa"                                                                             => ':flag-ee:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xac"                                                                             => ':flag-eg:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xad"                                                                             => ':flag-eh:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb7"                                                                             => ':flag-er:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb8"                                                                             => ':es:',
+            "\xf3\xbe\x93\xab"                                                                                             => ':es:',
+            "\xee\x97\x95"                                                                                                 => ':es:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xb9"                                                                             => ':flag-et:',
+            "\xf0\x9f\x87\xaa\xf0\x9f\x87\xba"                                                                             => ':flag-eu:',
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xae"                                                                             => ':flag-fi:',
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xaf"                                                                             => ':flag-fj:',
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb0"                                                                             => ':flag-fk:',
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb2"                                                                             => ':flag-fm:',
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb4"                                                                             => ':flag-fo:',
+            "\xf0\x9f\x87\xab\xf0\x9f\x87\xb7"                                                                             => ':fr:',
+            "\xf3\xbe\x93\xa7"                                                                                             => ':fr:',
+            "\xee\xab\xba"                                                                                                 => ':fr:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa6"                                                                             => ':flag-ga:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa7"                                                                             => ':uk:',
+            "\xf3\xbe\x93\xaa"                                                                                             => ':uk:',
+            "\xee\xac\x90"                                                                                                 => ':uk:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xa9"                                                                             => ':flag-gd:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xaa"                                                                             => ':flag-ge:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xab"                                                                             => ':flag-gf:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xac"                                                                             => ':flag-gg:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xad"                                                                             => ':flag-gh:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xae"                                                                             => ':flag-gi:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb1"                                                                             => ':flag-gl:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb2"                                                                             => ':flag-gm:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb3"                                                                             => ':flag-gn:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb5"                                                                             => ':flag-gp:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb6"                                                                             => ':flag-gq:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb7"                                                                             => ':flag-gr:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb8"                                                                             => ':flag-gs:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xb9"                                                                             => ':flag-gt:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xba"                                                                             => ':flag-gu:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbc"                                                                             => ':flag-gw:',
+            "\xf0\x9f\x87\xac\xf0\x9f\x87\xbe"                                                                             => ':flag-gy:',
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb0"                                                                             => ':flag-hk:',
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb2"                                                                             => ':flag-hm:',
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb3"                                                                             => ':flag-hn:',
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb7"                                                                             => ':flag-hr:',
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xb9"                                                                             => ':flag-ht:',
+            "\xf0\x9f\x87\xad\xf0\x9f\x87\xba"                                                                             => ':flag-hu:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa8"                                                                             => ':flag-ic:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xa9"                                                                             => ':flag-id:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xaa"                                                                             => ':flag-ie:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb1"                                                                             => ':flag-il:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb2"                                                                             => ':flag-im:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb3"                                                                             => ':flag-in:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb4"                                                                             => ':flag-io:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb6"                                                                             => ':flag-iq:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb7"                                                                             => ':flag-ir:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb8"                                                                             => ':flag-is:',
+            "\xf0\x9f\x87\xae\xf0\x9f\x87\xb9"                                                                             => ':it:',
+            "\xf3\xbe\x93\xa9"                                                                                             => ':it:',
+            "\xee\xac\x8f"                                                                                                 => ':it:',
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xaa"                                                                             => ':flag-je:',
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb2"                                                                             => ':flag-jm:',
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb4"                                                                             => ':flag-jo:',
+            "\xf0\x9f\x87\xaf\xf0\x9f\x87\xb5"                                                                             => ':jp:',
+            "\xf3\xbe\x93\xa5"                                                                                             => ':jp:',
+            "\xee\x93\x8c"                                                                                                 => ':jp:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xaa"                                                                             => ':flag-ke:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xac"                                                                             => ':flag-kg:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xad"                                                                             => ':flag-kh:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xae"                                                                             => ':flag-ki:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb2"                                                                             => ':flag-km:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb3"                                                                             => ':flag-kn:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb5"                                                                             => ':flag-kp:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xb7"                                                                             => ':kr:',
+            "\xf3\xbe\x93\xae"                                                                                             => ':kr:',
+            "\xee\xac\x92"                                                                                                 => ':kr:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbc"                                                                             => ':flag-kw:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbe"                                                                             => ':flag-ky:',
+            "\xf0\x9f\x87\xb0\xf0\x9f\x87\xbf"                                                                             => ':flag-kz:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa6"                                                                             => ':flag-la:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa7"                                                                             => ':flag-lb:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xa8"                                                                             => ':flag-lc:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xae"                                                                             => ':flag-li:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb0"                                                                             => ':flag-lk:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb7"                                                                             => ':flag-lr:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb8"                                                                             => ':flag-ls:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xb9"                                                                             => ':flag-lt:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xba"                                                                             => ':flag-lu:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbb"                                                                             => ':flag-lv:',
+            "\xf0\x9f\x87\xb1\xf0\x9f\x87\xbe"                                                                             => ':flag-ly:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa6"                                                                             => ':flag-ma:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa8"                                                                             => ':flag-mc:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xa9"                                                                             => ':flag-md:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xaa"                                                                             => ':flag-me:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xab"                                                                             => ':flag-mf:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xac"                                                                             => ':flag-mg:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xad"                                                                             => ':flag-mh:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb0"                                                                             => ':flag-mk:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb1"                                                                             => ':flag-ml:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb2"                                                                             => ':flag-mm:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb3"                                                                             => ':flag-mn:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb4"                                                                             => ':flag-mo:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb5"                                                                             => ':flag-mp:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb6"                                                                             => ':flag-mq:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb7"                                                                             => ':flag-mr:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb8"                                                                             => ':flag-ms:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xb9"                                                                             => ':flag-mt:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xba"                                                                             => ':flag-mu:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbb"                                                                             => ':flag-mv:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbc"                                                                             => ':flag-mw:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbd"                                                                             => ':flag-mx:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbe"                                                                             => ':flag-my:',
+            "\xf0\x9f\x87\xb2\xf0\x9f\x87\xbf"                                                                             => ':flag-mz:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa6"                                                                             => ':flag-na:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xa8"                                                                             => ':flag-nc:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xaa"                                                                             => ':flag-ne:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xab"                                                                             => ':flag-nf:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xac"                                                                             => ':flag-ng:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xae"                                                                             => ':flag-ni:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb1"                                                                             => ':flag-nl:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb4"                                                                             => ':flag-no:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb5"                                                                             => ':flag-np:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xb7"                                                                             => ':flag-nr:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xba"                                                                             => ':flag-nu:',
+            "\xf0\x9f\x87\xb3\xf0\x9f\x87\xbf"                                                                             => ':flag-nz:',
+            "\xf0\x9f\x87\xb4\xf0\x9f\x87\xb2"                                                                             => ':flag-om:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xa6"                                                                             => ':flag-pa:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xaa"                                                                             => ':flag-pe:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xab"                                                                             => ':flag-pf:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xac"                                                                             => ':flag-pg:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xad"                                                                             => ':flag-ph:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb0"                                                                             => ':flag-pk:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb1"                                                                             => ':flag-pl:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb2"                                                                             => ':flag-pm:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb3"                                                                             => ':flag-pn:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb7"                                                                             => ':flag-pr:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb8"                                                                             => ':flag-ps:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xb9"                                                                             => ':flag-pt:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbc"                                                                             => ':flag-pw:',
+            "\xf0\x9f\x87\xb5\xf0\x9f\x87\xbe"                                                                             => ':flag-py:',
+            "\xf0\x9f\x87\xb6\xf0\x9f\x87\xa6"                                                                             => ':flag-qa:',
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xaa"                                                                             => ':flag-re:',
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb4"                                                                             => ':flag-ro:',
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xb8"                                                                             => ':flag-rs:',
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xba"                                                                             => ':ru:',
+            "\xf3\xbe\x93\xac"                                                                                             => ':ru:',
+            "\xee\x97\x96"                                                                                                 => ':ru:',
+            "\xf0\x9f\x87\xb7\xf0\x9f\x87\xbc"                                                                             => ':flag-rw:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa6"                                                                             => ':flag-sa:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa7"                                                                             => ':flag-sb:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa8"                                                                             => ':flag-sc:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xa9"                                                                             => ':flag-sd:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaa"                                                                             => ':flag-se:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xac"                                                                             => ':flag-sg:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xad"                                                                             => ':flag-sh:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xae"                                                                             => ':flag-si:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xaf"                                                                             => ':flag-sj:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb0"                                                                             => ':flag-sk:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb1"                                                                             => ':flag-sl:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb2"                                                                             => ':flag-sm:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb3"                                                                             => ':flag-sn:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb4"                                                                             => ':flag-so:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb7"                                                                             => ':flag-sr:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb8"                                                                             => ':flag-ss:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xb9"                                                                             => ':flag-st:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbb"                                                                             => ':flag-sv:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbd"                                                                             => ':flag-sx:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbe"                                                                             => ':flag-sy:',
+            "\xf0\x9f\x87\xb8\xf0\x9f\x87\xbf"                                                                             => ':flag-sz:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa6"                                                                             => ':flag-ta:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa8"                                                                             => ':flag-tc:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xa9"                                                                             => ':flag-td:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xab"                                                                             => ':flag-tf:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xac"                                                                             => ':flag-tg:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xad"                                                                             => ':flag-th:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xaf"                                                                             => ':flag-tj:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb0"                                                                             => ':flag-tk:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb1"                                                                             => ':flag-tl:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb2"                                                                             => ':flag-tm:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb3"                                                                             => ':flag-tn:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb4"                                                                             => ':flag-to:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb7"                                                                             => ':flag-tr:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xb9"                                                                             => ':flag-tt:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbb"                                                                             => ':flag-tv:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbc"                                                                             => ':flag-tw:',
+            "\xf0\x9f\x87\xb9\xf0\x9f\x87\xbf"                                                                             => ':flag-tz:',
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xa6"                                                                             => ':flag-ua:',
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xac"                                                                             => ':flag-ug:',
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb2"                                                                             => ':flag-um:',
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xb8"                                                                             => ':us:',
+            "\xf3\xbe\x93\xa6"                                                                                             => ':us:',
+            "\xee\x95\xb3"                                                                                                 => ':us:',
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbe"                                                                             => ':flag-uy:',
+            "\xf0\x9f\x87\xba\xf0\x9f\x87\xbf"                                                                             => ':flag-uz:',
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa6"                                                                             => ':flag-va:',
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xa8"                                                                             => ':flag-vc:',
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xaa"                                                                             => ':flag-ve:',
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xac"                                                                             => ':flag-vg:',
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xae"                                                                             => ':flag-vi:',
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xb3"                                                                             => ':flag-vn:',
+            "\xf0\x9f\x87\xbb\xf0\x9f\x87\xba"                                                                             => ':flag-vu:',
+            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xab"                                                                             => ':flag-wf:',
+            "\xf0\x9f\x87\xbc\xf0\x9f\x87\xb8"                                                                             => ':flag-ws:',
+            "\xf0\x9f\x87\xbd\xf0\x9f\x87\xb0"                                                                             => ':flag-xk:',
+            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xaa"                                                                             => ':flag-ye:',
+            "\xf0\x9f\x87\xbe\xf0\x9f\x87\xb9"                                                                             => ':flag-yt:',
+            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xa6"                                                                             => ':flag-za:',
+            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xb2"                                                                             => ':flag-zm:',
+            "\xf0\x9f\x87\xbf\xf0\x9f\x87\xbc"                                                                             => ':flag-zw:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6"                                     => ':man-man-boy:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"         => ':man-man-boy-boy:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7"                                     => ':man-man-girl:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"         => ':man-man-girl-boy:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"         => ':man-man-girl-girl:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"         => ':man-woman-boy-boy:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"                                     => ':man-woman-girl:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"         => ':man-woman-girl-boy:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"         => ':man-woman-girl-girl:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8"                             => ':man-heart-man:',
+            "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa8" => ':man-kiss-man:',
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6"                                     => ':woman-woman-boy:',
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6"         => ':woman-woman-boy-boy:',
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7"                                     => ':woman-woman-girl:',
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6"         => ':woman-woman-girl-boy:',
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7"         => ':woman-woman-girl-girl:',
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9"                             => ':woman-heart-woman:',
+            "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9" => ':woman-kiss-woman:',
+    ];
+}
diff --git a/app/bundles/CoreBundle/Helper/EncryptionHelper.php b/app/bundles/CoreBundle/Helper/EncryptionHelper.php
index 87f702e8f3c..8783fff0598 100644
--- a/app/bundles/CoreBundle/Helper/EncryptionHelper.php
+++ b/app/bundles/CoreBundle/Helper/EncryptionHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * http://www.warpconduit.net/2013/04/14/highly-secure-data-encryption-decryption-made-easy-with-php-mcrypt-rijndael-256-and-cbc/
@@ -11,12 +12,10 @@
 
 namespace Mautic\CoreBundle\Helper;
 
-
 use Mautic\CoreBundle\Factory\MauticFactory;
 
 class EncryptionHelper
 {
-
     private $key;
 
     /**
@@ -35,44 +34,44 @@ public function __construct(MauticFactory $factory)
     }
 
     /**
-     * Returns a 64 character string
+     * Returns a 64 character string.
      *
      * @return string
      */
-    static public function generateKey()
+    public static function generateKey()
     {
         return hash('sha256', uniqid(mt_rand(), true));
     }
 
     /**
-     * Encrypt string
+     * Encrypt string.
      *
      * @param $encrypt
      *
      * @return string
      */
-    public function encrypt ($encrypt)
+    public function encrypt($encrypt)
     {
         $encrypt   = serialize($encrypt);
         $iv        = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC), MCRYPT_DEV_URANDOM);
         $key       = pack('H*', $this->key);
         $mac       = hash_hmac('sha256', $encrypt, substr(bin2hex($key), -32));
-        $passcrypt = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $encrypt . $mac, MCRYPT_MODE_CBC, $iv);
-        $encoded   = base64_encode($passcrypt) . '|' . base64_encode($iv);
+        $passcrypt = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $encrypt.$mac, MCRYPT_MODE_CBC, $iv);
+        $encoded   = base64_encode($passcrypt).'|'.base64_encode($iv);
 
         return $encoded;
     }
 
     /**
-     * Decrypt string
+     * Decrypt string.
      *
      * @param $decrypt
      *
      * @return bool|mixed|string
      */
-    public function decrypt ($decrypt)
+    public function decrypt($decrypt)
     {
-        $decrypt = explode('|', $decrypt . '|');
+        $decrypt = explode('|', $decrypt.'|');
         $decoded = base64_decode($decrypt[0]);
         $iv      = base64_decode($decrypt[1]);
         if (strlen($iv) !== mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC)) {
diff --git a/app/bundles/CoreBundle/Helper/InputHelper.php b/app/bundles/CoreBundle/Helper/InputHelper.php
index 9bfde27e33d..8713faf82cd 100644
--- a/app/bundles/CoreBundle/Helper/InputHelper.php
+++ b/app/bundles/CoreBundle/Helper/InputHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,21 +12,20 @@
 
 use Joomla\Filter\InputFilter;
 
-
 /**
- * Class InputHelper
+ * Class InputHelper.
  */
 class InputHelper
 {
     /**
-     * String filter
+     * String filter.
      *
      * @var InputFilter
      */
     private static $stringFilter;
 
     /**
-     * HTML filter
+     * HTML filter.
      *
      * @var InputFilter
      */
@@ -58,13 +58,13 @@ private static function getFilter($html = false, $strict = false)
                 'ilayer',
                 'layer',
                 'object',
-                'xml'
+                'xml',
             ];
 
             self::$htmlFilter->attrBlacklist = [
                 'codebase',
                 'dynsrc',
-                'lowsrc'
+                'lowsrc',
             ];
 
             // Strict HTML - basic one liner formating really
@@ -76,13 +76,13 @@ private static function getFilter($html = false, $strict = false)
                     'em',
                     'strong',
                     'a',
-                    'span'
+                    'span',
                 ], [], 0, 1);
 
             self::$strictHtmlFilter->attrBlacklist = [
                 'codebase',
                 'dynsrc',
-                'lowsrc'
+                'lowsrc',
             ];
 
             // Standard behavior if HTML is not specifically used
@@ -98,7 +98,7 @@ private static function getFilter($html = false, $strict = false)
     }
 
     /**
-     * Wrapper to InputHelper
+     * Wrapper to InputHelper.
      *
      * @param $name
      * @param $arguments
@@ -107,7 +107,6 @@ private static function getFilter($html = false, $strict = false)
      */
     public static function __callStatic($name, $arguments)
     {
-
         return self::getFilter()->clean($arguments[0], $name);
     }
 
@@ -159,7 +158,7 @@ public static function _($value, $mask = 'clean', $urldecode = false)
     }
 
     /**
-     * Cleans value by HTML-escaping '"<>& and characters with ASCII value less than 32
+     * Cleans value by HTML-escaping '"<>& and characters with ASCII value less than 32.
      *
      * @param            $value
      * @param bool|false $urldecode
@@ -182,7 +181,7 @@ public static function clean($value, $urldecode = false)
     }
 
     /**
-     * Strips tags
+     * Strips tags.
      *
      * @param            $value
      * @param bool|false $urldecode
@@ -199,7 +198,7 @@ public static function string($value, $urldecode = false)
     }
 
     /**
-     * Strips non-alphanumeric characters
+     * Strips non-alphanumeric characters.
      *
      * @param            $value
      * @param bool|false $urldecode
@@ -208,28 +207,28 @@ public static function string($value, $urldecode = false)
      *
      * @return string
      */
-    public static function alphanum($value, $urldecode = false, $convertSpacesTo = false, $allowedCharacters = array())
+    public static function alphanum($value, $urldecode = false, $convertSpacesTo = false, $allowedCharacters = [])
     {
         if ($urldecode) {
             $value = urldecode($value);
         }
 
         if ($convertSpacesTo) {
-            $value = str_replace(' ', $convertSpacesTo, $value);
+            $value               = str_replace(' ', $convertSpacesTo, $value);
             $allowedCharacters[] = $convertSpacesTo;
         }
 
         if (!empty($allowedCharacters)) {
-            $regex = "/[^0-9a-z".implode('', $allowedCharacters)."]+/i";
+            $regex = '/[^0-9a-z'.implode('', $allowedCharacters).']+/i';
         } else {
-            $regex = "/[^0-9a-z]+/i";
+            $regex = '/[^0-9a-z]+/i';
         }
 
-        return trim(preg_replace($regex, "", $value));
+        return trim(preg_replace($regex, '', $value));
     }
 
     /**
-     * Returns a satnitized string which can be used in a file system
+     * Returns a satnitized string which can be used in a file system.
      *
      * @param  $value
      *
@@ -238,11 +237,12 @@ public static function alphanum($value, $urldecode = false, $convertSpacesTo = f
     public static function filename($value)
     {
         $value = str_replace(' ', '_', $value);
-        return preg_replace("/[^a-z0-9\.\_]/", "", strtolower($value));
+
+        return preg_replace("/[^a-z0-9\.\_]/", '', strtolower($value));
     }
 
     /**
-     * Returns raw value
+     * Returns raw value.
      *
      * @param            $value
      * @param bool|false $urldecode
@@ -259,7 +259,7 @@ public static function raw($value, $urldecode = false)
     }
 
     /**
-     * Removes all characters except those allowed in URLs
+     * Removes all characters except those allowed in URLs.
      *
      * @param            $value
      * @param bool|false $urldecode
@@ -270,14 +270,14 @@ public static function raw($value, $urldecode = false)
      *
      * @return mixed|string
      */
-    public static function url($value, $urldecode = false, $allowedProtocols = null, $defaultProtocol = null, $removeQuery = array(), $ignoreFragment = false)
+    public static function url($value, $urldecode = false, $allowedProtocols = null, $defaultProtocol = null, $removeQuery = [], $ignoreFragment = false)
     {
         if ($urldecode) {
             $value = urldecode($value);
         }
 
         if (empty($allowedProtocols)) {
-            $allowedProtocols = array('https', 'http', 'ftp');
+            $allowedProtocols = ['https', 'http', 'ftp'];
         }
         if (empty($defaultProtocol)) {
             $defaultProtocol = 'http';
@@ -306,14 +306,14 @@ public static function url($value, $urldecode = false, $allowedProtocols = null,
             }
 
             $value =
-                (!empty($parts["scheme"])   ? $parts["scheme"]."://" :"") .
-                (!empty($parts["user"])     ? $parts["user"].":"     :"") .
-                (!empty($parts["pass"])     ? $parts["pass"]."@"     :"") .
-                (!empty($parts["host"])     ? $parts["host"]         :"") .
-                (!empty($parts["port"])     ? ":".$parts["port"]     :"") .
-                (!empty($parts["path"])     ? $parts["path"]         :"") .
-                (!empty($parts["query"])    ? "?".$parts["query"]    :"") .
-                (!$ignoreFragment && !empty($parts["fragment"]) ? "#".$parts["fragment"] :"");
+                (!empty($parts['scheme']) ? $parts['scheme'].'://' : '').
+                (!empty($parts['user']) ? $parts['user'].':' : '').
+                (!empty($parts['pass']) ? $parts['pass'].'@' : '').
+                (!empty($parts['host']) ? $parts['host'] : '').
+                (!empty($parts['port']) ? ':'.$parts['port'] : '').
+                (!empty($parts['path']) ? $parts['path'] : '').
+                (!empty($parts['query']) ? '?'.$parts['query'] : '').
+                (!$ignoreFragment && !empty($parts['fragment']) ? '#'.$parts['fragment'] : '');
         } else {
             //must have a really bad URL since parse_url returned false so let's just clean it
             $value = self::clean($value);
@@ -326,7 +326,7 @@ public static function url($value, $urldecode = false, $allowedProtocols = null,
     }
 
     /**
-     * Removes all characters except those allowed in emails
+     * Removes all characters except those allowed in emails.
      *
      * @param            $value
      * @param bool|false $urldecode
@@ -345,7 +345,7 @@ public static function email($value, $urldecode = false)
     }
 
     /**
-     * Returns a clean array
+     * Returns a clean array.
      *
      * @param            $value
      * @param bool|false $urldecode
@@ -357,14 +357,14 @@ public static function cleanArray($value, $urldecode = false)
         $value = self::clean($value, $urldecode);
 
         if (!is_array($value)) {
-            $value = array($value);
+            $value = [$value];
         }
 
         return $value;
     }
 
     /**
-     * Returns clean HTML
+     * Returns clean HTML.
      *
      * @param $value
      *
@@ -378,16 +378,16 @@ public static function html($value)
             }
         } else {
             // Special handling for doctype
-            $doctypeFound = preg_match("/(<!DOCTYPE(.*?)>)/is", $value, $doctype);
+            $doctypeFound = preg_match('/(<!DOCTYPE(.*?)>)/is', $value, $doctype);
 
             // Special handling for CDATA tags
-            $value = str_replace(array('<![CDATA[', ']]>'), array('<mcdata>', '</mcdata>'), $value, $cdataCount);
+            $value = str_replace(['<![CDATA[', ']]>'], ['<mcdata>', '</mcdata>'], $value, $cdataCount);
 
             // Special handling for conditional blocks
             $value = preg_replace("/<!--\[if(.*?)\]>(.*?)<!\[endif\]-->/is", '<mcondition><mif>$1</mif>$2</mcondition>', $value, -1, $conditionsFound);
 
             // Special handling for HTML comments
-            $value = str_replace(array('<!--', '-->'), array('<mcomment>', '</mcomment>'), $value, $commentCount);
+            $value = str_replace(['<!--', '-->'], ['<mcomment>', '</mcomment>'], $value, $commentCount);
 
             $value = self::getFilter(true)->clean($value, 'html');
 
@@ -397,7 +397,7 @@ public static function html($value)
             }
 
             if ($cdataCount) {
-                $value = str_replace(array('<mcdata>', '</mcdata>'), array('<![CDATA[', ']]>'), $value);
+                $value = str_replace(['<mcdata>', '</mcdata>'], ['<![CDATA[', ']]>'], $value);
             }
 
             if ($conditionsFound) {
@@ -406,7 +406,7 @@ public static function html($value)
             }
 
             if ($commentCount) {
-                $value = str_replace(array('<mcomment>', '</mcomment>'), array('<!--', '-->'), $value   );
+                $value = str_replace(['<mcomment>', '</mcomment>'], ['<!--', '-->'], $value);
             }
         }
 
@@ -414,7 +414,7 @@ public static function html($value)
     }
 
     /**
-     * Allows tags 'b', 'i', 'u', 'em', 'strong', 'a', 'span'
+     * Allows tags 'b', 'i', 'u', 'em', 'strong', 'a', 'span'.
      *
      * @param $data
      *
@@ -432,7 +432,7 @@ public static function strict_html($value)
     }
 
     /**
-     * Converts UTF8 into Latin
+     * Converts UTF8 into Latin.
      *
      * @param $value
      *
diff --git a/app/bundles/CoreBundle/Helper/IpLookupHelper.php b/app/bundles/CoreBundle/Helper/IpLookupHelper.php
index 4b77f1df8bf..593af54d7c0 100644
--- a/app/bundles/CoreBundle/Helper/IpLookupHelper.php
+++ b/app/bundles/CoreBundle/Helper/IpLookupHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * Class IpLookupHelper
+ * Class IpLookupHelper.
  */
 class IpLookupHelper
 {
@@ -81,7 +82,7 @@ public function getIpAddressFromRequest()
                 'HTTP_X_CLUSTER_CLIENT_IP',
                 'HTTP_FORWARDED_FOR',
                 'HTTP_FORWARDED',
-                'REMOTE_ADDR'
+                'REMOTE_ADDR',
             ];
 
             foreach ($ipHolders as $key) {
@@ -94,7 +95,6 @@ public function getIpAddressFromRequest()
 
                     // Validate IP
                     if (null !== $ip && $this->ipIsValid($ip)) {
-
                         return $ip;
                     }
                 }
@@ -106,7 +106,7 @@ public function getIpAddressFromRequest()
     }
 
     /**
-     * Get an IpAddress entity for current session or for passed in IP address
+     * Get an IpAddress entity for current session or for passed in IP address.
      *
      * @param string $ip
      *
@@ -174,7 +174,7 @@ public function getIpAddress($ip = null)
     }
 
     /**
-     * Validates if an IP address if valid
+     * Validates if an IP address if valid.
      *
      * @param $ip
      *
@@ -191,8 +191,6 @@ public function ipIsValid($ip)
 
     /**
      * @param $ip
-     *
-     * @return null
      */
     protected function getClientIpFromProxyList($ip)
     {
@@ -213,7 +211,6 @@ function (&$val) {
         // X-Forwarded-For: client, proxy1, proxy2
         foreach ($ips as $ip) {
             if ($this->ipIsValid($ip)) {
-
                 return $ip;
             }
         }
diff --git a/app/bundles/CoreBundle/Helper/LanguageHelper.php b/app/bundles/CoreBundle/Helper/LanguageHelper.php
index 15dd5059e22..86f57ea2113 100644
--- a/app/bundles/CoreBundle/Helper/LanguageHelper.php
+++ b/app/bundles/CoreBundle/Helper/LanguageHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Helper class for managing Mautic's installed languages
+ * Helper class for managing Mautic's installed languages.
  */
 class LanguageHelper
 {
-
     /**
      * @var string
      */
@@ -41,12 +41,12 @@ public function __construct(MauticFactory $factory)
         $this->factory = $factory;
 
         // Moved to outside environment folder so that it doesn't get wiped on each config update
-        $this->cacheFile = $this->factory->getSystemPath('cache') . '/../languageList.txt';
+        $this->cacheFile = $this->factory->getSystemPath('cache').'/../languageList.txt';
         $this->connector = HttpFactory::getHttp();
     }
 
     /**
-     * Extracts a downloaded package for the specified language
+     * Extracts a downloaded package for the specified language.
      *
      * This will attempt to download the package if it is not found
      *
@@ -56,8 +56,8 @@ public function __construct(MauticFactory $factory)
      */
     public function extractLanguagePackage($languageCode)
     {
-        $packagePath = $this->factory->getSystemPath('cache') . '/' . $languageCode . '.zip';
-        $translator = $this->factory->getTranslator();
+        $packagePath = $this->factory->getSystemPath('cache').'/'.$languageCode.'.zip';
+        $translator  = $this->factory->getTranslator();
 
         // Make sure the package actually exists
         if (!file_exists($packagePath)) {
@@ -70,7 +70,7 @@ public function extractLanguagePackage($languageCode)
             }
         }
 
-        $zipper = new \ZipArchive();
+        $zipper  = new \ZipArchive();
         $archive = $zipper->open($packagePath);
 
         if ($archive !== true) {
@@ -98,27 +98,27 @@ public function extractLanguagePackage($languageCode)
                     break;
             }
 
-            return array(
+            return [
                 'error'   => true,
-                'message' => $error
-            );
+                'message' => $error,
+            ];
         }
 
         // Extract the archive file now
-        $zipper->extractTo($this->factory->getSystemPath('translations_root') . '/translations');
+        $zipper->extractTo($this->factory->getSystemPath('translations_root').'/translations');
         $zipper->close();
 
         // We can remove the package now
         @unlink($packagePath);
 
-        return array(
+        return [
             'error'   => false,
-            'message' => 'mautic.core.language.helper.language.saved.successfully'
-        );
+            'message' => 'mautic.core.language.helper.language.saved.successfully',
+        ];
     }
 
     /**
-     * Fetches the list of available languages
+     * Fetches the list of available languages.
      *
      * @param bool $overrideCache
      *
@@ -134,7 +134,7 @@ public function fetchLanguages($overrideCache = false, $returnError = true)
             } elseif (isset($overrideData['name'])) {
                 return $overrideData;
             } else {
-                return array();
+                return [];
             }
         }
 
@@ -150,18 +150,18 @@ public function fetchLanguages($overrideCache = false, $returnError = true)
 
         // Get the language data
         try {
-            $data      = $this->connector->post('https://updates.mautic.org/index.php?option=com_mauticdownload&task=fetchLanguages', array(), array(), 10);
+            $data      = $this->connector->post('https://updates.mautic.org/index.php?option=com_mauticdownload&task=fetchLanguages', [], [], 10);
             $languages = json_decode($data->body, true);
             $languages = $languages['languages'];
         } catch (\Exception $exception) {
             // Log the error
             $logger = $this->factory->getLogger();
-            $logger->addError('An error occurred while attempting to fetch the language list: ' . $exception->getMessage());
+            $logger->addError('An error occurred while attempting to fetch the language list: '.$exception->getMessage());
 
-            return (!$returnError) ? array() : array(
+            return (!$returnError) ? [] : [
                 'error'   => true,
-                'message' => 'mautic.core.language.helper.error.fetching.languages'
-            );
+                'message' => 'mautic.core.language.helper.error.fetching.languages',
+            ];
         }
 
         if ($data->code != 200) {
@@ -173,20 +173,20 @@ public function fetchLanguages($overrideCache = false, $returnError = true)
                 is_string($data->body) ? $data->body : implode('; ', $data->body)
             ));
 
-            return (!$returnError) ? array() : array(
+            return (!$returnError) ? [] : [
                 'error'   => true,
-                'message' => 'mautic.core.language.helper.error.fetching.languages'
-            );
+                'message' => 'mautic.core.language.helper.error.fetching.languages',
+            ];
         }
 
         // Alphabetize the languages
         ksort($languages);
 
         // Store to cache
-        $cacheData = array(
+        $cacheData = [
             'checkedTime' => time(),
-            'languages'   => $languages
-        );
+            'languages'   => $languages,
+        ];
 
         file_put_contents($this->cacheFile, json_encode($cacheData));
 
@@ -194,7 +194,7 @@ public function fetchLanguages($overrideCache = false, $returnError = true)
     }
 
     /**
-     * Fetches a language package from the remote server
+     * Fetches a language package from the remote server.
      *
      * @param string $languageCode
      *
@@ -211,60 +211,60 @@ public function fetchPackage($languageCode)
 
         // Make sure the language actually exists
         if (!isset($cacheData['languages'][$languageCode])) {
-            return array(
+            return [
                 'error'   => true,
                 'message' => 'mautic.core.language.helper.invalid.language',
-                'vars'    => array(
-                    '%language%' => $languageCode
-                )
-            );
+                'vars'    => [
+                    '%language%' => $languageCode,
+                ],
+            ];
         }
 
-        $langUrl = 'https://updates.mautic.org/index.php?option=com_mauticdownload&task=downloadLanguagePackage&langCode=' . $languageCode;
+        $langUrl = 'https://updates.mautic.org/index.php?option=com_mauticdownload&task=downloadLanguagePackage&langCode='.$languageCode;
 
         // GET the update data
         try {
             $data = $this->connector->get($langUrl);
         } catch (\Exception $exception) {
             $logger = $this->factory->getLogger();
-            $logger->addError('An error occurred while attempting to fetch the package: ' . $exception->getMessage());
+            $logger->addError('An error occurred while attempting to fetch the package: '.$exception->getMessage());
 
-            return array(
+            return [
                 'error'   => true,
                 'message' => 'mautic.core.language.helper.error.fetching.package.exception',
-                'vars'    => array(
-                    '%exception%' => $exception->getMessage()
-                )
-            );
+                'vars'    => [
+                    '%exception%' => $exception->getMessage(),
+                ],
+            ];
         }
 
         if ($data->code >= 300 && $data->code < 400) {
-            return array(
+            return [
                 'error'   => true,
                 'message' => 'mautic.core.language.helper.error.follow.redirects',
-                'vars'    => array(
-                    '%url%' => $langUrl
-                )
-            );
+                'vars'    => [
+                    '%url%' => $langUrl,
+                ],
+            ];
         } elseif ($data->code != 200) {
-            return array(
+            return [
                 'error'   => true,
                 'message' => 'mautic.core.language.helper.error.on.language.server.side',
-                'vars'    => array(
-                    '%code%' => $data->code
-                )
-            );
+                'vars'    => [
+                    '%code%' => $data->code,
+                ],
+            ];
         }
 
         // Set the filesystem target
-        $target = $this->factory->getSystemPath('cache') . '/' . $languageCode . '.zip';
+        $target = $this->factory->getSystemPath('cache').'/'.$languageCode.'.zip';
 
         // Write the response to the filesystem
         file_put_contents($target, $data->body);
 
         // Return an array for the sake of consistency
-        return array(
-            'error' => false
-        );
+        return [
+            'error' => false,
+        ];
     }
 }
diff --git a/app/bundles/CoreBundle/Helper/PathsHelper.php b/app/bundles/CoreBundle/Helper/PathsHelper.php
index 16c47ef7d9e..95abdf39575 100644
--- a/app/bundles/CoreBundle/Helper/PathsHelper.php
+++ b/app/bundles/CoreBundle/Helper/PathsHelper.php
@@ -1,18 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
+
 use Mautic\UserBundle\Entity\User;
-use Symfony\Component\Security\Core\SecurityContext;
 
 /**
- * Class PathsHelper
+ * Class PathsHelper.
  */
 class PathsHelper
 {
@@ -64,30 +65,31 @@ class PathsHelper
      */
     public function __construct(UserHelper $userHelper, CoreParametersHelper $coreParametersHelper)
     {
-        $this->user = $userHelper->getUser();
-        $this->paths = $coreParametersHelper->getParameter('paths');
-        $this->theme = $coreParametersHelper->getParameter('theme');
-        $this->imagePath = $coreParametersHelper->getParameter('image_path');
-        $this->dashboardImportDir = $coreParametersHelper->getParameter('dashboard_import_dir');
+        $this->user                   = $userHelper->getUser();
+        $this->paths                  = $coreParametersHelper->getParameter('paths');
+        $this->theme                  = $coreParametersHelper->getParameter('theme');
+        $this->imagePath              = $coreParametersHelper->getParameter('image_path');
+        $this->dashboardImportDir     = $coreParametersHelper->getParameter('dashboard_import_dir');
         $this->dashboardImportUserDir = $coreParametersHelper->getParameter('dashboard_import_user_dir');
-        $this->kernelCacheDir = $coreParametersHelper->getParameter('kernel.cache_dir');
-        $this->kernelLogsDir = $coreParametersHelper->getParameter('kernel.logs_dir');
+        $this->kernelCacheDir         = $coreParametersHelper->getParameter('kernel.cache_dir');
+        $this->kernelLogsDir          = $coreParametersHelper->getParameter('kernel.logs_dir');
     }
 
     /**
      * Get the path to specified area.  Returns relative by default with the exception of cache and log
-     * which will be absolute regardless of $fullPath setting
+     * which will be absolute regardless of $fullPath setting.
      *
      * @param string $name
      * @param bool   $fullPath
      *
      * @return string
+     *
      * @throws \InvalidArgumentException
      */
     public function getSystemPath($name, $fullPath = false)
     {
         if ($name == 'currentTheme' || $name == 'current_theme') {
-            $path = $this->paths['themes']."/".$this->theme;
+            $path = $this->paths['themes'].'/'.$this->theme;
         } elseif ($name == 'cache' || $name == 'logs') {
             //these are absolute regardless as they are configurable
             return ($name === 'cache') ? $this->kernelCacheDir : $this->kernelLogsDir;
@@ -109,7 +111,7 @@ public function getSystemPath($name, $fullPath = false)
                 return $globalPath;
             }
 
-            if (! $userPath = $this->dashboardUserImportDir) {
+            if (!$userPath = $this->dashboardUserImportDir) {
                 $userPath = $globalPath;
             } elseif (substr($userPath, -1) === '/') {
                 $userPath = substr($userPath, 0, -1);
@@ -133,9 +135,9 @@ public function getSystemPath($name, $fullPath = false)
         }
 
         if ($fullPath) {
-            $rootPath = (!empty($this->paths[$name . '_root'])) ? $this->paths[$name . '_root'] : $this->paths['root'];
+            $rootPath = (!empty($this->paths[$name.'_root'])) ? $this->paths[$name.'_root'] : $this->paths['root'];
 
-            return $rootPath . '/' . $path;
+            return $rootPath.'/'.$path;
         }
 
         return $path;
diff --git a/app/bundles/CoreBundle/Helper/PhoneNumberHelper.php b/app/bundles/CoreBundle/Helper/PhoneNumberHelper.php
index 85b7d625f5f..129aa3f27ea 100644
--- a/app/bundles/CoreBundle/Helper/PhoneNumberHelper.php
+++ b/app/bundles/CoreBundle/Helper/PhoneNumberHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,18 +16,18 @@
 class PhoneNumberHelper
 {
     /**
-     * Format a phone number
-     * 
+     * Format a phone number.
+     *
      * @param string|int $number
-     * @param int $format
-     * 
+     * @param int        $format
+     *
      * @return string
      */
     public function format($number, $format = PhoneNumberFormat::E164)
     {
-        $phoneUtil = PhoneNumberUtil::getInstance();
+        $phoneUtil   = PhoneNumberUtil::getInstance();
         $phoneNumber = $phoneUtil->parse($number, 'US');
-        
+
         return $phoneUtil->format($phoneNumber, $format);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/ProgressBarHelper.php b/app/bundles/CoreBundle/Helper/ProgressBarHelper.php
index b4ae28874b3..69947db15bb 100644
--- a/app/bundles/CoreBundle/Helper/ProgressBarHelper.php
+++ b/app/bundles/CoreBundle/Helper/ProgressBarHelper.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
-use Symfony\Component\Console\Output\StreamOutput;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\StreamOutput;
 
 class ProgressBarHelper
 {
     /**
      * Avoid printing progress bar to stderr
-     * https://github.com/symfony/symfony/issues/18744
+     * https://github.com/symfony/symfony/issues/18744.
      *
      * @param OutputInterface $output
      * @param int             $maxCount
@@ -27,6 +28,7 @@ class ProgressBarHelper
     public static function init(OutputInterface $output, $maxCount = 0)
     {
         $output = $output instanceof StreamOutput ? new StreamOutput($output->getStream()) : $output;
+
         return new ProgressBar($output, $maxCount);
     }
 }
diff --git a/app/bundles/CoreBundle/Helper/SearchStringHelper.php b/app/bundles/CoreBundle/Helper/SearchStringHelper.php
index 0c6f141485c..1c7475ab58a 100644
--- a/app/bundles/CoreBundle/Helper/SearchStringHelper.php
+++ b/app/bundles/CoreBundle/Helper/SearchStringHelper.php
@@ -1,44 +1,44 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
 /**
- * Class SearchStringHelper
+ * Class SearchStringHelper.
  */
 class SearchStringHelper
 {
-
     /**
      * @var array
      */
-    protected static $needsParsing = array(
+    protected static $needsParsing = [
         ' ',
         '(',
-        ')'
-    );
+        ')',
+    ];
 
     /**
      * @var array
      */
-    protected static $needsClosing = array(
+    protected static $needsClosing = [
         'quote'       => '"',
-        'parenthesis' => '('
-    );
+        'parenthesis' => '(',
+    ];
 
     /**
      * @var array
      */
-    protected static $closingChars = array(
+    protected static $closingChars = [
         'quote'       => '"',
-        'parenthesis' => ')'
-    );
+        'parenthesis' => ')',
+    ];
 
     /**
      * @param string $input
@@ -48,7 +48,7 @@ class SearchStringHelper
      *
      * @return \stdClass
      */
-    public static function parseSearchString($input, $needsParsing = array(), $needsClosing = array(), $closingChars = array())
+    public static function parseSearchString($input, $needsParsing = [], $needsClosing = [], $closingChars = [])
     {
         if (!empty($needsParsing)) {
             self::$needsParsing = $needsParsing;
@@ -77,7 +77,7 @@ protected static function splitUpSearchString($input, $baseName = 'root', $overr
         $keyCount                                 = 0;
         $command                                  = $overrideCommand;
         $filters                                  = new \stdClass();
-        $filters->{$baseName}                     = array();
+        $filters->{$baseName}                     = [];
         $filters->{$baseName}[$keyCount]          = new \stdClass();
         $filters->{$baseName}[$keyCount]->type    = 'and';
         $filters->{$baseName}[$keyCount]->command = $command;
@@ -95,7 +95,7 @@ protected static function splitUpSearchString($input, $baseName = 'root', $overr
 
             $string .= $char;
             unset($chars[$pos]);
-            $pos++;
+            ++$pos;
 
             if ($char == ':') {
                 //the string is a command
@@ -103,15 +103,15 @@ protected static function splitUpSearchString($input, $baseName = 'root', $overr
                 //does this have a negative?
                 if (strpos($command, '!') === 0) {
                     $filters->{$baseName}[$keyCount]->not = 1;
-                    $command = substr($command, 1);
+                    $command                              = substr($command, 1);
                 }
                 $filters->{$baseName}[$keyCount]->command = $command;
-                $string  = '';
+                $string                                   = '';
             } elseif ($char == ' ') {
                 //arrived at the end of a single word that is not within a quote or parenthesis so add it as standalone
                 if ($string != ' ') {
                     $string = trim($string);
-                    $type = (strtolower($string) == 'or' || strtolower($string) == 'and') ? $string : '';
+                    $type   = (strtolower($string) == 'or' || strtolower($string) == 'and') ? $string : '';
                     self::setFilter($filters, $baseName, $keyCount, $string, $command, $overrideCommand, true, $type, (!empty($chars)));
                 }
                 continue;
@@ -128,7 +128,7 @@ protected static function splitUpSearchString($input, $baseName = 'root', $overr
                 foreach ($chars as $k => $c) {
                     $string .= $c;
                     unset($chars[$k]);
-                    $pos++;
+                    ++$pos;
 
                     if ($c === self::$closingChars[$key] && $openingCount === $closingCount) {
                         //found the matching character (accounts for nesting)
@@ -144,9 +144,9 @@ protected static function splitUpSearchString($input, $baseName = 'root', $overr
                             //check to see if the nested string needs to be parsed as well
                             foreach (self::$needsParsing as $parseMe) {
                                 if (strpos($string, $parseMe) !== false) {
-                                    $parsed = self::splitUpSearchString($string, 'parsed', $command);
+                                    $parsed                                    = self::splitUpSearchString($string, 'parsed', $command);
                                     $filters->{$baseName}[$keyCount]->children = $parsed->parsed;
-                                    $neededParsing = true;
+                                    $neededParsing                             = true;
                                     break;
                                 }
                             }
@@ -157,10 +157,10 @@ protected static function splitUpSearchString($input, $baseName = 'root', $overr
                         break;
                     } elseif ($c === $char) {
                         //this is another opening char so keep track of it to properly handle nested strings
-                        $openingCount++;
+                        ++$openingCount;
                     } elseif ($c === self::$closingChars[$key]) {
                         //this is a closing char within a nest but not the one to close the group
-                        $closingCount++;
+                        ++$closingCount;
                     }
                 }
             } elseif (empty($chars) && !empty($string)) {
@@ -172,7 +172,7 @@ protected static function splitUpSearchString($input, $baseName = 'root', $overr
         return $filters;
     }
 
-    static private function setFilter(&$filters, &$baseName, &$keyCount, &$string, &$command, $overrideCommand,
+    private static function setFilter(&$filters, &$baseName, &$keyCount, &$string, &$command, $overrideCommand,
                                       $setFilter = true,
                                       $type = null,
                                       $setUpNext = true)
@@ -183,12 +183,12 @@ static private function setFilter(&$filters, &$baseName, &$keyCount, &$string, &
             $string = strtolower($string);
 
             //remove operators
-            if (in_array($string, array('or', 'and'))) {
+            if (in_array($string, ['or', 'and'])) {
                 unset($filters->{$baseName}[$keyCount]);
+
                 return;
             }
 
-
             if (!isset($filters->{$baseName}[$keyCount]->strict)) {
                 $filters->{$baseName}[$keyCount]->strict = 0;
             }
@@ -203,17 +203,17 @@ static private function setFilter(&$filters, &$baseName, &$keyCount, &$string, &
                     //+! or !+
                     $filters->{$baseName}[$keyCount]->strict = 1;
                     $filters->{$baseName}[$keyCount]->not    = 1;
-                    $string = substr($string, 2);
+                    $string                                  = substr($string, 2);
                 } elseif ($strictPos === 0 && $notPos === false) {
                     //+
                     $filters->{$baseName}[$keyCount]->strict = 1;
                     $filters->{$baseName}[$keyCount]->not    = 0;
-                    $string = substr($string, 1);
+                    $string                                  = substr($string, 1);
                 } elseif ($strictPos === false && $notPos === 0) {
                     //!
                     $filters->{$baseName}[$keyCount]->strict = 0;
                     $filters->{$baseName}[$keyCount]->not    = 1;
-                    $string = substr($string, 1);
+                    $string                                  = substr($string, 1);
                 }
             }
 
@@ -221,7 +221,7 @@ static private function setFilter(&$filters, &$baseName, &$keyCount, &$string, &
 
             //setup the next filter
             if ($setUpNext) {
-                $keyCount++;
+                ++$keyCount;
                 $filters->{$baseName}[$keyCount]          = new \stdClass();
                 $filters->{$baseName}[$keyCount]->type    = 'and';
                 $filters->{$baseName}[$keyCount]->command = $overrideCommand;
diff --git a/app/bundles/CoreBundle/Helper/TemplatingHelper.php b/app/bundles/CoreBundle/Helper/TemplatingHelper.php
index 0c131dd9201..079901fe8ae 100644
--- a/app/bundles/CoreBundle/Helper/TemplatingHelper.php
+++ b/app/bundles/CoreBundle/Helper/TemplatingHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\HttpKernel\Kernel;
 
 /**
- * Class TemplatingHelper
+ * Class TemplatingHelper.
  */
 class TemplatingHelper
 {
@@ -26,7 +27,7 @@ class TemplatingHelper
 
     /**
      * TemplatingHelper constructor.
-     * 
+     *
      * @param Kernel $kernel
      */
     public function __construct(Kernel $kernel)
@@ -35,8 +36,8 @@ public function __construct(Kernel $kernel)
     }
 
     /**
-     * Retrieve the templating service
-     * 
+     * Retrieve the templating service.
+     *
      * @return \Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine
      */
     public function getTemplating()
diff --git a/app/bundles/CoreBundle/Helper/ThemeHelper.php b/app/bundles/CoreBundle/Helper/ThemeHelper.php
index 6585284877c..ac684df9873 100644
--- a/app/bundles/CoreBundle/Helper/ThemeHelper.php
+++ b/app/bundles/CoreBundle/Helper/ThemeHelper.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Helper;
 
-
 use Mautic\CoreBundle\Exception as MauticException;
+use Mautic\CoreBundle\Templating\Helper\ThemeHelper as TemplatingThemeHelper;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
-use Mautic\CoreBundle\Templating\Helper\ThemeHelper as TemplatingThemeHelper;
 
 class ThemeHelper
 {
@@ -25,17 +25,17 @@ class ThemeHelper
     /**
      * @var array|mixed
      */
-    private $themes = array();
+    private $themes = [];
 
     /**
      * @var array
      */
-    private $themesInfo = array();
+    private $themesInfo = [];
 
     /**
      * @var array
      */
-    private $steps = array();
+    private $steps = [];
 
     /**
      * @var string
@@ -45,16 +45,16 @@ class ThemeHelper
     /**
      * @var TemplatingThemeHelper[]
      */
-    private $themeHelpers = array();
+    private $themeHelpers = [];
 
     /**
      * ThemeHelper constructor.
-     * 
+     *
      * @param PathsHelper $pathsHelper
      */
     public function __construct(PathsHelper $pathsHelper, TemplatingHelper $templatingHelper)
     {
-        $this->pathsHelper = $pathsHelper;
+        $this->pathsHelper      = $pathsHelper;
         $this->templatingHelper = $templatingHelper;
     }
 
@@ -68,7 +68,7 @@ public function setDefaultTheme($defaultTheme)
 
     /**
      * @param string $themeName
-     * 
+     *
      * @return ThemeHelper
      */
     public function createThemeHelper($themeName)
@@ -78,13 +78,13 @@ public function createThemeHelper($themeName)
         }
 
         $themeHelper = new TemplatingThemeHelper($this->pathsHelper, $themeName);
-        
+
         return $themeHelper;
     }
 
     /**
      * @param $newName
-     * 
+     *
      * @return string
      */
     private function getDirectoryName($newName)
@@ -95,11 +95,11 @@ private function getDirectoryName($newName)
     /**
      * @param $theme
      *
-     * @return boolean
+     * @return bool
      */
     public function exists($theme)
     {
-        $root    = $this->pathsHelper->getSystemPath('themes', true) . '/';
+        $root    = $this->pathsHelper->getSystemPath('themes', true).'/';
         $dirName = $this->getDirectoryName($theme);
         $fs      = new Filesystem();
 
@@ -115,25 +115,25 @@ public function exists($theme)
      */
     public function copy($theme, $newName)
     {
-        $root      = $this->pathsHelper->getSystemPath('themes', true) . '/';
-        $themes    = $this->getInstalledThemes();
+        $root   = $this->pathsHelper->getSystemPath('themes', true).'/';
+        $themes = $this->getInstalledThemes();
 
         //check to make sure the theme exists
         if (!isset($themes[$theme])) {
-            throw new MauticException\FileNotFoundException($theme . ' not found!');
+            throw new MauticException\FileNotFoundException($theme.' not found!');
         }
 
         $dirName = $this->getDirectoryName($newName);
 
         $fs = new Filesystem();
 
-        if ($fs->exists($root . $dirName)) {
+        if ($fs->exists($root.$dirName)) {
             throw new MauticException\FileExistsException("$dirName already exists");
         }
 
-        $fs->mirror($root . $theme, $root . $dirName);
+        $fs->mirror($root.$theme, $root.$dirName);
 
-        $this->updateConfig($root . $dirName, $newName);
+        $this->updateConfig($root.$dirName, $newName);
     }
 
     /**
@@ -145,25 +145,25 @@ public function copy($theme, $newName)
      */
     public function rename($theme, $newName)
     {
-        $root      = $this->pathsHelper->getSystemPath('themes', true) . '/';
-        $themes    = $this->getInstalledThemes();
+        $root   = $this->pathsHelper->getSystemPath('themes', true).'/';
+        $themes = $this->getInstalledThemes();
 
         //check to make sure the theme exists
         if (!isset($themes[$theme])) {
-            throw new MauticException\FileNotFoundException($theme . ' not found!');
+            throw new MauticException\FileNotFoundException($theme.' not found!');
         }
 
         $dirName = $this->getDirectoryName($newName);
 
         $fs = new Filesystem();
 
-        if ($fs->exists($root . $dirName)) {
+        if ($fs->exists($root.$dirName)) {
             throw new MauticException\FileExistsException("$dirName already exists");
         }
 
-        $fs->rename($root . $theme, $root . $dirName);
+        $fs->rename($root.$theme, $root.$dirName);
 
-        $this->updateConfig($root . $theme, $dirName);
+        $this->updateConfig($root.$theme, $dirName);
     }
 
     /**
@@ -173,12 +173,12 @@ public function rename($theme, $newName)
      */
     public function delete($theme)
     {
-        $root      = $this->pathsHelper->getSystemPath('themes', true) . '/';
-        $themes    = $this->getInstalledThemes();
+        $root   = $this->pathsHelper->getSystemPath('themes', true).'/';
+        $themes = $this->getInstalledThemes();
 
         //check to make sure the theme exists
         if (!isset($themes[$theme])) {
-            throw new MauticException\FileNotFoundException($theme . ' not found!');
+            throw new MauticException\FileNotFoundException($theme.' not found!');
         }
 
         $fs = new Filesystem();
@@ -187,20 +187,20 @@ public function delete($theme)
 
     /**
      * Updates the theme configuration and converts
-     * it to json if still using php array
+     * it to json if still using php array.
      *
      * @param $themePath
      * @param $newName
      */
     private function updateConfig($themePath, $newName)
     {
-        if (file_exists($themePath . '/config.json')) {
-            $config = json_decode(file_get_contents($themePath . '/config.json'), true);
+        if (file_exists($themePath.'/config.json')) {
+            $config = json_decode(file_get_contents($themePath.'/config.json'), true);
         }
 
         $config['name'] = $newName;
 
-        file_put_contents($themePath . '/config.json', json_encode($config));
+        file_put_contents($themePath.'/config.json', json_encode($config));
     }
 
     /**
@@ -210,7 +210,7 @@ private function updateConfig($themePath, $newName)
      */
     public function getOptionalSettings()
     {
-        $minors = array();
+        $minors = [];
 
         foreach ($this->steps as $step) {
             foreach ($step->checkOptionalSettings() as $minor) {
@@ -228,7 +228,7 @@ public function getOptionalSettings()
      */
     public function checkForTwigTemplate($template)
     {
-        $parser = $this->templatingHelper->getTemplateNameParser();
+        $parser     = $this->templatingHelper->getTemplateNameParser();
         $templating = $this->templatingHelper->getTemplating();
 
         $template = $parser->parse($template);
@@ -245,24 +245,24 @@ public function checkForTwigTemplate($template)
 
     /**
      * @param string $specificFeature
-     * @param boolean $extended returns extended information about the themes
-     * 
+     * @param bool   $extended        returns extended information about the themes
+     *
      * @return mixed
      */
     public function getInstalledThemes($specificFeature = 'all', $extended = false, $ignoreCache = false)
     {
         if (empty($this->themes[$specificFeature]) || $ignoreCache === true) {
-            $dir = $this->pathsHelper->getSystemPath('themes', true);
+            $dir      = $this->pathsHelper->getSystemPath('themes', true);
             $addTheme = false;
 
             $finder = new Finder();
             $finder->directories()->depth('0')->ignoreDotFiles(true)->in($dir);
 
-            $this->themes[$specificFeature] = array();
-            $this->themesInfo[$specificFeature] = array();
+            $this->themes[$specificFeature]     = [];
+            $this->themesInfo[$specificFeature] = [];
             foreach ($finder as $theme) {
                 if (file_exists($theme->getRealPath().'/config.json')) {
-                    $config = json_decode(file_get_contents($theme->getRealPath() . '/config.json'), true);
+                    $config = json_decode(file_get_contents($theme->getRealPath().'/config.json'), true);
                 } else {
                     continue;
                 }
@@ -276,11 +276,11 @@ public function getInstalledThemes($specificFeature = 'all', $extended = false,
                 }
 
                 if ($addTheme) {
-                    $this->themes[$specificFeature][$theme->getBasename()] = $config['name'];
-                    $this->themesInfo[$specificFeature][$theme->getBasename()] = array();
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['name'] = $config['name'];
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['key'] = $theme->getBasename();
-                    $this->themesInfo[$specificFeature][$theme->getBasename()]['dir'] = $theme->getRealPath();
+                    $this->themes[$specificFeature][$theme->getBasename()]               = $config['name'];
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]           = [];
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]['name']   = $config['name'];
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]['key']    = $theme->getBasename();
+                    $this->themesInfo[$specificFeature][$theme->getBasename()]['dir']    = $theme->getRealPath();
                     $this->themesInfo[$specificFeature][$theme->getBasename()]['config'] = $config;
                 }
             }
@@ -295,10 +295,10 @@ public function getInstalledThemes($specificFeature = 'all', $extended = false,
 
     /**
      * @param string $theme
-     * @param bool $throwException
-     * 
+     * @param bool   $throwException
+     *
      * @return TemplatingThemeHelper
-     * 
+     *
      * @throws MauticException\FileNotFoundException
      * @throws MauticException\BadConfigurationException
      */
@@ -308,7 +308,7 @@ public function getTheme($theme = 'current', $throwException = false)
             try {
                 $this->themeHelpers[$theme] = $this->createThemeHelper($theme);
             } catch (MauticException\FileNotFoundException $e) {
-                if (! $throwException) {
+                if (!$throwException) {
                     // theme wasn't found so just use the first available
                     $themes = $this->getInstalledThemes();
 
@@ -341,12 +341,12 @@ public function getTheme($theme = 'current', $throwException = false)
     }
 
     /**
-     * Install a theme from a zip package
+     * Install a theme from a zip package.
      *
      * @param string $zipFile path
-     * 
-     * @return boolean
-     * 
+     *
+     * @return bool
+     *
      * @throws MauticException\FileNotFoundException
      * @throws Exception
      */
@@ -368,10 +368,10 @@ public function install($zipFile)
         if ($archive !== true) {
             throw new \Exception($this->getExtractError($archive));
         } else {
-            $containsConfig = false;
+            $containsConfig    = false;
             $allowedExtensions = ['', 'json', 'twig', 'css', 'js', 'htm', 'html', 'txt', 'jpg', 'jpeg', 'png', 'gif', 'tiff'];
-            $allowedFiles = [];
-            for ($i = 0; $i < $zipper->numFiles; $i++) {
+            $allowedFiles      = [];
+            for ($i = 0; $i < $zipper->numFiles; ++$i) {
                 $entry     = $zipper->getNameIndex($i);
                 $extension = pathinfo($entry, PATHINFO_EXTENSION);
 
@@ -379,7 +379,7 @@ public function install($zipFile)
                 if ($entry == 'config.json' || $entry == '/config.json') {
                     $containsConfig = true;
                 }
-                
+
                 // Filter out dangerous files like .php
                 if (in_array(strtolower($extension), $allowedExtensions)) {
                     $allowedFiles[] = $entry;
@@ -396,16 +396,17 @@ public function install($zipFile)
             } else {
                 $zipper->close();
                 unlink($zipFile);
+
                 return true;
             }
         }
     }
 
     /**
-     * Get the error message from the zip archive
+     * Get the error message from the zip archive.
      *
      * @param ZipArchive $archive
-     * 
+     *
      * @return string
      */
     public function getExtractError($archive)
@@ -437,12 +438,12 @@ public function getExtractError($archive)
     }
 
     /**
-     * Creates a zip file from a theme and returns the path where it's stored
+     * Creates a zip file from a theme and returns the path where it's stored.
      *
      * @param string $themeName
-     * 
+     *
      * @return string
-     * 
+     *
      * @throws Exception
      */
     public function zip($themeName)
@@ -452,9 +453,11 @@ public function zip($themeName)
         $zipper    = new \ZipArchive();
         $finder    = new Finder();
 
-        if (file_exists($tmpPath)) @unlink($tmpPath);
-        
-        $archive   = $zipper->open($tmpPath, \ZipArchive::CREATE);
+        if (file_exists($tmpPath)) {
+            @unlink($tmpPath);
+        }
+
+        $archive = $zipper->open($tmpPath, \ZipArchive::CREATE);
 
         $finder->files()->in($themePath);
 
@@ -462,7 +465,7 @@ public function zip($themeName)
             throw new \Exception($this->getExtractError($archive));
         } else {
             foreach ($finder as $file) {
-                $filePath = $file->getRealPath();
+                $filePath  = $file->getRealPath();
                 $localPath = $file->getRelativePathname();
                 $zipper->addFile($filePath, $localPath);
             }
diff --git a/app/bundles/CoreBundle/Helper/TrackingPixelHelper.php b/app/bundles/CoreBundle/Helper/TrackingPixelHelper.php
index c393537cf71..be4de055b50 100644
--- a/app/bundles/CoreBundle/Helper/TrackingPixelHelper.php
+++ b/app/bundles/CoreBundle/Helper/TrackingPixelHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class TrackingPixelHelper
+ * Class TrackingPixelHelper.
  */
 class TrackingPixelHelper
 {
@@ -70,6 +71,6 @@ public static function getResponse(Request $request)
      */
     public static function getImage()
     {
-        return sprintf('%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%',71,73,70,56,57,97,1,0,1,0,128,255,0,192,192,192,0,0,0,33,249,4,1,0,0,0,0,44,0,0,0,0,1,0,1,0,0,2,2,68,1,0,59);
+        return sprintf('%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%', 71, 73, 70, 56, 57, 97, 1, 0, 1, 0, 128, 255, 0, 192, 192, 192, 0, 0, 0, 33, 249, 4, 1, 0, 0, 0, 0, 44, 0, 0, 0, 0, 1, 0, 1, 0, 0, 2, 2, 68, 1, 0, 59);
     }
 }
diff --git a/app/bundles/CoreBundle/Helper/UTF8Helper.php b/app/bundles/CoreBundle/Helper/UTF8Helper.php
index 62eda9ad87b..0e479a3fa83 100644
--- a/app/bundles/CoreBundle/Helper/UTF8Helper.php
+++ b/app/bundles/CoreBundle/Helper/UTF8Helper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -38,10 +39,13 @@
 
 /**
  * @author   "Sebastián Grignoli" <grignoli@gmail.com>
- * @package  Encoding
+ *
  * @version  2.0
+ *
  * @link     https://github.com/neitanod/forceutf8
+ *
  * @example  https://github.com/neitanod/forceutf8
+ *
  * @license  Revised BSD
  */
 
@@ -49,12 +53,11 @@
 
 class UTF8Helper
 {
+    const ICONV_TRANSLIT = 'TRANSLIT';
+    const ICONV_IGNORE   = 'IGNORE';
+    const WITHOUT_ICONV  = '';
 
-    const ICONV_TRANSLIT = "TRANSLIT";
-    const ICONV_IGNORE = "IGNORE";
-    const WITHOUT_ICONV = "";
-
-    protected static $win1252ToUtf8 = array(
+    protected static $win1252ToUtf8 = [
         128 => "\xe2\x82\xac",
         130 => "\xe2\x80\x9a",
         131 => "\xc6\x92",
@@ -81,10 +84,10 @@ class UTF8Helper
         155 => "\xe2\x80\xba",
         156 => "\xc5\x93",
         158 => "\xc5\xbe",
-        159 => "\xc5\xb8"
-    );
+        159 => "\xc5\xb8",
+    ];
 
-    protected static $brokenUtf8ToUtf8 = array(
+    protected static $brokenUtf8ToUtf8 = [
         "\xc2\x80" => "\xe2\x82\xac",
         "\xc2\x82" => "\xe2\x80\x9a",
         "\xc2\x83" => "\xc6\x92",
@@ -111,10 +114,10 @@ class UTF8Helper
         "\xc2\x9b" => "\xe2\x80\xba",
         "\xc2\x9c" => "\xc5\x93",
         "\xc2\x9e" => "\xc5\xbe",
-        "\xc2\x9f" => "\xc5\xb8"
-    );
+        "\xc2\x9f" => "\xc5\xb8",
+    ];
 
-    protected static $utf8ToWin1252 = array(
+    protected static $utf8ToWin1252 = [
         "\xe2\x82\xac" => "\x80",
         "\xe2\x80\x9a" => "\x82",
         "\xc6\x92"     => "\x83",
@@ -141,13 +144,13 @@ class UTF8Helper
         "\xe2\x80\xba" => "\x9b",
         "\xc5\x93"     => "\x9c",
         "\xc5\xbe"     => "\x9e",
-        "\xc5\xb8"     => "\x9f"
-    );
+        "\xc5\xb8"     => "\x9f",
+    ];
 
-    static function toUTF8($text)
+    public static function toUTF8($text)
     {
         /**
-         * Function \ForceUTF8\Encoding::toUTF8
+         * Function \ForceUTF8\Encoding::toUTF8.
          *
          * This function leaves UTF8 characters alone, while converting almost all non-UTF8 to UTF8.
          *
@@ -167,12 +170,10 @@ static function toUTF8($text)
          *
          * @name         toUTF8
          *
-         * @param string $text Any string.
-         *
-         * @return string  The same string, UTF8 encoded
+         * @param string $text Any string
          *
+         * @return string The same string, UTF8 encoded
          */
-
         if (is_array($text)) {
             foreach ($text as $k => $v) {
                 $text[$k] = self::toUTF8($v);
@@ -187,8 +188,8 @@ static function toUTF8($text)
 
         $max = self::strlen($text);
 
-        $buf = "";
-        for ($i = 0; $i < $max; $i++) {
+        $buf = '';
+        for ($i = 0; $i < $max; ++$i) {
             $c1 = $text{$i};
             if ($c1 >= "\xc0") { //Should be converted to UTF8, if it's not UTF8 already
                 $c2 = $i + 1 >= $max ? "\x00" : $text{$i + 1};
@@ -197,7 +198,7 @@ static function toUTF8($text)
                 if ($c1 >= "\xc0" & $c1 <= "\xdf") { //looks like 2 bytes UTF8
                     if ($c2 >= "\x80" && $c2 <= "\xbf") { //yeah, almost sure it's UTF8 already
                         $buf .= $c1.$c2;
-                        $i++;
+                        ++$i;
                     } else { //not valid UTF8.  Convert it.
                         $cc1 = (chr(ord($c1) / 64) | "\xc0");
                         $cc2 = ($c1 & "\x3f") | "\x80";
@@ -244,7 +245,7 @@ static function toUTF8($text)
         return $buf;
     }
 
-    static function toWin1252($text, $option = self::WITHOUT_ICONV)
+    public static function toWin1252($text, $option = self::WITHOUT_ICONV)
     {
         if (is_array($text)) {
             foreach ($text as $k => $v) {
@@ -259,17 +260,17 @@ static function toWin1252($text, $option = self::WITHOUT_ICONV)
         }
     }
 
-    static function toISO8859($text)
+    public static function toISO8859($text)
     {
         return self::toWin1252($text);
     }
 
-    static function toLatin1($text)
+    public static function toLatin1($text)
     {
         return self::toWin1252($text);
     }
 
-    static function fixUTF8($text, $option = self::WITHOUT_ICONV)
+    public static function fixUTF8($text, $option = self::WITHOUT_ICONV)
     {
         if (is_array($text)) {
             foreach ($text as $k => $v) {
@@ -279,8 +280,8 @@ static function fixUTF8($text, $option = self::WITHOUT_ICONV)
             return $text;
         }
 
-        $last = "";
-        while ($last <> $text) {
+        $last = '';
+        while ($last != $text) {
             $last = $text;
             $text = self::toUTF8(static::utf8_decode($text, $option));
         }
@@ -289,7 +290,7 @@ static function fixUTF8($text, $option = self::WITHOUT_ICONV)
         return $text;
     }
 
-    static function UTF8FixWin1252Chars($text)
+    public static function UTF8FixWin1252Chars($text)
     {
         // If you received an UTF-8 string that was converted from Windows-1252 as it was ISO8859-1
         // (ignoring Windows-1252 chars from 80 to 9F) use this function to fix it.
@@ -298,9 +299,9 @@ static function UTF8FixWin1252Chars($text)
         return str_replace(array_keys(self::$brokenUtf8ToUtf8), array_values(self::$brokenUtf8ToUtf8), $text);
     }
 
-    static function removeBOM($str = "")
+    public static function removeBOM($str = '')
     {
-        if (substr($str, 0, 3) == pack("CCC", 0xef, 0xbb, 0xbf)) {
+        if (substr($str, 0, 3) == pack('CCC', 0xef, 0xbb, 0xbf)) {
             $str = substr($str, 3);
         }
 
@@ -317,7 +318,7 @@ public static function normalizeEncoding($encodingLabel)
     {
         $encoding     = strtoupper($encodingLabel);
         $encoding     = preg_replace('/[^a-zA-Z0-9\s]/', '', $encoding);
-        $equivalences = array(
+        $equivalences = [
             'ISO88591'    => 'ISO-8859-1',
             'ISO8859'     => 'ISO-8859-1',
             'ISO'         => 'ISO-8859-1',
@@ -326,8 +327,8 @@ public static function normalizeEncoding($encodingLabel)
             'UTF8'        => 'UTF-8',
             'UTF'         => 'UTF-8',
             'WIN1252'     => 'ISO-8859-1',
-            'WINDOWS1252' => 'ISO-8859-1'
-        );
+            'WINDOWS1252' => 'ISO-8859-1',
+        ];
 
         if (empty($equivalences[$encoding])) {
             return 'UTF-8';
@@ -354,12 +355,12 @@ protected static function utf8_decode($text, $option)
             );
         } else {
             $o = iconv(
-                "UTF-8",
-                "Windows-1252".($option == self::ICONV_TRANSLIT ? '//TRANSLIT' : ($option == self::ICONV_IGNORE ? '//IGNORE' : '')),
+                'UTF-8',
+                'Windows-1252'.($option == self::ICONV_TRANSLIT ? '//TRANSLIT' : ($option == self::ICONV_IGNORE ? '//IGNORE' : '')),
                 $text
             );
         }
 
         return $o;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Helper/UpdateHelper.php b/app/bundles/CoreBundle/Helper/UpdateHelper.php
index de2f521ab4d..d4cd23be63c 100644
--- a/app/bundles/CoreBundle/Helper/UpdateHelper.php
+++ b/app/bundles/CoreBundle/Helper/UpdateHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Helper class for fetching update data
+ * Helper class for fetching update data.
  */
 class UpdateHelper
 {
-
     /**
      * @var \Joomla\Http\Http
      */
@@ -39,7 +39,7 @@ public function __construct(MauticFactory $factory)
     }
 
     /**
-     * Fetches a download package from the remote server
+     * Fetches a download package from the remote server.
      *
      * @param string $package
      *
@@ -52,42 +52,42 @@ public function fetchPackage($package)
             $data = $this->connector->get($package);
         } catch (\Exception $exception) {
             $logger = $this->factory->getLogger();
-            $logger->addError('An error occurred while attempting to fetch the package: ' . $exception->getMessage());
+            $logger->addError('An error occurred while attempting to fetch the package: '.$exception->getMessage());
 
-            return array(
+            return [
                 'error'   => true,
-                'message' => 'mautic.core.updater.error.fetching.package'
-            );
+                'message' => 'mautic.core.updater.error.fetching.package',
+            ];
         }
 
         if ($data->code != 200) {
-            return array(
+            return [
                 'error'   => true,
-                'message' => 'mautic.core.updater.error.fetching.package'
-            );
+                'message' => 'mautic.core.updater.error.fetching.package',
+            ];
         }
 
         // Set the filesystem target
-        $target = $this->factory->getSystemPath('cache') . '/' . basename($package);
+        $target = $this->factory->getSystemPath('cache').'/'.basename($package);
 
         // Write the response to the filesystem
         file_put_contents($target, $data->body);
 
         // Return an array for the sake of consistency
-        return array(
-            'error' => false
-        );
+        return [
+            'error' => false,
+        ];
     }
 
     /**
-     * Tries to get server OS
+     * Tries to get server OS.
      *
      * @return string
      */
     public function getServerOs()
     {
         if (function_exists('php_uname')) {
-            return php_uname('s') . ' ' . php_uname('r');
+            return php_uname('s').' '.php_uname('r');
         } elseif (defined('PHP_OS')) {
             return PHP_OS;
         }
@@ -96,7 +96,7 @@ public function getServerOs()
     }
 
     /**
-     * Retrieves the update data from our home server
+     * Retrieves the update data from our home server.
      *
      * @param bool $overrideCache
      *
@@ -133,7 +133,7 @@ public function fetchData($overrideCache = false)
                     'dbDriver'      => $this->factory->getParameter('db_driver'),
                     'serverOs'      => $this->getServerOs(),
                     'instanceId'    => $instanceId,
-                    'installSource' => $this->factory->getParameter('install_source', 'Mautic')
+                    'installSource' => $this->factory->getParameter('install_source', 'Mautic'),
                 ]
             );
 
@@ -149,7 +149,7 @@ public function fetchData($overrideCache = false)
                 [
                     'appVersion' => $this->factory->getVersion(),
                     'phpVersion' => PHP_VERSION,
-                    'stability'  => $this->factory->getParameter('update_stability')
+                    'stability'  => $this->factory->getParameter('update_stability'),
                 ]
             );
 
@@ -162,7 +162,7 @@ public function fetchData($overrideCache = false)
 
             return [
                 'error'   => true,
-                'message' => 'mautic.core.updater.error.fetching.updates'
+                'message' => 'mautic.core.updater.error.fetching.updates',
             ];
         }
 
@@ -179,7 +179,7 @@ public function fetchData($overrideCache = false)
 
             return [
                 'error'   => true,
-                'message' => 'mautic.core.updater.error.fetching.updates'
+                'message' => 'mautic.core.updater.error.fetching.updates',
             ];
         }
 
@@ -187,7 +187,7 @@ public function fetchData($overrideCache = false)
         if ($update->latest_version) {
             return [
                 'error'   => false,
-                'message' => 'mautic.core.updater.running.latest.version'
+                'message' => 'mautic.core.updater.running.latest.version',
             ];
         }
 
@@ -195,7 +195,7 @@ public function fetchData($overrideCache = false)
         if (version_compare($this->factory->getVersion(), $update->version, 'ge')) {
             return [
                 'error'   => false,
-                'message' => 'mautic.core.updater.running.latest.version'
+                'message' => 'mautic.core.updater.running.latest.version',
             ];
         }
 
@@ -207,7 +207,7 @@ public function fetchData($overrideCache = false)
             'announcement' => $update->announcement,
             'package'      => $update->package,
             'checkedTime'  => time(),
-            'stability'    => $this->factory->getParameter('update_stability')
+            'stability'    => $this->factory->getParameter('update_stability'),
         ];
 
         file_put_contents($cacheFile, json_encode($data));
diff --git a/app/bundles/CoreBundle/Helper/UrlHelper.php b/app/bundles/CoreBundle/Helper/UrlHelper.php
index 576a8064547..631679f07bc 100644
--- a/app/bundles/CoreBundle/Helper/UrlHelper.php
+++ b/app/bundles/CoreBundle/Helper/UrlHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Monolog\Logger;
 
 /**
- * Class UrlHelper
+ * Class UrlHelper.
  */
 class UrlHelper
 {
@@ -46,7 +47,7 @@ public function __construct(Http $http = null, $shortnerServiceUrl = null, Logge
     }
 
     /**
-     * Shorten a URL
+     * Shorten a URL.
      *
      * @param $url
      *
@@ -54,8 +55,7 @@ public function __construct(Http $http = null, $shortnerServiceUrl = null, Logge
      */
     public function buildShortUrl($url)
     {
-        if (! $this->shortnerServiceUrl) {
-
+        if (!$this->shortnerServiceUrl) {
             return $url;
         }
 
@@ -63,7 +63,6 @@ public function buildShortUrl($url)
             $response = $this->http->get($this->shortnerServiceUrl.urlencode($url));
 
             if ($response->code === 200) {
-
                 return rtrim($response->body);
             } elseif ($this->logger) {
                 $this->logger->addWarning("Url shortner failed with code {$response->code}: {$response->body}");
@@ -72,7 +71,7 @@ public function buildShortUrl($url)
             if ($this->logger) {
                 $this->logger->addError(
                     $exception->getMessage(),
-                    array('exception' => $exception)
+                    ['exception' => $exception]
                 );
             }
         }
@@ -87,27 +86,31 @@ public function buildShortUrl($url)
      */
     public static function rel2abs($rel)
     {
-        $path = $host = $scheme = "";
+        $path = $host = $scheme = '';
 
         $base = 'http';
-        if (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
-            $base .= "s";
+        if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+            $base .= 's';
         }
-        $base .= "://";
-        if ($_SERVER["SERVER_PORT"] != "80") {
-            $base .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+        $base .= '://';
+        if ($_SERVER['SERVER_PORT'] != '80') {
+            $base .= $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].$_SERVER['REQUEST_URI'];
         } else {
-            $base .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+            $base .= $_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'];
         }
 
         $base = str_replace('/index_dev.php', '', $base);
         $base = str_replace('/index.php', '', $base);
 
         /* return if already absolute URL */
-        if (parse_url($rel, PHP_URL_SCHEME) != '') return $rel;
+        if (parse_url($rel, PHP_URL_SCHEME) != '') {
+            return $rel;
+        }
 
         /* queries and anchors */
-        if ($rel[0]=='#' || $rel[0]=='?') return $base.$rel;
+        if ($rel[0] == '#' || $rel[0] == '?') {
+            return $base.$rel;
+        }
 
         /* parse base URL and convert to local variables:
            $scheme, $host, $path */
@@ -117,17 +120,20 @@ public static function rel2abs($rel)
         $path = preg_replace('#/[^/]*$#', '', $path);
 
         /* destroy path if relative url points to root */
-        if ($rel[0] == '/') $path = '';
+        if ($rel[0] == '/') {
+            $path = '';
+        }
 
         /* dirty absolute URL // with port number if exists */
-        if (parse_url($base, PHP_URL_PORT) != ''){
+        if (parse_url($base, PHP_URL_PORT) != '') {
             $abs = "$host:".parse_url($base, PHP_URL_PORT)."$path/$rel";
-        }else{
+        } else {
             $abs = "$host$path/$rel";
         }
         /* replace '//' or '/./' or '/foo/../' with '/' */
-        $re = array('#(/\.?/)#', '#/(?!\.\.)[^/]+/\.\./#');
-        for($n=1; $n>0; $abs=preg_replace($re, '/', $abs, -1, $n)) {}
+        $re = ['#(/\.?/)#', '#/(?!\.\.)[^/]+/\.\./#'];
+        for ($n = 1; $n > 0; $abs = preg_replace($re, '/', $abs, -1, $n)) {
+        }
 
         /* absolute URL is ready! */
         return $scheme.'://'.$abs;
diff --git a/app/bundles/CoreBundle/Helper/UserHelper.php b/app/bundles/CoreBundle/Helper/UserHelper.php
index 7aee28069c9..41a8bcfa945 100644
--- a/app/bundles/CoreBundle/Helper/UserHelper.php
+++ b/app/bundles/CoreBundle/Helper/UserHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 
 /**
- * Class IpLookupHelper
+ * Class IpLookupHelper.
  */
 class UserHelper
 {
@@ -34,7 +35,7 @@ public function __construct(TokenStorage $tokenStorage)
 
     /**
      * @param bool $nullIfGuest
-     * 
+     *
      * @return User|null
      */
     public function getUser($nullIfGuest = false)
@@ -46,12 +47,12 @@ public function getUser($nullIfGuest = false)
             $user = $token->getUser();
         }
 
-        if (! $user instanceof User) {
+        if (!$user instanceof User) {
             if ($nullIfGuest) {
                 return null;
             }
-            
-            $user = new User();
+
+            $user          = new User();
             $user->isGuest = true;
         }
 
diff --git a/app/bundles/CoreBundle/IpLookup/AbstractLocalDataLookup.php b/app/bundles/CoreBundle/IpLookup/AbstractLocalDataLookup.php
index 0273e2743a4..691814f13d2 100644
--- a/app/bundles/CoreBundle/IpLookup/AbstractLocalDataLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/AbstractLocalDataLookup.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,19 +13,19 @@
 use Joomla\Http\HttpFactory;
 
 /**
- * Class AbstractLocalDataLookup
+ * Class AbstractLocalDataLookup.
  */
 abstract class AbstractLocalDataLookup extends AbstractLookup implements IpLookupFormInterface
 {
     /**
-     * Path to the local data store
+     * Path to the local data store.
      *
      * @return string
      */
     abstract public function getLocalDataStoreFilepath();
 
     /**
-     * Return the URL to manually download
+     * Return the URL to manually download.
      *
      * @return string
      */
@@ -45,11 +46,11 @@ public function getConfigFormService()
      */
     public function getConfigFormThemes()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Download remote data store
+     * Download remote data store.
      *
      * Used by the mautic:iplookup:update_data command and form fetch button (if applicable) to update local IP data stores
      *
@@ -75,12 +76,12 @@ public function downloadRemoteDataStore()
             $success = false;
 
             switch (true) {
-                case ($localTargetExt === $tempExt):
+                case $localTargetExt === $tempExt:
                     $success = (bool) file_put_contents($localTarget, $data->body);
 
                     break;
 
-                case ('gz' == $tempExt):
+                case 'gz' == $tempExt:
                     if (function_exists('gzdecode')) {
                         $success = (bool) file_put_contents($localTarget, gzdecode($data->body));
                     } elseif (function_exists('gzopen')) {
@@ -100,7 +101,7 @@ public function downloadRemoteDataStore()
 
                     break;
 
-                case ('zip' == $tempExt):
+                case 'zip' == $tempExt:
                     file_put_contents($tempTarget, $data->body);
 
                     $zipper = new \ZipArchive();
@@ -121,7 +122,7 @@ public function downloadRemoteDataStore()
     }
 
     /**
-     * Get the common directory for data
+     * Get the common directory for data.
      *
      * @return null|string
      */
@@ -138,4 +139,4 @@ protected function getDataDir()
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/AbstractLookup.php b/app/bundles/CoreBundle/IpLookup/AbstractLookup.php
index 5309600633a..11bd6f4a69b 100644
--- a/app/bundles/CoreBundle/IpLookup/AbstractLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/AbstractLookup.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,16 +15,16 @@
 
 abstract class AbstractLookup
 {
-    public $city = '';
-    public $region = '';
-    public $zipcode = '';
-    public $country = '';
-    public $latitude = '';
-    public $longitude = '';
-    public $isp = '';
+    public $city         = '';
+    public $region       = '';
+    public $zipcode      = '';
+    public $country      = '';
+    public $latitude     = '';
+    public $longitude    = '';
+    public $isp          = '';
     public $organization = '';
-    public $timezone = '';
-    public $extra = '';
+    public $timezone     = '';
+    public $extra        = '';
 
     /**
      * @var string IP Address
@@ -31,7 +32,7 @@ abstract class AbstractLookup
     protected $ip;
 
     /**
-     * Authorization for lookup service
+     * Authorization for lookup service.
      *
      * @var
      */
@@ -53,14 +54,14 @@ abstract class AbstractLookup
     protected $config;
 
     /**
-     * Return attribution HTML displayed in the configuration UI
+     * Return attribution HTML displayed in the configuration UI.
      *
      * @return string
      */
     abstract public function getAttribution();
 
     /**
-     * Executes the lookup of the IP address
+     * Executes the lookup of the IP address.
      */
     abstract protected function lookup();
 
@@ -98,7 +99,7 @@ public function setIpAddress($ip)
     }
 
     /**
-     * Return details of the IP address lookup
+     * Return details of the IP address lookup.
      *
      * @return array
      */
@@ -107,10 +108,11 @@ public function getDetails()
         $reflect = new \ReflectionClass($this);
         $props   = $reflect->getProperties(\ReflectionProperty::IS_PUBLIC);
 
-        $details = array();
+        $details = [];
         foreach ($props as $prop) {
             $details[$prop->getName()] = $prop->getValue($this);
         }
+
         return $details;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/AbstractRemoteDataLookup.php b/app/bundles/CoreBundle/IpLookup/AbstractRemoteDataLookup.php
index 3c13c77a06a..1fdac7d7b32 100644
--- a/app/bundles/CoreBundle/IpLookup/AbstractRemoteDataLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/AbstractRemoteDataLookup.php
@@ -1,31 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
-use Joomla\Http\HttpFactory;
-use Psr\Log\LoggerInterface;
-
 /**
- * Class AbstractRemoteDataLookup
+ * Class AbstractRemoteDataLookup.
  */
 abstract class AbstractRemoteDataLookup extends AbstractLookup
 {
     /**
-     * Method to use when communicating with the service
+     * Method to use when communicating with the service.
      *
      * @var string
      */
     protected $method = 'get';
 
     /**
-     * Get the URL to fetch data from
+     * Get the URL to fetch data from.
      *
      * @return mixed
      */
@@ -43,7 +41,7 @@ abstract protected function parseResponse($response);
      */
     protected function getHeaders()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -51,11 +49,11 @@ protected function getHeaders()
      */
     protected function getParameters()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Fetch data from lookup service
+     * Fetch data from lookup service.
      */
     protected function lookup()
     {
@@ -69,8 +67,8 @@ protected function lookup()
             $this->parseResponse($response->body);
         } catch (\Exception $exception) {
             if ($this->logger) {
-                $this->logger->warning('IP LOOKUP: ' . $exception->getMessage());
+                $this->logger->warning('IP LOOKUP: '.$exception->getMessage());
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/FreegeoipLookup.php b/app/bundles/CoreBundle/IpLookup/FreegeoipLookup.php
index ac9d3632ae0..7bee984d9e0 100644
--- a/app/bundles/CoreBundle/IpLookup/FreegeoipLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/FreegeoipLookup.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
-
 class FreegeoipLookup extends AbstractRemoteDataLookup
 {
     /**
@@ -56,4 +56,4 @@ protected function parseResponse($response)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/GeobytesLookup.php b/app/bundles/CoreBundle/IpLookup/GeobytesLookup.php
index 5843ac1a0c7..b4d25cfc499 100644
--- a/app/bundles/CoreBundle/IpLookup/GeobytesLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/GeobytesLookup.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
-
 class GeobytesLookup extends AbstractRemoteDataLookup
 {
     /**
@@ -35,8 +35,8 @@ protected function parseResponse($response)
     {
         $data = json_decode($response);
         foreach ($data as $key => $value) {
-            $key = str_replace('geobytes', '', $key);
+            $key        = str_replace('geobytes', '', $key);
             $this->$key = $value;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/GeoipsLookup.php b/app/bundles/CoreBundle/IpLookup/GeoipsLookup.php
index 244d5367dab..4b545a74208 100644
--- a/app/bundles/CoreBundle/IpLookup/GeoipsLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/GeoipsLookup.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
-
 class GeoipsLookup extends AbstractRemoteDataLookup
 {
     /**
@@ -56,4 +56,4 @@ protected function parseResponse($response)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/IP2LocationAPILookup.php b/app/bundles/CoreBundle/IpLookup/IP2LocationAPILookup.php
index 3e5e86fad34..faba8d4c9f8 100644
--- a/app/bundles/CoreBundle/IpLookup/IP2LocationAPILookup.php
+++ b/app/bundles/CoreBundle/IpLookup/IP2LocationAPILookup.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
-
 class IP2LocationAPILookup extends AbstractRemoteDataLookup
 {
     /**
@@ -28,8 +28,6 @@ protected function getUrl()
         return "api.ip2location.com/?ip={$this->ip}&key={$this->auth}&package=WS9&format=json";
     }
 
-
-
     /**
      * @param $response
      */
@@ -37,19 +35,19 @@ protected function parseResponse($response)
     {
         try {
             $record = json_decode($response);
-            if(isset($record->country_name)){
-                $this->country = $record->country_name;
-                $this->region = $record->region_name;
-                $this->city = $record->city_name;
+            if (isset($record->country_name)) {
+                $this->country   = $record->country_name;
+                $this->region    = $record->region_name;
+                $this->city      = $record->city_name;
                 $this->latitude  = $record->latitude;
                 $this->longitude = $record->longitude;
                 //$this->timezone  = $record->location->timeZone;
-                $this->zipcode   = $record->zip_code;
+                $this->zipcode = $record->zip_code;
             }
-        }catch (\Exception $exception) {
+        } catch (\Exception $exception) {
             if ($this->logger) {
-                $this->logger->warn("IP LOOKUP: " . $exception->getMessage());
+                $this->logger->warn('IP LOOKUP: '.$exception->getMessage());
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/IP2LocationBinLookup.php b/app/bundles/CoreBundle/IpLookup/IP2LocationBinLookup.php
index 9d40ccb532b..59dc231ca3f 100644
--- a/app/bundles/CoreBundle/IpLookup/IP2LocationBinLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/IP2LocationBinLookup.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use IP2Location\Database;
 
 /**
- * Class IP2LocationBinLookup
+ * Class IP2LocationBinLookup.
  */
 class IP2LocationBinLookup extends AbstractLocalDataLookup
 {
@@ -27,7 +28,6 @@ public function getAttribution()
     /**
      * @return string
      */
-
     public function getLocalDataStoreFilepath()
     {
         return $this->getDataDir();
@@ -39,7 +39,7 @@ public function getLocalDataStoreFilepath()
     public function getRemoteDateStoreDownloadUrl()
     {
         $usernamePass = explode(':', $this->auth);
-        $data         = array();
+        $data         = [];
 
         if (isset($usernamePass[0]) && isset($usernamePass[1])) {
             $data['login']       = $usernamePass[0];
@@ -56,7 +56,7 @@ public function getRemoteDateStoreDownloadUrl()
     }
 
     /**
-     * Extract the IP from the local database
+     * Extract the IP from the local database.
      */
     protected function lookup()
     {
@@ -76,7 +76,7 @@ protected function lookup()
             }
         } catch (\Exception $exception) {
             if ($this->logger) {
-                $this->logger->warn("IP LOOKUP: " . $exception->getMessage());
+                $this->logger->warn('IP LOOKUP: '.$exception->getMessage());
             }
         }
     }
diff --git a/app/bundles/CoreBundle/IpLookup/IpLookupFormInterface.php b/app/bundles/CoreBundle/IpLookup/IpLookupFormInterface.php
index bb5ab25e83d..7c45d71d035 100644
--- a/app/bundles/CoreBundle/IpLookup/IpLookupFormInterface.php
+++ b/app/bundles/CoreBundle/IpLookup/IpLookupFormInterface.php
@@ -1,30 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
 /**
- * Interface IpLookupFormInterface
+ * Interface IpLookupFormInterface.
  */
 interface IpLookupFormInterface
 {
     /**
-     * Return name of the form service to append to the Config form UI
-     *
-     * @return null
+     * Return name of the form service to append to the Config form UI.
      */
     public function getConfigFormService();
 
     /**
-     * Return array of themes to include in form rendering
+     * Return array of themes to include in form rendering.
      *
      * @return array
      */
     public function getConfigFormThemes();
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/IpinfodbLookup.php b/app/bundles/CoreBundle/IpLookup/IpinfodbLookup.php
index b2b18af0c30..d72a61fef48 100644
--- a/app/bundles/CoreBundle/IpLookup/IpinfodbLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/IpinfodbLookup.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
-
 class IpinfodbLookup extends AbstractRemoteDataLookup
 {
     /**
@@ -59,4 +59,4 @@ protected function parseResponse($response)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/MaxmindCountryLookup.php b/app/bundles/CoreBundle/IpLookup/MaxmindCountryLookup.php
index da4cfbde8fa..14142da3a1d 100644
--- a/app/bundles/CoreBundle/IpLookup/MaxmindCountryLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/MaxmindCountryLookup.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
 /**
- * Class MaxmindCountryLookup
+ * Class MaxmindCountryLookup.
  */
 class MaxmindCountryLookup extends MaxmindLookup
 {
@@ -21,4 +22,4 @@ protected function getName()
     {
         return 'maxmind_country';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/MaxmindDownloadLookup.php b/app/bundles/CoreBundle/IpLookup/MaxmindDownloadLookup.php
index a95a7606099..0c7715c1b03 100644
--- a/app/bundles/CoreBundle/IpLookup/MaxmindDownloadLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/MaxmindDownloadLookup.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -38,7 +39,7 @@ public function getRemoteDateStoreDownloadUrl()
     }
 
     /**
-     * Extract the IP from the local database
+     * Extract the IP from the local database.
      */
     protected function lookup()
     {
@@ -63,11 +64,10 @@ protected function lookup()
             $this->longitude = $record->location->longitude;
             $this->timezone  = $record->location->timeZone;
             $this->zipcode   = $record->location->postalCode;
-
         } catch (\Exception $exception) {
             if ($this->logger) {
-                $this->logger->warn("IP LOOKUP: " . $exception->getMessage());
+                $this->logger->warn('IP LOOKUP: '.$exception->getMessage());
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/MaxmindLookup.php b/app/bundles/CoreBundle/IpLookup/MaxmindLookup.php
index 7d8278f660a..e202051fdfe 100644
--- a/app/bundles/CoreBundle/IpLookup/MaxmindLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/MaxmindLookup.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
 /**
- * Class MaxmindLookup
+ * Class MaxmindLookup.
  */
 class MaxmindLookup extends AbstractRemoteDataLookup
 {
@@ -27,7 +28,7 @@ public function getAttribution()
      */
     protected function getHeaders()
     {
-        return array('Authorization' => 'Basic ' . base64_encode($this->auth));
+        return ['Authorization' => 'Basic '.base64_encode($this->auth)];
     }
 
     /**
@@ -35,7 +36,7 @@ protected function getHeaders()
      */
     protected function getUrl()
     {
-        $url = "https://geoip.maxmind.com/geoip/v2.1/";
+        $url = 'https://geoip.maxmind.com/geoip/v2.1/';
 
         switch ($this->getName()) {
             case 'maxmind_country':
@@ -92,8 +93,8 @@ protected function parseResponse($response)
                     $this->organization = $data->traits->organization;
                 }
             } elseif (null !== $this->logger) {
-                $this->logger->warning('IP LOOKUP: ' . $data->error);
+                $this->logger->warning('IP LOOKUP: '.$data->error);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/MaxmindOmniLookup.php b/app/bundles/CoreBundle/IpLookup/MaxmindOmniLookup.php
index 14afeeebd5b..bf84a23f485 100644
--- a/app/bundles/CoreBundle/IpLookup/MaxmindOmniLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/MaxmindOmniLookup.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
 /**
- * Class MaxmindOmniLookup
+ * Class MaxmindOmniLookup.
  */
 class MaxmindOmniLookup extends MaxmindLookup
 {
@@ -21,4 +22,4 @@ protected function getName()
     {
         return 'maxmind_omni';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/MaxmindPrecisionLookup.php b/app/bundles/CoreBundle/IpLookup/MaxmindPrecisionLookup.php
index c05ced17301..9ffa4dc4330 100644
--- a/app/bundles/CoreBundle/IpLookup/MaxmindPrecisionLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/MaxmindPrecisionLookup.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
 /**
- * Class MaxmindPrecisionLookup
+ * Class MaxmindPrecisionLookup.
  */
 class MaxmindPrecisionLookup extends MaxmindLookup
 {
@@ -21,4 +22,4 @@ protected function getName()
     {
         return 'maxmind_precision';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/IpLookup/TelizeLookup.php b/app/bundles/CoreBundle/IpLookup/TelizeLookup.php
index afdba7b40b4..09a8e947f94 100644
--- a/app/bundles/CoreBundle/IpLookup/TelizeLookup.php
+++ b/app/bundles/CoreBundle/IpLookup/TelizeLookup.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\IpLookup;
 
-
 class TelizeLookup extends AbstractRemoteDataLookup
 {
     /**
@@ -33,18 +33,16 @@ protected function getUrl()
      */
     protected function getHeaders()
     {
-        return array(
-            "X-Mashape-Key" => $this->auth,
-            "Accept"        => "application/json"
-        );
+        return [
+            'X-Mashape-Key' => $this->auth,
+            'Accept'        => 'application/json',
+        ];
     }
 
     /**
-     * Populates properties with obtained data from the service
+     * Populates properties with obtained data from the service.
      *
      * @param mixed $response Response from the service
-     *
-     * @return void
      */
     protected function parseResponse($response)
     {
@@ -60,4 +58,4 @@ protected function parseResponse($response)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Loader/RouteLoader.php b/app/bundles/CoreBundle/Loader/RouteLoader.php
index 6fb56278537..2777fb8b288 100644
--- a/app/bundles/CoreBundle/Loader/RouteLoader.php
+++ b/app/bundles/CoreBundle/Loader/RouteLoader.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,11 +17,10 @@
 use Symfony\Component\Routing\RouteCollection;
 
 /**
- * Class RouteLoader
+ * Class RouteLoader.
  */
 class RouteLoader extends Loader
 {
-
     /**
      * @var bool
      */
@@ -36,16 +36,17 @@ class RouteLoader extends Loader
      */
     public function __construct(MauticFactory $factory)
     {
-        $this->factory  = $factory;
+        $this->factory = $factory;
     }
 
     /**
-     * Load each bundles routing.php file
+     * Load each bundles routing.php file.
      *
      * @param mixed $resource
      * @param null  $type
      *
      * @return RouteCollection
+     *
      * @throws \RuntimeException
      */
     public function load($resource, $type = null)
diff --git a/app/bundles/CoreBundle/Loader/TranslationLoader.php b/app/bundles/CoreBundle/Loader/TranslationLoader.php
index 295c2aa8f19..49baf4d6ac8 100644
--- a/app/bundles/CoreBundle/Loader/TranslationLoader.php
+++ b/app/bundles/CoreBundle/Loader/TranslationLoader.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,11 +17,10 @@
 use Symfony\Component\Translation\MessageCatalogue;
 
 /**
- * Class TranslationLoader
+ * Class TranslationLoader.
  */
 class TranslationLoader extends ArrayLoader implements LoaderInterface
 {
-
     /**
      * @var MauticFactory
      */
@@ -45,9 +45,8 @@ public function load($resource, $locale, $domain = 'messages')
         //Bundle translations
         foreach ($bundles as $name => $bundle) {
             //load translations
-            $translations = $bundle['directory'] . '/Translations/' . $locale;
+            $translations = $bundle['directory'].'/Translations/'.$locale;
             if (file_exists($translations)) {
-
                 $iniFiles = new Finder();
                 $iniFiles->files()->in($translations)->name('*.ini');
 
@@ -59,7 +58,7 @@ public function load($resource, $locale, $domain = 'messages')
 
         //Theme translations
         $themeDir = $this->factory->getSystemPath('current_theme', true);
-        if (file_exists($themeTranslation = $themeDir . '/translations/' . $locale)) {
+        if (file_exists($themeTranslation = $themeDir.'/translations/'.$locale)) {
             $iniFiles = new Finder();
             $iniFiles->files()->in($themeTranslation)->name('*.ini');
             foreach ($iniFiles as $file) {
@@ -68,7 +67,7 @@ public function load($resource, $locale, $domain = 'messages')
         }
 
         //3rd Party translations
-        $translationsDir = $this->factory->getSystemPath('translations', true) . '/' . $locale;
+        $translationsDir = $this->factory->getSystemPath('translations', true).'/'.$locale;
         if (file_exists($translationsDir)) {
             $iniFiles = new Finder();
             $iniFiles->files()->in($translationsDir)->name('*.ini');
@@ -79,7 +78,7 @@ public function load($resource, $locale, $domain = 'messages')
         }
 
         //Overrides
-        $overridesDir = $this->factory->getSystemPath('translations', true) . '/overrides/' . $locale;
+        $overridesDir = $this->factory->getSystemPath('translations', true).'/overrides/'.$locale;
         if (file_exists($overridesDir)) {
             $iniFiles = new Finder();
             $iniFiles->files()->in($overridesDir)->name('*.ini');
@@ -93,7 +92,7 @@ public function load($resource, $locale, $domain = 'messages')
     }
 
     /**
-     * Load the translation into the catalogue
+     * Load the translation into the catalogue.
      *
      * @param $catalogue
      * @param $locale
diff --git a/app/bundles/CoreBundle/MauticCoreBundle.php b/app/bundles/CoreBundle/MauticCoreBundle.php
index 8cd942c18d1..e350e258052 100644
--- a/app/bundles/CoreBundle/MauticCoreBundle.php
+++ b/app/bundles/CoreBundle/MauticCoreBundle.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle;
 
+use Mautic\CoreBundle\DependencyInjection\Compiler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Mautic\CoreBundle\DependencyInjection\Compiler;
 
 /**
- * Class MauticCoreBundle
+ * Class MauticCoreBundle.
  */
 class MauticCoreBundle extends Bundle
 {
diff --git a/app/bundles/CoreBundle/Menu/MenuBuilder.php b/app/bundles/CoreBundle/Menu/MenuBuilder.php
index 291f8593e5f..b6cf163f86f 100644
--- a/app/bundles/CoreBundle/Menu/MenuBuilder.php
+++ b/app/bundles/CoreBundle/Menu/MenuBuilder.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,11 +19,10 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class MenuBuilder
+ * Class MenuBuilder.
  */
 class MenuBuilder
 {
-
     /**
      * @var FactoryInterface
      */
@@ -70,7 +70,7 @@ public function __call($name, $arguments)
     }
 
     /**
-     * Used by breadcrumbs to determine active link
+     * Used by breadcrumbs to determine active link.
      *
      * @param \Knp\Menu\ItemInterface $menu
      * @param string                  $forRouteUri
@@ -83,13 +83,13 @@ public function getCurrentMenuItem($menu, $forRouteUri, $forRouteName)
         try {
             /** @var \Knp\Menu\ItemInterface $item */
             foreach ($menu as $item) {
-                if ($forRouteUri == "current" && $this->matcher->isCurrent($item)) {
+                if ($forRouteUri == 'current' && $this->matcher->isCurrent($item)) {
                     //current match
                     return $item;
-                } else if ($forRouteUri != "current" && $item->getUri() == $forRouteUri) {
+                } elseif ($forRouteUri != 'current' && $item->getUri() == $forRouteUri) {
                     //route uri match
                     return $item;
-                } else if (!empty($forRouteName) && $forRouteName == $item->getExtra("routeName")) {
+                } elseif (!empty($forRouteName) && $forRouteName == $item->getExtra('routeName')) {
                     //route name match
                     return $item;
                 }
@@ -112,7 +112,7 @@ public function getCurrentMenuItem($menu, $forRouteUri, $forRouteName)
      */
     private function buildMenu($name)
     {
-        static $menus = array();
+        static $menus = [];
 
         if (!isset($menus[$name])) {
             $loader = new ArrayLoader($this->factory);
diff --git a/app/bundles/CoreBundle/Menu/MenuHelper.php b/app/bundles/CoreBundle/Menu/MenuHelper.php
index 0f6c987abc1..26d3459d96a 100644
--- a/app/bundles/CoreBundle/Menu/MenuHelper.php
+++ b/app/bundles/CoreBundle/Menu/MenuHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * Class MenuHelper
+ * Class MenuHelper.
  */
 class MenuHelper
 {
@@ -36,7 +37,7 @@ class MenuHelper
     protected $user;
 
     /**
-     * Stores items that are assigned to another parent outside it's bundle
+     * Stores items that are assigned to another parent outside it's bundle.
      *
      * @var array
      */
@@ -64,11 +65,11 @@ public function __construct(CorePermissions $security, UserHelper $userHelper, R
     }
 
     /**
-     * Converts menu config into something KNP menus expects
+     * Converts menu config into something KNP menus expects.
      *
-     * @param      $items
-     * @param int  $depth
-     * @param int  $defaultPriority
+     * @param     $items
+     * @param int $depth
+     * @param int $defaultPriority
      */
     public function createMenuStructure(&$items, $depth = 0, $defaultPriority = 9999)
     {
@@ -137,7 +138,7 @@ public function createMenuStructure(&$items, $depth = 0, $defaultPriority = 9999
             if (!isset($i['linkAttributes'])) {
                 $i['linkAttributes'] = [
                     'data-menu-link' => $i['id'],
-                    'id'             => $i['id']
+                    'id'             => $i['id'],
                 ];
             } elseif (!isset($i['linkAttributes']['id'])) {
                 $i['linkAttributes']['id']             = $i['id'];
@@ -193,7 +194,7 @@ public function createMenuStructure(&$items, $depth = 0, $defaultPriority = 9999
     }
 
     /**
-     * Get and reset orphaned menu items
+     * Get and reset orphaned menu items.
      *
      * @return array
      */
@@ -206,7 +207,7 @@ public function resetOrphans()
     }
 
     /**
-     * Give orphaned menu items a home
+     * Give orphaned menu items a home.
      *
      * @param array $menuItems
      * @param bool  $appendOrphans
@@ -248,7 +249,7 @@ public function placeOrphans(array &$menuItems, $appendOrphans = false, $depth =
     }
 
     /**
-     * Sort menu items by priority
+     * Sort menu items by priority.
      *
      * @param $menuItems
      * @param $defaultPriority
@@ -277,7 +278,6 @@ function ($a, $b) use ($defaultPriority) {
         );
     }
 
-
     /**
      * @param $name
      *
diff --git a/app/bundles/CoreBundle/Menu/MenuRenderer.php b/app/bundles/CoreBundle/Menu/MenuRenderer.php
index 5e7e384c64d..b6321c475bc 100644
--- a/app/bundles/CoreBundle/Menu/MenuRenderer.php
+++ b/app/bundles/CoreBundle/Menu/MenuRenderer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,15 +13,13 @@
 use Knp\Menu\ItemInterface;
 use Knp\Menu\Matcher\MatcherInterface;
 use Knp\Menu\Renderer\RendererInterface;
-use Knp\Menu\Util\MenuManipulator;
 use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class MenuRenderer
+ * Class MenuRenderer.
  */
 class MenuRenderer implements RendererInterface
 {
-
     /**
      * @var \Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine
      */
@@ -47,11 +46,11 @@ class MenuRenderer implements RendererInterface
      * @param string           $charset
      * @param array            $defaultOptions
      */
-    public function __construct(MatcherInterface $matcher, MauticFactory $factory, $charset, array $defaultOptions = array())
+    public function __construct(MatcherInterface $matcher, MauticFactory $factory, $charset, array $defaultOptions = [])
     {
         $this->engine         = $factory->getTemplating();
-        $this->matcher        =& $matcher;
-        $this->defaultOptions = array_merge(array(
+        $this->matcher        = &$matcher;
+        $this->defaultOptions = array_merge([
             'depth'             => null,
             'matchingDepth'     => null,
             'currentAsLink'     => true,
@@ -63,19 +62,19 @@ public function __construct(MatcherInterface $matcher, MauticFactory $factory, $
             'compressed'        => false,
             'allow_safe_labels' => false,
             'clear_matcher'     => true,
-        ), $defaultOptions);
-        $this->charset        = $charset;
+        ], $defaultOptions);
+        $this->charset = $charset;
     }
 
     /**
-     * Renders menu
+     * Renders menu.
      *
      * @param ItemInterface $item
      * @param array         $options
      *
      * @return string
      */
-    public function render(ItemInterface $item, array $options = array())
+    public function render(ItemInterface $item, array $options = [])
     {
         $options = array_merge($this->defaultOptions, $options);
 
@@ -84,11 +83,11 @@ public function render(ItemInterface $item, array $options = array())
         }
 
         //render html
-        $html = $this->engine->render($options['template'], array(
+        $html = $this->engine->render($options['template'], [
             'item'    => $item,
             'options' => $options,
-            'matcher' => $this->matcher
-        ));
+            'matcher' => $this->matcher,
+        ]);
 
         return $html;
     }
diff --git a/app/bundles/CoreBundle/Model/AbstractCommonModel.php b/app/bundles/CoreBundle/Model/AbstractCommonModel.php
index 2abf2f01bae..00d322bda32 100644
--- a/app/bundles/CoreBundle/Model/AbstractCommonModel.php
+++ b/app/bundles/CoreBundle/Model/AbstractCommonModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,22 +12,19 @@
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\UserHelper;
-use Mautic\UserBundle\Entity\User;
-use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Security\Core\SecurityContext;
+use Mautic\UserBundle\Entity\User;
+use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\Translation\TranslatorInterface;
-use Psr\Log\LoggerInterface;
 
 /**
- * Class AbstractCommonModel
- *
- * @package Mautic\CoreBundle\Model
+ * Class AbstractCommonModel.
  */
 abstract class AbstractCommonModel
 {
@@ -132,9 +130,8 @@ public function setLogger(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-
     /**
-     * Initialize the user parameter for use in locking procedures
+     * Initialize the user parameter for use in locking procedures.
      *
      * @param UserHelper $userHelper
      */
@@ -144,7 +141,7 @@ public function setUser(UserHelper $userHelper)
     }
 
     /**
-     * Retrieve the supported search commands for a repository
+     * Retrieve the supported search commands for a repository.
      *
      * @return array
      */
@@ -154,7 +151,7 @@ public function getSupportedSearchCommands()
     }
 
     /**
-     * Retrieve the search command list for a repository
+     * Retrieve the search command list for a repository.
      *
      * @return array
      */
@@ -166,7 +163,7 @@ public function getCommandList()
     }
 
     /**
-     * Retrieve the repository for an entity
+     * Retrieve the repository for an entity.
      *
      * @return \Mautic\CoreBundle\Entity\CommonRepository|bool
      */
@@ -182,7 +179,7 @@ public function getRepository()
     }
 
     /**
-     * Retrieve the permissions base
+     * Retrieve the permissions base.
      *
      * @return string
      */
@@ -192,7 +189,7 @@ public function getPermissionBase()
     }
 
     /**
-     * Return a list of entities
+     * Return a list of entities.
      *
      * @param array $args [start, limit, filter, orderBy, orderByDir]
      *
@@ -214,7 +211,7 @@ public function getEntities(array $args = [])
     }
 
     /**
-     * Get a specific entity
+     * Get a specific entity.
      *
      * @param $id
      *
@@ -235,7 +232,7 @@ public function getEntity($id = null)
     }
 
     /**
-     * Encode an array to append to a URL
+     * Encode an array to append to a URL.
      *
      * @param $array
      *
@@ -247,7 +244,7 @@ public function encodeArrayForUrl($array)
     }
 
     /**
-     * Decode a string appended to URL into an array
+     * Decode a string appended to URL into an array.
      *
      * @param      $string
      * @param bool $urlDecode
@@ -274,16 +271,16 @@ public function decodeArrayFromUrl($string, $urlDecode = true)
      *
      * @return string
      */
-    public function buildUrl($route, $routeParams = array(), $absolute = true, $clickthrough = array())
+    public function buildUrl($route, $routeParams = [], $absolute = true, $clickthrough = [])
     {
-        $url  = $this->router->generate($route, $routeParams, $absolute);
-        $url .= (!empty($clickthrough)) ? '?ct=' . $this->encodeArrayForUrl($clickthrough) : '';
+        $url = $this->router->generate($route, $routeParams, $absolute);
+        $url .= (!empty($clickthrough)) ? '?ct='.$this->encodeArrayForUrl($clickthrough) : '';
 
         return $url;
     }
 
     /**
-     * Retrieve entity based on id/alias slugs
+     * Retrieve entity based on id/alias slugs.
      *
      * @param string $slug
      *
@@ -300,12 +297,12 @@ public function getEntityBySlugs($slug)
         $locales   = Intl::getLocaleBundle()->getLocaleNames();
 
         switch (true) {
-            case ($slugCount === 3):
+            case $slugCount === 3:
                 list($lang, $category, $idSlug) = $slugs;
 
                 break;
 
-            case ($slugCount === 2):
+            case $slugCount === 2:
                 list($category, $idSlug) = $slugs;
 
                 // Check if the first slug is actually a locale
@@ -316,7 +313,7 @@ public function getEntityBySlugs($slug)
 
                 break;
 
-            case ($slugCount === 1):
+            case $slugCount === 1:
                 $idSlug = $slugs[0];
 
                 break;
@@ -358,6 +355,5 @@ public function getEntityBySlugs($slug)
      */
     public function getEntityByAlias($alias, $categoryAlias = null, $lang = null)
     {
-
     }
 }
diff --git a/app/bundles/CoreBundle/Model/AuditLogModel.php b/app/bundles/CoreBundle/Model/AuditLogModel.php
index 30e97cae19a..19b1575370b 100644
--- a/app/bundles/CoreBundle/Model/AuditLogModel.php
+++ b/app/bundles/CoreBundle/Model/AuditLogModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\UserBundle\Entity\User;
 
 /**
- * Class AuditLogModel
+ * Class AuditLogModel.
  */
 class AuditLogModel extends AbstractCommonModel
 {
-
     /**
      * {@inheritdoc}
      *
@@ -29,18 +29,18 @@ public function getRepository()
     }
 
     /**
-     * Writes an entry to the audit log
+     * Writes an entry to the audit log.
      *
      * @param array $args [bundle, object, objectId, action, details, ipAddress]
      */
     public function writeToLog(array $args)
     {
-        $bundle    = (isset($args["bundle"])) ? $args["bundle"] : "";
-        $object    = (isset($args["object"])) ? $args["object"] : "";
-        $objectId  = (isset($args["objectId"])) ? $args["objectId"] : "";
-        $action    = (isset($args["action"])) ? $args["action"] : "";
-        $details   = (isset($args["details"])) ? $args["details"] : "";
-        $ipAddress = (isset($args["ipAddress"])) ? $args["ipAddress"] : "";
+        $bundle    = (isset($args['bundle'])) ? $args['bundle'] : '';
+        $object    = (isset($args['object'])) ? $args['object'] : '';
+        $objectId  = (isset($args['objectId'])) ? $args['objectId'] : '';
+        $action    = (isset($args['action'])) ? $args['action'] : '';
+        $details   = (isset($args['details'])) ? $args['details'] : '';
+        $ipAddress = (isset($args['ipAddress'])) ? $args['ipAddress'] : '';
 
         $log = new AuditLog();
         $log->setBundle($bundle);
@@ -64,13 +64,13 @@ public function writeToLog(array $args)
         $log->setUserId($userId);
         $log->setUserName($userName);
 
-        $this->em->getRepository("MauticCoreBundle:AuditLog")->saveEntity($log);
+        $this->em->getRepository('MauticCoreBundle:AuditLog')->saveEntity($log);
 
         $this->em->detach($log);
     }
 
     /**
-     * Get the audit log for specific object
+     * Get the audit log for specific object.
      *
      * @param      $object
      * @param      $id
@@ -82,6 +82,6 @@ public function writeToLog(array $args)
      */
     public function getLogForObject($object, $id, $afterDate = null, $limit = 10, $bundle = null)
     {
-        return $this->em->getRepository("MauticCoreBundle:AuditLog")->getLogForObject($object, $id, $limit, $afterDate, $bundle);
+        return $this->em->getRepository('MauticCoreBundle:AuditLog')->getLogForObject($object, $id, $limit, $afterDate, $bundle);
     }
 }
diff --git a/app/bundles/CoreBundle/Model/FormModel.php b/app/bundles/CoreBundle/Model/FormModel.php
index 4b21becf3c0..8fa3674a471 100644
--- a/app/bundles/CoreBundle/Model/FormModel.php
+++ b/app/bundles/CoreBundle/Model/FormModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,16 +16,14 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class FormModel
+ * Class FormModel.
  */
 class FormModel extends AbstractCommonModel
 {
     /**
-     * Lock an entity to prevent multiple people from editing
+     * Lock an entity to prevent multiple people from editing.
      *
      * @param object $entity
-     *
-     * @return void
      */
     public function lockEntity($entity)
     {
@@ -40,7 +39,7 @@ public function lockEntity($entity)
     }
 
     /**
-     * Check to see if the entity is locked
+     * Check to see if the entity is locked.
      *
      * @param object $entity
      *
@@ -58,16 +57,15 @@ public function isLocked($entity)
                 }
             }
         }
+
         return false;
     }
 
     /**
-     * Unlock an entity that prevents multiple people from editing
+     * Unlock an entity that prevents multiple people from editing.
      *
      * @param object $entity
-     * @param        $extra Can be used by model to determine what to unlock
-     *
-     * @return void
+     * @param        $extra  Can be used by model to determine what to unlock
      */
     public function unlockEntity($entity, $extra = null)
     {
@@ -85,7 +83,7 @@ public function unlockEntity($entity, $extra = null)
     }
 
     /**
-     * Create/edit entity
+     * Create/edit entity.
      *
      * @param object $entity
      * @param bool   $unlock
@@ -97,13 +95,13 @@ public function saveEntity($entity, $unlock = true)
         //set some defaults
         $this->setTimestamps($entity, $isNew, $unlock);
 
-        $event = $this->dispatchEvent("pre_save", $entity, $isNew);
+        $event = $this->dispatchEvent('pre_save', $entity, $isNew);
         $this->getRepository()->saveEntity($entity);
-        $this->dispatchEvent("post_save", $entity, $isNew, $event);
+        $this->dispatchEvent('post_save', $entity, $isNew, $event);
     }
 
     /**
-     * Save an array of entities
+     * Save an array of entities.
      *
      * @param array $entities
      * @param bool  $unlock
@@ -120,9 +118,9 @@ public function saveEntities($entities, $unlock = true)
             //set some defaults
             $this->setTimestamps($entity, $isNew, $unlock);
 
-            $event = $this->dispatchEvent("pre_save", $entity, $isNew);
+            $event = $this->dispatchEvent('pre_save', $entity, $isNew);
             $this->getRepository()->saveEntity($entity, false);
-            $this->dispatchEvent("post_save", $entity, $isNew, $event);
+            $this->dispatchEvent('post_save', $entity, $isNew, $event);
 
             if ((($k + 1) % $batchSize) === 0) {
                 $this->em->flush();
@@ -132,7 +130,7 @@ public function saveEntities($entities, $unlock = true)
     }
 
     /**
-     * Determines if an entity is new or not
+     * Determines if an entity is new or not.
      *
      * @param mixed $entity
      *
@@ -150,11 +148,11 @@ public function isNewEntity($entity)
     }
 
     /**
-     * Toggles entity publish status
+     * Toggles entity publish status.
      *
      * @param object $entity
      *
-     * @return bool  Force browser refresh
+     * @return bool Force browser refresh
      */
     public function togglePublishStatus($entity)
     {
@@ -181,15 +179,15 @@ public function togglePublishStatus($entity)
         }
 
         //hit up event listeners
-        $event = $this->dispatchEvent("pre_save", $entity, false);
+        $event = $this->dispatchEvent('pre_save', $entity, false);
         $this->getRepository()->saveEntity($entity);
-        $this->dispatchEvent("post_save", $entity, false, $event);
+        $this->dispatchEvent('post_save', $entity, false, $event);
 
         return false;
     }
 
     /**
-     * Set timestamps and user ids
+     * Set timestamps and user ids.
      *
      * @param object $entity
      * @param bool   $isNew
@@ -231,25 +229,23 @@ public function setTimestamps(&$entity, $isNew, $unlock = true)
     }
 
     /**
-     * Delete an entity
+     * Delete an entity.
      *
      * @param object $entity
-     *
-     * @return void
      */
     public function deleteEntity($entity)
     {
         //take note of ID before doctrine wipes it out
-        $id = $entity->getId();
-        $event = $this->dispatchEvent("pre_delete", $entity);
+        $id    = $entity->getId();
+        $event = $this->dispatchEvent('pre_delete', $entity);
         $this->getRepository()->deleteEntity($entity);
         //set the id for use in events
         $entity->deletedId = $id;
-        $this->dispatchEvent("post_delete", $entity, false, $event);
+        $this->dispatchEvent('post_delete', $entity, false, $event);
     }
 
     /**
-     * Delete an array of entities
+     * Delete an array of entities.
      *
      * @param array $ids
      *
@@ -257,18 +253,18 @@ public function deleteEntity($entity)
      */
     public function deleteEntities($ids)
     {
-        $entities = array();
+        $entities = [];
         //iterate over the results so the events are dispatched on each delete
         $batchSize = 20;
         foreach ($ids as $k => $id) {
-            $entity = $this->getEntity($id);
+            $entity        = $this->getEntity($id);
             $entities[$id] = $entity;
             if ($entity !== null) {
-                $event = $this->dispatchEvent("pre_delete", $entity);
+                $event = $this->dispatchEvent('pre_delete', $entity);
                 $this->getRepository()->deleteEntity($entity, false);
                 //set the id for use in events
                 $entity->deletedId = $id;
-                $this->dispatchEvent("post_delete", $entity, false, $event);
+                $this->dispatchEvent('post_delete', $entity, false, $event);
             }
             if ((($k + 1) % $batchSize) === 0) {
                 $this->em->flush();
@@ -280,7 +276,7 @@ public function deleteEntities($ids)
     }
 
     /**
-     * Creates the appropriate form per the model
+     * Creates the appropriate form per the model.
      *
      * @param object                              $entity
      * @param \Symfony\Component\Form\FormFactory $formFactory
@@ -288,15 +284,16 @@ public function deleteEntities($ids)
      * @param array                               $options
      *
      * @return \Symfony\Component\Form\Form
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         throw new NotFoundHttpException('Form object not found.');
     }
 
     /**
-     * Dispatches events for child classes
+     * Dispatches events for child classes.
      *
      * @param       $action
      * @param       $entity
@@ -313,7 +310,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     }
 
     /**
-     * Set default subject for user contact form
+     * Set default subject for user contact form.
      *
      * @param string $subject
      * @param object $entity
@@ -332,33 +329,35 @@ public function getUserContactSubject($subject, $entity)
         }
 
         $nameGetter = $this->getNameGetter();
-        $subject    = $this->translator->trans($msg, array(
+        $subject    = $this->translator->trans($msg, [
             '%entityName%' => $entity->$nameGetter(),
-            '%entityId%'   => $entity->getId()
-        ));
+            '%entityId%'   => $entity->getId(),
+        ]);
 
         return $subject;
     }
 
     /**
-     * Returns the function used to name the entity
+     * Returns the function used to name the entity.
      *
      * @return string
      */
     public function getNameGetter()
     {
-        return "getName";
+        return 'getName';
     }
 
     /**
      * Cleans a string to be used as an alias. The returned string will be alphanumeric or underscore, less than 25 characters
-     * and if it is a reserved SQL keyword, it will be prefixed with f_
+     * and if it is a reserved SQL keyword, it will be prefixed with f_.
      *
      * @param string   $alias
-     * @param string   $prefix Used when the alias is a reserved keyword by the database platform
-     * @param int|bool $maxLength Maximum number of characters used; 0 to disable
+     * @param string   $prefix         Used when the alias is a reserved keyword by the database platform
+     * @param int|bool $maxLength      Maximum number of characters used; 0 to disable
      * @param string   $spaceCharacter Character to replace spaces with
+     *
      * @return string
+     *
      * @throws \Doctrine\DBAL\DBALException
      */
     public function cleanAlias($alias, $prefix = '', $maxLength = false, $spaceCharacter = '_')
@@ -368,12 +367,12 @@ public function cleanAlias($alias, $prefix = '', $maxLength = false, $spaceChara
 
         // Some labels are quite long if a question so cut this short
         $alias = strtolower(InputHelper::alphanum($alias, false, $spaceCharacter));
-        
+
         // Ensure we have something
         if (empty($alias)) {
-            $alias = substr(str_shuffle("abcdefghijklmnopqrstuvwxyz"), 0, 5);
+            $alias = substr(str_shuffle('abcdefghijklmnopqrstuvwxyz'), 0, 5);
         }
-        
+
         // Trim if applicable
         if ($maxLength) {
             $alias = substr($alias, 0, $maxLength);
@@ -382,13 +381,13 @@ public function cleanAlias($alias, $prefix = '', $maxLength = false, $spaceChara
         if (substr($alias, -1) == '_') {
             $alias = substr($alias, 0, -1);
         }
-        
+
         // Check that alias is SQL safe since it will be used for the column name
         $databasePlatform = $this->em->getConnection()->getDatabasePlatform();
-        $reservedWords = $databasePlatform->getReservedKeywordsList();
+        $reservedWords    = $databasePlatform->getReservedKeywordsList();
 
         if ($reservedWords->isKeyword($alias) || is_numeric($alias)) {
-            $alias = $prefix . $alias;
+            $alias = $prefix.$alias;
         }
 
         return $alias;
diff --git a/app/bundles/CoreBundle/Model/MessageQueueModel.php b/app/bundles/CoreBundle/Model/MessageQueueModel.php
index 25ba5535a6d..4d64d1f9a14 100644
--- a/app/bundles/CoreBundle/Model/MessageQueueModel.php
+++ b/app/bundles/CoreBundle/Model/MessageQueueModel.php
@@ -1,30 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Model;
 
+use Mautic\CoreBundle\CoreEvents;
+use Mautic\CoreBundle\Entity\MessageQueue;
 use Mautic\CoreBundle\Event\MessageQueueBatchProcessEvent;
+use Mautic\CoreBundle\Event\MessageQueueEvent;
 use Mautic\CoreBundle\Event\MessageQueueProcessEvent;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\CompanyModel;
 use Mautic\LeadBundle\Model\LeadModel;
-use Mautic\CoreBundle\Entity\MessageQueue;
-use Mautic\CoreBundle\Event\MessageQueueEvent;
-use Mautic\CoreBundle\CoreEvents;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class MessageQueueModel
+ * Class MessageQueueModel.
  */
 class MessageQueueModel extends FormModel
 {
-
     /**
      * @var LeadModel
      */
@@ -76,13 +76,12 @@ public function addToQueue($leads, $channel, $channelId, $scheduledDate = null,
             $scheduledDate = new \DateTime();
         } elseif (!$scheduledDate instanceof \DateTime) {
             $intervalPrefix = ('H' === $scheduledDate) ? 'PT' : 'P';
-            $scheduledDate = (new \DateTime())->add(new \DateInterval($intervalPrefix.$scheduledDate));
+            $scheduledDate  = (new \DateTime())->add(new \DateInterval($intervalPrefix.$scheduledDate));
         }
 
-        foreach ($leads as $lead){
-
+        foreach ($leads as $lead) {
             if (empty($this->getRepository()->findMessage($channel, $channelId, $lead['id']))) {
-                $leadEntity = $this->leadModel->getEntity($lead['id']);
+                $leadEntity   = $this->leadModel->getEntity($lead['id']);
                 $messageQueue = new MessageQueue();
                 if ($campaignEventId) {
                     $messageQueue->setEvent($this->em->getReference('MauticCampaignBundle:Event', $campaignEventId));
@@ -112,10 +111,10 @@ public function sendMessages($channel = null, $channelId = null)
     {
         // Note when the process started for batch purposes
         $processStarted = new \DateTime();
-        $limit   = 50;
-        $counter = 0;
+        $limit          = 50;
+        $counter        = 0;
         while ($queue = $this->getRepository()->getQueuedMessages($limit, $processStarted, $channel, $channelId)) {
-            $contacts = [];
+            $contacts  = [];
             $byChannel = [];
 
             // Lead entities will not have profile fields populated due to the custom field use - therefore to optimize resources,
@@ -166,12 +165,12 @@ public function sendMessages($channel = null, $channelId = null)
                 $lead = $message->getLead();
 
                 if (!$message->isProcessed()) {
-                    $event   = new MessageQueueProcessEvent($message);
+                    $event = new MessageQueueProcessEvent($message);
                     $this->dispatchEvent('process_message_queue', $message, false, $event);
                 }
 
                 if ($message->isSuccess()) {
-                    $counter++;
+                    ++$counter;
                     $message->setAttempts($message->getAttempts() + 1);
                     $message->setSuccess(true);
                     $message->setLastAttempt(new \DateTime());
@@ -204,7 +203,7 @@ public function rescheduleMessage($leadId, $channel, $channelId, $rescheduleDate
     {
         $persist = false;
         if (!$message) {
-            $message   = $this->getRepository()->findMessage($channel, $channelId, $leadId);
+            $message = $this->getRepository()->findMessage($channel, $channelId, $leadId);
             $persist = true;
         }
 
@@ -235,13 +234,13 @@ public function rescheduleMessage($leadId, $channel, $channelId, $rescheduleDate
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         switch ($action) {
-            case "process_message_queue":
+            case 'process_message_queue':
                 $name = CoreEvents::PROCESS_MESSAGE_QUEUE;
                 break;
-            case "process_batch_message_queue":
+            case 'process_batch_message_queue':
                 $name = CoreEvents::PROCESS_MESSAGE_QUEUE_BATCH;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = CoreEvents::MESSAGE_QUEUED;
                 break;
             default:
@@ -260,4 +259,4 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Model/NotificationModel.php b/app/bundles/CoreBundle/Model/NotificationModel.php
index 13b548dbc94..1d8d10063f6 100644
--- a/app/bundles/CoreBundle/Model/NotificationModel.php
+++ b/app/bundles/CoreBundle/Model/NotificationModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,12 +23,12 @@
 use Symfony\Component\HttpFoundation\Session\Session;
 
 /**
- * Class NotificationModel
+ * Class NotificationModel.
  */
 class NotificationModel extends FormModel
 {
     /**
-     * @var boolean
+     * @var bool
      */
     protected $disableUpdates;
 
@@ -103,7 +104,7 @@ public function getRepository()
     }
 
     /**
-     * Write a notification
+     * Write a notification.
      *
      * @param string    $message   Message of the notification
      * @param string    $type      Optional $type to ID the source of the notification
@@ -146,7 +147,7 @@ public function addNotification(
     }
 
     /**
-     * Mark notifications read for a user
+     * Mark notifications read for a user.
      */
     public function markAllRead()
     {
@@ -154,7 +155,7 @@ public function markAllRead()
     }
 
     /**
-     * Clears a notification for a user
+     * Clears a notification for a user.
      *
      * @param $id Notification to clear; will clear all if empty
      */
@@ -164,7 +165,7 @@ public function clearNotification($id)
     }
 
     /**
-     * Get content for notifications
+     * Get content for notifications.
      *
      * @param null $afterId
      *
@@ -235,14 +236,13 @@ public function getNotificationContent($afterId = null, $includeRead = false)
     }
 
     /**
-     * Fetch upstream notifications via RSS
+     * Fetch upstream notifications via RSS.
      */
     public function updateUpstreamNotifications()
     {
         $url = $this->coreParametersHelper->getParameter('rss_notification_url');
 
         if (empty($url)) {
-
             return;
         }
 
@@ -262,18 +262,17 @@ public function updateUpstreamNotifications()
                     $description = $item->getDescription();
                     if (mb_strlen(strip_tags($description)) > 300) {
                         $description = mb_substr(strip_tags($description), 0, 300);
-                        $description .= "... <a href=\"".$item->getLink()."\" target=\"_blank\">".$this->translator->trans(
+                        $description .= '... <a href="'.$item->getLink().'" target="_blank">'.$this->translator->trans(
                                 'mautic.core.notification.read_more'
-                            )."</a>";
+                            ).'</a>';
                     }
                     $header = $item->getTitle();
 
                     $this->addNotification($description, 'upstream', false, ($header) ? $header : null, 'fa-bullhorn');
                 }
-
             } catch (\Exception $exception) {
                 $this->logger->addWarning($exception->getMessage());
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Model/TranslationModelTrait.php b/app/bundles/CoreBundle/Model/TranslationModelTrait.php
index 00b91fee4cd..9e460dd51b9 100644
--- a/app/bundles/CoreBundle/Model/TranslationModelTrait.php
+++ b/app/bundles/CoreBundle/Model/TranslationModelTrait.php
@@ -1,27 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\CoreBundle\Model;
 
 use Mautic\CoreBundle\Entity\TranslationEntityInterface;
-use Mautic\CoreBundle\Entity\TranslationEntityTrait;
 use Mautic\LeadBundle\Entity\Lead;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Provides helper methods for determine the requested language from contact's profile and/or request
+ * Provides helper methods for determine the requested language from contact's profile and/or request.
  *
  * Class TranslationModelTrait
  */
 trait TranslationModelTrait
 {
     /**
-     * Get the entity based on requested translation
+     * Get the entity based on requested translation.
      *
      *
      * @param TranslationEntityInterface $entity
@@ -130,7 +131,7 @@ public function getTranslatedEntity(TranslationEntityInterface $entity, $lead =
     }
 
     /**
-     * Run post saving a translation aware entity
+     * Run post saving a translation aware entity.
      *
      * @param TranslationEntityInterface $entity
      */
@@ -155,4 +156,4 @@ protected function getTranslationLocaleCore($locale)
 
         return $locale;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Model/VariantModelTrait.php b/app/bundles/CoreBundle/Model/VariantModelTrait.php
index 96833cdf30d..fc7685aa56c 100644
--- a/app/bundles/CoreBundle/Model/VariantModelTrait.php
+++ b/app/bundles/CoreBundle/Model/VariantModelTrait.php
@@ -1,21 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Model;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Mautic\CoreBundle\Entity\TranslationEntityInterface;
 use Mautic\CoreBundle\Entity\VariantEntityInterface;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class VariantModelTrait
+ * Class VariantModelTrait.
  */
 trait VariantModelTrait
 {
@@ -25,7 +24,7 @@ trait VariantModelTrait
     protected $inConversion = false;
 
     /**
-     * Converts a variant to the main item and the original main item a variant
+     * Converts a variant to the main item and the original main item a variant.
      *
      * @param VariantEntityInterface $entity
      */
@@ -86,7 +85,7 @@ public function convertVariant(VariantEntityInterface $entity)
     }
 
     /**
-     * Prepare a variant for saving
+     * Prepare a variant for saving.
      *
      * @param VariantEntityInterface $entity
      * @param array                  $resetVariantCounterMethods ['setVariantHits', 'setVariantSends', ...]
@@ -110,7 +109,6 @@ protected function preVariantSaveEntity(VariantEntityInterface $entity, array $r
 
             // If unpublished and wasn't changed from published - don't reset
             if (!$entity->isPublished(false) && (!isset($changes['isPublished']))) {
-
                 return false;
             }
 
@@ -135,13 +133,12 @@ protected function preVariantSaveEntity(VariantEntityInterface $entity, array $r
     }
 
     /**
-     * Run post saving a variant aware entity
+     * Run post saving a variant aware entity.
      *
      * @param VariantEntityInterface $entity
      * @param bool                   $resetVariants
      * @param array                  $relatedIds
      * @param \DateTime|null         $variantStartDate
-     *
      */
     protected function postVariantSaveEntity(VariantEntityInterface $entity, $resetVariants = false, $relatedIds = [], \DateTime $variantStartDate = null)
     {
@@ -183,4 +180,4 @@ protected function resetVariants($entity, $relatedIds = null, \DateTime $variant
             $repo->resetVariants($relatedIds, $variantStartDate->format('Y-m-d H:i:s'));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Monolog/Handler/PhpHandler.php b/app/bundles/CoreBundle/Monolog/Handler/PhpHandler.php
index 6fc2afa76d9..6d79424692c 100644
--- a/app/bundles/CoreBundle/Monolog/Handler/PhpHandler.php
+++ b/app/bundles/CoreBundle/Monolog/Handler/PhpHandler.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Monolog\Handler\StreamHandler;
 
 /**
- * Class PhpHandler
+ * Class PhpHandler.
  */
 class PhpHandler extends StreamHandler
 {
-
     /**
      * @var string
      */
@@ -35,12 +35,12 @@ protected function write(array $record)
                 throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().');
             }
             $this->errorMessage = null;
-            set_error_handler(array($this, 'customErrorHandler'));
+            set_error_handler([$this, 'customErrorHandler']);
             if (!file_exists($this->url)) {
                 $this->stream = fopen($this->url, 'a');
 
                 //write php line to it
-                fwrite($this->stream, (string) '<?php die("access denied!"); ?>' . "\n\n");
+                fwrite($this->stream, (string) '<?php die("access denied!"); ?>'."\n\n");
             } else {
                 $this->stream = fopen($this->url, 'a');
             }
@@ -56,7 +56,6 @@ protected function write(array $record)
         }
 
         parent::write($record);
-
     }
 
     /**
diff --git a/app/bundles/CoreBundle/Security/Permissions/AbstractPermissions.php b/app/bundles/CoreBundle/Security/Permissions/AbstractPermissions.php
index 41bd0e20b49..a80c44f79e2 100644
--- a/app/bundles/CoreBundle/Security/Permissions/AbstractPermissions.php
+++ b/app/bundles/CoreBundle/Security/Permissions/AbstractPermissions.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,20 +13,19 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class AbstractPermissions
+ * Class AbstractPermissions.
  */
 abstract class AbstractPermissions
 {
-
     /**
      * @var array
      */
-    protected $permissions = array();
+    protected $permissions = [];
 
     /**
      * @var array
      */
-    protected $params = array();
+    protected $params = [];
 
     /**
      * @param array $params
@@ -36,7 +36,7 @@ public function __construct(array $params)
     }
 
     /**
-     * Returns bundle's permissions array
+     * Returns bundle's permissions array.
      *
      * @return array
      */
@@ -46,7 +46,7 @@ public function getPermissions()
     }
 
     /**
-     * Checks to see if the requested permission is supported by the bundle
+     * Checks to see if the requested permission is supported by the bundle.
      *
      * @param string $name
      * @param string $level
@@ -67,7 +67,7 @@ public function isSupported($name, $level = '')
     }
 
     /**
-     * Allows permission classes to be disabled if criteria is not met (such as bundle is disabled)
+     * Allows permission classes to be disabled if criteria is not met (such as bundle is disabled).
      *
      * @return bool
      */
@@ -77,7 +77,7 @@ public function isEnabled()
     }
 
     /**
-     * Returns the value assigned to a specific permission
+     * Returns the value assigned to a specific permission.
      *
      * @param string $name
      * @param string $perm
@@ -90,7 +90,7 @@ public function getValue($name, $perm)
     }
 
     /**
-     * Builds the bundle's specific form elements for its permissions
+     * Builds the bundle's specific form elements for its permissions.
      *
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -101,7 +101,7 @@ public function buildForm(FormBuilderInterface &$builder, array $options, array
     }
 
     /**
-     * Returns the name of the permission set (should be the bundle identifier)
+     * Returns the name of the permission set (should be the bundle identifier).
      *
      * @return string|void
      */
@@ -117,11 +117,11 @@ abstract public function getName();
      */
     public function convertBitsToPermissionNames(array $permissions)
     {
-        static $permissionLevels = array();
-        $bundle = $this->getName();
+        static $permissionLevels = [];
+        $bundle                  = $this->getName();
 
         if (!in_array($bundle, $permissionLevels)) {
-            $permissionLevels[$bundle] = array();
+            $permissionLevels[$bundle] = [];
             if (isset($permissions[$bundle])) {
                 if ($this->isEnabled()) {
                     foreach ($permissions[$bundle] as $permId => $details) {
@@ -131,7 +131,7 @@ public function convertBitsToPermissionNames(array $permissions)
                         if ($this->isSupported($permName)) {
                             $levels = $this->permissions[$permName];
                             //ensure that at least keys exist
-                            $permissionLevels[$bundle][$permName] = array();
+                            $permissionLevels[$bundle][$permName] = [];
                             //$permissionLevels[$bundle][$permName]["$bundle:$permName"] = $permId;
                             foreach ($levels as $levelName => $levelBit) {
                                 //compare bit against levels to see if it is a match
@@ -151,7 +151,7 @@ public function convertBitsToPermissionNames(array $permissions)
     }
 
     /**
-     * Allows the bundle permission class to utilize synonyms for permissions
+     * Allows the bundle permission class to utilize synonyms for permissions.
      *
      * @param string $name
      * @param string $level
@@ -160,7 +160,7 @@ public function convertBitsToPermissionNames(array $permissions)
      */
     protected function getSynonym($name, $level)
     {
-        if (in_array($level, array('viewown', 'viewother'))) {
+        if (in_array($level, ['viewown', 'viewother'])) {
             if (isset($this->permissions[$name]['view'])) {
                 $level = 'view';
             }
@@ -168,7 +168,7 @@ protected function getSynonym($name, $level)
             if (isset($this->permissions[$name]['viewown'])) {
                 $level = 'viewown';
             }
-        } elseif (in_array($level, array('editown', 'editother'))) {
+        } elseif (in_array($level, ['editown', 'editother'])) {
             if (isset($this->permissions[$name]['edit'])) {
                 $level = 'edit';
             }
@@ -176,15 +176,15 @@ protected function getSynonym($name, $level)
             if (isset($this->permissions[$name]['editown'])) {
                 $level = 'editown';
             }
-        } elseif (in_array($level, array('deleteown', 'deleteother'))) {
+        } elseif (in_array($level, ['deleteown', 'deleteother'])) {
             if (isset($this->permissions[$name]['delete'])) {
                 $level = 'delete';
             }
-        }  elseif ($level == 'delete') {
+        } elseif ($level == 'delete') {
             if (isset($this->permissions[$name]['deleteown'])) {
                 $level = 'deleteown';
             }
-        } elseif (in_array($level, array('publishown', 'publishother'))) {
+        } elseif (in_array($level, ['publishown', 'publishother'])) {
             if (isset($this->permissions[$name]['publish'])) {
                 $level = 'publish';
             }
@@ -194,17 +194,17 @@ protected function getSynonym($name, $level)
             }
         }
 
-        return array($name, $level);
+        return [$name, $level];
     }
 
     /**
-     * Determines if the user has access to the specified permission
+     * Determines if the user has access to the specified permission.
      *
      * @param array  $userPermissions
      * @param string $name
      * @param string $level
      *
-     * @return boolean
+     * @return bool
      */
     public function isGranted($userPermissions, $name, $level)
     {
@@ -235,26 +235,26 @@ public function analyzePermissions(array &$permissions, $allPermissions, $isSeco
         $hasViewAccess = false;
         foreach ($permissions as $level => &$perms) {
             foreach ($perms as $perm) {
-                $required = array();
+                $required = [];
                 switch ($perm) {
                     case 'editother':
                     case 'edit':
-                        $required = array('viewother', 'viewown');
+                        $required = ['viewother', 'viewown'];
                         break;
                     case 'deleteother':
                     case 'delete':
-                        $required = array('editother', 'viewother', 'viewown');
+                        $required = ['editother', 'viewother', 'viewown'];
                         break;
                     case 'publishother':
                     case 'publish':
-                        $required = array('viewother', 'viewown');
+                        $required = ['viewother', 'viewown'];
                         break;
                     case 'viewother':
                     case 'editown':
                     case 'deleteown':
                     case 'publishown':
                     case 'create':
-                        $required = array('viewown');
+                        $required = ['viewown'];
                         break;
                 }
                 if (!empty($required)) {
@@ -278,7 +278,7 @@ public function analyzePermissions(array &$permissions, $allPermissions, $isSeco
     }
 
     /**
-     * Generates an array of granted and total permissions
+     * Generates an array of granted and total permissions.
      *
      * @param array $data
      *
@@ -296,11 +296,11 @@ public function getPermissionRatio(array $data)
                 if (count($perms) === 1) {
                     //full is the only permission so count as 1
                     if (!empty($data[$level]) && in_array('full', $data[$level])) {
-                        $totalGranted++;
+                        ++$totalGranted;
                     }
                 } else {
                     //remove full from total count
-                    $totalAvailable--;
+                    --$totalAvailable;
                     if (!empty($data[$level]) && in_array('full', $data[$level])) {
                         //user has full access so sum perms minus full
                         $totalGranted += count($perms) - 1;
@@ -315,42 +315,38 @@ public function getPermissionRatio(array $data)
             }
         }
 
-        return array($totalGranted, $totalAvailable);
+        return [$totalGranted, $totalAvailable];
     }
 
     /**
-     * Gives the bundle an opportunity to change how JavaScript calculates permissions granted
+     * Gives the bundle an opportunity to change how JavaScript calculates permissions granted.
      *
      * @param array $perms
-     *
-     * @return void
      */
     public function parseForJavascript(array &$perms)
     {
     }
 
     /**
-     * Adds the standard permission set of view, edit, create, delete, publish and full
+     * Adds the standard permission set of view, edit, create, delete, publish and full.
      *
      * @param array $permissionNames
      * @param bool  $includePublish
-     *
-     * @return void
      */
     protected function addStandardPermissions($permissionNames, $includePublish = true)
     {
         if (!is_array($permissionNames)) {
-            $permissionNames = array($permissionNames);
+            $permissionNames = [$permissionNames];
         }
 
         foreach ($permissionNames as $p) {
-            $this->permissions[$p] = array(
-                'view'    => 4,
-                'edit'    => 16,
-                'create'  => 32,
-                'delete'  => 128,
-                'full'    => 1024
-            );
+            $this->permissions[$p] = [
+                'view'   => 4,
+                'edit'   => 16,
+                'create' => 32,
+                'delete' => 128,
+                'full'   => 1024,
+            ];
             if ($includePublish) {
                 $this->permissions[$p]['publish'] = 512;
             }
@@ -358,7 +354,7 @@ protected function addStandardPermissions($permissionNames, $includePublish = tr
     }
 
     /**
-     * Adds the standard permission set of view, edit, create, delete, publish and full to the form builder
+     * Adds the standard permission set of view, edit, create, delete, publish and full to the form builder.
      *
      * @param string               $bundle
      * @param string               $level
@@ -368,12 +364,12 @@ protected function addStandardPermissions($permissionNames, $includePublish = tr
      */
     protected function addStandardFormFields($bundle, $level, &$builder, $data, $includePublish = true)
     {
-        $choices = array(
+        $choices = [
             'view'   => 'mautic.core.permissions.view',
             'edit'   => 'mautic.core.permissions.edit',
             'create' => 'mautic.core.permissions.create',
-            'delete' => 'mautic.core.permissions.delete'
-        );
+            'delete' => 'mautic.core.permissions.delete',
+        ];
 
         if ($includePublish) {
             $choices['publish'] = 'mautic.core.permissions.publish';
@@ -381,38 +377,36 @@ protected function addStandardFormFields($bundle, $level, &$builder, $data, $inc
 
         $choices['full'] = 'mautic.core.permissions.full';
 
-        $label = ($level == "categories") ? "mautic.category.permissions.categories" : "mautic.$bundle.permissions.$level";
-        $builder->add("$bundle:$level", 'permissionlist', array(
-            'choices'  => $choices,
-            'label'    => $label,
-            'bundle'   => $bundle,
-            'level'    => $level,
-            'data'     => (!empty($data[$level]) ? $data[$level] : array())
-        ));
+        $label = ($level == 'categories') ? 'mautic.category.permissions.categories' : "mautic.$bundle.permissions.$level";
+        $builder->add("$bundle:$level", 'permissionlist', [
+            'choices' => $choices,
+            'label'   => $label,
+            'bundle'  => $bundle,
+            'level'   => $level,
+            'data'    => (!empty($data[$level]) ? $data[$level] : []),
+        ]);
     }
 
     /**
-     * Add a single full permission
+     * Add a single full permission.
      *
      * @param array $permissionNames
-     *
-     * @return void
      */
     protected function addManagePermission($permissionNames)
     {
         if (!is_array($permissionNames)) {
-            $permissionNames = array($permissionNames);
+            $permissionNames = [$permissionNames];
         }
 
         foreach ($permissionNames as $p) {
-            $this->permissions[$p] = array(
-                'manage'    => 1024
-            );
+            $this->permissions[$p] = [
+                'manage' => 1024,
+            ];
         }
     }
 
     /**
-     * Adds a single full permission to the form builder, i.e. config only bundles
+     * Adds a single full permission to the form builder, i.e. config only bundles.
      *
      * @param string               $bundle
      * @param string               $level
@@ -421,22 +415,22 @@ protected function addManagePermission($permissionNames)
      */
     protected function addManageFormFields($bundle, $level, &$builder, $data)
     {
-        $choices = array(
-            'manage'   => 'mautic.core.permissions.manage'
-        );
-
-        $builder->add("$bundle:$level", 'permissionlist', array(
-            'choices'  => $choices,
-            'label'    => "mautic.$bundle.permissions.$level",
-            'data'     => (!empty($data[$level]) ? $data[$level] : array()),
-            'bundle'   => $bundle,
-            'level'    => $level
-        ));
+        $choices = [
+            'manage' => 'mautic.core.permissions.manage',
+        ];
+
+        $builder->add("$bundle:$level", 'permissionlist', [
+            'choices' => $choices,
+            'label'   => "mautic.$bundle.permissions.$level",
+            'data'    => (!empty($data[$level]) ? $data[$level] : []),
+            'bundle'  => $bundle,
+            'level'   => $level,
+        ]);
     }
 
     /**
      * Adds the standard permission set of viewown, viewother, editown, editother, create, deleteown, deleteother,
-     * publishown, publishother and full
+     * publishown, publishother and full.
      *
      * @param array $permissionNames
      * @param bool  $includePublish
@@ -444,20 +438,20 @@ protected function addManageFormFields($bundle, $level, &$builder, $data)
     protected function addExtendedPermissions($permissionNames, $includePublish = true)
     {
         if (!is_array($permissionNames)) {
-            $permissionNames = array($permissionNames);
+            $permissionNames = [$permissionNames];
         }
 
         foreach ($permissionNames as $p) {
-            $this->permissions[$p] = array(
-                'viewown'      => 2,
-                'viewother'    => 4,
-                'editown'      => 8,
-                'editother'    => 16,
-                'create'       => 32,
-                'deleteown'    => 64,
-                'deleteother'  => 128,
-                'full'         => 1024
-            );
+            $this->permissions[$p] = [
+                'viewown'     => 2,
+                'viewother'   => 4,
+                'editown'     => 8,
+                'editother'   => 16,
+                'create'      => 32,
+                'deleteown'   => 64,
+                'deleteother' => 128,
+                'full'        => 1024,
+            ];
             if ($includePublish) {
                 $this->permissions[$p]['publishown']   = 256;
                 $this->permissions[$p]['publishother'] = 512;
@@ -467,7 +461,7 @@ protected function addExtendedPermissions($permissionNames, $includePublish = tr
 
     /**
      * Adds the standard permission set of viewown, viewother, editown, editother, create, deleteown, deleteother,
-     * publishown, publishother and full to the form builder
+     * publishown, publishother and full to the form builder.
      *
      * @param string               $bundle
      * @param string               $level
@@ -477,8 +471,8 @@ protected function addExtendedPermissions($permissionNames, $includePublish = tr
      */
     protected function addExtendedFormFields($bundle, $level, &$builder, $data, $includePublish = true)
     {
-        $choices =  $includePublish ?
-            array(
+        $choices = $includePublish ?
+            [
                 'viewown'      => 'mautic.core.permissions.viewown',
                 'viewother'    => 'mautic.core.permissions.viewother',
                 'editown'      => 'mautic.core.permissions.editown',
@@ -488,26 +482,26 @@ protected function addExtendedFormFields($bundle, $level, &$builder, $data, $inc
                 'deleteother'  => 'mautic.core.permissions.deleteother',
                 'publishown'   => 'mautic.core.permissions.publishown',
                 'publishother' => 'mautic.core.permissions.publishother',
-                'full'         => 'mautic.core.permissions.full'
-            ) :
-            array(
-                'viewown'      => 'mautic.core.permissions.viewown',
-                'viewother'    => 'mautic.core.permissions.viewother',
-                'editown'      => 'mautic.core.permissions.editown',
-                'editother'    => 'mautic.core.permissions.editother',
-                'create'       => 'mautic.core.permissions.create',
-                'deleteown'    => 'mautic.core.permissions.deleteown',
-                'deleteother'  => 'mautic.core.permissions.deleteother',
-                'full'         => 'mautic.core.permissions.full'
-            );
-
-        $builder->add("$bundle:$level", 'permissionlist', array(
-                'choices'  => $choices,
-                'label'    => "mautic.$bundle.permissions.$level",
-                'data'     => (!empty($data[$level]) ? $data[$level] : array()),
-                'bundle'   => $bundle,
-                'level'    => $level
-            )
+                'full'         => 'mautic.core.permissions.full',
+            ] :
+            [
+                'viewown'     => 'mautic.core.permissions.viewown',
+                'viewother'   => 'mautic.core.permissions.viewother',
+                'editown'     => 'mautic.core.permissions.editown',
+                'editother'   => 'mautic.core.permissions.editother',
+                'create'      => 'mautic.core.permissions.create',
+                'deleteown'   => 'mautic.core.permissions.deleteown',
+                'deleteother' => 'mautic.core.permissions.deleteother',
+                'full'        => 'mautic.core.permissions.full',
+            ];
+
+        $builder->add("$bundle:$level", 'permissionlist', [
+                'choices' => $choices,
+                'label'   => "mautic.$bundle.permissions.$level",
+                'data'    => (!empty($data[$level]) ? $data[$level] : []),
+                'bundle'  => $bundle,
+                'level'   => $level,
+            ]
         );
     }
 }
diff --git a/app/bundles/CoreBundle/Security/Permissions/CorePermissions.php b/app/bundles/CoreBundle/Security/Permissions/CorePermissions.php
index 42b47e4f2a6..a46b8ca2aba 100644
--- a/app/bundles/CoreBundle/Security/Permissions/CorePermissions.php
+++ b/app/bundles/CoreBundle/Security/Permissions/CorePermissions.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Security\Permissions;
 
 use Mautic\CoreBundle\Helper\UserHelper;
-use Mautic\UserBundle\Entity\User;
 use Mautic\UserBundle\Entity\Permission;
+use Mautic\UserBundle\Entity\User;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class Security
+ * Class Security.
  */
 class CorePermissions
 {
@@ -68,10 +69,10 @@ class CorePermissions
     /**
      * CorePermissions constructor.
      *
-     * @param Translator            $translator
-     * @param array                 $parameters
-     * @param                       $bundles
-     * @param                       $pluginBundles
+     * @param Translator $translator
+     * @param array      $parameters
+     * @param            $bundles
+     * @param            $pluginBundles
      */
     public function __construct(UserHelper $userHelper, TranslatorInterface $translator, array $parameters, $bundles, $pluginBundles)
     {
@@ -85,7 +86,7 @@ public function __construct(UserHelper $userHelper, TranslatorInterface $transla
     }
 
     /**
-     * Retrieves each bundles permission objects
+     * Retrieves each bundles permission objects.
      *
      * @return array
      */
@@ -104,13 +105,14 @@ public function getPermissionObjects()
     }
 
     /**
-     * Returns the bundles permission class object
+     * Returns the bundles permission class object.
      *
      * @param string $bundle
      * @param bool   $throwException
      * @param bool   $pluginBundle
      *
      * @return mixed
+     *
      * @throws \InvalidArgumentException
      */
     public function getPermissionObject($bundle, $throwException = true, $pluginBundle = false)
@@ -137,11 +139,12 @@ public function getPermissionObject($bundle, $throwException = true, $pluginBund
     }
 
     /**
-     * Generates the bit value for the bundle's permission
+     * Generates the bit value for the bundle's permission.
      *
      * @param array $permissions
      *
      * @return array
+     *
      * @throws \InvalidArgumentException
      */
     public function generatePermissions(array $permissions)
@@ -154,7 +157,7 @@ public function generatePermissions(array $permissions)
         //bust out permissions into their respective bundles
         $bundlePermissions = [];
         foreach ($permissions as $permission => $perms) {
-            list ($bundle, $level) = explode(':', $permission);
+            list($bundle, $level)               = explode(':', $permission);
             $bundlePermissions[$bundle][$level] = $perms;
         }
 
@@ -193,7 +196,7 @@ public function generatePermissions(array $permissions)
                 $entity->setName(strtolower($name));
 
                 $bit   = 0;
-                $class = $this->getPermissionObject($bundle, true, array_key_exists(ucfirst($bundle)."Bundle", $pluginBundles));
+                $class = $this->getPermissionObject($bundle, true, array_key_exists(ucfirst($bundle).'Bundle', $pluginBundles));
 
                 foreach ($perms as $perm) {
                     //get the bit for the perm
@@ -212,18 +215,19 @@ public function generatePermissions(array $permissions)
     }
 
     /**
-     * Determines if the user has permission to access the given area
+     * Determines if the user has permission to access the given area.
      *
      * @param array|string $requestedPermission
-     * @param string       $mode           MATCH_ALL|MATCH_ONE|RETURN_ARRAY
+     * @param string       $mode                MATCH_ALL|MATCH_ONE|RETURN_ARRAY
      * @param User         $userEntity
-     * @param bool         $allowUnknown   If the permission is not recognized, false will be returned.  Otherwise an
-     *                                     exception will be thrown
+     * @param bool         $allowUnknown        If the permission is not recognized, false will be returned.  Otherwise an
+     *                                          exception will be thrown
      *
      * @return mixed
+     *
      * @throws \InvalidArgumentException
      */
-    public function isGranted($requestedPermission, $mode = "MATCH_ALL", $userEntity = null, $allowUnknown = false)
+    public function isGranted($requestedPermission, $mode = 'MATCH_ALL', $userEntity = null, $allowUnknown = false)
     {
         if ($userEntity === null) {
             $userEntity = $this->userHelper->getUser();
@@ -253,7 +257,7 @@ public function isGranted($requestedPermission, $mode = "MATCH_ALL", $userEntity
                 throw new \InvalidArgumentException(
                     $this->getTranslator()->trans(
                         'mautic.core.permissions.badformat',
-                        ["%permission%" => $permission]
+                        ['%permission%' => $permission]
                     )
                 );
             }
@@ -271,11 +275,11 @@ public function isGranted($requestedPermission, $mode = "MATCH_ALL", $userEntity
                     throw new \InvalidArgumentException(
                         $this->getTranslator()->trans(
                             'mautic.core.permissions.notfound',
-                            ["%permission%" => $permission]
+                            ['%permission%' => $permission]
                         )
                     );
                 }
-            } elseif ($userEntity == "anon.") {
+            } elseif ($userEntity == 'anon.') {
                 //anon user or session timeout
                 $permissions[$permission] = false;
             } elseif ($userEntity->isAdmin()) {
@@ -291,26 +295,26 @@ public function isGranted($requestedPermission, $mode = "MATCH_ALL", $userEntity
             $this->grantedPermissions[$permission] = $permissions[$permission];
         }
 
-        if ($mode == "MATCH_ALL") {
+        if ($mode == 'MATCH_ALL') {
             //deny if any of the permissions are denied
             return in_array(0, $permissions) ? false : true;
-        } elseif ($mode == "MATCH_ONE") {
+        } elseif ($mode == 'MATCH_ONE') {
             //grant if any of the permissions were granted
             return in_array(1, $permissions) ? true : false;
-        } elseif ($mode == "RETURN_ARRAY") {
+        } elseif ($mode == 'RETURN_ARRAY') {
             return $permissions;
         } else {
             throw new \InvalidArgumentException(
                 $this->getTranslator()->trans(
                     'mautic.core.permissions.mode.notfound',
-                    ["%mode%" => $mode]
+                    ['%mode%' => $mode]
                 )
             );
         }
     }
 
     /**
-     * Check if a permission or array of permissions exist
+     * Check if a permission or array of permissions exist.
      *
      * @param array|string $permission
      *
@@ -349,7 +353,7 @@ public function checkPermissionExists($permission)
     }
 
     /**
-     * Checks if the user has access to the requested entity
+     * Checks if the user has access to the requested entity.
      *
      * @param string|bool $ownPermission
      * @param string|bool $otherPermission
@@ -409,9 +413,9 @@ public function hasEntityAccess($ownPermission, $otherPermission, $ownerId = 0)
     }
 
     /**
-     * Retrieves all permissions
+     * Retrieves all permissions.
      *
-     * @param boolean $forJs
+     * @param bool $forJs
      *
      * @return array
      */
@@ -478,7 +482,7 @@ protected function getParams()
     }
 
     /**
-     * Register permission classes
+     * Register permission classes.
      */
     private function registerPermissionClasses()
     {
diff --git a/app/bundles/CoreBundle/Security/Permissions/SystemPermissions.php b/app/bundles/CoreBundle/Security/Permissions/SystemPermissions.php
index b96e97a0abe..88d4acd07a4 100644
--- a/app/bundles/CoreBundle/Security/Permissions/SystemPermissions.php
+++ b/app/bundles/CoreBundle/Security/Permissions/SystemPermissions.php
@@ -1,25 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Security\Permissions;
 
 use Symfony\Component\Form\FormBuilderInterface;
-use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
 
 /**
- * Class AssetPermissions
- *
- * @package Mautic\CoreBundle\Security\Permissions
+ * Class AssetPermissions.
  */
 class SystemPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/CoreBundle/Templating/Helper/AnalyticsHelper.php b/app/bundles/CoreBundle/Templating/Helper/AnalyticsHelper.php
index 76cd4d1d318..41b9e55400f 100644
--- a/app/bundles/CoreBundle/Templating/Helper/AnalyticsHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/AnalyticsHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,6 @@
 
 class AnalyticsHelper extends Helper
 {
-
     /**
      * @var string
      */
@@ -23,7 +23,6 @@ class AnalyticsHelper extends Helper
     public function __construct(MauticFactory $factory)
     {
         $this->code = htmlspecialchars_decode($factory->getParameter('google_analytics', ''));
-
     }
 
     /**
@@ -41,4 +40,4 @@ public function getName()
     {
         return 'analytics';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Templating/Helper/AssetsHelper.php b/app/bundles/CoreBundle/Templating/Helper/AssetsHelper.php
index 6fae37e56c3..c6b8507d947 100644
--- a/app/bundles/CoreBundle/Templating/Helper/AssetsHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/AssetsHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Symfony\Component\Asset\Packages;
 
 /**
- * Class AssetsHelper
+ * Class AssetsHelper.
  */
 class AssetsHelper
 {
-
     /**
      * @var MauticFactory
      */
@@ -51,7 +51,6 @@ public function __construct(Packages $packages)
 
     public function setCharset()
     {
-
     }
 
     /**
@@ -63,7 +62,7 @@ public function setParamsHelper(CoreParametersHelper $coreParametersHelper)
     }
 
     /**
-     * Gets asset prefix
+     * Gets asset prefix.
      *
      * @param bool $includeEndingSlash
      *
@@ -84,7 +83,7 @@ public function getAssetPrefix($includeEndingSlash = false)
     }
 
     /**
-     * Set asset url path
+     * Set asset url path.
      *
      * @param string     $path
      * @param null       $packageName
@@ -99,7 +98,7 @@ public function getUrl($path, $packageName = null, $version = null)
         // Dirty hack to work around strict notices with parent::getUrl
         $absolute = $ignorePrefix = false;
         if (func_num_args() > 3) {
-            $args = func_get_args();
+            $args     = func_get_args();
             $absolute = $args[3];
             if (isset($args[4])) {
                 $ignorePrefix = $args[4];
@@ -120,14 +119,14 @@ public function getUrl($path, $packageName = null, $version = null)
         $url = $this->packages->getUrl($path, $packageName, $version);
 
         if ($absolute) {
-            $url = $this->getBaseUrl() . $url;
+            $url = $this->getBaseUrl().$url;
         }
 
         return $url;
     }
 
     /**
-     * Get base URL
+     * Get base URL.
      *
      * @return string
      */
@@ -137,32 +136,29 @@ public function getBaseUrl()
     }
 
     /**
-     * Adds a JS script to the template
+     * Adds a JS script to the template.
      *
      * @param string $script
      * @param string $location
-     * @param boolean $async
-     * @param string  $name
-     *
-     * @return void
+     * @param bool   $async
+     * @param string $name
      */
     public function addScript($script, $location = 'head', $async = false, $name = null)
     {
-        $assets     =& $this->assets;
+        $assets     = &$this->assets;
         $addScripts = function ($s) use ($location, &$assets, $async, $name) {
-
             $name = $name ?: 'script_'.hash('sha1', uniqid(mt_rand()));
 
             if ($location == 'head') {
                 //special place for these so that declarations and scripts can be mingled
-                $assets['headDeclarations'][$name] = array('script' => array($s, $async));
+                $assets['headDeclarations'][$name] = ['script' => [$s, $async]];
             } else {
                 if (!isset($assets['scripts'][$location])) {
-                    $assets['scripts'][$location] = array();
+                    $assets['scripts'][$location] = [];
                 }
 
                 if (!in_array($s, $assets['scripts'][$location])) {
-                    $assets['scripts'][$location][$name] = array($s, $async);
+                    $assets['scripts'][$location][$name] = [$s, $async];
                 }
             }
         };
@@ -177,21 +173,19 @@ public function addScript($script, $location = 'head', $async = false, $name = n
     }
 
     /**
-     * Adds JS script declarations to the template
+     * Adds JS script declarations to the template.
      *
      * @param string $script
      * @param string $location
-     *
-     * @return void
      */
     public function addScriptDeclaration($script, $location = 'head')
     {
         if ($location == 'head') {
             //special place for these so that declarations and scripts can be mingled
-            $this->assets['headDeclarations'][] = array('declaration' => $script);
+            $this->assets['headDeclarations'][] = ['declaration' => $script];
         } else {
             if (!isset($this->assets['scriptDeclarations'][$location])) {
-                $this->assets['scriptDeclarations'][$location] = array();
+                $this->assets['scriptDeclarations'][$location] = [];
             }
 
             if (!in_array($script, $this->assets['scriptDeclarations'][$location])) {
@@ -201,18 +195,16 @@ public function addScriptDeclaration($script, $location = 'head')
     }
 
     /**
-     * Adds a stylesheet to be loaded in the template header
+     * Adds a stylesheet to be loaded in the template header.
      *
      * @param string $stylesheet
-     *
-     * @return void
      */
     public function addStylesheet($stylesheet)
     {
-        $assets   =& $this->assets;
+        $assets   = &$this->assets;
         $addSheet = function ($s) use (&$assets) {
             if (!isset($assets['stylesheets'])) {
-                $assets['stylesheets'] = array();
+                $assets['stylesheets'] = [];
             }
 
             if (!in_array($s, $assets['stylesheets'])) {
@@ -248,20 +240,18 @@ public function includeScript($assetFilePath, $onLoadCallback = '', $alreadyLoad
      */
     public function includeStylesheet($assetFilePath)
     {
-        return  '<script async="async" type="text/javascript" data-source="mautic">Mautic.loadStylesheet(\'' . $this->getUrl($assetFilePath) . '\');</script>';
+        return  '<script async="async" type="text/javascript" data-source="mautic">Mautic.loadStylesheet(\''.$this->getUrl($assetFilePath).'\');</script>';
     }
 
     /**
-     * Add style tag to the header
+     * Add style tag to the header.
      *
      * @param string $styles
-     *
-     * @return void
      */
     public function addStyleDeclaration($styles)
     {
         if (!isset($this->assets['styleDeclarations'])) {
-            $this->assets['styleDeclarations'] = array();
+            $this->assets['styleDeclarations'] = [];
         }
 
         if (!in_array($styles, $this->assets['styleDeclarations'])) {
@@ -270,20 +260,18 @@ public function addStyleDeclaration($styles)
     }
 
     /**
-     * Adds a custom declaration to <head />
+     * Adds a custom declaration to <head />.
      *
      * @param string $declaration
      * @param string $location
-     *
-     * @return void
      */
     public function addCustomDeclaration($declaration, $location = 'head')
     {
         if ($location == 'head') {
-            $this->assets['headDeclarations'][] = array('custom' => $declaration);
+            $this->assets['headDeclarations'][] = ['custom' => $declaration];
         } else {
             if (!isset($this->assets['customDeclarations'][$location])) {
-                $this->assets['customDeclarations'][$location] = array();
+                $this->assets['customDeclarations'][$location] = [];
             }
 
             if (!in_array($declaration, $this->assets['customDeclarations'][$location])) {
@@ -293,9 +281,7 @@ public function addCustomDeclaration($declaration, $location = 'head')
     }
 
     /**
-     * Outputs the stylesheets and style declarations
-     *
-     * @return void
+     * Outputs the stylesheets and style declarations.
      */
     public function outputStyles()
     {
@@ -303,9 +289,7 @@ public function outputStyles()
     }
 
     /**
-     * Outputs the stylesheets and style declarations
-     *
-     * @return void
+     * Outputs the stylesheets and style declarations.
      */
     public function getStyles()
     {
@@ -313,34 +297,32 @@ public function getStyles()
 
         if (isset($this->assets['stylesheets'])) {
             foreach (array_reverse($this->assets['stylesheets']) as $s) {
-                $styles .= '<link rel="stylesheet" href="' . $this->getUrl($s) . '" data-source="mautic" />' . "\n";
+                $styles .= '<link rel="stylesheet" href="'.$this->getUrl($s).'" data-source="mautic" />'."\n";
             }
         }
 
         if (isset($this->assets['styleDeclarations'])) {
-            $styles .=  "<style data-source=\"mautic\">\n";
+            $styles .= "<style data-source=\"mautic\">\n";
             foreach (array_reverse($this->assets['styleDeclarations']) as $d) {
-                $styles .=  "$d\n";
+                $styles .= "$d\n";
             }
-            $styles .=  "</style>\n";
+            $styles .= "</style>\n";
         }
 
         return $styles;
     }
 
     /**
-     * Outputs the script files and declarations
+     * Outputs the script files and declarations.
      *
      * @param string $location
-     *
-     * @return void
      */
     public function outputScripts($location)
     {
         if (isset($this->assets['scripts'][$location])) {
             foreach (array_reverse($this->assets['scripts'][$location]) as $s) {
                 list($script, $async) = $s;
-                echo '<script src="'.$this->getUrl($script).'"' . ($async ? ' async' : '') . ' data-source="mautic"></script>'."\n";
+                echo '<script src="'.$this->getUrl($script).'"'.($async ? ' async' : '').' data-source="mautic"></script>'."\n";
             }
         }
 
@@ -360,9 +342,7 @@ public function outputScripts($location)
     }
 
     /**
-     * Output head scripts, stylesheets, and custom declarations
-     *
-     * @return void
+     * Output head scripts, stylesheets, and custom declarations.
      */
     public function outputHeadDeclarations()
     {
@@ -370,9 +350,7 @@ public function outputHeadDeclarations()
     }
 
     /**
-     * Returns head scripts, stylesheets, and custom declarations
-     *
-     * @return void
+     * Returns head scripts, stylesheets, and custom declarations.
      */
     public function getHeadDeclarations()
     {
@@ -391,7 +369,7 @@ public function getHeadDeclarations()
                         }
                         list($script, $async) = $output;
 
-                        $headOutput .= "\n".'<script src="' . $this->getUrl($script) . '"' . ($async ? ' async' : '') . ' data-source="mautic"></script>';
+                        $headOutput .= "\n".'<script src="'.$this->getUrl($script).'"'.($async ? ' async' : '').' data-source="mautic"></script>';
                         break;
                     case 'custom':
                     case 'declaration':
@@ -411,13 +389,12 @@ public function getHeadDeclarations()
                 $headOutput .= "\n</script>\n\n";
             }
         }
+
         return $headOutput;
     }
 
     /**
-     * Output system stylesheets
-     *
-     * @return void
+     * Output system stylesheets.
      */
     public function outputSystemStylesheets()
     {
@@ -425,13 +402,13 @@ public function outputSystemStylesheets()
 
         if (isset($assets['css'])) {
             foreach ($assets['css'] as $url) {
-                echo '<link rel="stylesheet" href="' . $this->getUrl($url) . '" data-source="mautic" />' . "\n";
+                echo '<link rel="stylesheet" href="'.$this->getUrl($url).'" data-source="mautic" />'."\n";
             }
         }
     }
 
     /**
-     * Output system scripts
+     * Output system scripts.
      *
      * @param bool|false $includeEditor
      */
@@ -445,15 +422,15 @@ public function outputSystemScripts($includeEditor = false)
 
         if (isset($assets['js'])) {
             foreach ($assets['js'] as $url) {
-                echo '<script src="' . $this->getUrl($url) . '" data-source="mautic"></script>' . "\n";
+                echo '<script src="'.$this->getUrl($url).'" data-source="mautic"></script>'."\n";
             }
         }
     }
 
     /**
-     * Fetch system scripts
+     * Fetch system scripts.
      *
-     * @param bool $render If true, a string will be returned of rendered script for header
+     * @param bool $render        If true, a string will be returned of rendered script for header
      * @param bool $includeEditor
      *
      * @return array|string
@@ -470,9 +447,10 @@ public function getSystemScripts($render = false, $includeEditor = false)
             $js = '';
             if (isset($assets['js'])) {
                 foreach ($assets['js'] as $url) {
-                    $js .= '<script src="' . $this->getUrl($url) . '" data-source="mautic"></script>' . "\n";
+                    $js .= '<script src="'.$this->getUrl($url).'" data-source="mautic"></script>'."\n";
                 }
             }
+
             return $js;
         }
 
@@ -480,42 +458,43 @@ public function getSystemScripts($render = false, $includeEditor = false)
     }
 
     /**
-     * Load Froala JS source files
+     * Load Froala JS source files.
      *
      * @return array
      */
     public function getFroalaScripts()
     {
-        $base = 'app/bundles/CoreBundle/Assets/js/libraries/froala/';
-        $plugins = $base . 'plugins/';
-        return array(
-            $base . 'froala_editor.js?v' . $this->version,
-            $plugins . 'align.js?v' . $this->version,
-            $plugins . 'code_beautifier.js?v' . $this->version,
-            $plugins . 'code_view.js?v' . $this->version,
-            $plugins . 'colors.js?v' . $this->version,
+        $base    = 'app/bundles/CoreBundle/Assets/js/libraries/froala/';
+        $plugins = $base.'plugins/';
+
+        return [
+            $base.'froala_editor.js?v'.$this->version,
+            $plugins.'align.js?v'.$this->version,
+            $plugins.'code_beautifier.js?v'.$this->version,
+            $plugins.'code_view.js?v'.$this->version,
+            $plugins.'colors.js?v'.$this->version,
             // $plugins . 'file.js?v' . $this->version,  // @todo
-            $plugins . 'font_family.js?v' . $this->version,
-            $plugins . 'font_size.js?v' . $this->version,
-            $plugins . 'fullscreen.js?v' . $this->version,
-            $plugins . 'image.js?v' . $this->version,
+            $plugins.'font_family.js?v'.$this->version,
+            $plugins.'font_size.js?v'.$this->version,
+            $plugins.'fullscreen.js?v'.$this->version,
+            $plugins.'image.js?v'.$this->version,
             // $plugins . 'image_manager.js?v' . $this->version,
-            $plugins . 'filemanager.js?v' . $this->version,
-            $plugins . 'inline_style.js?v' . $this->version,
-            $plugins . 'line_breaker.js?v' . $this->version,
-            $plugins . 'link.js?v' . $this->version,
-            $plugins . 'lists.js?v' . $this->version,
-            $plugins . 'paragraph_format.js?v' . $this->version,
-            $plugins . 'paragraph_style.js?v' . $this->version,
-            $plugins . 'quick_insert.js?v' . $this->version,
-            $plugins . 'quote.js?v' . $this->version,
-            $plugins . 'table.js?v' . $this->version,
-            $plugins . 'url.js?v' . $this->version,
+            $plugins.'filemanager.js?v'.$this->version,
+            $plugins.'inline_style.js?v'.$this->version,
+            $plugins.'line_breaker.js?v'.$this->version,
+            $plugins.'link.js?v'.$this->version,
+            $plugins.'lists.js?v'.$this->version,
+            $plugins.'paragraph_format.js?v'.$this->version,
+            $plugins.'paragraph_style.js?v'.$this->version,
+            $plugins.'quick_insert.js?v'.$this->version,
+            $plugins.'quote.js?v'.$this->version,
+            $plugins.'table.js?v'.$this->version,
+            $plugins.'url.js?v'.$this->version,
             //$plugins . 'video.js?v' . $this->version,
-            $plugins . 'gatedvideo.js?v' . $this->version,
-            $plugins . 'token.js?v' . $this->version,
-            $plugins . 'dynamic_content.js?v' . $this->version
-        );
+            $plugins.'gatedvideo.js?v'.$this->version,
+            $plugins.'token.js?v'.$this->version,
+            $plugins.'dynamic_content.js?v'.$this->version,
+        ];
     }
 
     /**
@@ -524,49 +503,52 @@ public function getFroalaScripts()
      * @param string $text
      * @param array  $protocols  http/https, ftp, mail, twitter
      * @param array  $attributes
+     *
      * @return string
      */
-    public function makeLinks($text, $protocols = array('http', 'mail'), array $attributes = array())
+    public function makeLinks($text, $protocols = ['http', 'mail'], array $attributes = [])
     {
-        if (strnatcmp(phpversion(),'4.0.5') >= 0)
-        {
+        if (strnatcmp(phpversion(), '4.0.5') >= 0) {
             // Link attributes
             $attr = '';
             foreach ($attributes as $key => $val) {
-                $attr = ' ' . $key . '="' . htmlentities($val) . '"';
+                $attr = ' '.$key.'="'.htmlentities($val).'"';
             }
 
-            $links = array();
+            $links = [];
 
             // Extract existing links and tags
             $text = preg_replace_callback('~(<a .*?>.*?</a>|<.*?>)~i', function ($match) use (&$links) {
-                return '<' . array_push($links, $match[1]) . '>';
+                return '<'.array_push($links, $match[1]).'>';
             }, $text);
 
             // Extract text links for each protocol
-            foreach ((array)$protocols as $protocol) {
+            foreach ((array) $protocols as $protocol) {
                 switch ($protocol) {
                     case 'http':
                     case 'https':
                         $text = preg_replace_callback('~(?:(https?)://([^\s<]+)|(www\.[^\s<]+?\.[^\s<]+))(?<![\.,:])~i', function ($match) use ($protocol, &$links, $attr) {
-                            if ($match[1]) $protocol = $match[1];
+                            if ($match[1]) {
+                                $protocol = $match[1];
+                            }
                             $link = $match[2] ?: $match[3];
-                            return '<' . array_push($links, "<a $attr href=\"$protocol://$link\">$link</a>") . '>';
+
+                            return '<'.array_push($links, "<a $attr href=\"$protocol://$link\">$link</a>").'>';
                         }, $text);
                         break;
                     case 'mail':
                         $text = preg_replace_callback('~([^\s<]+?@[^\s<]+?\.[^\s<]+)(?<![\.,:])~', function ($match) use (&$links, $attr) {
-                            return '<' . array_push($links, "<a $attr href=\"mailto:{$match[1]}\">{$match[1]}</a>") . '>';
+                            return '<'.array_push($links, "<a $attr href=\"mailto:{$match[1]}\">{$match[1]}</a>").'>';
                         }, $text);
                         break;
                     case 'twitter':
                         $text = preg_replace_callback('~(?<!\w)[@#](\w++)~', function ($match) use (&$links, $attr) {
-                            return '<' . array_push($links, "<a $attr href=\"https://twitter.com/" . ($match[0][0] == '@' ? '' : 'search/%23') . $match[1]  . "\">{$match[0]}</a>") . '>';
+                            return '<'.array_push($links, "<a $attr href=\"https://twitter.com/".($match[0][0] == '@' ? '' : 'search/%23').$match[1]."\">{$match[0]}</a>").'>';
                         }, $text);
                         break;
                     default:
-                        $text = preg_replace_callback('~' . preg_quote($protocol, '~') . '://([^\s<]+?)(?<![\.,:])~i', function ($match) use ($protocol, &$links, $attr) {
-                            return '<' . array_push($links, "<a $attr href=\"$protocol://{$match[1]}\">{$match[1]}</a>") . '>';
+                        $text = preg_replace_callback('~'.preg_quote($protocol, '~').'://([^\s<]+?)(?<![\.,:])~i', function ($match) use ($protocol, &$links, $attr) {
+                            return '<'.array_push($links, "<a $attr href=\"$protocol://{$match[1]}\">{$match[1]}</a>").'>';
                         }, $text);
                         break;
                 }
@@ -578,7 +560,7 @@ public function makeLinks($text, $protocols = array('http', 'mail'), array $attr
             }, $text);
         } else {
             return preg_replace(
-                array(
+                [
                     '/(?(?=<a[^>]*>.+<\/a>)
                         (?:<a[^>]*>.+<\/a>)
                         |
@@ -588,15 +570,15 @@ public function makeLinks($text, $protocols = array('http', 'mail'), array $attr
                     '/<a([^>]+)>/i',
                     '/(^|\s)(www.[^<> \n\r]+)/iex',
                     '/(([_A-Za-z0-9-]+)(\\.[_A-Za-z0-9-]+)*@([A-Za-z0-9-]+)
-                    (\\.[A-Za-z0-9-]+)*)/iex'
-                ),
-                array(
+                    (\\.[A-Za-z0-9-]+)*)/iex',
+                ],
+                [
                     "stripslashes((strlen('\\2')>0?'\\1<a href=\"\\2\">\\2</a>\\3':'\\0'))",
                     '<a\\1',
                     '<a\\1 target="_blank">',
                     "stripslashes((strlen('\\2')>0?'\\1<a href=\"http://\\2\">\\2</a>\\3':'\\0'))",
-                    "stripslashes((strlen('\\2')>0?'<a href=\"mailto:\\0\">\\0</a>':'\\0'))"
-                ),
+                    "stripslashes((strlen('\\2')>0?'<a href=\"mailto:\\0\">\\0</a>':'\\0'))",
+                ],
                 $text
             );
         }
@@ -606,13 +588,14 @@ public function makeLinks($text, $protocols = array('http', 'mail'), array $attr
      * Returns only first $charCount chars of the $text and adds "..." if it is shortened.
      *
      * @param string $text
-     * @param integer $charCount
+     * @param int    $charCount
+     *
      * @return string
      */
     public function shortenText($text, $charCount = null)
     {
         if ($charCount && strlen($text) > $charCount) {
-            return mb_substr($text, 0, $charCount, "utf-8") . '...';
+            return mb_substr($text, 0, $charCount, 'utf-8').'...';
         }
 
         return $text;
@@ -620,8 +603,6 @@ public function shortenText($text, $charCount = null)
 
     /**
      * @param MauticFactory $factory
-     *
-     * @return void
      */
     public function setFactory(MauticFactory $factory)
     {
@@ -646,20 +627,20 @@ public function setAssetHelper(AssetGenerationHelper $helper)
      */
     public function getCountryFlag($country, $urlOnly = true, $class = '')
     {
-        $flagPath = $this->factory->getSystemPath('assets', true) . '/images/flags/';
-        $relpath  = $this->factory->getSystemPath('assets') . '/images/flags/';
-        $country = ucwords(str_replace(' ', '-', $country));
-        $flagImg = '';
-        if (file_exists($flagPath . $country . '.png')) {
-            if (file_exists($flagPath . $country . '.png')) {
-                $flagImg = $this->getUrl($relpath . $country . '.png');
+        $flagPath = $this->factory->getSystemPath('assets', true).'/images/flags/';
+        $relpath  = $this->factory->getSystemPath('assets').'/images/flags/';
+        $country  = ucwords(str_replace(' ', '-', $country));
+        $flagImg  = '';
+        if (file_exists($flagPath.$country.'.png')) {
+            if (file_exists($flagPath.$country.'.png')) {
+                $flagImg = $this->getUrl($relpath.$country.'.png');
             }
         }
 
         if ($urlOnly) {
             return $flagImg;
         } else {
-            return '<img src="' . $flagImg . '" class="'.$class.'" />';
+            return '<img src="'.$flagImg.'" class="'.$class.'" />';
         }
     }
 
@@ -684,7 +665,7 @@ public function setAssets($assets)
     }
 
     /**
-     * Clear all the assets
+     * Clear all the assets.
      */
     public function clear()
     {
@@ -699,4 +680,3 @@ public function getName()
         return 'assets';
     }
 }
-
diff --git a/app/bundles/CoreBundle/Templating/Helper/ButtonHelper.php b/app/bundles/CoreBundle/Templating/Helper/ButtonHelper.php
index ebf1cb66d67..9351ebdb28c 100644
--- a/app/bundles/CoreBundle/Templating/Helper/ButtonHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/ButtonHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class ButtonHelper
+ * Class ButtonHelper.
  */
 class ButtonHelper extends Helper
 {
@@ -107,19 +108,19 @@ public function buildCustom($c, $buttonCount)
                 } elseif (!isset($c['confirm']['btnClass'])) {
                     $c['confirm']['btnClass'] = 'btn btn-default';
                 }
-            } elseif (in_array($this->groupType, array('button-dropdown', 'dropdown'))) {
+            } elseif (in_array($this->groupType, ['button-dropdown', 'dropdown'])) {
                 if (!isset($c['confirm']['btnClass'])) {
                     $c['confirm']['btnClass'] = '';
                 } elseif ($this->groupType == 'button-dropdown') {
-                    $search                   = array(
+                    $search = [
                         'btn-default',
                         'btn-primary',
                         'btn-success',
                         'btn-info',
                         'btn-warning',
                         'btn-danger',
-                        'btn'
-                    );
+                        'btn',
+                    ];
                     $c['confirm']['btnClass'] = str_replace($search, '', $c['attr']['class']);
                 }
             }
@@ -131,7 +132,7 @@ public function buildCustom($c, $buttonCount)
             $attr = $this->menuLink;
 
             if (!isset($c['attr'])) {
-                $c['attr'] = array();
+                $c['attr'] = [];
             }
 
             if (isset($c['btnClass'])) {
@@ -148,15 +149,15 @@ public function buildCustom($c, $buttonCount)
                 && isset($c['attr']['class'])
             ) {
                 // Remove btn classes
-                $search             = array(
+                $search = [
                     'btn-default',
                     'btn-primary',
                     'btn-success',
                     'btn-info',
                     'btn-warning',
                     'btn-danger',
-                    'btn'
-                );
+                    'btn',
+                ];
                 $c['attr']['class'] = str_replace($search, '', $c['attr']['class']);
             }
 
@@ -197,13 +198,11 @@ public function renderPreCustomButtons(&$buttonCount, $dropdownHtml = '')
     {
         $preCustomButtonContent = '';
         foreach ($this->preCustomButtons as $c) {
-
             if ($this->groupType == 'button-dropdown' && $buttonCount === 1) {
                 $preCustomButtonContent .= $dropdownHtml;
-
             }
             $preCustomButtonContent .= $this->buildCustom($c, $buttonCount);
-            $buttonCount++;
+            ++$buttonCount;
         }
 
         return $preCustomButtonContent;
@@ -219,7 +218,7 @@ public function renderPostCustomButtons(&$buttonCount, $dropdownHtml = '')
                     $postCustomButtonContent .= $dropdownHtml;
                 }
                 $postCustomButtonContent .= $this->buildCustom($c, $buttonCount);
-                $buttonCount++;
+                ++$buttonCount;
             }
         }
 
diff --git a/app/bundles/CoreBundle/Templating/Helper/DateHelper.php b/app/bundles/CoreBundle/Templating/Helper/DateHelper.php
index 4c9dc241f5a..49b61598e74 100644
--- a/app/bundles/CoreBundle/Templating/Helper/DateHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/DateHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -34,14 +35,14 @@ class DateHelper extends Helper
      */
     public function __construct(MauticFactory $factory)
     {
-        $this->formats = array(
+        $this->formats = [
             'datetime' => $factory->getParameter('date_format_full'),
             'short'    => $factory->getParameter('date_format_short'),
             'date'     => $factory->getParameter('date_format_dateonly'),
             'time'     => $factory->getParameter('date_format_timeonly'),
-        );
+        ];
 
-        $this->helper  = $factory->getDate();
+        $this->helper = $factory->getDate();
 
         $this->translator = $factory->getTranslator();
     }
@@ -68,7 +69,7 @@ protected function format($type, $datetime, $timezone, $fromFormat)
     }
 
     /**
-     * Returns full date. eg. October 8, 2014 21:19
+     * Returns full date. eg. October 8, 2014 21:19.
      *
      * @param \DateTime|string $datetime
      * @param string           $timezone
@@ -82,7 +83,7 @@ public function toFull($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i:
     }
 
     /**
-     * Returns date and time concat eg 2014-08-02 5:00am
+     * Returns date and time concat eg 2014-08-02 5:00am.
      *
      * @param \DateTime|string $datetime
      * @param string           $timezone
@@ -93,13 +94,14 @@ public function toFull($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i:
     public function toFullConcat($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i:s')
     {
         $this->helper->setDateTime($datetime, $fromFormat, $timezone);
+
         return $this->helper->toLocalString(
-            $this->formats['date'] . ' ' . $this->formats['time']
+            $this->formats['date'].' '.$this->formats['time']
         );
     }
 
     /**
-     * Returns short date format eg Sun, Oct 8
+     * Returns short date format eg Sun, Oct 8.
      *
      * @param \DateTime|string $datetime
      * @param string           $timezone
@@ -113,7 +115,7 @@ public function toShort($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i
     }
 
     /**
-     * Returns date only e.g. 2014-08-09
+     * Returns date only e.g. 2014-08-09.
      *
      * @param \DateTime|string $datetime
      * @param string           $timezone
@@ -127,7 +129,7 @@ public function toDate($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i:
     }
 
     /**
-     * Returns time only e.g. 21:19
+     * Returns time only e.g. 21:19.
      *
      * @param \DateTime|string $datetime
      * @param string           $timezone
@@ -141,7 +143,7 @@ public function toTime($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i:
     }
 
     /**
-     * Returns date/time like Today, 10:00 AM
+     * Returns date/time like Today, 10:00 AM.
      *
      * @param        $datetime
      * @param string $timezone
@@ -159,17 +161,16 @@ public function toText($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i:
         $this->helper->setDateTime($datetime, $fromFormat, $timezone);
 
         $textDate = $this->helper->getTextDate();
-        $dt = $this->helper->getLocalDateTime();
+        $dt       = $this->helper->getLocalDateTime();
 
         if ($textDate) {
-
-            return $this->translator->trans('mautic.core.date.' . $textDate, array('%time%' => $dt->format("g:i a")));
+            return $this->translator->trans('mautic.core.date.'.$textDate, ['%time%' => $dt->format('g:i a')]);
         } else {
             $interval = $this->helper->getDiff('now', null, true);
 
             if ($interval->invert && !$forceDateForNonText) {
                 // In the past
-                return $this->translator->trans('mautic.core.date.ago', array('%days%' => $interval->days));
+                return $this->translator->trans('mautic.core.date.ago', ['%days%' => $interval->days]);
             } else {
                 // In the future
                 return $this->toFullConcat($datetime, $timezone, $fromFormat);
@@ -182,24 +183,23 @@ public function toText($datetime, $timezone = 'local', $fromFormat = 'Y-m-d H:i:
      * Example: 55 minutes 49 seconds.
      * It doesn't return zero values like 0 years.
      *
-     * @param   DateInterval    $range
-     * @param   string          $format
+     * @param DateInterval $range
+     * @param string       $format
      *
-     * @return  string          $formatedRange
+     * @return string $formatedRange
      */
     public function formatRange($range, $format = null)
     {
         if ($range instanceof \DateInterval) {
-
-            $formated = array();
-            $timeUnits = array('y' => 'year', 'm' => 'month', 'd' => 'day', 'h' => 'hour', 'i' => 'minute', 's' => 'second');
+            $formated  = [];
+            $timeUnits = ['y' => 'year', 'm' => 'month', 'd' => 'day', 'h' => 'hour', 'i' => 'minute', 's' => 'second'];
 
             foreach ($timeUnits as $key => $unit) {
                 if ($range->{$key}) {
                     $formated[] = $this->translator->transChoice(
-                        'mautic.core.date.' . $unit,
+                        'mautic.core.date.'.$unit,
                         $range->{$key},
-                        array('%count%' => $range->{$key}));
+                        ['%count%' => $range->{$key}]);
                 }
             }
 
diff --git a/app/bundles/CoreBundle/Templating/Helper/ExceptionHelper.php b/app/bundles/CoreBundle/Templating/Helper/ExceptionHelper.php
index d78c4c97cf4..e9dd89d8dfc 100644
--- a/app/bundles/CoreBundle/Templating/Helper/ExceptionHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/ExceptionHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class ExceptionHelper
+ * Class ExceptionHelper.
  *
  * Code in this class is derived from \Symfony\Bridge\Twig\Extension\CodeExtension
  */
@@ -29,7 +30,7 @@ class ExceptionHelper extends Helper
     public function __construct($rootDir)
     {
         $this->fileLinkFormat = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
-        $this->rootDir = str_replace('\\', '/', dirname($rootDir)).'/';
+        $this->rootDir        = str_replace('\\', '/', dirname($rootDir)).'/';
     }
 
     /**
@@ -41,7 +42,7 @@ public function getName()
     }
 
     /**
-     * Returns an abbreviated class name with the full name as a tooltip
+     * Returns an abbreviated class name with the full name as a tooltip.
      *
      * @param string $class
      *
@@ -52,7 +53,7 @@ public function abbrClass($class)
         $parts = explode('\\', $class);
         $short = array_pop($parts);
 
-        return sprintf("<abbr title=\"%s\">%s</abbr>", $class, $short);
+        return sprintf('<abbr title="%s">%s</abbr>', $class, $short);
     }
 
     /**
@@ -70,11 +71,11 @@ public function fileExcerpt($file, $line)
             // see https://bugs.php.net/bug.php?id=25725
             $code = @highlight_file($file, true);
             // remove main code/span tags
-            $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
+            $code    = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
             $content = preg_split('#<br />#', $code);
 
-            $lines = array();
-            for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; $i++) {
+            $lines = [];
+            for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {
                 $lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><code>'.$this->fixCodeMarkup($content[$i - 1]).'</code></li>';
             }
 
@@ -91,14 +92,14 @@ public function fileExcerpt($file, $line)
      */
     public function formatArgs($args)
     {
-        $result = array();
+        $result = [];
         foreach ($args as $key => $item) {
             if ('object' === $item[0]) {
-                $parts = explode('\\', $item[1]);
-                $short = array_pop($parts);
-                $formattedValue = sprintf("<em>object</em>(<abbr title=\"%s\">%s</abbr>)", $item[1], $short);
+                $parts          = explode('\\', $item[1]);
+                $short          = array_pop($parts);
+                $formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
             } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
+                $formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
             } elseif ('string' === $item[0]) {
                 $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES, $this->charset));
             } elseif ('null' === $item[0]) {
@@ -132,9 +133,9 @@ public function formatArgsAsText($args)
     /**
      * Formats a file path.
      *
-     * @param string  $file An absolute file path
-     * @param int     $line The line number
-     * @param string  $text Use this text for the link rather than the file path
+     * @param string $file An absolute file path
+     * @param int    $line The line number
+     * @param string $text Use this text for the link rather than the file path
      *
      * @return string
      */
@@ -177,22 +178,22 @@ public function formatFileFromText($text)
     /**
      * Returns the link for a given file/line pair.
      *
-     * @param string  $file An absolute file path
-     * @param int     $line The line number
+     * @param string $file An absolute file path
+     * @param int    $line The line number
      *
      * @return string A link of false
      */
     public function getFileLink($file, $line)
     {
         if ($this->fileLinkFormat && is_file($file)) {
-            return strtr($this->fileLinkFormat, array('%f' => $file, '%l' => $line));
+            return strtr($this->fileLinkFormat, ['%f' => $file, '%l' => $line]);
         }
 
         return false;
     }
 
     /**
-     * Corrects the markup for a line
+     * Corrects the markup for a line.
      *
      * @param string $line
      *
diff --git a/app/bundles/CoreBundle/Templating/Helper/FormHelper.php b/app/bundles/CoreBundle/Templating/Helper/FormHelper.php
index 295814a3e4c..4a39d1a5f75 100644
--- a/app/bundles/CoreBundle/Templating/Helper/FormHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/FormHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,14 +13,12 @@
 use Symfony\Component\Form\FormView;
 
 /**
- * Class FormHelper
- *
- * @package Mautic\CoreBundle\Templating\Helper
+ * Class FormHelper.
  */
 class FormHelper extends \Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper
 {
     /**
-     * Render widget if it exists
+     * Render widget if it exists.
      *
      * @param       $form
      * @param       $key
@@ -28,7 +27,7 @@ class FormHelper extends \Symfony\Bundle\FrameworkBundle\Templating\Helper\FormH
      *
      * @return mixed|string
      */
-    public function widgetIfExists ($form, $key, $template = null, $variables = array())
+    public function widgetIfExists($form, $key, $template = null, $variables = [])
     {
         $content = (isset($form[$key])) ? $this->widget($form[$key], $variables) : '';
 
@@ -40,7 +39,7 @@ public function widgetIfExists ($form, $key, $template = null, $variables = arra
     }
 
     /**
-     * Render row if it exists
+     * Render row if it exists.
      *
      * @param       $form
      * @param       $key
@@ -49,7 +48,7 @@ public function widgetIfExists ($form, $key, $template = null, $variables = arra
      *
      * @return mixed|string
      */
-    public function rowIfExists ($form, $key, $template = null, $variables = array())
+    public function rowIfExists($form, $key, $template = null, $variables = [])
     {
         $content = (isset($form[$key])) ? $this->row($form[$key], $variables) : '';
 
@@ -61,7 +60,7 @@ public function rowIfExists ($form, $key, $template = null, $variables = array()
     }
 
     /**
-     * Render label if it exists
+     * Render label if it exists.
      *
      * @param       $form
      * @param       $key
@@ -70,7 +69,7 @@ public function rowIfExists ($form, $key, $template = null, $variables = array()
      *
      * @return mixed|string
      */
-    public function labelIfExists ($form, $key, $template = null, $variables = array())
+    public function labelIfExists($form, $key, $template = null, $variables = [])
     {
         $content = (isset($form[$key])) ? $this->label($form[$key], null, $variables) : '';
 
@@ -82,14 +81,15 @@ public function labelIfExists ($form, $key, $template = null, $variables = array
     }
 
     /**
-     * Checks to see if the form and its children has an error
+     * Checks to see if the form and its children has an error.
      *
      * @param FormView $form
      * @param array    $exluding
      *
      * @return bool
      */
-    public function containsErrors (FormView $form, array $exluding = array()) {
+    public function containsErrors(FormView $form, array $exluding = [])
+    {
         if (count($form->vars['errors'])) {
             return true;
         }
@@ -99,7 +99,7 @@ public function containsErrors (FormView $form, array $exluding = array()) {
             }
 
             if (isset($child->vars['errors']) && count($child->vars['errors'])) {
-               return true;
+                return true;
             }
 
             if (count($child->children)) {
@@ -109,6 +109,7 @@ public function containsErrors (FormView $form, array $exluding = array()) {
                 }
             }
         }
+
         return false;
     }
 }
diff --git a/app/bundles/CoreBundle/Templating/Helper/FormatterHelper.php b/app/bundles/CoreBundle/Templating/Helper/FormatterHelper.php
index 0416a840fe8..d11c9e3d02d 100644
--- a/app/bundles/CoreBundle/Templating/Helper/FormatterHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/FormatterHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class FormatHelper
+ * Class FormatHelper.
  */
 class FormatterHelper extends Helper
 {
@@ -34,7 +35,7 @@ public function __construct(MauticFactory $factory)
     }
 
     /**
-     * Format a string
+     * Format a string.
      *
      * @param $val
      * @param $type
@@ -55,7 +56,7 @@ public function _($val, $type, $textOnly = false, $round = 1)
                     }
                 }
 
-                $stringParts = array();
+                $stringParts = [];
                 foreach ($val as $k => $v) {
                     if (is_array($v)) {
                         $stringParts = $this->_($v, 'array', $textOnly, $round + 1);
@@ -79,13 +80,13 @@ public function _($val, $type, $textOnly = false, $round = 1)
                 $string = $this->dateHelper->toDate($val, 'utc');
                 break;
             case 'url':
-                $string = ($textOnly) ? $val : '<a href="' . $val . '" target="_new">' . $val . '</a>';
+                $string = ($textOnly) ? $val : '<a href="'.$val.'" target="_new">'.$val.'</a>';
                 break;
             case 'email':
-                $string = ($textOnly) ? $val : '<a href="mailto:' . $val . '">' . $val . '</a>';
+                $string = ($textOnly) ? $val : '<a href="mailto:'.$val.'">'.$val.'</a>';
                 break;
             case 'int':
-                $string = (int)$val;
+                $string = (int) $val;
                 break;
             default:
                 $string = InputHelper::clean($val);
diff --git a/app/bundles/CoreBundle/Templating/Helper/GravatarHelper.php b/app/bundles/CoreBundle/Templating/Helper/GravatarHelper.php
index 928caeaa61a..a15781072a1 100644
--- a/app/bundles/CoreBundle/Templating/Helper/GravatarHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/GravatarHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class GravatarHelper
+ * Class GravatarHelper.
  */
 class GravatarHelper extends Helper
 {
-
     /**
      * @var bool
      */
@@ -75,14 +75,14 @@ public function getImage($email, $size = '250', $default = null)
         $localDefault = ($this->devMode || in_array($this->request->getClientIp(), array_merge($this->devHosts, ['127.0.0.1', 'fe80::1', '::1']))) ?
             'https://www.mautic.org/media/images/default_avatar.png' :
             $this->avatarHelper->getDefaultAvatar(true);
-        $url          = 'https://www.gravatar.com/avatar/' . md5(strtolower(trim($email))) . '?s='.$size;
+        $url = 'https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$size;
 
         if ($default === null) {
             $default = $localDefault;
         }
 
         $default = (strpos($default, '.') !== false && strpos($default, 'http') !== 0) ? UrlHelper::rel2abs($default) : $default;
-        $url    .= '&d=' . urlencode($default);
+        $url .= '&d='.urlencode($default);
 
         return $url;
     }
diff --git a/app/bundles/CoreBundle/Templating/Helper/MautibotHelper.php b/app/bundles/CoreBundle/Templating/Helper/MautibotHelper.php
index ed162d95f45..ec14b6de658 100644
--- a/app/bundles/CoreBundle/Templating/Helper/MautibotHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/MautibotHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,16 +13,15 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class MautibotHelper
+ * Class MautibotHelper.
  */
 class MautibotHelper extends Helper
 {
+    private static $openMouth = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADZCAYAAABl0n+gAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgpMwidZAABAAElEQVR4Aey9CZhlR3UmGO+93DMrl9r3ylq0lpAEAgkQyAkYkNnxgvfpD+xu2932eNx2j+3pb+x2f223F5r2Mqa9sUxj+7PHNtDGBmRsKHYBEkgCoVKpSlWqTao9Myv3fMv8/38i4sZ972VWZlVmViEUme/eiLPFiRNxbiw37r0F9+0VCihu8ftw+BvnKk2KXrxxy5aBckvnjmKpurFWrW6v1grbwLSjUHT9tVphoOBqq2vODdRqtXbwtzlXw6/Q4mVVgZspFAozhRrPbgzpC8Dj50ZdrXoBBEcg61SxWDxeqNXOuNnZE619fWceffTRmSb6EFQcwm8fMnLOVfFjYPy5sAIWYIN5tofikDUwOkTasAo7d+7c3lIt3OIK1b01V7wN6D01Vxss1AqrXcG1oKHnbAOnUDqcc8gmicBfgDD+M/AkKZBVrdWo00XQPYPzU8j7MM6PwXmeLNZqT0zXak8dOXJkCrD6UBqCqH3mMBRnitVTPZe+Ygv4artiOdeagMKQc6V91kvExnP91q1bqsXWl9aKtbvRaO+C0nvxW1WEI6iVRQcAVI2uUAUdUMCrlat9pzaTC1kGsemT1UA68aAk2r/BkYJPoB8xf2FCP2bKQDL8JgE8Bsw34UffKLrSQ5WKe+TJ408eBklZhNkhdZjQy2TY52KXbYG0si9byDXEGBpdHD5dPzh4I1rMvWiLr0Wru7NQLK6mvtYIGUN/4YoVV4QT1GpFDINgkwpOswDMADYLmmkwYARUs7an5k5WH3JG5GirgNFXoQ3tm3F/diXEg3qUgB+VsFGTEgARAboCiOkzdY5TrY4DerDmCl8D3/0Yon15Ynb28ZMnT06ILztwyEdZVNhkZrjnYouwQK5uF8F3rZGyQYUG4QYHBze2OvdmNKbvRRO8Gw2tkwpXOUPAeKqACYY5Q7lQq07iNwLkFHsJR/8ptPS7Yksvfj34dbpiqQM/NPQipxtFtlz84EsUyoCRkhyuSseCU1WmXbUy5apl/CrjOI8BdhG/c6CrgBc8hR6I6savA3G251AVaNP0m+xQgyPAJ+Rd6Owyp6lVa2XofAhudz/4P40M7n/iqaf2kxm/EGgbhuecxeywqGOolUUxXUPEOcfYs2PHS9DE34629hY0pHXUk06BHgINCS2rVimioRaq1bOEuWLrNtfSvsm1dK7Fud+V2la5UmuXK5Xa0XBb7MfWzJ8acGYuxtJWyLwUrHEDByx6nJqcpgxHmcFv2lVmJ1x55qKrzIy6yvQFxM+46uxp0I0hmxLyHMCvC8WAi0NHtWv1XMqNB46/WCqWqMQDfwzVKry9UHgYJJ+q1Ur/3DI+8pXHz569KKQdnnOWxBgLiWY1vhDqa4eGLYdBY57dg4P3oiA/i6ZzL4ZQaGxomBw28aJbKxer5fPoJUbR+Le61u6drq17s2ulU7T1ulJLB8jQbnSBpkg2bM0BLM50CEk0gJqeZdVgWjZgUuGgCBM+DzhPhb2Nd5pZOszkGfyegSMdR+km4SOrXKHUB/W4aBZ4Y2dAjSjMHAbzruAw7HRAfwgjyH3oMz9WmJ369IGTJ88CGMJzzhIsMc9ZVTcP/lpDFYZs8q1J6q7tu15VKNR+GdOHV1FRjpuw+FTBmKRUK48WapUzrtg26NpWXe86Vm13bV1r4CQc1vghuhzBNza2J4ZokRgx+BUdvfCQR8yHzkNfR15yHjgmnKZannbl2TE3O3XBzU6cwu+kK089BdwonAXDv1Iv6DHcY1DvouuEUoSwh4E8OgsD4bTNM1hu+Bd0Sn/fMjPzL/tPnDgnhB3oLNQuCkpw39bRpWwFy21IVqIm33u2b7+5Vij+OiqfQykOLdAgSmwYpWqZK6Y1OMULXGf/da69G0OoNgxZOO/lkIcNSldXkKn0V9sEdc6D8qhRB8eBvhyalacvupnJc25m/KSbHT+KIdohFADzodI6/FA+FoZly7dxKzC8EDI1fwEBil87ieN9cJq/nZqd3ZdM8gtDTVb/yPPtGq5261iQ3YeGhlr27dtXvsPd0ToyeOE/ooZ/EdXdUa1W0CJaOMkoVWdPoGfocR0Dd7qugetcW+ca6ynkFPArtsNrwiEWUmQo6/1GOsNZQk/DSX61POlmJ4fd9PgzbmbsKfQwB2CSi+hZNsBZeqygjc6CC0ihgrsvGIUWNRRjHgA+AcN8EB3X3z557MkHEu2e61VCk0mMcq1F2aQ5Bqns3r79DgyN/gQX2Beow8DEG62hpVI+A3TNda25x3WvvsG1dvQjjfk478Gxp/iWcQqoPW/wTsPyyGGs/XLyX54eddNjz7jpi4fRw+zHWsQwVt9SZ2HHGzxOmbC35XJa7FnYC6OX+RzGqH+Bq87/Onz48CmvTqgDdk85IR7/rD6p+VyjJaRjsFLcru2DP4uafCecowX1WMYKT8lVpwvV2WOuY/UrXc+629VjkLZWw/SE1QjiZ2/wzsICakgGZ8G5Vpl1s9MjcJan3dToIQzFHoUtJrCKvBk+xZVu8tFZciEMw1rQswiBoddpRD6MW0IfePLok59LqDl5Y52oXhL4szZ6rbYiXh5Zk8XrBnf+D9Tuv8FwipVQKRRaS5WZo67UvtP1br4Hk+9tQHPlKtxcvlaLRPWXK3iHyTnLDCb5w27q4gk3NfI4Vsa+ASfC/ZyW9fClVrgK7KlhWNSJlxWucwBfKNFZNF9zhc/A9d6H26UfxraXYU/9bTP8uhZbk5xjz549vbXZ8odRU6+oVCocTgGOQfTMYde17nWud8PztSIlx9BQ6losSmx8Kxipdxa0eqyKzUycdZOjR9z0yDcxwT9ijsLVMAb2uvkQhmAlzezhePCcI/CqD5RqlfcfOHr0SU/ul+Bs8SQv4tmRutZalYZVu3bt6itUa59A5bwIQ6pZjBFaeU8Ad71d37a3uK7+XbI+l0Q5tHguzGWB4CyY5PNeD3qM8sw4hmAn3eTwAUzwvwoYuunWTdaryFHYkeRChb1KmNgjPgqKD+HG0h8ffOqpL3pKVoLqDucGATlp32KJa6l1URcat2XP4OAnMH8conNgP1NrtTKKK16/G9jxetfetQ7LutwfxXAtqW8aXbNHv2ChbV6Y5GOvGXqVc25y5Ek3NfwIepWjcJQtcCQuGTcMv1is3FyFtyZh/vsA/cODRw//A/DBMThPgYCYRvRbN1xLLUxXIDjHu4uF4k9VgnOUh12pY6tbveNebAfp1UT0uV7jShoc2jGbcpyvYGsw7rFMXTzmJs4/6srjD2E0iyVyXJAUGif12fCrqB2eFHc/nOXd5Vrtb8L2/CFc6PY9CxzlWnEQm3fs3Pl9uE32/2HOUcGSLoa7Y9gftcGt2fkGnLu9c9CPngtLYwG76IdehXMV3luZOL/fTY9+RVkUWzbCmWDzxnkK8ewpMKe3m5DY4vMoHOUP28fHP/DomTNjJBj6FneUa8FBqENtcHCwo8UVH0T0ZowG0J1XOHB2a3a/Dfc2+p5zDra2ZQuhV7G5Chc+eNd+4sITburCA7D9eQy/tsITWnT7xLqgnDJc/apxnoJ5I4bAtYPY7vMHLWPt73v87OPaLDn0Leoo14KDhN7jTXgy439Vaug9Ci2lKsbEq3f9uOvs3a6tFrqK5erkWyWRN/FC1hQ4XbBGGHjtSr8iJdZcBf24JvU1LBWPuInhg27y/IPYQInl9dYdcBQsE2vo1aCX5ilYdtfTmOhRDmF33O+NTna978yZR9WjoAyq7xUpyxJkQmWvduCYqba6b+AX0FG/oFDDvcDyM8XOta90q9beosnkte8caFD807i+/qzhPnB2XoixjZZyAm+9TDpOcJ6FSFwEDTNlwPY2OmmptRP3mra4jr4b0ItsxhaXU9oHxg2TBW2YzDkJFWV9VuEcGCYX12Ka8l3trbPf29+/utzX3/eN4eFhrrAwE7a9HDPS11y42g5CQ1V5zwOXpN9GfIDPbdSqw4X+Lfdq3sGlSbWUa8Z0jY1VbappeyVwKX6Nhc+cKK/PkjlOLBTsD2fhYwHtPZvgKNfDabbixuNpTO6f0M7iSzoKns3B0OsNeM7+rav7V4+cH7nwCEpE56Az6QLZWMJrA9K0WldQNXW3e3bufA3MdR96d9y8nSq0dGx2a3a9AX5xtf2XlmADnM8iTZAe1AQzn6B5cfFSGyMpeVOgCLLhWkp/OXHkgf/w7EwF91Mmhg+78bNfwYNfT+BitgNIPOTVfDKfH3rVql/Cnslfx/LwR7wmoTdht3VNBXrv1QxqQ+gkvlPDkyKe5aiccu2rduoRV7jLVdENLgGnCL9UBarrf3YJl/P4qI+LmxIy2iWIR6nSC1pAfPgpkssj09lorCyme4ZbXMwy5NyDe76KGHqtWn+LW7fnba53yw9CNLfHHbQy6xHinHTM/gstmMdj/zVePYEXZmAg9vd7Bnfeh02od4OSq2FV7to2ATneq5pgLV6twLzpAbgxuPPLOD8f92urmJwX1+z5SXTnGzG64haIlVGRDtE8eDhOjRSNkChjXtTcSHSiUURDZB6UmTLjEGmkj5FIcOU9C2RSLPZssacvz4xh1eugmzhzP7a2nIAD7YDBcP1t3qNg2z1cCstecBrK+XPMWP4z3tjyBBUcckMt+9y+hv0vUfkVjMxdU8uvBHuv6vU7d96Gm7JfgZ1a8QaRGu6YF9bufqv1IPM1liXRj1fWekEJANEslcVyHAnYeo0cdtkSOUdiQ20aDKFjpImRyHFlzgJ5+A9DL269Hz/3uJs49zlc4MbhKJssn8YbjoSz54CbFDHvrI1hNvL7eIDrvx0/fvw84LQs2whprlq4moN85l3t7+//ftw5fz1W0TG8Ol3sHHg+9loNwugcjiatbwlNNN/wKQxbdFb+1MHrEaI4RxnAhb+mKopHDGS6jF9TqTFP5Q25QR+pyjwVlLnRxqwNFssEOlMrwD3rgk9eMG5dhcl8Ry9WvXpvhN90u9mxRzFSnkZ3gQe5mEX+okcHgHNgqFBwHaVC8eXoVX5oYGBg/MLwMDaKUahWu8jZ6NkALne4mg7CstXW9q/+RRjnJgyvMKI6XexZP4Qbg3h1FZcZWXNLGGIjijIpHz81sJCdh1ltBrQ1QMDCXxTBiFhMjm9tRk+5+vMkgXRRZ0iQfnn5lg8zz4eQI3lMr4CXkkhQHo5KZjBSGdzyC1wLPwehqDdc3Lg83Nm7DY8+34T7WEVXHsOrvDA3KWqvV11bt6VhzFAw0Cq4AVww37i6v++1/b29T10YGTkEHWpDGIofuQpOQgtdjcB8a9u3bx9oKxS/jprZwjuxGK8W1u75Yey5WoWrDnvWpVDPGkS+kKzMVHqSj4+yoTUNAme4LFZPXYepS9ZTN03XtaO52keeDKk8wIv2g7IGnAF0zA5Rncsffplcu/tedVPYwjJ2+qtuZvSLcB7bFKmH2xqVxYpXoYqpDZ6lRh3Van+JV/j9R+zxOuKV4kV9xYZdV6sHYb61DX1r7sa7DH8ad1vhD2OF1u7drnvNjd4Ol9OiPKtOdiXUldKnzSvMYUw6jz4fnHQFRbrBOezSKoKAzTh9LKHxgkx0QPucAt+lzqnKUlEMOKT5eEReFsuX0EkQD6Z51hsFhHHrmB1ELy6JImKxQcJQyxwJOG0X6urb5Uqde/S2lsrUYxh2YUOklvLNmXwOVLQIiJwANxtvxTjs7bh/Uti0ZfOXz5w5s3IrN1CIY8AVD0MyGUZRxerLVGHFEuYfZ/C+Kl5ZuJaeM9ii9bNGkLKxlvGvEw5MCOBPQPDP4Dgx+EYmWUz6n/EhFRthREQa3xQlM8SjhMiXykjiXkrgazybJOQaRWa65LQ0Sbn8xOVZIVk4LyfNN4qJEdGKPhOxsBjzQKjhmTfq2T2wy63d/RbXs/WHAMWziuV0Pi7ScOBFtIhVYWwSdn3YN/wb0+MTD+zesfuVgKtzCYTLeb4qDrIvdpGFF7NwGF2htkp4b5VehnjZ5TXHsAoxIYijUqwdZJXNtmAN35pfzFCE1nASaqBNjhck8oA3CUFOoDMW3+bEHuMxszkimeA8X4RbJM03oDLFAGFZlGkqxsOFs/yjnIxcfIJHGCMWGm0cMJc4+zx1DwUXwd51t7iBXd/rSr3PRwOY1oqX9SZZXpLIMRoH3Hj8AXfjn1csVP9s7969fCnYijgJb8ysdKAFans27oE3lJ+vzqI2Wyy2btfzHqFLXpxSqM6cXZGwf4hJEHPASJNQ+awjcVSlgaqRKebXFBUlXV4k9qt84XwuIDeAsjwNj8sOgod6FlyzjRMG81TW1IINJAoYIX2JkR/frWQw46KjXNb8RBWFaQbW9lvbelz76ptdBSOH8shBV5nYjxFEN/oNvEUyvyzMQrTASVCcQvfY2NgapJ+2gizv8Wo4CHutSrWtirFlYYPNP8YLbatuxn6fThgdRgiVuoCys6KyYPEM5HE4NW/c9VARRnFeWkw3qlXPn5Eq5rNfTHnqJCBpDZLwzC+iYJFbW87olB+SGRUaeEwgIlI1eUrNcH5oq1KJDISi9eWscxSzMx1FRNJlYYeoDCfhuFfS49rwZprKJPZ4jTyGO/LH0Zn0SbcGebVaH+qcSDoIBS028waR8wFW3EGGUKh91KhYfaFW9wqlSnX2XEtrF97jhC3WYaxKkvkDKi2zM0jTtEfgZLGE0DNlkEik7BrpUy18Q0lBjIspk1iPDulLUwRKO1vNJ1xJNFKAyMAZUnyZN6EJpXoHZ/H04recsFHUi7W0uADS+pcJRV5igFOQ1tOB73J6E17c8AiJq5Tx2gFMh0ud69F59LvK2AlXvoiX1OtiaSqFI3LFCwocHWRFwoo7yD67+cNKvZMl1PwDhm7rWIsUjX7p0NBrgM04PX88+QhFLsYxUrZ6nSIuRqLCTSGNwEh/qUhkVTu0xpjyqA+IRAEDqEgNYdGEN3EWNXyR4QASNX6Imd9RTC72XIPF+Mhs5l1cb2IOkjRBbEvhtpXWvt1oFxVXHv6KPfprjsKM+VpIbPqqbPGlNWVC0ZfhvNKTdBVy77p1PYVa8TZ1zXj7erFl64LnH/XOwYoxK3lbKc1rX5Zm7TFlEBLwZ9Y0SiY8TPAAjUSex9OBNouRE3+SCWjuvEQ1pszqZQcdpbn0CSXKdAi4QEsZVlSeE6iHGzKQRDm+GKQXv9Kem8QCKmJ2yIg851wn60Ey94UMdEUcZhfwTRZbyzG5lID2IlI8paIH5ocSbYhfjpC473KIb5DJ0tamu7quw1O1g04fdJrE9zm2a3fo/PMPVEi0FSL2D3EeqLSPh2zBkEFEIIzBPCYjAG0ukcn28jIsYlki5JY752QFzCV4Alk8Zy1HIF3xIxIRycuEqgdIePI9DBD4D3qJLAzDYq+CHIJM0YrK9yiICwYC/EsXoSFRvQn08cMuq6eF9CZ8nRC+w0LBIfji2Bv4dbssYCxbpSp4UH5lwko7CHssvgP2Nsw/SngbbAVfd8KuhA0wFB7j5O7dzAuiBep7DVrK7BismVW8mLyMSOPJiAsNxAtIIWI1eOQ0GI9N9BJYFJkeSl7ykCjUQNvYWAJJ1J2AhCxzHMhNRHMCHEK9s4RhmCgW5ChoxpTtZVIX3N/1eiilvBvnJpkOQZf0zBFTTmkhoa2+5kVcY6i64mZC9+Ws0Ei3FJCVdhBZC0bEBB1m4W5nvAyuFW9in7MB5homKkINwLcCysi1CJokhYhAdjKOLJ2jE9IoTIJY5tYp5JmxeIZwyiPyKdA0AAIfz0AmbSqJeiIPSWTEEntUdJjEds2dBQ1RPCZMDZ65NO1R5GJA+YzhKMpX6kKIdT2oH+YuIAUhzZ5EQnnIBcK5UGNbsXIoLOKwZ6m7aczt8wg4+ncS1fEsQ3KlHcT20BQcHjaHIWtV7EvrwfwDixKyVr6EWc9hlTK/c8RmAiGgNxZ/ytJEeJSniakEnsGokaVwzIO9shFr6aY0nrS5gIDMzokMi6qFebxHsk1mHIixtRlAJfTI+ZxFDVk8JixYpt5RJIPGVxYmWI5iLR/Zzt+biNUPv3Iqy4HMQbK9d1QImrFnYS/CTGOgEP1zRYeB9wSWNaykg6jkeP58Xa1cxoYrJGuzhVIbPnCDrz7xTT9pyDmHmQVoirBTqExLpykjNsqM3tjSdI4Coj1OAu0gqY1gIJP8cvhcIpGUj16KKm0SQZO8BKRwpc7JQdvJ+BDzSGkqRHSVWNbQqzRzFLFY94KsKAz8komDxPPg84SjBFspF0+fOoaZl72JJMfisPco8oErvEY2VgFJeAOdNwwr+Axdtl8LKitzOgjbbtiXlRcapV95ZCVXsWTe6kz1BhiTNwgx55gslNox/2iBIWQ4kgAbLYW0/QvO4hKnylBCAJIwQmSengiBUh4PNJTnIcyCUeLoZQU4BemP+QcRWQRkqYxMrMSIx2SaXNAaoulZZczxeLLGXDyE8hJRXlcBWQCqFuQlegYdhCZdFOJZAi0JEOefgk8blCgPZ5Q0Ec8yRypGkM5oQ9rmIWkbh8Nx6KUeJH/hlJCaW4ULbfMJigiW7rBiDjKkoSMMVKzu9Y2EE3Ts8lwLY+Bi4B0ks58Z2szp4xmSllZlpHiaxSrR6C1lFKo0z09IbKhkQpA04oU0WOC3Bisif8gRURX/Y4PwiSiItFcafH5edtAnqGvSPQ3z9Qg7JXASCm22i1oFuYYOREYLBv7x305K+bQBeVSePCNE+pASmRdAPPNTUFehm4UekJ0432iy5UQ9SM2tLpfLAxnx8sVWbIi1Tx0zjFMr3CJDF7CjuTbjWvhFqFBBwW40seIegJOvFrMEkBmpxeLRIyKF0hEb+YNJRed5AizmFuExIpKcbhlTkxj47L8JbuEgXVvrhiYSTBE5+aC0f0NEvCQAF4ZhSIsPB9F7vBUMdRSGY1440rSTqDjsghxgkEZcEcPWT+DrV7ls5GWcdJJQJM03TDo1RqBcfhK7AwNvDL18bobTcRXenoan6hw/SGkCE+RSRlfMQaC09ZWFAl8tChNUcZeoU59iZoF83TA2t3PQFN5cjAUmM6BQOogsh2cCIcvEpERCIetIcsi8TqKsO0B2nqMO35BsRg3DNAmiTHQPJNbAUh5Q2j9IZGTf7HxeYd6yAEcRBzKQdOUNJ7EE/MPyrJ+bxDkN6cEri4DW9GQKcQq2AyKmF+cgIY6ID6AvcRULzUY8Ac6S1VqwAtqbQZYvtlIOoiIODg72w1rXW4Hx0Bi+o8eXUstwKiOMIpuZ4UgnIxPn4YYRInBE29bTZmzGJQaJyvgNFvKNHAKLKzsYaTymPBGYRPJ5CtEElDAgmhBYG8yjlcoQOVsBl58AQ5b9ExMbqUQsxlGsdUOCF+YbPiSaumjssf6iYyBHHyeRRam3p2Uxyecdrfm9ENA0zkGMk/tRCi48G0HYsoWVmoOoEHgx0i4YdpNN0KfwGbV1emNfuIOeq3Bw0JwKQoSUEAYmPpBkEeCMVigTGultjqCkp2NFMc2DCVOMQJ8vsQw29id94BGUmOwnnOGDCDsDtpi/OeRIJwqMeVIHC6l+ho+YqDM5I6/yYCrIM5TkCMY0cKQjG4PyTniEsJJleE/vaY0tSAg4UUuu7qYntIZBHpyDaOAReOnqutHMs+YgQ1RlGcOKOghmY3v4BnCUCe9uHSu0tK/RVgOVTwbyZcUpVgnghBpGCJ+2OHlT2ixFfORCNKM3GnARbQeKUdTojE9AwUmbh1GGfjhJdDgHeMM5SDO2BrQXl1D5aEDYmWXVX8gvZB4FGpuB6/U2JuFiRoRZGRSRHCAFxiEEMDEliBdgaRw9wigiUUbrZWQ29JSQo36FsnUTkKks2HYT5RiBts6LZKXmbxYORdxyRFbEQVAEK2WldhMLgfFj1VXHcIOQE3RTIZoBkdTQEU4R9k8J+jdKT8FKMwzAAW8USnssZYtU5BmPVZ6ljZR09lPa80ui4CEb8qS/uiRQQU48U4e5/nyeRht462QmujBv/Skf0tXpIhAoIpzMRkwQqe1IGs/uoUZm8o3M8wUeySS3SRF9SAnkMZ5OOcV4wDHPklay8kNEUONu+pzvuC4UNlAeXjDH07KFFZmD7AsT9GJBDgJDaPTJO+iqOG/MYGCVlnVBQJbwKSEAzQzMOIOOsQI8RRAxJ33klAy2ksgiiE/hlMGzWB0JknU4k3qZxyCrTic/do/XW0WMVseIR0o4ozTT4Krt5xXSFSSaQ6QyyI85gnHhSBqlDSIbQYZSFDrXvAQozTVAmc1JIAs8pgPLRflYr9FEPTUTZj18PwHhPts8tioHYQ4pfKnjK+EgNBNXsDCxKuwxw2C/YrEPK1h4mRgrC8bnBpvYDMjBWlHA2f4N5nH+JJjipLUWYHIyIDEeFYENaQIyrDjEl8vbIPPDA42E5SXmUCHR5Ny8xmmnQGxyo/ToEMCLJuCRQFQT7MiLlLeT+QkRKLtY0JADP2QSxPmihOKk5mwEMmhcDiYz4MJTAbH4VC5udBAoHYKjUp9iCU1xNipJErQJNhk4SVZwOholosfBGvAKhJVwEBVjcHBwHZ5D3qHi8dMRrWvwfiRfRhSZ5lTQKaSE8BiLR8omdOQXp3AxRaAw8Wg2ZlIhNBif8jBLeeYUZXkEdDjX5xHgl3GO6ud4ca1tQKBBhQYN2qCCv7YDZwwGt8ZnDZ6C6Sg8h6u5xQVDYzf3ALauN5GtlC0OIM4t7ZILeZpKJGJtsPdgdiGORHQywpkvGzyeJjWRSIkB4tE89Q2S7B1pUpl0zq3IfqyVmIOoTG3F4jZYY0ArWHiLRamNE/R22Ifr3CKRoVh0S+Fo/2YwAT0ujWdExikcRYGWcU8riNKRAHjShLSQlqdAPm2ijFY5BHrKRtz/qFnC4TP2kIQu0C/q7CWneZjkLH/Jo64IRoej8jWYCkaMZwlp0WdAI0aaIJ8QqSU9kDKkEyhEGFJCeIzFI6VYPZ0XrpTnL8oZQp4403E4vNLddA5AJIAEcFldAtYjzgu8KIlYjrBiDoL7PckK1kShpW0A5bcOLJiXxjYzmHHT+JyG9nYzYwcTISU4D16KrwijIN4zCoA4/3UinD87yYlCWrBAaLpm1BncCzIxBJsofybfQv4yvrwAn0+UltIFHaioBeVkBYsQcmTmoHZeRp1NMhuZXEMbPbOn7ITZp4TIxSOlyD2Xz0spNHn2IFGehLKH434sDrHoIPkAr+hZif1Yy+4gQ2Z7fJOrtodFtBWsi7gHwgk6jEL/Z4DBvLk9h4A+HoxqMLNzpDbDeuOTIa1IxrOKtrivG2ZKgOgtBy/T8/hcmanoRMuo/wV+L4BUHkfO7K+BLgiY9ywlJDGTxJjPI42oQAmOVFZwqqQgGYKlECPzEo2ung9pZmUBcSU8hNkk2GAfyRMusiGS8RCqlAlTCnMKsNc1R+bNm4VhSEbGKKjWhznMsr+8oU4j02Apj/usC6RBrgtyOTnj+3djw80Z0wwpw1vUG5PcvjqiYT1EdIZLKzCNizvhE2fMN8torh6DFEZFpvAzmOGYv8XCKXf2CaO69DFK9iIzWRkgydGTA6cyRk0snZRbPEFE0CmwKR1EkcgH8GciQtzjyev5RE1ai0hQSBGYxSOFZYb2YDcL2RzDFRNRZgoHqektpMZD0ZrcY0dvtVoNGxYzJAmWMNgYZwkFNhFl71gtuEFeCfCHSwXf3YIVLAYVLZTPzjKkB2XxYN5A6w2upMf5uMQmcUsHPjtbhXtYPAUa6uXpyKyAdKRLYIwmbIYJuga65NxAm+CSaOxZ64Sr+WRIcEAggJlYWFiJALcGp2VWytfV2PRLNxMSpacBjZmESNdP4CHbFBAtMwr6NF8GpiKc7muqLiUjHe3rdeEwgjR4ei55LoSS4TDaboImZKIAswD61mKl4htRgC79ebkdRMW6dcOG7olaDS/epVHwRHFprV6PLwMBRiKzntkhFDNgCDUaIzNqQAT0OB8XLomLV2njIo8lPVBpH8+Ys/wyhgY+kltI9MtAERdAizonKmV8aEi+gQZYaKAhbatFTF3aUaQ18gElDwiAIANF5SjeSSSOUOJBmjbsjBW6eUcgPWkp2TuCT3mMzy7Q6AwH4SaLyox4RUg45yDcsJgFWoYe1YKHcpd9iLUiDnKxq2trsVrbJMvjEwfF1gFXKmGfDWtbtYEio9gseYjQoJb0Z6ECBc4BLXg8qAIzZJQCAsSjqIw5pSBBJGEsIxM/cwkwyRPAHyJjjAiRTzVlSIGIB4PkwQaFtJzAvMOIxjwIYkJZ5nMUcOCflGlvwobNfMI9EGUJ25hjABXj1Ic6yBXEk8ZjUWh4OFWWj2JU0euJ/PB2am4toXsqPxaf4jVJBz6DEsPbIQXcLOCWd4bIYsmlOy73HESKt1YK21CeTpQDNp6Rg+BZWxSTJaMVQvkYT8rrwQayhNEHAwBmSAFMjNHVN/YMZzysZMlSdoTFlOljZJ4mJkBtfIBY3oxIuCJSx2JGKRzxDb+UP403o0WeXr8gGxzGFOUGdTxFJKzX1xDxSH5JsjxUAF8KQxleNJ42Hwde/54uF2fePkReEQCY0Use0iVuLaEvBBzjchDCsgCwqLC4pf1YQ5Eho1mq2LI6SFC8XKzSQagzNiniPVhtvXbnVOU0Q8mUqc0U9wb2xk1paBMDe35PL8MgblCm8nREeKkipRDSGj2RIeah/mRcnlOwgMj4xcpD/FkW4UjKxfwFvniOciEF8aCB4UO+VpaQT0YUIZ6A3BYNZbY05QglLLMMEhUzAKPSQREyRDoi+C8AiULMw40jR+NBGmL5eDixB/GSAkiXWSbQKeGiizA0pNNyHJZ1iLXPa4xud5cMUizhvuAobhJiiRcTMK1OyJhZ0TJzhlhinhgFTnEDpPGsQprhkopjlrHyQGvk/pSlcxyiMUJPLhmZ9lksRxWJM/xCYsECorVrJmzmIwRawU1nzQt4aUVmys+us0FGeMjJhl5eCvlBpgGSl5UfCikTZAN6ZUvByAG0zYZb2SRfQjn6Mm1Bb9tSqBv4w5CMRaBEHhCKJcxB6gPnJfxMoS9fisaozPZj7duXgpc0vqwOAk3NrAW3PWhNw7bwISkZOUBpOMa9pUJlpaCAw9nQRpvGifASJDiPo/S8fC9B2cZ4szyFzFGAx9LKyB8y+Sk0jTfypNjmcZkwMw3L4EFNnWUeR7HK4BGaKgEJVAkHOglDOqkmUXCM+Z0EfCYcZiGPhJqNvD6qG8RthsEjcqQSwTvAwg2LNtIwXYBEGi8UxF12SqwPkKZP6O4j4TKF5XYQLfHCUlvpGPjTEm9Jr/mxIqtR+dLrlIvPQeONEbCWlKSImc85fBagRSwmwM+kb/gE0+pWoSlZZFBeMdc82GSLIuX1gMWcfAPKtQBr3VDdZwokrasQ9PcNU/qLDDGRqL8wpbxjWBYgAg9Jg5OQiOKst2AcuXgZzDHrSfK41EmoY9QtlNuEen2RS1CdL4uLNwulNLsVELAX8UTSzwoOvW2IlSJDHkt0Xk4Hka2xHaC9Vq5s9cVFYfGae3wHJFrFF4SGtOBjoaIJDChGFPcATyOShMbAgYYsIR5jAHJSiHf3leCzmIlV8EGX6RkM+vCRFjYCfLrbtbYUXRt+pGP1lEFTqVhFSVLMM1MygmIkwzG26CA51nDFq+xNH5MFAGikj3C+OQb71TuKnMDzs2XKSdjCKAeChCfY4syjuSNY7s1x1IYSqRiOyCPIz3YAE+XhpEP2vJvOeyH4Hp+VhxKQLmjDogqnTEMtgjos82ZIU2vJjsvpIFKyNlFb71pr662K+fZ6bFJswS5e1QcNSDId4ilXOl/RRFrUaMOVXtxz0FBsMCaZfS6urZVduXPnR2fdE2dm3OnZqnveQJvbtq7DrelpwRI0XmQ2W3EXLs66/Scn3VNjFbeuHePEvja3urfVtbbyhlZwFq9PUozmBUmgQZFcQesSsE9W6wmDomZNcaiReV5dilFO8Xpub5usYVIAGy150EAtkjVW0i/ISUyO5RzitHFwUGUT0aYTs6R+3nmoR9AB+tjeK/QWZf+OZurIqxdXsipTiMeeBCJUAC7zcqEp7GYUEOklC8vpILJarVTbgMgqacwrQwtWsFqwxNu0+mkuhFCpliLAx4QNaFIibjDSGJFPKxnidmZvQEs+emzcTaEO3vTi9e7Hv3+7u/G6jW7Nml7X19vlOjq4OQ7VjAqYmJh2wyPj7sy5UXf4qbPuGwdOu/u/cdY99dSE27mmzQ30sxyoT/UqPi9BUlXycI++9AlseU7Uvf2DN8Gg5SklnIcLhrhgODD4hsmoOEgqR/BNGmle0Ym13oO5hLjJaOwtjJ5VYO0V7DGBOoMeTecjIFNIaOmxReSvbe9AUrKC5iXcbjKBJB0kCbVa7x133FF68MEHc3cSE4orji63g2AIWcXHTgolGBBtbrbQgudAuO8GJTZjBlPQWArhTHwCScAZIgBxtv/IEFyK2ZSAa0evceDkhIZLP/dDe90r7rnZ7RrcAIewRm6M+eOqnk63YX2/u+G6Le5l+NzobLninjkz7L6+/7j7l88fdJ+9/7TrwBBtLZyFn8+rolexYgS98vKuLFVXRjZetVuf10Icxdu4sTfJnMSGXHQMaItDvZOoTny+qQNkzmPVGnTL5i2sopAPYmwQNAiLhYjFw70QpFQs2hOReLMwWtBjXffx48dZgbMRs8SRZXOQITdU4PPCuBqt58wc9sCG3ukSv0cnBzGTmB1UXG+TGPcRWZCltnTWYwSIWcRjBUydg8OpcrnqPvLYqPv1H77Rff9b73SDO8LTmqgYVhTrI2RXZ2BVnMe3tpTctk1r9Hv5S29yjzx+1H38nx9zn/zUCbequ8X19LS6WQzXViaglNIZyunfFwAnNsMMRuXxj8bum6QKGxuoITM8xUTHYFzsrEfE2fdATmzRwHt6EmZOQt3MrrSFeLygjDVAJYBk0iu7FxLgoIOD6M03KjAUYpAurqezs5Ojk3HBluGwbA4SHqZHxWylEdF5wkXwqp+WHhiP90DYkDh8ZKAxeLKzjgFkmBTt456A5k8YApSNvrOj5E6fx9sbMWfY9/uvdy97yc3izZyCvIE/ySiJJqJZxaoYyl7V3ubuvnWPu373JveSlxx2H/rbr7tH94+4zZs6V9BJqBA0tH/TjaAIg6JyDIKscbNhqRwsNwuCQIzwCW3mJMCBDscmTgIZ4AYbhfgQEslZXpGkSRyS5EKcJAx28bS4jqxcTNJ5z4wsIXjy7tZajTt6l+0Ni8vmIFDaylCr7VQL5kpQbRybFPGZX068sAFNBfalTgsfHMUsR5MEbCBO0iEayZgPnaPFHX5mwt1182r3K//nG9zWzWsAt6saV6jMqci08KCsvENRFsO67m53zwuvd1u3rnH3fezr7q//7pDbsaVTq2KeZOEZXCkldYPZs3yhMR0DqvomjjRolMaBRgAxy6VjpAVAQI+BvXgpIzkRsiPO2G6On88zSAFNyN+LF4/0Mnbk71PShQ4rwTrmbxbSxsiZQyxuWDR1KCWEVqz62Pw2QJb4vJwOYmONQkHPDsOotAocpMssDcOaXWhgBLM+4mYsgVRYS3t0AlHUU5ssVRXy6GgvuSefnnCvfOEG959+6c2uv69blWkP5RjflR7DUI9V2INFh53rV7u3fs8dbv36Ve7df/Kw27IR75XFnCQ0livNb+H8sIJMFvKmbbwThEu9QFkjpWwbcnla0LVg4sYb21zWnpypuPGpipvBeQZpLnu3txRcV3vRdbQVQcsRQQ1zNK7s4cIHBewCohphtVtdJ/kbkIh80NtNVABxqT3Y+7Eah64gY2HnnkTmRV9WarkchFXEEkJ+bbM1Equ28KIGEiS+wJQFIRhlZaUgS4SGSaRJ9HCQMp82VNgz56fdS5+3xv0anKMvcQ6TtrRH5s4x+ar2ds11XnbPDa69vcW96/cfdNs2dwBmFb20uS5EmtknNFRycF7A8ZA0Um/hnUTi2NrwteE2m7OdODftvnp2xt3QW3I3b+12Nw72ud5V7a4TZZuCo1wcm3JPnx53+4+NuUdOzbiBtoK7YV0rlsHbtBrLuRgvEKokNQDqQ6eVxVh7yM3wck6rRq1iZXUsda0HkdaeyFoGmbFJXEMsFU/FWOLDcjmI1Lxh7Q2dldrMGtiCQUfeA5FxlPIFtpbuyUSbsnhOg8ejZ1Xayyrhqjc9U3UDq1rdf/rFNy67cwRdVB40goHuTjeDNfwX3rXb/bufKLvfe/dDbtf2LjeDxpKqG/hW4myNra43QdPKhlTWUHlhYaP+ysExt2Wg1b1paJv7jTsGsaCx3q1dvcqtWtWJHkUDLanN4dXY+JS7cOGiO312xB049Iz78sPH3D9/+ZQbG5l1123pcJ1dvJ+E97Mjv4ZAg+Tg1ANVjWVd3iy019EajfUgOWLS4vNkhRJ2v2rL+xBY94F8qcNyOYiKX+4rb3Dl2morOYqEN1QUuc09sUy+4YQUzj5qJ3/0jkRkDu5TbZiMf+HJi+4T736L27hhIA6rltpozeSFq9763h43ce6Ce+nLrnennh51H/yHw27rik/c6zWEvXT1JhyWU+/BrdUY8qLNc3Xum7g3tHl1m/ut//1F7uUvucFtwZyNc7W5AlebOHTlb+fgRnfXC29w3/fWWXfkxBn3hQefcB/5+GPukUeG3Q70op2dJVy4uOso6EG5dNG6XoQUupsOx4IDhurW63+SNiOdbFjCoRwmtQhDQ3jN4j7GljQsl4NISTwSuQYjR76BGPZAgUt9cBAkeTEIpRfSH3x92CmXSKgA9ygBfZxXwK8/Ne7+yzue5150x3U0HCqYV7yVC8yTjrJ+VY87PjLivusNt7rHHj/nnj41qRU1DTlWTp26nNg4YXo1LGuY7bigTKHH/epTY+6Xf/Rm991vvEMXlsBoQ6RgbjN0qDZrn6xIk8lyd7S1uht3btbvO7/jee7T9z/m/u5vH3aPH7zodm7D6h6W28lHSeKMEYnRgXL0vRA9WejrD86IGVHgMjovAoVa1kl63a3JTNErjLFktYG+NbeivD/KOK5XKHu7611/B7pq3q22K0hwFF5NrOFbRcZq8TVCw1loxMvOyKEDd8r/75//Lg0HSJvxeNZlPjE/VnwbrshT07N8ahrLvj3uY/90GHfpW9CjLbMCCxAvHWkrzDXOjsxoL9of/dqr3Vve8ELcx+m0eQPkkC7/IyzLgPE8HmWHXM0rQNbf3aUbrM97wVbX011xn/wM7xWVtL+N+97ALWGqd8YknBeYopueHsfcbUbyteKJbSaViSOg4bWWvArct4TPJLtHLowM/9ORI0fUDAJyqc7Lcokd8qWHyTbRiEhiLlXBFpMuTcJiEdNSmL282QyRVkgk9XRK+zgnll86PO5+4gdvQ4NcrUq2fCPXikfW9HRj1afs9mAby+tfsw3j9GmtDK24InUZshHz/tCxM1OYePe697zre9Dj7lHPYr2uOUYd24KSrC/MC9SwKasD84m92ze5H/rBl7v/+l++06EJuIvjZeyFQ7OjIgxJfZqz2HaTzBFAp0dx8z2IMQPlXNiwGEBLel4WB8GAUEpi0U8TKBQcF5ZZlBPPgegBGBoHlvEeYIYhC2H+zJO3XtbYA6XRhRS77puwrPqKe/Yal2QouuKHkHUnhhvdbbzB5dw933GdNZoV1yafIdtkO4aix+Ecd+1d437zV97kNm20uVroDfIcl5+iPPYmLRjmbujucXe+6Ab3q//59W7D2g53Hj0XL2pNfEQZNtwshBvYPCTTB3f2ZWqsINocJPOojGgJYsviILiLznZBB9hmOrL7hYOUugCyUV1oSIZvPHrfaUTUQXg1OoAdtz/w+uvRe9jNwMyh6ohXKBkqvrezHb3IrNuCm4gvf8kGd354BsPLS5V8+ZRsxb2LC6Mz7qYdq7DK97rc/aHlyFVOAmNwyLmuo9MNDq53/+GXvstt3tDlRsdmNdzyDcWyh2lonXQrEtu9Lqp8NSniIQQr4iIZngkJqCU9L4uDQEOVBP2Gf8EwioMPdhZL2OauiXNWUJXGl9ZOWdHzJYUphApUdmaXfnqq5u5+8XUiD40zz7uyqeDcXehBqF8L5kZ3vHA7hhcYZs6zMrScWlInjv2x6up+5RdejZ3I2c3T5c2XF8caNou2uDXtnW79hn7387/wGjkHe/4SFbOqjGqUNMpIgKLJOwiI/U6ZQvhW4bLM8JbVQdA6eukq6AZRmCkMseweiFnCDBCGSbKSt0liGjhFmvI29CA2trGJsnvd8wcclxoZmpF7rhU/teFWdDve3sRdwDsG12LJE/dJsNy50jrycsSe9oEjE+7XfvZut2PbuhVfAqeT9HS0ux4s0Gzcstb9/L9/hTtyknvzrDKzdsBrKJplMBKVx8Rdr//R+7HS9gBkwdFBwmJTilyS+l4OB6GSLBaLjgelVEJs3CljSw16EBQcPQsLNndohmsC43DlaWxGvOO2Ta5/Fbaw0F7BsHNLXxGMlRpbMnDlLMNBens73Y03DGBoATuscC/Shpo4dnrK/dQbB909L7tJ5V/pJfBQL+twnwgP0LibnzfofuZf3+72H56wSbu0skrmPZbUYbQTTN8Jaewk4Hir8NTqst2uWA4HYVFZUvbo/jtyoeDtVvC0sft4Csq8J0CDuSwdUmxop/G0357dfBM+/YPNcukCr3q8Y8zz5Qb2Iryf0IJx+I7BAfR4eLNkKNblCr0MvilsefmB775DQ76rdT+GduSQcx1W+GZny+5Vr77N3bG3z41jFBBuWdmFhZ9kY9NkCj9ubuUcJF8PZsWa6xoZGeF9g2UJS+0ghaGhIa3H7d6+/QUo0DYaBSVRYYot+XI0tpM8pGlnkJLAdh3YMLcJ41qGvP2uzF7SGwqwosJkc1ESvTIlX/NUmxsZzdnSQixK6qKJ+Vz9oacn3TvevMft3rlR+a90DxaUDr3Iqs4ObNIruB48wfl93/cC99ixKT3GbHSclNPm3G4SOOkj7CTYg+RthypqxzMh+YaVsV1xbCkdRLL27dtX3rNj1w9j5eFTKApXGOghGlUV9SJi6hwKmZx9NEAuWTJYhjtNN/S3Ys8VhleUumDm+aUH58CVyT388MPu9OnTl+EkpgyvmCwuq7ZnFbZdwKHNSebXYemwfPKm4O59lS2BJ21u6bJYhCQ2etqkH/vWpnEz9ZZbB92rX7zOjeD5f+4SZqAj2TcLvbayob2WNM2KdsSvu6XaEr42ZQJSoiuML5WDUA7bQG3P4K7/BOf/cyi+CsUzl0eEmut1o6nCzYrTBEb7mAQejYCwKhykDy9ZaG9fugsIjc4KOnXqlHvHO97hbr/9dvfSl77UPf7445fhJFlh8fk5Pe/OHg/RFQncss4Hxt78HZv1eDEzlcOuSO7NM7G6xMUCu5/ZRXTDUV71quvdEydwIxW9nQW7WUhnCml77Jb7ufIB7aGtWFq+t7wHjfK5Li4VnMNdN7jzj3ER+FWM2+EYNewtwVY43fcwD8kep1xABsGS3iHEkTgPo7g9jyEW36WUIBYgej4SOgjDJz/5SffBD37Q3X333e7QoUPuYx/72HxsTXAmp6KVF0NzuMWFhZBHE6YlBTGvIxdm3Xe8dLd24l6tuUezQrVjTsYVvnKl4m66ebvbtdEeF2BNqgeJN5TJDTfQHATNqq6q0Ydg8MX3SC1PuFIH4Xyjyndf7Rnc+fco2L+pVCp4Xwjucxbbi5XZ8646cwqF4pgSE3Td7AFHXSEtGYD51HzF1tgN5GkjnI9+MbiBAfs2y/nz58XW17fIHQ3eafUAkc+YjkH/CyVdjD6XQ8vt63vQ8K7bc20tgYdemrsNOFlfs7bX3XnHBnduGMMsODUtlH+ykCBNbVMzkJA31It4YwOWR5cnXImDUOPK5s2bu2qz5Y9C0TfipWvYoYfdBaXOwvToAdez7qVuzeBbXXnqKMrXjwlvVshcI8kl6gqa4GLUNz7Of8t8yg3vsFqqwKsXw9DQkPuDP/gDNzk56X71V3/VveUtb1lUFkHXaVwhWeEUy/shejZkBZaxOJ7nkvLtN61269AAFXzZFlWQZSTuQA/CXq2Nu4Bv2uSeQW9nz5zAYrqYWi+sK4om6VQmWFaK2eWmUAk3C3PIpVD9cteP6ViVwcFBbHtz/4gHXIYwquKrV1oLJUy+Rve7ge1vcIPP+253/tQ34SBTrr1vM5wkzS6UJZzrip4rXaAJZw1f4XC8UYin2/DgDk0Z5ic51kUm6CC8wnV0dLif/umfdj/yIz+Cexh4lxe8MVz5FiqSQ8AZOAXbJeVOjE+7iamqW5MVY6GiFk1H2wzDQa7fvdp1tvKtIDa3WrQgz6BRs49f+T0UMwAf1bVQc1u3rfENwJzC7qZ7NE5hi1IGQRvAv641hWLYj5WilyQeNFyMMPJw8s3m/uG8c3S46eH9bt11P+x23PIWELS76uyUekcWEB3n/Pk0NJykyTfgoAC644sXK+78hTF8g97Gp2be+bO5FDY4Cen6+9nzLd45yDuNpwtn0YNggMmkG74woUdwQy8l4DId6JTjszXsT/O3oq4wH9og/OhsVxR8XfLJQS4asBfpH+hxm/DAFlcmieZSr/cYeUKzpwqDDtBHDjIUGQLmys+XaLENGVB3OofbPTj4ARTwtVnPYc6xae873NbrX60rZq1a0ZXL7vXgOw+N40jfdOrz8RasB9el2dD4zqunTw27ydmlfXdYaMShMYR0nQpNk6H9TEzPYH6ExoTisBGcODGi3bRBZlPmpQIiW95B7+tbmvnrI4884j7wgQ/gKcFHVLdXomaoXToHHZn26O7qcGvx+le++IH20nCcyBDgTPXtH/uX5KnYyeR7kKFAvWTndMyzEKHUGEu5g+/C3OgHNSHH++kL2ITInmPT3h9zm3bfg/Ur7xhq/vInGAKrTboqMBuIScrekPF8uEiMKw/sw2cbnjpyzo1OTLlVrbY5MJIsQWQxjhGys0rHsw9T0+o9eOWdmpp1Bw+dd709vLMeKJfvLNvgRQqdnZf/0g8Oq6j71772NfeCF7wgKvvQQw+52267DeUwfEQsMhJ2PrCdc6dBT3ebOz05gedm0Dw04lBzM6lhBGI+EXMyiurVn6QPDQ3Rmaq7d+z8eTjHz2F1hm/yapFzjOx3G2/6V3COl8s51Cd6J+DD9yyTNpuh5cjlY/HqI+YZl/KPgNd9kL4W99g3z7ozF0bdNBfQEObPoz7PpU2HvCdmZtwEejU6CyeeZ8+Muv1PjOJKaRPTpc21uTTeRS9qVag5fqHQBx54QKT33nuvzl/60pcWytqULtiIe5FCvIDJRGsr2gdgDLwwoZ1FfsWTdECQGj8/jtwXwEt2zjSYRySdg3fIr9u+/Q3Q+528cuAlALjZid2pF/e7tXve5jbvGULheGmkyqEJIwXv4G10fhBecxCiG0JG34CqB7DF+UBb8gVxjx8aQy9yxo2hUcobA8FVPJ+f4MuWTVdW/v79T7vxScxHEv2XU71QC2W8p+pKw6233ioRH//4x3XmzdMrCr4NcHk+dAhsJ3xFEm3FEOYnhgcDehDs5GqaLTj0XPo+a3xNaS4X2DzHvLQSnWP31q17oP3/y7KhMHgeuL0wO7Hf9W1+LeYcr7ErgUqTNWDpSxjLx/nHFTSOVGqqHg3bgWHW1x446i6MT7oJPKBEWsJXOjBP5j2GoRWHV1xq5RBl7OKU+8IXjrn1mIQuRYNdSLmoB3vYiclZf8may4JzS6PuDHfddZf7/Oc/7975zneiHF9wd955p+ABr8SiDlY3XPZmYG9RQXx8wu6DyI7oLbKnT0nEpY7sNoEx6ojKtmdCcCFnIRdfUC+m2elScxBmxlLgZmXrXyJvPPBdKReLrS2V2WHX0fsit33vm9EIWjEeLauguUzMN6yCOAeRsdgOxgAAQABJREFUgyxRw/Vm4KcH1uPt6p/89HH3iu8857p3t2lZM1yJcvosc4Ll49j/1MWxuDrT0dnivvbVw3gj/KjekbVSL7emqWexinURFw2u8GF25h3l8ozA7Tb8LUWwduCwsGJDYqYnJ6fdBTxxuSrM0QDTsArNRVXN4RUvsrmA92JxNOPcW3bt2PEOXMjfCzTJ6dlX3nV6QTjNGaQR9lf9Dp78ehFe0oXLc7GlVkPBqtNux/O+37W29cA5ONZWMRoFhSu5XmG/kA6rXsQcckEmDA2IvGfhKJ/d97gbw8rR2XF72fdK9iLB7U+PXtTyLnXi3IO9x8c+esBtXIslTKy4rVhgA4NSZ8+OSR8ZK9TFZSjBhkh78rwUgT0pl8E5ouI9m5HhcffMuVm9xlQjDijMlawwS8nmIMHS0oJNgKXqxn2T9+zZufPXmcaPSl5OYwNbPswpZEivDXVlZPomaPF/4C45M8XLgtvczNgRt/32n3ZdvRuwbs3XszQXQ025osWgVYm5nEgUl3/gUu+m9R3ug/94xB18/KS7iFfGXJzE/RfktxJOoiEB1D8/PuHOT+Az1xiacFm3FZ9e+MLnnsCHd0ZdFyfnubq9/PIuhJOT3XZ8FevEiVHZQjpegf05nKI9L39YZVoHH52YndE9Isrkpe7kyQt47y+amNIwFPNK21WD7UjDL4VxFQKzXwRo+H/t2bHzf0IgGyTba32XA9DiQvOWjQz2YRfHno178Gym+0N5MUpWwEvfpi8+7jbd/ONuYMMNeEhwbucwNchJPVleObuBl+HIG0zrMMb/y7/4qhsdmXSnxsYd70Mst5Ow3pjHCBzjFHoPbkjk6gy/VHXo4DPuz/9qv9uOR21XamgVTEsdevDNksNPDrtz+EoW31R4TQQ2A4SLGFIx0HZ84vKJA6fcOr07LPOE/BwEjHIYj4dzVGbOuMrsOYCxRRoTEd52QG/0o7gN8dFB7PKAeF6dr8hJ5nIQFaPQUf4tjOW3wj/LWKYtlqeedr0bX+k2DL4YUxHk7QvLgtaHgIrvWFXhCM0MUM9zJWk2iG68C/aJwxfdh/7uQbhlzR0bHtGEWU6yxDmHnoklYs9xYuSirq62t6gF76wdd+997wNopNnrba6kfIvl5ZWa94iePDzmTj59wU2U7UZq0Hux8paKnvaaxtzj4jTuEcE5OAwdxvt9H3zoGbwD2O6kh7wad39bq+I9tfLUk27DdT/gejfc46ZHDmA5uxNjStfC/YAY0bwWM977sPrGG4hX5CTNHIQeV9k9OHhvrVB8O7suzTvUsLFn5sbXoVB43xO3dsznIaGUvk+daxgWyK70TNPN4DWaWzZ2ug999Cl330cfwroCXpAGJ2EDJp6/K3VP8vNHp+OE/Bk4xjPqOWzLBIdVk5Mz7v3vu9+dxCtHu/BeWjrvVQko8DSGn/u/+bQbxpCTW8up99UKwTm5BE7bMZRwV/DgEyfdo4fGscuAF5PMVvnhHPX2zRVzkwo6oI6uNdjv91a3eueb3RTuxfG2A0IrmiycpHDP+OjFj3EzLWB0kmZtnfTzhnomalHZu3cvbr8WfovTHyrMB51mRg+5LRhada4K844FGJqFlSNBmnbyLoCnQd3MYDkURecAbLRwEm7x3t7p/vj9j8FJHsYLAVq0qnTsPMa4mBQGDcjLstXLqBOppNEahvz8cTHgyLnzmHPwu4ecc2ClqK1FzvG+937BPfjwOVwR27WSFPI0CSt35LCTV+X7v3jCncaHSEdx1WZIG+FKaaN2hAqaxDI8nZU2o7NOT824z3zmCbdtPZfA87WhWwOmsRk91B7IuKBVLuNNOXhLyo69b3IbbvjftJuD0wAEOQl6qJd3trb/PT70ySfqeEWvb++knTfkGIb8eG1qbOJnsGp1K4dWWMLF0Oqk69v6Grd68y0YWnHFKsfWPAPfKuIQKxSuOfUloXnTzU/OnuT6wS73R+99FC9P/rJWcybRgA+dOad5QnAUVlDaeOXPEC2HSLIgDZ2P+HE4xrELw+7o+WFcnSt6rxMrnx8DPXt21L37Dz/jvvzAWS0aUA/yXa1AffkxoQNHxt2jjxx3I3CQSdxMZbkXY8+l0F95QiHO0xi4iMALyhMHTriPfvKk9mHRodNgPUjQNSz7ehqcaFq7Oe3clutf6Tbd8uNwEjz5ia8IIMhJcC/qVSNnz+MWhcIChz2eGqd0AlM4Ai/bvRuvCKnVPoAfPyYIXygVKjNPu8Hb/jWeju/HlXLh3TQdafTME2783KOuc/Ve19W/HVmygCxsaDmMA5TAmuFoDTVnEBunAB4WcF4OTlwQ4aT9818+407hlfy7dq5xA6t7NDm8gCEXx8Hs5imNy4zMk3pQdvhRU/YMU9gyMoKr3mnc3+ASMrewa6MdCDiM43fVH/3GMfcH/w+GVc9M4qu3fKPi1XUOWoKBztuDudmRwxewn2oz3k1W1Md+VuqOvukAm8KotN+IbqBa7zGL53j+5/s/68bHpuEs7IWlsh1Az3trU5OjaPC4IGMkUhk/hjMcHLcMKtPnXN/Gu1x33xbRkWnV6h1wi7Vu+NgnXEsXHhKrlUu8yGOec8vq/oGB88MXuBWAV3dW7YJCdJAh1PUR6LS2t/+X0GBeh4ZRRndVmhl7ApOhf+XWbL4NS7rz3O9oyM4a8vDp/W5i+DHXOXCz6+prdBBRsUWyqfozI4rmYKJQLuZAoNB//hypIENDDOwQPXJ0zH32s0dcL6ZsmzYNYMm1HY2+jK5+Eg1/Uk7DSSN7B658MU6HuICVqXNwJp45pOJKEKpWk3E6Rgse+GGv8Y//8LD7o/d8w3V1FLXXijforCwNRrkqAL407ujTU663s+p23bARw9BZtwrPu6xECEMr2pAO0uqHo+xxv/C5R90ffeCbbie+6ci3LOYCDMiL8SQdhBXdxEF6N9FBNtOT1BbY7FetHnQ1PJw3cvyf8SCunKQIdAVt+iUDff0TeBP854ewdQpvg6/LMJd7TAQHUe8xODi4EVeW9+DKyrdMo2+r4BmnPrdt7/dgMoVpCfvsRdQ8CzZ8Zr+burDfdfbflHcQFjpp4GrYSFtJM2ex7BJakXgHAlIxz2enDEf5XGzjPQi+wOC+Tx13Rw4+jfsDfM6jW6/756S6DOOzV5jE29i5wZBb53kTizez2MuU0BPy4Z5WzGdIz0o/c3rUfebTj7v3vOdr7uFvnHfb8PJsBtWVFFHymjhQp4HeVvf5r5xxz7txwPWt63GzmAvwTYcMvJwuh8qSizriEvjJkdE4V2vHF4KPHTvj/utvfcpt3dCBG6ikTAO0wT+H55OTI0CwTvEqdPYg1awH6d2ATzb0bUUdsbdmCSAHdUMnqWCD78VTn3YtHZsAm9VrSkHzmtUDA1/96kMP7XeOm28v7SRhqwkdpYxb5O9Ad7ZOy7qltpbpiwfcllt+yrV39aMQi+k9rLCcAtfQTSpYS1cZ0tpoVjk26qyrsmaEEjwnImYbPiy5G59D4xDod373AXfdzv3urhdtcjfcuEHvi+3p6cB4vVXDLVPYjrwmkJ+vqBkdmXDHj5933/j60+7+r5xyw6NlzDXa9dNzDCnjNRbnBHgDtuT8yZ894H75l/F+rrX4DY+6jf29qg6WM1TRlaoeeg3WIFcQbZUv3Dxtwe6CCfenf/zpeBe93GSVz/SxoRjlmQt7J6CCirITSNsJ4r4gW/BM0uzUiBs99XHX2nl9oVaZNuKae/+ebXvuPHhs3yEws91zhWvOQAdhDuW969b1YGX67VIGXlLDVpK27t1uYOPNmghdtvFUOGSykIm9t0MwB7VO40w3DSKqowxJf6YavFnH1+7s2talt/n9zYcOYdh00G3BVWzbVjzRtrHH9fbBUXCTj2N0OsbExAyeWJzAnV7sGMZnys7iuWl+CGagrxXPdvC9u7YLtale1xCQ5W/FUOsi3j/1p3/yRfczP3OPq/XU3DQ+F7elv8+2eEDf0LgvR/XAy6s57kdoSMWhla3y2c4CfjPlfe/d5x755rDbil7XPs3WLDcOU9lzwLHQhs0N8otDNkFnBScBPIRzf+B2rG4dnDzvZiYOYwTUhzY9i0Wn0upaqfKXGGbdzU244KToOiGZPDoIc61MdXe/AY1iDwqG8VpbaQa9x6abMTHv6ENDWXzvEbLgh3MY1JsEoIfkvb+ZM1DvoH96zgmqSzAn65Lr5ZOQFysuBXPItRkVRKlM7z8w4r72CIyJ+QMrWjkDSUfhNzV4P6Mbv158IJQ3Azm/udZ7jTrDaDt5H75Ce+jIRfdH/+Nz7id+8m5XxBOHXN3bgHfm9uGNhzZUoaOQ2xppvZw0rQsqAGrMsBXDKN5BcObiuIap2RJ4Ky420+79cI5/+tQJt3NrJ77CZQ1fWYkzHAIE9cgJOoa7yMB+gURn1VIOwgR14f5A7hMcvPVt7sAXfwPlgYxiqYX7CaHTncePHPltkP57/DR6Il+zkM3oa4UfIQGLyEZdaut1/RtuVMO2YjdjXwAMlmbZ6r09mICVoNY4l6iMsJHiEqxksKZusTQfNgA+f8BGTifgtowNa9uxLaTD7djS5QYxceTb2LduwqOgWA3jGxHpXOyF6pcjGxW7NiGsB14M1g6046u0o+5d79rnnj5xwbXhmZoTmCMcOXteixO8+pM2OMt8pQmOwZuho1jYeAo90vELI/YsPoTQgTrwnZQzp4fd7/33+9wn9h3H9wq74Bw2b8hXr6UCjO3OdCCECrG52tyaODmn3tmJRF3giIX7BHnfbsft/1b7B/HwK6laUT68s634c9xniHR5yPYdEtcQ6D21XVt3XYdB1W8iwzbcxi+Upw4V+re83q3d8nw5i6zVwLoQQM1dOPUN7N865Dr6kkk6rY8QKoDXe3kmDhHmaYiwqNGINvImMIn0WDBYUsdMJqGBzp+lCA50GDoAJ7TsIexsaeJYRc+GQFvSwbsxTBzGl572ffqIW4+dxtu24mPEWJe5MDYBJ5nGxkFbBmeZySOLymYAyFa2sMEnJ7VCNTam8yyGpbzgMLTiPgfr86EHD7nfeeen3PGT427TOhtWeRLR6dDEwOSdnhrDYomNYCpjJ1Ah4/CTduzDOofXSt3hVg3sQN2FSXomjjHyc7Ns5yq83Ly02g0fx/Jv5wbIwFXRGtrL1nZ1feDBi1he8y0jL8F7TrFUew26sm7sr6rgXOILfPo33AxF8Pw0VncaClMvZY40PTzu5iUNBbG1WSu1VkdQBkHMUuS1MgDUJHgqYFgZSPED9bqaMB2kKBoTaT5U43LL5aV+y55Ybi5Fd+FZFa7S/fZ/f8C95hUn3L333uy2bcdrboG/gN7gHJyFD3214D6PHv7yBqPt2Mtw2VsvpfC2pGPw14LVPtbfieNn3X0fe8T91YeexLyvw63ub9N37NVwKSSGrJ9X9QtOPCfp6DUYZbUy/8DGdE4G0s0C6LhvkPsHxy886cbPf9W1tK2z+UiptK3a2v6bYPtx/Ng9NUzYbRWr4F5D2VSmWpnEO6xwte/dpMbtbUL0IgNLgADvZuF0Rx0FCmU1ZJNjAwF5eP0CQk7QyNPAEnKhAVGAIAEC5pTRKPXZDWG9cljE8y6s7t3/ldPu8/efdq9+xRb34hfv1HuqunG/iLbFdRM9Cl7EgaoMTZk1wobeiuVv3mgt4swan8LWkaOHnnZfuv+g+8hHn8TyedXdvBvLyrjQ8rEE5kfnsRDOPtnkpDmItAAjmZOgl4Mk6eZRDvPwJStsQdl64+vd4194wMqA55ow0qrCoX/sup07//qJw4c/Af6GVa2W6zdvXgu3uYveiL0v2FaCTxZvehu6x26A6FB5pZorMQeUDkEZEpEYwzdcNdg6+aRqyDEBZo3d55ngCFGyDiZKD7NTSOBcZ3Qv9dvmxKrgvIpXd4ZPfPK4+8h9R93zb+l3t9+20Q3uXOvWYkm4q7tDW0PoDFZDHIZiDsd7R5h8n8NeryNHzrqHvnbcffHBs/QCbBzl92A474FzUXh9aAr0RMRhRKAehKBcowASaXuUYj4hJouOHOYjW27+MXf0a7/r2nvxuEZlqoZ3l1IQJ+x8jphbnplTFNpSae28FXP+DfBqbN4tFTi86unfccXDK2SiXHi1UI56cCrmS7TwxCmW6x1IZxihmx0gl4VTzxLK1GyYxRYwhxMsIJdmOT8rYWHhYR3mIwxHjl50Dzx0XtWwCbANGzqxhaYDN11btUWdS+CTeIb87PkJ9/TTuD+EnctcAVw/0KKbpqwX3h2n+RXC2SfnPmWEbDnRQcTAx4atPVmbQpeGcImWYjQaHc261ZtuccOnvhPbn76ModZ6bEWZxVaU0u14avbfHTzy5O8OoRfZh4m7mHBowWMmt/LJLfRCcPNyS6m9y3X2cDsWusNAdblnWof9spUGMrPCR5EEAW8nn/BIOVd9486TGCVgOf8SNE8ow3oHwqUAhg/4cPaZflufeE+HBsD8BM+SDG7lCBwNHT3MseNj7gmsfLHRaw8bzMZXa3ZgCZzL4Fz1Y6CjcSjFQMvWh7QNGB5HRWIqx2IOYjjfkBK85ZMA5o0ybz6qsXnPq9yB0/8McZiwIwOWB43zP+zZuPEv9j3zzBkIUYulMCxeFfRGMHZDnH+0dV/nWtvxHbnQsOfNch4ks1DDR+Y8Jw4XijsndwMBmzdDOAaCcM5LErQ5Kk9IiQuka2B8FgJSW6CDkDNwMk8T8fVKq/GxIi6Fb1rX7jZiB8Ea7HPj/SHOo0mnJXAuBYbgo3ZK4MJn6RiLEda0JXKP3TKjENi+uNSY8ATUXGcbas1qg+O63T/qZsafgO5tmLBz13pxM+4Q/1vyDtlcRGI4s9pBz+IHC6oVvBqzZwuuDJicyVrU4nKCdYPS3jsGHUQiQ4FibURAzChAIoCRZkDADByQAZClFfN5yegG8I5hdFbWXG7fhonMZnlbG5zzDW5X0U/3j+x+EOFm3oRf1ZVPNxg0oBsQYo5QNuosMJ4xmhNl6Yxu7phJwHMy217oWtq3oR/AnAJzC/YiaLU/iU95rNtnQyxlTJfcQXHwj0KtPO7aOgcQx2Q+NmBiLzPAw00BLvtxwt9YmBxEiQCxc9Z4zRzSJJCkagGWghVPASltiOfwuUSg+LY5p9VtlsDR/r0Ngn3CGeAkSiIl62BiboAldZkQZNDAgCYrBzEnyTsL8uMoh8HQFr/UUSOlMp5GHHDrdr3OzY4fhn+0FtSLFAoba+Xy270Irmi5IlRZ7XuLAnusFtyer1fkUnnOhWcxNbQq4BFd7MJsNIDn9PbI8GRsIlUwQ0RaeT5pAwPOCR0TljS8Uh4fIOK2RJNMvw1A0TtgBG8b2cQSgkXziCSmUvK8oTyJnfwx5hNIURuZqABMzkDGYRW9gD/PgIaue2wSsBgPYWcAKWjsqzfuda3dg2qbyKdIP8Ds9O1bt2IfjO9FCOwyjciFwRcmMZQwr97GcIkj5cEA3M1LB8FemOjx4JT8aJ0kNx9NIM2NmBIETQBLwYp7gMUt4V3GtEiIst4qCPx2OGfWoPHMQmaarPQBGs4BH9Jehq/PTCLwgSQTtigY1ymbXbA5yrFRSSp4oXF71oQPAK7Z/io3O3GEvQh9oYK8buwstb3OS9KqtrqSKHpxzhjZmkXMULwPgg+40FFCl1hnNCU9zE4h4c/RypAoUKDK6ALE9EBKAI+P/ImWHpWRBUDgSWiftdFgTxYwNGsrf0jR4NEiiCQpg0dkYqQmsHgtVE4JbZTumdL8QJZzDvUmQTi/2YKLbuRPZV46bs28htdX3YSnLPEsj6YAxlctVH/YS6hxDsKbIzGkV/kIvOwICoOM+ZoWbp+XbPZvPqioqeUEDwZgZWQhjUdoMyBgKVgGFMCb0ufXAPdCjTeVEHN71kUy06O83kYqZNPiJ8CUFoyWNLxPQQxidXRmQKPL8HmopcRuctFe+KcQh1tMoelmBTD8Yo6QyycW2/FmlL5Nr8VrhNCLFFrw9CHnNYVXDiIggjvteIeXyeWNQqxjz0wq46wZG/ayjiiAORy6Q64WqEA0EH51hcsMG1CZIZV3pM8bPvIxLyP0R+ahqJ2axj0QFCbe0mncJDwLj4k9aaBgCYv7VGpT0UQqo8+SmYGawTJsfbUbZh4eOQcas4XgFGRgD9J84ccTX/LEITV2wLt+zEUq/M4l3tLIYRa2n/SVqoVXUwC/gXVS3RiXY/GMxAyewrIr/SXlL4yAwyp6Hifp5p1ZZUBCzja5hImP9VhPG3JvwpMJBVL4QFR/ptAMZlFLp/GQ1bPmjML5Uso++bi3R6ShjbwZaQDFPQ0SipmxQkpEqf2yuV3G5xkpMeOLeSZ08I3Yg3hqndimfL5KX8aBfseJflfvZte26jrEJ9GLQC4CcNqfyHv3h6kAnKJabFnrpsefxg1DfGeDXdgVBcrkfh2+ZoZfVeIQix6fBm8IX9BQbTKZWd4T5+nq8ZEvNTBYPJdkiMbLtJNhPSjmY6p4XB6ZKv6tG482siIkVsgaaq50RiFrpvbwddaUNAEGboJSlgiPkTwT64vtB59Xo4dYiD2JOU3meAnvoqJsoxXXhhvjq9be6srTR9lWtZpVK9Tu2rVrFx5DrLmvmwI1fJF9lZsafcLNTnPPPR2kmfYL1yA2XHhlDa9r0VNdEunlNhPfBNbUsKl24Il5xZgJEtzL1CkXb6SRpIRQeacKLLz41xwlG1QocWM5vWGodUoHcOASKh4IN1oDBX5QG4JgyfIRO5ErwUfZaZ6eUic4RehBwtngfpJumaUci4qTnY919OC5Es4C+EY6c0y3tVgp3sw7+V9SiWrc+duKycoZNzF2Sl3NZecdDMAzhlUqWHVKkyJdDgCPhgkxn1kOHuSwyEGZcK4ztBmddCT2IcaVIYAeEPMiyGDKN6E3cMCRLCKD9G+hM0oX9Uc5+K/i+DL5kwoEhCVxtH8rp+KGIcJiIQ2SJNrMMDH7lLQZTwoL8dBz6Ayg4HQQf6OwWYYLhKlzgnLcf1jER08xC+cbUPhcFL6hVrmlWCqXH4DxzptHVGr8jMfomQMamwW9FphXnswXRhXDcR2eBKvxG4L1j0gGI6TcTWApKK1sg4ejp2paycDpP6Nhlkr52mvqJMIZj+Xr+VN9r+k4nSMoiIj9h5I32KSO1OgE9JhMmDceT4Er5GXptJ5MA8CFyugFD2AjitJ8EqcwxkqH/YhzyC59Aj7jWHAMrHS01o5VuGnILfB8qTbvnyNUai8oPn7s2Ek4x2f5mkcMgaotHbvd8Ml/clPjfK28PRm24MzqCGUgb1CO9XgvhPcqDU5bZYZSLNCmcEOY5LRyQl5BBNOIR5mgNVR69GIS+Z6NVhJSXDEfL0Moj+cp4k3etXmE7rSBqU2lw7/FeSQ+2EJxX5LIZDxklBgvy+KWEMYjPVpCVMf14pinhzES4zEWIAGJMy60vNYKk16xEU/zCGIXf6YcPFCF/Yft3Vuwof0i9yUCiKyLhUG5JN708DcUzAw5i6+V8YrN4w/Gsd/iMzWOWDAvgN7ZNKj0dZgUpnioSkNkxgHc4yUh5QPAUJ6HKY9PK5Z8eToCPCEwjKV5WBrHSEMJ11CAXplq0lZpxlRSqW4pA1kZQ9yoSCRIOCHh6TLhkcZ4jdO4wjHkE+QlaU8eIMwo0cTyBSybe7CnCNT0Glx0U11Clos+Y7kXnUFbJ78wOMz80IUo4y1ykPGpqQ9jN+MB9CJ8gKTaii3vZw79pRs5exDPF3Nn7+WN9aS8CsCCYZQFB9Er7pSSNRKD5I2vlGyRmgw2CfaBjMw4oPG0FB058sTKlVj+M8Q8PJ2JMCSPpr9RitqA4oxQ8RoPYVc30A6x9FAFevFf6vHg0zyHkNIbIbAZPsY9TjI875z2j7Qhb2OIUk2NIKXujKQII7V6ERYicxQvj/mwaVnz8nIu40QxuJpzH6Kauq7stKXbQAcpnTp1CstW7r/Z/RC8dxue2dq53T318J+6seHj6H74Wk0yUOlE8QZdjIZGtcKw+5qKheD7tUJIpSjuAWk8ywvQFCE9gqTsbCKMljoogNbHICPEjYb4ACHO0gRGDsPHpFELbQfjoTikL20fkS/xwfK1/INoKaRieI0NQXBmDZUzK5rFIj6l9fYQhWeIdHmJ+ZTnU64Jc+SlzVKVs5TFItJ7gD8ZWKOgwL0EZz5Xzz2DFOVl12r8dJXe5FA4dPjwn2Bv/+eKJdxaxJds+QZt3gs5+OV34dU93wRPEY7SCk8LW7dQOEoLRoDXEVfC9xq44VFv5h4/Cxh6H2YKfBXfc0hMAiD5cbIDTkrEdA6VkjHueaxR+nRgj0kPgNyIinFAAjpGCPC01MXrQ4iV1Qv2NELbgQgFYwu8PoOAXLKzyc87BYUHeCiaz19glcI0MCVJHXksltB7bGYDkgYOCiSHPymeAgzjIZE2Y1AsO3i5GT5w4iynCF2EBjwg41QA7VC7M8KTr4EnE7u4GNtvyMdyBT8GXhaIqdVKhR9D//ElLHH1o4FXiqWOUq2G79x9+Tdc/7Y34vsgt7suvIir1NqhMRvfby2joYD8bsjs7JSbnsTnvkZOutGz+93k8NfwAjq8bwk9UqHQBQeZRJwFwQ83gNJ7QKy+0IWSQkMxKCy4CAOFsMo2lIcyrXCgAW18nFbZeLmgsWfYVVLFqUe4EUXprA17EtfyAiDqwbigJKP9/GocpZNV1xxaUSFcgZgQA6nE5g9MLSJAhv034TH5eXwK8/HASTuEuGeyNI4eESlUVx4c4xldppSX4GkoPosGacYXUiTwXNImpMQbD0KhPu2cRZiGjZdoDhL04CKSz4ogNsdycBBOMlqefPLJA3gFytvwkNh9Nh/hJ5mKLW2rrnejz3zcXTj6Ede+ag9+g3gb32p0Sdili0FbZRYP7E+exl3449g6fJTa42mtNa7Yug6W8vtlCu1wkAnRW96mAw0TGqkYadloEUFwMFqeUwfIHIMVAjniy9OQFXdFVVoQ5ZyE+Vj+zAemAZ0omR0ZhSdYgJgmzvzDeIwacbIwkUWUIjSIFM5DL//k9cmfLF8KjXAfEcziGQQx+zcGIVh+H3yZDWxQYTMCmtN4eQw2ysXBkdBExcgWQpQHAOKZBhaj7WVTHnLtAotJ2iFOAWb1IHKxZ3JT/zL2IfKOBLVgW4LkkeAghJaH0K734f1Au7ZvfzVWs/4aw601eHtFhTtxW9p3YFcwbp5UptzEua+4MTyeSwnUrYDGX2jphcN0w3mupyzkV0EOfmsJC4mbkOpB6KWh44plQ0Q9Co0hdamiNczYSC0vZep7FGXOGvCGi+LAnToS9ZzfSSjJdDAnYRp6SDZzpE6AMc04UYIAowhhASLKQOA5gTMR4rJDAyDBhajJDCmfaTh5cEKDaNbAUnQKFZGQESoRMQUhJtPAIY6zRcELWkN6OT4vnjyviCM94fo3QtAYKhwD0tJpPma4YPDEZozi4hwkmeDLPLKNoa3OTmEFq9SFeFUtDL5yLAzqJHmfnGSo5cmjR/8FT7LfiVb+T/g6Twnfx8BQq1zAKhQeKCmVi21rKy2de6qtXddVW3EudWytFkur4A2FMmiwajyTOYcko+B4aKrCNWa9/ofGojHMMN4sgTJaUvBYWUZLoow+mMdDouGNylgDLuRJATF3xb0aJpnk+JFCnEobMB4pmAkjNdoAE9wogxSlcBBJRCWAgGg4ZzyZ+CjAcvdJXgG9xtIrZJaDeiHGwiOCTvVlDWCjEdaTE0MxnoIRRAPSyzGoieZR/55GemYEgVNiPFh5pAB/ATRnCRxsurjx7HOJrIuO4CIH+ZXytJsaO45JRz8vhHh3L53GHc05CGXvc3olfMuBo0efPHjk8GvhS2+FSp+Aw07h/UHwFWyad1Xs+62At4xfFbcY8cMcHq+nxFsq+ZLKwjS7kExXKoE9LpUxdYt2dQ7YUGCcFfVpb/QcKBojVJLJMNKMz8eADHQBF02PiMHiERHGrYp9QimjENIOOoqOMrwcakKY/gQXgGAEkxzOkS7Qz3MOPNk5ExecgvJi8DqFHA2e6Wm0TJsc08XiBEY+Xy5BCFRAKsY9JAJSXIgbsWR4CfGU8Jn6XnAKN0RksSG0JdWBkLZOn0i80Aj4ee9vdvoiXnD9GEZB7EGC0OpX0yFWKpKuKec5dOTQhxH/8J7t22+GX70UQ5U70MAHAeuHkl0QNoN78yM4n0fPdAgT/Eew7fEAvOSvMKzYAzhzAwtvQI7ivUkYrrlVANFschUVUn0aS5sOtciqq4eJABPwGSwdRhnY00UaMYAF+WgIBI1Bkg63RIE8bIiFFK8cPHldDE8IYFRSWCYYY5pww5uuAgHnYf4kOk8vCmM14rmOCW/INwcKfAIaJo9HygOiPuQRLIF4/SNvTGf8ZArFDEKtak2JFGfxkHGUCraQp8FCSrKjXl56YDfx/hiMRiQrgFPnRH6OdmEJcaNtjo+exFx6Bi+3xupYAd82VBaFB+dyEEpn7gxc160ePHoUa72Ovz/Dj4EOJBzOSW9BlHPXDe4c96orK5LXqhcwD8HddJZT0mGi2DjRJAHPTBDch2ZEA6bGofF6iTJs0viNxJCqPMmmNpCR0NGm0UmENj0YDfMM+YJyJrtpRR7RqHIYQxqo4ChsAEF/I8ylQGf8wiVRpRd7UA0aU16UT8VTglU00cKnKcWiGa2oYhKphFb0af4xXkcHnkxEyNeAGTyhCRby8kij+vD2l7GDhdkW9J4DUVGlywrslbgCO3r6MVdqx1e3amXuNGFNH60Viw+pl7iEZDZ+alEcwiQeZzoFa55NnHf+iGe6OISPI/LHOJrK+bR56BqNgld4LwTSYpmjCZkFMyJSUTsp7o0bDZfRiMPTiD+JMyMlJQ7xiEOE/8J7CiEDvZBGE3QSgxKIhT9Lm2DKMX6LmXzhKDv8KGexIfAm55hHlBXyAIBR/yd0IBbMM1CWTzNmZTCcSiGgEB4VAUg3iwMmsMcpGeJmF0n3IBErntFY7skx5OMvTNbMAh6tK6yQBtAizywHt5hMXHzGjT59HxaiNqJVV/niBjTo2r9gVTe3inUp8dV9/rrvCdP2z1LW8EkrOg3hSNfGdMWHFilhZXbc2Fl4KCJKnERDKSFCrmRYRLjQno8mz5aHmV1GbyReGBK8rjMrSpA2JDVpPn9RWAakMWKjoRjGPL+ddJR+QpMiltJDRGK5UEIMQjO/hYUgv5HaYxICi9YD6qBKJjAaywdaSmZRWqlok0iT0se48UVJSvqUoYzd02f5pHmErIzPY8QXbeXrJdXFRPpMImGgmP/8/7d3pjGWHdd9v2/p2ZceLiMuItkkRyRFiV5ES0psIWrACYwEoJQAVoggSILERpAE+ZLNH7J8SIDAcOLE+ZZ8UeIARmIrsaMYsmMocdSyQ0oKQxIWRVoc9cz0cJ/hLD2cmV7fkt//nNrue697Zrrf6xZpVfe7t+rUqVOnTp1T261b19QPI3v37DdYvaLdFzE2uQcxfEmpb6YH2SgXlST+SpzIJi+3Z6cC6/AGNxAfvSUhwJgIGTk8db+HQjPmcUOCVhr+DDWkLvwWG9KkPMp4/EO9SeIp8iUk+7e8ikDg3DgIcV4UY0j5Wt7cRcB+2RchG92HMCO9kMBvnrfhJkKRn5CjwSO2YPiNL2M/hN0fYouE7t2s5xDlkMBpRVLKx1zEiOGIrUjjhluBk9EShdDKOTm0zOosliFqncfe4Ep+zF+0g/fS2y9Xl3i+p13sfLZNvYc2Kn7j1MLC70AEjR2/M1Yp36I8jCFlGfiANA9xKARLvTa5clCaC4B2w/mIhAEtyS7PSSBvvQdACRp/nJAburBDy+OsBF6Ebeliaw4c1MSPkYOe7qRXKkfQPfcoFnIkec3FuUoMCz+NEhwjR92Cz7IZlT5FuCcFhSshBJd8NRjQFCFEybCeojSMofiU3BPVcCEUoJZHDAmY/Y5hCPVsAy+GbH590DM7aoR2locQVA/rqHpoiLN6CvWdcaNPZZM6atvU3mrx/Mnq9W//YrXn0MPMj/mKFUxoeAXOL4QULM6O2c1GHqv+O65UIQNjjG9ir19lUlTM6aN8hFYKVEGXpBEYFKglC2lLPEtVRMpbVpr8IZnlYFkkfDz6N5yMZXyFdA41JCEG3pTM/5yAkxYt+6XYiLW1uxNT3iV9DxS5h3jhKS6jWzjBQgpHMSyDWFiXkDbgi45gOUi8/W+AC2KgEPCcggM9JiAMgEIc0PrgfMRwtbFeLb33tq2MaldHq72HoZJ/9i3klm9q5OgP/NxphlWvPVedee6fMTGfAcfKsK59iKzE/tf5hYX/DlC20R1/DzIL2Tl+fMUrFtVCMNHgYWFv7RJzKw6FaOpAR5+ySCFluRHPbEw1IWtWutBDmN/sXHFeLJ+m1PEUk3sSUbVWQeTMr1oWb56nc+m9iWEGHKNi+cT+I2pHnqOAKj7NOf9i1TmzpB5lKB7vgO1cA7+DJAwceYkcCAlYBlsqK32CuScVIyAbNAOh4TLzbCXfQNsBhBPBAheY/4MVPYGOoUe/BcDIODGffCeuqD/pTrN9oDr7wi/w/csfqw7f+dHq4JF7eenpdl7R2G/boJphY63o6iASnbVwnX2Cl974v9XV879Hz3EC8uigbc5tTrGN/bVes/rbnqdfx28gc06YsizKpz7LVUMFZKNwZxGLX2HDoz+QiUqrQpgiSkYksDQS+oZGAnGQwNh8uCUmwmTfyVkKQb1SoZ/4I2OLTeMhz8AqDm/EDNphuMHqiFNKEfWbsM3rxMuIiGD3FF2DFmQG4CmY8kmenLWQSoVVMMYmdPdktBRRV3YjleOMkgUDjFuiHfJN2BZnQCGJUrwVfse2mJQQzMKvlHJJVvJYPO9w7HuQzxicrc5d4mgFdL29905eneUYn313slFWz9v0eGGFvYIX+JjsmarDnsH2/tttS5TOi8at8+xOW9cv80r6U6+eOXMOv1ZqbZgzdgOZC6zzcP1CX4u93lWRH87Gihdtc2O1nxjvQDyOAqfxP9Lx+QhRktSGRhLjQBmBJ1YkR++BzBcEX/RYyks4ZqnyKUuvCp/LCEKYKMPEmwzFkXU1ozY8C8nntOLNwU43oNgtZFWCLK86QKFAbyCiBpUMBpzxXAN7wK75Yqk86PFOhtQp6B4PByA3l17INMjSicUYQwIUwpY0+gMdJUhe4gKOpQmNlktU8qvLUM9CGvQke6YeIRU11l+3g0fWry8wL9E6EdvhGbk0WofYPHuIj/0cg/46+zz0kXb2UGEc7I06w16Qz8+fPv3SbDXbDrtJxJU91zDPGC9WvGbVucwREDIBjeUEs5JJkbtr+uqunISBuoUWXlijjQRUUkuso4dboeWXZIMxiZYpckgnDS4V3od14sEF7kME4QgmdrkG7S3TKSpUryW1PAw5XeRxCk7Mwroko0kQPJ5VCRnpH4nmmjQCP3BYS+QBuyZ48lDW7DeChDMEn/8TFaAWDn4lSPiO6DHuV5qMGf0FJOVdjxPYZZ9xU/7GZLjQdbChQzWnFN1mc1/Vb+2nOVblGlhqRRH5OlZvhdN76DM03yADvtL7H1tra39//q23Lgwah6iPvQcJLKt/uoxfDxL3RpjdGWZ11t4rKkScR+WlMJJFMhjiUDJTLCmrRd+ckSgviTsalIWUjyICfa8X9SYG9BRWF+JHMK+YaChKZ2BFOTOWRwzW4gRMFW8YgRr+lJ/DN70O0NgIV2U1F24ZL5YhQuoIQ4ahEiWUMm0CWrlSyDwxdwL+T2bRE+MEMuQiTlgZZr4YjOzqHmA2SjC6WdIFmpZo2QjYaAtdOqPseE7OBXz756LHHNoW1e/9Dgn+3ZkzZ34/0GiVPUekOwkDseLwTau3GMix1NvQB0JDftybRzjBbhEmi2U5K4yUUngUjVv0K5CNRNFW9KT4ErCpvSeS+IhzOhKKxQfjStWRDFJshfyU0q0CmAtXcaWhqBcSZbncq1hISVKcG6ChOW/uzVcjEillcPYVcYVX5YmuBOeMh2NNFAaupZCSRORwj2WOYOL9H0DAtXDwCw0aOWSRIex+Q9FFLuRnKUKi7E8AIQb0APNQuGpAgpMccpIuwyS+ENX7V+z/+wqrUH+CqBnGLfoA4SH8dCT9Ncp7ER5Otar2883e2rfsNB8jtvF2KUVPwkAs23a7vdzv6KURMWrFQbsYD9L9ddc4/5el3nisUBz/lz2J5DlsJKJkERDMvYP5JTWLU2YuQbc3NyhxYIakKKUe7E0MTEqLt0vAU8SAoShGRhfcKGOJcaYECmT0GGV3gYPueN4MDGrr/SFdogOy/SmRiyIQJxBcpOfBDFd4lGGITsZyX6YRYgwnY4npFArIHjZE5TQ6PiSy2ERAfBl3ugzxmNA0Cx9wNIYe3W+8fnLBeoPYI0RME3EMFHcN/RVXPHMoYoNXSON2xvD8/Pwqub89SNxenFpn0yLLbtkwIhZiqwlK8CAeIoIvStOrQEB+irV4C5svhN3vlPCnoKew/PwiFMvfZO6MGMyoK/8BmBMTPKYzTFEZ+A0EQ7TT02EBbfvJsLudtWpt9Vq1snylWl5eTL+VpSscLH6t6qyz2ZPTKmk0WdP3MwI0thYt52M47wgf4j+msVJGprwsqQyAjXYUnKFJdsGJOM4hQs4h86d4IRW47vWUIY2lTHCFQhLSWTthBlJHIGRR+oCg8GdmZnTCiFahDM5dCeRvznqHEONkbZsaB/ET60FkeHqb/rxabdaXQ3ur4nCQdeeyLfW2K76may6WQQFVtFpsh0mm0S8Bj1zdsmTIgDSeCr8n9LD8cnQPhiGakpnE5hBugliEEC2daBhKvgAKtIycRRgNLu6IDqkiBHKeJmLHCJ2Psb66XF1771x19crb1fWr59h2rR8Pv7TruWwxSawed9/BO6pDR+7md7w6yPkAh47ezff2psGV3FTfOZeS15inuCuKADiUx/gWVggHr0tUAZzycJ8CCTVBLTKESv8gbiICbsAL5J1uysOgpOZPdVfKI+IAN6xGw1Z+ZhYWOgvDiq9c+nPSyVt0kxpiGdc0dO+2MBXrBkNBbEjYu0pLuMzHS0ATy9xUmd6jqAQSXN1IpGSm1Koko07IpIvgCJtKu8cEGnGNti44w48CBUv/hmfRqgY8BrOLUihoMF08qdMysNeuvAXvFmOwdDEiRgGQaDuNc2+8VJ357v+qFi98L6EqRvvm7NQOw1NioBwU0OPbzFcvXua8sozfBnfm8T9bffjBT9sp5foozEgnudUiElMBXsTirWGHciaMWtiQjXJKY4gxNBCfidyEcUSGrWZgqt4AeKZUuvhpVJwvZc+oUw4x9XbuEzEQlssarAjAc+90w3q7QRZ10IN29VrBUuRmRiLUvARMEustpN4WEYwGQbr1GK6k5o238nFld6NSeldSVaPjEHaPKCozp+1oSpAq1ED5ImziLJX504U8UnIDCkeV3axeP/Vs9Ycv/OdKDcg+viwsp/1A3guIqwF6EFK3rFc39TxJvYmMSIfxzb/05erS+fnqiU/9RYzkYKBBAngaoKJclJXd3Fdg4B1KUaNhCCF5SJduyWPELVTIxOgGFMvFEZxW4TfAwCXJdkQPQqNqtdboNsxABpJuOzgRA8E4rMg86n9LHrpHHRAUHArS2M9KVlzqzTFCuCUjUXWaEpKLMjIjkAKKEFdEZ2BBQmUJX640FOGIQDYUDxvcDIVwMJ6A6fkpjQBy5kkhh9WUSyB90WjKhlEyjn18/qvXXWY4FZ8LebKNrs4nXS6e8BQY1AZDrburS+e+U51/86Xqvof/OFMUx8x0QljpEjD7jF4RYyhRXhG/Fs70RDFRKnGCX8m3YxxWbzE760EiQ/U7fUvcPZ7YqWNsLTQRA4EVYxLbfoNhllRVjV9wRDW0afE9KrJT8ZJ7FnDEMOHS+pq+IV4pqbcTRjn1JMIH143E/VIYZSjEem+iGCJEWzddcKMMRQwZbqBjhXGinmrQWETIkeQLOOaNIQtEnVlesl04xot9mi6ibuner9Z5riR3/dq7zO00VxXjxpDA5s2h7BNKod4B1+MzliEFMgGabsnjmcRrLKiFY3rH9ahhv2Uw4iLMxKMNH6VKnj54rLDNZtjOO4LGdkCF4m6HzOi0PCU8T+Fi1xekQvXpjCwqtatNi2YFqcAFIVImcPQHADfvdmNYItSfnCKdjEPqYYvSxYgnDA+HdE6FOOEkmCUi6HCLMpDDHdGRI9hxIn7AA7hnj395O8+5nN+tXn0rEU9kOcLfhmAMRSJ/KoP+En+JjQgPuYYEEdPwDRZTKgZntyJtCiuKgNIYGqGQPsSEqBAf0hnyphchxjQj5iCKZfbe6zbDm3ibErvlyEkZiJXo8NLSGxjA+boiEKVNi5xw0uEkRm/tNuJbQo5x7rdKSAKLogdHeCA7OtdQOQYW1D2GGLFiGkVmPOEq5E4xXtGCR6juClisZ+XBkDYFAp7w5VjGpYU/cPh4dffMT1TLSxerqb3HEJFWHrfq1Lv6QODYnSeMF1YNIRZ/ga4FA79lQUxOgnsKuwbZKWWKCQhOISCHfBTlQpAnpDFgChnZcDHU6LcEG140b+Qvlod9Vpp/GbNlGs635ZsecYhVxmzbPykDMca+fe7cEtX3ZuAyiIybFKK7hIFw0qKV1oc7o0sTBaRY0vq/+xMokLawU3RIQg75hLDdhOdYdisq26CmJCE+5GYpIlxRKdoDTpErwfhznIisCD3DaFcf+fifru689xN8zes8y97a3ayD9/a7AqgcN+Eazb3sXp3G0C5Uj3/qL1dHpu9h2MqLP2GeFcslBfO/QNTYcSYjZy5YwRwnpUgIBQXDUTigq7DBGTQFHcdpOjApe0ywyd1HuCEX3WwUNUJlOSG912Zp1F3KfRPSNx01yTmISqLFydew7h/Pz0LEG0Xvr9pKlr58myp0E7YlWMej/PavllOyEC39c8Frc4dQYbUJPDFpbqJ8wpxC8xk5Tyef0xmaoxiSVZkwHC/cLK38Hp3jos8TCAMHH/Qi+nDkx558ujp/98erNxae5SzjeYttc+JYe9/t5td7M7ayZTmKI2XAtbUXY9pbLfOpvIqHik985q9Xd93zBDsUeHZiOEExjUpxqSlyhMNcwV9KmWAJEvA8wq41ekBSGtEmnSPFjEJPkII39lBcM27oqK5t524oX0wsnSB6udPhVMIJuEkZSDXLxHwOA6GMJ8U3k2FpuLwqLcXUUu+1qkuLN0VlF9XgOCOu2UgUKYFBD8E5Va5IangCL1zlp0j3b8VQLGWhEKksRCTejb5y83zKm/ntAhIIWqBo8iT8ngeerI7f93Em2OerC++8Wr298K1q5er5hK5WpsXDDp22L2PpdrpIzkcTd374yeqRH/18dejwXbwTwa4ek29gIlIoeK7HECoAg2UoShXwHDldB9OmcKBk4QS8deMI/OeHg9BSD6IhVnbKgKrtL02vrq69luFj803MQCKHtOKnpDDco3l4lMrLs5AOWyumeD+YQgJ31YppR91lJMJzYvjRdoNs2JuICpUWcr9ZQ7E8RDhqEaxFUxQ0rX4pIFeUzpLFdB5wHKGlMoogjQR/LeYQx47NVLfdcaJ6+PE/xZDpMkvB56uri2+yfHuyun75LDugr9tLZtN3P8TQ7Inq9rseq44e+zA606ETuYzehHlMYRDKtJ49oQLg3gBI8GQqATdFeNKCvmHmaMvNgvni1VpmKqZuxcVnH7prDlIuiAY6yPTa1Ic/vFad07tO43UTM5A59F+sYu8LKLUa7TwTlZC1vKt5iJ2TpS0nNzYO0XNH1YiEKaXVBmHS36A3UVofdpkvKAAmY1kH9feA0XLKgTODR4jTcV7CFYaGSlAYTcQt1C+AtBUHQ1lZsrD2Vx08eLw6cvTe6m56F51lrF5WQ1Ht2dK3V3TvcQrg6jXezuys25xGAsnc5dzMNxBRw0xxBdRgKWLIMETTsBOKe1QnQajywFJCsPCtX2ybkiUTLX/2U5eyhZrVxeeff972YinbW89n4xQTM5DIKG9q8Z5jVwv1RwOMMlEGTnuvOtdZ1WEuQtfZsrceb61sXgEb9SbKTf2F8tJ/EGxUJJTXIcRbttlQSClb01WXZEAWiJTKyjc065scJV4DTsg5QgfuHssrPAbn9eiqe52HqLQvOn1DE3oNxeTvYQwde7DI8jhGpV5Dv0K1oRHLU8+mhmNl8/hheI50X52e4WcUyy+LIkds3zgCf3o4KBHRQFgPYkOslA+tkslP8w8BFUiR+LftagO6bVMbQeDUqVNv09IvhAFWYJ6bliaZV+koUu1gHdHYjqA2CkSVpRoSeYWjlHJ21gKVsgPJYQVuTmiYUgb9hUBAjFCLsSiPF17xS4nqycVR/RfoFfzIWGQYZhQoyDrfrdBO3vXVJRoUVqmI1+kdrg5FnoF/p1/yKZwiYwLxzyRqcREhoiqNfobh+EVYEfZn8bo4oqHoMhZHMxH2X9kWHNuw6w2KyMdcqMe4xJsjx5L/5HbzRv5lgOr6vouB/HB9JYuWr8dp7/Qg6/z29P3h2VbL5UZS9iYSIPIaHHZJrAKbdpFbqEwfWQlKfJS8IxJ0gEnfvLEeCOBN6Ma8x3kPJEA91lDKSyRVwCxFkUyGEro0JzeggI5aJIi0aqBYihBpcRkh+YZoE5MildYDGS1Heh3EzMdz19DSHKMMvW+u98sjD7bw4yG9vSo3QpoesdXrRHuQ2TSj6r8qBmOBjFm6DH2Yp89n2dQq+sFf2y0fSpBrjmy8ch2kigyVKTDAmspYtMMCVkhvyJGUUchYigtk472GETHjPaOTyl1MN3iP8dyNV+JVjkipvBvVwfShfBlPhOIveiJIhMMv5GvpPMMEEXZGK2hYUoXH61Ru9SAaffjXpOI0o54Pse8IMvt+M5A5lz/jx8Z3VAAbM5hHFwmUiTob9WQcHYZaWx9mJaLmcYWKFab76IoVC9lQAr6hC18qEgsgsoasBA5MN+HlvzI+EYiElDYAc4ob+2KajWk73Tol8YyzKC61vCM4wIUTnNGIZTSYEUhkEi/EGVqiGymM8w43YYhlH+zUus8IJQF6yXOdHWfmRmuSk3RlEETfegUj0FMs1nMNhtFrfsVnd9fYuMeEc13vh/Cd6nE6KbkaFZeps2KrXYKmMRC9FlEhVuhK4WxY+hBnoBjj2LF0lkgpnBSeEO9UIjUPpaiQR8DZ/JYSDVAeSJXQkichJEgoU4owj8wCl5ByIMNzpJPIYSMx9ot6DfaUaYjFzotRmzr16EDZcgtDrLmxc7EjBrLSWzm9rz31Gtx/BKWVZF2Vmpy0yOu3egDUYZil5UzfeDdO4asVktxGG0qeoziOlMTUBQ5dhf0aNSiQ8iIoCY6qdE+4eSCk41YDeyTX0dAUfSNPSp48tRQZii8HBnBGxTlytqN6Yq++GpmJBKT6fByTIRYNKROBvL0/8wNK0/jp994VE3MblnTrLE50DgJbKk3zjTfeYJWh8bKNJctCqGXgXIc+S5dSynX2ZnmjkIWw9aINppShRGNRnPLgF2CuEAEWogWzNMZdPc6szhECTqKo1LiAH3BK/OzPaBG9fhcDwtF94JcQU04B4uXM+OIlO8nZ/oxehFsmAe5ZZaqO47IT3s45P/mGHkRF187v+kNCMaNprXZrhPcHhDleN2kDqWZDqSjIC2K9NlG3jqTD1verGEazWltj86Lt+afIE3OuQKrw7OQXnKt+JmeHGU7yjhJXiEyJM33RiUlH3ZXTZj+P3YiGU7dyFHkbyVwwL5f4AMdxQ5Yhb6NCRiIRLhHBgikd0J11PCRMrw9jJBxXa7uWxWfh0JRlupH4CH0gtkDconfSQ6zc7TX6z1kllHu7BdC7IavMsQ7fb0OsdZ6s630Jq8wtFupmk+U86my76kUAABiWSURBVMMv6Y4tEYuQLROrsnwhQQ807TmEHtIxDrBZiQ+FLVtNbaR05uwW/A6pXTeOqaHdUqCe92DSnKPVhUVnWMT2uGF4jJ/8XXlz6iFDbirADLdvx4hqM0bmy0Yb/f7ivtXVaCBjZ23iBgLHmH9VrXW7397bbGm14TZ+KqVKjpLp5amLtBB0oSjdKseSTnE69846ta7KMRqK/KEijFPe48BArrKhUPatitHJ4Tp6x550awuInnhzF0y9YfqJVHIxnwgIeUgUt+CSEcQ0kUwMp3uOMF8KJk/GrCMk+O54TDV4Z0ibE7WewzMQehB7uJwZEsdURePi1LlzGn9NxO2EgZjoX3/99bdOzDz4EqrzWfYeyWhoDohCsfqdS8zTl/hWwzHbm6Ul36kpzlfNzdxECj9MtFTgAWOBl2gcSieD8RaOUgQ+ZTjRMKLxlIZjxmQGJgNCCTT7TA5ZmKR0y/4UfVOeQABc8+VghAxRibwPRewywPanIWMdcGETdE5od3mlQvFs15ZH3nzej7hVK5Mix8X+ThiIeFU+NAf9Z9GMz/rSRGw11VowD+E40tY+P91jhW9Wt9s6/2s3Xd1YfNu15O98m4Inf51Prd3zfgJAHoQWxqO0ZjgYhoxF52KZ0aj3sZ5HPZKMRgYkmrp4nUc6MaxYuaQRyePwIiYC7O7sDCHXcHY7INnqxS+bjyIXfy+GOUhTI4vIu1osgr0uww9zEpzeyR2r2ykDsVLxfcRnrHUcmIc0OMSht/Ju1Wceoijt8NWKls9F1Nm4Uo615DdNzCtEPUaunBslVk/iPPs9VioUZDyafOplqPUIV1uoYRuGYcM2H7p57+N+9Uz2QRjo6i8aj3wmU2Mp0ov8ycgdI0LeL3e9mqxGqcmePetBeMGuarAdKTQ40U4o8dlQJhV07G6nDMTmIb1247lGt6+3gY7zU21SKKJ4dbS3dp6WgqfpbVoJBLPCsUAaZu2ucZC9KSNbHnhOszVeBpUW9baqjIqe46XoyscOsyA37zWE77/avMcMyXuect6zNR5Vzu8X52ohGbhkGEbZM2aHRy7jQ0JOazcDma1mWRCai9Fju++Ugah0TXb2nmce8k2GEZ/r4YD5OyL0Gv0OH9ZZvcLQ6gAKwddFENAKr5Pu33cURRl9msXYpHADQlJU7Rcbv/K5CpTZe4/jjWE0JG9L6HQYiur9D3feb5iZqedRD6NhGj+9gGVDuTR08/jYq5X55aGboCU/zkOJuzN+Tcr7Vv/GL/4+81NXlcwf3NlDQsr7mvjCOHLkGBndKQPBvv0VXCrhayja5ySEVGHm56n6Cp3LwbuseGotV9WLMBdp83FGnwPsRqXpJJI1hkXFYQhjrIAbk8r1LmNAaClJ9qm30bxHDQkPXBOG0NX7yEDCilsYwmn45osOwbASbVH1PKmW5C9ITtjrS+q2rR/e6VMZWWAgej0ii0I+Ra61mt23A0M5dowc7piBzIXlXl6g+t1mr79KxeV9WTbM2o+BvE1r8Qiy8FdwVUFLy5eqw4c0IivVYYwS2JSUjJjezN561AtM+aXITZPtSqQMQRkPy0mNizrsOHRzTROeFg1i7xN6Het95Hejsmc+I2hOqogqQ5dvB2oXr+YfjDnRiWuUTaqabUCGTyN7cbVfWQ9Sixwjc80x0roRKZuHnOY7cCC+EHqPosRa7tUwS7sGxJb3MGpJrvOO9qiKBzhhp0ro2hN+LTe+f52MJ/YkQfGtVzElw3A6tll0lSHt8grvw3OM0FVOabx2nffir75TbAHaGQnoEw9u6/DH4kifM9T8GUhSF/PwNanXFxYW/FjJCbG2o7U+G17Qomf4bTMQHzd50dRd6KHhEj0mLV40CLXaaxzusLzMwQTeRE5IFINkvffQ9hc979jZvAd5mWx4U+NBQW0LUNLNyfKink67KbyRRBVYuOl3dWhi7r1tbc50oXGaCCmLt6h4xu121EDm0jCr+k26R2ld0W/qHesDDLNe90kZLZx3qRz4rPkI+7WuL/m2f1fWSdcY74CjHCsr7w0Yh/Ld7DfuKtpdepK9Fkz0XCI2WpPiSPXawSAkd69jehBN0Ps8KC8aR7bzWOUzP/lD8TIbrWkCjO2ogcC/dQ18OPHb+J/1h2IG86JhFP0eBzksaWtNfSxtPQnbUK5d9wOa83xgUobSr5YwyPhOtDMotmjJmOBaly/7th8wwe0H3966DZXBaWxmXINxKddd9eip9hrHDrmOTkreFBHS6/TYpetxdhoC9cgQwRKv6S3o9qbqnLdYIXa8N7XgO+3UV3YYEf8q98/WV7PUixzisJOzVevwfVRI0cGALKPQNpSrnCi4b+8Re5CoJ9GSj+hs3/mwSrSuc26uuvpQF4E0K1oYb19wjt/JRuHjema2jm/1Rx2iUTZ3kWa5dkEntEkxPMR2CQj+BEqewM9geCMJ1BubjbA2gusB5ioGsocX2rR8PAknSWmlcJ1XsJPMMcw+XwGw99BzUfXos8nHOtGh/vcCLzl2zMzthoHYdgDeQv9yu9/4p/Qix1FIFZByc+Mlqv76W1V3+d2qfehe+hw9wc4VHIWnyaQ2Nu5hY6M2N+q8KO+WoVIzlkD6hoLTJFZLuuusnF02Q4x55aSsz793suotfwdDvg1uw1xJPQdjZDPo1KNoGRXx6ngjW1KVX88puFsP5N8X1AZN6w1FQ34ZkJQQpbT8jTblh7cNja2QT+ZVvlJv8JfBWqAWEUhkmRsllFXL7gcOUO5ijhiQt3kjf8qrbzOq7tLwCoPpr+vESBqjgl/Fg/ZOv9U6FTIeVYBt8uTJd8NAVJgWqw/vnJiZ+XWU4G+yd1Fv5jsvCF+9SPfqmap94EOg1isqllpKpRWmZSpNDxRbfJhGJzRqD5feSvSny8LO6Uu7iQ24MATXuFfDCBmdFGDYOHxFhRkjOv8AZKXM0UEgEZcfo1blWqXKiPzNON19AQIc2zaku6gEStbzBOPQ9jUzMN1lRNx1dli4q/wOczw9IFScG5VwFe+0srGp95LhkZ8JIN5Dr0aswcUW5Syd6KoXadMY7ZnS6wiKD3yXiFvwi7ZGBlqMcbnDADDt4O11FvGWe7A44cAK1n/l1OnTWI8xIY4n4pDkrjgrEL3Hf+C7e38DqVCT0RHFp6J7qxy3ufQQvcg96FW9F4mYko0mkXJq+XUIXcVGRxmH3tuQ0eTNgK4cMa2MQD+l61AROgI1GoZXUsQMd3TBDpLWkqNa+QEFqmNL8QqlI9JbRXkiZvJEAHfKnqpaHoWZoMqurLcSzPn2OBmfYKUyi27MHx5kSIPGZj2YDEvvtgQDkxzNAMGnN24fuJv4Oo8qg+ZlrUPaaMlZwcjP8uK6HadeY3mFN0u5JznBdY/Gyj4v0zjIPZQxDA9A1TxWTgogBZmI2y0DkWSbJ0+ffo6tJ19hPfupLr0I1eHarha8ebjqvvdq1dp/B0ITm1KEjZ0LNiQnveYP+qkV1+BEf17hqvQ4Z8k0ZRQjDcOyFJ62w/DGIwbSaLPrOFbYhixl2o4SwoPgDdPHCCm5ePaySSGT3gpsLnlCuMxLfv1kZTQgnLff7xJGw9zoopEpPuDyzaPmPT/NaJdDNGo9hYY2fRZKLvDw9k5rfLZnJDKIlhmHHsbW5Q93OtBjsO4jUqPPLndzYnpirt7MTSybkYStVhHwL1nLoZpPjjLrQIc1Pod8jc+L2BbwW5GDlMgVXj2MyTRpldORQUWcKPOU/UgPFbaindVic4gXWVwHqJo5/aR18SfkUT/AN+vK5JGsFDr+yFKKnH4BbiworZz4xsikcDYvYs7G0KXRPMjvEL3GEaKO8uPTC+ya7afVI0ucLpKbRsR6kKje9+Zkl5LXPDIOPZxcofeo09FqJg8IVy8AZ8OqGa4lVWGaPCtZYpz1YiAWC1ijPa7AbhqIFKl56uzZr2Egv91kqYSSCuaOym60pqvOlT/AUDh6VUOAYcWM2BO+azzMs4DlN0yhigpTvqogpgB8pICxHcVoUdl0iny41H9misIpfnhJh81RdvZSNLS3u/YLspA8CouwvJTf4E/0bsINJitIR2MLVWCvQVs2w2SzkZwPy79qbGL7pjw2d8LVT8+YtJWobhykJ85663UaJBlz5sM28RL9XR4VzIdcbpzh5uxsGrtbQ6zIVJBq/5/TSPwZAgMGC0TDpUvfqfYe/yRpYiXE5DtxR/7MaboMK3rr79DC3gFPyY590Nzvv81Cw/+goqfRep2hqh9NX+OQwlT3YQxgL0rhOwSrSrUuJUFT5JOLQygP6aqe1cucdcBhGUdo/Py7tkRKYrVYIVhGBk25ERrtJ89G6wCriG9W7e7DWH59BSnSFutyeni7xplm+/Yertp854UEQNWhDrFhRqE06nk059BZaHXjUKwcvRRbjnTkbsPeAQnyZrhB26Ml3m+BJKCElioD/9jdbhuIFZJe5NkTDzz4Rdrdn+lpY5BPOigsLRyV1VtZqNYXp6upY48heyUp63bsMhkg6L2H5kON5hHyV6sbHK0/9dVGO39l/uyZn4tg7mKw+bGPfay1vLy8v9PtHaBv2dPqdNrNdvtQp9u4g5cJ9zNU4KPm1T6Qj6HaDPh7R1Gr/XRBB1HAg/iP8kGgA40e44xGX5s7p8E9IByTUb8PqnWtZgLKVD/iR7pRShtgSqKkOLy02v0OQ6il81X7yP2oIHPgYBCOk69ScCn6Ot+b1CriFAdutG3JXUNbJ6k8NFfRlh3HZS4nQzRjyrTcRxrquLes9/9rwysZOpUBVr/xtcFUkwrvtoGoXCoyW7R7/2Sq33wKGRxHnNJC700QlibFnfdepGVj6/uRB02AnizUqQhMxElZeDh55Sy9xznjo+g9pDRtPbAC9mvKfpa9ZnPeoqlM3ZdfflnWrAMFtBy5VSc5NJ8kt4szMwf39roHUJR9bOfbu6fROILxHOq1+gdRQBkOL/I3DnFq5G0Y7TRbMvY37LsS/aN0VdPwux/NZElIePRq2vxWNY4iS+vREoOIv9E6isxfYZHkTsoNmlXJaHlHRfeFEe8VZLeCKwX1afMWGYmcwUcanMtbH1bqrb5FqbW8mxokf0DY711q9bvPGKEiMoTHfhtd4rFnc0OCMtTOwzMzf4Ux/C/Xe5GYVi35YtWe/lQ1dfRBBwaBI/KINL67hggsZXavs5v13TlUf6D3qBodejx6j96XTy0s/DkyliKn2sS/EVOCp7jZwj9HRHAysPIX4du9K9/WzMxMe9/6+sFe/2CjO7X6BIvlv4USx4cNzpsa6+7VqnXw0WrP7T8UDORWslevkfFjb5Iho3wkYBTaeY8Rw+Vn8LJgkIez6q1b9Dy/Ob9w5vOkHpT3KILbhg0PfLdNcksEpFity4uLL94+Pf0g48xPIAjtjiv409iYd0aW5un+eVd5Dw2ijXlVn1GXlHfSPQW24EKtYhy95QvV+gUaK2vJhkhpzVP1/lcvLS6+QawqrFCJIfwIiMzafQGjij8QJAf9Ig5ecyrU4E/5Caa7/Wal/NVsc6ZaaC44LMbrLie6vcXFxc6Fq1eXL169uHT5ypWF26aPPYby/VB4YCtaOORNuXsrZ7nz/fX9nNa0SS/iacqrT8QloJszDqWFTQxiffEVu3sRnCb60IdHdUm/iLxfmKWsCy4rR5jQNQpuQuRviax46T96x6OHOwdXv0k3/DinWhTzkUCLrlstm5YmW4cfZYpynJ0bzIltPEv9WyVKD+RupXghjQ3pGR+p57j0TUho9CGdiTRFt1pnxWqKIcO//d7Cwt8iPPHJouW6/cugQFSw7kceeOCj/UbzeXSw3otYft5zT93+marN/ji9wOSyGCS1XeaQL71Hl7nH2vnfxVt71iTha1B2qeq0f3j+zXk1SGKgVinb5WBU+qKFHhW947DWxaWLK7fdcftXOaL0L9DyaJysp6ShVRM/mtxpvqqJ3Kmqd/11DgjhfQEZhsa96SkxSSTS5DaSJTjCk2Fw7zP+XV88WXUWn4OWFqOGjKMLX22onVnr9Z6+cuWKXl54vzoJpX3pypXzt03fNsUa9SxGInkXeuE9Sff6ScTDZkU7minqZinf7YrAaa5fpveIr9gm/ddiSEu9x2/Mv3b6lwN/6mkn7gpBTDyvm8mgP1vNtl+8/OKFY7ff/r8xkqfRWW38UU9SMxK0GZ3WfBPw+gVkKmNhk6OWB1lRUVdt1QcBS2oGIKORIeiun1eKPePgwIgO+786iy/w3EXLucw5UgUl1lUpWjmqeOz/+bNnz75KWPOnHamsxMV4PdZyXFq8/HvHpqd/ilHMAwy1huSt4VZ36STtEDOWfbchPvWssdjbNBStaLGs1116lwWR54PsI20V1muS2z9geHUKAJU3XDnCHLfbZsnGzY7Tm52dbc/NzXVOPPDAj6Lcv4Ui382SqOYkUsYRPAdlVy/Cdoq+TuETop4So+iNNiuozF9UqdbDEKdDyfwLV9cxKIyK0x2J5B9ck39ZQaJm2qBl+AYrVz/Lsu4XZ+FnboL7gJTpDjk1lN1H7r//oV6z9Q38x3mCmbf+RCZoXPqdK8z/jrNY8gQiZRItl4a1I6rGMTa+aibPcya9Obh67v/AhT4EIHbMbpVOPbaWxJ6ZP3P6M4SVSYoUwiTdFko0SXYy7Wgkj83MzNCc/SqPpT/Nfi1EY72JJLgB74CtZ+BuBqMH1LItRg6pIpWP8NRr0xLqYZgqxcQ+ZBiApSwsmILPguXfnV9Y+CUImFKJ0gfBzQZj/8jMzKdpz79OmfZuZCSswdJcLFfNg48xL3mQY83U2wZ5p15FUgE20kX9Vh24caxdeIG2TUu7GtbmOmDI123hqIOn58+c+RKROyr3jUowslg7DZzNLXTrxMxD/xhN/zk2cBzQe8sSnIY6OHW3m5RDUfwSRvSESrK1yFhhIldziuhgnFN42GtS/cz8a2d+BZjyzLVYS/L+DcRG6aH7H/qTPK/+CiXZG4Zb6rkLF2TKR1gliuaBh1gOvpd2hr1cepHMhC3R8SvXeo2C6iL8aLC6vNezfpmNuev04DwU9kbMEJW6y3i2xQMQeo8zO957iAtZ4/etW3AlNGVkjPz1O45N/wbMqgZm2Pukp806PEyfHMFYmlLYqP3xDkguVNbIu2MMXGWBotlq8U/qF5i+PzV/duGrX6i+0HqleuUDZxwqP+/o9GQkL/7Bi/Mst/9PxPk5hpSHka+64IGGCKnYc0aeuq+dY9VvntHRRYarDJHSSpdsoZ4MsTJM4z0PltA7V05WXeYcmi/qFYeBNkcPBkVA7eBfYu5xlpD0VZW5Y25AkXYs31vNqDGLcObCeP/R++67p9NqPcWwRw/ofhwJstqF5Gitwk/jZy131WtHSIjcbzVBuwUpMS2W1Qm1QvAc6P9m78L+f/1y9bKeiKsl1SrPB9rFnsTmJI3Wr9Fr/xi9tmSkhmFEo4qYJVW9JGbf8ZDCM+drsUtYQyab0KtGEB3zw37nPfB01hVGYUMqF/+AUG0pnQexP8+Q9h+GfCG8sy4qy87muvXcosInQZ24776H+432T2IKPwnZP8bvfjU55mQweKT3wUWP7kIyROHHNAH3JVL9J17p/Pc6LjWklWKkfAPsA3ubDcPbJ598cmrxwqWfR0R/T8LCUOIKl+piwIFhsudu8z+Ji1+a+8mQEKNtucdv9TLUGatuaP9aUxjHrzO0+umQibKP9RdAk78p0/ejE99RYZPQZmZmpvd0G0/QffwIg68foQN5hInmfVTEcUyAJSzrAawOrW54xRwTWiPuLQzkJLicG1x9fc+BA99kH5V6jGrWFUU1nfIR/I+IizKueD16Fhn9C7T7k2pEMJQ4BxTOBq5Ur1K/NxSl5MxqCAeK9rv/7b6ZmT+v1UxgMsYhS9og07GCyxKMlfAOEmvM+vBLAhwS4okTJ45QmXc1u122nrenmaro4Yle1ljqdjqXq97UleXe8lu4+nkzPpz6o2oYZfUh31mGt6aoLfbL/Szi+zvI71H1ADQqGtfy0CkNZ29Vp2QtkMEKwvvT+P/lqbw7eteMQ0K41cKUgvt+9Ks8MpjmnLf4UvCbdaWhqdI2bOZuluAHDK9FeUyeH/rQhw4e3nfwaSzjryGmn9AWKbcT2YqWxHn3jY/BgB/1K94lkiDbBkah8xfoMEgvxzTn/zV61T+af/3MVw2wiz1HyD8VIIY/iHczmqJgg5WlqB8YRCGgTbySnbQ5NTwPP/AAiyStpxDhTyHEx+lZtA/IJIq5mOFYOFwYzmI2mvM5ACvRN8CfZS3yi6cXFr4EtPsFRgT/xUcDu95IlcpSluMH/h9IYDMJREPRkDYqcevh+x7+aNXufYJe4JMYwKNEzNCj3AmOhrVaAdTJDIskPovp8AZa4xn2r//+yYWF7xIXXeqpImA37/8fhdcEEzxnxnUAAAAASUVORK5CYII=';
 
-    static private $openMouth = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADZCAYAAABl0n+gAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgpMwidZAABAAElEQVR4Aey9CZhlR3UmGO+93DMrl9r3ylq0lpAEAgkQyAkYkNnxgvfpD+xu2932eNx2j+3pb+x2f223F5r2Mqa9sUxj+7PHNtDGBmRsKHYBEkgCoVKpSlWqTao9Myv3fMv8/38i4sZ972VWZlVmViEUme/eiLPFiRNxbiw37r0F9+0VCihu8ftw+BvnKk2KXrxxy5aBckvnjmKpurFWrW6v1grbwLSjUHT9tVphoOBqq2vODdRqtXbwtzlXw6/Q4mVVgZspFAozhRrPbgzpC8Dj50ZdrXoBBEcg61SxWDxeqNXOuNnZE619fWceffTRmSb6EFQcwm8fMnLOVfFjYPy5sAIWYIN5tofikDUwOkTasAo7d+7c3lIt3OIK1b01V7wN6D01Vxss1AqrXcG1oKHnbAOnUDqcc8gmicBfgDD+M/AkKZBVrdWo00XQPYPzU8j7MM6PwXmeLNZqT0zXak8dOXJkCrD6UBqCqH3mMBRnitVTPZe+Ygv4artiOdeagMKQc6V91kvExnP91q1bqsXWl9aKtbvRaO+C0nvxW1WEI6iVRQcAVI2uUAUdUMCrlat9pzaTC1kGsemT1UA68aAk2r/BkYJPoB8xf2FCP2bKQDL8JgE8Bsw34UffKLrSQ5WKe+TJ408eBklZhNkhdZjQy2TY52KXbYG0si9byDXEGBpdHD5dPzh4I1rMvWiLr0Wru7NQLK6mvtYIGUN/4YoVV4QT1GpFDINgkwpOswDMADYLmmkwYARUs7an5k5WH3JG5GirgNFXoQ3tm3F/diXEg3qUgB+VsFGTEgARAboCiOkzdY5TrY4DerDmCl8D3/0Yon15Ynb28ZMnT06ILztwyEdZVNhkZrjnYouwQK5uF8F3rZGyQYUG4QYHBze2OvdmNKbvRRO8Gw2tkwpXOUPAeKqACYY5Q7lQq07iNwLkFHsJR/8ptPS7Yksvfj34dbpiqQM/NPQipxtFtlz84EsUyoCRkhyuSseCU1WmXbUy5apl/CrjOI8BdhG/c6CrgBc8hR6I6savA3G251AVaNP0m+xQgyPAJ+Rd6Owyp6lVa2XofAhudz/4P40M7n/iqaf2kxm/EGgbhuecxeywqGOolUUxXUPEOcfYs2PHS9DE34629hY0pHXUk06BHgINCS2rVimioRaq1bOEuWLrNtfSvsm1dK7Fud+V2la5UmuXK5Xa0XBb7MfWzJ8acGYuxtJWyLwUrHEDByx6nJqcpgxHmcFv2lVmJ1x55qKrzIy6yvQFxM+46uxp0I0hmxLyHMCvC8WAi0NHtWv1XMqNB46/WCqWqMQDfwzVKry9UHgYJJ+q1Ur/3DI+8pXHz569KKQdnnOWxBgLiWY1vhDqa4eGLYdBY57dg4P3oiA/i6ZzL4ZQaGxomBw28aJbKxer5fPoJUbR+Le61u6drq17s2ulU7T1ulJLB8jQbnSBpkg2bM0BLM50CEk0gJqeZdVgWjZgUuGgCBM+DzhPhb2Nd5pZOszkGfyegSMdR+km4SOrXKHUB/W4aBZ4Y2dAjSjMHAbzruAw7HRAfwgjyH3oMz9WmJ369IGTJ88CGMJzzhIsMc9ZVTcP/lpDFYZs8q1J6q7tu15VKNR+GdOHV1FRjpuw+FTBmKRUK48WapUzrtg26NpWXe86Vm13bV1r4CQc1vghuhzBNza2J4ZokRgx+BUdvfCQR8yHzkNfR15yHjgmnKZannbl2TE3O3XBzU6cwu+kK089BdwonAXDv1Iv6DHcY1DvouuEUoSwh4E8OgsD4bTNM1hu+Bd0Sn/fMjPzL/tPnDgnhB3oLNQuCkpw39bRpWwFy21IVqIm33u2b7+5Vij+OiqfQykOLdAgSmwYpWqZK6Y1OMULXGf/da69G0OoNgxZOO/lkIcNSldXkKn0V9sEdc6D8qhRB8eBvhyalacvupnJc25m/KSbHT+KIdohFADzodI6/FA+FoZly7dxKzC8EDI1fwEBil87ieN9cJq/nZqd3ZdM8gtDTVb/yPPtGq5261iQ3YeGhlr27dtXvsPd0ToyeOE/ooZ/EdXdUa1W0CJaOMkoVWdPoGfocR0Dd7qugetcW+ca6ynkFPArtsNrwiEWUmQo6/1GOsNZQk/DSX61POlmJ4fd9PgzbmbsKfQwB2CSi+hZNsBZeqygjc6CC0ihgrsvGIUWNRRjHgA+AcN8EB3X3z557MkHEu2e61VCk0mMcq1F2aQ5Bqns3r79DgyN/gQX2Beow8DEG62hpVI+A3TNda25x3WvvsG1dvQjjfk478Gxp/iWcQqoPW/wTsPyyGGs/XLyX54eddNjz7jpi4fRw+zHWsQwVt9SZ2HHGzxOmbC35XJa7FnYC6OX+RzGqH+Bq87/Onz48CmvTqgDdk85IR7/rD6p+VyjJaRjsFLcru2DP4uafCecowX1WMYKT8lVpwvV2WOuY/UrXc+629VjkLZWw/SE1QjiZ2/wzsICakgGZ8G5Vpl1s9MjcJan3dToIQzFHoUtJrCKvBk+xZVu8tFZciEMw1rQswiBoddpRD6MW0IfePLok59LqDl5Y52oXhL4szZ6rbYiXh5Zk8XrBnf+D9Tuv8FwipVQKRRaS5WZo67UvtP1br4Hk+9tQHPlKtxcvlaLRPWXK3iHyTnLDCb5w27q4gk3NfI4Vsa+ASfC/ZyW9fClVrgK7KlhWNSJlxWucwBfKNFZNF9zhc/A9d6H26UfxraXYU/9bTP8uhZbk5xjz549vbXZ8odRU6+oVCocTgGOQfTMYde17nWud8PztSIlx9BQ6losSmx8Kxipdxa0eqyKzUycdZOjR9z0yDcxwT9ijsLVMAb2uvkQhmAlzezhePCcI/CqD5RqlfcfOHr0SU/ul+Bs8SQv4tmRutZalYZVu3bt6itUa59A5bwIQ6pZjBFaeU8Ad71d37a3uK7+XbI+l0Q5tHguzGWB4CyY5PNeD3qM8sw4hmAn3eTwAUzwvwoYuunWTdaryFHYkeRChb1KmNgjPgqKD+HG0h8ffOqpL3pKVoLqDucGATlp32KJa6l1URcat2XP4OAnMH8conNgP1NrtTKKK16/G9jxetfetQ7LutwfxXAtqW8aXbNHv2ChbV6Y5GOvGXqVc25y5Ek3NfwIepWjcJQtcCQuGTcMv1is3FyFtyZh/vsA/cODRw//A/DBMThPgYCYRvRbN1xLLUxXIDjHu4uF4k9VgnOUh12pY6tbveNebAfp1UT0uV7jShoc2jGbcpyvYGsw7rFMXTzmJs4/6srjD2E0iyVyXJAUGif12fCrqB2eFHc/nOXd5Vrtb8L2/CFc6PY9CxzlWnEQm3fs3Pl9uE32/2HOUcGSLoa7Y9gftcGt2fkGnLu9c9CPngtLYwG76IdehXMV3luZOL/fTY9+RVkUWzbCmWDzxnkK8ewpMKe3m5DY4vMoHOUP28fHP/DomTNjJBj6FneUa8FBqENtcHCwo8UVH0T0ZowG0J1XOHB2a3a/Dfc2+p5zDra2ZQuhV7G5Chc+eNd+4sITburCA7D9eQy/tsITWnT7xLqgnDJc/apxnoJ5I4bAtYPY7vMHLWPt73v87OPaLDn0Leoo14KDhN7jTXgy439Vaug9Ci2lKsbEq3f9uOvs3a6tFrqK5erkWyWRN/FC1hQ4XbBGGHjtSr8iJdZcBf24JvU1LBWPuInhg27y/IPYQInl9dYdcBQsE2vo1aCX5ilYdtfTmOhRDmF33O+NTna978yZR9WjoAyq7xUpyxJkQmWvduCYqba6b+AX0FG/oFDDvcDyM8XOta90q9beosnkte8caFD807i+/qzhPnB2XoixjZZyAm+9TDpOcJ6FSFwEDTNlwPY2OmmptRP3mra4jr4b0ItsxhaXU9oHxg2TBW2YzDkJFWV9VuEcGCYX12Ka8l3trbPf29+/utzX3/eN4eFhrrAwE7a9HDPS11y42g5CQ1V5zwOXpN9GfIDPbdSqw4X+Lfdq3sGlSbWUa8Z0jY1VbappeyVwKX6Nhc+cKK/PkjlOLBTsD2fhYwHtPZvgKNfDabbixuNpTO6f0M7iSzoKns3B0OsNeM7+rav7V4+cH7nwCEpE56Az6QLZWMJrA9K0WldQNXW3e3bufA3MdR96d9y8nSq0dGx2a3a9AX5xtf2XlmADnM8iTZAe1AQzn6B5cfFSGyMpeVOgCLLhWkp/OXHkgf/w7EwF91Mmhg+78bNfwYNfT+BitgNIPOTVfDKfH3rVql/Cnslfx/LwR7wmoTdht3VNBXrv1QxqQ+gkvlPDkyKe5aiccu2rduoRV7jLVdENLgGnCL9UBarrf3YJl/P4qI+LmxIy2iWIR6nSC1pAfPgpkssj09lorCyme4ZbXMwy5NyDe76KGHqtWn+LW7fnba53yw9CNLfHHbQy6xHinHTM/gstmMdj/zVePYEXZmAg9vd7Bnfeh02od4OSq2FV7to2ATneq5pgLV6twLzpAbgxuPPLOD8f92urmJwX1+z5SXTnGzG64haIlVGRDtE8eDhOjRSNkChjXtTcSHSiUURDZB6UmTLjEGmkj5FIcOU9C2RSLPZssacvz4xh1eugmzhzP7a2nIAD7YDBcP1t3qNg2z1cCstecBrK+XPMWP4z3tjyBBUcckMt+9y+hv0vUfkVjMxdU8uvBHuv6vU7d96Gm7JfgZ1a8QaRGu6YF9bufqv1IPM1liXRj1fWekEJANEslcVyHAnYeo0cdtkSOUdiQ20aDKFjpImRyHFlzgJ5+A9DL269Hz/3uJs49zlc4MbhKJssn8YbjoSz54CbFDHvrI1hNvL7eIDrvx0/fvw84LQs2whprlq4moN85l3t7+//ftw5fz1W0TG8Ol3sHHg+9loNwugcjiatbwlNNN/wKQxbdFb+1MHrEaI4RxnAhb+mKopHDGS6jF9TqTFP5Q25QR+pyjwVlLnRxqwNFssEOlMrwD3rgk9eMG5dhcl8Ry9WvXpvhN90u9mxRzFSnkZ3gQe5mEX+okcHgHNgqFBwHaVC8eXoVX5oYGBg/MLwMDaKUahWu8jZ6NkALne4mg7CstXW9q/+RRjnJgyvMKI6XexZP4Qbg3h1FZcZWXNLGGIjijIpHz81sJCdh1ltBrQ1QMDCXxTBiFhMjm9tRk+5+vMkgXRRZ0iQfnn5lg8zz4eQI3lMr4CXkkhQHo5KZjBSGdzyC1wLPwehqDdc3Lg83Nm7DY8+34T7WEVXHsOrvDA3KWqvV11bt6VhzFAw0Cq4AVww37i6v++1/b29T10YGTkEHWpDGIofuQpOQgtdjcB8a9u3bx9oKxS/jprZwjuxGK8W1u75Yey5WoWrDnvWpVDPGkS+kKzMVHqSj4+yoTUNAme4LFZPXYepS9ZTN03XtaO52keeDKk8wIv2g7IGnAF0zA5Rncsffplcu/tedVPYwjJ2+qtuZvSLcB7bFKmH2xqVxYpXoYqpDZ6lRh3Van+JV/j9R+zxOuKV4kV9xYZdV6sHYb61DX1r7sa7DH8ad1vhD2OF1u7drnvNjd4Ol9OiPKtOdiXUldKnzSvMYUw6jz4fnHQFRbrBOezSKoKAzTh9LKHxgkx0QPucAt+lzqnKUlEMOKT5eEReFsuX0EkQD6Z51hsFhHHrmB1ELy6JImKxQcJQyxwJOG0X6urb5Uqde/S2lsrUYxh2YUOklvLNmXwOVLQIiJwANxtvxTjs7bh/Uti0ZfOXz5w5s3IrN1CIY8AVD0MyGUZRxerLVGHFEuYfZ/C+Kl5ZuJaeM9ii9bNGkLKxlvGvEw5MCOBPQPDP4Dgx+EYmWUz6n/EhFRthREQa3xQlM8SjhMiXykjiXkrgazybJOQaRWa65LQ0Sbn8xOVZIVk4LyfNN4qJEdGKPhOxsBjzQKjhmTfq2T2wy63d/RbXs/WHAMWziuV0Pi7ScOBFtIhVYWwSdn3YN/wb0+MTD+zesfuVgKtzCYTLeb4qDrIvdpGFF7NwGF2htkp4b5VehnjZ5TXHsAoxIYijUqwdZJXNtmAN35pfzFCE1nASaqBNjhck8oA3CUFOoDMW3+bEHuMxszkimeA8X4RbJM03oDLFAGFZlGkqxsOFs/yjnIxcfIJHGCMWGm0cMJc4+zx1DwUXwd51t7iBXd/rSr3PRwOY1oqX9SZZXpLIMRoH3Hj8AXfjn1csVP9s7969fCnYijgJb8ysdKAFans27oE3lJ+vzqI2Wyy2btfzHqFLXpxSqM6cXZGwf4hJEHPASJNQ+awjcVSlgaqRKebXFBUlXV4k9qt84XwuIDeAsjwNj8sOgod6FlyzjRMG81TW1IINJAoYIX2JkR/frWQw46KjXNb8RBWFaQbW9lvbelz76ptdBSOH8shBV5nYjxFEN/oNvEUyvyzMQrTASVCcQvfY2NgapJ+2gizv8Wo4CHutSrWtirFlYYPNP8YLbatuxn6fThgdRgiVuoCys6KyYPEM5HE4NW/c9VARRnFeWkw3qlXPn5Eq5rNfTHnqJCBpDZLwzC+iYJFbW87olB+SGRUaeEwgIlI1eUrNcH5oq1KJDISi9eWscxSzMx1FRNJlYYeoDCfhuFfS49rwZprKJPZ4jTyGO/LH0Zn0SbcGebVaH+qcSDoIBS028waR8wFW3EGGUKh91KhYfaFW9wqlSnX2XEtrF97jhC3WYaxKkvkDKi2zM0jTtEfgZLGE0DNlkEik7BrpUy18Q0lBjIspk1iPDulLUwRKO1vNJ1xJNFKAyMAZUnyZN6EJpXoHZ/H04recsFHUi7W0uADS+pcJRV5igFOQ1tOB73J6E17c8AiJq5Tx2gFMh0ud69F59LvK2AlXvoiX1OtiaSqFI3LFCwocHWRFwoo7yD67+cNKvZMl1PwDhm7rWIsUjX7p0NBrgM04PX88+QhFLsYxUrZ6nSIuRqLCTSGNwEh/qUhkVTu0xpjyqA+IRAEDqEgNYdGEN3EWNXyR4QASNX6Imd9RTC72XIPF+Mhs5l1cb2IOkjRBbEvhtpXWvt1oFxVXHv6KPfprjsKM+VpIbPqqbPGlNWVC0ZfhvNKTdBVy77p1PYVa8TZ1zXj7erFl64LnH/XOwYoxK3lbKc1rX5Zm7TFlEBLwZ9Y0SiY8TPAAjUSex9OBNouRE3+SCWjuvEQ1pszqZQcdpbn0CSXKdAi4QEsZVlSeE6iHGzKQRDm+GKQXv9Kem8QCKmJ2yIg851wn60Ey94UMdEUcZhfwTRZbyzG5lID2IlI8paIH5ocSbYhfjpC473KIb5DJ0tamu7quw1O1g04fdJrE9zm2a3fo/PMPVEi0FSL2D3EeqLSPh2zBkEFEIIzBPCYjAG0ukcn28jIsYlki5JY752QFzCV4Alk8Zy1HIF3xIxIRycuEqgdIePI9DBD4D3qJLAzDYq+CHIJM0YrK9yiICwYC/EsXoSFRvQn08cMuq6eF9CZ8nRC+w0LBIfji2Bv4dbssYCxbpSp4UH5lwko7CHssvgP2Nsw/SngbbAVfd8KuhA0wFB7j5O7dzAuiBep7DVrK7BismVW8mLyMSOPJiAsNxAtIIWI1eOQ0GI9N9BJYFJkeSl7ykCjUQNvYWAJJ1J2AhCxzHMhNRHMCHEK9s4RhmCgW5ChoxpTtZVIX3N/1eiilvBvnJpkOQZf0zBFTTmkhoa2+5kVcY6i64mZC9+Ws0Ei3FJCVdhBZC0bEBB1m4W5nvAyuFW9in7MB5homKkINwLcCysi1CJokhYhAdjKOLJ2jE9IoTIJY5tYp5JmxeIZwyiPyKdA0AAIfz0AmbSqJeiIPSWTEEntUdJjEds2dBQ1RPCZMDZ65NO1R5GJA+YzhKMpX6kKIdT2oH+YuIAUhzZ5EQnnIBcK5UGNbsXIoLOKwZ6m7aczt8wg4+ncS1fEsQ3KlHcT20BQcHjaHIWtV7EvrwfwDixKyVr6EWc9hlTK/c8RmAiGgNxZ/ytJEeJSniakEnsGokaVwzIO9shFr6aY0nrS5gIDMzokMi6qFebxHsk1mHIixtRlAJfTI+ZxFDVk8JixYpt5RJIPGVxYmWI5iLR/Zzt+biNUPv3Iqy4HMQbK9d1QImrFnYS/CTGOgEP1zRYeB9wSWNaykg6jkeP58Xa1cxoYrJGuzhVIbPnCDrz7xTT9pyDmHmQVoirBTqExLpykjNsqM3tjSdI4Coj1OAu0gqY1gIJP8cvhcIpGUj16KKm0SQZO8BKRwpc7JQdvJ+BDzSGkqRHSVWNbQqzRzFLFY94KsKAz8komDxPPg84SjBFspF0+fOoaZl72JJMfisPco8oErvEY2VgFJeAOdNwwr+Axdtl8LKitzOgjbbtiXlRcapV95ZCVXsWTe6kz1BhiTNwgx55gslNox/2iBIWQ4kgAbLYW0/QvO4hKnylBCAJIwQmSengiBUh4PNJTnIcyCUeLoZQU4BemP+QcRWQRkqYxMrMSIx2SaXNAaoulZZczxeLLGXDyE8hJRXlcBWQCqFuQlegYdhCZdFOJZAi0JEOefgk8blCgPZ5Q0Ec8yRypGkM5oQ9rmIWkbh8Nx6KUeJH/hlJCaW4ULbfMJigiW7rBiDjKkoSMMVKzu9Y2EE3Ts8lwLY+Bi4B0ks58Z2szp4xmSllZlpHiaxSrR6C1lFKo0z09IbKhkQpA04oU0WOC3Bisif8gRURX/Y4PwiSiItFcafH5edtAnqGvSPQ3z9Qg7JXASCm22i1oFuYYOREYLBv7x305K+bQBeVSePCNE+pASmRdAPPNTUFehm4UekJ0432iy5UQ9SM2tLpfLAxnx8sVWbIi1Tx0zjFMr3CJDF7CjuTbjWvhFqFBBwW40seIegJOvFrMEkBmpxeLRIyKF0hEb+YNJRed5AizmFuExIpKcbhlTkxj47L8JbuEgXVvrhiYSTBE5+aC0f0NEvCQAF4ZhSIsPB9F7vBUMdRSGY1440rSTqDjsghxgkEZcEcPWT+DrV7ls5GWcdJJQJM03TDo1RqBcfhK7AwNvDL18bobTcRXenoan6hw/SGkCE+RSRlfMQaC09ZWFAl8tChNUcZeoU59iZoF83TA2t3PQFN5cjAUmM6BQOogsh2cCIcvEpERCIetIcsi8TqKsO0B2nqMO35BsRg3DNAmiTHQPJNbAUh5Q2j9IZGTf7HxeYd6yAEcRBzKQdOUNJ7EE/MPyrJ+bxDkN6cEri4DW9GQKcQq2AyKmF+cgIY6ID6AvcRULzUY8Ac6S1VqwAtqbQZYvtlIOoiIODg72w1rXW4Hx0Bi+o8eXUstwKiOMIpuZ4UgnIxPn4YYRInBE29bTZmzGJQaJyvgNFvKNHAKLKzsYaTymPBGYRPJ5CtEElDAgmhBYG8yjlcoQOVsBl58AQ5b9ExMbqUQsxlGsdUOCF+YbPiSaumjssf6iYyBHHyeRRam3p2Uxyecdrfm9ENA0zkGMk/tRCi48G0HYsoWVmoOoEHgx0i4YdpNN0KfwGbV1emNfuIOeq3Bw0JwKQoSUEAYmPpBkEeCMVigTGultjqCkp2NFMc2DCVOMQJ8vsQw29id94BGUmOwnnOGDCDsDtpi/OeRIJwqMeVIHC6l+ho+YqDM5I6/yYCrIM5TkCMY0cKQjG4PyTniEsJJleE/vaY0tSAg4UUuu7qYntIZBHpyDaOAReOnqutHMs+YgQ1RlGcOKOghmY3v4BnCUCe9uHSu0tK/RVgOVTwbyZcUpVgnghBpGCJ+2OHlT2ixFfORCNKM3GnARbQeKUdTojE9AwUmbh1GGfjhJdDgHeMM5SDO2BrQXl1D5aEDYmWXVX8gvZB4FGpuB6/U2JuFiRoRZGRSRHCAFxiEEMDEliBdgaRw9wigiUUbrZWQ29JSQo36FsnUTkKks2HYT5RiBts6LZKXmbxYORdxyRFbEQVAEK2WldhMLgfFj1VXHcIOQE3RTIZoBkdTQEU4R9k8J+jdKT8FKMwzAAW8USnssZYtU5BmPVZ6ljZR09lPa80ui4CEb8qS/uiRQQU48U4e5/nyeRht462QmujBv/Skf0tXpIhAoIpzMRkwQqe1IGs/uoUZm8o3M8wUeySS3SRF9SAnkMZ5OOcV4wDHPklay8kNEUONu+pzvuC4UNlAeXjDH07KFFZmD7AsT9GJBDgJDaPTJO+iqOG/MYGCVlnVBQJbwKSEAzQzMOIOOsQI8RRAxJ33klAy2ksgiiE/hlMGzWB0JknU4k3qZxyCrTic/do/XW0WMVseIR0o4ozTT4Krt5xXSFSSaQ6QyyI85gnHhSBqlDSIbQYZSFDrXvAQozTVAmc1JIAs8pgPLRflYr9FEPTUTZj18PwHhPts8tioHYQ4pfKnjK+EgNBNXsDCxKuwxw2C/YrEPK1h4mRgrC8bnBpvYDMjBWlHA2f4N5nH+JJjipLUWYHIyIDEeFYENaQIyrDjEl8vbIPPDA42E5SXmUCHR5Ny8xmmnQGxyo/ToEMCLJuCRQFQT7MiLlLeT+QkRKLtY0JADP2QSxPmihOKk5mwEMmhcDiYz4MJTAbH4VC5udBAoHYKjUp9iCU1xNipJErQJNhk4SVZwOholosfBGvAKhJVwEBVjcHBwHZ5D3qHi8dMRrWvwfiRfRhSZ5lTQKaSE8BiLR8omdOQXp3AxRaAw8Wg2ZlIhNBif8jBLeeYUZXkEdDjX5xHgl3GO6ud4ca1tQKBBhQYN2qCCv7YDZwwGt8ZnDZ6C6Sg8h6u5xQVDYzf3ALauN5GtlC0OIM4t7ZILeZpKJGJtsPdgdiGORHQywpkvGzyeJjWRSIkB4tE89Q2S7B1pUpl0zq3IfqyVmIOoTG3F4jZYY0ArWHiLRamNE/R22Ifr3CKRoVh0S+Fo/2YwAT0ujWdExikcRYGWcU8riNKRAHjShLSQlqdAPm2ijFY5BHrKRtz/qFnC4TP2kIQu0C/q7CWneZjkLH/Jo64IRoej8jWYCkaMZwlp0WdAI0aaIJ8QqSU9kDKkEyhEGFJCeIzFI6VYPZ0XrpTnL8oZQp4403E4vNLddA5AJIAEcFldAtYjzgu8KIlYjrBiDoL7PckK1kShpW0A5bcOLJiXxjYzmHHT+JyG9nYzYwcTISU4D16KrwijIN4zCoA4/3UinD87yYlCWrBAaLpm1BncCzIxBJsofybfQv4yvrwAn0+UltIFHaioBeVkBYsQcmTmoHZeRp1NMhuZXEMbPbOn7ITZp4TIxSOlyD2Xz0spNHn2IFGehLKH434sDrHoIPkAr+hZif1Yy+4gQ2Z7fJOrtodFtBWsi7gHwgk6jEL/Z4DBvLk9h4A+HoxqMLNzpDbDeuOTIa1IxrOKtrivG2ZKgOgtBy/T8/hcmanoRMuo/wV+L4BUHkfO7K+BLgiY9ywlJDGTxJjPI42oQAmOVFZwqqQgGYKlECPzEo2ung9pZmUBcSU8hNkk2GAfyRMusiGS8RCqlAlTCnMKsNc1R+bNm4VhSEbGKKjWhznMsr+8oU4j02Apj/usC6RBrgtyOTnj+3djw80Z0wwpw1vUG5PcvjqiYT1EdIZLKzCNizvhE2fMN8torh6DFEZFpvAzmOGYv8XCKXf2CaO69DFK9iIzWRkgydGTA6cyRk0snZRbPEFE0CmwKR1EkcgH8GciQtzjyev5RE1ai0hQSBGYxSOFZYb2YDcL2RzDFRNRZgoHqektpMZD0ZrcY0dvtVoNGxYzJAmWMNgYZwkFNhFl71gtuEFeCfCHSwXf3YIVLAYVLZTPzjKkB2XxYN5A6w2upMf5uMQmcUsHPjtbhXtYPAUa6uXpyKyAdKRLYIwmbIYJuga65NxAm+CSaOxZ64Sr+WRIcEAggJlYWFiJALcGp2VWytfV2PRLNxMSpacBjZmESNdP4CHbFBAtMwr6NF8GpiKc7muqLiUjHe3rdeEwgjR4ei55LoSS4TDaboImZKIAswD61mKl4htRgC79ebkdRMW6dcOG7olaDS/epVHwRHFprV6PLwMBRiKzntkhFDNgCDUaIzNqQAT0OB8XLomLV2njIo8lPVBpH8+Ys/wyhgY+kltI9MtAERdAizonKmV8aEi+gQZYaKAhbatFTF3aUaQ18gElDwiAIANF5SjeSSSOUOJBmjbsjBW6eUcgPWkp2TuCT3mMzy7Q6AwH4SaLyox4RUg45yDcsJgFWoYe1YKHcpd9iLUiDnKxq2trsVrbJMvjEwfF1gFXKmGfDWtbtYEio9gseYjQoJb0Z6ECBc4BLXg8qAIzZJQCAsSjqIw5pSBBJGEsIxM/cwkwyRPAHyJjjAiRTzVlSIGIB4PkwQaFtJzAvMOIxjwIYkJZ5nMUcOCflGlvwobNfMI9EGUJ25hjABXj1Ic6yBXEk8ZjUWh4OFWWj2JU0euJ/PB2am4toXsqPxaf4jVJBz6DEsPbIQXcLOCWd4bIYsmlOy73HESKt1YK21CeTpQDNp6Rg+BZWxSTJaMVQvkYT8rrwQayhNEHAwBmSAFMjNHVN/YMZzysZMlSdoTFlOljZJ4mJkBtfIBY3oxIuCJSx2JGKRzxDb+UP403o0WeXr8gGxzGFOUGdTxFJKzX1xDxSH5JsjxUAF8KQxleNJ42Hwde/54uF2fePkReEQCY0Use0iVuLaEvBBzjchDCsgCwqLC4pf1YQ5Eho1mq2LI6SFC8XKzSQagzNiniPVhtvXbnVOU0Q8mUqc0U9wb2xk1paBMDe35PL8MgblCm8nREeKkipRDSGj2RIeah/mRcnlOwgMj4xcpD/FkW4UjKxfwFvniOciEF8aCB4UO+VpaQT0YUIZ6A3BYNZbY05QglLLMMEhUzAKPSQREyRDoi+C8AiULMw40jR+NBGmL5eDixB/GSAkiXWSbQKeGiizA0pNNyHJZ1iLXPa4xud5cMUizhvuAobhJiiRcTMK1OyJhZ0TJzhlhinhgFTnEDpPGsQprhkopjlrHyQGvk/pSlcxyiMUJPLhmZ9lksRxWJM/xCYsECorVrJmzmIwRawU1nzQt4aUVmys+us0FGeMjJhl5eCvlBpgGSl5UfCikTZAN6ZUvByAG0zYZb2SRfQjn6Mm1Bb9tSqBv4w5CMRaBEHhCKJcxB6gPnJfxMoS9fisaozPZj7duXgpc0vqwOAk3NrAW3PWhNw7bwISkZOUBpOMa9pUJlpaCAw9nQRpvGifASJDiPo/S8fC9B2cZ4szyFzFGAx9LKyB8y+Sk0jTfypNjmcZkwMw3L4EFNnWUeR7HK4BGaKgEJVAkHOglDOqkmUXCM+Z0EfCYcZiGPhJqNvD6qG8RthsEjcqQSwTvAwg2LNtIwXYBEGi8UxF12SqwPkKZP6O4j4TKF5XYQLfHCUlvpGPjTEm9Jr/mxIqtR+dLrlIvPQeONEbCWlKSImc85fBagRSwmwM+kb/gE0+pWoSlZZFBeMdc82GSLIuX1gMWcfAPKtQBr3VDdZwokrasQ9PcNU/qLDDGRqL8wpbxjWBYgAg9Jg5OQiOKst2AcuXgZzDHrSfK41EmoY9QtlNuEen2RS1CdL4uLNwulNLsVELAX8UTSzwoOvW2IlSJDHkt0Xk4Hka2xHaC9Vq5s9cVFYfGae3wHJFrFF4SGtOBjoaIJDChGFPcATyOShMbAgYYsIR5jAHJSiHf3leCzmIlV8EGX6RkM+vCRFjYCfLrbtbYUXRt+pGP1lEFTqVhFSVLMM1MygmIkwzG26CA51nDFq+xNH5MFAGikj3C+OQb71TuKnMDzs2XKSdjCKAeChCfY4syjuSNY7s1x1IYSqRiOyCPIz3YAE+XhpEP2vJvOeyH4Hp+VhxKQLmjDogqnTEMtgjos82ZIU2vJjsvpIFKyNlFb71pr662K+fZ6bFJswS5e1QcNSDId4ilXOl/RRFrUaMOVXtxz0FBsMCaZfS6urZVduXPnR2fdE2dm3OnZqnveQJvbtq7DrelpwRI0XmQ2W3EXLs66/Scn3VNjFbeuHePEvja3urfVtbbyhlZwFq9PUozmBUmgQZFcQesSsE9W6wmDomZNcaiReV5dilFO8Xpub5usYVIAGy150EAtkjVW0i/ISUyO5RzitHFwUGUT0aYTs6R+3nmoR9AB+tjeK/QWZf+OZurIqxdXsipTiMeeBCJUAC7zcqEp7GYUEOklC8vpILJarVTbgMgqacwrQwtWsFqwxNu0+mkuhFCpliLAx4QNaFIibjDSGJFPKxnidmZvQEs+emzcTaEO3vTi9e7Hv3+7u/G6jW7Nml7X19vlOjq4OQ7VjAqYmJh2wyPj7sy5UXf4qbPuGwdOu/u/cdY99dSE27mmzQ30sxyoT/UqPi9BUlXycI++9AlseU7Uvf2DN8Gg5SklnIcLhrhgODD4hsmoOEgqR/BNGmle0Ym13oO5hLjJaOwtjJ5VYO0V7DGBOoMeTecjIFNIaOmxReSvbe9AUrKC5iXcbjKBJB0kCbVa7x133FF68MEHc3cSE4orji63g2AIWcXHTgolGBBtbrbQgudAuO8GJTZjBlPQWArhTHwCScAZIgBxtv/IEFyK2ZSAa0evceDkhIZLP/dDe90r7rnZ7RrcAIewRm6M+eOqnk63YX2/u+G6Le5l+NzobLninjkz7L6+/7j7l88fdJ+9/7TrwBBtLZyFn8+rolexYgS98vKuLFVXRjZetVuf10Icxdu4sTfJnMSGXHQMaItDvZOoTny+qQNkzmPVGnTL5i2sopAPYmwQNAiLhYjFw70QpFQs2hOReLMwWtBjXffx48dZgbMRs8SRZXOQITdU4PPCuBqt58wc9sCG3ukSv0cnBzGTmB1UXG+TGPcRWZCltnTWYwSIWcRjBUydg8OpcrnqPvLYqPv1H77Rff9b73SDO8LTmqgYVhTrI2RXZ2BVnMe3tpTctk1r9Hv5S29yjzx+1H38nx9zn/zUCbequ8X19LS6WQzXViaglNIZyunfFwAnNsMMRuXxj8bum6QKGxuoITM8xUTHYFzsrEfE2fdATmzRwHt6EmZOQt3MrrSFeLygjDVAJYBk0iu7FxLgoIOD6M03KjAUYpAurqezs5Ojk3HBluGwbA4SHqZHxWylEdF5wkXwqp+WHhiP90DYkDh8ZKAxeLKzjgFkmBTt456A5k8YApSNvrOj5E6fx9sbMWfY9/uvdy97yc3izZyCvIE/ySiJJqJZxaoYyl7V3ubuvnWPu373JveSlxx2H/rbr7tH94+4zZs6V9BJqBA0tH/TjaAIg6JyDIKscbNhqRwsNwuCQIzwCW3mJMCBDscmTgIZ4AYbhfgQEslZXpGkSRyS5EKcJAx28bS4jqxcTNJ5z4wsIXjy7tZajTt6l+0Ni8vmIFDaylCr7VQL5kpQbRybFPGZX068sAFNBfalTgsfHMUsR5MEbCBO0iEayZgPnaPFHX5mwt1182r3K//nG9zWzWsAt6saV6jMqci08KCsvENRFsO67m53zwuvd1u3rnH3fezr7q//7pDbsaVTq2KeZOEZXCkldYPZs3yhMR0DqvomjjRolMaBRgAxy6VjpAVAQI+BvXgpIzkRsiPO2G6On88zSAFNyN+LF4/0Mnbk71PShQ4rwTrmbxbSxsiZQyxuWDR1KCWEVqz62Pw2QJb4vJwOYmONQkHPDsOotAocpMssDcOaXWhgBLM+4mYsgVRYS3t0AlHUU5ssVRXy6GgvuSefnnCvfOEG959+6c2uv69blWkP5RjflR7DUI9V2INFh53rV7u3fs8dbv36Ve7df/Kw27IR75XFnCQ0livNb+H8sIJMFvKmbbwThEu9QFkjpWwbcnla0LVg4sYb21zWnpypuPGpipvBeQZpLnu3txRcV3vRdbQVQcsRQQ1zNK7s4cIHBewCohphtVtdJ/kbkIh80NtNVABxqT3Y+7Eah64gY2HnnkTmRV9WarkchFXEEkJ+bbM1Equ28KIGEiS+wJQFIRhlZaUgS4SGSaRJ9HCQMp82VNgz56fdS5+3xv0anKMvcQ6TtrRH5s4x+ar2ds11XnbPDa69vcW96/cfdNs2dwBmFb20uS5EmtknNFRycF7A8ZA0Um/hnUTi2NrwteE2m7OdODftvnp2xt3QW3I3b+12Nw72ud5V7a4TZZuCo1wcm3JPnx53+4+NuUdOzbiBtoK7YV0rlsHbtBrLuRgvEKokNQDqQ6eVxVh7yM3wck6rRq1iZXUsda0HkdaeyFoGmbFJXEMsFU/FWOLDcjmI1Lxh7Q2dldrMGtiCQUfeA5FxlPIFtpbuyUSbsnhOg8ejZ1Xayyrhqjc9U3UDq1rdf/rFNy67cwRdVB40goHuTjeDNfwX3rXb/bufKLvfe/dDbtf2LjeDxpKqG/hW4myNra43QdPKhlTWUHlhYaP+ysExt2Wg1b1paJv7jTsGsaCx3q1dvcqtWtWJHkUDLanN4dXY+JS7cOGiO312xB049Iz78sPH3D9/+ZQbG5l1123pcJ1dvJ+E97Mjv4ZAg+Tg1ANVjWVd3iy019EajfUgOWLS4vNkhRJ2v2rL+xBY94F8qcNyOYiKX+4rb3Dl2morOYqEN1QUuc09sUy+4YQUzj5qJ3/0jkRkDu5TbZiMf+HJi+4T736L27hhIA6rltpozeSFq9763h43ce6Ce+nLrnennh51H/yHw27rik/c6zWEvXT1JhyWU+/BrdUY8qLNc3Xum7g3tHl1m/ut//1F7uUvucFtwZyNc7W5AlebOHTlb+fgRnfXC29w3/fWWXfkxBn3hQefcB/5+GPukUeG3Q70op2dJVy4uOso6EG5dNG6XoQUupsOx4IDhurW63+SNiOdbFjCoRwmtQhDQ3jN4j7GljQsl4NISTwSuQYjR76BGPZAgUt9cBAkeTEIpRfSH3x92CmXSKgA9ygBfZxXwK8/Ne7+yzue5150x3U0HCqYV7yVC8yTjrJ+VY87PjLivusNt7rHHj/nnj41qRU1DTlWTp26nNg4YXo1LGuY7bigTKHH/epTY+6Xf/Rm991vvEMXlsBoQ6RgbjN0qDZrn6xIk8lyd7S1uht3btbvO7/jee7T9z/m/u5vH3aPH7zodm7D6h6W28lHSeKMEYnRgXL0vRA9WejrD86IGVHgMjovAoVa1kl63a3JTNErjLFktYG+NbeivD/KOK5XKHu7611/B7pq3q22K0hwFF5NrOFbRcZq8TVCw1loxMvOyKEDd8r/75//Lg0HSJvxeNZlPjE/VnwbrshT07N8ahrLvj3uY/90GHfpW9CjLbMCCxAvHWkrzDXOjsxoL9of/dqr3Vve8ELcx+m0eQPkkC7/IyzLgPE8HmWHXM0rQNbf3aUbrM97wVbX011xn/wM7xWVtL+N+97ALWGqd8YknBeYopueHsfcbUbyteKJbSaViSOg4bWWvArct4TPJLtHLowM/9ORI0fUDAJyqc7Lcokd8qWHyTbRiEhiLlXBFpMuTcJiEdNSmL282QyRVkgk9XRK+zgnll86PO5+4gdvQ4NcrUq2fCPXikfW9HRj1afs9mAby+tfsw3j9GmtDK24InUZshHz/tCxM1OYePe697zre9Dj7lHPYr2uOUYd24KSrC/MC9SwKasD84m92ze5H/rBl7v/+l++06EJuIvjZeyFQ7OjIgxJfZqz2HaTzBFAp0dx8z2IMQPlXNiwGEBLel4WB8GAUEpi0U8TKBQcF5ZZlBPPgegBGBoHlvEeYIYhC2H+zJO3XtbYA6XRhRS77puwrPqKe/Yal2QouuKHkHUnhhvdbbzB5dw933GdNZoV1yafIdtkO4aix+Ecd+1d437zV97kNm20uVroDfIcl5+iPPYmLRjmbujucXe+6Ab3q//59W7D2g53Hj0XL2pNfEQZNtwshBvYPCTTB3f2ZWqsINocJPOojGgJYsviILiLznZBB9hmOrL7hYOUugCyUV1oSIZvPHrfaUTUQXg1OoAdtz/w+uvRe9jNwMyh6ohXKBkqvrezHb3IrNuCm4gvf8kGd354BsPLS5V8+ZRsxb2LC6Mz7qYdq7DK97rc/aHlyFVOAmNwyLmuo9MNDq53/+GXvstt3tDlRsdmNdzyDcWyh2lonXQrEtu9Lqp8NSniIQQr4iIZngkJqCU9L4uDQEOVBP2Gf8EwioMPdhZL2OauiXNWUJXGl9ZOWdHzJYUphApUdmaXfnqq5u5+8XUiD40zz7uyqeDcXehBqF8L5kZ3vHA7hhcYZs6zMrScWlInjv2x6up+5RdejZ3I2c3T5c2XF8caNou2uDXtnW79hn7387/wGjkHe/4SFbOqjGqUNMpIgKLJOwiI/U6ZQvhW4bLM8JbVQdA6eukq6AZRmCkMseweiFnCDBCGSbKSt0liGjhFmvI29CA2trGJsnvd8wcclxoZmpF7rhU/teFWdDve3sRdwDsG12LJE/dJsNy50jrycsSe9oEjE+7XfvZut2PbuhVfAqeT9HS0ux4s0Gzcstb9/L9/hTtyknvzrDKzdsBrKJplMBKVx8Rdr//R+7HS9gBkwdFBwmJTilyS+l4OB6GSLBaLjgelVEJs3CljSw16EBQcPQsLNndohmsC43DlaWxGvOO2Ta5/Fbaw0F7BsHNLXxGMlRpbMnDlLMNBens73Y03DGBoATuscC/Shpo4dnrK/dQbB909L7tJ5V/pJfBQL+twnwgP0LibnzfofuZf3+72H56wSbu0skrmPZbUYbQTTN8Jaewk4Hir8NTqst2uWA4HYVFZUvbo/jtyoeDtVvC0sft4Csq8J0CDuSwdUmxop/G0357dfBM+/YPNcukCr3q8Y8zz5Qb2Iryf0IJx+I7BAfR4eLNkKNblCr0MvilsefmB775DQ76rdT+GduSQcx1W+GZny+5Vr77N3bG3z41jFBBuWdmFhZ9kY9NkCj9ubuUcJF8PZsWa6xoZGeF9g2UJS+0ghaGhIa3H7d6+/QUo0DYaBSVRYYot+XI0tpM8pGlnkJLAdh3YMLcJ41qGvP2uzF7SGwqwosJkc1ESvTIlX/NUmxsZzdnSQixK6qKJ+Vz9oacn3TvevMft3rlR+a90DxaUDr3Iqs4ObNIruB48wfl93/cC99ixKT3GbHSclNPm3G4SOOkj7CTYg+RthypqxzMh+YaVsV1xbCkdRLL27dtX3rNj1w9j5eFTKApXGOghGlUV9SJi6hwKmZx9NEAuWTJYhjtNN/S3Ys8VhleUumDm+aUH58CVyT388MPu9OnTl+EkpgyvmCwuq7ZnFbZdwKHNSebXYemwfPKm4O59lS2BJ21u6bJYhCQ2etqkH/vWpnEz9ZZbB92rX7zOjeD5f+4SZqAj2TcLvbayob2WNM2KdsSvu6XaEr42ZQJSoiuML5WDUA7bQG3P4K7/BOf/cyi+CsUzl0eEmut1o6nCzYrTBEb7mAQejYCwKhykDy9ZaG9fugsIjc4KOnXqlHvHO97hbr/9dvfSl77UPf7445fhJFlh8fk5Pe/OHg/RFQncss4Hxt78HZv1eDEzlcOuSO7NM7G6xMUCu5/ZRXTDUV71quvdEydwIxW9nQW7WUhnCml77Jb7ufIB7aGtWFq+t7wHjfK5Li4VnMNdN7jzj3ER+FWM2+EYNewtwVY43fcwD8kep1xABsGS3iHEkTgPo7g9jyEW36WUIBYgej4SOgjDJz/5SffBD37Q3X333e7QoUPuYx/72HxsTXAmp6KVF0NzuMWFhZBHE6YlBTGvIxdm3Xe8dLd24l6tuUezQrVjTsYVvnKl4m66ebvbtdEeF2BNqgeJN5TJDTfQHATNqq6q0Ydg8MX3SC1PuFIH4Xyjyndf7Rnc+fco2L+pVCp4Xwjucxbbi5XZ8646cwqF4pgSE3Td7AFHXSEtGYD51HzF1tgN5GkjnI9+MbiBAfs2y/nz58XW17fIHQ3eafUAkc+YjkH/CyVdjD6XQ8vt63vQ8K7bc20tgYdemrsNOFlfs7bX3XnHBnduGMMsODUtlH+ykCBNbVMzkJA31It4YwOWR5cnXImDUOPK5s2bu2qz5Y9C0TfipWvYoYfdBaXOwvToAdez7qVuzeBbXXnqKMrXjwlvVshcI8kl6gqa4GLUNz7Of8t8yg3vsFqqwKsXw9DQkPuDP/gDNzk56X71V3/VveUtb1lUFkHXaVwhWeEUy/shejZkBZaxOJ7nkvLtN61269AAFXzZFlWQZSTuQA/CXq2Nu4Bv2uSeQW9nz5zAYrqYWi+sK4om6VQmWFaK2eWmUAk3C3PIpVD9cteP6ViVwcFBbHtz/4gHXIYwquKrV1oLJUy+Rve7ge1vcIPP+253/tQ34SBTrr1vM5wkzS6UJZzrip4rXaAJZw1f4XC8UYin2/DgDk0Z5ic51kUm6CC8wnV0dLif/umfdj/yIz+Cexh4lxe8MVz5FiqSQ8AZOAXbJeVOjE+7iamqW5MVY6GiFk1H2wzDQa7fvdp1tvKtIDa3WrQgz6BRs49f+T0UMwAf1bVQc1u3rfENwJzC7qZ7NE5hi1IGQRvAv641hWLYj5WilyQeNFyMMPJw8s3m/uG8c3S46eH9bt11P+x23PIWELS76uyUekcWEB3n/Pk0NJykyTfgoAC644sXK+78hTF8g97Gp2be+bO5FDY4Cen6+9nzLd45yDuNpwtn0YNggMmkG74woUdwQy8l4DId6JTjszXsT/O3oq4wH9og/OhsVxR8XfLJQS4asBfpH+hxm/DAFlcmieZSr/cYeUKzpwqDDtBHDjIUGQLmys+XaLENGVB3OofbPTj4ARTwtVnPYc6xae873NbrX60rZq1a0ZXL7vXgOw+N40jfdOrz8RasB9el2dD4zqunTw27ydmlfXdYaMShMYR0nQpNk6H9TEzPYH6ExoTisBGcODGi3bRBZlPmpQIiW95B7+tbmvnrI4884j7wgQ/gKcFHVLdXomaoXToHHZn26O7qcGvx+le++IH20nCcyBDgTPXtH/uX5KnYyeR7kKFAvWTndMyzEKHUGEu5g+/C3OgHNSHH++kL2ITInmPT3h9zm3bfg/Ur7xhq/vInGAKrTboqMBuIScrekPF8uEiMKw/sw2cbnjpyzo1OTLlVrbY5MJIsQWQxjhGys0rHsw9T0+o9eOWdmpp1Bw+dd709vLMeKJfvLNvgRQqdnZf/0g8Oq6j71772NfeCF7wgKvvQQw+52267DeUwfEQsMhJ2PrCdc6dBT3ebOz05gedm0Dw04lBzM6lhBGI+EXMyiurVn6QPDQ3Rmaq7d+z8eTjHz2F1hm/yapFzjOx3G2/6V3COl8s51Cd6J+DD9yyTNpuh5cjlY/HqI+YZl/KPgNd9kL4W99g3z7ozF0bdNBfQEObPoz7PpU2HvCdmZtwEejU6CyeeZ8+Muv1PjOJKaRPTpc21uTTeRS9qVag5fqHQBx54QKT33nuvzl/60pcWytqULtiIe5FCvIDJRGsr2gdgDLwwoZ1FfsWTdECQGj8/jtwXwEt2zjSYRySdg3fIr9u+/Q3Q+528cuAlALjZid2pF/e7tXve5jbvGULheGmkyqEJIwXv4G10fhBecxCiG0JG34CqB7DF+UBb8gVxjx8aQy9yxo2hUcobA8FVPJ+f4MuWTVdW/v79T7vxScxHEv2XU71QC2W8p+pKw6233ioRH//4x3XmzdMrCr4NcHk+dAhsJ3xFEm3FEOYnhgcDehDs5GqaLTj0XPo+a3xNaS4X2DzHvLQSnWP31q17oP3/y7KhMHgeuL0wO7Hf9W1+LeYcr7ErgUqTNWDpSxjLx/nHFTSOVGqqHg3bgWHW1x446i6MT7oJPKBEWsJXOjBP5j2GoRWHV1xq5RBl7OKU+8IXjrn1mIQuRYNdSLmoB3vYiclZf8may4JzS6PuDHfddZf7/Oc/7975zneiHF9wd955p+ABr8SiDlY3XPZmYG9RQXx8wu6DyI7oLbKnT0nEpY7sNoEx6ojKtmdCcCFnIRdfUC+m2elScxBmxlLgZmXrXyJvPPBdKReLrS2V2WHX0fsit33vm9EIWjEeLauguUzMN6yCOAeRsdgOxgAAQABJREFUgyxRw/Vm4KcH1uPt6p/89HH3iu8857p3t2lZM1yJcvosc4Ll49j/1MWxuDrT0dnivvbVw3gj/KjekbVSL7emqWexinURFw2u8GF25h3l8ozA7Tb8LUWwduCwsGJDYqYnJ6fdBTxxuSrM0QDTsArNRVXN4RUvsrmA92JxNOPcW3bt2PEOXMjfCzTJ6dlX3nV6QTjNGaQR9lf9Dp78ehFe0oXLc7GlVkPBqtNux/O+37W29cA5ONZWMRoFhSu5XmG/kA6rXsQcckEmDA2IvGfhKJ/d97gbw8rR2XF72fdK9iLB7U+PXtTyLnXi3IO9x8c+esBtXIslTKy4rVhgA4NSZ8+OSR8ZK9TFZSjBhkh78rwUgT0pl8E5ouI9m5HhcffMuVm9xlQjDijMlawwS8nmIMHS0oJNgKXqxn2T9+zZufPXmcaPSl5OYwNbPswpZEivDXVlZPomaPF/4C45M8XLgtvczNgRt/32n3ZdvRuwbs3XszQXQ025osWgVYm5nEgUl3/gUu+m9R3ug/94xB18/KS7iFfGXJzE/RfktxJOoiEB1D8/PuHOT+Az1xiacFm3FZ9e+MLnnsCHd0ZdFyfnubq9/PIuhJOT3XZ8FevEiVHZQjpegf05nKI9L39YZVoHH52YndE9Isrkpe7kyQt47y+amNIwFPNK21WD7UjDL4VxFQKzXwRo+H/t2bHzf0IgGyTba32XA9DiQvOWjQz2YRfHno178Gym+0N5MUpWwEvfpi8+7jbd/ONuYMMNeEhwbucwNchJPVleObuBl+HIG0zrMMb/y7/4qhsdmXSnxsYd70Mst5Ow3pjHCBzjFHoPbkjk6gy/VHXo4DPuz/9qv9uOR21XamgVTEsdevDNksNPDrtz+EoW31R4TQQ2A4SLGFIx0HZ84vKJA6fcOr07LPOE/BwEjHIYj4dzVGbOuMrsOYCxRRoTEd52QG/0o7gN8dFB7PKAeF6dr8hJ5nIQFaPQUf4tjOW3wj/LWKYtlqeedr0bX+k2DL4YUxHk7QvLgtaHgIrvWFXhCM0MUM9zJWk2iG68C/aJwxfdh/7uQbhlzR0bHtGEWU6yxDmHnoklYs9xYuSirq62t6gF76wdd+997wNopNnrba6kfIvl5ZWa94iePDzmTj59wU2U7UZq0Hux8paKnvaaxtzj4jTuEcE5OAwdxvt9H3zoGbwD2O6kh7wad39bq+I9tfLUk27DdT/gejfc46ZHDmA5uxNjStfC/YAY0bwWM977sPrGG4hX5CTNHIQeV9k9OHhvrVB8O7suzTvUsLFn5sbXoVB43xO3dsznIaGUvk+daxgWyK70TNPN4DWaWzZ2ug999Cl330cfwroCXpAGJ2EDJp6/K3VP8vNHp+OE/Bk4xjPqOWzLBIdVk5Mz7v3vu9+dxCtHu/BeWjrvVQko8DSGn/u/+bQbxpCTW8up99UKwTm5BE7bMZRwV/DgEyfdo4fGscuAF5PMVvnhHPX2zRVzkwo6oI6uNdjv91a3eueb3RTuxfG2A0IrmiycpHDP+OjFj3EzLWB0kmZtnfTzhnomalHZu3cvbr8WfovTHyrMB51mRg+5LRhada4K844FGJqFlSNBmnbyLoCnQd3MYDkURecAbLRwEm7x3t7p/vj9j8FJHsYLAVq0qnTsPMa4mBQGDcjLstXLqBOppNEahvz8cTHgyLnzmHPwu4ecc2ClqK1FzvG+937BPfjwOVwR27WSFPI0CSt35LCTV+X7v3jCncaHSEdx1WZIG+FKaaN2hAqaxDI8nZU2o7NOT824z3zmCbdtPZfA87WhWwOmsRk91B7IuKBVLuNNOXhLyo69b3IbbvjftJuD0wAEOQl6qJd3trb/PT70ySfqeEWvb++knTfkGIb8eG1qbOJnsGp1K4dWWMLF0Oqk69v6Grd68y0YWnHFKsfWPAPfKuIQKxSuOfUloXnTzU/OnuT6wS73R+99FC9P/rJWcybRgA+dOad5QnAUVlDaeOXPEC2HSLIgDZ2P+HE4xrELw+7o+WFcnSt6rxMrnx8DPXt21L37Dz/jvvzAWS0aUA/yXa1AffkxoQNHxt2jjxx3I3CQSdxMZbkXY8+l0F95QiHO0xi4iMALyhMHTriPfvKk9mHRodNgPUjQNSz7ehqcaFq7Oe3clutf6Tbd8uNwEjz5ia8IIMhJcC/qVSNnz+MWhcIChz2eGqd0AlM4Ai/bvRuvCKnVPoAfPyYIXygVKjNPu8Hb/jWeju/HlXLh3TQdafTME2783KOuc/Ve19W/HVmygCxsaDmMA5TAmuFoDTVnEBunAB4WcF4OTlwQ4aT9818+407hlfy7dq5xA6t7NDm8gCEXx8Hs5imNy4zMk3pQdvhRU/YMU9gyMoKr3mnc3+ASMrewa6MdCDiM43fVH/3GMfcH/w+GVc9M4qu3fKPi1XUOWoKBztuDudmRwxewn2oz3k1W1Md+VuqOvukAm8KotN+IbqBa7zGL53j+5/s/68bHpuEs7IWlsh1Az3trU5OjaPC4IGMkUhk/hjMcHLcMKtPnXN/Gu1x33xbRkWnV6h1wi7Vu+NgnXEsXHhKrlUu8yGOec8vq/oGB88MXuBWAV3dW7YJCdJAh1PUR6LS2t/+X0GBeh4ZRRndVmhl7ApOhf+XWbL4NS7rz3O9oyM4a8vDp/W5i+DHXOXCz6+prdBBRsUWyqfozI4rmYKJQLuZAoNB//hypIENDDOwQPXJ0zH32s0dcL6ZsmzYNYMm1HY2+jK5+Eg1/Uk7DSSN7B658MU6HuICVqXNwJp45pOJKEKpWk3E6Rgse+GGv8Y//8LD7o/d8w3V1FLXXijforCwNRrkqAL407ujTU663s+p23bARw9BZtwrPu6xECEMr2pAO0uqHo+xxv/C5R90ffeCbbie+6ci3LOYCDMiL8SQdhBXdxEF6N9FBNtOT1BbY7FetHnQ1PJw3cvyf8SCunKQIdAVt+iUDff0TeBP854ewdQpvg6/LMJd7TAQHUe8xODi4EVeW9+DKyrdMo2+r4BmnPrdt7/dgMoVpCfvsRdQ8CzZ8Zr+burDfdfbflHcQFjpp4GrYSFtJM2ex7BJakXgHAlIxz2enDEf5XGzjPQi+wOC+Tx13Rw4+jfsDfM6jW6/756S6DOOzV5jE29i5wZBb53kTizez2MuU0BPy4Z5WzGdIz0o/c3rUfebTj7v3vOdr7uFvnHfb8PJsBtWVFFHymjhQp4HeVvf5r5xxz7txwPWt63GzmAvwTYcMvJwuh8qSizriEvjJkdE4V2vHF4KPHTvj/utvfcpt3dCBG6ikTAO0wT+H55OTI0CwTvEqdPYg1awH6d2ATzb0bUUdsbdmCSAHdUMnqWCD78VTn3YtHZsAm9VrSkHzmtUDA1/96kMP7XeOm28v7SRhqwkdpYxb5O9Ad7ZOy7qltpbpiwfcllt+yrV39aMQi+k9rLCcAtfQTSpYS1cZ0tpoVjk26qyrsmaEEjwnImYbPiy5G59D4xDod373AXfdzv3urhdtcjfcuEHvi+3p6cB4vVXDLVPYjrwmkJ+vqBkdmXDHj5933/j60+7+r5xyw6NlzDXa9dNzDCnjNRbnBHgDtuT8yZ894H75l/F+rrX4DY+6jf29qg6WM1TRlaoeeg3WIFcQbZUv3Dxtwe6CCfenf/zpeBe93GSVz/SxoRjlmQt7J6CCirITSNsJ4r4gW/BM0uzUiBs99XHX2nl9oVaZNuKae/+ebXvuPHhs3yEws91zhWvOQAdhDuW969b1YGX67VIGXlLDVpK27t1uYOPNmghdtvFUOGSykIm9t0MwB7VO40w3DSKqowxJf6YavFnH1+7s2talt/n9zYcOYdh00G3BVWzbVjzRtrHH9fbBUXCTj2N0OsbExAyeWJzAnV7sGMZnys7iuWl+CGagrxXPdvC9u7YLtale1xCQ5W/FUOsi3j/1p3/yRfczP3OPq/XU3DQ+F7elv8+2eEDf0LgvR/XAy6s57kdoSMWhla3y2c4CfjPlfe/d5x755rDbil7XPs3WLDcOU9lzwLHQhs0N8otDNkFnBScBPIRzf+B2rG4dnDzvZiYOYwTUhzY9i0Wn0upaqfKXGGbdzU244KToOiGZPDoIc61MdXe/AY1iDwqG8VpbaQa9x6abMTHv6ENDWXzvEbLgh3MY1JsEoIfkvb+ZM1DvoH96zgmqSzAn65Lr5ZOQFysuBXPItRkVRKlM7z8w4r72CIyJ+QMrWjkDSUfhNzV4P6Mbv158IJQ3Azm/udZ7jTrDaDt5H75Ce+jIRfdH/+Nz7id+8m5XxBOHXN3bgHfm9uGNhzZUoaOQ2xppvZw0rQsqAGrMsBXDKN5BcObiuIap2RJ4Ky420+79cI5/+tQJt3NrJ77CZQ1fWYkzHAIE9cgJOoa7yMB+gURn1VIOwgR14f5A7hMcvPVt7sAXfwPlgYxiqYX7CaHTncePHPltkP57/DR6Il+zkM3oa4UfIQGLyEZdaut1/RtuVMO2YjdjXwAMlmbZ6r09mICVoNY4l6iMsJHiEqxksKZusTQfNgA+f8BGTifgtowNa9uxLaTD7djS5QYxceTb2LduwqOgWA3jGxHpXOyF6pcjGxW7NiGsB14M1g6046u0o+5d79rnnj5xwbXhmZoTmCMcOXteixO8+pM2OMt8pQmOwZuho1jYeAo90vELI/YsPoTQgTrwnZQzp4fd7/33+9wn9h3H9wq74Bw2b8hXr6UCjO3OdCCECrG52tyaODmn3tmJRF3giIX7BHnfbsft/1b7B/HwK6laUT68s634c9xniHR5yPYdEtcQ6D21XVt3XYdB1W8iwzbcxi+Upw4V+re83q3d8nw5i6zVwLoQQM1dOPUN7N865Dr6kkk6rY8QKoDXe3kmDhHmaYiwqNGINvImMIn0WDBYUsdMJqGBzp+lCA50GDoAJ7TsIexsaeJYRc+GQFvSwbsxTBzGl572ffqIW4+dxtu24mPEWJe5MDYBJ5nGxkFbBmeZySOLymYAyFa2sMEnJ7VCNTam8yyGpbzgMLTiPgfr86EHD7nfeeen3PGT427TOhtWeRLR6dDEwOSdnhrDYomNYCpjJ1Ah4/CTduzDOofXSt3hVg3sQN2FSXomjjHyc7Ns5yq83Ly02g0fx/Jv5wbIwFXRGtrL1nZ1feDBi1he8y0jL8F7TrFUew26sm7sr6rgXOILfPo33AxF8Pw0VncaClMvZY40PTzu5iUNBbG1WSu1VkdQBkHMUuS1MgDUJHgqYFgZSPED9bqaMB2kKBoTaT5U43LL5aV+y55Ybi5Fd+FZFa7S/fZ/f8C95hUn3L333uy2bcdrboG/gN7gHJyFD3214D6PHv7yBqPt2Mtw2VsvpfC2pGPw14LVPtbfieNn3X0fe8T91YeexLyvw63ub9N37NVwKSSGrJ9X9QtOPCfp6DUYZbUy/8DGdE4G0s0C6LhvkPsHxy886cbPf9W1tK2z+UiptK3a2v6bYPtx/Ng9NUzYbRWr4F5D2VSmWpnEO6xwte/dpMbtbUL0IgNLgADvZuF0Rx0FCmU1ZJNjAwF5eP0CQk7QyNPAEnKhAVGAIAEC5pTRKPXZDWG9cljE8y6s7t3/ldPu8/efdq9+xRb34hfv1HuqunG/iLbFdRM9Cl7EgaoMTZk1wobeiuVv3mgt4swan8LWkaOHnnZfuv+g+8hHn8TyedXdvBvLyrjQ8rEE5kfnsRDOPtnkpDmItAAjmZOgl4Mk6eZRDvPwJStsQdl64+vd4194wMqA55ow0qrCoX/sup07//qJw4c/Af6GVa2W6zdvXgu3uYveiL0v2FaCTxZvehu6x26A6FB5pZorMQeUDkEZEpEYwzdcNdg6+aRqyDEBZo3d55ngCFGyDiZKD7NTSOBcZ3Qv9dvmxKrgvIpXd4ZPfPK4+8h9R93zb+l3t9+20Q3uXOvWYkm4q7tDW0PoDFZDHIZiDsd7R5h8n8NeryNHzrqHvnbcffHBs/QCbBzl92A474FzUXh9aAr0RMRhRKAehKBcowASaXuUYj4hJouOHOYjW27+MXf0a7/r2nvxuEZlqoZ3l1IQJ+x8jphbnplTFNpSae28FXP+DfBqbN4tFTi86unfccXDK2SiXHi1UI56cCrmS7TwxCmW6x1IZxihmx0gl4VTzxLK1GyYxRYwhxMsIJdmOT8rYWHhYR3mIwxHjl50Dzx0XtWwCbANGzqxhaYDN11btUWdS+CTeIb87PkJ9/TTuD+EnctcAVw/0KKbpqwX3h2n+RXC2SfnPmWEbDnRQcTAx4atPVmbQpeGcImWYjQaHc261ZtuccOnvhPbn76ModZ6bEWZxVaU0u14avbfHTzy5O8OoRfZh4m7mHBowWMmt/LJLfRCcPNyS6m9y3X2cDsWusNAdblnWof9spUGMrPCR5EEAW8nn/BIOVd9486TGCVgOf8SNE8ow3oHwqUAhg/4cPaZflufeE+HBsD8BM+SDG7lCBwNHT3MseNj7gmsfLHRaw8bzMZXa3ZgCZzL4Fz1Y6CjcSjFQMvWh7QNGB5HRWIqx2IOYjjfkBK85ZMA5o0ybz6qsXnPq9yB0/8McZiwIwOWB43zP+zZuPEv9j3zzBkIUYulMCxeFfRGMHZDnH+0dV/nWtvxHbnQsOfNch4ks1DDR+Y8Jw4XijsndwMBmzdDOAaCcM5LErQ5Kk9IiQuka2B8FgJSW6CDkDNwMk8T8fVKq/GxIi6Fb1rX7jZiB8Ea7HPj/SHOo0mnJXAuBYbgo3ZK4MJn6RiLEda0JXKP3TKjENi+uNSY8ATUXGcbas1qg+O63T/qZsafgO5tmLBz13pxM+4Q/1vyDtlcRGI4s9pBz+IHC6oVvBqzZwuuDJicyVrU4nKCdYPS3jsGHUQiQ4FibURAzChAIoCRZkDADByQAZClFfN5yegG8I5hdFbWXG7fhonMZnlbG5zzDW5X0U/3j+x+EOFm3oRf1ZVPNxg0oBsQYo5QNuosMJ4xmhNl6Yxu7phJwHMy217oWtq3oR/AnAJzC/YiaLU/iU95rNtnQyxlTJfcQXHwj0KtPO7aOgcQx2Q+NmBiLzPAw00BLvtxwt9YmBxEiQCxc9Z4zRzSJJCkagGWghVPASltiOfwuUSg+LY5p9VtlsDR/r0Ngn3CGeAkSiIl62BiboAldZkQZNDAgCYrBzEnyTsL8uMoh8HQFr/UUSOlMp5GHHDrdr3OzY4fhn+0FtSLFAoba+Xy270Irmi5IlRZ7XuLAnusFtyer1fkUnnOhWcxNbQq4BFd7MJsNIDn9PbI8GRsIlUwQ0RaeT5pAwPOCR0TljS8Uh4fIOK2RJNMvw1A0TtgBG8b2cQSgkXziCSmUvK8oTyJnfwx5hNIURuZqABMzkDGYRW9gD/PgIaue2wSsBgPYWcAKWjsqzfuda3dg2qbyKdIP8Ds9O1bt2IfjO9FCOwyjciFwRcmMZQwr97GcIkj5cEA3M1LB8FemOjx4JT8aJ0kNx9NIM2NmBIETQBLwYp7gMUt4V3GtEiIst4qCPx2OGfWoPHMQmaarPQBGs4BH9Jehq/PTCLwgSQTtigY1ymbXbA5yrFRSSp4oXF71oQPAK7Z/io3O3GEvQh9oYK8buwstb3OS9KqtrqSKHpxzhjZmkXMULwPgg+40FFCl1hnNCU9zE4h4c/RypAoUKDK6ALE9EBKAI+P/ImWHpWRBUDgSWiftdFgTxYwNGsrf0jR4NEiiCQpg0dkYqQmsHgtVE4JbZTumdL8QJZzDvUmQTi/2YKLbuRPZV46bs28htdX3YSnLPEsj6YAxlctVH/YS6hxDsKbIzGkV/kIvOwICoOM+ZoWbp+XbPZvPqioqeUEDwZgZWQhjUdoMyBgKVgGFMCb0ufXAPdCjTeVEHN71kUy06O83kYqZNPiJ8CUFoyWNLxPQQxidXRmQKPL8HmopcRuctFe+KcQh1tMoelmBTD8Yo6QyycW2/FmlL5Nr8VrhNCLFFrw9CHnNYVXDiIggjvteIeXyeWNQqxjz0wq46wZG/ayjiiAORy6Q64WqEA0EH51hcsMG1CZIZV3pM8bPvIxLyP0R+ahqJ2axj0QFCbe0mncJDwLj4k9aaBgCYv7VGpT0UQqo8+SmYGawTJsfbUbZh4eOQcas4XgFGRgD9J84ccTX/LEITV2wLt+zEUq/M4l3tLIYRa2n/SVqoVXUwC/gXVS3RiXY/GMxAyewrIr/SXlL4yAwyp6Hifp5p1ZZUBCzja5hImP9VhPG3JvwpMJBVL4QFR/ptAMZlFLp/GQ1bPmjML5Uso++bi3R6ShjbwZaQDFPQ0SipmxQkpEqf2yuV3G5xkpMeOLeSZ08I3Yg3hqndimfL5KX8aBfseJflfvZte26jrEJ9GLQC4CcNqfyHv3h6kAnKJabFnrpsefxg1DfGeDXdgVBcrkfh2+ZoZfVeIQix6fBm8IX9BQbTKZWd4T5+nq8ZEvNTBYPJdkiMbLtJNhPSjmY6p4XB6ZKv6tG482siIkVsgaaq50RiFrpvbwddaUNAEGboJSlgiPkTwT64vtB59Xo4dYiD2JOU3meAnvoqJsoxXXhhvjq9be6srTR9lWtZpVK9Tu2rVrFx5DrLmvmwI1fJF9lZsafcLNTnPPPR2kmfYL1yA2XHhlDa9r0VNdEunlNhPfBNbUsKl24Il5xZgJEtzL1CkXb6SRpIRQeacKLLz41xwlG1QocWM5vWGodUoHcOASKh4IN1oDBX5QG4JgyfIRO5ErwUfZaZ6eUic4RehBwtngfpJumaUci4qTnY919OC5Es4C+EY6c0y3tVgp3sw7+V9SiWrc+duKycoZNzF2Sl3NZecdDMAzhlUqWHVKkyJdDgCPhgkxn1kOHuSwyEGZcK4ztBmddCT2IcaVIYAeEPMiyGDKN6E3cMCRLCKD9G+hM0oX9Uc5+K/i+DL5kwoEhCVxtH8rp+KGIcJiIQ2SJNrMMDH7lLQZTwoL8dBz6Ayg4HQQf6OwWYYLhKlzgnLcf1jER08xC+cbUPhcFL6hVrmlWCqXH4DxzptHVGr8jMfomQMamwW9FphXnswXRhXDcR2eBKvxG4L1j0gGI6TcTWApKK1sg4ejp2paycDpP6Nhlkr52mvqJMIZj+Xr+VN9r+k4nSMoiIj9h5I32KSO1OgE9JhMmDceT4Er5GXptJ5MA8CFyugFD2AjitJ8EqcwxkqH/YhzyC59Aj7jWHAMrHS01o5VuGnILfB8qTbvnyNUai8oPn7s2Ek4x2f5mkcMgaotHbvd8Ml/clPjfK28PRm24MzqCGUgb1CO9XgvhPcqDU5bZYZSLNCmcEOY5LRyQl5BBNOIR5mgNVR69GIS+Z6NVhJSXDEfL0Moj+cp4k3etXmE7rSBqU2lw7/FeSQ+2EJxX5LIZDxklBgvy+KWEMYjPVpCVMf14pinhzES4zEWIAGJMy60vNYKk16xEU/zCGIXf6YcPFCF/Yft3Vuwof0i9yUCiKyLhUG5JN708DcUzAw5i6+V8YrN4w/Gsd/iMzWOWDAvgN7ZNKj0dZgUpnioSkNkxgHc4yUh5QPAUJ6HKY9PK5Z8eToCPCEwjKV5WBrHSEMJ11CAXplq0lZpxlRSqW4pA1kZQ9yoSCRIOCHh6TLhkcZ4jdO4wjHkE+QlaU8eIMwo0cTyBSybe7CnCNT0Glx0U11Clos+Y7kXnUFbJ78wOMz80IUo4y1ykPGpqQ9jN+MB9CJ8gKTaii3vZw79pRs5exDPF3Nn7+WN9aS8CsCCYZQFB9Er7pSSNRKD5I2vlGyRmgw2CfaBjMw4oPG0FB058sTKlVj+M8Q8PJ2JMCSPpr9RitqA4oxQ8RoPYVc30A6x9FAFevFf6vHg0zyHkNIbIbAZPsY9TjI875z2j7Qhb2OIUk2NIKXujKQII7V6ERYicxQvj/mwaVnz8nIu40QxuJpzH6Kauq7stKXbQAcpnTp1CstW7r/Z/RC8dxue2dq53T318J+6seHj6H74Wk0yUOlE8QZdjIZGtcKw+5qKheD7tUJIpSjuAWk8ywvQFCE9gqTsbCKMljoogNbHICPEjYb4ACHO0gRGDsPHpFELbQfjoTikL20fkS/xwfK1/INoKaRieI0NQXBmDZUzK5rFIj6l9fYQhWeIdHmJ+ZTnU64Jc+SlzVKVs5TFItJ7gD8ZWKOgwL0EZz5Xzz2DFOVl12r8dJXe5FA4dPjwn2Bv/+eKJdxaxJds+QZt3gs5+OV34dU93wRPEY7SCk8LW7dQOEoLRoDXEVfC9xq44VFv5h4/Cxh6H2YKfBXfc0hMAiD5cbIDTkrEdA6VkjHueaxR+nRgj0kPgNyIinFAAjpGCPC01MXrQ4iV1Qv2NELbgQgFYwu8PoOAXLKzyc87BYUHeCiaz19glcI0MCVJHXksltB7bGYDkgYOCiSHPymeAgzjIZE2Y1AsO3i5GT5w4iynCF2EBjwg41QA7VC7M8KTr4EnE7u4GNtvyMdyBT8GXhaIqdVKhR9D//ElLHH1o4FXiqWOUq2G79x9+Tdc/7Y34vsgt7suvIir1NqhMRvfby2joYD8bsjs7JSbnsTnvkZOutGz+93k8NfwAjq8bwk9UqHQBQeZRJwFwQ83gNJ7QKy+0IWSQkMxKCy4CAOFsMo2lIcyrXCgAW18nFbZeLmgsWfYVVLFqUe4EUXprA17EtfyAiDqwbigJKP9/GocpZNV1xxaUSFcgZgQA6nE5g9MLSJAhv034TH5eXwK8/HASTuEuGeyNI4eESlUVx4c4xldppSX4GkoPosGacYXUiTwXNImpMQbD0KhPu2cRZiGjZdoDhL04CKSz4ogNsdycBBOMlqefPLJA3gFytvwkNh9Nh/hJ5mKLW2rrnejz3zcXTj6Ede+ag9+g3gb32p0Sdili0FbZRYP7E+exl3449g6fJTa42mtNa7Yug6W8vtlCu1wkAnRW96mAw0TGqkYadloEUFwMFqeUwfIHIMVAjniy9OQFXdFVVoQ5ZyE+Vj+zAemAZ0omR0ZhSdYgJgmzvzDeIwacbIwkUWUIjSIFM5DL//k9cmfLF8KjXAfEcziGQQx+zcGIVh+H3yZDWxQYTMCmtN4eQw2ysXBkdBExcgWQpQHAOKZBhaj7WVTHnLtAotJ2iFOAWb1IHKxZ3JT/zL2IfKOBLVgW4LkkeAghJaH0K734f1Au7ZvfzVWs/4aw601eHtFhTtxW9p3YFcwbp5UptzEua+4MTyeSwnUrYDGX2jphcN0w3mupyzkV0EOfmsJC4mbkOpB6KWh44plQ0Q9Co0hdamiNczYSC0vZep7FGXOGvCGi+LAnToS9ZzfSSjJdDAnYRp6SDZzpE6AMc04UYIAowhhASLKQOA5gTMR4rJDAyDBhajJDCmfaTh5cEKDaNbAUnQKFZGQESoRMQUhJtPAIY6zRcELWkN6OT4vnjyviCM94fo3QtAYKhwD0tJpPma4YPDEZozi4hwkmeDLPLKNoa3OTmEFq9SFeFUtDL5yLAzqJHmfnGSo5cmjR/8FT7LfiVb+T/g6Twnfx8BQq1zAKhQeKCmVi21rKy2de6qtXddVW3EudWytFkur4A2FMmiwajyTOYcko+B4aKrCNWa9/ofGojHMMN4sgTJaUvBYWUZLoow+mMdDouGNylgDLuRJATF3xb0aJpnk+JFCnEobMB4pmAkjNdoAE9wogxSlcBBJRCWAgGg4ZzyZ+CjAcvdJXgG9xtIrZJaDeiHGwiOCTvVlDWCjEdaTE0MxnoIRRAPSyzGoieZR/55GemYEgVNiPFh5pAB/ATRnCRxsurjx7HOJrIuO4CIH+ZXytJsaO45JRz8vhHh3L53GHc05CGXvc3olfMuBo0efPHjk8GvhS2+FSp+Aw07h/UHwFWyad1Xs+62At4xfFbcY8cMcHq+nxFsq+ZLKwjS7kExXKoE9LpUxdYt2dQ7YUGCcFfVpb/QcKBojVJLJMNKMz8eADHQBF02PiMHiERHGrYp9QimjENIOOoqOMrwcakKY/gQXgGAEkxzOkS7Qz3MOPNk5ExecgvJi8DqFHA2e6Wm0TJsc08XiBEY+Xy5BCFRAKsY9JAJSXIgbsWR4CfGU8Jn6XnAKN0RksSG0JdWBkLZOn0i80Aj4ee9vdvoiXnD9GEZB7EGC0OpX0yFWKpKuKec5dOTQhxH/8J7t22+GX70UQ5U70MAHAeuHkl0QNoN78yM4n0fPdAgT/Eew7fEAvOSvMKzYAzhzAwtvQI7ivUkYrrlVANFschUVUn0aS5sOtciqq4eJABPwGSwdRhnY00UaMYAF+WgIBI1Bkg63RIE8bIiFFK8cPHldDE8IYFRSWCYYY5pww5uuAgHnYf4kOk8vCmM14rmOCW/INwcKfAIaJo9HygOiPuQRLIF4/SNvTGf8ZArFDEKtak2JFGfxkHGUCraQp8FCSrKjXl56YDfx/hiMRiQrgFPnRH6OdmEJcaNtjo+exFx6Bi+3xupYAd82VBaFB+dyEEpn7gxc160ePHoUa72Ovz/Dj4EOJBzOSW9BlHPXDe4c96orK5LXqhcwD8HddJZT0mGi2DjRJAHPTBDch2ZEA6bGofF6iTJs0viNxJCqPMmmNpCR0NGm0UmENj0YDfMM+YJyJrtpRR7RqHIYQxqo4ChsAEF/I8ylQGf8wiVRpRd7UA0aU16UT8VTglU00cKnKcWiGa2oYhKphFb0af4xXkcHnkxEyNeAGTyhCRby8kij+vD2l7GDhdkW9J4DUVGlywrslbgCO3r6MVdqx1e3amXuNGFNH60Viw+pl7iEZDZ+alEcwiQeZzoFa55NnHf+iGe6OISPI/LHOJrK+bR56BqNgld4LwTSYpmjCZkFMyJSUTsp7o0bDZfRiMPTiD+JMyMlJQ7xiEOE/8J7CiEDvZBGE3QSgxKIhT9Lm2DKMX6LmXzhKDv8KGexIfAm55hHlBXyAIBR/yd0IBbMM1CWTzNmZTCcSiGgEB4VAUg3iwMmsMcpGeJmF0n3IBErntFY7skx5OMvTNbMAh6tK6yQBtAizywHt5hMXHzGjT59HxaiNqJVV/niBjTo2r9gVTe3inUp8dV9/rrvCdP2z1LW8EkrOg3hSNfGdMWHFilhZXbc2Fl4KCJKnERDKSFCrmRYRLjQno8mz5aHmV1GbyReGBK8rjMrSpA2JDVpPn9RWAakMWKjoRjGPL+ddJR+QpMiltJDRGK5UEIMQjO/hYUgv5HaYxICi9YD6qBKJjAaywdaSmZRWqlok0iT0se48UVJSvqUoYzd02f5pHmErIzPY8QXbeXrJdXFRPpMImGgmP/8/7d3pjGWHdd9v2/p2ZceLiMuItkkRyRFiV5ES0psIWrACYwEoJQAVoggSILERpAE+ZLNH7J8SIDAcOLE+ZZ8UeIARmIrsaMYsmMocdSyQ0oKQxIWRVoc9cz0cJ/hLD2cmV7fkt//nNrue697Zrrf6xZpVfe7t+rUqVOnTp1T261b19QPI3v37DdYvaLdFzE2uQcxfEmpb6YH2SgXlST+SpzIJi+3Z6cC6/AGNxAfvSUhwJgIGTk8db+HQjPmcUOCVhr+DDWkLvwWG9KkPMp4/EO9SeIp8iUk+7e8ikDg3DgIcV4UY0j5Wt7cRcB+2RchG92HMCO9kMBvnrfhJkKRn5CjwSO2YPiNL2M/hN0fYouE7t2s5xDlkMBpRVLKx1zEiOGIrUjjhluBk9EShdDKOTm0zOosliFqncfe4Ep+zF+0g/fS2y9Xl3i+p13sfLZNvYc2Kn7j1MLC70AEjR2/M1Yp36I8jCFlGfiANA9xKARLvTa5clCaC4B2w/mIhAEtyS7PSSBvvQdACRp/nJAburBDy+OsBF6Ebeliaw4c1MSPkYOe7qRXKkfQPfcoFnIkec3FuUoMCz+NEhwjR92Cz7IZlT5FuCcFhSshBJd8NRjQFCFEybCeojSMofiU3BPVcCEUoJZHDAmY/Y5hCPVsAy+GbH590DM7aoR2locQVA/rqHpoiLN6CvWdcaNPZZM6atvU3mrx/Mnq9W//YrXn0MPMj/mKFUxoeAXOL4QULM6O2c1GHqv+O65UIQNjjG9ir19lUlTM6aN8hFYKVEGXpBEYFKglC2lLPEtVRMpbVpr8IZnlYFkkfDz6N5yMZXyFdA41JCEG3pTM/5yAkxYt+6XYiLW1uxNT3iV9DxS5h3jhKS6jWzjBQgpHMSyDWFiXkDbgi45gOUi8/W+AC2KgEPCcggM9JiAMgEIc0PrgfMRwtbFeLb33tq2MaldHq72HoZJ/9i3klm9q5OgP/NxphlWvPVedee6fMTGfAcfKsK59iKzE/tf5hYX/DlC20R1/DzIL2Tl+fMUrFtVCMNHgYWFv7RJzKw6FaOpAR5+ySCFluRHPbEw1IWtWutBDmN/sXHFeLJ+m1PEUk3sSUbVWQeTMr1oWb56nc+m9iWEGHKNi+cT+I2pHnqOAKj7NOf9i1TmzpB5lKB7vgO1cA7+DJAwceYkcCAlYBlsqK32CuScVIyAbNAOh4TLzbCXfQNsBhBPBAheY/4MVPYGOoUe/BcDIODGffCeuqD/pTrN9oDr7wi/w/csfqw7f+dHq4JF7eenpdl7R2G/boJphY63o6iASnbVwnX2Cl974v9XV879Hz3EC8uigbc5tTrGN/bVes/rbnqdfx28gc06YsizKpz7LVUMFZKNwZxGLX2HDoz+QiUqrQpgiSkYksDQS+oZGAnGQwNh8uCUmwmTfyVkKQb1SoZ/4I2OLTeMhz8AqDm/EDNphuMHqiFNKEfWbsM3rxMuIiGD3FF2DFmQG4CmY8kmenLWQSoVVMMYmdPdktBRRV3YjleOMkgUDjFuiHfJN2BZnQCGJUrwVfse2mJQQzMKvlHJJVvJYPO9w7HuQzxicrc5d4mgFdL29905eneUYn313slFWz9v0eGGFvYIX+JjsmarDnsH2/tttS5TOi8at8+xOW9cv80r6U6+eOXMOv1ZqbZgzdgOZC6zzcP1CX4u93lWRH87Gihdtc2O1nxjvQDyOAqfxP9Lx+QhRktSGRhLjQBmBJ1YkR++BzBcEX/RYyks4ZqnyKUuvCp/LCEKYKMPEmwzFkXU1ozY8C8nntOLNwU43oNgtZFWCLK86QKFAbyCiBpUMBpzxXAN7wK75Yqk86PFOhtQp6B4PByA3l17INMjSicUYQwIUwpY0+gMdJUhe4gKOpQmNlktU8qvLUM9CGvQke6YeIRU11l+3g0fWry8wL9E6EdvhGbk0WofYPHuIj/0cg/46+zz0kXb2UGEc7I06w16Qz8+fPv3SbDXbDrtJxJU91zDPGC9WvGbVucwREDIBjeUEs5JJkbtr+uqunISBuoUWXlijjQRUUkuso4dboeWXZIMxiZYpckgnDS4V3od14sEF7kME4QgmdrkG7S3TKSpUryW1PAw5XeRxCk7Mwroko0kQPJ5VCRnpH4nmmjQCP3BYS+QBuyZ48lDW7DeChDMEn/8TFaAWDn4lSPiO6DHuV5qMGf0FJOVdjxPYZZ9xU/7GZLjQdbChQzWnFN1mc1/Vb+2nOVblGlhqRRH5OlZvhdN76DM03yADvtL7H1tra39//q23Lgwah6iPvQcJLKt/uoxfDxL3RpjdGWZ11t4rKkScR+WlMJJFMhjiUDJTLCmrRd+ckSgviTsalIWUjyICfa8X9SYG9BRWF+JHMK+YaChKZ2BFOTOWRwzW4gRMFW8YgRr+lJ/DN70O0NgIV2U1F24ZL5YhQuoIQ4ahEiWUMm0CWrlSyDwxdwL+T2bRE+MEMuQiTlgZZr4YjOzqHmA2SjC6WdIFmpZo2QjYaAtdOqPseE7OBXz756LHHNoW1e/9Dgn+3ZkzZ34/0GiVPUekOwkDseLwTau3GMix1NvQB0JDftybRzjBbhEmi2U5K4yUUngUjVv0K5CNRNFW9KT4ErCpvSeS+IhzOhKKxQfjStWRDFJshfyU0q0CmAtXcaWhqBcSZbncq1hISVKcG6ChOW/uzVcjEillcPYVcYVX5YmuBOeMh2NNFAaupZCSRORwj2WOYOL9H0DAtXDwCw0aOWSRIex+Q9FFLuRnKUKi7E8AIQb0APNQuGpAgpMccpIuwyS+ENX7V+z/+wqrUH+CqBnGLfoA4SH8dCT9Ncp7ER5Otar2883e2rfsNB8jtvF2KUVPwkAs23a7vdzv6KURMWrFQbsYD9L9ddc4/5el3nisUBz/lz2J5DlsJKJkERDMvYP5JTWLU2YuQbc3NyhxYIakKKUe7E0MTEqLt0vAU8SAoShGRhfcKGOJcaYECmT0GGV3gYPueN4MDGrr/SFdogOy/SmRiyIQJxBcpOfBDFd4lGGITsZyX6YRYgwnY4npFArIHjZE5TQ6PiSy2ERAfBl3ugzxmNA0Cx9wNIYe3W+8fnLBeoPYI0RME3EMFHcN/RVXPHMoYoNXSON2xvD8/Pwqub89SNxenFpn0yLLbtkwIhZiqwlK8CAeIoIvStOrQEB+irV4C5svhN3vlPCnoKew/PwiFMvfZO6MGMyoK/8BmBMTPKYzTFEZ+A0EQ7TT02EBbfvJsLudtWpt9Vq1snylWl5eTL+VpSscLH6t6qyz2ZPTKmk0WdP3MwI0thYt52M47wgf4j+msVJGprwsqQyAjXYUnKFJdsGJOM4hQs4h86d4IRW47vWUIY2lTHCFQhLSWTthBlJHIGRR+oCg8GdmZnTCiFahDM5dCeRvznqHEONkbZsaB/ET60FkeHqb/rxabdaXQ3ur4nCQdeeyLfW2K76may6WQQFVtFpsh0mm0S8Bj1zdsmTIgDSeCr8n9LD8cnQPhiGakpnE5hBugliEEC2daBhKvgAKtIycRRgNLu6IDqkiBHKeJmLHCJ2Psb66XF1771x19crb1fWr59h2rR8Pv7TruWwxSawed9/BO6pDR+7md7w6yPkAh47ezff2psGV3FTfOZeS15inuCuKADiUx/gWVggHr0tUAZzycJ8CCTVBLTKESv8gbiICbsAL5J1uysOgpOZPdVfKI+IAN6xGw1Z+ZhYWOgvDiq9c+nPSyVt0kxpiGdc0dO+2MBXrBkNBbEjYu0pLuMzHS0ATy9xUmd6jqAQSXN1IpGSm1Koko07IpIvgCJtKu8cEGnGNti44w48CBUv/hmfRqgY8BrOLUihoMF08qdMysNeuvAXvFmOwdDEiRgGQaDuNc2+8VJ357v+qFi98L6EqRvvm7NQOw1NioBwU0OPbzFcvXua8sozfBnfm8T9bffjBT9sp5foozEgnudUiElMBXsTirWGHciaMWtiQjXJKY4gxNBCfidyEcUSGrWZgqt4AeKZUuvhpVJwvZc+oUw4x9XbuEzEQlssarAjAc+90w3q7QRZ10IN29VrBUuRmRiLUvARMEustpN4WEYwGQbr1GK6k5o238nFld6NSeldSVaPjEHaPKCozp+1oSpAq1ED5ImziLJX504U8UnIDCkeV3axeP/Vs9Ycv/OdKDcg+viwsp/1A3guIqwF6EFK3rFc39TxJvYmMSIfxzb/05erS+fnqiU/9RYzkYKBBAngaoKJclJXd3Fdg4B1KUaNhCCF5SJduyWPELVTIxOgGFMvFEZxW4TfAwCXJdkQPQqNqtdboNsxABpJuOzgRA8E4rMg86n9LHrpHHRAUHArS2M9KVlzqzTFCuCUjUXWaEpKLMjIjkAKKEFdEZ2BBQmUJX640FOGIQDYUDxvcDIVwMJ6A6fkpjQBy5kkhh9WUSyB90WjKhlEyjn18/qvXXWY4FZ8LebKNrs4nXS6e8BQY1AZDrburS+e+U51/86Xqvof/OFMUx8x0QljpEjD7jF4RYyhRXhG/Fs70RDFRKnGCX8m3YxxWbzE760EiQ/U7fUvcPZ7YqWNsLTQRA4EVYxLbfoNhllRVjV9wRDW0afE9KrJT8ZJ7FnDEMOHS+pq+IV4pqbcTRjn1JMIH143E/VIYZSjEem+iGCJEWzddcKMMRQwZbqBjhXGinmrQWETIkeQLOOaNIQtEnVlesl04xot9mi6ibuner9Z5riR3/dq7zO00VxXjxpDA5s2h7BNKod4B1+MzliEFMgGabsnjmcRrLKiFY3rH9ahhv2Uw4iLMxKMNH6VKnj54rLDNZtjOO4LGdkCF4m6HzOi0PCU8T+Fi1xekQvXpjCwqtatNi2YFqcAFIVImcPQHADfvdmNYItSfnCKdjEPqYYvSxYgnDA+HdE6FOOEkmCUi6HCLMpDDHdGRI9hxIn7AA7hnj395O8+5nN+tXn0rEU9kOcLfhmAMRSJ/KoP+En+JjQgPuYYEEdPwDRZTKgZntyJtCiuKgNIYGqGQPsSEqBAf0hnyphchxjQj5iCKZfbe6zbDm3ibErvlyEkZiJXo8NLSGxjA+boiEKVNi5xw0uEkRm/tNuJbQo5x7rdKSAKLogdHeCA7OtdQOQYW1D2GGLFiGkVmPOEq5E4xXtGCR6juClisZ+XBkDYFAp7w5VjGpYU/cPh4dffMT1TLSxerqb3HEJFWHrfq1Lv6QODYnSeMF1YNIRZ/ga4FA79lQUxOgnsKuwbZKWWKCQhOISCHfBTlQpAnpDFgChnZcDHU6LcEG140b+Qvlod9Vpp/GbNlGs635ZsecYhVxmzbPykDMca+fe7cEtX3ZuAyiIybFKK7hIFw0qKV1oc7o0sTBaRY0vq/+xMokLawU3RIQg75hLDdhOdYdisq26CmJCE+5GYpIlxRKdoDTpErwfhznIisCD3DaFcf+fifru689xN8zes8y97a3ayD9/a7AqgcN+Eazb3sXp3G0C5Uj3/qL1dHpu9h2MqLP2GeFcslBfO/QNTYcSYjZy5YwRwnpUgIBQXDUTigq7DBGTQFHcdpOjApe0ywyd1HuCEX3WwUNUJlOSG912Zp1F3KfRPSNx01yTmISqLFydew7h/Pz0LEG0Xvr9pKlr58myp0E7YlWMej/PavllOyEC39c8Frc4dQYbUJPDFpbqJ8wpxC8xk5Tyef0xmaoxiSVZkwHC/cLK38Hp3jos8TCAMHH/Qi+nDkx558ujp/98erNxae5SzjeYttc+JYe9/t5td7M7ayZTmKI2XAtbUXY9pbLfOpvIqHik985q9Xd93zBDsUeHZiOEExjUpxqSlyhMNcwV9KmWAJEvA8wq41ekBSGtEmnSPFjEJPkII39lBcM27oqK5t524oX0wsnSB6udPhVMIJuEkZSDXLxHwOA6GMJ8U3k2FpuLwqLcXUUu+1qkuLN0VlF9XgOCOu2UgUKYFBD8E5Va5IangCL1zlp0j3b8VQLGWhEKksRCTejb5y83zKm/ntAhIIWqBo8iT8ngeerI7f93Em2OerC++8Wr298K1q5er5hK5WpsXDDp22L2PpdrpIzkcTd374yeqRH/18dejwXbwTwa4ek29gIlIoeK7HECoAg2UoShXwHDldB9OmcKBk4QS8deMI/OeHg9BSD6IhVnbKgKrtL02vrq69luFj803MQCKHtOKnpDDco3l4lMrLs5AOWyumeD+YQgJ31YppR91lJMJzYvjRdoNs2JuICpUWcr9ZQ7E8RDhqEaxFUxQ0rX4pIFeUzpLFdB5wHKGlMoogjQR/LeYQx47NVLfdcaJ6+PE/xZDpMkvB56uri2+yfHuyun75LDugr9tLZtN3P8TQ7Inq9rseq44e+zA606ETuYzehHlMYRDKtJ49oQLg3gBI8GQqATdFeNKCvmHmaMvNgvni1VpmKqZuxcVnH7prDlIuiAY6yPTa1Ic/vFad07tO43UTM5A59F+sYu8LKLUa7TwTlZC1vKt5iJ2TpS0nNzYO0XNH1YiEKaXVBmHS36A3UVofdpkvKAAmY1kH9feA0XLKgTODR4jTcV7CFYaGSlAYTcQt1C+AtBUHQ1lZsrD2Vx08eLw6cvTe6m56F51lrF5WQ1Ht2dK3V3TvcQrg6jXezuys25xGAsnc5dzMNxBRw0xxBdRgKWLIMETTsBOKe1QnQajywFJCsPCtX2ybkiUTLX/2U5eyhZrVxeeff972YinbW89n4xQTM5DIKG9q8Z5jVwv1RwOMMlEGTnuvOtdZ1WEuQtfZsrceb61sXgEb9SbKTf2F8tJ/EGxUJJTXIcRbttlQSClb01WXZEAWiJTKyjc065scJV4DTsg5QgfuHssrPAbn9eiqe52HqLQvOn1DE3oNxeTvYQwde7DI8jhGpV5Dv0K1oRHLU8+mhmNl8/hheI50X52e4WcUyy+LIkds3zgCf3o4KBHRQFgPYkOslA+tkslP8w8BFUiR+LftagO6bVMbQeDUqVNv09IvhAFWYJ6bliaZV+koUu1gHdHYjqA2CkSVpRoSeYWjlHJ21gKVsgPJYQVuTmiYUgb9hUBAjFCLsSiPF17xS4nqycVR/RfoFfzIWGQYZhQoyDrfrdBO3vXVJRoUVqmI1+kdrg5FnoF/p1/yKZwiYwLxzyRqcREhoiqNfobh+EVYEfZn8bo4oqHoMhZHMxH2X9kWHNuw6w2KyMdcqMe4xJsjx5L/5HbzRv5lgOr6vouB/HB9JYuWr8dp7/Qg6/z29P3h2VbL5UZS9iYSIPIaHHZJrAKbdpFbqEwfWQlKfJS8IxJ0gEnfvLEeCOBN6Ma8x3kPJEA91lDKSyRVwCxFkUyGEro0JzeggI5aJIi0aqBYihBpcRkh+YZoE5MildYDGS1Heh3EzMdz19DSHKMMvW+u98sjD7bw4yG9vSo3QpoesdXrRHuQ2TSj6r8qBmOBjFm6DH2Yp89n2dQq+sFf2y0fSpBrjmy8ch2kigyVKTDAmspYtMMCVkhvyJGUUchYigtk472GETHjPaOTyl1MN3iP8dyNV+JVjkipvBvVwfShfBlPhOIveiJIhMMv5GvpPMMEEXZGK2hYUoXH61Ru9SAaffjXpOI0o54Pse8IMvt+M5A5lz/jx8Z3VAAbM5hHFwmUiTob9WQcHYZaWx9mJaLmcYWKFab76IoVC9lQAr6hC18qEgsgsoasBA5MN+HlvzI+EYiElDYAc4ob+2KajWk73Tol8YyzKC61vCM4wIUTnNGIZTSYEUhkEi/EGVqiGymM8w43YYhlH+zUus8IJQF6yXOdHWfmRmuSk3RlEETfegUj0FMs1nMNhtFrfsVnd9fYuMeEc13vh/Cd6nE6KbkaFZeps2KrXYKmMRC9FlEhVuhK4WxY+hBnoBjj2LF0lkgpnBSeEO9UIjUPpaiQR8DZ/JYSDVAeSJXQkichJEgoU4owj8wCl5ByIMNzpJPIYSMx9ot6DfaUaYjFzotRmzr16EDZcgtDrLmxc7EjBrLSWzm9rz31Gtx/BKWVZF2Vmpy0yOu3egDUYZil5UzfeDdO4asVktxGG0qeoziOlMTUBQ5dhf0aNSiQ8iIoCY6qdE+4eSCk41YDeyTX0dAUfSNPSp48tRQZii8HBnBGxTlytqN6Yq++GpmJBKT6fByTIRYNKROBvL0/8wNK0/jp994VE3MblnTrLE50DgJbKk3zjTfeYJWh8bKNJctCqGXgXIc+S5dSynX2ZnmjkIWw9aINppShRGNRnPLgF2CuEAEWogWzNMZdPc6szhECTqKo1LiAH3BK/OzPaBG9fhcDwtF94JcQU04B4uXM+OIlO8nZ/oxehFsmAe5ZZaqO47IT3s45P/mGHkRF187v+kNCMaNprXZrhPcHhDleN2kDqWZDqSjIC2K9NlG3jqTD1verGEazWltj86Lt+afIE3OuQKrw7OQXnKt+JmeHGU7yjhJXiEyJM33RiUlH3ZXTZj+P3YiGU7dyFHkbyVwwL5f4AMdxQ5Yhb6NCRiIRLhHBgikd0J11PCRMrw9jJBxXa7uWxWfh0JRlupH4CH0gtkDconfSQ6zc7TX6z1kllHu7BdC7IavMsQ7fb0OsdZ6s630Jq8wtFupmk+U86my76kUAABiWSURBVMMv6Y4tEYuQLROrsnwhQQ807TmEHtIxDrBZiQ+FLVtNbaR05uwW/A6pXTeOqaHdUqCe92DSnKPVhUVnWMT2uGF4jJ/8XXlz6iFDbirADLdvx4hqM0bmy0Yb/f7ivtXVaCBjZ23iBgLHmH9VrXW7397bbGm14TZ+KqVKjpLp5amLtBB0oSjdKseSTnE69846ta7KMRqK/KEijFPe48BArrKhUPatitHJ4Tp6x550awuInnhzF0y9YfqJVHIxnwgIeUgUt+CSEcQ0kUwMp3uOMF8KJk/GrCMk+O54TDV4Z0ibE7WewzMQehB7uJwZEsdURePi1LlzGn9NxO2EgZjoX3/99bdOzDz4EqrzWfYeyWhoDohCsfqdS8zTl/hWwzHbm6Ul36kpzlfNzdxECj9MtFTgAWOBl2gcSieD8RaOUgQ+ZTjRMKLxlIZjxmQGJgNCCTT7TA5ZmKR0y/4UfVOeQABc8+VghAxRibwPRewywPanIWMdcGETdE5od3mlQvFs15ZH3nzej7hVK5Mix8X+ThiIeFU+NAf9Z9GMz/rSRGw11VowD+E40tY+P91jhW9Wt9s6/2s3Xd1YfNu15O98m4Inf51Prd3zfgJAHoQWxqO0ZjgYhoxF52KZ0aj3sZ5HPZKMRgYkmrp4nUc6MaxYuaQRyePwIiYC7O7sDCHXcHY7INnqxS+bjyIXfy+GOUhTI4vIu1osgr0uww9zEpzeyR2r2ykDsVLxfcRnrHUcmIc0OMSht/Ju1Wceoijt8NWKls9F1Nm4Uo615DdNzCtEPUaunBslVk/iPPs9VioUZDyafOplqPUIV1uoYRuGYcM2H7p57+N+9Uz2QRjo6i8aj3wmU2Mp0ov8ycgdI0LeL3e9mqxGqcmePetBeMGuarAdKTQ40U4o8dlQJhV07G6nDMTmIb1247lGt6+3gY7zU21SKKJ4dbS3dp6WgqfpbVoJBLPCsUAaZu2ucZC9KSNbHnhOszVeBpUW9baqjIqe46XoyscOsyA37zWE77/avMcMyXuect6zNR5Vzu8X52ohGbhkGEbZM2aHRy7jQ0JOazcDma1mWRCai9Fju++Ugah0TXb2nmce8k2GEZ/r4YD5OyL0Gv0OH9ZZvcLQ6gAKwddFENAKr5Pu33cURRl9msXYpHADQlJU7Rcbv/K5CpTZe4/jjWE0JG9L6HQYiur9D3feb5iZqedRD6NhGj+9gGVDuTR08/jYq5X55aGboCU/zkOJuzN+Tcr7Vv/GL/4+81NXlcwf3NlDQsr7mvjCOHLkGBndKQPBvv0VXCrhayja5ySEVGHm56n6Cp3LwbuseGotV9WLMBdp83FGnwPsRqXpJJI1hkXFYQhjrIAbk8r1LmNAaClJ9qm30bxHDQkPXBOG0NX7yEDCilsYwmn45osOwbASbVH1PKmW5C9ITtjrS+q2rR/e6VMZWWAgej0ii0I+Ra61mt23A0M5dowc7piBzIXlXl6g+t1mr79KxeV9WTbM2o+BvE1r8Qiy8FdwVUFLy5eqw4c0IivVYYwS2JSUjJjezN561AtM+aXITZPtSqQMQRkPy0mNizrsOHRzTROeFg1i7xN6Het95Hejsmc+I2hOqogqQ5dvB2oXr+YfjDnRiWuUTaqabUCGTyN7cbVfWQ9Sixwjc80x0roRKZuHnOY7cCC+EHqPosRa7tUwS7sGxJb3MGpJrvOO9qiKBzhhp0ro2hN+LTe+f52MJ/YkQfGtVzElw3A6tll0lSHt8grvw3OM0FVOabx2nffir75TbAHaGQnoEw9u6/DH4kifM9T8GUhSF/PwNanXFxYW/FjJCbG2o7U+G17Qomf4bTMQHzd50dRd6KHhEj0mLV40CLXaaxzusLzMwQTeRE5IFINkvffQ9hc979jZvAd5mWx4U+NBQW0LUNLNyfKink67KbyRRBVYuOl3dWhi7r1tbc50oXGaCCmLt6h4xu121EDm0jCr+k26R2ld0W/qHesDDLNe90kZLZx3qRz4rPkI+7WuL/m2f1fWSdcY74CjHCsr7w0Yh/Ld7DfuKtpdepK9Fkz0XCI2WpPiSPXawSAkd69jehBN0Ps8KC8aR7bzWOUzP/lD8TIbrWkCjO2ogcC/dQ18OPHb+J/1h2IG86JhFP0eBzksaWtNfSxtPQnbUK5d9wOa83xgUobSr5YwyPhOtDMotmjJmOBaly/7th8wwe0H3966DZXBaWxmXINxKddd9eip9hrHDrmOTkreFBHS6/TYpetxdhoC9cgQwRKv6S3o9qbqnLdYIXa8N7XgO+3UV3YYEf8q98/WV7PUixzisJOzVevwfVRI0cGALKPQNpSrnCi4b+8Re5CoJ9GSj+hs3/mwSrSuc26uuvpQF4E0K1oYb19wjt/JRuHjema2jm/1Rx2iUTZ3kWa5dkEntEkxPMR2CQj+BEqewM9geCMJ1BubjbA2gusB5ioGsocX2rR8PAknSWmlcJ1XsJPMMcw+XwGw99BzUfXos8nHOtGh/vcCLzl2zMzthoHYdgDeQv9yu9/4p/Qix1FIFZByc+Mlqv76W1V3+d2qfehe+hw9wc4VHIWnyaQ2Nu5hY6M2N+q8KO+WoVIzlkD6hoLTJFZLuuusnF02Q4x55aSsz793suotfwdDvg1uw1xJPQdjZDPo1KNoGRXx6ngjW1KVX88puFsP5N8X1AZN6w1FQ34ZkJQQpbT8jTblh7cNja2QT+ZVvlJv8JfBWqAWEUhkmRsllFXL7gcOUO5ijhiQt3kjf8qrbzOq7tLwCoPpr+vESBqjgl/Fg/ZOv9U6FTIeVYBt8uTJd8NAVJgWqw/vnJiZ+XWU4G+yd1Fv5jsvCF+9SPfqmap94EOg1isqllpKpRWmZSpNDxRbfJhGJzRqD5feSvSny8LO6Uu7iQ24MATXuFfDCBmdFGDYOHxFhRkjOv8AZKXM0UEgEZcfo1blWqXKiPzNON19AQIc2zaku6gEStbzBOPQ9jUzMN1lRNx1dli4q/wOczw9IFScG5VwFe+0srGp95LhkZ8JIN5Dr0aswcUW5Syd6KoXadMY7ZnS6wiKD3yXiFvwi7ZGBlqMcbnDADDt4O11FvGWe7A44cAK1n/l1OnTWI8xIY4n4pDkrjgrEL3Hf+C7e38DqVCT0RHFp6J7qxy3ufQQvcg96FW9F4mYko0mkXJq+XUIXcVGRxmH3tuQ0eTNgK4cMa2MQD+l61AROgI1GoZXUsQMd3TBDpLWkqNa+QEFqmNL8QqlI9JbRXkiZvJEAHfKnqpaHoWZoMqurLcSzPn2OBmfYKUyi27MHx5kSIPGZj2YDEvvtgQDkxzNAMGnN24fuJv4Oo8qg+ZlrUPaaMlZwcjP8uK6HadeY3mFN0u5JznBdY/Gyj4v0zjIPZQxDA9A1TxWTgogBZmI2y0DkWSbJ0+ffo6tJ19hPfupLr0I1eHarha8ebjqvvdq1dp/B0ITm1KEjZ0LNiQnveYP+qkV1+BEf17hqvQ4Z8k0ZRQjDcOyFJ62w/DGIwbSaLPrOFbYhixl2o4SwoPgDdPHCCm5ePaySSGT3gpsLnlCuMxLfv1kZTQgnLff7xJGw9zoopEpPuDyzaPmPT/NaJdDNGo9hYY2fRZKLvDw9k5rfLZnJDKIlhmHHsbW5Q93OtBjsO4jUqPPLndzYnpirt7MTSybkYStVhHwL1nLoZpPjjLrQIc1Pod8jc+L2BbwW5GDlMgVXj2MyTRpldORQUWcKPOU/UgPFbaindVic4gXWVwHqJo5/aR18SfkUT/AN+vK5JGsFDr+yFKKnH4BbiworZz4xsikcDYvYs7G0KXRPMjvEL3GEaKO8uPTC+ya7afVI0ucLpKbRsR6kKje9+Zkl5LXPDIOPZxcofeo09FqJg8IVy8AZ8OqGa4lVWGaPCtZYpz1YiAWC1ijPa7AbhqIFKl56uzZr2Egv91kqYSSCuaOym60pqvOlT/AUDh6VUOAYcWM2BO+azzMs4DlN0yhigpTvqogpgB8pICxHcVoUdl0iny41H9misIpfnhJh81RdvZSNLS3u/YLspA8CouwvJTf4E/0bsINJitIR2MLVWCvQVs2w2SzkZwPy79qbGL7pjw2d8LVT8+YtJWobhykJ85663UaJBlz5sM28RL9XR4VzIdcbpzh5uxsGrtbQ6zIVJBq/5/TSPwZAgMGC0TDpUvfqfYe/yRpYiXE5DtxR/7MaboMK3rr79DC3gFPyY590Nzvv81Cw/+goqfRep2hqh9NX+OQwlT3YQxgL0rhOwSrSrUuJUFT5JOLQygP6aqe1cucdcBhGUdo/Py7tkRKYrVYIVhGBk25ERrtJ89G6wCriG9W7e7DWH59BSnSFutyeni7xplm+/Yertp854UEQNWhDrFhRqE06nk059BZaHXjUKwcvRRbjnTkbsPeAQnyZrhB26Ml3m+BJKCElioD/9jdbhuIFZJe5NkTDzz4Rdrdn+lpY5BPOigsLRyV1VtZqNYXp6upY48heyUp63bsMhkg6L2H5kON5hHyV6sbHK0/9dVGO39l/uyZn4tg7mKw+bGPfay1vLy8v9PtHaBv2dPqdNrNdvtQp9u4g5cJ9zNU4KPm1T6Qj6HaDPh7R1Gr/XRBB1HAg/iP8kGgA40e44xGX5s7p8E9IByTUb8PqnWtZgLKVD/iR7pRShtgSqKkOLy02v0OQ6il81X7yP2oIHPgYBCOk69ScCn6Ot+b1CriFAdutG3JXUNbJ6k8NFfRlh3HZS4nQzRjyrTcRxrquLes9/9rwysZOpUBVr/xtcFUkwrvtoGoXCoyW7R7/2Sq33wKGRxHnNJC700QlibFnfdepGVj6/uRB02AnizUqQhMxElZeDh55Sy9xznjo+g9pDRtPbAC9mvKfpa9ZnPeoqlM3ZdfflnWrAMFtBy5VSc5NJ8kt4szMwf39roHUJR9bOfbu6fROILxHOq1+gdRQBkOL/I3DnFq5G0Y7TRbMvY37LsS/aN0VdPwux/NZElIePRq2vxWNY4iS+vREoOIv9E6isxfYZHkTsoNmlXJaHlHRfeFEe8VZLeCKwX1afMWGYmcwUcanMtbH1bqrb5FqbW8mxokf0DY711q9bvPGKEiMoTHfhtd4rFnc0OCMtTOwzMzf4Ux/C/Xe5GYVi35YtWe/lQ1dfRBBwaBI/KINL67hggsZXavs5v13TlUf6D3qBodejx6j96XTy0s/DkyliKn2sS/EVOCp7jZwj9HRHAysPIX4du9K9/WzMxMe9/6+sFe/2CjO7X6BIvlv4USx4cNzpsa6+7VqnXw0WrP7T8UDORWslevkfFjb5Iho3wkYBTaeY8Rw+Vn8LJgkIez6q1b9Dy/Ob9w5vOkHpT3KILbhg0PfLdNcksEpFity4uLL94+Pf0g48xPIAjtjiv409iYd0aW5un+eVd5Dw2ijXlVn1GXlHfSPQW24EKtYhy95QvV+gUaK2vJhkhpzVP1/lcvLS6+QawqrFCJIfwIiMzafQGjij8QJAf9Ig5ecyrU4E/5Caa7/Wal/NVsc6ZaaC44LMbrLie6vcXFxc6Fq1eXL169uHT5ypWF26aPPYby/VB4YCtaOORNuXsrZ7nz/fX9nNa0SS/iacqrT8QloJszDqWFTQxiffEVu3sRnCb60IdHdUm/iLxfmKWsCy4rR5jQNQpuQuRviax46T96x6OHOwdXv0k3/DinWhTzkUCLrlstm5YmW4cfZYpynJ0bzIltPEv9WyVKD+RupXghjQ3pGR+p57j0TUho9CGdiTRFt1pnxWqKIcO//d7Cwt8iPPHJouW6/cugQFSw7kceeOCj/UbzeXSw3otYft5zT93+marN/ji9wOSyGCS1XeaQL71Hl7nH2vnfxVt71iTha1B2qeq0f3j+zXk1SGKgVinb5WBU+qKFHhW947DWxaWLK7fdcftXOaL0L9DyaJysp6ShVRM/mtxpvqqJ3Kmqd/11DgjhfQEZhsa96SkxSSTS5DaSJTjCk2Fw7zP+XV88WXUWn4OWFqOGjKMLX22onVnr9Z6+cuWKXl54vzoJpX3pypXzt03fNsUa9SxGInkXeuE9Sff6ScTDZkU7minqZinf7YrAaa5fpveIr9gm/ddiSEu9x2/Mv3b6lwN/6mkn7gpBTDyvm8mgP1vNtl+8/OKFY7ff/r8xkqfRWW38UU9SMxK0GZ3WfBPw+gVkKmNhk6OWB1lRUVdt1QcBS2oGIKORIeiun1eKPePgwIgO+786iy/w3EXLucw5UgUl1lUpWjmqeOz/+bNnz75KWPOnHamsxMV4PdZyXFq8/HvHpqd/ilHMAwy1huSt4VZ36STtEDOWfbchPvWssdjbNBStaLGs1116lwWR54PsI20V1muS2z9geHUKAJU3XDnCHLfbZsnGzY7Tm52dbc/NzXVOPPDAj6Lcv4Ui382SqOYkUsYRPAdlVy/Cdoq+TuETop4So+iNNiuozF9UqdbDEKdDyfwLV9cxKIyK0x2J5B9ck39ZQaJm2qBl+AYrVz/Lsu4XZ+FnboL7gJTpDjk1lN1H7r//oV6z9Q38x3mCmbf+RCZoXPqdK8z/jrNY8gQiZRItl4a1I6rGMTa+aibPcya9Obh67v/AhT4EIHbMbpVOPbaWxJ6ZP3P6M4SVSYoUwiTdFko0SXYy7Wgkj83MzNCc/SqPpT/Nfi1EY72JJLgB74CtZ+BuBqMH1LItRg6pIpWP8NRr0xLqYZgqxcQ+ZBiApSwsmILPguXfnV9Y+CUImFKJ0gfBzQZj/8jMzKdpz79OmfZuZCSswdJcLFfNg48xL3mQY83U2wZ5p15FUgE20kX9Vh24caxdeIG2TUu7GtbmOmDI123hqIOn58+c+RKROyr3jUowslg7DZzNLXTrxMxD/xhN/zk2cBzQe8sSnIY6OHW3m5RDUfwSRvSESrK1yFhhIldziuhgnFN42GtS/cz8a2d+BZjyzLVYS/L+DcRG6aH7H/qTPK/+CiXZG4Zb6rkLF2TKR1gliuaBh1gOvpd2hr1cepHMhC3R8SvXeo2C6iL8aLC6vNezfpmNuev04DwU9kbMEJW6y3i2xQMQeo8zO957iAtZ4/etW3AlNGVkjPz1O45N/wbMqgZm2Pukp806PEyfHMFYmlLYqP3xDkguVNbIu2MMXGWBotlq8U/qF5i+PzV/duGrX6i+0HqleuUDZxwqP+/o9GQkL/7Bi/Mst/9PxPk5hpSHka+64IGGCKnYc0aeuq+dY9VvntHRRYarDJHSSpdsoZ4MsTJM4z0PltA7V05WXeYcmi/qFYeBNkcPBkVA7eBfYu5xlpD0VZW5Y25AkXYs31vNqDGLcObCeP/R++67p9NqPcWwRw/ofhwJstqF5Gitwk/jZy131WtHSIjcbzVBuwUpMS2W1Qm1QvAc6P9m78L+f/1y9bKeiKsl1SrPB9rFnsTmJI3Wr9Fr/xi9tmSkhmFEo4qYJVW9JGbf8ZDCM+drsUtYQyab0KtGEB3zw37nPfB01hVGYUMqF/+AUG0pnQexP8+Q9h+GfCG8sy4qy87muvXcosInQZ24776H+432T2IKPwnZP8bvfjU55mQweKT3wUWP7kIyROHHNAH3JVL9J17p/Pc6LjWklWKkfAPsA3ubDcPbJ598cmrxwqWfR0R/T8LCUOIKl+piwIFhsudu8z+Ji1+a+8mQEKNtucdv9TLUGatuaP9aUxjHrzO0+umQibKP9RdAk78p0/ejE99RYZPQZmZmpvd0G0/QffwIg68foQN5hInmfVTEcUyAJSzrAawOrW54xRwTWiPuLQzkJLicG1x9fc+BA99kH5V6jGrWFUU1nfIR/I+IizKueD16Fhn9C7T7k2pEMJQ4BxTOBq5Ur1K/NxSl5MxqCAeK9rv/7b6ZmT+v1UxgMsYhS9og07GCyxKMlfAOEmvM+vBLAhwS4okTJ45QmXc1u122nrenmaro4Yle1ljqdjqXq97UleXe8lu4+nkzPpz6o2oYZfUh31mGt6aoLfbL/Szi+zvI71H1ADQqGtfy0CkNZ29Vp2QtkMEKwvvT+P/lqbw7eteMQ0K41cKUgvt+9Ks8MpjmnLf4UvCbdaWhqdI2bOZuluAHDK9FeUyeH/rQhw4e3nfwaSzjryGmn9AWKbcT2YqWxHn3jY/BgB/1K94lkiDbBkah8xfoMEgvxzTn/zV61T+af/3MVw2wiz1HyD8VIIY/iHczmqJgg5WlqB8YRCGgTbySnbQ5NTwPP/AAiyStpxDhTyHEx+lZtA/IJIq5mOFYOFwYzmI2mvM5ACvRN8CfZS3yi6cXFr4EtPsFRgT/xUcDu95IlcpSluMH/h9IYDMJREPRkDYqcevh+x7+aNXufYJe4JMYwKNEzNCj3AmOhrVaAdTJDIskPovp8AZa4xn2r//+yYWF7xIXXeqpImA37/8fhdcEEzxnxnUAAAAASUVORK5CYII=';
+    private static $smile = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAAC+CAYAAABwI0BCAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAC4jAAAuIwF4pT92AAABy2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBJbWFnZVJlYWR5PC94bXA6Q3JlYXRvclRvb2w+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgqyI37xAABAAElEQVR4Aey9CZhmSVkmGv+Se+ValbXvVV29AU13Q0M3CNkw0IIiiIDIwx19HBSvu1fm0Xm4Xh1HnYte4arXmVHnzowyXhdUkK1lNaG7Wbppuht6rcqqzKx9zX3981/u+75fRJzz//lXVWZVVlVW25H5n4j4toj4Ir7YTpxzMu4Fl4EKsn19fZn+/v4SwpUalTTs3bJ3QzlX3pnJlre6TGZbplzZVcm4DRmX6QFtl3OZdrC1u0qlrexcMwRmvYyiq2TmEZvKZDJTwE8BPg760UqldBawY8AfyVQypyqZ0vFKPn/04MGDI6Apev4qr8+5PAH9ziEZ5bM2r0S/4FZQA2wc/xKdjMIXnEYR3d4tW7aW800vybjK7ZmMuw2IGyqVyi405k78Ip0CaJ7pFqowiKuJnJjSrLVyyIJfCcY3AqM7AobhsisfAN2TQBzIFgoD+48fP1sjl9FcH6yt/wWDoS6uiKup8SuSxmoSmu1zfdl+1x976N7e3jUdrR13odN+XSaTfRUa5EvQUHuymSwav6mHTd7+XTmDllzBxZWLGTRr2FEJRLQJ2YUxgBftFr8srghnskDSJxFMIENWk0ppaN8kzokZlhR8wFy5XCkDcAqw/ZVK+TuZSvaRXM49MV+p7B8aGpojTcrlfDiMMCnUC8FL0YDq4lIYrzOe0GI1WmzdurWlOZ9/DRrtW9FQ34AGuBfGgSKhBaMJ47+Mhl9y5blMuTydceUptGi0U3b9mE1lsq34tbhMrhmwBrDl4Ie2ybaPZPArlwuQNO8q5Vn9XGXS7AJaz7hmJN9mcjINsMXIT/vzRgjDgWCly9z5YQjYBQg6AMijsLWHAP9GQ2vrM0899RQSjC7bhxT6nas3bYxELwQurIHnu4FUGcburVtvcPn8e7KV7LtcpnILjYKjBMcDVymWKqXJTLl0jt1+Jpvf7HKNG1y+aa3LNXW6fMMal21oddlck8tmG0iABgvxWUtCIwUYaV4UR6GwCnj4lYswlgVXLhUw8My5UnHGlQtTrrQw4UqFUfjnkPwZ0C5AJowu1yHDcTQ+Og0zGEsolCNOJpOXrSYGU0DKzwLzYLlc/hIs4uvDw8MnjFnXTB9GqH4avv0EfOFycQ08Xw2kyjD27thxN1ryT6P9vhUNq71SoWGgZ60slMvFs9lKeTqba9zu8i07XWPbRtfQstblG9tdLs+RgoaA3j1oig0fDm3Wazf4PlrlGVPo+SWEILDQjDTK0GhK8zCSGVcsTLji3KhbmDvjSnMnXXnhKNIpIg+d3mgawQwBFdiK44+GXWMwJvsMcF8D4efK2eyXDh06tB/x4Kgb/l4YWYJGLuCHar8AyfWF6nN9+bDG2L1t98uz2cqvoKG8PZPNYvOJg4NbKBVHsxWMFLmmPa6pfR9+W11jM0aKBk55ONXhYoEtzabyiTFQF+jAg0piIABqfDZh7yxoqxoLcyAgEheMRCaKV4w/HG0w0hQLkzCWEbcwcwq/YxhthmESsxgL1mIkw8ZZhptayicuNBgUEY0fUnJcQ1FoBXPESjbzDeyUfTpXqNz/3PHB55iqd2FeZwUN0Bf8qAHWyPPFsVekK+/bunVLOdfw62jkP57NZnPlSkZznfLCCbTEbKap407X0nUDRosNZhScapVt9mEDAxsyVHO1tMM2zoYOZ+kyYRqQFYlrmnJxVgZTmDnjCtPHYTCDmKYdhjlwLbQWxcKaho7rHwwr+EeBaCSVfNpYIPQhIP8hs5D/zMCxgaPiwcV3LKaEAHzBv2pN4Eqrml2pdqZ279z5U7CC38S0pheGwb9SqXgsm8m0ZVp6XuFaumEYGC04dVIb4hoBf1fVIJaijUVGg1JxyMGvUipiSjbtChhdClPH3fzUIKZkz0IqSpHfgLK1WApVxkJ0BsbiZZTL5zA5+zxk/nXrzMyXvnPq1LTPFq2SFvrCqOIV4fVyfXq4wZfHDb7ijdu2bS5l83+CAeL7y+hA0RYWygtjuUplMtOy9nWube0tMAze12P/iuUHadgO2BSuExememYonJaxLZex6J/TVGx+EsYyedAVZ58CHDtrMpYmhGltHFnYF2jeaMbCDQboAZawH5i/zVRyfz1weIDMwbHj+Re9VrmOmkeosyqfc+jSnh077sV05H+ic9yMBfgC2kC2VBjMNnXc49o3vBxTqfUyhkoZhgEGdqLXvfMjjBk5rtomRmOHsXBkmZs44uYn9mPR/wxGlA6Xza9FwaEu2QcHBzOWCqwNowq3ktlpzAH6Rdyk/O+FUun+o0ePYsEjRz1TdWI00L+M6/XaVJhvdp+lPdt3/SSm6n9i9YdRozSFudOCa9/8ZteK6RS3ZLFVpdp8XhhGvXbpjYXDIRt6MBbujBVmTrvZiSEYy1PYFTsGQ9kIO1kDKWTSqEKJbPj8NWDNxjjXZE9D3F9gW/wvBwbiWiUs6iOjiJ/Hl+vVQPzIsesD2Jz6vXK5VMlkG0ulwtFcvuUm17X1XtfY2otK5lRKN/iex1W4uGjJ9JHrFmxAQAfFwjimX8fd7NizWOR/G/AWGMt6P6rEWVRc3INN91ogawQHBv4GfdF/HRge/rZPLXZQi1N/fkGuOwMJaw7c2/hpbMn+cbmEO97ZRmyBDmSbu1/vujbfg/sXLdoqZW/6L9qlpmHY5oYxZDEFm3eF2TMwlENubvw7Nqo04Awmd8GS6RfVVjWqwFAWYD2fKWcy/2lwcPALXq/Pe0O53lqQRo4bdu16DdaWX0HPiJV2I+6zHci2rX+L69yEI1WceXHq8C/dOHwLjl4wFhgJp2BcmhfnxzH9OuxmR57Ewv5JjSi8iw8Fmg6NGREt1POYfvEUDKH92B38owPDh/7R4whj3dCoREDA88FdTwbCvFZ4uLCzbc0jCN6EoxjF4vxgrm3dfa5zM26W07ECr6dSWa6v6jVMwTSqoEPh0Zc5bBfPjjztCpPfhP7acaxmneUpWafY9Msv6tkBYbfwEdxh+sOmw4N/i62vcA4sbrlf1UJdocSup6YkxWNR/nPZXOYPccICd8RH8k3tL3bd2/8V6osjx/VoHPWq4Cp1wkgGrV6646jCO/gF3LWfGXnWzY09jCaH2SsW9Zya4bBY0gSxT05N8yas3/16HHL+oLmt7f9LHZjUaJ8wXZ+herWzWkvCvFb27tz1FVTKa7D2wCEl3EPe+27X0NihnSpW1upw9fNxydlTQ65XshUypBpD4X2iwuw5NzP6nJsbfRgz1gmMKFtgEmjzKUMBm47/w1LCgv4JjN6/PzA4+FfILS2KioB1aYoG7/pz9Wty9ZWDSi7v3b79FuzbfquCY4WlwsFy+6Z3ZTo2vBSH/XgKliQr1GCWXf5EjdVGEODMVwgvW3iKIZSPskIYoSRYBU8xLjmYTL+4Tqno8OT06AE3e+4bMJQRGMrWRYYC4TzKg51EbyjlyrfA+rsDhwc/5hNm5TDT1932MIfBVe/6sAAcQiV0d3f/CM4VvQXtAc9DlHIdm16rE7dXf2rFuuYtunDfATGAbAQznLWHoFrC4DyKdPZL+IzfZKTxgadKQFqY8hD4zMc1ScwYl3xVGcAuQ4Hl8QBnMw5zNndgyYczXwszwxhETiLciWTCulyZUCeG+ydl3HncCjnv7O7qev3arq7jI2NjA8gAzZgMzFyVSSO+at11YSBDpr5KT3f3r+F4xb5ycarS0Lonu2bdi4GBvqnyK+qYgP2Shs10E3jMRGz8wQhSPmTwL3GBn5B0OFAYva515ZJtsby0ganB15Ud0qjvh6LRULj9m8OzMM3tW1xz542YNHXBUA6ijzqLhQgNJY7eyKoen8SIUi7jDv0uIN8LQ7lrXVfXQRjKEaRW6cOJ6yE3dF0YSVq79TV17aHMY8VO6OYxx21YWywcsOnV+tuv8P0OU0/SBheryxrg+ZQU6NkWEA7RFDkeVVzkcIhwsdM8Ko2owwguTovq989GLzFRen0ZEZ0KGF8FM1wbBHgMf/rcM1jQP4j0yph6bQA1dnl1L8UzcjEPBeV4opojS8b9uSvlf3vgyMBBUvThJRT953lBBfGrwV0PIwjzyNHjjeicfgwVhbPfs9n2ja/FQ01rbCqQbjeXrVUKY0fIH0K8qGX7RAQPeA9Tmp7OmFL8JkPglKQgNYoOAPipYBJWupRlP1HFSOAgNMmb8k6UnNEk5SIw4TOa818tKdCjAjiqaOrVsV1Tr3KlyS1MPUYUZl1tXggjmGzhisGEL6TAplf2djyy8mM9XT0tHV2djz8+NjbjM6E6Pn/q1w5zPRiIxu+enp6fxfrj5ZXyfCnbtDm7pvel0DmfBV8p5VljiQ0h3XgAtIbF5pd2rP6AU9BzBSqTCYxH1viXAg8pUBSyop8XK2VIIYSaY45D3kUssHEGY0kkBa4L+D4tm3phuwSdVHPHDtfYfgvu0pcx9XoM6TVh1sUj936EgnEwAsedrVbcb3wtjka+u6era3x0bOxx4t6J9cnTlpGlD2tgvNJutRsIa7J86623NpYKC/8B3dPG0sJJ19x1e6alazfUiiE9aQuXqCs1Id+2rOFIkBqCb1xpyWZBvtGlk/e8woPB+6ERGtanxUbLP9DU/VsEt3QkMmQxROhDCn8xhABlWx4C1CgsP4QF5/MhUEIbsOfzg3iddQNRA57bb+nc5Rpab8S5r2lXmvku1ip8wQWP2/MGu7IXDQX5WIsO720wktd1dfQMPDQ+OgyaCo8S4W0tYiDTtXZpTV3rvNRLnwot79u16zbetUV/1VCaHyh373xfprVrz2WuP6xBqdrsovTV3lJxA/Lq6QWwuIJeg4kik1AtaYxzkSGy0Fkykg6TMsQjlwXqgrXySAgjTQwIp1hy8fScMiWsShdxA1Uh0kSLwhxRzPjyqJeCmxkfclOnv4EXwzyD9clOlBd9cXJXnvzaGsa0K69UKu7P8KDxr9e8bGJROlcbwAa4al2f3WRi/l6BUboBCi7izm6mobkbIKq1TmMk9QUdedhr0rMwya1HTOKSDaAqPRoH8Ebo0TQa+xMAYf4bDX0LB5roBzLPK7KqMFnr/6XTB4mlUUurPIZ8RCIjVzSBKSWVE/RywMV4mi7g6/vUEx3vxnPqu6Znn1u354dc26YfhgHiBZNFvjCSzS02OR0Kw9q9COPi1vBP5DPZx/fu2PUzfdjloqzV4Fb1FGvIqr/S3dn9C1D6beXSdAlvHsm2rbsVukMDsjpZoh6tssljlWnMtXEJBVBwSTa+APBS1CTT6ND6rFkrd6JRKl6E0TDrACz5R/rklwQTA0pkeTp5aTwBac4Q9fkAmonYCEA6uhC3MONLccFQ+KhBFqesm9dsco0de91CEccj54+hX4MBhefnJVrrEy5QuD7pyOfybx7rHDmEtckTfdjlGvLzM5JeC7dqLLVO4VkjpZ07d/Ic9p18QJZvImlsvds/BMWNkTpcdUGs7IDwAXhsQtGBIBUDWARC12KM0KireYytXmNaRBcTvlgg4dRUJImC0aZAyVaxIZNtYuDxH/MPtE3GFADc+Kkchfxcyxp5mHqB2yfANwyFNC+aayoca0SuURqbulzT2ltdtnWjK04cdOWZ/TASPLSl937F9Qnb4jxeJNkEpr2U38/LNXar3UAqjZnMjTjUvpdzXHQymYbW9VBZqCj6F3KGN+PwtPBigyHreQzDcybCPXsNt2VF+THSSBY5PYSeb4+1qBhPB+rQJoYQkCY7MQgKQFcS0MwX/i2KK/5j2UHETseQCgGZNhQaBtHkQwBOhoJwlCfoBS7GBgLcJ8E1izNzTetud6XZrW5h/BkMJmfMULxEkkhaJstKprOkLHxNrnFCeE1Sv0CifV5ZpUoWL5HGWI3XE2bzGzLcLbGqjdo/jxSr4OrpFJtH4CM+iaklMQ60QRUQmMDkD8lRhAgD1IOUE/KJwNN4+oQFaPBVyQxyUr5oYjKSbOl6QUnE5y3kwafPPDAbJNevFu7TEtIoIq14CSMv/hiXg+/zFaR6xPk9GiV4sBaHndhRrFzrBte04VUu33EbOj2+XtjLtyEKVpLxZ+1fMJDzKrY39h6lV1LBlcpMJd+8TTeoLry9ywoNdeorWfXqK4EpxkpWJMbZGFRZ0SPEoIaSoAiTRDw5RHnJjxJ4/zjwer+GxuRZcsYbwmk/kSt5aZkMMwPxl6JVDolKYApG8gAnIOTPwibQX2MCRsY8mLO0LRpgxISxLPgAeTQNJA4HeEcA+7xcG04Ipx0S4EwBcvCGCblrvt27akcQHANld4M7sZmXUmeV4ng237IBbxTE+2r9XNkr0Txp3yoOtYKY1YxVqq8lNgb+xIGr4qQkhHF6jNmfkXk6wdK0BkcW1RoCj9LjcSTJMrGU6YXLj7SplBbDQh7SvFViqvIaqEHhkzK+AKevfDAv9q/UYyTkRWy6kMxnXSHTsOcXH3mIEqV80SDufcAYYh/CIyqiJTkC/kgKbyoaETzvUL1r78StFR8NXAF9Vf3VaiBSyu7du7diOnUTR95KZTbT0MKRl+/VTfQftQWlJ5UFdv4bwEiIV0gIwwtitKLHxWhAyIDnMRjp+DOc9yyNFNwIeE3/eVYvIshI5HmE5ISwTydE5adlAkBB6bQRtg6AdIa2tIzOc1TxGczwgUmpCBGxSTnFbekwCZWUZMbMQLUTDme4eOqhigZ9CKddvJEoY/FCVLWVnlNbt+LdqtferdZFOg23hG8P3AKldmInBPvkba6hGR9zWmQcUqzaSaik+oZBZYPW/mPYoCYjqb9QlZGYZB5dDRMCGC/BR0Ms+AauvRq2Po1fNtey+ExYB6F+mux+RhO7DY+QZGtwpjUaE5z177aSs4wjNdFxckgKRNjrM0SEgJYjTB4RF7GMxqZEoPV0hrErJdExxkOOVi8JTkeFYCDYvkdadsfB56qzOZPhzS7ePLmmblWOIH1JM7jNjvEUS9mGTRkekGOFJM3RV7i8EDZfWmWPagFIREj/hFiYfqAQ3scFi/SiNjoPSyDGTzAI/C8GqkBixUU9PJM3AAN1fwmd0ca4kvFpkJepBI9BRT0g4nw+RZjkM1CZDDF6URYGJeLMMwNGbUELC28JipLMIpMUYoNjndnnIsy2yA9DIbFGEFu8AygEMC3ZhgZ7DabBgqCr7q/KEaTf3xzCbsbt1A8+T+Aa2m50uRwPwGHdRjXi4j2FBbHaMZyQgoreorh6pjQ6yjIhvMpV8wSY56wWkKJHUPlgTxmJjDleE3gSikgFrJ+txSLuQdCK9exVPTdZAU/IRCNZNkQABaQA6Ku9vgwVRhTKpYiLjCYSw4t1WHGkIS8E1t4z4bleTrPwolTkEXxyqGEZCO8REubNB71iqVwOC/VAbCxX+boaRxAqpHznnXc2IHAzFVcujWUbmnu10EuGdFCpgkHF/2Ac8EPQELxSpNGFmIGIMayYPKNgDOvHGvF0IS46k6kr4lUjAlmUgOckPkjxtDYihDQW+3HEiLwxF5Iu+RRKyVGm0QjmU/RoePZn9GRLIEaa5DGUm+IFVToWBpt4PcaHA455AZ5c3mfMHGB6lsRHZaSA5fjNk7hZRavEcyN66zCnWNfcrUYDkVLGT49vL1Uqe9Sn4AZhXuevWF34SytfdSKAKsuHLFyFU7X5+iMVJdGRKIYMalFP49MTjBfjI0s0CorxjlhRgcDwAUGGhMoiogSwnk9az2CJRTIzHpOvcBBLep+uWAT3sj3AYkEukwg5trDFmZTJoogYFpunj2GK8PIkIoRB52lYhwxm+T0TGyQo1gODgQQ+Mxa8Y1kG0mdUIr8Wl9VoIMpTOVu+kd8ssAV6C547wAvNoMOgdCmLcakeMVU0oUZk6haBxxkk0ClGYYHE85k4awRKywglV+R2sXT8NcCjQYgRSAmzhlLdqJUllaUaTtp69AlcTBRtGVVIZSIf/5Rfj5csgxmYheWPntFLQIybOBNCPJzoLayrgBRBJhGIifKCS8KgIhkunIhxoa6BIxDC5/2QKqfVPulLeN8QXZ+u1+qy6gykz/VJ08jYTbZAL+GrBhuwQG/1vY9VhBRvNcQa8CHWhv6hzxD2OLJV0RFAKtIZbYgzSrBhk0r2QCJU6WoICbHoxcN09DM69J0RZzJCAkqE4mpcGp8OY84OyrRs5UHcwBCJi+FVMmGECHkKtCTWP+nEiLiFvRgfF5m/0DM+nxJZRKe4RSwFhT0VWRC3nSyh4wUV68Np00G4ktFxk9539qYRke9qBVbdIh2fT5NCMBW9jTsf/ORYrmWH3rcLrakyTPeqRotLW1ZxSWUDlap4zyp6khu38Vg8CUesiIwy8sSKJ8Rc0kgZJz2LkPAxaLEUjKRLdtZGvGIWcSVZQs9bNYWJGlDnIn4QKxegY68e7unxQIDheQUNPFLIAugBGraAResX/QSSM2z/Mi+UYKwhP+K24yaSRALveC/Eb/EGEH0s6jXF+tjHPiZxadzVDK86A0Hhtc2B0WMPqwWfM8g2NfVAYcyqr6mg5FDZjOufFQFXFfYNgijfkgTxpEYuBmMMV09reAJTDAJ6uQyH/CjMaMDV8AT8sn2To2uVSO4WUVgCTGeznrFEmPII5pRhSIripmcaAnUuD2ngHAhigME4qgwKBFVGohjzBTqkEzZWbAThaBrqkapCvYZvLYqFGRA+LNIRuXZutRmIamTf5s1rS+XKHs5MKpXpTL6pG4rE/JXPEmi6AoWlGyHrDH9yCivC2glQ0RMvSCQ14sAoMHiCM1rWTwpmRJ6EEWtFxhboCAtdbGAHiPUeSLyEpXrWSnxb8Z5KE+Wd31jMiIzJRrsULXOKjPlzgsq2jR5EkAdakGHQCmAWEgYOGQlzb2GqAd0ZCIDA809waVtkCsDzZiHeMK93OICVstDxZTJchyh/TEOpIsa7wrQmrtpZShHAv6qOGVhNTtVdbG7eBX30QsNSSh4neNmwWAVyiFhIwBo4May9NI2FdRUjQ8ZrukdMbEL6JNJ4TyUiqkzEng5nsYxZcbvwLBZl+p/PociMC9cgg+kwTJf2U3iPYZ715+Um9MYb0wtifBoUrzym0gm05KQcxX2Y+RGP+IlmqigTnZdBSHWYSDuXhuFetEpTMkiNP3yCgfdCrK1bJtnx8fMVMpYUAjXYtXnzZv9lUsq+Nm5VGki2UtnFFyOjJ8IRk/ZMvtFeJaN5riqLymIF8d8U7aOCWYUaSYTHgOcQm4WTigQ75ftGYKn4uB58s7SIrqVTmp5XeDLLiRgh73ukyaAcYby8INfDgSObiAK/ABJsvBCQzr/HeHlkpjNB7JpraVUOI1I6zE+gV5IhPcBNW0SbXCMNYRGItwpuETV9pmU7WWZrBuTNwuqtXt8vdjU1NV3z81irykD6rGaw7qjcZJWBt/PhNfz8IA6VRl1L37zq32IxrKivRlViKhxw9EMYwVDZFhSCQTjwUoanFYRRL9eTKF7VyJQZEUp2EGE0zI/9mWBPp0RS4ZhGoIYPGCjg+zxYQPlM5035E79ymOQvMDP9IEMSTaj4xJKkpTySVn+kS4cpUCBcQlgEggoS4IwIRQPBrD7YB8HseDDF0qdEEQ8O9d2OPOG1jXISF3BX019Va5B+f0sVOruJ5oATvLj/sR1H3HHik7MmTfehHinbq8kr3mLWiFRhobf0qhVGYQMkDYLiJCQKTNpXoCXKwiISeSoecIJ7MQEWWNUoSGCtw+fUiOuIMnbO3FMulB+gyAJ51nUA6Im5pgiNVhIER4pgsrhx22yfejZG6iSESZxelCtFkjH/Wm9AkgRa6kkYMurQiB/0HEGqHA1EU6xwhEhYptSQr1S4DrmmblUZCDShBRnUuINaqZRmslqg57CQU+UAyIojklf9WyzCWWnE0gsoT8uKVZBILy9tKFFGwoiQFyKhZE/FGbZ/YuFSOB+M9BEVA0bOfJzXRW6j8Kxq5ISIN0UjYyEChMKx8SKsKAD4r45TIGigD7MRC1OCDAVwYBAmHXgpXzqkcODAZIbBWAhbmsFILCMmh/rVCCJpvFBOmGKFM1qEUWwmh8YQDMQyQMxVdqvJQFRb27dv70ItbKfiK+VJl2vCJ4y1g2UK9FXFGmEVmbpUkQiGKC0hLBSN0JDk8TQCxwjhKQSpGfUGZSICHnAv0yAk8g9IEQWHnBvMoiIPQfMTWTHZagI1HQOpwSBIHgunR1LSoGnSU35NMuIIsKkayhqtomG0YCQ0eLDaaAJyiiI7MmajCVTJ3gmWwWvQi9JExIwkpM1dLHLzCnL9Wzrs+Tifz+YwgqQLzbAegkP9skLJjZrHS+XQQVbCFAuc18atpjUINIVzzrncNuh2AxWFHxbo/GYe9S3PLqLURcq2kBEYyu+iqBGARZonqechJIbZAAIcPv8VtzAintvkKC4ULiI24zCqQOsNJpBIQjVFiEkG5dT8mIfqP1IEgfAZ9C7SMd+C8+KhClqc5FY0ERlNmgdKVtk9OtGLGFEjQLBehI9EqShtiHC/m2UYSwdhGhXPY+EIEWAgpSy4uM3rLR1ShMFFI0ifT1HEV/my2kYQ7KRntkFBDexFWJt5PANCPZvqfaUAoJAU7TVGGgY9TBQGqIKTKql4hsFD6+O/p5dEgQSg0PBvYRJ4lM8JIR5miMBpcMRY5WlgbVyENRfRp5jAYzHPjAhD5hASHkDBLc6IumXBeAlxa7AJD1sl8HDUQ3rK5Qcdg5MAAKMhPXPgfQA1ongQ60wdG3zRkxKzAUy08H1DVC/idHbcJMghgJzwsvHZdEaviVs1I0gf9EENQG/b1XvilGI21433KfIZEDqvTngKJVEAfCTQ0K8iMjybxiLj8LQG93JY0RJAOfx5cSGguKdB2EgtblESpH4++5EUDCpjYGV80R/Fpv8icZXstMyQV7AZp887Y0GaBWvizB85SC/HsA/CS+A+LGSgAaH+PQNwxpuCCwU4ZeFeiB17p9X4NPR+rFTcg8uVDN7dcW3dqjGQqIZyeR81h49/VTL5Lmzx8r1x1mNVVQQipnfTsmIGsApSHwRJqq0QiakklQiQVajhQsNV7UEeRZpsizAc0xJjhJggwsgkvoRfPEQEPGkU9vQxHhjTcJMWUhIpQXRRRkjBY6MHeCpNk0E+MassiwyAKGLIZ4Q+TLivCwsqedGA1HJAlhBSIgb36XF6ZTtZvk5IrmNEbIoJjOIxkOipwv5aBJFXya0aA+n3W7yVbHY7y47PHGDk7bYt3jiMm8IvVAGhSkTjyVV1qmzT6uKKByH/I42PizwJh2q3NmMxYMloPwb1I87DhIsIwQ2LK3DVf+T3f7W4Kjkm2ygtTaRgeRCfyRGGGSJKfwr4WBJGyMrONELYQiqa5EQ4aSBNnqf3tACHVIyGcC+TGDZ/Tq90szBtC9z65R31APPbZmicXIDSBYzFruJ1Na1BtNEBNW7mfkelPAcD6Uz2zaV8aMbqxFRUAxPK41UvcW2RMC02Dspk8/HOV2iEAMGwKpdEmsNX0zKWpvfYNNRASkRChBNQMEMvugqnlIFCz60JvVFpHRvlIX01Ib+6DWXQ4gF5D3J83sMWLMEKs/QcpRVXUlAJywyh5IFwa7McPQD3ciMceKYvCSEsYZZXCiZeDvy5cPDUUoRMNkP+ApEPJjcKUwhJuWqX1WIgUufOnTvZY2yhonlIMYePs9ghRS7oSELnQ1C0OfMFVTBQIsL/FJ0FPX2Aw1flEcwwPKto7D4inssBxrdzCWNVWIYp43MMbFMGDbKUoUBJeQRYekLFmIdZYrUklkjAxXQB8GyWQ0R8s1FDFs6nzbwpaWPgwpnMZgwIodGnwxRk9zPY0IkDOXgoLRoTlLQ0I2FSzBuVAwnKiwQqDyyDTakQpWPWMIJkwjqEILLBBynbA+8sVt0kQfyquVVlIDiRsxGP2fZSnQ6v0c818AXHGGj13iTAqFypJlwDIPGF8Q02MQ7wEcGa57/HhwoUUpWJ2shncQs364r4WtLETMmNzRTd1FzFLcAosL50rY1Z19Wccx1r8q6liVuWqD28PLjEKqRjOj6X1aE0WEREp0ktLhibB1zIJ1qRODyYTAp6oMwCAEPjyrKQX40zyPGNn3A0P7VAymGALRLcdpPDpJuRMCyM0YC2rpGQF3QS6hkjn/QaZFsOc7wXknJ23IQvBMTLG5R35h6HTyquY+fOnQ34oE7QboprUZBM+vWZ7/oppPqH6PLc5RoIM0QXfNOAZcowy7iit9mExtsMIZxuuZw/pCgRSsEnA68mmqQCBdN5SoUMZExVxiFCNoCMa8pxdyXjjo/Mu2+dLLiXb2xyt+/rcru2d7q13fgUMoyBhjAxOeeOn55yA8MT7qnD0250puz2rm1067obYUAZGBYbC9KPGYgBpian5kuwCL1PTICF3Pt4UGoAB1L10gAKD1qF0ECNHldkwgzBN2zShB7dy1ZDrjIS5kc59MZDMZRJqYDXMxIWliMGKUJQaS1uCExWz6bHwjCfMBh8/sWVCsBqquULUeloLi7wpCpf4Hs+F6yNRqRM9NenJB3xalv1SRZDL8VAVMaaxEw7ifxsH4rcb0NjLS6hSkLcLMDMJbfJqgLaxmouhy1eKZwpsnLk6ap4hAa8R6XpWKGscDJTljnfABDBqWHX0pB1g6fm3DmMGP/LG7a5//M1+9wNeza53nX4rFgLT5pWu2IJo8vEjDtzbsINDJ1yX/v2YffPXz/l5qZLbuuGJtcAeTSU4NL5CTD5IT/BJzAd9nFfcrGwjn1bjAVSa2IxVUiKsDKrUVviEmtxSJMAUEk3pLcwRwfyUl0UYapDhNVhnjJYZSRG6vHG6KUofzJIMFuaEgudY+TlcMxEmDrx+j5S0naZV8DXVPJ5TrPO4VfrQoPX6LJ3796m8lx5X7ahsgtSeRoDmcmNZ11paMG5ZzEKBSMLfElitZJT8eUaCIUzQ8oUzuu3tuZaN5VduRuFgb4LY3OVyvGjR4/O9ntL7bNP/UbrBu8i1wdIP37lTHlrDlMqKJNvUsSpBG7xAgElpp1iAeQjFvXAxBKMlxXg6SiHYbaRRjTkAuZOnzww7X79nbvdO976Mrdv72aXz7OYiYsH+ATCzUuMNj3da/S7EfRvvPcl7l8fPe36v37AfeqzB93JU/NuIwxFaxVWg8+W2K1NJMKXEqriCWUBIwoh9TAB/SOm/xAnDf9xIQhtxsKIIFS13mB7MosAKai8Do2SmWS6gEOUxAGhcFAm8ZKeyBEhoOZLAlkhB3WMH74upbrQNJoneu3eMCiia4YlhSPvQRB9WpfaIF5P++pMqfLD+ELPvZlc5gYkgEkwnJ+ao5QLOPQ4sHfn7n/C2ZWPDgwPP0Y0HNs+X8h1QbdUAwnmXrq1t3fNXFvb9wPwVhTvDswbtyDH9mBLJj/blHHH9u7c9R2sG/4J1v/p/oMHTzMHfWYodTPU+853VtzHPsb62cmKkaJy2MHCKV4pFPzUimkz8Vkl0flgGsaeSZz01AAogvKR4aacO3lu3q1pbXD9f/gm96pX3oy6MCFlTKXEKuFsGF64T0wNg42BmYNrwJz6xh2b3F78XnX3De7+zz/pPvnJQdfR0eCammw0iSKqRZmAi13PxwOhQiEfaviM8d9nDKVgBP8oM9NgmDDgExxVA5ggoAMNdUUOwUHrYxQAXXheSfR84A+HG4NSgkRLP0lD2cDoUf0SOVBzilX98CCznK+UMmGrl6yhUZf27NhxL4zs32He+wbefFSRWS4uXdiA4CAAVZdpwO9mZPFmHHT5WXzi7S8aXPnXnhkePtGHT73hHQh12yT56ViOC7q+VMPes33XT8AwP4AE95GJSvG9KwsjWcDFBoWcngL4z/OlhT947siR456GdLXDGw2wDCv/OPjfVi7NFzO59tzGm96DhTrupCMdymUKrCyfEmDgMgg8RWLaoiea+ECHAES5FiyyDxybda+9fZ37tQ+82W3aaG+5NMMI9GJe0kV6ACX6ReXt7OyM+8ajB91f/Plj7txowXV1NroFjFQ+i0uSeUlEKBubb3SsH0X8VZ7Hq+6ApG48HctB+2DnyxmQ7y9IIL1RP1yHsefn6BhHFKaSSgtB8QhsF0qgGJOF69jYUVcozPpOCSP5yJOuNPUsliMcMJAIHOoQz86V33xwePh+TqEGBgbm9+zZsx47Ih9CLf0Ys442xrbE0YRtSDWd8iUHcfqky2Nqx0ZwAn3A+wcGBz8FGPmID7QIJq56LpHAFerDJ3n7h4aKO+HWdnb9PeY8Pw85a/GgH2fYGuJSLCERWnAJNIx3ID+vwveFfrSnu2thZGzsG4BV+pDRIcswonKkzfR0df8ctLKtXJ6r5Bt7M2vwLUIdTWCxfesKDb/aUEwvAUc9GXniWzIcOfLuwPFZ95ZXb3b/4YNvc2t7OlTh5KHufDKBfEk+0+UvNMe2hka3fkOn23vLWnd06KwbPjbt2tc0oF5p6EsSeWlEkK28BG7lixEpUGkjp9YUiBPcotjNxpQzh1E742bmSu7kWMENnS24/afn3QH4I+MLbg5wSmrGJKYJIzCNSJ2Dao8YuiAV8QRkQR8nRQGfii4W55VfttHS/KirzJ9EfXMygnEMDnfdeerxU/he4VMjIyOlvTt33gcD/jRO+r4WaGx4ak6GXMCkMb/COgbFz/MHuTzzRW1DguVEhgAefJwk0wmiH+nu7JoaHR/7GvDE1XXnNRAZR39/cdeuXd+D5L4Ay3sReg6sd+CYerRYFEOZQwbhEykcb5lKf/o4Yzv4vxffxO5b19HxwKPj4+co338Pm/Ru69atLTDvXwb/2kppqtLYuh0GwoHKKzxUqKit6ML5OGUgA/S8jzD/qR8DqwGcHCm4e16yVsbRvqZFxsEFo2cV/6VelL7yiUaEaVczFvh7b+mFkZxxR47PYDqXQw/M/F1qCkvg84016IKFZ3qWpAW8RmXQOXQKTWjwk7Ml983BaTeJjYqbd6xx33PHBve992xzb793h3vrq7e5V72k192wDW/YR80fPj3rvnxgys1OlVxXS04jMvtfND7LYKqAIa2QA1LwKPvCwqx+aNVAYT0yP4bf8WAgzC/WoeruP4uO9fE9O3Z9EGX6b2DH2/7x9g7eHwGBHteFnZQKp9zC7EkY2jn9yvDLlREYfAdsJ3xiQWrgUW9+PBEGnr0PnXJhZGz0AclDEeBXOdNbFci5YBy0WOT+k0A3+kzFNYu9rgXvsShO4ZbFGTQ0m8plc62YTvYgY3zRG/MhOIe3MjKEU7rubKbsfuzA8KHPAEZDY6bKe7ds2Yqju0/ggHtPqXC83Np7b6Z3573AsEVRifzXJfqC+MqIDSLQkQphz4hKQV4hig30o//PuzWt4lSBxrHSjgVi0iUkdmJq0p04Pe4+/PtfdWMTBfS+eIEzB1flbaVTXiwvNlqiWB9K2KZMTXj78QTu83xteMa96+Vr3fe9/gb3klu3uY0buzHicQdxcSZn5zCajEy4oyfOuW9/d9h97oFB98DjY+7G9Y2uu6sBa2U0Vo6USIl6UPUiYFMsS5dyp6fPusmpM9A/mgD624WJYVcc/RqrH8SYnGCEwP2SPKZ0H8DNWqxDMv9HiQrVTTH0xHgKsVycdgszx1y+ZaNbs+4O19Kx2TXgMXYaXbEw4+Ygf/Ls464wOeAa1+wAHF8Sl22pXJjpoAHmsjk84v2TBw8P/llo98q2vyzWgDXaEnYHXpYtV74KuhZOqSAdJWGRabh5WOt+laO5607X3L4NGeOnCcpuYW7czU0MuvmJZ1hu19CyV0n5jBWhHK7GaMK/eGho6A8Q1MLrhp078SWpzCOVDJQyP1Bu3/yOzLqt95iBocDKqCosafgJDOqrwZEh3Xu1YErwj89Mugf/6M1YSN+CRnpljEOFxYUNk3mamS+4UzPT7uDAKffvf+sBt64HFWtT7EB65X3kxRor82WnEhpgHI8PTrl7bu50/+Y9d7qX37HHtbXaXkvIUJVxAWg6Dljzz45Num9995D7+GeecF/85xNuG+4ftWBUKRRsOmaGwZYjKzG9oFOanRl14xMnooEUp465hXNfQZvhS92rZu9jSLcbeaFxIBN51WxhasA1d77YrdvR5zrW7nGNzdzUYVNSq1Dm+CnqhflJN3bmOXdq4BPqyPPN22Fi84EOMnFgwmXwfQ33qsHBwYcZxy9mgJG0Y3da3rlz58ZcxX0RYa03gnGYBc67helB173tB93WW97rNux6jevZ+CLXuW6vfl3rb3Hdm+5w7etfjqbf66ZHHoKlj+GmH94kiRPsKCczlclls2/C8JbB8PZlZmBtd/eL4f0o8lfmR+dbe+7MtLRvjg1NjT00eukAEBlFuuJERQD/4ciQ0XYu73P8/Ft3u/e869WeL9CQbuUd88YG1pjPu7n5Bbemu8W1t5bdPz94wq3tarzy65FQJFqG9MH8QLvYouZK/NtDM+7Xf+I2929/9g3uxhs2Q0d5GS5pzJl+WY7wSxtMCLe1NGH3bqN7xSv2uH372t2B/afd8JFp1+PLKFmqC4S8D5FIq4g1zaTVBTrAysKMK80MoWFoDeLzII/PO3BIwcDQlCkXxzGdOuo23fx+t/Wmt8A4dmPiAR52Ahh50j8aVA64NV3bXNf625HegpsZfRjvOdgAFGc2qqQSbhDj7IR7dUNT0/+Ynp6O1sPUaw2ERais6+r+SyjlLigBb2rjSTL0htiGKy2cw1GMbrfjjp9xG3bc45pa+UI3iFbmOJ3i0IrFRx69SNta19F7g+vccLcrlprd1OmvwUi60GOg66pwL8Th4G7m3p6uzmbMMb/U3dV1F6ZB74AE6G4ku2bdK11TWy9koqenRvmDY2XharqugnmcaCOF6PPoI45i7fEff/WNbt1aLso5/zR5EnqlLsgLU2nCfZWxmTm3cVOXG3j2hKZaPM5yVZwvJht+AzrfAqZAp7Hg/rPffL17y5vuxGIbm57qs7A20CZFMIjFuQuGkvaDoaxpanJ7dm9yt750M4x/2n35wVNuQy9GS98X+xqzesOV/eQcZhuqTxpIac6VpofQzhYZCJsK5i/NmYXp/a6p4yVu1x0/59aiU+ZMBh8/Vhuh/HS+Qpj5o9E04FRG1/qb3UIh76bPPYi26I1EDdgV0WFvaMg1NGDR/oW+1CZSNJC+PodFsytxKxeK+oBfkJtxYFZUWhjBPG6f23Pnv4FFboVSzVqpRjVZNgbfOEOmkDPX2NLpunpvwnC4z42fegSKmMEapZ2LF27mlTHPfE1XZ+cotFBGJt+KauIIkm3vvRu8GG45JaARIhEpWRXOtCxlpcmgFBR8IQHC6IGGePDknHvfD+51P/Dml0GeNQSxXOELc4HkuLfo5goLeHlHFtOYjPunLx91667iKELj4GK8iLXB9HzZ/cnvvMnd+dLdqB7mjvrgJoXXmSBLv6QbYh711N3R5nbftMltQNX94/2H3YZ1GC01ZwgyLR1OuWggzALrt1KatxEkectiZIDRZOYnnnM9O9/udr74Ha4ZnW9Zx1LIm7S7wJD2WSzSaGoJg2rv2e2mJyZcYfoQpmQ466cawpiKjIDurp7Ozk9/e3yctyTYg1WCgWRgHGXuMUPU3wJBTjqI5ys/C9oNoHE0tfagbRdgvZYx6bVGtyFTypjvQto6N7sODHPT46fc/OQTLteMUyXYFEPGyP1GSLsVYaiVyhrNtK9/NdYvWJvJQFhK/qd9slnhEz+FN6yOfXz7+Jz77V94rdu8oZvpSWFCX42LT4+6GJ+dc1041/Xs08ewSC3ijv3VGUVYHxwdhs/Muz/97fvci2/drlHjcgyjVnXWCCvqDJqwFti0q9dt2ZBzf/eZQbept0lHb0L9sRpZD3NzE/B9B1hasBFER98T6VyMz4/vdxtv+XG3dd8b0Q6x0NaSmO0vobtYyPKHw0yc3WDqfu7w/VjO8PW/tF7myBW1iVRxvRhFaAOEVVRDfa7PDKVU+WVMZzYi89xGE47DWHHmiNt667tgueu8cSy9YpkxplSCUbWs6XV77vgx17HpzdhZwE2hfIuZNtICGfd00Z9gOM20AteoGGCW1egnWjHJEcGA0goB9prjkwvuXa9cpyMkwifsIrvSF5afrqWxQTfh2ttb3CtfsdmdwZSv5lDrFckK2qFrwpGab2EL9/f+7T3uJS/a4aeYS6/DpWbMGmHFtTU1uk7cC3rdG17qfun9t7mnD07rRIGNVyaNW722g0gofjryzkV2QsXZ/fzEfrf5xT/lNu/pEyMX3kGnAizjQr4yDLG1Y6Pr3fujWEsPoKNHOzOXw6ypjNr6wb07dtwNEC2HKzYeKtT9jh3I3E/i23Akl8Ewg9yt6t7xNizAb1AjtykbSZbnQua4oNr5oh9yPTve7goTvHOKwynsTzhRpGOPm8UWIwxTzjewxBgAtTYX/RD1DMaGgSmPOffQGdz3uGs77kE0q9e6VOWa7Eu/cprVhAU7pxY33oj5LzPNwTNpD5cu/DycNA6eNxs8Net+7u273Rvu5T4Ikq5W2Hm4Lw0c9NvT1uqa0Oi/9/vvdG/5V1vcKdSDrbsscbYje51TOp0kY2p7cwfd5he9323ceY+f0q/Q6A/F9Gy+DZ/V2InRKK7JmTgW7OirM9n3h1xlMXqoK8mW3fuA4mtWOHrEnFLJ67bdDaXSZhCJGESX6jyPjIQ9ABS37ebvx5zyh7CPvZ9WTArfpWHI5b0Unc2BQmrSsHgNVFFcasFoCScx575p3yZJYVku18GQZWj0l+oCJRfrPAm8fn2H27qxGQcl0SdcwdZK0bx10IYt7ve8A7uKcNygCI14qflfLh11wzTWtrZoE+Dd77lbGwTcmlFx2YwQ0D0Q9RC1FQc9FU5jJ/SN2Ax6JfStTtt4l5uZGnprg0XX1NLlurb0ueLccNIZY2DghgWy+QO4zbEdrCWNHjjn0oFzNe/xlW4NFaNHcf6Q69jyg661fb3N+2pbYE3iS4kyg7ZgymGb7k2urfdebNuNQGM0QOJoQJhicQRhY5TQoMDgkzK4dMiHWQv45w2rG7GTsmk955pwCanFl3kNFc8yWDlC07+IIG9MPNRYZoNta3bbt65xs3O8F3MR3ktEM0mOHk8emXU/8a5b3JbNWNii5rkWudJOukEirZhq4SkZt2nLOvej773NPYutZeZJWpOB+FkCIOSxNoAwK6oyj1mXn/7Q4FY400yuAyc1KjmMCX7ygiTYALEWyXRnS5W3MElVT2YBJyJdZjesh9McgyFAa+racCsyalODlcqlFIikuOBqbMaiv3QOor0KaCD43LNN5Qj18KAhlowu+BarupKCafCA4PaNLW4N5v10QYQiy7wE46BOzpw5A+OzubDvVJYkjXNu3r7N47zG+vWtbnbeZCyJeZlEVA/LvwO7SK97zc3ivoDKlil9CeS+U+hua5GuXnH3je7WPW24J8Rte+PncyGJ/tDsMO2i9bBbZCdZWphCx3wlRlnYAeqxua3bNXW9DLdExpG2LcOVM1pwxiUGggy9lQ0OjcrGMtgIv02e73glRg/uFxN8Oc3LFBKvyEAwkmJhCspol1KUBm7g8Jh7ekpXnbL6nyjKKh0U1UQsjp714EnapsbQU0W2ZQWCcczNzbmPfOQjaNzr3Yc+9CE3Oztr5fCNYUlCkX324mvWNKEBs+dcEtfyiJAG5/tDp+fcD963C8dqrv7uHeuXrrWx0eWw1uruaXdvum+fO3R0VjuLxNkUi6HgyOPrl7cWinMpA0pQgfpSfcsZ3k6IHa3mTmxaJCMIGybuM2gafdfeLXu3ZjHX6kT+X1PB8AtnZoTCVXCzp7lrNwpjnx641Mycn4+jGeZ7uEHkT58wcxzhYMzNCC5uOQZZDGcaEer5yM/nxFtbcNRSexHnz8nFMKGXe+aZZ9wHPvABd/fdd7sPfvCD7oknnhBrwF9Mjg7/gIhZbOSZLN8WQpu4GP9S8RTLNMYKFXf3y3eJbTk2vNR0LkbHNLk92YodPBzvdre9dKdra0Hn68vNESTWMzMce3F2HLizX5yxEQQJiQUkK+aQCY7ovG3hGjAI6ByuEsA5g3IJ+ep2jaU7srlKBR/LdDtoM0icuURucHcy14MhaD22Im1xzvyvlPP6MQMpshfm8awA5QjSCBiHXJ+i/BBJwNX5MTxMLIKZZ867/c5chC83ECqxq8teNv71r39dItau5bmhpTjLGxfocshiXLAuhX2ZNByhZnA69xU4+rFzu72ccCXrb+nZsbrgFncRGxIbMJK97La1eK4fN01RvTaCQDe+6fETbWoHZKOBoPNU777SmWeSauoZ3WHP6BgUn4e3esJcit+Q4zTsZVksZG9XAwjbrDIQ3AjErfiGJt4vZK+eNDoAVsxxflmCgVAZQUkVLM7wvh/AEsXFBC3/iPpAjEeKiGOOuc07g9OqvIt9OU7Kgg527drlHn30UffhD3/YPfzww+6GG26QWNvPP38KoX4LJZ75hNEiczMzBdxUQ0SN4fy8l4LhgDk6seBuw/MoXZ32da6os2UIZL1fVt37gvM8GsvZjHNbt9y83p0ewxtrUHZsqUIfoRLRzhSmQjiCYL2GWYzueywjz0snlYlgAGjACQe8RD5kgwJ48xplxzT/xTwdcLuE8vEwOmYSw2GmqQvPXnMtQNo0t6gu/0K5MJAyjp5wOI2OaxDFgQcwXA3v8xE9Bs6TNxSQd6rHxwtuahrP62MkvRwXKvKOO+5w/C3XcRSbL2JjAo2CC/zR0Tk9h3FZDbBeJqA0jiDjGEF2bsebKalBVfZ59FRPBmBpnnT4POT1wVaBZgxInvnashUjyCwbH9e8fB8WrFkGwTiMAjHLKU9UcIqlQ4WiCZj6iV0KlGnil2+FcTb5NOABaMZQ2UEb3k0FUK9KAmGHKU82j5e2sYdTdo1c+BW6IFsyECoBCUGqTwMLJm3vIeN0dlXwvBdPmhADwGLw7SLnzhXc2dFJr/ilSDtvMkJwF4v6or8UR1q6uYWiW4Bh6FwWTpUeOz6FY+Hc1VqKlOXT8JHPdeval88IjmAQ586dc3gBhxoRBYWyLFmoVzfXIWyI5O/pWYM1CcIyCo4gXJNQCST2UyzGQF8uzULP3Fi9/HqDkPoOafPt8jokqc0okelsFnK1mR+ywKs+lQWfC56NwSI57EHXF3uZUFMIjzxTCWYgPhfMC48dxBSSUDSiiKsJUCwdfAb5+OgUnno7cnzEzWF6Q6HLrmQJTC4cAVh5F5tWJRwWmpqfhzFgYYj5z9jotDt8ZEYvjrjc/NSmY2XkCWLslLWxV1yeY35Yvueee87dd999btu2be7Tn/708oR46nTNEUQ7aGltdG14JwA3haRHdY5AkjjdUdJwyjAQHA1Bdq6AM6H6JDXamz4Dl4xfRHJ+uQ4Gos8t+wwATivi+RTuUct6r0DeKBJJ0UC4W8bRxIPUsHm03jQmcMQlMYaMJw2LisRztjZCoUJwkuXAc6fc+DQMERXESllJhwa1SGAaxvQ4vZrEg1McJznNODx8zo1NFjX1WMm8BFlsiNzm5VsiL9Xdf//9Wm/dfPPN7ld+5Vfc5OQkimKjwPlkhnJH3xMyP4Apxk2fRj7x4OuCC3XDQY2csng6EaMp2lPeQcWLdX2+vFwczjGMb8TE4pyGSYNkA6l26A4rlXDm1+eCOefcEM9Pw3rrMFWLuMQYEyujV69we62m0VZ/xy6dQFAUYenCBHj0heQxi2688fCxx06742fG3Lzms0llpSVfahiNJp0RiQmw0CjGcIq3UIRBYPSYny+6xx4/jmPh9qbGS033wnwYqaAKPaF6YcJF2JDn2267TThubb/3ve/F3f82lZNGcj4Xyh380NiL6CDCFrd2FXHCgY6dGBfq5igXj+nFejVb4bH2RMGLde2Zl+dBoMqBwWBhAbcZ2HXBMOuUzK+Ga8WTGIogM0cUsuietAAAQABJREFUCaulucw4C13GQTHrMKqzZjcJLzMBsFM23381gJOszz57DOefetx6vDjhSpSnNrcsH9MpYt0xMo2NCPzlsZszPHTafeORs249Xleqx8ZqGVcijnTxzg+8nWT5u3dBN319fe6b3/wmnj8fca9+9as1paTxBPxyssm1F+uCa5F5PF05i7vpmk2VUuex0ATCgt1kW5sIz30sJ72L0apuUB88Yc5XDyFbaIzc5g3GKgmEzvJOzSRyjwcvwgQMcD1IaAZSQi/PrTBTjhgv/WI58/x29DjpHoiEo8dzWKYfgdKXBJyE0vgqRpCwF+1FY+z/0oB7yW07+A1E19F89U72nprEiwXQg/JN8dThQw8dQhFRSGa/Sh/VpbjUGBuiRGOOPzKOV+sgEVSyr7/z6SxJLRgA/bvuuisiLs04LL25BW+okDk5gTen8AwaWyX+bcfSJ0NYjVJKxRojXyGdsXwFvlkFRqLJFdY7ZrVMQM9cQGnuBEbizJmgFGVOiyMOO2UIKOARRd7ptoL6Yly6VyMm6R0MoawhuDi9GkblQNQ+L+lwdfZ4b66jPY/35464Jx4bcqNYLM+jwpgGK/1KODUmCB7FyDGB4ynslxrxPq5DB0+5z3zuCJ6ya4LhIu16xbrMDFEkS9WIDYpTpybdLBvnJabDnbqwa7e4Ti6eUTYb6mIG96FC+NTJceWNeWS2uCFj9YAY76THOjH94CWC1QldYlmqhVjqszN8ohHdFdKolLGb6kcQYEnADB7lIv04wxFIe4I1VTj3w/RqdhYHuVQU4yHtSjnuUJijbE5CzNlQ6yOX4AU5ZGWYZ552bGp2f/VXT7rjJ0bc6ZkZTX2uhJHIONAaJufmHUcPloprj5nZgvu7v/sOXtzABnEJhVoqCwrMeX4r3iwyNDzmxqZY8dADW+gyHXfqwq7dMlljGWexvT3H9RdkLRSKbmDgjOvt4l1yKsGOe0TZmnclymGW+fRqFBYJLyMA8dQFF/9Tk2dRN8hLYQJpsC2ajpistY3yc1ls+A4wQqAlixAesS3jJCUXy1NTeAEXdrNEkeT9MnKYsJbwZj2fpwhkFm0Nkk4sHY6kdQL16dho+Zob3l3++499203NzLtj4xMraiTWC5ryOWpQPh3X8Ny5+dxnv+see3IMoxnOJflFap0CrAiIBtLWhjdI7h93J86Ma4pHwSGPK5LIRYVYXVAXXKDzheCjuB/1+HfOuG4cIOX6ixS8Scw6N8exNtQhfCC0yxRhKbTnWK7HVNm+ZmYm8LgB2jjafmnuLNJK3Sj0O5NYIT2MHFW+pUTidiUzhrdRzOENJpiAzc5O4NlhvJ4FPUDI+nIzVZceSuMUi71E4nwK6kkS6NJDJizJpxcObwF3ztZjavPF/hPus5/Gy8QwfTg8Ou5mNfx7vkvo2tno+As99NmpaXdsjD2S6hcPDDW6Bx94zv3lxwbctk0tOmFcXeall26plCwGn7s4gdeG8t3hkwU/TbnSCfsMUv/UB3fuJjCS8m4+R9GBgePu2cOzOKjJzVMj1v0kn6+qmYN0il6b05/Qd5PFV6lxX8qVU+sy7kUd0wBQxlGnyhzf6MhHIjRGsDLxQvhKAe/KejhbLucexjyTDyb425jcYcArOedOYHhjD4/jGmOahUGAL9Wl5GsRD4qN4dN0UysXWqgCJVqpAkeZCT6CFEioSVEolN2ubS3uf/z1fvc5vOgMeyvu6Pi4O4upEHu50MjJZQ2/WhpjCc5ka/RFIbgQPTwy5k7DQJgW+hOsOxrcQzCOP/rPT7gdW1rw4gLuCC6WudIQpsEeumNNzj3y8BF3ZnwKx1xwDoz5T1Sy0skukncWazBu8fIzdnN4I+MDXxlwO/AGxhI6K6kBeaFRxMm1miAbqXKKpteMZ0LQBkUnjkVpLAfAOuV9l2nMijgzyuG9B8WZU1hSoENT2kqKL0Wgnr4zODj4VDbblP0uMvgMgJYrpohhr1Ia0dCTh5CJiTMYksYlnIlclmNhIYC9Al9erJbkZQbJl9eIgpR0Lk25lEsj2bu91f3pXzzj/u5vHtYbAMfQww6eHcGielYVSmpr+GkZFk5w3OTAPiAM4wSmU0MwjmneDASwQc+fZNzn7n/CfeSPH8fIgYrmtKpe1hYnsSIQpteFzy98/eGzbuDASTc2b89WXJ5uL541tg/qiGswvsWFk6YGnObd/+xR91mM3j24L8W8BVVo1AiZCj54hMe0hyct2OPLBSaLLevKJsa0uLV75swgjJavLp3FG+UPwhDt7TkUiLxr/YHgJ/Er5fVK+R277sdc7EUoHHPCVTqY1rjS5CGXb90owecgtHnbS0wEM0otXKqjItDDlfFADI+1VLUcKalWeL0Ea2m8mDpgdZuUKyUlRvIPnxp0w8Pj7kfec4fbhmPhZ/CKUE6R+PwC38zBlyzwYznakvTieVd8AYcOufCcKhR0UhivGcc2Lr5tiCcFud44dXLUfeIT33Ff/MpJjBzNeuWNVdClKmz5fF7FeA9X1n3+n/a7nbvXY7s369biZQpqxNLz8uVeiCPILUA/JycwLQcxp1CzWPN9/OOPu63r/PoLCLvlxxuadh7L5NKcgtNMR42YzdIOtLIdXILzbOz0zp7Fa3HnZ2C0ra4wNoy1+RkMHj0QyjNfsssGHHOfLmczfPWP3osLcOlvKuXcL/k4xOGWfhbWi1c8FmdOuob27XiPE3ZERo+6nrU7sGjncF2vJVLk0hxHEHtYCl8W8iwXkkga67MDlUGM1WOh9ap8CYxLaAxgFQg+3x3LNcGBgxPu136j370TL5a7+569rnstnhXHjHNyEo97olVzAhD27NnIy6gsGgQFEc7jHI0wCibBM1aPPjrk/uHj+900T9NiWsXHXqmqkIWlaWdlqDSKYEH84CNn3B3fPOS+p+8mh48DuE68TCE05pVJCeqATtgAOaU6OobXg8KnjhrR2Xz5i0+4L3/9tLt1d5ubh96FgE5CZVCP7Jm55WtAeHB6myfXCDzydIF7Y0Z9/ivHK+5WjY4cw0bBcXRkeJwXb5MvTnwXxsFnfGQcFFCCQWdxTuzjmF49hzhqFkmP4k1yePXnK4HbB+vheoSLd2QQRoIVfq4VnyXDk4VTU2dxZ3oN3gixBpmmVbOUl+DAx0KfO/YI5phjSAdnv6gtwkuTbs16vAWjqQNK93N2pYOmr+ToW7rme5MgTP+8JDBRij4NM1reI2lpxtdqsSX6wDdOu29967Ar4OM3/BxAKw7VNTc3otzYZcEcmmeoeNAwh92YJsD4LlvOrXln+PjxUfe1BwfcR//n4+4L/cewS4MRqBWvTOJcWxm4BB2tAAvT5o5WF3bOvvHISXfbi9e55o4mTQOb0XDpoHWq7bJcNA4o9MgojvRwvQPBfP7jmaeH3W/9xwfdHkxr+eb3dFphosVbCTgjjd4cXwqYHYa+W5Ex5oxVmXM9W15uJ7wJSwu4SK5NhBnHBF5YePLEfuym4atleKRi4exjaGtYLyYP6zFB7MGz/yu9DzZxgsnzQQwlic+VfAQFfTM4UlkAfXkKQ9Fzrmkd3iOEQ4QnTjzrtuZfjEbVaSNJmvwiGWZtMBdsqmz8nANq6CQwulTygInemBABjugYRxjxAK6FW5wERoerdwagKN5pZ5G3b7ap0N9+/JD72CcOuRv3rHH7buh2m7d04jxXK8rLr9hy96WCnb0CNi5m3YmT+IjngVH3zAHs9OH4BF+zuWurNQR+xHM5qgk5W2lfjQTdXXNz1v3JnzzsfvmXX+PKvRVXwPGP3nY80oAEWSa6qqoX5PwXcYCPPPxNY7p5YnxSR/ppHE3Q19Ejp93vf/gr2D3ELAGGqnqQSNaJpYn+WdMsjTiqTBB4FJ8wtMduw0ls5JE4ZvoiLojnrYrxsZNot8+hc0OngLwujO7Ht0iOoPVXvdGkhHs1Dcjmnx0cPvzoO2EsH0PzoIFwfMkeOnzoi3t27v4Eesq3YVeLd02AQ+PBJ7HK00+7Bbx4urFzF6yu4I4deRIPvtzqWvFWCB5oZI6X1BhUGyCH40DFh6XMRoOyDFd9BVNQSNCOj5uucI0WEjgTLbKXokHWc6ICin4RUyFW9BZ8fJPxU2fm3IFDR3BuaFhwvviZBwCJ48jA6Uszvj/I76X34pMGPIjK3Rl+FJS6WJI+6mVqhWHMB/PKkZKfg/vjP37I/czPvgoPi7S7mXOjbkNHu2vGaBhcMJZQALCrzKmLCkc4adiwz2G3agQ3X9kow8hB4/jdD33BzeOrVG1teM8VRg9VAxVowhjwuuLag8YGX4KJoTA+VTijtsI6FCtRF3Esg2SB7tzZYS3KudmExuwWxgewtn4czY7vfY5TKy7MYRzl45Vc7jcoHsbBWZ9fgzAEB3v9d7CgNyDI5zQ1LaQQLmKKo9+Ej08cr9mMTBfckSPfdZs23+Ta23tVACknFo7Szu9YaXqaUCMIZ3mJW6wGqEUGEHzQLiExKrM6OwGSNpmUTIrFT9MAZLAJL1XY0IvPjCFMONMMElirlM1scDtVhw7RCAlk2VabY57YQDtx5ObYiVn3+//XV91P/dRdbseu9bgXNOba8eYRvp6nuQEPDtUpgIqUXFQ8HkCcmJ13o3izCxflbOJ8grMBxvbMU8MYOb6K9UYRb2/BVJMvyPNOukxHqEsaBp38lAIRr3AXS6ewCaeOU3gxVV9oHNzKZcd96uQAdmBP4eg/zt6Bb2H8kCuOPYx2XGUcqEfyMC33CweHDp7uQ1H6oTJKDq2z0odPoj36+OOn8XbrOSRwH5hI4HPOvOP80Ay2xGB5OXyshM2GQxcV2tqKOHyz3AsXgIXkvLK4MI0XCH8ZclO7WICXi2fdGrzZvaE5rEHYGCFT/7yYfKtIKpfFoG9wAgxEHyH9p/x6sEiDAKV5WTQAzuHtZwaBqHpk3QkmQXDGGmKrzmeRtObCemsaz+l/8ctDbl13DlNIzAJQy9zinsLWrJ28RZlRNHYJLCHLz8U3n4qcxlk2jhhnsInBm4Csc+70NTY36F7Hl77whPud3/sa3l6CT7PhZx8vDcpJ6UuSTdcFvPppgYcSYQwlfHsmtAm2k9LCSaxBXoc3/Sft4XzKtYaedwXsUh0/+jQ2lkZhsNiQAMPC+AFXHPfGkSzKKWohj9O4KOmHB4YH/2/Ec0PICRF0wUDc0NAQR4zsyPj419Z2dd6GO+d82zrnT56GjRDbdDMDgOA7H3hmnVbHhXsRx+Jb27q0U2AL66AQJpFyXj8seAFv9j53+Iv8FAIIAgJWjI/nrOm9x+VhhOyi2VhDQzdDoDzmxdIwn3GDV9NU05LIyNK+zytxXoawHkwJcqk46Yw2IK8Pn3nm5hLvsnN6+Dl8huHU8bP4kGkz1lltqAscwcDJAj6/Mo6RgfcxRvFdk1FMnziFGgNsAjf87OUTHGWxWYFfATxPPXnY/bf/+pD7m3885HZvbdF01NZ3Kd2omq2uUbOodavfAj6XtoAtf2wtVRsIRwJ8a7B762ux4O9Cc7BpcEqigtZP2WJ8enrEHTv6JNrkPDZYsMmEqfzC6NOYVn0bnfs60Me2T94FtGF+XvBzA0OD/1rCai7J5DOFmC0W39eUb7gFe9Q3Yl5GIwEdC4amg/sj/FRWpYxevn0nLLQZL0Y4DSXNuk2bbsbd41Zkim/vSLWoIJsgEyMavpyOw2t4oUrgsH6LtCCGHM/ipSRUzE9wnpRM+CVw4lURNTDC6RIc+PxaJsIWizKm6/jKauGahP7uba3u6WfH8MnqB92rXr7OvfLuHW737l7X2dWms1Osw1AX1GioU+qau3enTo9hk+KEe+Crh1w/tnE3rm1wN+/yW7lqteSiXqnI4DxMUYYp1yYq5htMCNYZWJNT3wZNX4NoLsbHsIV78uQBTbF4l5xL6cK577ryzHNmHMmagyLMOMrlxzEHe5eXyYxwoIiu1kCIzOFB/ZG92/Z+n8uVHoBSNvmRxBsJCpTrdsWRByFqwTV07oWRNGExhuesDz+OIftmTLm6zUhYwHR5fbIE8SSvFa4OgRBppYKBUZISx9oNjVnRgAQ+utjMIyQKgQw9lFvDVhOtm/eUsOs2SPXRcUOhHWsErk2eeHLE/fNDp/ANlSZ3041dbteOLreudw3WmM1oP2wm2IDAmmJyctadPjXhDh4acU8+PeKO4O2Nm7BJceOuVt0QtfscIA91JU5c0o6KVoWaxqufKoyzetDAQEGitlKnIVlTsMKcxY3sM2eHkFe+Uw1TdYxGBWzllrnJEj4MmuRBxoHjRd91c7n7Dg4P4KyJZkpVwwvJaw2EsBLXI/39/Qf3bt/7BpctfRlGsj4xEpJgqGvo1ZyugiexGrtv0hYah7Mjh7F433Sj6+jcACNBeihgqBBymuPDUjhOX2WrAQcWljw46VAXQILPEAdp1QLgvsY9PuICb2qR7+3KSzd5iVQmgRh7TvjqMauQnu154rFeuL7gjU+eMub9GxrNo4+ddf0PnNTn2rC88M/OV/TYwAIWMo3Y0eM5rw7sTt28GycusAHAIzxyoUrq6IiqtDpMkKZuGoXpPalLTwNwvRHE6oezD3xSDqPG2DhuaOMeB6Y4un0wf/ZbOJR+Cp151VYuhfJDOY0o90PNpYUfeOrUUbw5vb5xkLiegTgYR/HOO+9swEvSnrphx44+rPE/j+nWVky3+Fyiv8OE3S3M6Ur4WlQBU6qGHrzkGnNGNqrjx59BbzKPu9LbUG6+JkdtjulFp0JLY6FxE+XDHAqFi+QxQHDtpCsgDYdYDCTBBBRC3owUxcUbUTC7IDNkKcafbwGWH06Gwp04OJ7h6u60Y+hsiKy/pEIszmkaH6YKX7MlhZyXl9TfIkCCIgOqXB2RFA1D0XQr8Bie56eS9BFChrSARyd7EvflpqawGOcNQBoHNn8KZ76JtSxuQOMWBd8SqkQoANaUxYIcfcLHMw25H3lqeBCHAc9vHMAlu1SMpB2MY4FGcmB4+JlyLvMqyH6GlgcarknMcQsYu1ql6WcwnD0OS0dmkEnuOZ86fdCdOXVAdFSAKdmzwdPDUmnbACyohb0CHZtwgAacR8gLDLECU0QWDIDgmzjFIsgCMUrJPrOsiOe7Mx0nZaa+ubjmjU6OJnzYjFvEvPfDeAHv++VWuJ40BBurMNFSCEWpQIZOL61JT+c9NnY5Dmn8RQcC2Ex6BGGdsCMuYlF/DLcaeASK0yoZR2HSFU4/BJuYgHHgTkXKOMBXgXHwdfJ/enDo0Nt5BhHJMOFF06qYPAIc287raCScbh06dOhwdqHwGhwv+bo3EpqlORkJ1hxzh2Akj2IvGfaDQjbCokdGsGjCHUw2+GojQe+DOWKtC8oOBkK8dBguwfeMSTUIEaEW8LCAgr+YHhDiRSMCRRT10oKxpFpBwFz/fuwAgmaCDqQGK19srxxb4XgnMCgo8Ie4cfirAYNkA6Z5A1l6zOakubpJMs2S2gp5aRzcNZvBVP47OCg6gy1mvC+BI8c8Psx5mutinM7grYOUcbDicYgU3xd3v3tgaPD9PmUmdEHjIF11bjxn2uN0C/H8/uPHz+Lla6/HkYFPw0g4zao2khyOnswdxfD2MPKG/XEYCS2bO1zHjz2NHoev3URxvVI1bErjiXYZIkiH0xIwINWuLkpA3+BJHolCFQEQYT7IeCoPEc2Az2eEiY6Cnz8uli0E4AdtRWVBD0IHGhU/oTJtGNJUVkXolVVLH3RotNy9onptqsVOPcjgVAptHlMsnv3jd2rm56dkHEXA8jAWMw6c/zrzVbBxBoN1iDaiVGGaiuAMHb4cVfnfMXL8CpBs80SeZwUMTMpd1EA8LY2Bu1uzuJnyFhT3ozIS25/12sHWbh7HUrAwmpeR4PkD5INGwhs22pvG6KInEzGisFew0TQoI8kVd5YFjSifBKEB5hvwooYsMSl6xgOPgkFGAlTIXyQWvaRFjSZOtSyqFK73S1Km0HiDb/ry6vDF9Hqo0r+hopyUkkPVhLqJKIhJUmGI7RRANgQ1BvqpJglBPOFbwn02Tqu4U3oU0yq+aYfxCner5kbd/OmvYmCjHPbbsd0zgIMQGXwsqvyLB4cHf5txSzDmCNELu1RuLkwILIcj0Q8M4qZKufJHnNNBQdQec4crjATfnq4snEWmv4EojgmAhcMgH93l3U0WjsNomS/sUnbJXu3SdkeMKKrI0moOvAlBUkEJzrAJDYUq5omrJBrC8OGqCgjyrm8/3ahNI1EZKlhaF14VVQWOPClo1LmXQM/ogh9ihggyTK1hP5IGE9qwSaARYUKOkQOPMh97MhoHGhqM45xGDt0/SRkHZNM48KalTAZ7Ce87NDT0B4zjx2RTGUHsIm45BkJRskr4mQPDgz+Pwn2IczvEfcLBSNpgHBz2aCQ4xAZLCEZyQtMt3gOJlk653kEMRCRvOwE4ar5euTzM00RblTTDxcoO7PAjLIRCGkEOi0N6xA1kzEnD8tm9Dr10GWLZQnFZHq+D6EsRXmdSgycmqccxZC7oy0flBVxCFUI0Bzk/emiKxV7T54Hys5i6L8zj5RPHn8bCnN8VQXOLxvEVDDzciOXP2hPKx0850zggpfLuweHB/5fraBCwg08yg8hS3HINhDJDy84ODB36VeTn1zHd4jl6OlyDkeDJNewmzJ/+GkYUGIkfSfjoLhfuPIul0aZOnrkGMeX78sDzIYMrklRGwCkHPhuhniOjlyhJQV4Vo5fnYfJ8DZosQ6QbWJLe9RGqyntUUNAt+moUkaW0ktL3gFg8q5VI4QlToiJ3TEs0tXKiQKWh8YO61lSL/S0d2xENBE/+4blxPgVoxoHZh0YOGgc3VdmEU8aBLTEYB+by7q0Hh4b+xt/TS9bLFL0MdykGQvEsNn8wkqHfxBzvV7EQCrKQ22AkeFNECS8MoJFwJEFheCafD8zPTh5DmOetgr1RLBx6hDJut8j+KSftpGxLOAFXAy9cWaGCyR34PIxRZptwoRDyvqgVZgjo6kQMuMqvVXlG/q04uIYyKmhQ6d6CKlXQSSAlMEjwAgQJPX8alhLjaZIkKSc4m2SxCljnCZfSwYihlgC/xDUHFuSJcXhazMux4KBxYBvLfT+WAZ/ibQq/yRSSWbYfGvWyGX0pmLsc5ngfgs7/N4wklMeyRCPB0V9s/ZqR8OEXDo88Qs7hNFEDOOQ448S2He+yQ2CiKqOsqhSBAPFCqnBeVsAxWpUWEfoPUM/tGRQjCnEDeXpFjKeqwSm91XupyivLpKz6MkXNGFRlJt4PJ1EXi+isvKYfHzYv1klkATykmtSEh0iAtQc1HbSPtJPB8FW4mKSU8Zhs4cxX0HY4Y2JTi3kuYfMnj53TGdzt+D4Yx+f9je7knl1a6DLCl2MgTIY55BCQw3TrI3hb3s/jjnuNkfB5Ehw5hpEUtCaxd6DqY50yAYpJOb6TiwaSFN5CoSaCTlIsMehp0g0iLUd0oLF7VxCkf/MZkegggzFZKOBEhAZjRF4UIorHHKyOQCpPiS6Y16ANy3fEEZ7i8YpJlS3oxooX+WLhyV8lwPQTrgFlyaZ05BEaHgKYs/XAQBg6ShhEaW4E7efrqBIaEA3E02DkoHGgUqew+Pjeg8MH/3mljIOpX66BUAZzKiM5eHjwj/DQwf+K0YFy+YsjiYxEC/dHsIPFUZAFTSsCUcaxG6F3pWLqVYs1igCF74OhcgJGdIokNF668cSGQihApA30AvACR4QqzzcgGokHGxPZ6jcOEV6rSzRsy69yiaC1YQYYxiXSIaPqAHzTBIquEjoFReziUYwk8hSzS6iLoB/RRXwQXJ0O0RopmCH2r5ZRQJlHPvY9hxPkDyPKm9DJghx0ZhyuMl3OuTcNDg4+sJLGwXythIFQDkte6oNpHzgy9F8wktBIqH7+EiPBx+FRUvzjIBk+1pnsvCFIR31oDYJ7KHxwIboahTI1OPN4xc8rNVaQxxIeYQz7Ri4WuyDRIIOSvCzS8o9yiY5hoyU4pCms6ETI6LVzyALzHHPCsCK4oJyWTYaRxYCrMgTjlAQGjZkBK5MEMObjVSQBFrCIC2R+wJogL04EoakQxiaZpgQu3BWXcXgc7wXYXAtTEvd9hw4denCljSPkhv6KuH7cXe+DkRyCkaBUP51ak6BU3lZwDKBSnII54QEZDTTppEnGl9ahzDywCJc0UMUMRgVKT8H30aBYX6niZbJwSYWnaMVuMiTOCP0UTEyEJLzpMBsb40rLuGM8CiP3VXJI0wwjJC6A1wjDxDMvuFAniCgejCPgREFio9V01Bgln9Aw3SRRlAmwWIhnwEdMSwFIuId4mcQwC8pT3MWKkoiG85XohUICzy7hDUaZ+XI58xZsFH3lShgHU16pEYSy5PrtCEoemf7P5VL5F7yREBdVxmFzsXGIHargWX4+h8ydOigm6CayB+WZH2ISH1MIJ+RUH5Y0cMnoEbhSPvFKgwGGBIjZThuqsGLlpaybuNZSBAQnYeS3uJXsCl2VjM+vkrB0lXyMh7JhVGaWVD74wThIF8PkJ0Aa8GF6vL1gzoolItER6jsK0CgvqLogx0gCNWmDUKVAhKqZ4jnvCCNITI4MaYeMcLeKrwIovx0vG/nSlTIOJrriBuJLoqMpBw8P/SHOwHyARuLbitdTtbqS0gMOBfF9RXwqkS5WNFBpLoXDxSMsyivbpwdGLsSNwMv1eNBZyPBVYVSyxPDCqqcvgHLm49YSyBdpvUiDUUaaT8lf3kXiTK5PiqkrA0pKJUrFLWNGAhwwllmSVIUjIIGLnnCWk2zyGEyFA8z6BaIooCpvxkAwETUOAM3IKZyGsYgg0HPeza1c1HD2hw8ND3+2DzcBeag2EKy0f6UMhPlUYXAG5vdxwPGDeLs3jCTU1AWKQQPBx0zsKTLQpVkQluoEowxTpK8NxQOE2MAbK5X8JsCjjZrAyIeAkcRAEqfBSGzAkdbL1P0cj480omYs8jEv4WdAoS3RhHxRPPDITzOyQJJpLLp6OTE3vs2RVE48pDRewiwcQwAYsa6ez+R5Gg9TLIRjAsoFUQqYjEAUwIgTBJ4Eg4xqmzeBGLWuBGqEwfbNjx8YPvT3NI7Lvc+Rkl83eCUNhAWSkeCA4+9AE7+lYyn1z5ikMof7I3hZnT0DEGqWugxK8z48hepVZEICuZTBegDQgqHuE7gR+BRMMCdpEm2JWPoMx/RIZ7QIiNfoRUTCFCzwBRwTNAqeMyLlxf6Mw7hCuiF5SqW0CPfSCCLMjAphDXZMCWAb+BAiJ3lDiGFFPCiECfc03lcsZALIQBno6AeoceLK/DDina1xYtUgEKZYgUK+WDgTwZMov4T7bv/9ahgHU66+K1OVpxWNZEfGxr68tqu7G8cF7sEOFXcg6hsnR5DiOdfSdTte9dINhabeZMGhldlK+YoSaggbqREJdEauGIPAU9cW51AdXAx7mCR4tJeWpEEm4bwcxRNZho7MjMIl+CTkwTFLxKSaT4B7UAqziK6q2UXCFDTd6K3lQoZvwKL3tOm0Ig+AhLNxK/NGpE6HQjiyCmR0SapGlxiFj8f0jZ4iCjh6VMK0ujx7Do/K4oXSeM1U0AWl48R6Dmn8xsGhwQ8BkcNbeC76LAflXq6r30gvV2o1P7XCX+bA0KFfxJNoH9WTXeknE6voUQP454utgx7Pq/DaCgwM8FUVAe99JmNBYRE23+A+TJj+eUmFRWQCABWNF6a0JMvTG5p5wF+AyTeZHuPxiSjSpsi8XOLtT5SRwPKgqChDntKpW5hCI50FEpm+MLFMXowYFGaeGcDFj0AxHxQPR5QRhatFU2ASGJv3E09UjMKx7mtGkEoGrwSlcVT+Ajej/z2I2KlzZnJV3NUwEBaEWkDpncN060dR2C9gtORJszqHyExhJfQoptGgQPj6T+IKWe0Yra5GR2Kj9NdIB4wxgpphw4dw5EGgOhzkiUnShSe/l8G4qALMBHhaYuxP9EYsDuP3gMgbCODHYJCQ+EJ6njQ0gRu7NW6WkvFEpvEQSJiPMZymIz1qz4M9Tl4doMlWGp5S0iJzjWyLemFIRmuQVPu3PUJOJPQlNOxY1VhQZL0igatlIMw8S63C4dsL78Q06ymcyap+MlFF5NECvJ6eJ4A5vfI1E/WIgMIRAKYIM2BsAEBYvRhBYgwpONlF5AUiHKSQmWFdSaN4oBOjcIJ4vKdexCcAWOiTnjL152UyDxIhqMcLFimB8c4EmCzxm0xhJcQSCel4wSHFSEzJEkoeuLAeULgWZ8KMzsjBIAnk9P8RIboqvKiMLtDTJwevyTSW/WiQw6BN6nAUi6/gdO2PPppCEnJl3dU0EJZEi3bc9RzHAQI8mehOYe4PI/F3BVVWQPXprWnoxhawARyqIyowXUEgUj2HyiaTVAku+n5RWm0kRODHfwZDxSAS0yLC/hNaYcVgLJ4+ihCP4Xm1H/PhYwGvKC4erEycF0ZBpLW8hSugEW44irO/IM/Ek5e0YhBFCJsI4oVMcIxr5PC4ECaj8mGyFDVhCdzLUoIk96SJJwiiMI408jxLU7zDyr/EoI8irpq72gbCgpX6XF/+ueHhQTyi/k40Giy2UmcIoNgMnisu4VkSuxcSTv1Ci0GRCioCGBsDHCuEFaiwXarCjNQaCXkj3MJemgSpV6coSvW0wpNJIMYowEgsLwYTVHQiFL3hfVAsxh046vpkj3/GqysT8PIV9DQGs/wEvggLcgKv4hRDgDmFFQV32iBiGHTAG4cFmI5cgCfRalqxBiKTEZL2LH6KRWlIsK7rrwu9UsBrYSCu39l7t/bjcBmG1p/i8fe041n/8gI+8q63WahmPDpUhSn5/2/vXGMru677vslLcmbIeUqj12gsz2gkq43lSIKt1GmLlDbgBEgbx0ZrOG1RoB+KFi2CpmnjAu2H5EMfCIykSWugQJykKBI0Map+KBAYaV0bImwnjmMrsh2NZEnz4IxG836SQ3JI3kd////a+9xzL8nxvEheOd7kPXvvtddee+2119qvs885JSZRW8BZ2o4FIMOVHahg0V2FUrjYAg8cZQiFMQFFHK9gjpcShRxhlekcuvgXkALPqaQpQ+2Xiw1YyStfRHDisY7vMKBcnulmWDCgtEjPgRzLHJhu0O7JK3qkhYEwcptIUBKdqH/wUnIb7kIKPFJy6cpEgpwI9PoR1dQqYxdUoQnZbeOILzymnW8GTnaBGxDaFANRvfxKIUYSFu2/xUrjP2uPG4Eymkg4TMA4+atvZMt2JOeurHNDi4jg2Vcowr5GLCf24HQjmaYARTkqYlFmUASIGfNGDbvQHLIUPshvBkk1TPCgWTynC5rzBEbGynkycRHJP5FbLU/kNk3Sje4cNaoVvMAKWdHOJVQ4xOk0FBUtvTnEO0kGBCxyKSx6clwdzikRdUoPjjGVGHkCO65RoJJy2ZE74/ZZh+i0fWKxYG2Yv2kGEjWcyhVtO6DJlQG6F9LmK7u82KH0MSHKjG6ZdwXtUL6EF2luzh648ucGyQpgL4cjTRnyL8j4puXclZN+dZFeZ9TTm4IT2CVPAETSjZ+vRnLxkR6ZFI5fGI946/4K5cDpslVoraAPKePmMl2tTD+4UXIuU7wIz/EcZok4d/Wk39avpgiejGi6Iq88+T8SHOWiloNWL07g5lzO53AgRX5fuwDdODUx8VVzvDIq73hO1aDrH9xUA6GqsZ/HAkyNQZtYzBKQ4i2+WRcSz8JarQEso9wwBU2wLGCnGK4QgSpcxxF6zmxw0CsnqmcvH0+v/9//mK6c+TY8MrqJjx5eRLcLy7mDB5F1ck7P+YTTLREcuX5AyWvcyBHlBi3jGycQC02KiLIzwYhydUIUFHVQWGDGcJ45mrtyPB35wi+nmQuvEY96iqneugqSnUiWWK6XUw0X4cAzjsMFOxJEVzz1jBfwsprj+OeG3BjsL3tTDaQwwzGtSwgrdx2CSoAc11yeddhyrKRdE7LkK7jQI4TnSAaVcMGpUCt8N1KmEWHRwpkOPDDN27PvybT36b+ezr7y22n20pt8B4VXXYpdcJQnF9nNp+JykcGt+Ci/TNvRkv/mfpW1FGRflMtfZteFdssJ3oiXfAW/QlG51IMRe5nX6lw88WKa2L+X+j7FqMlhhyKGwoBIrQgHkki6jsbJYUMKIHIWXipZU0iVV9lyzMGI2X6G8+nVqZKwQf5mG4hl01oe1hu2uXVeOhN6Fb5D0uR1ku7d3FK5cZSDBq+ESsAxA/oaQULMytGL40xK9C9QTAB0MHMeZfcbIYe2pcef+4TP0Z157TfT9avHmavLSLp0Sr7gIOi6bNMLNpRW/yvl34of+URHofBzQBHXQ/yWtHodBPVfhUbA6w6g5NXAffXct9K1o99O+57+e2nL+N54m6EImmJ4UXIOu0yFCxSa8V+QXWZkzzg5T8lhvpSn0CJn1EWBmhPOcFmkF4Zq6esY3GwDcdW2psXL2ACv43ZnYSENDU/wdaHLKKg2L4BLiPrPKF1BZrgTRa7eGPVwTqk1koNk789jiMvjPSzsHSxcv4bB7krv/YlPpxvnZ9KpV/5rmmEk0bQkFri1aYHYIa9/Qdr0VYb+ox5GqgUzfoBr8EKrls90REgufF1Lmc7stEgPeEE1ZqavMtseDWcvH0kXDv+P9MAPfzjteeSH08IML3+m3qZPFosil+XidVE7qJ4qJoB9YWWMtPAKZg0ukIjLq3JrJlUaGfFqLaS/+NqZcTfyMhgGcuqhWYzjUhYLEtOcmHshyxiIPs0VMgy5ZIEqosbPQONYyAZlcfeEAzdAXHvSTC03hAmbrFBURoMPyMxdvZS2bH04PfN3Pp2aszPp7Zd/NV05/RKsarTTq4q0NeocyuX8ADJNN3CElZKTI1BFckKdRkkrfsmR6Ym+ynS5UaQwBItfFyaZBmrQD+PYkuaunUznXv9vfFIvpYPPfjwtzi9TJd2aCnaiZJWhOHQL8w6LfqT14GVYZIp8wrQLxBLr2kKB+1HrSi3FhdWCw1j6BsKGu4qTDS85CrRYXkp64GXookChZArxZCFbvX4LfO5FisC7OHV8SPk/fEVMPF/CizSFnVqlEbP2qNzIF2UYwWmNkQajxnk+Vvlwevbjn0lbdj+dTn71t9LZo3+IUl1myqVTM3wYCINR3m7+oCHKZigrWcG5XR/CQccEy6VbppLDKRC/KEPQzBdImiJevzqdzn73d9PC6Zn0Qx/5NOnbqcusR80oJtPAI6ep+UKiUkzfafWwyshxYUREgFq4F8d0MkWHc0+pLM6oS6OxKQaSN/crNjYjICPViveChlN+mq/wum9t9V5hy3GBY+9la1XpklnEhS+nRoiwWos0cIY8F6MhQOkJOwOXbHRBLtOhPYxroOgKDixfhxlJZCQTu/akpz/8r9Jbj3whTX/199N1Pvuw9/GPpZ33P5Uao7xRkmPbXvy68MitYkVIMTd75l3R23JSzhrJ3rxdfaorqXGUT3XxYcCUrp1/NZ1/8zfSjdPN9MzP/DLrjkdYh5yBf94q48yZlkRqhqESRCNeJRshihCe4ZF4a8ahrJpGySm/dnMtJUNyBBbKUZOMWlLX2R8EAwmd6bQ5l9X7eIoOcnqrtxKC5LS2kUjpLWpwbCQStGQug6mF1QBxSFR4EKccpxvdGYQNWmm2gk9HpunWtSvs+oynx977U8zZfygd/8bvpuNf/my6/z0f4Iusfy2N73qMjwjxVknm+J6umH+VUBQhyjT4Ti7Bloh0c4vterykUDf96YXhmgouL86mq2deShdf/V+J15Wl9/+DX2NUfDBdPqM3XbKm0q6WXD890VFxlpcxTFd4ci7b4QDcunEoM3n8U1jlW/r4dnqOt5WaQys/KFMw1tHfdAOZRBpTVJCXNUzjSVDoURYQR06afEM7GrgITQ0lFDUECodgy0giIetGntVwFSMRfmQrFNUwIqMc0FEYHAUcVDkG5bhilCFFai7xeeSzZ9OO+x5L7/vIv0kXTv1ZOvmNz6TLb3wz7Xny/Wn3I89jKO9Oo1t2QD4OCVTK51JUjojXXR1gDuqJEc7g8NbCEb+k8a9ORwvuFmu5uUtvpCunXkyXj76a9j33E+mJ5z/JFHY0XTp9KkaOnEcZK8pSXJyvElBOKPQjrcAj8baMw9Qrsoi3LNJzQaSr1ZZH019MA5kqAhpqv61eDrFk80BhtdW7pEOLfHynrjtgrTQSEQJJDWoK+JWRkES4KH53yhVE8yMHNi41VRiR0kJR6oajUqwzlKGNHk25Rse2pb37P5ju3/e+dOnt76S3v/P76diXX0rb9+1Nu/Z9KE3cd5ApzAMeVcJYtGDWrFI8il9RjfJyRAAcaTdzTq4ps/Fl1BotYA7azaW5ND/zVpo5+1K6/PqfpC08pPnMx/5t2vuu59h4uJZmLzNyjOrRHPGi/1qZ5O/GSroYinCFbaTAvDPjUN788xSrd2kMF8y7hnQbQC4KivC6Xzd9BKGGHtM5sHgmjwaSDjLRDh8fgi+HFkf0WS1kEzpdULAFyUsjiTyU22HhOWRxCuo0GQlOUy7lsWEAilxKiHxKVdjY0HFc1zKiKKx8xPXZO30t6+rZ02lsfALF+yDG8lyauXgsnTv2R+nsN19w/h3vfk/a/uAzaXznftZU9/OR+wnuq4yiyGYAHNGXKOTrn8tNnHgThkZP/UHI2HozfpPvsizxqs55dqhmz349XTtxLG3dmdKTP/5P08OPfxDUcQz5dFpmFGyMYRzaWKiXZ2EG/cxM0BZOxVbO4XgJV4nIpoRJyzgmsupFOCD5px001a441S0tDi0u6gVxG+4GwUAsvvby8Gm+y87brROvX8wtwaMi7eWZ1ORU78go7/ethF7kJMFmQ7DG5KlSgMAmYFlL+KTZgERdQlejkp4bTyC1RBlNlFFJVZy0yFPw5ENDwxFWOjzK/P7GQroyP8ecfuvQ9vue6ux+6C+nA2ydXjt/JF06+afp3Dde8COU2/gy8fhDH0zbmIJtmXiAadhOpm0T/PjGN1+30yjDO45VugrJLuoWEdVHP77UxTczWjye3GKkWOLN5zdmTzOVejXNnTziD2Lc955n09M/9al0/6NPI8PtaebyZXavWIwzTdSP4dn1NN0iixJxXLWU43VU0bMQltwFi5QI6mop0kxZwH14yrHSQbaiRb52k0vvCALCAnfSN8VA6i2wkveNgYiHzgMPPLB91/j2bxN8HHnllRrC41MIOx776TSx81E3Zo/OVPxFNcIYSrhWNRIytNK5AomEKkZ6hRnUc1yRKqUiXUEybmBp+qSjGtr63TqxPW0dH0fx+UIsH4KZRzmvXTiaZs78WZo99oY/GaytiTG+BDG264k0NvEIBrPLu2HDfAjVBsPi2qWLLvLQG19a7O619OHK+bNp8eqrafFKPL+8BWK7n/rRdP9jH0i7H3qSEeth9GuY6dQVDEMHFmKjQVppxVQVQkOzuguDFrDSyuuGcyynBUJXuVfBNUomJLKrOm2NL6XZ6xd4vGEpLZ77Cu3MbCpGRE0jZC3HG9fHnnn94us6e2SOVyW1DsCBGUEuXLhwfdeB7aeo/+NYBQaiLS1kwe6ePraj0aOmq32iUCNET9Sdcgk/FNjKQBiM3LiE6qOJ1ABUm0lRFmcFkuMqPJoaug4oQ4FkdiAiLF31HRQVtjB7lanOFS+Cx7ZNpB33/6W0++H3pvT03/T6QPdQFvS9lJlz/E6lGzMn0vz5ryRmlowO0VNEKVGGtEU/Bpw0tvu+tHX3k2n3vk+m8d2Psv38cNq2QyMSn8HDKBbnF9Lls3x8Zo6PFTGV03RQrmckpn5d+oRyJLx6vCRUKSJker00I08Nq8JZERASYqz40RTTyw0L32Qjz9D8yEMji8l3ylZQWVfAIBiIKqhOlM9KdU5pcckIHfK1gvPNbr5/rbNqDfWkapRKfnXZ5CaRkjo7qppxpbDK5/YwTULgySgIkKp0gYJGiQsYOEAqZejmU55gJa4ymKAgsgppIU/V+BcvNziyMj9zBf6G08jYFhR5K4v3R9ntOpAaj6H2YgMF0TpCL85TnfVZ7VIP0+OLd3rfRYPRSSOUnlPRTpVuUDaXltONhfl07SLri8V4Abie7xjh3oacuTODwWXFq7jOkSqlSsx1crxKFaOmabpVGNwKXAUqvLUDKkN/mjjoPoi6gGApJNuZO3z4sBI23A2EgUzS8lNUnVnuG7KUutN8tM2xd52qtYFkXazj9IbVSCh0VnYbAqIvo0kom0yABnQbSuGjMWN3C3CJW2NFHZouV5cyghCsjSrCimyZQXtqdFyQpxdv8K1GWQt1Ze2wwCJ5foYI/+oYeLuNe3mtDaTYMoBhzoDwJlo4MccYju4NtdJie9H3iFrNZl6HoD9op9cvDb7kpdHCRYkHlcEvu55QjoTHtUqs816l9tHpwzdaRaAUt7aPjFQvHdOxYwTRTdbyTiw6JaZY3tnkuYcy7e5yuDbhe5cyEAYyVTXL8BuqGnJhUwvpqVHpHTvNOe/MjHGX+tYcjRsanQ0F5TKtaBDR1bgR/6WRw1BCr32tDMW5SuOLLWXEdUcVRUKBq6qI9cDyNS41pSPRT+/VUpVX3/9eXmbLXzyKZzmzGGEPgIUyESmQZDWiKZ14M1otrzIHCfuZWA47FqmB5nAtGGm6ZroE7SreCv2+9IJ3U195xLN1n7DugXibVy8wyVxIiJ2O1h5yjkVwY64DYSBU1dJgrDhOZ9KmwTXGAtNQwN3dbCDxAFMMv99bPCHgtUcTkde/lEzUunENBQHylWYJxVZvJ7R8qY0qQnGCEnGRz5A8GgWcK8CgLYgwchmK4lSGO4f+atbJByq5A2hfQUe7iN2QMhCrAUreLqyC9NBxllrdqrLMA7GKZhVwyi1dctW95BSHTC17XpVWpgGdVDeQWyJ9r5D6m+Fe0b1dOtEOjcYxtOMiciuiI4QN87Z3PX7rZ9SVdFttEY1Y7wHV+9V7wIgXshB3uuIqSPHsCe6/AAU849fgVT4hqODqF2IxuQpcaPb55gGY/HIA0mVkWJ2mwiUtWA1uKhwV5v8uVmTpyScc8xq5XXbEgTspEwnEnFQRCqTbvEaRMgycviBl2rn5DRSkfVXBycnJ3oScvp7eQBnI0aNHL9B/HlGXXprCE2m+b9jm5tcy0487c9GIoUfdBrXyVQRVopQvmshXx4Hlv4CRwUgFKnqC6Rc0TKc3VyTrWnAyxBn78kbSKri1vFG6cusv/KBV8ompvnTnNzDnI2+97EKrKsckwBGeEOUiT0QLLFLu5KqW1kkJOa0/XAfHuhdG1AuOTU11gRsUGhQDUXW1PldTvKkpBl1FXrkhQh3k5GZYkx8fTanGl9uXEdSjEF3jlxs/UkQRuGGBIYjiXZgwS96CHrCAZkoZpeQtfsEMP8roDQumv5JW9yPFqZmnQrdk6PKQqRjARb7p9sEjIbIXmkLF9RuGyhJKlyOF784Fe2pqWpyNmJ7G9UISeKezCRu8Ua+BMZDJLBma4Ftmrayy3XQYiXeyllnE3kCUsO2Gikrc3tVN4obuNjYUAMeIUggbEHhVAQELXGXJymaAaCg9/JLmqPEykQBUeBUjzqv8N/uJdvzCUykFlHmpeFBCF8upjnKp4DlvKZMscisMQ/wrW1Va4N2TK4TLiWfdFI4tXjFq3mQdWpNxGzTxPjUzoOCGuUFZpFeV5/NBhz2c9yzU9SI5pqEMxctMtW59N+tmcsyNoH0AyZ2m8CUrQizcBTQgtwxx/0fe0lxe0tcW4yZllJzfbIR6RTm5rELAwEyzQihxZ155qZKrQMbJ5ZQcVXIViFId7cKEbrmXfJk325JhvbgV2l0GtIMVi3T41gii+8PZYRja6VUsjgCUhA30B8ZAqLOnVAvLy69ubYxIIPcFDPXjxlhniU6ERVyzyf4/c1V9GvvedChZobwtrN4KsqKc4wrf1Fi6GiRUnM3NhlTnL5PNoLrhKE9d+ephpa3mujjdEHhVpApUmQ1ZwauSqX8PekS6sJ7Eit69CWj6zM1Qmt4S4d5OGEhwSxn6KlmLj4NcyuWtJzOrVmlgplhw58qfOnXqNNr/mtYhSCuvQ7gX0ubYO9MrrUGWefO70++puEQslCWUI+KSmuLqyVb0sELRjnTwqoiw4yf8svvkvJmOU0mr/yn9tv4KTyJm5sKHBgF+cXXMZWccp0RqqY+yhzN2Ra5LoaTfY5/iNHZrgW65ihE+3sqBmL6ChhZardYPDERS+UReqGMFL4eBlOZD8biJ1FnigBLKqK8R+XkK6eM9d72KEkYRMBVVFEvhJR7mmpu/lBY5NLgMT02mCN2XN9D8nH/i/jh/hVHoqEr8bDwYEHWtYCXtlvxVjaHGXy5HfMpRCmQp1z+DCrSC9de1YK2nX+1gqX11SFHry2zk0gH+L42OjhYDWU9WVqU9SFOs9EJ0wQy47a9x6OJnabC4o67Zl974vngpjXTezRRLd5vnWYtMuHEr/Vu1incKlEqFK/sF5b5VtN8Q66HFtLBwGUPgqT39uUF1Vko/jpPzk++fjo4wvy53vqMDgH4ZdFyUjEX/XtVEMfXK1ewss4bX5bMLi5DorEzO+D1Ja9Pop3lv4xyb4ayZrCBOZpYplksJpjrpwpEjR/Q1pU1xA2UgSMBTKl4S9hI98TxKVD0booenOksXYyHHMxOLPFs9qqMnRWl6xKcFRG3V3JN2J5HcVvZKgYrovVn6nn2DSMTVI3LIEKQb0SHn4vR8h41Dhw25+WnjwWiKEZVHYzXmhPHI5FxgdAKiE1HiqnYxoxwWWzk9F5k9ASNR+bquJ9IFrxm6FZkWnOKvScwsqQat/N4zLdDZzqfq22EMNUB6fipyKJ2Dim6UrFnDm5Ry10kDaSDHjx9/88kDBw8jqedZc+jD8WiNzmRdS21O9o6MP0jvfSNGkbEJFLK7uA6J3Evj6JcxXMW/DEGJOYZHG6ozxFckhxUK53s4zRatvZiWjKGRggw2HkzDo03/6BPxGHliyVg3ICl9JkUhJZJhpeDAiPQKdruBW5FpwSn+zcvQ7pVOLatu/qpxZzkaUhXKwzU4MhA5VT7fcnd8Qy6DZiCqtHhqsvn3x/S6z3PCVqNKaAYNrbctNni+W0K9wdxfbw8JhVHWDXLotIaHbCC1Qq2qxFfr7GQ8guun9rfXvUBPR2lanNat9/TKo7pqeqapm95MIkPiw5aOazSK0SfTNl3yQER/4bJfosJRuJ+HjL0xHgt0diV1D0T16+ijrXKFx4gRHZpWcBJupxTYYDeIBmIR0XYv0sY/RyS/rwFR8Sx1+8Z5FnOPWyl08lUL5G18LlqL4xVKt27CZILjJ/s4mk3jhitad7NCi1bWtSBrqQxhLeNBTTQVielI14DCeGRAxViyn43IhkXYN1ZtaNK/KCWO9Nf4qAVdg3U2HrVVMz/rYsn5aWsfpggB5oUf4p2+mUTXO20QDSTWIY3G1+hOzyG8hxCCJqW0LPdDls+xFuEJua27sRweQsJARke38vzDVvfq624kKJIU0ztWbDmrZ1/R7fV3g27FooHFL03bHy/wui8j6GpsLQiSRjKvexwuo4+NR8aAhmkTwRsHNqSycaANg/IDT3aupUNQ8dWR9bhQZdW6xSaH64Uc22y61L7Ep6mW7oHQpsNvi4WpvD5VeCPdIBqIZDfMwcXzT7z74FfZKv3bPN+t4YHWJIVhuXXjIt/55M0Hjqc0z2Or27c/ZBTPT7q6tC6y1NSluhfjEjIjVWn9cSUUWPELcj1eD9fTFS6G1I8jI1C6LzmseDive3g+nn9cjD6BH5sBZepWdt68DpIh8WrSGB1LuZngvfBgwO+C42UcKsPH3DmQOqST210nA5nvNDpvZdA6MNItbK1QmR+slb5ZcPPFOu3zPQzQo/it7wunmbPqaHT0kFutNLkAABFxSURBVJp6zM3rPBsyVOuvlyhFF/p6CZs2CUKBxGF/gf3xOk5/Wj1eDyuPnGB1eD1cTy94dV/s5lFEI4lHkO6ooc5EslNdFrmnM79w1fd1Zq6f5V4TCiuj6y9ORd6NMz19d2Uxr+FkIOxgYSD1ESSPgKdv3LjhEeRuirybvINqIO7v2kuNL7KLwY0Gdy2Iln9Ns5bOsJs1Qxj2ZTQ0/DLPi9hIiAPwQHI3glk1b3TSntZ104OtSo+J3txlIkZSuMTr4TqFteB1nHq40BNMzJRfPa4wblXjkSHxQR3emqKRsmIvctz9Ffa0QaX2iqairTCWTltvfMrqyNAh44SN6dOnTytBlfqekr175lZSGFQDkTAaR08ffQtpfknf6MB1t/iQXGv+NKDSgLof0eDO9ny6Pn/ePVPOc88MJRqTN4Ww5lniwGR3+kHbUXb84FO8ynDd2GpX/eoOnlU7/xQu8Xq4D/+2daO/TNFTgcUpvNZPCjwcZ968swStetZC4i58rZl06FSjhDYNOlp/6GEp4nayIIJ8G/1ILsYKcBdF3nHWTSv4Vjlud4Y+J1w6lcwryxE+rtOePxELu9LrIGoZiQ4zzl7nVTfcSFTD9ryArejErRbucgNZBrfIPZiFG1czTRGjcbW7tHCB7ecrqY3xtNlAaKv3da/IG0lQhq6VSgGoBiOef5VhFQOr+T6TpCrrp3zlR9Bh+dmVetnnUhkd6SWt4H5PXxnkOshQ70rAqeh74NzJUB+t31q808gLdPZf2k09Ucv6QwhyZQerM/znik7eMw5E7fZcz6ro9rKuO7Z3s7bNz35hcXz7ERT0CYxEowhzAG4atq7xJO7ZNLz7UOxvuPfRdAuFYlfEZ6RGZn0cZZTXlvr7He7ZaxpTdGGtqkBTAwLl2jBu3OBLUy4HjVFjkqip3tIZDsmMPgIMQvDmGaGNQPcoEDFviAyDyHFtvQpuX8aicKwNjAefmjZ6JHIYJsy71hOUbYUFJqeweXJsjQuMVXWtAjXcflhMW3Xmbaw5kUZH2F5Hpt+zmBrF1YLKLzpa73TlyB0vn7EbI4v5cCNK5nR5r4nOVI17xTfSDbKBdCb5jvrUhanrTxyY+D0U/xcRWtw01M2l4Z0YyJE0sv1RdGoLMrM94SNkWkK7MzrnM9+64h5fH94cwVBGwPXrdKzIwpbSRba64NU8skfNlTUaaWTSdmm4rkJppEiNvaTxJjfbb07zXXZGEPjyXN6si0fSHRZejpuoNZ2QFF8G0WtoMqIwtjCsKi4j41fhi8cqL3RkeKJnuGb2oq1fCZdyixC6dQOJs2a89G67drRU93qamb7lS/Qnw0yDZ2iXpUwvrz/4UNKQOpEufVbunUsj7aXXcwGlcW+5vHuFOMgGQs8xFYJpjfxOp9H6F1R6Jz/BaGe97eRyas69nUZ3HSrQLJdoSI0manYJXgrunSdlpbFlJN1zUOqxM6Z6LhRdxqV3ApepQBhHUZCiTFBmLu3CK6V3gVbAUHYpKK57yQgVsBYv9AVSOMf9pB0L2fwXBpaNqzK8eh4Vpp8MQYpdRicZUhhaR34xLJ63UVEjOw/yKTZEnOsi+WmXa54DmROcXijsRF1U3q05GYfkK5kueBSGLxGDfrs5jwz5JmIjmlbS97R4KH339RNvncklZEHcWnn3EmugDYSKSgsaR946cpSzWZ9DSf8xCzxNs7AORpHGrtSaeY2jJw+nYR1c1AvIrIhFREWuMTUpSRrm9WyJHtVx4wk9JyruqA0GY1pl1IjGBQse2hx94aaMIs5Xu8BMvvNWAXtwCjtV6poB9fiZQWfqXvqykFBRpSwXV8qUD0s8lMTtVcKMbZVRk6l5mg3CHRgILwkWqusfU61lNj/m06U0Pn6/y9P0J/cnjt/sUowjpr0cNqXMmAZTCMVq3dY9iyjQkF771OBxAN7TnDqfSJ9ovJBeUJtvipPkB925hdut4c+w5auWrY3FGolR9GtsdrhR16qKErs/9WYeXTSSaAqiH2H9FDdMo09Wkshbo+2y6P2Yo7fZctZJ4xqOU9XI/CTf+k/qq5N86BiaoqEq1lU69Ri/AsMHTx1E/knV6r/yMIn9jIYeQTJ+JavY0U+O4sWS1jxMafQGwyGMe0ifmhrZR114rFlGIy6rPBgDMlnkvsjcHMd8oB8bH2AUskLvd7lY4aqq17lPpRE5REKiygDe5hEGPcoQ1RSsup3/NZG8kF4wNwpvhtP4O+iOXiQ1vjpz5dx9e3Y/ymL9eZRLykRLq/G2IuSTtPfeNKxXpEtBrJfrVa3cXpTRnD3J2bC3KA4FC4WSWsggrqIIxwAtgq07muoZlRGb4WwA57h1kScXxjQsg2o4yTDB0UXj69ErEQgaJieiOOsoAiFdXXOxiq5PmtCEQH6HnTEu4gkXI0VqXk/D4/upT7VgjmSusMF0K57D0TF0vxtYOxhrObUB1PWSjfmFi0yvFj21zRyThuEAa147DO1KDc0ILM+PNIZ+6dLVq5emqwxrFbS+8Cyg9S3kHlBXS7QPHTr0rqFm62VaWWO9lKDiXz3bloc+hJFsJ6UlXQJN+iAU+TdzdZyKJBlKfuXNYekbjav3dC2dmxKcDFY8gp0W79cd4fj9p46eOP4r79m3b+8QuwPNzth4Y7Q9wYHK8eFOY6I9TJhPhKD9fPGzswMiu9jO3sn51p0YBHNFTmWmDl/Y4VspncTqX35ngpKBJz5pqgVEjEzm1nZDylqOjOLeV9uL7j8YEmCnSWGvpJHdf4U13ePIkD5ISp5zErGQZG/aeBhls2OMRw206RHfNDF9ywIxDLHe6Cyx5b2kexwwS70yLXzxwPqnNXcmLV18kdrw+gF1bJSqTgL/60emj/9oziD4prlBX4MUwbQnmQRMHT361hMHDvx7ut5fQ9kk0cy/FuPLCPsbacuDfEFpZBttqAYujVLIrOXX9KRSiIK7ShpkmzNHaVMOTTZ2gCBbJSPbTPB1ZWh0xPdu3jh9+m7f56QKNPbv369p5TasY1sTreRjMuPcRBtnoJnAn2DWPtEZ7ozj80HEtIu12E4eosHY0jiqOWGjEx4GBrPabtOiaQ8/GVzuaBiAWCi3Zr+b13SMil7TFRnasqzoem5chzWX5zUqcBQfZY9pKqrPjI/HAPDUPHlkIqRwOHyT5OM/C+cBUbUgreRYf3TaU4SVQe2r2cKmObH6TnIWLUYyxZD/N1BGTV8qI+nwEaKhkT1p7IEPsGinY9ZMTGK+61q62GhInmbU1Gr58h+hUByYDOOQDJsoLJ/E6nzmzRPH//nk5OTI1NSUu0Ul4upcKDw0mSbxpviFeyB9osOCtKZJlVYVlLvxNRw0+FDRll2tXcNpx/J7YeH/UZhGqGwkjCLtOb5+ezCN7X02l1UEWNgqLJTqaKNjZVqMGAW3P12jFdvnZ6dAyEUHav5gTudDR6anlajRpC7DwNrAa6nlBhZ5V0WpkduH9u9/go9e/CkPBe1BvMynNN1QIyBPvYVxaBQ7ea4zsu1BD+VuBC0+hdJTY0UKsDRiHSHDjAKc0V/byssX/5ig9KrkcUDrhWtsrz373enpaRLNK/7dujpDolWPlzDGJqfrlH22yMVcYbAeBhzuiYMHf5MR5h/1dDTUsdNkqrXr/WmUj/PoXWRRoobjYgkqViRL8ZlgAEpCKTsnZrBIsOhvzr5FJ/MVOjRmyz3Tq85rN5rN9/N2G+2fl4KqAjY6IAt9J7kOve7IyzPfuXjf7t2vM7z/TNYBpO4GxNOAwinVuTdYvPOsvxtEUwCGchom5tW5yn1NuKogRFb3XBiNmjPHUvPy1zEO1jmV7jmXRg9tTf7SmyemP6/RAxtZr55PXPf/2tOo8nSarvw+HDEpZSs/tXvngV27XmFi9Q8J16ZaTIvYdGgvHAN7nNEktnYtR8nibh00LMsrfw4HGj3Uj9i1JEOAvz198uT/mWRmMO2eLRI36ypBvaOclEAK+PK3vvXqnt27riDUn8xDvJQmtyD9onaWuAHVWjjCua0zvPaVc0W+uy0sbeliSNqF0UK0+pG9Cqvhylmr8/R230ntudfJyk5Zr3EswwPbPp0vHTkx/U+UCeNQyw+y60iGL33725f37NpzPctQBp21VUbC8ZIF1llttr233kcceUmhLeE7MRTy5M5KR4Ra178DTe1PWFRqO+niMsPwz7F7dW6aCE7wTXV3UtNNZbhWuATaYj3y86xH/hPTBCWVNYnqhXDxpPAM4X7nkm6jaN+fdcrQ6B52vFjTcg9AR1W0yJSzsWFImiPrvkB7kb3/5fOkM6XivkGeDhiXyzLTqjFKmV7qtP/qiRMnzgCTkg26gRT+zeuhAwd+j/3lv9vS1zTjPlOke7rF4cwt+9PonqfzTUTpLNWTZ+3JonaOEnYCkAqJIHmQcYcTDYvnvkxcRUnm4OTdP2T/B+xefRTgwMiw1ASe3nFOvOvXpoE/yZjxWZR1JzfaY9dDG/e5CaNmoNpY1LgYgNYqOmIthyJEY5mc06NBuZk2xEjkc0LSeTV45dTbjbHJe4qtlw8fO3bsTVJstBXG4AdU4c6+ffvGx8e2vIj8foSOZqWR8MZDGcXIjqc5l7U/Ti2obl7X1WQiav2uJMs42FNZuvgy945O0RRlVucM3r3i/TUfOXby2BeBDIwcV6tSfxUHOj7JXHWKydRTBw8+xa3n/0Ij/7iGcrY/1TQylmIotboqmKOeV4PqhtQFuJO4mIRgTsRXkDvcFNKINccrfD7zo6+fOHF8krURC+MwzsB8p1wln/ajjz56/7aR0S9yE/DZFUaSZaUT1NoKbkwcYiuYR5z57rqnXq4pMrKYarKybEOOOvW8fOUVBo6ztEjZOHNG7/5x7+jz3Dv6W0DMj1MG4GJVGAA+7oqFyWwkIsJo8jHu3f0sbfNj6PGo7MS2opWhbx5WBiP0W62/Wt1zdDYGeEuc/oZ+Y2Zu9hf0+erJWvki+g507rEPHDiwm+2M/8nI+JEmL8TVvgcCksJmF7rbac0iOV7+MPYIM9YH8XcS1VRVt2sKOidpOJzo4zgLrDnmjzlNJx88RQuKGpZ1gmCRd+09f+zUMVbuPzCQEM29v3ZbBtpPHjjwLBr9UW4h/iTR52gEFtIaAMJg0PiW360fRqOErrHUYTr+ES4MLXVepIf9D8dOnvyS6OEGZjoQ7NzxtaoHL8v4VWzjX6pXQF6ahyqtK59iBDr42NH0i0RtivDLYgZONh6j1X0VPSbtNZwxqxFGDdHWyQO8n+e+x69PDmBHU6u0uf9+uKgx1QrqneSGmH69jzfRMaKkHyPhGWAHqPgYem+Em10wBm5Kp+PgfonTr587euLEixlf5axYmNyM1jsgLYYIGGXz46eR1a8zYh5ABGJ9FUOR/IoMwfa2bSV2khCR132kVc0hUsyAuYxompo6v/Lm8eOfIlqVLYRBcaV2g8LPveRjeBKhT8U6pKKrBenW4a2HhhqtJzgycZAGOshmLvuYQ5x90rYN65ZO5zqrmDMcd2Jft3N4y9zEK4cvHM7Pn1oj1Jiacn0/OumE63fAU670r9FypqxDO2wocVAUkDdBVP8+HSpRmcAKJ+vRgnxUnROTsH939PjxXwR200wrqGwgoDC2gUVuSlHDk2EsbqA75EAjhtz3q2FE7bpX3XH1psMT73rXIW6W/jMmoX+f9clDQpGxMP1qoegKsFhZYTBhIXp1rN6DGmsNsuveUvsoOX7h6PT0/wZedHBVi1JZm+kKc5vJw0aXrTr7N4k/FdOx0jjy6+k6uCGjErzgEPwL44YmUeypbCiHDh3ireHtj2EKH8c4Poi278YwLBlGYhmMBFPkhC14kY9Edffc6YeJ/Peh0cZn+aSBnpQa+GmqlOEH7gcS+F4SGJ7sm64+/vjjjzVarQ+w5f0j/J5GkR7DNB5mdOAurEeTa3hnMAzWb51vUoD2wP+EUwZ66E1OxjHwo/H/B8a5H70Z+tYsAAAAAElFTkSuQmCC';
 
-    static private $smile = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAAC+CAYAAABwI0BCAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAC4jAAAuIwF4pT92AAABy2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBJbWFnZVJlYWR5PC94bXA6Q3JlYXRvclRvb2w+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgqyI37xAABAAElEQVR4Aey9CZhmSVkmGv+Se+ValbXvVV29AU13Q0M3CNkw0IIiiIDIwx19HBSvu1fm0Xm4Xh1HnYte4arXmVHnzowyXhdUkK1lNaG7Wbppuht6rcqqzKx9zX3981/u+75fRJzz//lXVWZVVlVW25H5n4j4toj4Ir7YTpxzMu4Fl4EKsn19fZn+/v4SwpUalTTs3bJ3QzlX3pnJlre6TGZbplzZVcm4DRmX6QFtl3OZdrC1u0qlrexcMwRmvYyiq2TmEZvKZDJTwE8BPg760UqldBawY8AfyVQypyqZ0vFKPn/04MGDI6Apev4qr8+5PAH9ziEZ5bM2r0S/4FZQA2wc/xKdjMIXnEYR3d4tW7aW800vybjK7ZmMuw2IGyqVyi405k78Ip0CaJ7pFqowiKuJnJjSrLVyyIJfCcY3AqM7AobhsisfAN2TQBzIFgoD+48fP1sjl9FcH6yt/wWDoS6uiKup8SuSxmoSmu1zfdl+1x976N7e3jUdrR13odN+XSaTfRUa5EvQUHuymSwav6mHTd7+XTmDllzBxZWLGTRr2FEJRLQJ2YUxgBftFr8srghnskDSJxFMIENWk0ppaN8kzokZlhR8wFy5XCkDcAqw/ZVK+TuZSvaRXM49MV+p7B8aGpojTcrlfDiMMCnUC8FL0YDq4lIYrzOe0GI1WmzdurWlOZ9/DRrtW9FQ34AGuBfGgSKhBaMJ47+Mhl9y5blMuTydceUptGi0U3b9mE1lsq34tbhMrhmwBrDl4Ie2ybaPZPArlwuQNO8q5Vn9XGXS7AJaz7hmJN9mcjINsMXIT/vzRgjDgWCly9z5YQjYBQg6AMijsLWHAP9GQ2vrM0899RQSjC7bhxT6nas3bYxELwQurIHnu4FUGcburVtvcPn8e7KV7LtcpnILjYKjBMcDVymWKqXJTLl0jt1+Jpvf7HKNG1y+aa3LNXW6fMMal21oddlck8tmG0iABgvxWUtCIwUYaV4UR6GwCnj4lYswlgVXLhUw8My5UnHGlQtTrrQw4UqFUfjnkPwZ0C5AJowu1yHDcTQ+Og0zGEsolCNOJpOXrSYGU0DKzwLzYLlc/hIs4uvDw8MnjFnXTB9GqH4avv0EfOFycQ08Xw2kyjD27thxN1ryT6P9vhUNq71SoWGgZ60slMvFs9lKeTqba9zu8i07XWPbRtfQstblG9tdLs+RgoaA3j1oig0fDm3Wazf4PlrlGVPo+SWEILDQjDTK0GhK8zCSGVcsTLji3KhbmDvjSnMnXXnhKNIpIg+d3mgawQwBFdiK44+GXWMwJvsMcF8D4efK2eyXDh06tB/x4Kgb/l4YWYJGLuCHar8AyfWF6nN9+bDG2L1t98uz2cqvoKG8PZPNYvOJg4NbKBVHsxWMFLmmPa6pfR9+W11jM0aKBk55ONXhYoEtzabyiTFQF+jAg0piIABqfDZh7yxoqxoLcyAgEheMRCaKV4w/HG0w0hQLkzCWEbcwcwq/YxhthmESsxgL1mIkw8ZZhptayicuNBgUEY0fUnJcQ1FoBXPESjbzDeyUfTpXqNz/3PHB55iqd2FeZwUN0Bf8qAHWyPPFsVekK+/bunVLOdfw62jkP57NZnPlSkZznfLCCbTEbKap407X0nUDRosNZhScapVt9mEDAxsyVHO1tMM2zoYOZ+kyYRqQFYlrmnJxVgZTmDnjCtPHYTCDmKYdhjlwLbQWxcKaho7rHwwr+EeBaCSVfNpYIPQhIP8hs5D/zMCxgaPiwcV3LKaEAHzBv2pN4Eqrml2pdqZ279z5U7CC38S0pheGwb9SqXgsm8m0ZVp6XuFaumEYGC04dVIb4hoBf1fVIJaijUVGg1JxyMGvUipiSjbtChhdClPH3fzUIKZkz0IqSpHfgLK1WApVxkJ0BsbiZZTL5zA5+zxk/nXrzMyXvnPq1LTPFq2SFvrCqOIV4fVyfXq4wZfHDb7ijdu2bS5l83+CAeL7y+hA0RYWygtjuUplMtOy9nWube0tMAze12P/iuUHadgO2BSuExememYonJaxLZex6J/TVGx+EsYyedAVZ58CHDtrMpYmhGltHFnYF2jeaMbCDQboAZawH5i/zVRyfz1weIDMwbHj+Re9VrmOmkeosyqfc+jSnh077sV05H+ic9yMBfgC2kC2VBjMNnXc49o3vBxTqfUyhkoZhgEGdqLXvfMjjBk5rtomRmOHsXBkmZs44uYn9mPR/wxGlA6Xza9FwaEu2QcHBzOWCqwNowq3ktlpzAH6Rdyk/O+FUun+o0ePYsEjRz1TdWI00L+M6/XaVJhvdp+lPdt3/SSm6n9i9YdRozSFudOCa9/8ZteK6RS3ZLFVpdp8XhhGvXbpjYXDIRt6MBbujBVmTrvZiSEYy1PYFTsGQ9kIO1kDKWTSqEKJbPj8NWDNxjjXZE9D3F9gW/wvBwbiWiUs6iOjiJ/Hl+vVQPzIsesD2Jz6vXK5VMlkG0ulwtFcvuUm17X1XtfY2otK5lRKN/iex1W4uGjJ9JHrFmxAQAfFwjimX8fd7NizWOR/G/AWGMt6P6rEWVRc3INN91ogawQHBv4GfdF/HRge/rZPLXZQi1N/fkGuOwMJaw7c2/hpbMn+cbmEO97ZRmyBDmSbu1/vujbfg/sXLdoqZW/6L9qlpmHY5oYxZDEFm3eF2TMwlENubvw7Nqo04Awmd8GS6RfVVjWqwFAWYD2fKWcy/2lwcPALXq/Pe0O53lqQRo4bdu16DdaWX0HPiJV2I+6zHci2rX+L69yEI1WceXHq8C/dOHwLjl4wFhgJp2BcmhfnxzH9OuxmR57Ewv5JjSi8iw8Fmg6NGREt1POYfvEUDKH92B38owPDh/7R4whj3dCoREDA88FdTwbCvFZ4uLCzbc0jCN6EoxjF4vxgrm3dfa5zM26W07ECr6dSWa6v6jVMwTSqoEPh0Zc5bBfPjjztCpPfhP7acaxmneUpWafY9Msv6tkBYbfwEdxh+sOmw4N/i62vcA4sbrlf1UJdocSup6YkxWNR/nPZXOYPccICd8RH8k3tL3bd2/8V6osjx/VoHPWq4Cp1wkgGrV6646jCO/gF3LWfGXnWzY09jCaH2SsW9Zya4bBY0gSxT05N8yas3/16HHL+oLmt7f9LHZjUaJ8wXZ+herWzWkvCvFb27tz1FVTKa7D2wCEl3EPe+27X0NihnSpW1upw9fNxydlTQ65XshUypBpD4X2iwuw5NzP6nJsbfRgz1gmMKFtgEmjzKUMBm47/w1LCgv4JjN6/PzA4+FfILS2KioB1aYoG7/pz9Wty9ZWDSi7v3b79FuzbfquCY4WlwsFy+6Z3ZTo2vBSH/XgKliQr1GCWXf5EjdVGEODMVwgvW3iKIZSPskIYoSRYBU8xLjmYTL+4Tqno8OT06AE3e+4bMJQRGMrWRYYC4TzKg51EbyjlyrfA+rsDhwc/5hNm5TDT1932MIfBVe/6sAAcQiV0d3f/CM4VvQXtAc9DlHIdm16rE7dXf2rFuuYtunDfATGAbAQznLWHoFrC4DyKdPZL+IzfZKTxgadKQFqY8hD4zMc1ScwYl3xVGcAuQ4Hl8QBnMw5zNndgyYczXwszwxhETiLciWTCulyZUCeG+ydl3HncCjnv7O7qev3arq7jI2NjA8gAzZgMzFyVSSO+at11YSBDpr5KT3f3r+F4xb5ycarS0Lonu2bdi4GBvqnyK+qYgP2Shs10E3jMRGz8wQhSPmTwL3GBn5B0OFAYva515ZJtsby0ganB15Ud0qjvh6LRULj9m8OzMM3tW1xz542YNHXBUA6ijzqLhQgNJY7eyKoen8SIUi7jDv0uIN8LQ7lrXVfXQRjKEaRW6cOJ6yE3dF0YSVq79TV17aHMY8VO6OYxx21YWywcsOnV+tuv8P0OU0/SBheryxrg+ZQU6NkWEA7RFDkeVVzkcIhwsdM8Ko2owwguTovq989GLzFRen0ZEZ0KGF8FM1wbBHgMf/rcM1jQP4j0yph6bQA1dnl1L8UzcjEPBeV4opojS8b9uSvlf3vgyMBBUvThJRT953lBBfGrwV0PIwjzyNHjjeicfgwVhbPfs9n2ja/FQ01rbCqQbjeXrVUKY0fIH0K8qGX7RAQPeA9Tmp7OmFL8JkPglKQgNYoOAPipYBJWupRlP1HFSOAgNMmb8k6UnNEk5SIw4TOa818tKdCjAjiqaOrVsV1Tr3KlyS1MPUYUZl1tXggjmGzhisGEL6TAplf2djyy8mM9XT0tHV2djz8+NjbjM6E6Pn/q1w5zPRiIxu+enp6fxfrj5ZXyfCnbtDm7pvel0DmfBV8p5VljiQ0h3XgAtIbF5pd2rP6AU9BzBSqTCYxH1viXAg8pUBSyop8XK2VIIYSaY45D3kUssHEGY0kkBa4L+D4tm3phuwSdVHPHDtfYfgvu0pcx9XoM6TVh1sUj936EgnEwAsedrVbcb3wtjka+u6era3x0bOxx4t6J9cnTlpGlD2tgvNJutRsIa7J86623NpYKC/8B3dPG0sJJ19x1e6alazfUiiE9aQuXqCs1Id+2rOFIkBqCb1xpyWZBvtGlk/e8woPB+6ERGtanxUbLP9DU/VsEt3QkMmQxROhDCn8xhABlWx4C1CgsP4QF5/MhUEIbsOfzg3iddQNRA57bb+nc5Rpab8S5r2lXmvku1ip8wQWP2/MGu7IXDQX5WIsO720wktd1dfQMPDQ+OgyaCo8S4W0tYiDTtXZpTV3rvNRLnwot79u16zbetUV/1VCaHyh373xfprVrz2WuP6xBqdrsovTV3lJxA/Lq6QWwuIJeg4kik1AtaYxzkSGy0Fkykg6TMsQjlwXqgrXySAgjTQwIp1hy8fScMiWsShdxA1Uh0kSLwhxRzPjyqJeCmxkfclOnv4EXwzyD9clOlBd9cXJXnvzaGsa0K69UKu7P8KDxr9e8bGJROlcbwAa4al2f3WRi/l6BUboBCi7izm6mobkbIKq1TmMk9QUdedhr0rMwya1HTOKSDaAqPRoH8Ebo0TQa+xMAYf4bDX0LB5roBzLPK7KqMFnr/6XTB4mlUUurPIZ8RCIjVzSBKSWVE/RywMV4mi7g6/vUEx3vxnPqu6Znn1u354dc26YfhgHiBZNFvjCSzS02OR0Kw9q9COPi1vBP5DPZx/fu2PUzfdjloqzV4Fb1FGvIqr/S3dn9C1D6beXSdAlvHsm2rbsVukMDsjpZoh6tssljlWnMtXEJBVBwSTa+APBS1CTT6ND6rFkrd6JRKl6E0TDrACz5R/rklwQTA0pkeTp5aTwBac4Q9fkAmonYCEA6uhC3MONLccFQ+KhBFqesm9dsco0de91CEccj54+hX4MBhefnJVrrEy5QuD7pyOfybx7rHDmEtckTfdjlGvLzM5JeC7dqLLVO4VkjpZ07d/Ic9p18QJZvImlsvds/BMWNkTpcdUGs7IDwAXhsQtGBIBUDWARC12KM0KireYytXmNaRBcTvlgg4dRUJImC0aZAyVaxIZNtYuDxH/MPtE3GFADc+Kkchfxcyxp5mHqB2yfANwyFNC+aayoca0SuURqbulzT2ltdtnWjK04cdOWZ/TASPLSl937F9Qnb4jxeJNkEpr2U38/LNXar3UAqjZnMjTjUvpdzXHQymYbW9VBZqCj6F3KGN+PwtPBigyHreQzDcybCPXsNt2VF+THSSBY5PYSeb4+1qBhPB+rQJoYQkCY7MQgKQFcS0MwX/i2KK/5j2UHETseQCgGZNhQaBtHkQwBOhoJwlCfoBS7GBgLcJ8E1izNzTetud6XZrW5h/BkMJmfMULxEkkhaJstKprOkLHxNrnFCeE1Sv0CifV5ZpUoWL5HGWI3XE2bzGzLcLbGqjdo/jxSr4OrpFJtH4CM+iaklMQ60QRUQmMDkD8lRhAgD1IOUE/KJwNN4+oQFaPBVyQxyUr5oYjKSbOl6QUnE5y3kwafPPDAbJNevFu7TEtIoIq14CSMv/hiXg+/zFaR6xPk9GiV4sBaHndhRrFzrBte04VUu33EbOj2+XtjLtyEKVpLxZ+1fMJDzKrY39h6lV1LBlcpMJd+8TTeoLry9ywoNdeorWfXqK4EpxkpWJMbZGFRZ0SPEoIaSoAiTRDw5RHnJjxJ4/zjwer+GxuRZcsYbwmk/kSt5aZkMMwPxl6JVDolKYApG8gAnIOTPwibQX2MCRsY8mLO0LRpgxISxLPgAeTQNJA4HeEcA+7xcG04Ipx0S4EwBcvCGCblrvt27akcQHANld4M7sZmXUmeV4ng237IBbxTE+2r9XNkr0Txp3yoOtYKY1YxVqq8lNgb+xIGr4qQkhHF6jNmfkXk6wdK0BkcW1RoCj9LjcSTJMrGU6YXLj7SplBbDQh7SvFViqvIaqEHhkzK+AKevfDAv9q/UYyTkRWy6kMxnXSHTsOcXH3mIEqV80SDufcAYYh/CIyqiJTkC/kgKbyoaETzvUL1r78StFR8NXAF9Vf3VaiBSyu7du7diOnUTR95KZTbT0MKRl+/VTfQftQWlJ5UFdv4bwEiIV0gIwwtitKLHxWhAyIDnMRjp+DOc9yyNFNwIeE3/eVYvIshI5HmE5ISwTydE5adlAkBB6bQRtg6AdIa2tIzOc1TxGczwgUmpCBGxSTnFbekwCZWUZMbMQLUTDme4eOqhigZ9CKddvJEoY/FCVLWVnlNbt+LdqtferdZFOg23hG8P3AKldmInBPvkba6hGR9zWmQcUqzaSaik+oZBZYPW/mPYoCYjqb9QlZGYZB5dDRMCGC/BR0Ms+AauvRq2Po1fNtey+ExYB6F+mux+RhO7DY+QZGtwpjUaE5z177aSs4wjNdFxckgKRNjrM0SEgJYjTB4RF7GMxqZEoPV0hrErJdExxkOOVi8JTkeFYCDYvkdadsfB56qzOZPhzS7ePLmmblWOIH1JM7jNjvEUS9mGTRkekGOFJM3RV7i8EDZfWmWPagFIREj/hFiYfqAQ3scFi/SiNjoPSyDGTzAI/C8GqkBixUU9PJM3AAN1fwmd0ca4kvFpkJepBI9BRT0g4nw+RZjkM1CZDDF6URYGJeLMMwNGbUELC28JipLMIpMUYoNjndnnIsy2yA9DIbFGEFu8AygEMC3ZhgZ7DabBgqCr7q/KEaTf3xzCbsbt1A8+T+Aa2m50uRwPwGHdRjXi4j2FBbHaMZyQgoreorh6pjQ6yjIhvMpV8wSY56wWkKJHUPlgTxmJjDleE3gSikgFrJ+txSLuQdCK9exVPTdZAU/IRCNZNkQABaQA6Ku9vgwVRhTKpYiLjCYSw4t1WHGkIS8E1t4z4bleTrPwolTkEXxyqGEZCO8REubNB71iqVwOC/VAbCxX+boaRxAqpHznnXc2IHAzFVcujWUbmnu10EuGdFCpgkHF/2Ac8EPQELxSpNGFmIGIMayYPKNgDOvHGvF0IS46k6kr4lUjAlmUgOckPkjxtDYihDQW+3HEiLwxF5Iu+RRKyVGm0QjmU/RoePZn9GRLIEaa5DGUm+IFVToWBpt4PcaHA455AZ5c3mfMHGB6lsRHZaSA5fjNk7hZRavEcyN66zCnWNfcrUYDkVLGT49vL1Uqe9Sn4AZhXuevWF34SytfdSKAKsuHLFyFU7X5+iMVJdGRKIYMalFP49MTjBfjI0s0CorxjlhRgcDwAUGGhMoiogSwnk9az2CJRTIzHpOvcBBLep+uWAT3sj3AYkEukwg5trDFmZTJoogYFpunj2GK8PIkIoRB52lYhwxm+T0TGyQo1gODgQQ+Mxa8Y1kG0mdUIr8Wl9VoIMpTOVu+kd8ssAV6C547wAvNoMOgdCmLcakeMVU0oUZk6haBxxkk0ClGYYHE85k4awRKywglV+R2sXT8NcCjQYgRSAmzhlLdqJUllaUaTtp69AlcTBRtGVVIZSIf/5Rfj5csgxmYheWPntFLQIybOBNCPJzoLayrgBRBJhGIifKCS8KgIhkunIhxoa6BIxDC5/2QKqfVPulLeN8QXZ+u1+qy6gykz/VJ08jYTbZAL+GrBhuwQG/1vY9VhBRvNcQa8CHWhv6hzxD2OLJV0RFAKtIZbYgzSrBhk0r2QCJU6WoICbHoxcN09DM69J0RZzJCAkqE4mpcGp8OY84OyrRs5UHcwBCJi+FVMmGECHkKtCTWP+nEiLiFvRgfF5m/0DM+nxJZRKe4RSwFhT0VWRC3nSyh4wUV68Np00G4ktFxk9539qYRke9qBVbdIh2fT5NCMBW9jTsf/ORYrmWH3rcLrakyTPeqRotLW1ZxSWUDlap4zyp6khu38Vg8CUesiIwy8sSKJ8Rc0kgZJz2LkPAxaLEUjKRLdtZGvGIWcSVZQs9bNYWJGlDnIn4QKxegY68e7unxQIDheQUNPFLIAugBGraAResX/QSSM2z/Mi+UYKwhP+K24yaSRALveC/Eb/EGEH0s6jXF+tjHPiZxadzVDK86A0Hhtc2B0WMPqwWfM8g2NfVAYcyqr6mg5FDZjOufFQFXFfYNgijfkgTxpEYuBmMMV09reAJTDAJ6uQyH/CjMaMDV8AT8sn2To2uVSO4WUVgCTGeznrFEmPII5pRhSIripmcaAnUuD2ngHAhigME4qgwKBFVGohjzBTqkEzZWbAThaBrqkapCvYZvLYqFGRA+LNIRuXZutRmIamTf5s1rS+XKHs5MKpXpTL6pG4rE/JXPEmi6AoWlGyHrDH9yCivC2glQ0RMvSCQ14sAoMHiCM1rWTwpmRJ6EEWtFxhboCAtdbGAHiPUeSLyEpXrWSnxb8Z5KE+Wd31jMiIzJRrsULXOKjPlzgsq2jR5EkAdakGHQCmAWEgYOGQlzb2GqAd0ZCIDA809waVtkCsDzZiHeMK93OICVstDxZTJchyh/TEOpIsa7wrQmrtpZShHAv6qOGVhNTtVdbG7eBX30QsNSSh4neNmwWAVyiFhIwBo4May9NI2FdRUjQ8ZrukdMbEL6JNJ4TyUiqkzEng5nsYxZcbvwLBZl+p/PociMC9cgg+kwTJf2U3iPYZ715+Um9MYb0wtifBoUrzym0gm05KQcxX2Y+RGP+IlmqigTnZdBSHWYSDuXhuFetEpTMkiNP3yCgfdCrK1bJtnx8fMVMpYUAjXYtXnzZv9lUsq+Nm5VGki2UtnFFyOjJ8IRk/ZMvtFeJaN5riqLymIF8d8U7aOCWYUaSYTHgOcQm4WTigQ75ftGYKn4uB58s7SIrqVTmp5XeDLLiRgh73ukyaAcYby8INfDgSObiAK/ABJsvBCQzr/HeHlkpjNB7JpraVUOI1I6zE+gV5IhPcBNW0SbXCMNYRGItwpuETV9pmU7WWZrBuTNwuqtXt8vdjU1NV3z81irykD6rGaw7qjcZJWBt/PhNfz8IA6VRl1L37zq32IxrKivRlViKhxw9EMYwVDZFhSCQTjwUoanFYRRL9eTKF7VyJQZEUp2EGE0zI/9mWBPp0RS4ZhGoIYPGCjg+zxYQPlM5035E79ymOQvMDP9IEMSTaj4xJKkpTySVn+kS4cpUCBcQlgEggoS4IwIRQPBrD7YB8HseDDF0qdEEQ8O9d2OPOG1jXISF3BX019Va5B+f0sVOruJ5oATvLj/sR1H3HHik7MmTfehHinbq8kr3mLWiFRhobf0qhVGYQMkDYLiJCQKTNpXoCXKwiISeSoecIJ7MQEWWNUoSGCtw+fUiOuIMnbO3FMulB+gyAJ51nUA6Im5pgiNVhIER4pgsrhx22yfejZG6iSESZxelCtFkjH/Wm9AkgRa6kkYMurQiB/0HEGqHA1EU6xwhEhYptSQr1S4DrmmblUZCDShBRnUuINaqZRmslqg57CQU+UAyIojklf9WyzCWWnE0gsoT8uKVZBILy9tKFFGwoiQFyKhZE/FGbZ/YuFSOB+M9BEVA0bOfJzXRW6j8Kxq5ISIN0UjYyEChMKx8SKsKAD4r45TIGigD7MRC1OCDAVwYBAmHXgpXzqkcODAZIbBWAhbmsFILCMmh/rVCCJpvFBOmGKFM1qEUWwmh8YQDMQyQMxVdqvJQFRb27dv70ItbKfiK+VJl2vCJ4y1g2UK9FXFGmEVmbpUkQiGKC0hLBSN0JDk8TQCxwjhKQSpGfUGZSICHnAv0yAk8g9IEQWHnBvMoiIPQfMTWTHZagI1HQOpwSBIHgunR1LSoGnSU35NMuIIsKkayhqtomG0YCQ0eLDaaAJyiiI7MmajCVTJ3gmWwWvQi9JExIwkpM1dLHLzCnL9Wzrs+Tifz+YwgqQLzbAegkP9skLJjZrHS+XQQVbCFAuc18atpjUINIVzzrncNuh2AxWFHxbo/GYe9S3PLqLURcq2kBEYyu+iqBGARZonqechJIbZAAIcPv8VtzAintvkKC4ULiI24zCqQOsNJpBIQjVFiEkG5dT8mIfqP1IEgfAZ9C7SMd+C8+KhClqc5FY0ERlNmgdKVtk9OtGLGFEjQLBehI9EqShtiHC/m2UYSwdhGhXPY+EIEWAgpSy4uM3rLR1ShMFFI0ifT1HEV/my2kYQ7KRntkFBDexFWJt5PANCPZvqfaUAoJAU7TVGGgY9TBQGqIKTKql4hsFD6+O/p5dEgQSg0PBvYRJ4lM8JIR5miMBpcMRY5WlgbVyENRfRp5jAYzHPjAhD5hASHkDBLc6IumXBeAlxa7AJD1sl8HDUQ3rK5Qcdg5MAAKMhPXPgfQA1ongQ60wdG3zRkxKzAUy08H1DVC/idHbcJMghgJzwsvHZdEaviVs1I0gf9EENQG/b1XvilGI21433KfIZEDqvTngKJVEAfCTQ0K8iMjybxiLj8LQG93JY0RJAOfx5cSGguKdB2EgtblESpH4++5EUDCpjYGV80R/Fpv8icZXstMyQV7AZp887Y0GaBWvizB85SC/HsA/CS+A+LGSgAaH+PQNwxpuCCwU4ZeFeiB17p9X4NPR+rFTcg8uVDN7dcW3dqjGQqIZyeR81h49/VTL5Lmzx8r1x1mNVVQQipnfTsmIGsApSHwRJqq0QiakklQiQVajhQsNV7UEeRZpsizAc0xJjhJggwsgkvoRfPEQEPGkU9vQxHhjTcJMWUhIpQXRRRkjBY6MHeCpNk0E+MassiwyAKGLIZ4Q+TLivCwsqedGA1HJAlhBSIgb36XF6ZTtZvk5IrmNEbIoJjOIxkOipwv5aBJFXya0aA+n3W7yVbHY7y47PHGDk7bYt3jiMm8IvVAGhSkTjyVV1qmzT6uKKByH/I42PizwJh2q3NmMxYMloPwb1I87DhIsIwQ2LK3DVf+T3f7W4Kjkm2ygtTaRgeRCfyRGGGSJKfwr4WBJGyMrONELYQiqa5EQ4aSBNnqf3tACHVIyGcC+TGDZ/Tq90szBtC9z65R31APPbZmicXIDSBYzFruJ1Na1BtNEBNW7mfkelPAcD6Uz2zaV8aMbqxFRUAxPK41UvcW2RMC02Dspk8/HOV2iEAMGwKpdEmsNX0zKWpvfYNNRASkRChBNQMEMvugqnlIFCz60JvVFpHRvlIX01Ib+6DWXQ4gF5D3J83sMWLMEKs/QcpRVXUlAJywyh5IFwa7McPQD3ciMceKYvCSEsYZZXCiZeDvy5cPDUUoRMNkP+ApEPJjcKUwhJuWqX1WIgUufOnTvZY2yhonlIMYePs9ghRS7oSELnQ1C0OfMFVTBQIsL/FJ0FPX2Aw1flEcwwPKto7D4inssBxrdzCWNVWIYp43MMbFMGDbKUoUBJeQRYekLFmIdZYrUklkjAxXQB8GyWQ0R8s1FDFs6nzbwpaWPgwpnMZgwIodGnwxRk9zPY0IkDOXgoLRoTlLQ0I2FSzBuVAwnKiwQqDyyDTakQpWPWMIJkwjqEILLBBynbA+8sVt0kQfyquVVlIDiRsxGP2fZSnQ6v0c818AXHGGj13iTAqFypJlwDIPGF8Q02MQ7wEcGa57/HhwoUUpWJ2shncQs364r4WtLETMmNzRTd1FzFLcAosL50rY1Z19Wccx1r8q6liVuWqD28PLjEKqRjOj6X1aE0WEREp0ktLhibB1zIJ1qRODyYTAp6oMwCAEPjyrKQX40zyPGNn3A0P7VAymGALRLcdpPDpJuRMCyM0YC2rpGQF3QS6hkjn/QaZFsOc7wXknJ23IQvBMTLG5R35h6HTyquY+fOnQ34oE7QboprUZBM+vWZ7/oppPqH6PLc5RoIM0QXfNOAZcowy7iit9mExtsMIZxuuZw/pCgRSsEnA68mmqQCBdN5SoUMZExVxiFCNoCMa8pxdyXjjo/Mu2+dLLiXb2xyt+/rcru2d7q13fgUMoyBhjAxOeeOn55yA8MT7qnD0250puz2rm1067obYUAZGBYbC9KPGYgBpian5kuwCL1PTICF3Pt4UGoAB1L10gAKD1qF0ECNHldkwgzBN2zShB7dy1ZDrjIS5kc59MZDMZRJqYDXMxIWliMGKUJQaS1uCExWz6bHwjCfMBh8/sWVCsBqquULUeloLi7wpCpf4Hs+F6yNRqRM9NenJB3xalv1SRZDL8VAVMaaxEw7ifxsH4rcb0NjLS6hSkLcLMDMJbfJqgLaxmouhy1eKZwpsnLk6ap4hAa8R6XpWKGscDJTljnfABDBqWHX0pB1g6fm3DmMGP/LG7a5//M1+9wNeza53nX4rFgLT5pWu2IJo8vEjDtzbsINDJ1yX/v2YffPXz/l5qZLbuuGJtcAeTSU4NL5CTD5IT/BJzAd9nFfcrGwjn1bjAVSa2IxVUiKsDKrUVviEmtxSJMAUEk3pLcwRwfyUl0UYapDhNVhnjJYZSRG6vHG6KUofzJIMFuaEgudY+TlcMxEmDrx+j5S0naZV8DXVPJ5TrPO4VfrQoPX6LJ3796m8lx5X7ahsgtSeRoDmcmNZ11paMG5ZzEKBSMLfElitZJT8eUaCIUzQ8oUzuu3tuZaN5VduRuFgb4LY3OVyvGjR4/O9ntL7bNP/UbrBu8i1wdIP37lTHlrDlMqKJNvUsSpBG7xAgElpp1iAeQjFvXAxBKMlxXg6SiHYbaRRjTkAuZOnzww7X79nbvdO976Mrdv72aXz7OYiYsH+ATCzUuMNj3da/S7EfRvvPcl7l8fPe36v37AfeqzB93JU/NuIwxFaxVWg8+W2K1NJMKXEqriCWUBIwoh9TAB/SOm/xAnDf9xIQhtxsKIIFS13mB7MosAKai8Do2SmWS6gEOUxAGhcFAm8ZKeyBEhoOZLAlkhB3WMH74upbrQNJoneu3eMCiia4YlhSPvQRB9WpfaIF5P++pMqfLD+ELPvZlc5gYkgEkwnJ+ao5QLOPQ4sHfn7n/C2ZWPDgwPP0Y0HNs+X8h1QbdUAwnmXrq1t3fNXFvb9wPwVhTvDswbtyDH9mBLJj/blHHH9u7c9R2sG/4J1v/p/oMHTzMHfWYodTPU+853VtzHPsb62cmKkaJy2MHCKV4pFPzUimkz8Vkl0flgGsaeSZz01AAogvKR4aacO3lu3q1pbXD9f/gm96pX3oy6MCFlTKXEKuFsGF64T0wNg42BmYNrwJz6xh2b3F78XnX3De7+zz/pPvnJQdfR0eCammw0iSKqRZmAi13PxwOhQiEfaviM8d9nDKVgBP8oM9NgmDDgExxVA5ggoAMNdUUOwUHrYxQAXXheSfR84A+HG4NSgkRLP0lD2cDoUf0SOVBzilX98CCznK+UMmGrl6yhUZf27NhxL4zs32He+wbefFSRWS4uXdiA4CAAVZdpwO9mZPFmHHT5WXzi7S8aXPnXnhkePtGHT73hHQh12yT56ViOC7q+VMPes33XT8AwP4AE95GJSvG9KwsjWcDFBoWcngL4z/OlhT947siR456GdLXDGw2wDCv/OPjfVi7NFzO59tzGm96DhTrupCMdymUKrCyfEmDgMgg8RWLaoiea+ECHAES5FiyyDxybda+9fZ37tQ+82W3aaG+5NMMI9GJe0kV6ACX6ReXt7OyM+8ajB91f/Plj7txowXV1NroFjFQ+i0uSeUlEKBubb3SsH0X8VZ7Hq+6ApG48HctB+2DnyxmQ7y9IIL1RP1yHsefn6BhHFKaSSgtB8QhsF0qgGJOF69jYUVcozPpOCSP5yJOuNPUsliMcMJAIHOoQz86V33xwePh+TqEGBgbm9+zZsx47Ih9CLf0Ys442xrbE0YRtSDWd8iUHcfqky2Nqx0ZwAn3A+wcGBz8FGPmID7QIJq56LpHAFerDJ3n7h4aKO+HWdnb9PeY8Pw85a/GgH2fYGuJSLCERWnAJNIx3ID+vwveFfrSnu2thZGzsG4BV+pDRIcswonKkzfR0df8ctLKtXJ6r5Bt7M2vwLUIdTWCxfesKDb/aUEwvAUc9GXniWzIcOfLuwPFZ95ZXb3b/4YNvc2t7OlTh5KHufDKBfEk+0+UvNMe2hka3fkOn23vLWnd06KwbPjbt2tc0oF5p6EsSeWlEkK28BG7lixEpUGkjp9YUiBPcotjNxpQzh1E742bmSu7kWMENnS24/afn3QH4I+MLbg5wSmrGJKYJIzCNSJ2Dao8YuiAV8QRkQR8nRQGfii4W55VfttHS/KirzJ9EfXMygnEMDnfdeerxU/he4VMjIyOlvTt33gcD/jRO+r4WaGx4ak6GXMCkMb/COgbFz/MHuTzzRW1DguVEhgAefJwk0wmiH+nu7JoaHR/7GvDE1XXnNRAZR39/cdeuXd+D5L4Ay3sReg6sd+CYerRYFEOZQwbhEykcb5lKf/o4Yzv4vxffxO5b19HxwKPj4+co338Pm/Ru69atLTDvXwb/2kppqtLYuh0GwoHKKzxUqKit6ML5OGUgA/S8jzD/qR8DqwGcHCm4e16yVsbRvqZFxsEFo2cV/6VelL7yiUaEaVczFvh7b+mFkZxxR47PYDqXQw/M/F1qCkvg84016IKFZ3qWpAW8RmXQOXQKTWjwk7Ml983BaTeJjYqbd6xx33PHBve992xzb793h3vrq7e5V72k192wDW/YR80fPj3rvnxgys1OlVxXS04jMvtfND7LYKqAIa2QA1LwKPvCwqx+aNVAYT0yP4bf8WAgzC/WoeruP4uO9fE9O3Z9EGX6b2DH2/7x9g7eHwGBHteFnZQKp9zC7EkY2jn9yvDLlREYfAdsJ3xiQWrgUW9+PBEGnr0PnXJhZGz0AclDEeBXOdNbFci5YBy0WOT+k0A3+kzFNYu9rgXvsShO4ZbFGTQ0m8plc62YTvYgY3zRG/MhOIe3MjKEU7rubKbsfuzA8KHPAEZDY6bKe7ds2Yqju0/ggHtPqXC83Np7b6Z3573AsEVRifzXJfqC+MqIDSLQkQphz4hKQV4hig30o//PuzWt4lSBxrHSjgVi0iUkdmJq0p04Pe4+/PtfdWMTBfS+eIEzB1flbaVTXiwvNlqiWB9K2KZMTXj78QTu83xteMa96+Vr3fe9/gb3klu3uY0buzHicQdxcSZn5zCajEy4oyfOuW9/d9h97oFB98DjY+7G9Y2uu6sBa2U0Vo6USIl6UPUiYFMsS5dyp6fPusmpM9A/mgD624WJYVcc/RqrH8SYnGCEwP2SPKZ0H8DNWqxDMv9HiQrVTTH0xHgKsVycdgszx1y+ZaNbs+4O19Kx2TXgMXYaXbEw4+Ygf/Ls464wOeAa1+wAHF8Sl22pXJjpoAHmsjk84v2TBw8P/llo98q2vyzWgDXaEnYHXpYtV74KuhZOqSAdJWGRabh5WOt+laO5607X3L4NGeOnCcpuYW7czU0MuvmJZ1hu19CyV0n5jBWhHK7GaMK/eGho6A8Q1MLrhp078SWpzCOVDJQyP1Bu3/yOzLqt95iBocDKqCosafgJDOqrwZEh3Xu1YErwj89Mugf/6M1YSN+CRnpljEOFxYUNk3mamS+4UzPT7uDAKffvf+sBt64HFWtT7EB65X3kxRor82WnEhpgHI8PTrl7bu50/+Y9d7qX37HHtbXaXkvIUJVxAWg6Dljzz45Num9995D7+GeecF/85xNuG+4ftWBUKRRsOmaGwZYjKzG9oFOanRl14xMnooEUp465hXNfQZvhS92rZu9jSLcbeaFxIBN51WxhasA1d77YrdvR5zrW7nGNzdzUYVNSq1Dm+CnqhflJN3bmOXdq4BPqyPPN22Fi84EOMnFgwmXwfQ33qsHBwYcZxy9mgJG0Y3da3rlz58ZcxX0RYa03gnGYBc67helB173tB93WW97rNux6jevZ+CLXuW6vfl3rb3Hdm+5w7etfjqbf66ZHHoKlj+GmH94kiRPsKCczlclls2/C8JbB8PZlZmBtd/eL4f0o8lfmR+dbe+7MtLRvjg1NjT00eukAEBlFuuJERQD/4ciQ0XYu73P8/Ft3u/e869WeL9CQbuUd88YG1pjPu7n5Bbemu8W1t5bdPz94wq3tarzy65FQJFqG9MH8QLvYouZK/NtDM+7Xf+I2929/9g3uxhs2Q0d5GS5pzJl+WY7wSxtMCLe1NGH3bqN7xSv2uH372t2B/afd8JFp1+PLKFmqC4S8D5FIq4g1zaTVBTrAysKMK80MoWFoDeLzII/PO3BIwcDQlCkXxzGdOuo23fx+t/Wmt8A4dmPiAR52Ahh50j8aVA64NV3bXNf625HegpsZfRjvOdgAFGc2qqQSbhDj7IR7dUNT0/+Ynp6O1sPUaw2ERais6+r+SyjlLigBb2rjSTL0htiGKy2cw1GMbrfjjp9xG3bc45pa+UI3iFbmOJ3i0IrFRx69SNta19F7g+vccLcrlprd1OmvwUi60GOg66pwL8Th4G7m3p6uzmbMMb/U3dV1F6ZB74AE6G4ku2bdK11TWy9koqenRvmDY2XharqugnmcaCOF6PPoI45i7fEff/WNbt1aLso5/zR5EnqlLsgLU2nCfZWxmTm3cVOXG3j2hKZaPM5yVZwvJht+AzrfAqZAp7Hg/rPffL17y5vuxGIbm57qs7A20CZFMIjFuQuGkvaDoaxpanJ7dm9yt750M4x/2n35wVNuQy9GS98X+xqzesOV/eQcZhuqTxpIac6VpofQzhYZCJsK5i/NmYXp/a6p4yVu1x0/59aiU+ZMBh8/Vhuh/HS+Qpj5o9E04FRG1/qb3UIh76bPPYi26I1EDdgV0WFvaMg1NGDR/oW+1CZSNJC+PodFsytxKxeK+oBfkJtxYFZUWhjBPG6f23Pnv4FFboVSzVqpRjVZNgbfOEOmkDPX2NLpunpvwnC4z42fegSKmMEapZ2LF27mlTHPfE1XZ+cotFBGJt+KauIIkm3vvRu8GG45JaARIhEpWRXOtCxlpcmgFBR8IQHC6IGGePDknHvfD+51P/Dml0GeNQSxXOELc4HkuLfo5goLeHlHFtOYjPunLx91667iKELj4GK8iLXB9HzZ/cnvvMnd+dLdqB7mjvrgJoXXmSBLv6QbYh711N3R5nbftMltQNX94/2H3YZ1GC01ZwgyLR1OuWggzALrt1KatxEkectiZIDRZOYnnnM9O9/udr74Ha4ZnW9Zx1LIm7S7wJD2WSzSaGoJg2rv2e2mJyZcYfoQpmQ466cawpiKjIDurp7Ozk9/e3yctyTYg1WCgWRgHGXuMUPU3wJBTjqI5ys/C9oNoHE0tfagbRdgvZYx6bVGtyFTypjvQto6N7sODHPT46fc/OQTLteMUyXYFEPGyP1GSLsVYaiVyhrNtK9/NdYvWJvJQFhK/qd9slnhEz+FN6yOfXz7+Jz77V94rdu8oZvpSWFCX42LT4+6GJ+dc1041/Xs08ewSC3ijv3VGUVYHxwdhs/Muz/97fvci2/drlHjcgyjVnXWCCvqDJqwFti0q9dt2ZBzf/eZQbept0lHb0L9sRpZD3NzE/B9B1hasBFER98T6VyMz4/vdxtv+XG3dd8b0Q6x0NaSmO0vobtYyPKHw0yc3WDqfu7w/VjO8PW/tF7myBW1iVRxvRhFaAOEVVRDfa7PDKVU+WVMZzYi89xGE47DWHHmiNt667tgueu8cSy9YpkxplSCUbWs6XV77vgx17HpzdhZwE2hfIuZNtICGfd00Z9gOM20AteoGGCW1egnWjHJEcGA0goB9prjkwvuXa9cpyMkwifsIrvSF5afrqWxQTfh2ttb3CtfsdmdwZSv5lDrFckK2qFrwpGab2EL9/f+7T3uJS/a4aeYS6/DpWbMGmHFtTU1uk7cC3rdG17qfun9t7mnD07rRIGNVyaNW722g0gofjryzkV2QsXZ/fzEfrf5xT/lNu/pEyMX3kGnAizjQr4yDLG1Y6Pr3fujWEsPoKNHOzOXw6ypjNr6wb07dtwNEC2HKzYeKtT9jh3I3E/i23Akl8Ewg9yt6t7xNizAb1AjtykbSZbnQua4oNr5oh9yPTve7goTvHOKwynsTzhRpGOPm8UWIwxTzjewxBgAtTYX/RD1DMaGgSmPOffQGdz3uGs77kE0q9e6VOWa7Eu/cprVhAU7pxY33oj5LzPNwTNpD5cu/DycNA6eNxs8Net+7u273Rvu5T4Ikq5W2Hm4Lw0c9NvT1uqa0Oi/9/vvdG/5V1vcKdSDrbsscbYje51TOp0kY2p7cwfd5he9323ceY+f0q/Q6A/F9Gy+DZ/V2InRKK7JmTgW7OirM9n3h1xlMXqoK8mW3fuA4mtWOHrEnFLJ67bdDaXSZhCJGESX6jyPjIQ9ABS37ebvx5zyh7CPvZ9WTArfpWHI5b0Unc2BQmrSsHgNVFFcasFoCScx575p3yZJYVku18GQZWj0l+oCJRfrPAm8fn2H27qxGQcl0SdcwdZK0bx10IYt7ve8A7uKcNygCI14qflfLh11wzTWtrZoE+Dd77lbGwTcmlFx2YwQ0D0Q9RC1FQc9FU5jJ/SN2Ax6JfStTtt4l5uZGnprg0XX1NLlurb0ueLccNIZY2DghgWy+QO4zbEdrCWNHjjn0oFzNe/xlW4NFaNHcf6Q69jyg661fb3N+2pbYE3iS4kyg7ZgymGb7k2urfdebNuNQGM0QOJoQJhicQRhY5TQoMDgkzK4dMiHWQv45w2rG7GTsmk955pwCanFl3kNFc8yWDlC07+IIG9MPNRYZoNta3bbt65xs3O8F3MR3ktEM0mOHk8emXU/8a5b3JbNWNii5rkWudJOukEirZhq4SkZt2nLOvej773NPYutZeZJWpOB+FkCIOSxNoAwK6oyj1mXn/7Q4FY400yuAyc1KjmMCX7ygiTYALEWyXRnS5W3MElVT2YBJyJdZjesh9McgyFAa+racCsyalODlcqlFIikuOBqbMaiv3QOor0KaCD43LNN5Qj18KAhlowu+BarupKCafCA4PaNLW4N5v10QYQiy7wE46BOzpw5A+OzubDvVJYkjXNu3r7N47zG+vWtbnbeZCyJeZlEVA/LvwO7SK97zc3ivoDKlil9CeS+U+hua5GuXnH3je7WPW24J8Rte+PncyGJ/tDsMO2i9bBbZCdZWphCx3wlRlnYAeqxua3bNXW9DLdExpG2LcOVM1pwxiUGggy9lQ0OjcrGMtgIv02e73glRg/uFxN8Oc3LFBKvyEAwkmJhCspol1KUBm7g8Jh7ekpXnbL6nyjKKh0U1UQsjp714EnapsbQU0W2ZQWCcczNzbmPfOQjaNzr3Yc+9CE3Oztr5fCNYUlCkX324mvWNKEBs+dcEtfyiJAG5/tDp+fcD963C8dqrv7uHeuXrrWx0eWw1uruaXdvum+fO3R0VjuLxNkUi6HgyOPrl7cWinMpA0pQgfpSfcsZ3k6IHa3mTmxaJCMIGybuM2gafdfeLXu3ZjHX6kT+X1PB8AtnZoTCVXCzp7lrNwpjnx641Mycn4+jGeZ7uEHkT58wcxzhYMzNCC5uOQZZDGcaEer5yM/nxFtbcNRSexHnz8nFMKGXe+aZZ9wHPvABd/fdd7sPfvCD7oknnhBrwF9Mjg7/gIhZbOSZLN8WQpu4GP9S8RTLNMYKFXf3y3eJbTk2vNR0LkbHNLk92YodPBzvdre9dKdra0Hn68vNESTWMzMce3F2HLizX5yxEQQJiQUkK+aQCY7ovG3hGjAI6ByuEsA5g3IJ+ep2jaU7srlKBR/LdDtoM0icuURucHcy14MhaD22Im1xzvyvlPP6MQMpshfm8awA5QjSCBiHXJ+i/BBJwNX5MTxMLIKZZ867/c5chC83ECqxq8teNv71r39dItau5bmhpTjLGxfocshiXLAuhX2ZNByhZnA69xU4+rFzu72ccCXrb+nZsbrgFncRGxIbMJK97La1eK4fN01RvTaCQDe+6fETbWoHZKOBoPNU777SmWeSauoZ3WHP6BgUn4e3esJcit+Q4zTsZVksZG9XAwjbrDIQ3AjErfiGJt4vZK+eNDoAVsxxflmCgVAZQUkVLM7wvh/AEsXFBC3/iPpAjEeKiGOOuc07g9OqvIt9OU7Kgg527drlHn30UffhD3/YPfzww+6GG26QWNvPP38KoX4LJZ75hNEiczMzBdxUQ0SN4fy8l4LhgDk6seBuw/MoXZ32da6os2UIZL1fVt37gvM8GsvZjHNbt9y83p0ewxtrUHZsqUIfoRLRzhSmQjiCYL2GWYzueywjz0snlYlgAGjACQe8RD5kgwJ48xplxzT/xTwdcLuE8vEwOmYSw2GmqQvPXnMtQNo0t6gu/0K5MJAyjp5wOI2OaxDFgQcwXA3v8xE9Bs6TNxSQd6rHxwtuahrP62MkvRwXKvKOO+5w/C3XcRSbL2JjAo2CC/zR0Tk9h3FZDbBeJqA0jiDjGEF2bsebKalBVfZ59FRPBmBpnnT4POT1wVaBZgxInvnashUjyCwbH9e8fB8WrFkGwTiMAjHLKU9UcIqlQ4WiCZj6iV0KlGnil2+FcTb5NOABaMZQ2UEb3k0FUK9KAmGHKU82j5e2sYdTdo1c+BW6IFsyECoBCUGqTwMLJm3vIeN0dlXwvBdPmhADwGLw7SLnzhXc2dFJr/ilSDtvMkJwF4v6or8UR1q6uYWiW4Bh6FwWTpUeOz6FY+Hc1VqKlOXT8JHPdeval88IjmAQ586dc3gBhxoRBYWyLFmoVzfXIWyI5O/pWYM1CcIyCo4gXJNQCST2UyzGQF8uzULP3Fi9/HqDkPoOafPt8jokqc0okelsFnK1mR+ywKs+lQWfC56NwSI57EHXF3uZUFMIjzxTCWYgPhfMC48dxBSSUDSiiKsJUCwdfAb5+OgUnno7cnzEzWF6Q6HLrmQJTC4cAVh5F5tWJRwWmpqfhzFgYYj5z9jotDt8ZEYvjrjc/NSmY2XkCWLslLWxV1yeY35Yvueee87dd999btu2be7Tn/708oR46nTNEUQ7aGltdG14JwA3haRHdY5AkjjdUdJwyjAQHA1Bdq6AM6H6JDXamz4Dl4xfRHJ+uQ4Gos8t+wwATivi+RTuUct6r0DeKBJJ0UC4W8bRxIPUsHm03jQmcMQlMYaMJw2LisRztjZCoUJwkuXAc6fc+DQMERXESllJhwa1SGAaxvQ4vZrEg1McJznNODx8zo1NFjX1WMm8BFlsiNzm5VsiL9Xdf//9Wm/dfPPN7ld+5Vfc5OQkimKjwPlkhnJH3xMyP4Apxk2fRj7x4OuCC3XDQY2csng6EaMp2lPeQcWLdX2+vFwczjGMb8TE4pyGSYNkA6l26A4rlXDm1+eCOefcEM9Pw3rrMFWLuMQYEyujV69we62m0VZ/xy6dQFAUYenCBHj0heQxi2688fCxx06742fG3Lzms0llpSVfahiNJp0RiQmw0CjGcIq3UIRBYPSYny+6xx4/jmPh9qbGS033wnwYqaAKPaF6YcJF2JDn2267TThubb/3ve/F3f82lZNGcj4Xyh380NiL6CDCFrd2FXHCgY6dGBfq5igXj+nFejVb4bH2RMGLde2Zl+dBoMqBwWBhAbcZ2HXBMOuUzK+Ga8WTGIogM0cUsuietAAAQABJREFUCaulucw4C13GQTHrMKqzZjcJLzMBsFM23381gJOszz57DOefetx6vDjhSpSnNrcsH9MpYt0xMo2NCPzlsZszPHTafeORs249Xleqx8ZqGVcijnTxzg+8nWT5u3dBN319fe6b3/wmnj8fca9+9as1paTxBPxyssm1F+uCa5F5PF05i7vpmk2VUuex0ATCgt1kW5sIz30sJ72L0apuUB88Yc5XDyFbaIzc5g3GKgmEzvJOzSRyjwcvwgQMcD1IaAZSQi/PrTBTjhgv/WI58/x29DjpHoiEo8dzWKYfgdKXBJyE0vgqRpCwF+1FY+z/0oB7yW07+A1E19F89U72nprEiwXQg/JN8dThQw8dQhFRSGa/Sh/VpbjUGBuiRGOOPzKOV+sgEVSyr7/z6SxJLRgA/bvuuisiLs04LL25BW+okDk5gTen8AwaWyX+bcfSJ0NYjVJKxRojXyGdsXwFvlkFRqLJFdY7ZrVMQM9cQGnuBEbizJmgFGVOiyMOO2UIKOARRd7ptoL6Yly6VyMm6R0MoawhuDi9GkblQNQ+L+lwdfZ4b66jPY/35464Jx4bcqNYLM+jwpgGK/1KODUmCB7FyDGB4ynslxrxPq5DB0+5z3zuCJ6ya4LhIu16xbrMDFEkS9WIDYpTpybdLBvnJabDnbqwa7e4Ti6eUTYb6mIG96FC+NTJceWNeWS2uCFj9YAY76THOjH94CWC1QldYlmqhVjqszN8ohHdFdKolLGb6kcQYEnADB7lIv04wxFIe4I1VTj3w/RqdhYHuVQU4yHtSjnuUJijbE5CzNlQ6yOX4AU5ZGWYZ552bGp2f/VXT7rjJ0bc6ZkZTX2uhJHIONAaJufmHUcPloprj5nZgvu7v/sOXtzABnEJhVoqCwrMeX4r3iwyNDzmxqZY8dADW+gyHXfqwq7dMlljGWexvT3H9RdkLRSKbmDgjOvt4l1yKsGOe0TZmnclymGW+fRqFBYJLyMA8dQFF/9Tk2dRN8hLYQJpsC2ajpistY3yc1ls+A4wQqAlixAesS3jJCUXy1NTeAEXdrNEkeT9MnKYsJbwZj2fpwhkFm0Nkk4sHY6kdQL16dho+Zob3l3++499203NzLtj4xMraiTWC5ryOWpQPh3X8Ny5+dxnv+see3IMoxnOJflFap0CrAiIBtLWhjdI7h93J86Ma4pHwSGPK5LIRYVYXVAXXKDzheCjuB/1+HfOuG4cIOX6ixS8Scw6N8exNtQhfCC0yxRhKbTnWK7HVNm+ZmYm8LgB2jjafmnuLNJK3Sj0O5NYIT2MHFW+pUTidiUzhrdRzOENJpiAzc5O4NlhvJ4FPUDI+nIzVZceSuMUi71E4nwK6kkS6NJDJizJpxcObwF3ztZjavPF/hPus5/Gy8QwfTg8Ou5mNfx7vkvo2tno+As99NmpaXdsjD2S6hcPDDW6Bx94zv3lxwbctk0tOmFcXeall26plCwGn7s4gdeG8t3hkwU/TbnSCfsMUv/UB3fuJjCS8m4+R9GBgePu2cOzOKjJzVMj1v0kn6+qmYN0il6b05/Qd5PFV6lxX8qVU+sy7kUd0wBQxlGnyhzf6MhHIjRGsDLxQvhKAe/KejhbLucexjyTDyb425jcYcArOedOYHhjD4/jGmOahUGAL9Wl5GsRD4qN4dN0UysXWqgCJVqpAkeZCT6CFEioSVEolN2ubS3uf/z1fvc5vOgMeyvu6Pi4O4upEHu50MjJZQ2/WhpjCc5ka/RFIbgQPTwy5k7DQJgW+hOsOxrcQzCOP/rPT7gdW1rw4gLuCC6WudIQpsEeumNNzj3y8BF3ZnwKx1xwDoz5T1Sy0skukncWazBu8fIzdnN4I+MDXxlwO/AGxhI6K6kBeaFRxMm1miAbqXKKpteMZ0LQBkUnjkVpLAfAOuV9l2nMijgzyuG9B8WZU1hSoENT2kqKL0Wgnr4zODj4VDbblP0uMvgMgJYrpohhr1Ia0dCTh5CJiTMYksYlnIlclmNhIYC9Al9erJbkZQbJl9eIgpR0Lk25lEsj2bu91f3pXzzj/u5vHtYbAMfQww6eHcGielYVSmpr+GkZFk5w3OTAPiAM4wSmU0MwjmneDASwQc+fZNzn7n/CfeSPH8fIgYrmtKpe1hYnsSIQpteFzy98/eGzbuDASTc2b89WXJ5uL541tg/qiGswvsWFk6YGnObd/+xR91mM3j24L8W8BVVo1AiZCj54hMe0hyct2OPLBSaLLevKJsa0uLV75swgjJavLp3FG+UPwhDt7TkUiLxr/YHgJ/Er5fVK+R277sdc7EUoHHPCVTqY1rjS5CGXb90owecgtHnbS0wEM0otXKqjItDDlfFADI+1VLUcKalWeL0Ea2m8mDpgdZuUKyUlRvIPnxp0w8Pj7kfec4fbhmPhZ/CKUE6R+PwC38zBlyzwYznakvTieVd8AYcOufCcKhR0UhivGcc2Lr5tiCcFud44dXLUfeIT33Ff/MpJjBzNeuWNVdClKmz5fF7FeA9X1n3+n/a7nbvXY7s369biZQpqxNLz8uVeiCPILUA/JycwLQcxp1CzWPN9/OOPu63r/PoLCLvlxxuadh7L5NKcgtNMR42YzdIOtLIdXILzbOz0zp7Fa3HnZ2C0ra4wNoy1+RkMHj0QyjNfsssGHHOfLmczfPWP3osLcOlvKuXcL/k4xOGWfhbWi1c8FmdOuob27XiPE3ZERo+6nrU7sGjncF2vJVLk0hxHEHtYCl8W8iwXkkga67MDlUGM1WOh9ap8CYxLaAxgFQg+3x3LNcGBgxPu136j370TL5a7+569rnstnhXHjHNyEo97olVzAhD27NnIy6gsGgQFEc7jHI0wCibBM1aPPjrk/uHj+900T9NiWsXHXqmqkIWlaWdlqDSKYEH84CNn3B3fPOS+p+8mh48DuE68TCE05pVJCeqATtgAOaU6OobXg8KnjhrR2Xz5i0+4L3/9tLt1d5ubh96FgE5CZVCP7Jm55WtAeHB6myfXCDzydIF7Y0Z9/ivHK+5WjY4cw0bBcXRkeJwXb5MvTnwXxsFnfGQcFFCCQWdxTuzjmF49hzhqFkmP4k1yePXnK4HbB+vheoSLd2QQRoIVfq4VnyXDk4VTU2dxZ3oN3gixBpmmVbOUl+DAx0KfO/YI5phjSAdnv6gtwkuTbs16vAWjqQNK93N2pYOmr+ToW7rme5MgTP+8JDBRij4NM1reI2lpxtdqsSX6wDdOu29967Ar4OM3/BxAKw7VNTc3otzYZcEcmmeoeNAwh92YJsD4LlvOrXln+PjxUfe1BwfcR//n4+4L/cewS4MRqBWvTOJcWxm4BB2tAAvT5o5WF3bOvvHISXfbi9e55o4mTQOb0XDpoHWq7bJcNA4o9MgojvRwvQPBfP7jmaeH3W/9xwfdHkxr+eb3dFphosVbCTgjjd4cXwqYHYa+W5Ex5oxVmXM9W15uJ7wJSwu4SK5NhBnHBF5YePLEfuym4atleKRi4exjaGtYLyYP6zFB7MGz/yu9DzZxgsnzQQwlic+VfAQFfTM4UlkAfXkKQ9Fzrmkd3iOEQ4QnTjzrtuZfjEbVaSNJmvwiGWZtMBdsqmz8nANq6CQwulTygInemBABjugYRxjxAK6FW5wERoerdwagKN5pZ5G3b7ap0N9+/JD72CcOuRv3rHH7buh2m7d04jxXK8rLr9hy96WCnb0CNi5m3YmT+IjngVH3zAHs9OH4BF+zuWurNQR+xHM5qgk5W2lfjQTdXXNz1v3JnzzsfvmXX+PKvRVXwPGP3nY80oAEWSa6qqoX5PwXcYCPPPxNY7p5YnxSR/ppHE3Q19Ejp93vf/gr2D3ELAGGqnqQSNaJpYn+WdMsjTiqTBB4FJ8wtMduw0ls5JE4ZvoiLojnrYrxsZNot8+hc0OngLwujO7Ht0iOoPVXvdGkhHs1Dcjmnx0cPvzoO2EsH0PzoIFwfMkeOnzoi3t27v4Eesq3YVeLd02AQ+PBJ7HK00+7Bbx4urFzF6yu4I4deRIPvtzqWvFWCB5oZI6X1BhUGyCH40DFh6XMRoOyDFd9BVNQSNCOj5uucI0WEjgTLbKXokHWc6ICin4RUyFW9BZ8fJPxU2fm3IFDR3BuaFhwvviZBwCJ48jA6Uszvj/I76X34pMGPIjK3Rl+FJS6WJI+6mVqhWHMB/PKkZKfg/vjP37I/czPvgoPi7S7mXOjbkNHu2vGaBhcMJZQALCrzKmLCkc4adiwz2G3agQ3X9kow8hB4/jdD33BzeOrVG1teM8VRg9VAxVowhjwuuLag8YGX4KJoTA+VTijtsI6FCtRF3Esg2SB7tzZYS3KudmExuwWxgewtn4czY7vfY5TKy7MYRzl45Vc7jcoHsbBWZ9fgzAEB3v9d7CgNyDI5zQ1LaQQLmKKo9+Ej08cr9mMTBfckSPfdZs23+Ta23tVACknFo7Szu9YaXqaUCMIZ3mJW6wGqEUGEHzQLiExKrM6OwGSNpmUTIrFT9MAZLAJL1XY0IvPjCFMONMMElirlM1scDtVhw7RCAlk2VabY57YQDtx5ObYiVn3+//XV91P/dRdbseu9bgXNOba8eYRvp6nuQEPDtUpgIqUXFQ8HkCcmJ13o3izCxflbOJ8grMBxvbMU8MYOb6K9UYRb2/BVJMvyPNOukxHqEsaBp38lAIRr3AXS6ewCaeOU3gxVV9oHNzKZcd96uQAdmBP4eg/zt6Bb2H8kCuOPYx2XGUcqEfyMC33CweHDp7uQ1H6oTJKDq2z0odPoj36+OOn8XbrOSRwH5hI4HPOvOP80Ay2xGB5OXyshM2GQxcV2tqKOHyz3AsXgIXkvLK4MI0XCH8ZclO7WICXi2fdGrzZvaE5rEHYGCFT/7yYfKtIKpfFoG9wAgxEHyH9p/x6sEiDAKV5WTQAzuHtZwaBqHpk3QkmQXDGGmKrzmeRtObCemsaz+l/8ctDbl13DlNIzAJQy9zinsLWrJ28RZlRNHYJLCHLz8U3n4qcxlk2jhhnsInBm4Csc+70NTY36F7Hl77whPud3/sa3l6CT7PhZx8vDcpJ6UuSTdcFvPppgYcSYQwlfHsmtAm2k9LCSaxBXoc3/Sft4XzKtYaedwXsUh0/+jQ2lkZhsNiQAMPC+AFXHPfGkSzKKWohj9O4KOmHB4YH/2/Ec0PICRF0wUDc0NAQR4zsyPj419Z2dd6GO+d82zrnT56GjRDbdDMDgOA7H3hmnVbHhXsRx+Jb27q0U2AL66AQJpFyXj8seAFv9j53+Iv8FAIIAgJWjI/nrOm9x+VhhOyi2VhDQzdDoDzmxdIwn3GDV9NU05LIyNK+zytxXoawHkwJcqk46Yw2IK8Pn3nm5hLvsnN6+Dl8huHU8bP4kGkz1lltqAscwcDJAj6/Mo6RgfcxRvFdk1FMnziFGgNsAjf87OUTHGWxWYFfATxPPXnY/bf/+pD7m3885HZvbdF01NZ3Kd2omq2uUbOodavfAj6XtoAtf2wtVRsIRwJ8a7B762ux4O9Cc7BpcEqigtZP2WJ8enrEHTv6JNrkPDZYsMmEqfzC6NOYVn0bnfs60Me2T94FtGF+XvBzA0OD/1rCai7J5DOFmC0W39eUb7gFe9Q3Yl5GIwEdC4amg/sj/FRWpYxevn0nLLQZL0Y4DSXNuk2bbsbd41Zkim/vSLWoIJsgEyMavpyOw2t4oUrgsH6LtCCGHM/ipSRUzE9wnpRM+CVw4lURNTDC6RIc+PxaJsIWizKm6/jKauGahP7uba3u6WfH8MnqB92rXr7OvfLuHW737l7X2dWms1Osw1AX1GioU+qau3enTo9hk+KEe+Crh1w/tnE3rm1wN+/yW7lqteSiXqnI4DxMUYYp1yYq5htMCNYZWJNT3wZNX4NoLsbHsIV78uQBTbF4l5xL6cK577ryzHNmHMmagyLMOMrlxzEHe5eXyYxwoIiu1kCIzOFB/ZG92/Z+n8uVHoBSNvmRxBsJCpTrdsWRByFqwTV07oWRNGExhuesDz+OIftmTLm6zUhYwHR5fbIE8SSvFa4OgRBppYKBUZISx9oNjVnRgAQ+utjMIyQKgQw9lFvDVhOtm/eUsOs2SPXRcUOhHWsErk2eeHLE/fNDp/ANlSZ3041dbteOLreudw3WmM1oP2wm2IDAmmJyctadPjXhDh4acU8+PeKO4O2Nm7BJceOuVt0QtfscIA91JU5c0o6KVoWaxqufKoyzetDAQEGitlKnIVlTsMKcxY3sM2eHkFe+Uw1TdYxGBWzllrnJEj4MmuRBxoHjRd91c7n7Dg4P4KyJZkpVwwvJaw2EsBLXI/39/Qf3bt/7BpctfRlGsj4xEpJgqGvo1ZyugiexGrtv0hYah7Mjh7F433Sj6+jcACNBeihgqBBymuPDUjhOX2WrAQcWljw46VAXQILPEAdp1QLgvsY9PuICb2qR7+3KSzd5iVQmgRh7TvjqMauQnu154rFeuL7gjU+eMub9GxrNo4+ddf0PnNTn2rC88M/OV/TYwAIWMo3Y0eM5rw7sTt28GycusAHAIzxyoUrq6IiqtDpMkKZuGoXpPalLTwNwvRHE6oezD3xSDqPG2DhuaOMeB6Y4un0wf/ZbOJR+Cp151VYuhfJDOY0o90PNpYUfeOrUUbw5vb5xkLiegTgYR/HOO+9swEvSnrphx44+rPE/j+nWVky3+Fyiv8OE3S3M6Ur4WlQBU6qGHrzkGnNGNqrjx59BbzKPu9LbUG6+JkdtjulFp0JLY6FxE+XDHAqFi+QxQHDtpCsgDYdYDCTBBBRC3owUxcUbUTC7IDNkKcafbwGWH06Gwp04OJ7h6u60Y+hsiKy/pEIszmkaH6YKX7MlhZyXl9TfIkCCIgOqXB2RFA1D0XQr8Bie56eS9BFChrSARyd7EvflpqawGOcNQBoHNn8KZ76JtSxuQOMWBd8SqkQoANaUxYIcfcLHMw25H3lqeBCHAc9vHMAlu1SMpB2MY4FGcmB4+JlyLvMqyH6GlgcarknMcQsYu1ql6WcwnD0OS0dmkEnuOZ86fdCdOXVAdFSAKdmzwdPDUmnbACyohb0CHZtwgAacR8gLDLECU0QWDIDgmzjFIsgCMUrJPrOsiOe7Mx0nZaa+ubjmjU6OJnzYjFvEvPfDeAHv++VWuJ40BBurMNFSCEWpQIZOL61JT+c9NnY5Dmn8RQcC2Ex6BGGdsCMuYlF/DLcaeASK0yoZR2HSFU4/BJuYgHHgTkXKOMBXgXHwdfJ/enDo0Nt5BhHJMOFF06qYPAIc287raCScbh06dOhwdqHwGhwv+bo3EpqlORkJ1hxzh2Akj2IvGfaDQjbCokdGsGjCHUw2+GojQe+DOWKtC8oOBkK8dBguwfeMSTUIEaEW8LCAgr+YHhDiRSMCRRT10oKxpFpBwFz/fuwAgmaCDqQGK19srxxb4XgnMCgo8Ie4cfirAYNkA6Z5A1l6zOakubpJMs2S2gp5aRzcNZvBVP47OCg6gy1mvC+BI8c8Psx5mutinM7grYOUcbDicYgU3xd3v3tgaPD9PmUmdEHjIF11bjxn2uN0C/H8/uPHz+Lla6/HkYFPw0g4zao2khyOnswdxfD2MPKG/XEYCS2bO1zHjz2NHoev3URxvVI1bErjiXYZIkiH0xIwINWuLkpA3+BJHolCFQEQYT7IeCoPEc2Az2eEiY6Cnz8uli0E4AdtRWVBD0IHGhU/oTJtGNJUVkXolVVLH3RotNy9onptqsVOPcjgVAptHlMsnv3jd2rm56dkHEXA8jAWMw6c/zrzVbBxBoN1iDaiVGGaiuAMHb4cVfnfMXL8CpBs80SeZwUMTMpd1EA8LY2Bu1uzuJnyFhT3ozIS25/12sHWbh7HUrAwmpeR4PkD5INGwhs22pvG6KInEzGisFew0TQoI8kVd5YFjSifBKEB5hvwooYsMSl6xgOPgkFGAlTIXyQWvaRFjSZOtSyqFK73S1Km0HiDb/ry6vDF9Hqo0r+hopyUkkPVhLqJKIhJUmGI7RRANgQ1BvqpJglBPOFbwn02Tqu4U3oU0yq+aYfxCner5kbd/OmvYmCjHPbbsd0zgIMQGXwsqvyLB4cHf5txSzDmCNELu1RuLkwILIcj0Q8M4qZKufJHnNNBQdQec4crjATfnq4snEWmv4EojgmAhcMgH93l3U0WjsNomS/sUnbJXu3SdkeMKKrI0moOvAlBUkEJzrAJDYUq5omrJBrC8OGqCgjyrm8/3ahNI1EZKlhaF14VVQWOPClo1LmXQM/ogh9ihggyTK1hP5IGE9qwSaARYUKOkQOPMh97MhoHGhqM45xGDt0/SRkHZNM48KalTAZ7Ce87NDT0B4zjx2RTGUHsIm45BkJRskr4mQPDgz+Pwn2IczvEfcLBSNpgHBz2aCQ4xAZLCEZyQtMt3gOJlk653kEMRCRvOwE4ar5euTzM00RblTTDxcoO7PAjLIRCGkEOi0N6xA1kzEnD8tm9Dr10GWLZQnFZHq+D6EsRXmdSgycmqccxZC7oy0flBVxCFUI0Bzk/emiKxV7T54Hys5i6L8zj5RPHn8bCnN8VQXOLxvEVDDzciOXP2hPKx0850zggpfLuweHB/5fraBCwg08yg8hS3HINhDJDy84ODB36VeTn1zHd4jl6OlyDkeDJNewmzJ/+GkYUGIkfSfjoLhfuPIul0aZOnrkGMeX78sDzIYMrklRGwCkHPhuhniOjlyhJQV4Vo5fnYfJ8DZosQ6QbWJLe9RGqyntUUNAt+moUkaW0ktL3gFg8q5VI4QlToiJ3TEs0tXKiQKWh8YO61lSL/S0d2xENBE/+4blxPgVoxoHZh0YOGgc3VdmEU8aBLTEYB+by7q0Hh4b+xt/TS9bLFL0MdykGQvEsNn8wkqHfxBzvV7EQCrKQ22AkeFNECS8MoJFwJEFheCafD8zPTh5DmOetgr1RLBx6hDJut8j+KSftpGxLOAFXAy9cWaGCyR34PIxRZptwoRDyvqgVZgjo6kQMuMqvVXlG/q04uIYyKmhQ6d6CKlXQSSAlMEjwAgQJPX8alhLjaZIkKSc4m2SxCljnCZfSwYihlgC/xDUHFuSJcXhazMux4KBxYBvLfT+WAZ/ibQq/yRSSWbYfGvWyGX0pmLsc5ngfgs7/N4wklMeyRCPB0V9s/ZqR8OEXDo88Qs7hNFEDOOQ448S2He+yQ2CiKqOsqhSBAPFCqnBeVsAxWpUWEfoPUM/tGRQjCnEDeXpFjKeqwSm91XupyivLpKz6MkXNGFRlJt4PJ1EXi+isvKYfHzYv1klkATykmtSEh0iAtQc1HbSPtJPB8FW4mKSU8Zhs4cxX0HY4Y2JTi3kuYfMnj53TGdzt+D4Yx+f9je7knl1a6DLCl2MgTIY55BCQw3TrI3hb3s/jjnuNkfB5Ehw5hpEUtCaxd6DqY50yAYpJOb6TiwaSFN5CoSaCTlIsMehp0g0iLUd0oLF7VxCkf/MZkegggzFZKOBEhAZjRF4UIorHHKyOQCpPiS6Y16ANy3fEEZ7i8YpJlS3oxooX+WLhyV8lwPQTrgFlyaZ05BEaHgKYs/XAQBg6ShhEaW4E7efrqBIaEA3E02DkoHGgUqew+Pjeg8MH/3mljIOpX66BUAZzKiM5eHjwj/DQwf+K0YFy+YsjiYxEC/dHsIPFUZAFTSsCUcaxG6F3pWLqVYs1igCF74OhcgJGdIokNF668cSGQihApA30AvACR4QqzzcgGokHGxPZ6jcOEV6rSzRsy69yiaC1YQYYxiXSIaPqAHzTBIquEjoFReziUYwk8hSzS6iLoB/RRXwQXJ0O0RopmCH2r5ZRQJlHPvY9hxPkDyPKm9DJghx0ZhyuMl3OuTcNDg4+sJLGwXythIFQDkte6oNpHzgy9F8wktBIqH7+EiPBx+FRUvzjIBk+1pnsvCFIR31oDYJ7KHxwIboahTI1OPN4xc8rNVaQxxIeYQz7Ri4WuyDRIIOSvCzS8o9yiY5hoyU4pCms6ETI6LVzyALzHHPCsCK4oJyWTYaRxYCrMgTjlAQGjZkBK5MEMObjVSQBFrCIC2R+wJogL04EoakQxiaZpgQu3BWXcXgc7wXYXAtTEvd9hw4denCljSPkhv6KuH7cXe+DkRyCkaBUP51ak6BU3lZwDKBSnII54QEZDTTppEnGl9ahzDywCJc0UMUMRgVKT8H30aBYX6niZbJwSYWnaMVuMiTOCP0UTEyEJLzpMBsb40rLuGM8CiP3VXJI0wwjJC6A1wjDxDMvuFAniCgejCPgREFio9V01Bgln9Aw3SRRlAmwWIhnwEdMSwFIuId4mcQwC8pT3MWKkoiG85XohUICzy7hDUaZ+XI58xZsFH3lShgHU16pEYSy5PrtCEoemf7P5VL5F7yREBdVxmFzsXGIHargWX4+h8ydOigm6CayB+WZH2ISH1MIJ+RUH5Y0cMnoEbhSPvFKgwGGBIjZThuqsGLlpaybuNZSBAQnYeS3uJXsCl2VjM+vkrB0lXyMh7JhVGaWVD74wThIF8PkJ0Aa8GF6vL1gzoolItER6jsK0CgvqLogx0gCNWmDUKVAhKqZ4jnvCCNITI4MaYeMcLeKrwIovx0vG/nSlTIOJrriBuJLoqMpBw8P/SHOwHyARuLbitdTtbqS0gMOBfF9RXwqkS5WNFBpLoXDxSMsyivbpwdGLsSNwMv1eNBZyPBVYVSyxPDCqqcvgHLm49YSyBdpvUiDUUaaT8lf3kXiTK5PiqkrA0pKJUrFLWNGAhwwllmSVIUjIIGLnnCWk2zyGEyFA8z6BaIooCpvxkAwETUOAM3IKZyGsYgg0HPeza1c1HD2hw8ND3+2DzcBeag2EKy0f6UMhPlUYXAG5vdxwPGDeLs3jCTU1AWKQQPBx0zsKTLQpVkQluoEowxTpK8NxQOE2MAbK5X8JsCjjZrAyIeAkcRAEqfBSGzAkdbL1P0cj480omYs8jEv4WdAoS3RhHxRPPDITzOyQJJpLLp6OTE3vs2RVE48pDRewiwcQwAYsa6ez+R5Gg9TLIRjAsoFUQqYjEAUwIgTBJ4Eg4xqmzeBGLWuBGqEwfbNjx8YPvT3NI7Lvc+Rkl83eCUNhAWSkeCA4+9AE7+lYyn1z5ikMof7I3hZnT0DEGqWugxK8z48hepVZEICuZTBegDQgqHuE7gR+BRMMCdpEm2JWPoMx/RIZ7QIiNfoRUTCFCzwBRwTNAqeMyLlxf6Mw7hCuiF5SqW0CPfSCCLMjAphDXZMCWAb+BAiJ3lDiGFFPCiECfc03lcsZALIQBno6AeoceLK/DDina1xYtUgEKZYgUK+WDgTwZMov4T7bv/9ahgHU66+K1OVpxWNZEfGxr68tqu7G8cF7sEOFXcg6hsnR5DiOdfSdTte9dINhabeZMGhldlK+YoSaggbqREJdEauGIPAU9cW51AdXAx7mCR4tJeWpEEm4bwcxRNZho7MjMIl+CTkwTFLxKSaT4B7UAqziK6q2UXCFDTd6K3lQoZvwKL3tOm0Ig+AhLNxK/NGpE6HQjiyCmR0SapGlxiFj8f0jZ4iCjh6VMK0ujx7Do/K4oXSeM1U0AWl48R6Dmn8xsGhwQ8BkcNbeC76LAflXq6r30gvV2o1P7XCX+bA0KFfxJNoH9WTXeknE6voUQP454utgx7Pq/DaCgwM8FUVAe99JmNBYRE23+A+TJj+eUmFRWQCABWNF6a0JMvTG5p5wF+AyTeZHuPxiSjSpsi8XOLtT5SRwPKgqChDntKpW5hCI50FEpm+MLFMXowYFGaeGcDFj0AxHxQPR5QRhatFU2ASGJv3E09UjMKx7mtGkEoGrwSlcVT+Ajej/z2I2KlzZnJV3NUwEBaEWkDpncN060dR2C9gtORJszqHyExhJfQoptGgQPj6T+IKWe0Yra5GR2Kj9NdIB4wxgpphw4dw5EGgOhzkiUnShSe/l8G4qALMBHhaYuxP9EYsDuP3gMgbCODHYJCQ+EJ6njQ0gRu7NW6WkvFEpvEQSJiPMZymIz1qz4M9Tl4doMlWGp5S0iJzjWyLemFIRmuQVPu3PUJOJPQlNOxY1VhQZL0igatlIMw8S63C4dsL78Q06ymcyap+MlFF5NECvJ6eJ4A5vfI1E/WIgMIRAKYIM2BsAEBYvRhBYgwpONlF5AUiHKSQmWFdSaN4oBOjcIJ4vKdexCcAWOiTnjL152UyDxIhqMcLFimB8c4EmCzxm0xhJcQSCel4wSHFSEzJEkoeuLAeULgWZ8KMzsjBIAnk9P8RIboqvKiMLtDTJwevyTSW/WiQw6BN6nAUi6/gdO2PPppCEnJl3dU0EJZEi3bc9RzHAQI8mehOYe4PI/F3BVVWQPXprWnoxhawARyqIyowXUEgUj2HyiaTVAku+n5RWm0kRODHfwZDxSAS0yLC/hNaYcVgLJ4+ihCP4Xm1H/PhYwGvKC4erEycF0ZBpLW8hSugEW44irO/IM/Ek5e0YhBFCJsI4oVMcIxr5PC4ECaj8mGyFDVhCdzLUoIk96SJJwiiMI408jxLU7zDyr/EoI8irpq72gbCgpX6XF/+ueHhQTyi/k40Giy2UmcIoNgMnisu4VkSuxcSTv1Ci0GRCioCGBsDHCuEFaiwXarCjNQaCXkj3MJemgSpV6coSvW0wpNJIMYowEgsLwYTVHQiFL3hfVAsxh046vpkj3/GqysT8PIV9DQGs/wEvggLcgKv4hRDgDmFFQV32iBiGHTAG4cFmI5cgCfRalqxBiKTEZL2LH6KRWlIsK7rrwu9UsBrYSCu39l7t/bjcBmG1p/i8fe041n/8gI+8q63WahmPDpUhSn5/2/vXGMru677vslLcmbIeUqj12gsz2gkq43lSIKt1GmLlDbgBEgbx0ZrOG1RoB+KFi2CpmnjAu2H5EMfCIykSWugQJykKBI0Map+KBAYaV0bImwnjmMrsh2NZEnz4IxG836SQ3JI3kd////a+9xzL8nxvEheOd7kPXvvtddee+2119qvs885JSZRW8BZ2o4FIMOVHahg0V2FUrjYAg8cZQiFMQFFHK9gjpcShRxhlekcuvgXkALPqaQpQ+2Xiw1YyStfRHDisY7vMKBcnulmWDCgtEjPgRzLHJhu0O7JK3qkhYEwcptIUBKdqH/wUnIb7kIKPFJy6cpEgpwI9PoR1dQqYxdUoQnZbeOILzymnW8GTnaBGxDaFANRvfxKIUYSFu2/xUrjP2uPG4Eymkg4TMA4+atvZMt2JOeurHNDi4jg2Vcowr5GLCf24HQjmaYARTkqYlFmUASIGfNGDbvQHLIUPshvBkk1TPCgWTynC5rzBEbGynkycRHJP5FbLU/kNk3Sje4cNaoVvMAKWdHOJVQ4xOk0FBUtvTnEO0kGBCxyKSx6clwdzikRdUoPjjGVGHkCO65RoJJy2ZE74/ZZh+i0fWKxYG2Yv2kGEjWcyhVtO6DJlQG6F9LmK7u82KH0MSHKjG6ZdwXtUL6EF2luzh648ucGyQpgL4cjTRnyL8j4puXclZN+dZFeZ9TTm4IT2CVPAETSjZ+vRnLxkR6ZFI5fGI946/4K5cDpslVoraAPKePmMl2tTD+4UXIuU7wIz/EcZok4d/Wk39avpgiejGi6Iq88+T8SHOWiloNWL07g5lzO53AgRX5fuwDdODUx8VVzvDIq73hO1aDrH9xUA6GqsZ/HAkyNQZtYzBKQ4i2+WRcSz8JarQEso9wwBU2wLGCnGK4QgSpcxxF6zmxw0CsnqmcvH0+v/9//mK6c+TY8MrqJjx5eRLcLy7mDB5F1ck7P+YTTLREcuX5AyWvcyBHlBi3jGycQC02KiLIzwYhydUIUFHVQWGDGcJ45mrtyPB35wi+nmQuvEY96iqneugqSnUiWWK6XUw0X4cAzjsMFOxJEVzz1jBfwsprj+OeG3BjsL3tTDaQwwzGtSwgrdx2CSoAc11yeddhyrKRdE7LkK7jQI4TnSAaVcMGpUCt8N1KmEWHRwpkOPDDN27PvybT36b+ezr7y22n20pt8B4VXXYpdcJQnF9nNp+JykcGt+Ci/TNvRkv/mfpW1FGRflMtfZteFdssJ3oiXfAW/QlG51IMRe5nX6lw88WKa2L+X+j7FqMlhhyKGwoBIrQgHkki6jsbJYUMKIHIWXipZU0iVV9lyzMGI2X6G8+nVqZKwQf5mG4hl01oe1hu2uXVeOhN6Fb5D0uR1ku7d3FK5cZSDBq+ESsAxA/oaQULMytGL40xK9C9QTAB0MHMeZfcbIYe2pcef+4TP0Z157TfT9avHmavLSLp0Sr7gIOi6bNMLNpRW/yvl34of+URHofBzQBHXQ/yWtHodBPVfhUbA6w6g5NXAffXct9K1o99O+57+e2nL+N54m6EImmJ4UXIOu0yFCxSa8V+QXWZkzzg5T8lhvpSn0CJn1EWBmhPOcFmkF4Zq6esY3GwDcdW2psXL2ACv43ZnYSENDU/wdaHLKKg2L4BLiPrPKF1BZrgTRa7eGPVwTqk1koNk789jiMvjPSzsHSxcv4bB7krv/YlPpxvnZ9KpV/5rmmEk0bQkFri1aYHYIa9/Qdr0VYb+ox5GqgUzfoBr8EKrls90REgufF1Lmc7stEgPeEE1ZqavMtseDWcvH0kXDv+P9MAPfzjteeSH08IML3+m3qZPFosil+XidVE7qJ4qJoB9YWWMtPAKZg0ukIjLq3JrJlUaGfFqLaS/+NqZcTfyMhgGcuqhWYzjUhYLEtOcmHshyxiIPs0VMgy5ZIEqosbPQONYyAZlcfeEAzdAXHvSTC03hAmbrFBURoMPyMxdvZS2bH04PfN3Pp2aszPp7Zd/NV05/RKsarTTq4q0NeocyuX8ADJNN3CElZKTI1BFckKdRkkrfsmR6Ym+ynS5UaQwBItfFyaZBmrQD+PYkuaunUznXv9vfFIvpYPPfjwtzi9TJd2aCnaiZJWhOHQL8w6LfqT14GVYZIp8wrQLxBLr2kKB+1HrSi3FhdWCw1j6BsKGu4qTDS85CrRYXkp64GXookChZArxZCFbvX4LfO5FisC7OHV8SPk/fEVMPF/CizSFnVqlEbP2qNzIF2UYwWmNkQajxnk+Vvlwevbjn0lbdj+dTn71t9LZo3+IUl1myqVTM3wYCINR3m7+oCHKZigrWcG5XR/CQccEy6VbppLDKRC/KEPQzBdImiJevzqdzn73d9PC6Zn0Qx/5NOnbqcusR80oJtPAI6ep+UKiUkzfafWwyshxYUREgFq4F8d0MkWHc0+pLM6oS6OxKQaSN/crNjYjICPViveChlN+mq/wum9t9V5hy3GBY+9la1XpklnEhS+nRoiwWos0cIY8F6MhQOkJOwOXbHRBLtOhPYxroOgKDixfhxlJZCQTu/akpz/8r9Jbj3whTX/199N1Pvuw9/GPpZ33P5Uao7xRkmPbXvy68MitYkVIMTd75l3R23JSzhrJ3rxdfaorqXGUT3XxYcCUrp1/NZ1/8zfSjdPN9MzP/DLrjkdYh5yBf94q48yZlkRqhqESRCNeJRshihCe4ZF4a8ahrJpGySm/dnMtJUNyBBbKUZOMWlLX2R8EAwmd6bQ5l9X7eIoOcnqrtxKC5LS2kUjpLWpwbCQStGQug6mF1QBxSFR4EKccpxvdGYQNWmm2gk9HpunWtSvs+oynx977U8zZfygd/8bvpuNf/my6/z0f4Iusfy2N73qMjwjxVknm+J6umH+VUBQhyjT4Ti7Bloh0c4vterykUDf96YXhmgouL86mq2deShdf/V+J15Wl9/+DX2NUfDBdPqM3XbKm0q6WXD890VFxlpcxTFd4ci7b4QDcunEoM3n8U1jlW/r4dnqOt5WaQys/KFMw1tHfdAOZRBpTVJCXNUzjSVDoURYQR06afEM7GrgITQ0lFDUECodgy0giIetGntVwFSMRfmQrFNUwIqMc0FEYHAUcVDkG5bhilCFFai7xeeSzZ9OO+x5L7/vIv0kXTv1ZOvmNz6TLb3wz7Xny/Wn3I89jKO9Oo1t2QD4OCVTK51JUjojXXR1gDuqJEc7g8NbCEb+k8a9ORwvuFmu5uUtvpCunXkyXj76a9j33E+mJ5z/JFHY0XTp9KkaOnEcZK8pSXJyvElBOKPQjrcAj8baMw9Qrsoi3LNJzQaSr1ZZH019MA5kqAhpqv61eDrFk80BhtdW7pEOLfHynrjtgrTQSEQJJDWoK+JWRkES4KH53yhVE8yMHNi41VRiR0kJR6oajUqwzlKGNHk25Rse2pb37P5ju3/e+dOnt76S3v/P76diXX0rb9+1Nu/Z9KE3cd5ApzAMeVcJYtGDWrFI8il9RjfJyRAAcaTdzTq4ps/Fl1BotYA7azaW5ND/zVpo5+1K6/PqfpC08pPnMx/5t2vuu59h4uJZmLzNyjOrRHPGi/1qZ5O/GSroYinCFbaTAvDPjUN788xSrd2kMF8y7hnQbQC4KivC6Xzd9BKGGHtM5sHgmjwaSDjLRDh8fgi+HFkf0WS1kEzpdULAFyUsjiTyU22HhOWRxCuo0GQlOUy7lsWEAilxKiHxKVdjY0HFc1zKiKKx8xPXZO30t6+rZ02lsfALF+yDG8lyauXgsnTv2R+nsN19w/h3vfk/a/uAzaXznftZU9/OR+wnuq4yiyGYAHNGXKOTrn8tNnHgThkZP/UHI2HozfpPvsizxqs55dqhmz349XTtxLG3dmdKTP/5P08OPfxDUcQz5dFpmFGyMYRzaWKiXZ2EG/cxM0BZOxVbO4XgJV4nIpoRJyzgmsupFOCD5px001a441S0tDi0u6gVxG+4GwUAsvvby8Gm+y87brROvX8wtwaMi7eWZ1ORU78go7/ethF7kJMFmQ7DG5KlSgMAmYFlL+KTZgERdQlejkp4bTyC1RBlNlFFJVZy0yFPw5ENDwxFWOjzK/P7GQroyP8ecfuvQ9vue6ux+6C+nA2ydXjt/JF06+afp3Dde8COU2/gy8fhDH0zbmIJtmXiAadhOpm0T/PjGN1+30yjDO45VugrJLuoWEdVHP77UxTczWjye3GKkWOLN5zdmTzOVejXNnTziD2Lc955n09M/9al0/6NPI8PtaebyZXavWIwzTdSP4dn1NN0iixJxXLWU43VU0bMQltwFi5QI6mop0kxZwH14yrHSQbaiRb52k0vvCALCAnfSN8VA6i2wkveNgYiHzgMPPLB91/j2bxN8HHnllRrC41MIOx776TSx81E3Zo/OVPxFNcIYSrhWNRIytNK5AomEKkZ6hRnUc1yRKqUiXUEybmBp+qSjGtr63TqxPW0dH0fx+UIsH4KZRzmvXTiaZs78WZo99oY/GaytiTG+BDG264k0NvEIBrPLu2HDfAjVBsPi2qWLLvLQG19a7O619OHK+bNp8eqrafFKPL+8BWK7n/rRdP9jH0i7H3qSEeth9GuY6dQVDEMHFmKjQVppxVQVQkOzuguDFrDSyuuGcyynBUJXuVfBNUomJLKrOm2NL6XZ6xd4vGEpLZ77Cu3MbCpGRE0jZC3HG9fHnnn94us6e2SOVyW1DsCBGUEuXLhwfdeB7aeo/+NYBQaiLS1kwe6ePraj0aOmq32iUCNET9Sdcgk/FNjKQBiM3LiE6qOJ1ABUm0lRFmcFkuMqPJoaug4oQ4FkdiAiLF31HRQVtjB7lanOFS+Cx7ZNpB33/6W0++H3pvT03/T6QPdQFvS9lJlz/E6lGzMn0vz5ryRmlowO0VNEKVGGtEU/Bpw0tvu+tHX3k2n3vk+m8d2Psv38cNq2QyMSn8HDKBbnF9Lls3x8Zo6PFTGV03RQrmckpn5d+oRyJLx6vCRUKSJker00I08Nq8JZERASYqz40RTTyw0L32Qjz9D8yEMji8l3ylZQWVfAIBiIKqhOlM9KdU5pcckIHfK1gvPNbr5/rbNqDfWkapRKfnXZ5CaRkjo7qppxpbDK5/YwTULgySgIkKp0gYJGiQsYOEAqZejmU55gJa4ymKAgsgppIU/V+BcvNziyMj9zBf6G08jYFhR5K4v3R9ntOpAaj6H2YgMF0TpCL85TnfVZ7VIP0+OLd3rfRYPRSSOUnlPRTpVuUDaXltONhfl07SLri8V4Abie7xjh3oacuTODwWXFq7jOkSqlSsx1crxKFaOmabpVGNwKXAUqvLUDKkN/mjjoPoi6gGApJNuZO3z4sBI23A2EgUzS8lNUnVnuG7KUutN8tM2xd52qtYFkXazj9IbVSCh0VnYbAqIvo0kom0yABnQbSuGjMWN3C3CJW2NFHZouV5cyghCsjSrCimyZQXtqdFyQpxdv8K1GWQt1Ze2wwCJ5foYI/+oYeLuNe3mtDaTYMoBhzoDwJlo4MccYju4NtdJie9H3iFrNZl6HoD9op9cvDb7kpdHCRYkHlcEvu55QjoTHtUqs816l9tHpwzdaRaAUt7aPjFQvHdOxYwTRTdbyTiw6JaZY3tnkuYcy7e5yuDbhe5cyEAYyVTXL8BuqGnJhUwvpqVHpHTvNOe/MjHGX+tYcjRsanQ0F5TKtaBDR1bgR/6WRw1BCr32tDMW5SuOLLWXEdUcVRUKBq6qI9cDyNS41pSPRT+/VUpVX3/9eXmbLXzyKZzmzGGEPgIUyESmQZDWiKZ14M1otrzIHCfuZWA47FqmB5nAtGGm6ZroE7SreCv2+9IJ3U195xLN1n7DugXibVy8wyVxIiJ2O1h5yjkVwY64DYSBU1dJgrDhOZ9KmwTXGAtNQwN3dbCDxAFMMv99bPCHgtUcTkde/lEzUunENBQHylWYJxVZvJ7R8qY0qQnGCEnGRz5A8GgWcK8CgLYgwchmK4lSGO4f+atbJByq5A2hfQUe7iN2QMhCrAUreLqyC9NBxllrdqrLMA7GKZhVwyi1dctW95BSHTC17XpVWpgGdVDeQWyJ9r5D6m+Fe0b1dOtEOjcYxtOMiciuiI4QN87Z3PX7rZ9SVdFttEY1Y7wHV+9V7wIgXshB3uuIqSPHsCe6/AAU849fgVT4hqODqF2IxuQpcaPb55gGY/HIA0mVkWJ2mwiUtWA1uKhwV5v8uVmTpyScc8xq5XXbEgTspEwnEnFQRCqTbvEaRMgycviBl2rn5DRSkfVXBycnJ3oScvp7eQBnI0aNHL9B/HlGXXprCE2m+b9jm5tcy0487c9GIoUfdBrXyVQRVopQvmshXx4Hlv4CRwUgFKnqC6Rc0TKc3VyTrWnAyxBn78kbSKri1vFG6cusv/KBV8ompvnTnNzDnI2+97EKrKsckwBGeEOUiT0QLLFLu5KqW1kkJOa0/XAfHuhdG1AuOTU11gRsUGhQDUXW1PldTvKkpBl1FXrkhQh3k5GZYkx8fTanGl9uXEdSjEF3jlxs/UkQRuGGBIYjiXZgwS96CHrCAZkoZpeQtfsEMP8roDQumv5JW9yPFqZmnQrdk6PKQqRjARb7p9sEjIbIXmkLF9RuGyhJKlyOF784Fe2pqWpyNmJ7G9UISeKezCRu8Ua+BMZDJLBma4Ftmrayy3XQYiXeyllnE3kCUsO2Gikrc3tVN4obuNjYUAMeIUggbEHhVAQELXGXJymaAaCg9/JLmqPEykQBUeBUjzqv8N/uJdvzCUykFlHmpeFBCF8upjnKp4DlvKZMscisMQ/wrW1Va4N2TK4TLiWfdFI4tXjFq3mQdWpNxGzTxPjUzoOCGuUFZpFeV5/NBhz2c9yzU9SI5pqEMxctMtW59N+tmcsyNoH0AyZ2m8CUrQizcBTQgtwxx/0fe0lxe0tcW4yZllJzfbIR6RTm5rELAwEyzQihxZ155qZKrQMbJ5ZQcVXIViFId7cKEbrmXfJk325JhvbgV2l0GtIMVi3T41gii+8PZYRja6VUsjgCUhA30B8ZAqLOnVAvLy69ubYxIIPcFDPXjxlhniU6ERVyzyf4/c1V9GvvedChZobwtrN4KsqKc4wrf1Fi6GiRUnM3NhlTnL5PNoLrhKE9d+ephpa3mujjdEHhVpApUmQ1ZwauSqX8PekS6sJ7Eit69CWj6zM1Qmt4S4d5OGEhwSxn6KlmLj4NcyuWtJzOrVmlgplhw58qfOnXqNNr/mtYhSCuvQ7gX0ubYO9MrrUGWefO70++puEQslCWUI+KSmuLqyVb0sELRjnTwqoiw4yf8svvkvJmOU0mr/yn9tv4KTyJm5sKHBgF+cXXMZWccp0RqqY+yhzN2Ra5LoaTfY5/iNHZrgW65ihE+3sqBmL6ChhZardYPDERS+UReqGMFL4eBlOZD8biJ1FnigBLKqK8R+XkK6eM9d72KEkYRMBVVFEvhJR7mmpu/lBY5NLgMT02mCN2XN9D8nH/i/jh/hVHoqEr8bDwYEHWtYCXtlvxVjaHGXy5HfMpRCmQp1z+DCrSC9de1YK2nX+1gqX11SFHry2zk0gH+L42OjhYDWU9WVqU9SFOs9EJ0wQy47a9x6OJnabC4o67Zl974vngpjXTezRRLd5vnWYtMuHEr/Vu1incKlEqFK/sF5b5VtN8Q66HFtLBwGUPgqT39uUF1Vko/jpPzk++fjo4wvy53vqMDgH4ZdFyUjEX/XtVEMfXK1ewss4bX5bMLi5DorEzO+D1Ja9Pop3lv4xyb4ayZrCBOZpYplksJpjrpwpEjR/Q1pU1xA2UgSMBTKl4S9hI98TxKVD0booenOksXYyHHMxOLPFs9qqMnRWl6xKcFRG3V3JN2J5HcVvZKgYrovVn6nn2DSMTVI3LIEKQb0SHn4vR8h41Dhw25+WnjwWiKEZVHYzXmhPHI5FxgdAKiE1HiqnYxoxwWWzk9F5k9ASNR+bquJ9IFrxm6FZkWnOKvScwsqQat/N4zLdDZzqfq22EMNUB6fipyKJ2Dim6UrFnDm5Ry10kDaSDHjx9/88kDBw8jqedZc+jD8WiNzmRdS21O9o6MP0jvfSNGkbEJFLK7uA6J3Evj6JcxXMW/DEGJOYZHG6ozxFckhxUK53s4zRatvZiWjKGRggw2HkzDo03/6BPxGHliyVg3ICl9JkUhJZJhpeDAiPQKdruBW5FpwSn+zcvQ7pVOLatu/qpxZzkaUhXKwzU4MhA5VT7fcnd8Qy6DZiCqtHhqsvn3x/S6z3PCVqNKaAYNrbctNni+W0K9wdxfbw8JhVHWDXLotIaHbCC1Qq2qxFfr7GQ8guun9rfXvUBPR2lanNat9/TKo7pqeqapm95MIkPiw5aOazSK0SfTNl3yQER/4bJfosJRuJ+HjL0xHgt0diV1D0T16+ijrXKFx4gRHZpWcBJupxTYYDeIBmIR0XYv0sY/RyS/rwFR8Sx1+8Z5FnOPWyl08lUL5G18LlqL4xVKt27CZILjJ/s4mk3jhitad7NCi1bWtSBrqQxhLeNBTTQVielI14DCeGRAxViyn43IhkXYN1ZtaNK/KCWO9Nf4qAVdg3U2HrVVMz/rYsn5aWsfpggB5oUf4p2+mUTXO20QDSTWIY3G1+hOzyG8hxCCJqW0LPdDls+xFuEJua27sRweQsJARke38vzDVvfq624kKJIU0ztWbDmrZ1/R7fV3g27FooHFL03bHy/wui8j6GpsLQiSRjKvexwuo4+NR8aAhmkTwRsHNqSycaANg/IDT3aupUNQ8dWR9bhQZdW6xSaH64Uc22y61L7Ep6mW7oHQpsNvi4WpvD5VeCPdIBqIZDfMwcXzT7z74FfZKv3bPN+t4YHWJIVhuXXjIt/55M0Hjqc0z2Or27c/ZBTPT7q6tC6y1NSluhfjEjIjVWn9cSUUWPELcj1eD9fTFS6G1I8jI1C6LzmseDive3g+nn9cjD6BH5sBZepWdt68DpIh8WrSGB1LuZngvfBgwO+C42UcKsPH3DmQOqST210nA5nvNDpvZdA6MNItbK1QmR+slb5ZcPPFOu3zPQzQo/it7wunmbPqaHT0kFutNLkAABFxSURBVJp6zM3rPBsyVOuvlyhFF/p6CZs2CUKBxGF/gf3xOk5/Wj1eDyuPnGB1eD1cTy94dV/s5lFEI4lHkO6ooc5EslNdFrmnM79w1fd1Zq6f5V4TCiuj6y9ORd6NMz19d2Uxr+FkIOxgYSD1ESSPgKdv3LjhEeRuirybvINqIO7v2kuNL7KLwY0Gdy2Iln9Ns5bOsJs1Qxj2ZTQ0/DLPi9hIiAPwQHI3glk1b3TSntZ104OtSo+J3txlIkZSuMTr4TqFteB1nHq40BNMzJRfPa4wblXjkSHxQR3emqKRsmIvctz9Ffa0QaX2iqairTCWTltvfMrqyNAh44SN6dOnTytBlfqekr175lZSGFQDkTAaR08ffQtpfknf6MB1t/iQXGv+NKDSgLof0eDO9ny6Pn/ePVPOc88MJRqTN4Ww5lniwGR3+kHbUXb84FO8ynDd2GpX/eoOnlU7/xQu8Xq4D/+2daO/TNFTgcUpvNZPCjwcZ968swStetZC4i58rZl06FSjhDYNOlp/6GEp4nayIIJ8G/1ILsYKcBdF3nHWTSv4Vjlud4Y+J1w6lcwryxE+rtOePxELu9LrIGoZiQ4zzl7nVTfcSFTD9ryArejErRbucgNZBrfIPZiFG1czTRGjcbW7tHCB7ecrqY3xtNlAaKv3da/IG0lQhq6VSgGoBiOef5VhFQOr+T6TpCrrp3zlR9Bh+dmVetnnUhkd6SWt4H5PXxnkOshQ70rAqeh74NzJUB+t31q808gLdPZf2k09Ucv6QwhyZQerM/znik7eMw5E7fZcz6ro9rKuO7Z3s7bNz35hcXz7ERT0CYxEowhzAG4atq7xJO7ZNLz7UOxvuPfRdAuFYlfEZ6RGZn0cZZTXlvr7He7ZaxpTdGGtqkBTAwLl2jBu3OBLUy4HjVFjkqip3tIZDsmMPgIMQvDmGaGNQPcoEDFviAyDyHFtvQpuX8aicKwNjAefmjZ6JHIYJsy71hOUbYUFJqeweXJsjQuMVXWtAjXcflhMW3Xmbaw5kUZH2F5Hpt+zmBrF1YLKLzpa73TlyB0vn7EbI4v5cCNK5nR5r4nOVI17xTfSDbKBdCb5jvrUhanrTxyY+D0U/xcRWtw01M2l4Z0YyJE0sv1RdGoLMrM94SNkWkK7MzrnM9+64h5fH94cwVBGwPXrdKzIwpbSRba64NU8skfNlTUaaWTSdmm4rkJppEiNvaTxJjfbb07zXXZGEPjyXN6si0fSHRZejpuoNZ2QFF8G0WtoMqIwtjCsKi4j41fhi8cqL3RkeKJnuGb2oq1fCZdyixC6dQOJs2a89G67drRU93qamb7lS/Qnw0yDZ2iXpUwvrz/4UNKQOpEufVbunUsj7aXXcwGlcW+5vHuFOMgGQs8xFYJpjfxOp9H6F1R6Jz/BaGe97eRyas69nUZ3HSrQLJdoSI0manYJXgrunSdlpbFlJN1zUOqxM6Z6LhRdxqV3ApepQBhHUZCiTFBmLu3CK6V3gVbAUHYpKK57yQgVsBYv9AVSOMf9pB0L2fwXBpaNqzK8eh4Vpp8MQYpdRicZUhhaR34xLJ63UVEjOw/yKTZEnOsi+WmXa54DmROcXijsRF1U3q05GYfkK5kueBSGLxGDfrs5jwz5JmIjmlbS97R4KH339RNvncklZEHcWnn3EmugDYSKSgsaR946cpSzWZ9DSf8xCzxNs7AORpHGrtSaeY2jJw+nYR1c1AvIrIhFREWuMTUpSRrm9WyJHtVx4wk9JyruqA0GY1pl1IjGBQse2hx94aaMIs5Xu8BMvvNWAXtwCjtV6poB9fiZQWfqXvqykFBRpSwXV8qUD0s8lMTtVcKMbZVRk6l5mg3CHRgILwkWqusfU61lNj/m06U0Pn6/y9P0J/cnjt/sUowjpr0cNqXMmAZTCMVq3dY9iyjQkF771OBxAN7TnDqfSJ9ovJBeUJtvipPkB925hdut4c+w5auWrY3FGolR9GtsdrhR16qKErs/9WYeXTSSaAqiH2H9FDdMo09Wkshbo+2y6P2Yo7fZctZJ4xqOU9XI/CTf+k/qq5N86BiaoqEq1lU69Ri/AsMHTx1E/knV6r/yMIn9jIYeQTJ+JavY0U+O4sWS1jxMafQGwyGMe0ifmhrZR114rFlGIy6rPBgDMlnkvsjcHMd8oB8bH2AUskLvd7lY4aqq17lPpRE5REKiygDe5hEGPcoQ1RSsup3/NZG8kF4wNwpvhtP4O+iOXiQ1vjpz5dx9e3Y/ymL9eZRLykRLq/G2IuSTtPfeNKxXpEtBrJfrVa3cXpTRnD3J2bC3KA4FC4WSWsggrqIIxwAtgq07muoZlRGb4WwA57h1kScXxjQsg2o4yTDB0UXj69ErEQgaJieiOOsoAiFdXXOxiq5PmtCEQH6HnTEu4gkXI0VqXk/D4/upT7VgjmSusMF0K57D0TF0vxtYOxhrObUB1PWSjfmFi0yvFj21zRyThuEAa147DO1KDc0ILM+PNIZ+6dLVq5emqwxrFbS+8Cyg9S3kHlBXS7QPHTr0rqFm62VaWWO9lKDiXz3bloc+hJFsJ6UlXQJN+iAU+TdzdZyKJBlKfuXNYekbjav3dC2dmxKcDFY8gp0W79cd4fj9p46eOP4r79m3b+8QuwPNzth4Y7Q9wYHK8eFOY6I9TJhPhKD9fPGzswMiu9jO3sn51p0YBHNFTmWmDl/Y4VspncTqX35ngpKBJz5pqgVEjEzm1nZDylqOjOLeV9uL7j8YEmCnSWGvpJHdf4U13ePIkD5ISp5zErGQZG/aeBhls2OMRw206RHfNDF9ywIxDLHe6Cyx5b2kexwwS70yLXzxwPqnNXcmLV18kdrw+gF1bJSqTgL/60emj/9oziD4prlBX4MUwbQnmQRMHT361hMHDvx7ut5fQ9kk0cy/FuPLCPsbacuDfEFpZBttqAYujVLIrOXX9KRSiIK7ShpkmzNHaVMOTTZ2gCBbJSPbTPB1ZWh0xPdu3jh9+m7f56QKNPbv369p5TasY1sTreRjMuPcRBtnoJnAn2DWPtEZ7ozj80HEtIu12E4eosHY0jiqOWGjEx4GBrPabtOiaQ8/GVzuaBiAWCi3Zr+b13SMil7TFRnasqzoem5chzWX5zUqcBQfZY9pKqrPjI/HAPDUPHlkIqRwOHyT5OM/C+cBUbUgreRYf3TaU4SVQe2r2cKmObH6TnIWLUYyxZD/N1BGTV8qI+nwEaKhkT1p7IEPsGinY9ZMTGK+61q62GhInmbU1Gr58h+hUByYDOOQDJsoLJ/E6nzmzRPH//nk5OTI1NSUu0Ul4upcKDw0mSbxpviFeyB9osOCtKZJlVYVlLvxNRw0+FDRll2tXcNpx/J7YeH/UZhGqGwkjCLtOb5+ezCN7X02l1UEWNgqLJTqaKNjZVqMGAW3P12jFdvnZ6dAyEUHav5gTudDR6anlajRpC7DwNrAa6nlBhZ5V0WpkduH9u9/go9e/CkPBe1BvMynNN1QIyBPvYVxaBQ7ea4zsu1BD+VuBC0+hdJTY0UKsDRiHSHDjAKc0V/byssX/5ig9KrkcUDrhWtsrz373enpaRLNK/7dujpDolWPlzDGJqfrlH22yMVcYbAeBhzuiYMHf5MR5h/1dDTUsdNkqrXr/WmUj/PoXWRRoobjYgkqViRL8ZlgAEpCKTsnZrBIsOhvzr5FJ/MVOjRmyz3Tq85rN5rN9/N2G+2fl4KqAjY6IAt9J7kOve7IyzPfuXjf7t2vM7z/TNYBpO4GxNOAwinVuTdYvPOsvxtEUwCGchom5tW5yn1NuKogRFb3XBiNmjPHUvPy1zEO1jmV7jmXRg9tTf7SmyemP6/RAxtZr55PXPf/2tOo8nSarvw+HDEpZSs/tXvngV27XmFi9Q8J16ZaTIvYdGgvHAN7nNEktnYtR8nibh00LMsrfw4HGj3Uj9i1JEOAvz198uT/mWRmMO2eLRI36ypBvaOclEAK+PK3vvXqnt27riDUn8xDvJQmtyD9onaWuAHVWjjCua0zvPaVc0W+uy0sbeliSNqF0UK0+pG9Cqvhylmr8/R230ntudfJyk5Zr3EswwPbPp0vHTkx/U+UCeNQyw+y60iGL33725f37NpzPctQBp21VUbC8ZIF1llttr233kcceUmhLeE7MRTy5M5KR4Ra178DTe1PWFRqO+niMsPwz7F7dW6aCE7wTXV3UtNNZbhWuATaYj3y86xH/hPTBCWVNYnqhXDxpPAM4X7nkm6jaN+fdcrQ6B52vFjTcg9AR1W0yJSzsWFImiPrvkB7kb3/5fOkM6XivkGeDhiXyzLTqjFKmV7qtP/qiRMnzgCTkg26gRT+zeuhAwd+j/3lv9vS1zTjPlOke7rF4cwt+9PonqfzTUTpLNWTZ+3JonaOEnYCkAqJIHmQcYcTDYvnvkxcRUnm4OTdP2T/B+xefRTgwMiw1ASe3nFOvOvXpoE/yZjxWZR1JzfaY9dDG/e5CaNmoNpY1LgYgNYqOmIthyJEY5mc06NBuZk2xEjkc0LSeTV45dTbjbHJe4qtlw8fO3bsTVJstBXG4AdU4c6+ffvGx8e2vIj8foSOZqWR8MZDGcXIjqc5l7U/Ti2obl7X1WQiav2uJMs42FNZuvgy945O0RRlVucM3r3i/TUfOXby2BeBDIwcV6tSfxUHOj7JXHWKydRTBw8+xa3n/0Ij/7iGcrY/1TQylmIotboqmKOeV4PqhtQFuJO4mIRgTsRXkDvcFNKINccrfD7zo6+fOHF8krURC+MwzsB8p1wln/ajjz56/7aR0S9yE/DZFUaSZaUT1NoKbkwcYiuYR5z57rqnXq4pMrKYarKybEOOOvW8fOUVBo6ztEjZOHNG7/5x7+jz3Dv6W0DMj1MG4GJVGAA+7oqFyWwkIsJo8jHu3f0sbfNj6PGo7MS2opWhbx5WBiP0W62/Wt1zdDYGeEuc/oZ+Y2Zu9hf0+erJWvki+g507rEPHDiwm+2M/8nI+JEmL8TVvgcCksJmF7rbac0iOV7+MPYIM9YH8XcS1VRVt2sKOidpOJzo4zgLrDnmjzlNJx88RQuKGpZ1gmCRd+09f+zUMVbuPzCQEM29v3ZbBtpPHjjwLBr9UW4h/iTR52gEFtIaAMJg0PiW360fRqOErrHUYTr+ES4MLXVepIf9D8dOnvyS6OEGZjoQ7NzxtaoHL8v4VWzjX6pXQF6ahyqtK59iBDr42NH0i0RtivDLYgZONh6j1X0VPSbtNZwxqxFGDdHWyQO8n+e+x69PDmBHU6u0uf9+uKgx1QrqneSGmH69jzfRMaKkHyPhGWAHqPgYem+Em10wBm5Kp+PgfonTr587euLEixlf5axYmNyM1jsgLYYIGGXz46eR1a8zYh5ABGJ9FUOR/IoMwfa2bSV2khCR132kVc0hUsyAuYxompo6v/Lm8eOfIlqVLYRBcaV2g8LPveRjeBKhT8U6pKKrBenW4a2HhhqtJzgycZAGOshmLvuYQ5x90rYN65ZO5zqrmDMcd2Jft3N4y9zEK4cvHM7Pn1oj1Jiacn0/OumE63fAU670r9FypqxDO2wocVAUkDdBVP8+HSpRmcAKJ+vRgnxUnROTsH939PjxXwR200wrqGwgoDC2gUVuSlHDk2EsbqA75EAjhtz3q2FE7bpX3XH1psMT73rXIW6W/jMmoX+f9clDQpGxMP1qoegKsFhZYTBhIXp1rN6DGmsNsuveUvsoOX7h6PT0/wZedHBVi1JZm+kKc5vJw0aXrTr7N4k/FdOx0jjy6+k6uCGjErzgEPwL44YmUeypbCiHDh3ireHtj2EKH8c4Poi278YwLBlGYhmMBFPkhC14kY9Edffc6YeJ/Peh0cZn+aSBnpQa+GmqlOEH7gcS+F4SGJ7sm64+/vjjjzVarQ+w5f0j/J5GkR7DNB5mdOAurEeTa3hnMAzWb51vUoD2wP+EUwZ66E1OxjHwo/H/B8a5H70Z+tYsAAAAAElFTkSuQmCC';
-
-    static private $wave = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAC4jAAAuIwF4pT92AAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgpMwidZAABAAElEQVR4Aey9CZylSVUveO6S+77UvmVWVXd10xtNL4DNkgjS6gAqiiPK8hQeLqD4nOcbHfyp6O/xc97D0acyjxGdJ4oOiIqIvpbNLmm6Wexumoam6epasvY1s3Lf7jb//zlx4vvuzVtVmVWZWdVNR+b9IuLEOSciTsSJ/YsvI985JoOsZvGjXcKvgt8ic9NNNzXOj4x0lVpaehHYlSllOrLZcjuQmzPlTKNkMg0gzVYqkslmM8VKplIE3jx+c5VydqqcLU9VKpUJ+MeKxeL4sWPH5uCuGxfgNNkh/PYaTlnMXAw/oDxnrYUEWFmerYZ5ywwNDWX37t27SCEGBga6s9nsbtT0nZWyXJfJyPWZTGYzKvcGVP5+1Ndu0DcBljUh4XkRaYFO5QiblXwBikQlOQ/6c5mKnClXSsfhPpCpZI+UynI025Qd3r9//whwXCmUPjxyQ4htr4WR8XMKEwSz1tZFinytk7Ji8bGX4I8tezSDg4M7oAy3I8MvQt27HQE3ojJvhpLkIhIcoZ7DlbFaWdEKrBU0I6jq0SROoIBtQLG4TZegdTRQjEBFG9jlcgnAc/AdhPcgeqHHs5XsE+iBvr1119bDUOiqtIMoO2S9DJWJESWRw/OcWT0JeMmtXgxrw5n5oFKw4miLfMcd0jA+MnBHpZL5HlTQV6Bhvz2byXSjYgIFlR+YGCXBLSU8QVORSrkIDYC3UshUKux0UE8rRUOOeoJoMuEnebCjfuUBUze4osPJZL0CgyliyVTKcGjqkA4kg70SEoKIXXm0B6rIFAD7QPMEkvQVuB/JTU098dS5c5NMaMq4UrvCpIKec66kBLSGrCTDNebF9LOyxBZ3944dt1ck+3pUyteibt6KDkIrOJUBP9b+cqW8kCmXZ7NSnkBd5GgI9TXbJdlcp2Ry7bBbYTfBbkINziEcUVAp1LCil8ClrLTl0gK8c/jN4jeN3mEKdZt8oWDUgUw7SMEvQ16YviBhxoZ1G3qjyqm6g4RCu5TGigU9TQWuQ6B5BAO3B6DsXyrnyt8cHh7mvMZNdijpXbRx8IDn7CuXgJXElfNZaw6ZISjG3qAYe/bs6SguLPwQEvGWTCXzMtSxBushsqxgxUp5LlMujWUr5SnoQrvkGrdIrnm9NDT1wt2FH2D5ZigE5uBZ9gSsyFnYFA9+9s8+gE5UfjzUxw4CHtTeSrkAd1HKpYKUi3NSKs5KaWFKSoVJKc6fh3tEyoUzwJsAXyhbFp1Ztg2/RudKPmRG7l7R80gDDSNkMLu0p5CpL2LB4HPzleJDR48ePaGB9nC5LJpzpXCecy5DAib5ZRBcA6gYz1iPsWvXrvWZUuVtqDlvw5LSLqYNbS7qT6ZYLs1my6VTqFpZdAa7paFtuzS2bZSG5h7JN7RBGZpROdEzaJUnZajsdIbKr073Rk9wRMm5AzZiU1+o0GTDKQyGblCceSgLlWZSClCY4uyIFOdOwn8S4VAa9jLZHvyalY+mQRWGSpNhd8XuKGf6YnEi+BwifBC94n3lYvHzB44d259KJrs8/p5TlpRQluv00l0u3dXA9zFOeefOnVh+rbwLc+Z3ZTPZjdqKZ/LoKVARi2dyUpmVfMvN0tS5W5raN0MpuqEQLdZyI+W20IRGWiswG2xXE1Zy9V7eQ1npbCPQs07TyQfd5M8RHyMuQWnmpLgwLYW581KYOYvfcSjNMBRmHIrSiTRjIU17GJDrnEgJQZwpw4XhmOSwyMAIyJPzlC+jM/uUNGTvO3DgQFpZ2BLQsGfSVKrvucclJXAl1eGSzFcKAUu1eV/Z2TUw8FaM4n8DPcZgUIwC5gHZSvEIuopN0tx9q7R07ZTGln7JYtjEiqkKwWGQ1g1v5VcqdUvkQ51QVD5dcVLDONTdUhG9DIZlC+hdFmZOSGH6MIZnB5Qqm1uP6VCr0kKDYOsojN2eOqB4eWoMNIugScjoC5hz/V2DlO578vDhk8rEHuyBI4MU/DlnHQlc6woSe43d27c/r5LJ/Tdszr3K6kS+gDF/rrwwnMk27ZTWvjugGIOSb+pC9WMlwchClUKrIx/XnlGNSaktKrjOT4JSl4vTsjA3JgvTp2R+chjDsm8jTzNQlI34tSE/yJT1LJa3SgbLxzqHaUj1LGcReB8mYB9byGT+JTXBf65XWUKNuBarjSebBcjxs+zaPvjzqPO/A21pxVAcu9fZTLlwHD1Gn7St+y5p7dmFeUUnWmg0jFxdwp9PbJ3ZM8bWngbpZ+XXhQK2EcgZVssK82MyP31S5icOond5CmDMXdBrmrIQLU43qnsWDMNsWIfl44z8NTj+9b7hYWhbNOxVInGEPudgKVx7ZggbC3sxEd/Tj9Wp9vn/B/OMN2LJE/Ulj+HUbL5SPCUt/fdKR/8t6DG6bZShlYOV6trLz2WnqEpZkt6lXIayYN4yP3VC5sb3S3HmceQb4exZslhOhkKZsmjM7KdKeKDz1Uk+OtbKNDToM2hn/kxyuU9jR59HZWieG36ZHOLzmqtOPt/ARHw7pqKfQqHeiu2AAjbiMJw6msk175LOzS+X5o6t0AXuSmNUQa245nISZbxyDleY2LNkdHWMc5a5iSPoWZ6U0tw+LID32gSfy8lJr8J0cDWM3WueQzCd8kvlGxDjn+fLxb96Klky9uGX9uArl4FnHqdrqloNhZ4DynF9tlz5HBK3DYuc2MnLNpQwWW3t/z7p3HgH9izaoBi2N8h56XekQe1m18A5i+3m4wxAYRpDsNMyi15lfgK9SnkM7coW61WSiT3FZb0KVsLQrXDpmHpzFtC/BtGf7j98+GtBphzfUcLfsYpyLVUvnXMMwGB37AEU1lY0ddimLjeUC8ekc+uPSVvvjVpunIA/Y+cYoeatpKXzC/ajoWehfDgEm5s4LLNjT0hp9kkMv9ZBWboQLbuhqvpe06tUsPhR+UcshHzg4JEjn0+lk+XD1S8q13eMuVYUhOmobNiwoa29pfUhtIm3oiR4hqMBO+DSs+PHsEI1AK/1Gt8Rw6nLqYKs+/hj42G9Cpr+4ozMTZ2U2fPfloXJfwPXPJa/N6BfQH2vHn5pr0IEdiumdPKv2Hb9w6cPH/x7wFWr3iBvyH1cPv4doyjXioJo77F7cPADWcn+XImzUJGGcnFEegbfJC2d23UV57leA1JZotHFXuB6r1LGUZjC7DmZOf+0zI19DbpxBoqyzTYi9ZWW2DHYChiEzUk9R1hQlodxQOGPoCEfSy0Tf0esfF0LCsJxbvm6gYEXou37EgoDVi5TWhhGz/GTuoTL803PKccSNaMOmopUe5U8+pcyduvHME85KDOjjwnndtkGLHhkW9CjsIeOigKnjcWwKcszYVSUb+DAyx/OFwofwYtgsyEqKkro2utE/gwHseW+2oYKUunt6vlVNFl3YwmmWF44km3f8Dos496Myfi1rhxsY1b6t7JF4o2LbZ5Cwg2t0owjOM3d10uuaTuUZAyrX9gWyfA8GE8f0EBRQvcDVxkFUQafTehVXpvP5n6wt6d7obO7+1tjY2Ps7WlYl1LapbBn/ONq9yCMX+ceHS2tWDnJXIfRVSmb78r27/ohPVCIZsvq31UXdbWo1FcNukQKHXnpdciHSdWMl05fTZfyKQvKlUf5szZPmTgq0yOPYQPyMQy9wuZj9coXa38ZcxLs00rSo0jldw8MD/8luLMXedatenmppaS3pk6de1y/fecry9nK5yqSw4bxfunY9KOZzvW3X+XeIxENRhd1TF1gHbwrBbE2My6t1cqsWnES+LJjAqlN6m2pmCeO5yahKOcek4WpR4KitAOpeugFMigKzjT40KtceRjLAr+DyfzfhjR4b8LJ/DPaXO0hFuMvd3d3/ixWTu5BRcCJ3Plcx4aXS76xjWNetHBrJV9GZD8OSRiv/xxebRu64RB/pX4xGSHjLoB0+pK0IdZagkC3BEvziAcVBdMNHv9vbO3HiuEuaWjdhaHXNM5/fRNwvrfCoZcpI8mQYZ074sWxMobGW/H70d7u7ld09fQcx7BrP5GHsCI2DAeMEZr7GfWkdK+2yWP16svone8oF2dKuaZN2f6dr0OBcO632nJNss+Knpgqj4GpAAnCJVzEZNqXa1+Mrbb1YFtPJgmsOjiBX4xzOswapaRHmcUO/fTZR3Cc5et4IbL+ZB6xaI+CRi5vMVb+Hun8bWw4PkreQ7YBjEWwVS9QRreiZullvqLRKjNtga4fHLwNu+VfxfCqobRwsNK+4QczXRvv1J1yn1yufNShslflvsqjdfuSKlGtVctQoPo5WlSdq2v7IiKqzOIql3BJyBPYIiYXAERFQa/CtyNnxw9DUb6KHuVJvIG5A/LBW5c69Eox0G4IXQvecwZ9AQh/IoX8+/Yf338sYD3jVryu2hBrCKsewxxedfb8KPalXiM4ql0un892bHiFHlnnkfaVVRAqAKs8/sypfmvlAeA/ewn/EZA2JPIwt6s5pLBJu5yfkS6i8HhC3JZw4hKTz1R6DRTCjJPlxfCS9CjpJR8u+wrOuqFjkKa29Rh67dYlYb7YVS4cwhy/B2xZ58NUw4ZduKICRLbheBeuAXgrVrxyza2tj05OTvJQpE/kl6+1l0z1yiMwsVfF7A1SzWYrr2DhVSrzUIzdksfbfyurHF5ZEIs6zW8VhrBQyUKli8IIlTIJdwpipHikK290k+/SfsaqDnI6jnSMYEzeMQImR01aWYjgxnh7epK0e/jFbVUUdEXci+JbmR3rbpH+3Tj2s+H1OAU0A0VB56D7iam2NhwOw/SkAC3og968r7Wx6eHd2wffgNioTWUeSoWdTujFE3KVQq9WAhlvZevWrb3NuQYMbnNbS4XT5eaeF2d6tr4cIZDhFafMGGhlUuGmGLKS1RP4heDEriGo9lb76rFeHixpXBNX4KCARVAbadUJWzwMM9rLGn6B1Fa9bHm4MDcqUyPfktmRvZBPI1a9+qzsvEexJDPCEhStgVLCwa9/xgrYe2rmJ9fsRmNK7S03a/RkvJWN/f33QHrvwqFSHM49hZefXpJpal2HHuRKDiOyGKyVNeUwP/OV7g3oV0Ol8J/DVBtARwYaRo78JX8OMRwNjKBqGHkwPG27u5bO/UqgniRGuoyN8UpwAI5h2uIzrmCUXvPgMKPT5MAZuDr6xW3ik5DahTLK4fKL5s5t0tRxg5RwoVJh+lGEN2GBhe+kRMMIcVEYWj0MDTA9uR5cfgobw12tHe0PPz4xMY1w4lyT5qoMsdC9qkDQBd+Dl6EgmEopm+vJNLagBdK28HLkRRoUNyz+TObGxxWAUDOGpHAHsYyc2J3kR7j/Uk4DWfjiJyn8z91p292Os9i2tHjUTBATagmI2DE9DHdPwIp5IdxMtRwCvpMG3o57UVtJ8S4Kpxp4ka2pdb30bf9unJv7GVyntBX37p0GOcI49AoGadalsXKpVMQEPo9l4f+tOd/wGI4YvREo7GWShDrRNWBfrUQx3srugcFPY3z6aizvFrNNG3K2vMt7oiiv5RiIP+YkOgBL3MoN/mpI8FVZKYyUk+VX5fXkLQIuAjjmJeyaPNd4SWygVEDKaeEpgDoTv3kTv+In46yEew0d8S5ldMWL8sFkniteY2e/KYUxvIdVxK1EvJlFJVe1Z8hYiiifRtCy89mNQ5DDAbE6kQBeTcOJ0lob1qAK77SCaG7F6hUaobFsU+vtEGYTOmKuXi01SYZo+AnRkhQjoAcOSYSRTR2FSIUlBCvV9EXmpgiJl+LS6HBTCUwSANHBhPoEK51inAgxXA3GhitRISjz6jM2IKzgzlcvfgRjw7AnSS9mXN48N8fL95o6d0gGl2eUpk9IaeIJjKz4zht25JO5CZOTR7wsbAy7MuvgH8aP8KVFCsS1MFdDQTimKuG1nFsgmI2QBq4Cnc00tm6AdPAaqL52oMV5ifyjOkQ0c9QqChEiinKDLwCqQiJSFTTiphxOnkpbZJiCXZnTFIE8vK6EChvTafC0wpiyBBoEx5wASdUjsFJOl1IUxEM83lVnxtMRvBewGCcpqGR4CVQasCycQ7kWxw9AWb4NGG5i0SG1MiAqY2jAPbC9gaVHGLxX31rzOcgQZQ+Db27cZcvmlVIm16U3HrJCxIK9oGxIDizlYm5ytFZMgfSoP/gU32BKmcQRyRkr/wxVHRpBAjdUJ4DNcP0FmjSpup32UjbTZD9YZhwQ43AejhsQYrjDademK9A6zxCbep3eo/X8qB90gVVN6gL2hSw0c1AO7ZWwkZjF69GNfbdK47pXoNCxuRiVHi4Ylhs+CcHJpwwtLyKSrLpZ8x5kb+hnIXscbYcpzWFktU1XRNjjavlpQL2HFZqFsIiBzlJMmWo/wuyfmIYVreBwWvUaLAmBK/E4ZgDVBNR4I/IlHQlhdFU12OwBYDQwYqBSEeiIaO81yPzVPUvAAYKxCPyUQPsW8A49FIZaigVEreBKAZj6lToVJ+OvY4CGlaokvSxTmBwm8sWpPinPHUEnwgvwMLoKGahkyusV6Rp8rLWCUMplvlqLtuMWSr5cnsw2tzwPY1csDXIs7OVQJSwDmi4EBFihyA0TgQmpBio8QmNghCSFCMwY7K4EECABkIInSSSQFTEJTFwJVj1XqL4hKPiqiEN6I2IdhUGYVfFQ0ZUeQIUbM5uTIJoqRUGY8jVFQXMOvwJCw5MMszhssiDyM5x6+SES7oFAeixe1S7ic7qB+Ym95hsodcLDKCubCdkbwNeSdTUUpNLe1HQDhDBAgfPi5oZmXCgAoertPi7YKKUgapW3Cb26l0DlMM0BBcK9XJQ+8TMgBAUc8yWw6HJK40dfdZCGV/FTnLpIAffCllKxvqkDj1TdS5xwRfbVCqPq4rRkEyo4CWKvouTGIIG5XMnB4lX1giw1XuUDHAZFt6XI5ibmrs0ZoexBrEzoM96ce9j+SNVqlpFnMt6D1GdaG8ka+td0DjIE2WnecrmbsA6eR6OEpb58hjeu1zdWQFY5rIATZQAFSi/xI9z+YRE3eNRnEAPTHTGUh9YCo0iwWTMCG3c4JeNkcAyv9qQDluZO09MdeCfOGHPgl7DVtIRUAwpa0huD+IwwZ02cwMNp1R8pwIJuM+pWbwiPbsdwRNockvETEnbvVsQgDXsQXclSBtQ8aCPxM14B6mhP5HBVHGuqIDI0ZJksl+9kCWHFqpJp2KTf57AxqQuOaKESekkiqLbQAjYD+K9FzWdCwoqlrAwnYBBkBMaBT8U0JkavEEKNh9YXRTRsQ4qUkR3TuLSfJ4H47nauqTjSaXK8JFWaFXiVUOMN6TWYETg3i8hJnCjxE6J09tB8KI2CLV8ROyKrw8DhyXRwmFXVHcJn30JJUDlDty4jw0k6GX1n9yDhY5qQee5migmH3TL5po24CK7VunGXtVYyYgQALKumBmMBmGGAhyiSkhCiUKIpruMEf6BXLLr15xyNNpApP+dBj7JUNnAraaCPIcbn0k/nREx3B15grJXdvelwukN6zbL0Gg9nZTA+1VhCAxent1B9Bn6WP4aTj9HqM7jJKy37BGy4Gpc+wJUT9RrDpV9jHtTCwyvlnt27d7N7oallZtCr9FzLOQgzXtm8eXM/NGNPBfczYf6BLxRg/pGD4HhswUojlI3JyQohyAye4DI5whOwEloXpAak8JPSBE0kDNgBz5gZ7xjijhgYALQSmLrcy/JPxZciqO9U/NB4wgquhD/4Gus0TohMLZtkh0kH6IHnwTrpUEhMk89TdFIOXF/10om8kpIYNMyD+vngaAg2UxXdkFvoA9LzElJjBA1aJVYafaiCVFU5nfAgib25mZkO4PgdwQnNVXZVpXaV06JSb21ouA5i24i4sKo7iwl6L8oSq1ksKExRrF4R1QpCHeYJZY4w+yeGBas/cRMefGSSsEgIA+wiihHJoiPFB84U3xjgjsUkHlLfVvxABKuKXOtkqOAeksZBJQzqAcJQgW0mzrodYMhnmg/TzrE/gvWpDrpQX+kmJRwKJqECEQ4605HgDniksFUuUyKy50SdUSo7ZQQaviVauxeiPKSzmNWJ6DnyupbMms1BhsIEHa3SHrxxhqv7eAQ6l8njG4E0PqQIIlW/BligCZpP+yeFoaqFR8AjMPjgNBefCk0C1K/BCosYSmLDCIMpW9LDa7/gYECt0SDGhD8gR5vuer8avIQd4w6GzipaD/Bw8ra04Ulk80SLMAMrH00V/YbAUMVQv7mZbgPSCm6GBzKlVboETzHpBR5VzVaylCQ+uFKJ41fwV83FqUc4t1jxibpFFKmurmPNepC92ixpZp9PYeoEHVdg8gOaNFoQLAy6Q2FUu60wDI9IGuqWAqJkvTCJQowkIIUfwgyDkRIQjfpqYBbIEGtBbQiRotMmE34HuR251jg8PNjV0QHI3oFh5BsNJOB0gFvfYgCDK5ApNAq0RCozx1UwINrzAIVECGOJKA3DtXcBRHsPhikQ/hSuuo234ykmaWB0s1Dp1IsH4JyX8JNypRmgsuopLthmsqVK5Zo8brJmCgJpaLMBYe9RkZXnsYO+HhN03OjHICtdWCwMM4kbMP0PYTVuLRglMTw6FTPNyxgY41BwhhOxNcxINCTgOolVE/OF8ORcUQL2oGpq+BjACuG2IVh1CkEhXRZCVMYJjMCTcB/iKA7gMVVe4Yms/6DTf3gYCRXFxk/wkicoCacPKMrJmAdF8MpvOERSJSJudJO34ZFZICeBzkGs/DQShWGMhf8mTDfxOfgAAQ0PK4K2wmO/15xZqyGWipU76CiP3RRpuTydzTfhO4KcoLPAYBKFSLtBqv8uUi1KxTcphyrCmh1R6A4eABVDvXwYvsalOIZHv8XvdJoghWmYxmj0FhHc/Nef0Roe+dfgqZ8MCKdJwg07RR/SoUmrwSVdOj4N9ofTpeNQmKVR4wzRWvo8GdEXEINfI1IqQ9SkMwyO6GaQehTHnObnKhaHVL7JyDLmHJNvHqaHWFQNMgSVDrGGAncgXRNmLRVEOpqaBtDObKM+cAedX4eiEFVAUdDwRTfEpv8m9Fq30lGMAZ9YSQGaW4OUXEMMNfInKeApv7EzmMVqXMnNwhKawFHhVQ8lCXSegIvaVdTBE9Kg6WOcjhP4MqcaRtvDYMNtcIcpIOAEWscJeWKg/Rm9+UlPRP3XcLoNGoAGZYQW4MjwMQ02zApBSohY9LgJBxPOjP2YNpBhN30oRXD1nWs1xDJp5HK7II4miANruhXsgaBXpXBVPiaMpLICrv9GWu1mcQYT6LWM9EF4CFckw7SgSKUF6CzMBk0Mjg4NqqW9MF11SEyks7ug7QFGb+LAM8rFwpP0+XAmofMwG+aQMORH2aT9oNWEAQZyDrsYauMt0ICB+d1NJIQDDghKDaFK6m6FAg4kx1EOuKe/drOQOJyD2J3YjDUxFcE3GUTWyTqNPgm4uq416UGGZIgiRq8h1/EVW3hwEXIrVrDaKfJEAl7KxNB/JavjJgkRLFyVyt2Aq1ODWHhE06fGk/jVq3wYbuQpPDgNnsCcgcMTOudFO+B7nLQv9EvlweiM3jgwTfaL9DGadFgqzpB30kV+Gj3wnVZ5pmgYrtgBg+GOre7AyYMZtsgdKDReBrP34A97XV68aiOEClK9iqUpg57qEAvfHnEKhV/tx5r0IHtlr4knU7mJDny+GYsY/Tji3qIC1AINhaHS1zKIpaACV0HV4BCmRRNRlVBRNUThIZC4oQADQsqfxmFo4lfcGK9TpnBqUReh1CBUhYe6ENJlLbvzRhhqDR5JaiIew4xRkv/qXsU28ND8KB4eIQ8+J1BWCFTu7BVgrDchbtoNj/cMmpxL9yTKFWmngtQa3U3X1xrIF6G2w8hy9Em6JaaW8Cr5F+dgdRKCIRVNZlAtrGDxiElWV7BCgVi4FY5XCchQK4CSRlfAUaC6IxYLMNBaXVKAQULlUlwDExkm4KRoE3AqTgUSPSGu53I0ZcuiJtIFbQR6eECN9HQgLKUerEwKJImF0QEYwQBY0tKKAmrnYZoCPwGswiRh/oivHOEHPtwW5m74Ag2xgs4yttRwy+HGj6wRrHMQklYZbhSmYFzjDTv0VBCNogr/KnvWYoil4sBZm06IcQcLo1yewesf+BJr2FWlWFU2sBSZQlF38GlBBklFtyMbtREGTloqRuu9k1EjPLC0mMxvPYvHhRCNI/DVhDAu+xGLIRZqPqKkf5He+SzBTtOrOwA8LkZhaaDDTEyLpi2BavxGAGBIKXGMsfKxPJMG4RpmbqIoaXAYNdEcSoS0O/AI5CmfKohzI5zGzmOx2qkahrg0pPNaPI+1ZgoiCwtb0XBtoigq5UlsEHZCWDofIUjl6GK3sjFfKKeA48XFQjKiYCkDc+tT8ZOCZzArgtF4ZBYe8GHR7zEYDoH6r3ANIxP82488jSb9tMj1aXge7UXsNL26YxwgojumAKGaBqZDAxhooZ42h0S/MTOyFE2aHm4LwdP+lYu5A03AV5+DInKg10gCKYZYJmP2QgbDsAFu/Ew/CLQuq1Luytp5rIB4bVhrpiCVbHY7hNWMjhtrfGW9fxej1NiOmPzwVEeQphZa4jaRJTgJaqpwVOJgEwqTNHQbl/BUFuZWnul4iEla+4dFvOgJPkKdp3JQFAskrtFYvMAL/OvZxjvQGFlk6LGo7WG0Q+zmxDPE5yGajjQXRbRQfabxU27yMVTytFiCQ2NUloofwoLbcdQ2JDzDm4W6F6JAhdkpX47sEw3hgA9DrU7J5zHKuLbMqivIUJAaItqhFYTnEgHjCpYaCllLJbHdG2VYVSikCgUZEM3Sp4WkCo5xGh/Y/Ncww9UKAb/5NNBwYgyE0aNV1HgrE0VQeMLDcZwkoQW24SotGdLPH2hC/OrVGAzGMPsFXA+LtOawWAMOaRxP6YlD4zzNrU+iAu5ucxFEjgrV4Gp3wNJ4FKk+jqKh+cOKZbgY0JCpE1AYG2ZFBTHsirRgadMO5inXwP8qW6uuIHtDBrFwwddsUVnL+DJRlx0xgWisgIPgERxkqy4rbwvTYguBVTjkGQosgSswgAFlodOKk1GCvCIEeobTyaciu5XG87gIMzhpDN/pgk04eanltnkV38M8XON0HkZJqhhLSBNp458haPwGUwL1GyWgTscg5J9ehmm4uumHIV8LNLcBFdXQ8NT/QET8ejhkZYjKx071qmYghIsG2BjmbjpXsswwEAF4/4G9yDVmVl1BkF+VBBqTHcx7pVzEqedeKAi+WIRJSRB3tfBNxCpg0kSBqzt5KG0oVLWcGWwDGyC66YXHi5aczU+XBhrI49Rwo3G6wELpNBJjDiQldS6JHeIzhUQs0W9xhlgjvjLSeC1t6oy8PY0MsxhjbjTIfCEoUFk8ltZAowjuhiedB3drOg3H06CREt0iVzpjpUBPEom4IIaeIiz1UgXcoCIkR96VmqtYpi3fgT0IJcDMQyoZXNqK8VVlAe9HddstJhz7sED0X4WlfnOlnh5kiGAXiigUZiwwDbdKokyJqTjOIMGsjhfhRFErOkgc46LLaEK4oWtKFKL5gKvWVjo+YJSJ28Slu5rGUu/PQJTCURJl4XSGoxTsIYkQUkWydB7MHcI1LLi1GJQQALbywQ3bXHjaPxmGfwshT3P508K5s84/2wtxDSFvLMygB+HnqN2Agqu9PF+hPciQxuChV9dek32QG7Zs6cGNxVtUkuU5bKbiDFbOJ2oULH9mBZeXA2yDaDGoMxRIhBudEYSwwC8WNFECvjN2rknUIeYQR0gOrZgGdSqgGqY8A9xT4GjKn/WDfOvZEZFTVSCFTTsDB25avxgOE/MBbAOw3YFRDziE/QkFqc/CObwiDujjZiGplIkljjLS7RJFC3iA2fETSxvRNSb1kiN9Hg+AyiDEhZBsrubVW+9BeNyE0aZMJRuPvKegV9e52kMsFcFCU9NmNBE4ZEOhT+MDnR06ebMKEeSkmEFisRK4BGHTaTUBboOzGNxN26EUaaIQaTfx9Z8YwUE6ozTLfAphPDEuogd/gGk8CjUeGicJ9UdcwzAe9GtAyiZuwIOtoWobv8DArCp4im+gUyRnr2kK6Ui7gauUtN3NWBWMR1AM8xNFAxTXXHjqv8MTUmVsuuLkmgB99TYFIUVy3MT5uKqL3rC4V5ldG4/V7kFUArh7dQvE0gD54c1aDrGwgsWWhEdOOPpSYxVEC662oFxWLJwg00DiIaEILDAWLEKjO1YI1gPERV6MndHDo7EjXraIqrgsbAbpIx1pgDGkCpx4qlz0kFdd2zHZEgcctS1yC8UTXm2pA7ql1dpuomv6Q8ttfEigWLGHsCoIGmY8zP20vQEqMRf3JMopJlsFFuJg1xWPpTiGyjDIDqnV2IHHIVYsA7Jk/NwgTibpmgU+sHzTHzwWeQy5eo5VVZAhiGMv8oYuejM3BeHiq+e5PD68AreKFg46qwxl6DATNIPhUjxDjkK/EFwLLLA1QmWZy2WlIQ8eqB0LxbLMzpelULTyyOWz0tyQlSZ8C4l4hBZLGC3jK6MxvRa9+gN3T6p5U2n08IjgtFW287Y0aKQgCL7AM1Q4AA2Op+dPYeYnModDTKtVePrJi+EAq9KklIS0lI0qTKCJWmNwFTpZggdlHo6FEAADnLSyME3gpTwZJ/7t1VuWvTIxEj1BkcxBlBUewPJl3oDsIRe1mbNasxz6WtoqP1O+emZoyHhnMjtCJJQyTjzzblYaz1tQFhaWGrOrlCMNT+GZM+A7OXCjM+A2NeSkAb+RiYJ89skpefDAlMwtVGTzuha55bpuuW1Pr+za0i6NwDl4el7u+/akPD48LVNTRWmAsjRCcbgqw0pG7vaEK+2IHk2spRgw/QNePTtJaWBEHqQxS+MxHGVg8Bi7ZZQVl9RqSAhjkEATfIYUcEMEih2INSQADBSeIZx13NgDYP8aV5XbIJZkpoOnJTBaUL31sHDEKCLx/BERMsKbTWguVcGzQ8k3Dolb+8sO4fMKgHvK4bw8s6o9CO7B0oziMaApRbdqeyC4h9elHQvX8pIupKrsxYJPMqogxsDCUvLAI+Cy3W1E5ab3iaPT7MLlh16ySX75hTvkul2bpK+3QzraW6ShEcMAsCmVyjIzOy9j49Ny+uy47DtwRh7+5kl58OujUpmvyLb1TdLUnNMehy1p0osxCeBg0ScJdJfCPbzaVjrHo438aIvvzBxdaxh7AxiFETH4tXKBk9MGwZifyIYLF0jcne5JwEcDKTHyBA5dwLWDjJbXCFcM4xt7KCaKdIg7Turh5xCavQi+sadhQEId4BCLuEaCuJkqmkv1IJzxE7WMuqVd0MDAAPYLpBuP5jmRuXw+f37//v3ze231FEESaehZrllVBUFiNBPIv53BqmCvNIcJOi6qDrJJ0kt506ePaClAy9sx3ZOyzWmEWmkhQnbzrU1ZOXYWFX6uLL/448+TV7/iZhkc2ICe5MLZbm1tkv6+Ttm9c5Pc88Ib5MfmC3Lo6Bl56JGD8k+fPyjDwzOyZUMzeGSliKFZWkk8iVdkIxuQl7FgPrQ+wBvyqyqhcCKyAtKESq0gQkhFD1HcrUQAURlUQHSpnIivVEaqeYorXVFJ+K0bUERlBC21KvDStKjCgremiGWAYNDwxal0g8KrSTU/5KW4jJgmwx6EFZqnv0Nq4EoquZ4K371jB762lLkXEdwDtJ1IST8+p9uUy8gcxsRndu8Y3Aea+8u5zKcOHjx4hAyGZCiP1y6W/bFQTxl5rLTxDDbgU2v/hozcVi4vlLL5zuzGPT+Od0G4UWhCN2EBg5VAU4RidJupMo+Fh1RaxTT8WKGIB5nzZR0OiT6NYdK7v3+7vP0tL0GPoReIK7XNKSLbwDGxQrlptBaPhR06PSL3P/ht+ftPPi3jYwVZ19+E3oTfprwwr4TrFboQiVUn58MKCjd/WknN6U8GajjlGGmBHJgoN3UHvopM1ICgZMTHj2JdFB74k6H+40EDPHXRpgNlMjl5SmZnx1EuWfhzUpo9JwtnPg8nOwxtQ9FyUotk/0xh/rYTJ07g2hOrCUNQjr2YCsIvuwcGfgDgd8I5BHx0Q5YuS5uqvsbnZVauVM5DNH9VyWf/zwMHDhwFOpWPEYbEwnUJQ4LVMiwawRHmvkqp8h+R6I5KaRbfQd+Y6eh/XqjsQREgRNUBfVAyIFXqADeIZp48DQ3CVrciGj6arByakSwQHjowLX/2nnvkZ9/2PajIXVrAoYxVgSjEpfwofNIxlp72Vrlhzxa58ZZ+FPiMPIqhV3cXhwtsWT1dmqyVf3h6I+eQfvVTXiYrPA2D/io3wcQLwcHLvkNBwFdQsF1WQdgIqg6nP0ACW/OpJygGqyHnbYXCLH4zYIXqBv6V8gK+ODUMp9ZxjVcDgNrQ2Pin58+f55dvtTIPo0IPDAy8sK+r+89xrutXUWa7UCZZ/Ir4XB9joqHtP+gFapztzrdBKe/GFdBv6enpHj8/NoaGWg0rj9MGUH3rwmON+vjLgVJiFVmQ9WjhcOcRJ2rzOO2M12y5xIsgVlAKzIzZKnZ1pgqACAFPaZzCSekPysGCPXh6Tv7h979f7nnRjYqJr+lq6xWjCvRLsUyJgjTBvAXj6efv2ip9P9kuOweflD/5H0/I+n58IxzMWV6XE8dS0hFxEAGzjQpgIPV7a44QNJlxXqBeHUhZ/QONDYtQ+1Bx81x0AD7Eo/MvVjfy5goe88E4OC8rsv0GXhJlMtSKQE2N8SMPTR29+Kt6sxBMTFFqq56muy1bKPAU6xn8dJi1a8fgexHHe3jZIL+Qa9FoBeL6Mbz8ufFYUdnMoOh5p6305TLZD6IHururr+9nHnnkkQJgxNHuy1DrP2tTWR/r8qCW8mxxHYSEixowGsYmIb+tjWYFEkTaQt7USuczBhgwrRSWFMAZBKWgrZUYXg6tvnVsVj72f71G7rrjOi1g4mvXTscVGEbHAmGlacBQYUtXp7zyVTdLZ2eL/P4fPIx5S6OV1xXEsRxSl4kqCuSgr9iifkDOSKdWtlBJg1srZkaaGjOo9BU5O74gB84tyJn5kmxvz8m61rw04wzhNJa9T40X5NR0SVqaMrKnu0HWdeWlqQlDI2hQoYD6FhSJCmOK5HFqEAWFn1ZWzZK9GJfKHcrfeo8Eh6HwNePEBS+QOzg4OLgDH1f/i1wm81LEi84CXwjVyQtC0ROZs4RqBJ3RugSe+oovG2KmkXqhCWEdh56Xy7ls7qfGzo3uuHXDhh94/PRp9lKXVJLVVxDsoLMVgTAxWC/iGqwWZI6ZoIJotQv5YG4oaHgJ8SDzBlgCjLgAsaCaUYD/jDnHfb97ryqHt+ZekVJsrshJfqyUTfm89DU1yx137ZT/8Asi/+X3/k22bmzWfZMrimCZxJoerYwQBP+RtkRJTDaENzfmsOdTlC8dmJH1bTl51Z3r5Z23bpKdO9ZLT08r5NeI1zG4QlfE8HFBRkcnZfjoOXly/xn5yjfOyD9+a0JugaJsWd/M+glFYePLCg7maqcSrumgn2HsrThaMjf91oNgeIU6nyporqvkKw0N87u27bo5Uyl/FnnbiIq9ABLWU3xbncNZfFRm4aSU5qex2APeTVtgt+IyuhkpzA1z7xnDeByGbeQd6exwqCja42RL5dJCLpt95UxL698B+P0eCJsZqWtWTUGGEN1e/BDzRooGmWXJ6XvoqjCA0ajYEtkZMAkhXYAldgQxBK0nleNL2Nf4o3fdLq942S1agYmT0AYWK2SRL5WkvblJZgtFef4dA/KOn5yRD/zJN2Xntla8PMnFhxWKbAlsPD2KiohdSSjwPDY/mZZHDk3LTVta5Hd/4U558V27ZeuWvouu5pHXS/BDBZVzoxPy1METcv9D++RTnzkk0+hhtm+BoqDeUVHI31e04vBOS5b7wraKZb14qIfag+DGE73MnVVQ4RCqFDG5eKvkKm8GcL32GlJp8B6jMMPFKZHOjd8rHetukJZ2rEhiT429CS8CKSzMyuzkSTl/8jGZOv2v0tC2FcqDi0FUx7RAGqhwUJJXY6Xrg/sPH/r3YMdeRLsb8q41VO1VMcOh++rt7v5hFCCW46DAxdFs+7oXS1NrH2QB0bEwKUhNO1xuM0XmURzzMlARIow4nJRPzhTljl1d8p/e/X0YCtjEj7xX0zj/1sYGmcDeyZZtvTI1Ni5PPT0u7W15HdevchKqsmeyDKAQMTdHKZtDZ+bl1//9rfLL7/puedGd10lPd7udFGBvo78qVoCxwltlZsVub22WHVvWyT13Xy8v+a7t0tldkUe+dkZmZ3D8tjOP8Us1vZZTlfgrMjc7oTxNbtCEmZOouGHi7gWrpZ65B3G3IfYSNAZTB1xVWpyU4uwR6d3xI7LtprfIum13S3v3Nmls5kuIzWh00fthZNLY0intXVuke8NN0trzPJkaPYhe5SCG9fgMO7sWqz85jNdKmGfd2dPVeXZ0fPyr3HQcHh6uOx9ZNQUJqan0dve8GUK5DQqCZI1mO9a/BJ886IawbInXK1q1otQoAjJmZZ7YViToPTB0+Mz+Gfnvv/ZK3btAq7Mic47aIq/nZyVi+tEiyUwJreq2bnnwi4d1LrSWyhHThkgpOaaLverhM3M4HdAmf/je75VXDd0ibajoGM5bew08pv1SP9MTKhKGLsjnhp5Oue3WAbn1+RtkYnxcvvTIOVnXy7uuEC+rGBLgumGpMdjcHBWkZPEBozRzCtME3NGrl1iTWg1JtaLCgUWrZlmY3ifNHc+Tgdt/RtZtvxtKgaVh5gG8WId0qK4KbW7CqdStnZuka/2tMj+LIeP5r2DIhXvpXEmQb8gIM9bsUF931yce/frXuSjAnsRaBTjcrKaCaBz9PT1vh8iux1VxUNyZbOf678L76NgPCgoCCQEvqfgqXIUBWmMbnmIwUPLoPc6MLcj/+pKN8pY3vlRbRUbqdJqAVXx4PJyPTMzMoVBacI6rKHu/eEr6uht1MhyysIqpqGbNIU0Ldvu/fWxGXvOSzfJbv/K/yLYt/aoYxORqmytFNWV9H9Pv+FQ8mkYcYd+8vkf23LIVK3jYb/rcESx326ISV8RCCUUH6efnJyEPzrNRD+EvzZ6RSmEMTipXul5y5QVTc0y45yf2ybrdPy47bnq9Dqc4p9CGVetLko90GrVMwI479/mGVunEUGyOSjL2ZSgJbjeFAmkCsLcCRcIdCbJ7dGzsIwTWJARe0xp1rPDDI8OQUvooWH4OJJvFEi8uq07EYaK0Z0hB8GhGFeShrkQBD0waML7+6sl5+eHXPR8bgxzWhI3HFc7Mxdh5pelubdEVnjvvGpRtm5tlfoGt5cUoVz6M9be5MStPYyXvja/eIe/5pe9DxW1TubhiXEmsaUVpQEXf0dslr3ntXfJbv/FyOX6KH4fikm51ps1HeHq6y7LkULh2VIMMaI+C3YGpp2X77b8o2/bcq5vKmF+DxpQi0cAL5AaRUhGpJDnUt203vkaa2p+PodoUAmKfkOeyMfDu3T04+IaQmBjonNmtrJrZunUrD13hjD+7NFTeXBsEZSsRGmm1LEM6qoFayaJGhTAAuY4/PlWQn3hRv9xy04CxW+saiVhdkduwCoRMSndPuwy9bKucGVnQCXKqNQj5Wx2LytGIBuPEyLy86q518os/+0ppxrotV/Nsgrxy8TLPbBga0XOua26RF2K/6b2//go5cnxO54SswKjKMULi20XWoSAZRIXRMZmjBeXAMKg4d0h23v1rsm7rnarcFWxluJwdeyk2abg63NjUKZtv+EHMY06CT6KoXB2n3FBGv3rTTTexK9PuJc17VRUkl8thsmF3rnLOlcFynK1VJxWLojRZsnVIJy3lZkAqDOthehbqSfQe3/PyXXrgkAV2OUJMxXJFzgYMO5pRYTjGv/mWLVpRtHdJpfuKIrgEMVvuOexR9HU2YDL+SmltweRW52OrkwDKmvlrRcPQkW+QF9y5W/6PX36xfGP/tDRiXmiqABwUHFNglzd4JgDTE73pHgQ05Xkpzh+GcvyWdK+/EUMy9BoguZJyZU/CoV1n74B07/ghKMk+8AsLOUgFlA+9SOb2+cmZHw2pq9KJKo8nfwVsLZWGSqUHg6sO09KiLrlRQSg2N/WKz0RKjCQ0whwEFiWk/rabtykrjcOZrrGtioA4uaJVxD7Cho3dsmd3B04GX17Lt9zkM++NeMflcQytfuWd3yXr13cF5Vit4rUUesXtwxGcBjTHL37pTfLTb7oBhztnoCQeN8uaPX7SctfPH/CgIDvveq909e+UUnHeFMPLuz7REqFQU2ya9G99IRowkujDaKFALD8k/6cDs7TW6sw9wFfewp4zb+ymuiIFriBIkCawXs4DzK06KFQUnu+Zww7wXbvbZeNGbryylVHrih8qrMvUNg45OKRpbWmUPdf1yATeJcGpjVU3nItxxernXjcoL7rreo2PLedaGG8c+tsxfEYZvPYH7pJd29tkdo6rSVQNAPGvbxbSUcfwFdzC9CFZv+v1UI7diXLUwb0cENPACX5rx3pp3/RaKS0cQZpcYSs55AGHJeUlO7fv5NYPtSfORVZFihjPaewYAfZiZs44MPIo2CYhCi4RkwkviPECeXecJJjDicnpoly/q1u6OluTgCt0sbDZKvLnBb80lpYjLoPSMMubt3RBiW3R4DL1bWlRozjZI89hw46LFWwo/BTB0hhcGZbKCixa0Hu2YJjZ3dsub3rTHfLkML5gDMU1Q7l6nQutt/q9Jae8gYlWXpdtUzUkMLgyCzJheeZwUUjX+pvi0C3FFON/zpPKP5yCqdNzUAu/XD9rSu6JJ55YuA4nMDEF+j2s7aIEWeMKkBHm7CxBmmCZJ/F7cBohooZA1sPJ2TKOdnRiWdXGk2n8yHMZDleOhYUFmZ6e1iQvmdyzhPRpawXCnh4uSLDqeiVYMrdlIXKn/Ah6jzd9/4DsxktgNLUrSctieDnIoQXobm3FSl4ReyQ75d571svYZMEm7Zomnp+KJZmqB4RxCIQhM079rq640Lt34MOx7XegR0FcyQCKp4Phz3wvFpb40cw4WV9JBWFO+Svt3LHzp5DlByCRXRYZr7ifQwPBF6WSKFPiApobg6Zl6ZWf1Y2Ggubrsl3dLcaNmavPzJle1HblOHTokLzjHe+Q1772tfLQQw8pjQnuouQx0JNApWhtbdR32zVpHhAxV8ZB3mwsRtBYvGroBhUBe4+1Nl7xOQfDgSnkvVle/eob5MDxeV3JUxmgd+Cwz+UZ64Em18qvjMn06mkIeymsvDW1SlPXTlOQpJKhfuLKz4rc0JRtekGQn5ZaUluvTKrOp4wjxb+BcfefIkLM0QUrBDxUjbiwpJdFF8dY6xdhvVoEWBU47UFm8apsfV5LzwyFph0c7A996EPy4Q9/WO6//355+9vfLmNj3MgywV6UI2hpKGE1sLCCt+rLvFzqnsBS9ytv75XrdlvvkZS5JWWtni7HdqxqLWCh4oYbt8lNg622H4REUDnivIjFyC6DpUe3lgFaVkzM0xfKIWTFjMoF8eSwetbUhqMnWdxRZ5uGjIOFrF/bxb0iLyJgKHQvXrEJu1xDHpz5V64b2Pn7OB/wmyUYxIklnGyuMLcfcbPHYmuHpeZ0CYb6nq72iph6xLDosEBufLE6WpWsCUzRX8rpCkC7pYW9q5menh6t5O5fil1CI8Dew7KIlKFALH1LoV4mDhjzHNrxkYK8+M4t0o5lXa+ky+S0ouici/Adkp6+Drn7rk1ydnRB00n56l4IGxFulquCeNQcYuEYTBFvlauyIHyVBMfhZwPuZZNGns+yzU1Nhb4voNXzbvr3Wp3WY8QafpkPVw7B6cgPQQhvx+YkLt9FH4KFgcLMAdl0wztk8ty3cTvIQWwUQkGqu4SqaJNqnrgW41sYj5nMzhUEr5VJI4VNwVvNrOK5HM/b3vY2nX+cOnVK3v3ud0tHR8eyKl0BFYPJoOFYnNcJXWGSjFm9J8RA3rMYUt2wZ6NiXIkIrli5QkYbOUqADHh0/oYbNsn/+PgBzBUzeA3AFIRNhrXKLEcrSxVZpgk9yBzkx4UNw6iX7SuBMR4uEeVxuDHb2AP9OAwA0oAA/Ps8ZDfQuMikpxt9rety4mXuNG9Qjj+BZr4N5+25VIUrLIqZwtxhGbzzPbpsN3H2m8qfPYiJhF53uU2Qu8nW3cRN+QBmReDdVePjszKPitjYSMW7fMPWjRVk8+bN8r73vQ8tYAkbkWEzKabpwvxJTzOHtNDQPz01j7RhWAk3XgJKsqYYK/PgpRFb+xtkI/Y9aJaQ1EURM99GmwwlPT+LkC8C8NLigJpDP06FNm/ulY5mm3dwmG1fvTUmiRKE+DH0KRdngoJwxcvgF4ny8oIgJO6JZPDiHr6zbJUJnJB+3VVHR7J1YGCgH6d7TzGCy1VVyoO/CpTjD7GsCeUoY5kqn8fZ+0ypOCK7X/Rb0oNjx6XiApYdMcRCTEyYZ9sFykTEkk0VlrFn4GIKorXiQN7pM1MyNYtueQWMKwmXaKkcXnGWyprzj7kC2gcUANN3bmQ6klblNUKvzMH0zmMvaOuGFj1JcDncvNcgLz/HdjnKkY6b8qMMyK+zq1U24k1LvZgPsOrjJqmqB3mhXcdLT+hBuOq5BiaTw/ssOEofRlKMEcWkQ+IeyEA/SU1YKpXEWbIhXRnvC/82BPIuDqswfsqVsRNaKc3L7rvfg639wTDpQu6xSchKUn1grU5cEKIakKhRb4AFAH22GZeTo4cnZQR3WNm4P41n5Mt9snKw0njFWQq9K9LsQkEW0PNwjFsqluTIkTFpa0FnSm258qQtSgpFtYC7bvp6mtGD+lL3IrQLAjyP3Pn/xCc+Ie985zvlM5/5jOJ7ni5IfIkAlSO6EJ4F6+lqkqK+VGUtN8VhhkLx6gcgdtqtB7EV1ojm6Cto65uG3NnHsE5bM+PNKDk7wnZvvJ8rpnDJ0Q/ZjXalXdsHfx6V4deKrA3ZPM60FDLl4oTsuus/6Mss7Dm0NdIK5z0IBLKUyqI4KRHV0FDITbjz6iiOdJ84NSpz4Y2dKy1YCoFp1nQvWSKGODGHxgHp4oUHU1Nzsm/febTstrO+TFZLQqeC8FrUtvYGnQQviSiF5LLCBQby+te/Xj74wQ/KvffeK08++aTmnz3A5RitZSAkf1zihndQ8ppODvWtBwlc2TYzE6GYuZFYxq03PJi4pDpyOYkL6eLdDzrc081K5lMrGB9MDadQvIyOZnk9CJUDN9oVdw0MfC8o/wBCxHvEyCgm5KX5I7Lzzl825UAvYqxDnJh4aWzhKLN6wkOTlgZEN0etNSYFYDc+i1db9+07JVY5Oc5PIdSQroZXpYk4F9BGTEJBGDsV5PixUdl/eEZfWgpZX43oWQu1xwp17LLimJ3lhhnOtN2Gd9pg5ue5snP5hoplvSakwf/QSTCNyQgCPg3w8mIoFQS3X+JIiJX8leSqTvoZJaLjIkCR57wwFLygseskNfgiWIvIc1SO3dt274KKfSSElnH4MLuAczQDd/yadPYNYILLQ2aBLfOPhOmbZJiEcQ5C42JJuzSg9uEyctvDwYCtJ99ke/irx+X0yLjMYahA4y2jo66qzS4DZnRmRlfTbOxdka997RjeywiT3iSzK54UDufmF7haZnlfTgTemNx9993y/ve/X0ZGRuSP//iPBceElI2HL5Wny72IlTy+x84eg4OLOZzJ4nI06wHrBfmiKVO7qvwJx8ULOFyLKFdLaBj+Yh2pULDGLL5hWJPJcjkbBYrh1pIMU1zimfn5qZmPQfv60FIUMMnJz48/Jdtf8IvSs/4GnZBH5Uixpdbq4TBV4RBAjqxfF5OFh5GOJoXPEQDf/X708TH0IiehLDh2giVGVpq1MKwQLGzOPcawUMAmIY9j3qdOjMneB05IP5SX1+uslqFu8pb6SVzG++ThlgAAQABJREFUPYPrUXExybKMVlQwacXxkF/6pV/SjdGuLlsN87wti2FA5jyMPQj5z1M2uF6I6WR6bYjF8vGCpNRMRuw1KmXMJ1dpiKXLy1DQwgJvJ8ViCuLl8XrryTQNfHCpt4x12MmQncqSehC8bqV4UI7fhXLcgVWpBVWOyadkww1vkf4tL1DNrFfbmTCkBALjEq8fWAuVmKO9YJZUrR0JZNzX4T1NvT15+fxnnpJz41O4g9eGC96aOe+VtplqVgBWhFMTkCVLnzD8PfjF/TKNVzy51BnKXsNW+sEoG3CkfHR0XiamL28lz5WENpWDcrsS5WAeZ7GSx3yzoZqamEHvbi+OsR5wnmENKBB0lJGqfkgD21HuFHgxr7TMWEL2bjzix4tUdh6rOjbIYhqV+VyIe0kKkv84eo/d2wd/BHngihXenW1sKGKfo2vTq2TTrpdBqD7HqJMlhPEkryqICgWJiwaJY/rSoIuJx/E0T+wu8QZfZ6N84avn5OuPHJJxHDSc4lyAwg6VNka1Qg4mwUV6cnwyDu14m8rBA6fl7/9pWDbh7igOASPiCsWdZsP88QLtkXPzcnYEt37Ar/lOIy3BTRoaVwz3L4G0CoV0bDCm0WuwbaD/9JlxOT9lK3ssY8KUv5YjkVIKAmGxyHgNFnJSxXslPGy8uN0wPTWqR57KuApVd9JTadC0iZycKhZ1D4TxplNYLx0MLw4MDGyEKv0B88UWgOvVuYYtsvXG16GlwAcZtYeoJWc2raLyziJ9F/hC+a6Cq/RqmdX1Q94YT5ZlB94B//OPPC4njo/KWdyZO4dCYmZXWkm0EoWUnEbPMT5nQytOzKen5+WjH31MOlp5ZLtuclcWiDjYS03hBsSjWBSYLfKgH8xlRh4qh/FY5tPlPDO/oOewOBfjcZOD+09LVxvqC9OEHt/mIDq4YUXS+pG0jihMoPHd85U2Gj0m5fPzU3iJbQJXQuAtw/nziAYzDJcXKnGQwcHU5dmX7EG06uYrmfcj05sgCMw7GrOF6aOy7ZYfl+bWXlt1YE29kGEC9AY9JAZd7KLWAcHV5iK8HFFpjJDs8xjj8t2Lv/qLr2pFPT45iXG5LTMTy2Xg5Jdjq3Ko0qGJQc8xMjPLuzesoCH8T33yMfnmt8extMuzSJa2y4lnyTSImhWvBTvVTz11RkanMMHFkPNKKvqS465FDOU/hgaDsuZBzcnJWXnk0ZPYKMQREsoD/0wbzuppgVA9tNFM8wIOX7NV5DT8it1gDDMxflptbEng5cXT6MB49s7CkDh1IP2PEGloaEjnAxfrQYhQwo0Pr0PGfkJvgMg25hemMO/Y8xYcIblOM3OpAuHY03oYnuRl5Q8JYipS7gSauBQl/SB52hAVMB654DU7X/naiHz8Y1/Fqk5Jjk9MyPlpXExGFDxYwb2lS7O4mJvsnYb55CnVI+fPy3ksjfpsiieKP/fpb8jf/MOwbN3Ugs07zrcuxnXlwljxuvAO+mNfOycnTo/JTOhFPM0rF9OFOTEuZncGvTaXujm8yuHCuuGDJ+XhJ8bxdiWWb20EDjz8oTFRo0IyZYncQVtGHqyeROgVOaiwXByYx1Wl41CQfB4KOz+OT2VCWfTddK1vfPDNQurJA4wQK7YacCEFYZ5L+vJIufI+VnJoOzYCJ6W563ZZv+PFseKQ2aUN381mDwK2Gq1TMJplGKetIaN3HhcWbMdQ6x/uOyof//++ghW1spxFK390dEzmUbFZwV2ZKQj9gY4sq34hjKkiX9KwpR6Fsg2DFysCLlXGODYLYefk0/c9Ln/84SdlAO/ZrPWVo0iWfgflBG5O/NY3j2GRYg6NFhW0RkDMzCoZj+vsFK7UgaG/gCuPvvAA7rTCXVlUDksOEguHf0wHHvynqx/D2YPwyDvcK2aM1+jIUZS5aWpp+jji8ibOIkK6qdvDOPP+5RC1IqdTGJPk3QsuRPt5aPxNqEwYWuWzvC5y857XSgMuftO9jaUUBEuRvyphIKqlyMBxSE/j5e5wBZqHBTOPjcPBbS3yyfuOyIf+5AFdRVlAz3lo5LycGJvQym2thCkL2S36gY8XegFLlqoYoD81OYXCxvo+KJqaG9AiFeWv0Vt9CMoxCOWwr01pgtbsQfFz32EDDix+/vPDcvrcuCoJE8B8rrbxOEbQeHByTlny2MvBAyfkU/98FOnCMROkz43KurYHSVUEVpEyNvGWVjmc64Vtpo+bk5OT50Lv0YzeYwy3Ou5HdeRXFmLa9JVbnDP5p4MHD44jgNqjAqy3D5LhhuDg4OAGSPmXWClwTUqugOtSegdfj83AnbYUtxTl0FjYWnMCSfHQpAuObodrYP1HHZR6lESjkrAn+cq/nZXDw/8ib33r7XLj87bKNJYPx0fnsFeSE95h1YIDiXm4OdHlpJL1qYwWpoj8ssdhT8GLqYtQEnb5nG/kMXSg8nC16qMf/bp848kxKOTaX1adFhJb6JbmvOzD5dT/9uWD0v297fp5hs6WZlUSV/Y0zUq4vaGZxlzv7BQ+awG54B8Nx4J88hOPSg/u7GXa3Fh5WQ/COqDLvdpoekkShjLgKYwVUG5Tjhx69Vk5c3o/5kW84BpfNJ444ElK2xxeoaKW/zINpLueglB7irlK5ucg3A0YXuBIXBlvUnZiaHWPZkxXpZZSsRkDuzUcH9Dc019jXDxVYAUivRQ6AxzJ7Srkao8WEpRkXW+TTOPi5t/8zw/Ka+7dJt/93Xtky1bcgIKh0RjGyiPTs8qb+FqJwJuvO+mKC9yEc7WDN5Xw89CcAJ/GOP8h7HP8/T8O69h668a1H1ZV59bSyc/AbdvULB/7+NOy58ZNkhtYp1/mbWnkCiMrnkqxlvSy/c6TDcnx8QnlQ/m04KWtf/nc1+Sf/uWk3HxdG5SFBw9ThrL2HoTgqCBwazrxDRKc4XP+sdxTLJbipH5RAfnawumTTylPfnajMHlMyrghPpNHPQgv8SGyUhbagzg/vf/w4S+BP0dVMeG1CkJJFnft2rW+Uiq/A2/pIg+NuYWpfbLh+n8nLR3roOE2nl9KQlkDqbXp1yhZ5S84xrScIXfkTmKzkrhIaRwCUhIEl6OzPrDSNOCdkR2bW+Tze4/L/V84IS/HF27vvHO7bN/eJ+0dLTqHIBXp7EHB8qcJwLCJ6+ZzWD4+r8dH9j5wXCaxrr9pA9/e42natZuQV2W0xsO00DTgeMtf/sWj8gu/+DJV6E0d7bhtxJSEGbNcGe7lPF1OlA9PEBzDbfbsddkGUjn2PXVU/tsHHpbn7WyL8zFNGwn5QwKSd0KYmmSEr6WQbUVlDi9NXWZqTbnsHZTTJ78tMzNjOOHQgqHVhBTHvoaph79qGySAzJCmXM683yHBVqtKQYbQaO6FgmCc8WbshG6EfhSwJIaJ/0bp2/L8WInSDC7lNqFSqdAxQbCJcgSJkQGlyErJH734EZPP+qYePOAHXsRgxqko67DUSPOvuFT6f372OOYMrbLnhm7Zsa1H+vrboCw4Mo7hEw2PZk/PzMvoyBT2F/A5g6fOy358L53KxrNfXMYtgidNSK66r+aD6eCKFtP25P4JzI0ekTe9+UVyDMvR69tapQv3BtNQHkx0PeldLP2ULMtIGw4Qj2EV7/TElJYQh/E81n7ixDn5vd/bq0OrpIyVsIo1exAL57ksrHDB5+nhjYd87ZaNKi8YZJzLMcwfV6x4Wpc9xwTmHg34WCznNYXRx6DImCfh1V6OFYLhBdYN6Aj+5uCRg58DjJUg9h7EqVKQvagf+OhmU6ZYegsj04OIuER4/XVvxTc9sOexnN6D3GmYSe3OaAeQWigo+ikdl5AFG16EOZLbRIKbJ/eJ4850sPJJAFzRYsXo72mEsvBGlJJ88cHT8um5k9rS8ou43EshO+6A8z0L/rXhpaxOHFnnZdSMh2H+wRiN4hp6UEmYNu7if+b+EzhJ/LD8yI/eKadxhdE0zmqt72zHnMtabEpGy+UiymJ105SCcqH8eM7qHOYbdvaM8zYbVp08MSL/9b98FhUSV3xCXmyU1GhEoGZBq5t9BuZxyo88WR9DAG2sdPKdEO2SQojiEv8SxpQjj55rRk6h55idmTDlwO75wug3pYyvUnGakKr/TCQuFqkAMfcrgb0nJsaWVhDVnkqx+Aqk9FYQ8gMm6BFz0rPxZiR6qUmNvOEgDeOErRKHm3JwobBU6Y6VnYH140GICRa2mrpoCVbicgJWcLRMZXsltA+9wboQl+pwSBPZ+hCL8xFONItQGI/8AslLIrmKLqaNS83bMaz81D8fQU+4ID/2xrsk15GVg+dGpBcHE7twJQ/vEb6QnD35lk8TMuca4ziQScXgIoYtc+NT2xi+Pb3vmPYc4xML0tXRgMalqgEGO5aEGza6VFIvPNohHLLWHgTvhPBISDj47YQXtkFODpyET0+dl5NQjiL2UvLsOTD3LVA5Zp6G7nUDkYd0Q9yo4Jh7UBd/df/+/QeGwqsctRGlFUTDUDl+RNvSTA693ZFs16bvw7cZ+jUyrzi1TC7m18rHQWo9w5y5rOBMvHVcDkrZFbRM1u47MAzM3Ot2nbg5JOH5JZraSs/WqAqeSqMGXMMPV5JtUJIvfumMHD9+v7zlzS+Qnbs3yggOc3JJlqt4vJ6nGZ+M0JU8ELFsNdfIu36sE5WU79hzlYpLuEVWWkibq36NTfh2B5a57//c1+UPP/iwdKHXMOXgnAx8gvyimEycWsC6eqUBECon6cRlohE7w8pFvjSF+kJYLZ/I0BxOyt35sfMn5NSp/Rhi2aUMPLKyMPo4lONAUA4qbizIApSjEUO5v9p/ePj/RkCWK7c17NXrCkLK0sDAAG9jf5VOqjP5XAmH/7o33Ix84B1tPQIQI6jHaxFMsX21YFEoAZRcqNTBvQjNUFJgDn5MLVJAc7rEqgIcfxEjK5cqXPNoedWBP1NATD97kvXYhziDw4y//tsPyBt+cKe85KXXSd+6TtyEUsQxeXsxihe96VJ3WF1ir8n3OdhT6NEVZJrvmWNPDKt5OV24ePqp4/LJT35d7rv/pOwZwDcAIVoOq6rlRrkvNlQCa2iRyKohFnA5xMJLU3wlliVsHOrXOSqhKVsFy7gHcKr5KIbJ/NIw5jWYxyycexTDqmMp5YhpKUKhoByVrzdNt/10hF7A4QrCfq8Ezwth78ALVZDTvDS2D0obvvnGTcGU9l2A1WIwBaStCRzMrPqrONXPPDlZXSdFgrPIF4dmwKe8SajGMKvwg8cEm2A6xbPNZmXlnKQFn2LjcY+P/t0BrOYdlVe/crvc9vxtsmFDt254UixUBL3Ti0LHPyswP0jE1pjuMoamk1OzcvjQGczd9st9nz2G7xZm5aZdWMrFfE7LuFaAOiQn98SoD/yseUsquGEwYvQgYYiVUC12MT6djGModerUU7oR2IAjJBXQlwrTsnD2qxhNjUL/8H5LeliF0TLy04CaeKSSy772ibNPcPt/0cQ8HaMqyJAMZfbiqiwoxkspFCS0hI8m5ru3hF1ztCYU+HINSbgioUaFv1hgi9iaZpASPw91t9vGkk+qnQvc8RMsuFRzEiylTBASRs9CF8uMPQJveOKeDVffPvKxp+Xjnzggt93ULTfeuE62YSWvp7dNWlqbdNlbFQLlvYA3FaegFGfPTMihg2flscdOy2NPjuN0bg4f9OT4Ht+ohXLQMJ6oJJQtjU7MzaNPFiXSomXllQkVmiXoBtuIGKnMgTc2lr3oPTDYphyYjONs1YkTT2KohxXGoBzlhQkoB7YyoGSZHHbK6ygH2JwoZzPfc/DAgaNDWKTaq9IJzOtYqiBQDs0p0n0X04tXYzNlTLbae3bAjR3IyxheMa6UeOBBFEFZmEkWhGKECuxdAGlqZbNIZwCIm4iMKBijDRyqrRoMVyqnfJbbEKitvuEeLWwocn/ryafG5MGHz2qRdKDSd2Pnm1cpoehxlgo9xnRBRvH9xwncot+CCzL6u/Ny/QC+R861f/RMakIRpqXHpkiNWkBg4TmMATrEQk+hhYrGO6ArDeoEX2Li5HpxLSArOzoyi72NE8e/haEgvkPIT/phWFWaG8Ww6kHoJdLGpdzqUU8BpyUaETKMZadXHzx48OkLTco1HakHFUSzubt3dyeYXseJL1Kp+znNbbweKJ2DFOWSnC4gImPFG4mmXkSZMeZgGEvKq1CVIdNjSayHkcAWoaUA3ovAtlPNtTFpdM/qh8udZ8ZYAO2cWEMpKGNOyrkUPoaVKGu8MO7ASGLjuibbFGW4Ln9jJJGWEkV8AWNBKQQ4tR8HA20cETF7jOr6xQk+ILVvFQZarlRNTpzVnoPzD56zUuWYPQvleAD8GsCclwgGBba0FTCHaoRCfiNXLHzfvmPHji9VOUgeFQRfpt6OGDarPlTwHnHLID7XDJ3RVr9KLBbtEp8uIpvHpIkY4hP0AKd0tCQ1CA/DCaFqxd7Hg2AvXs0KQ6qA46jGAE9kJ/JJM38Wu5lfE6e18exFsK1BQag8KHa+oUg/5UV8Lovru26EsWITrqEUFLFoACEPc5odw4K3yuIgi5xgaoZYCgMrnsei+rif3KkMXKk6eWqf9hoaBvrS9ClZGIFy6LsdVLgq5eBGICfkGCJVfujAsWNjmE7ozTxKv4QHOWpKcg0V3KAq2HLOYBkaHz9p3YQxKbzIfEjqEtgtRtFP9yo4CBK5DeIMyO5zW0W+iFES6kFJUTmEjBUvIrsjCTBIgHvBRgbPcgcLMiUS9SjMZEmlwb9V+ICnwQFHpeOiqyMqZx3jSEXnEZOVrz4tVhCGoker6UG4isbj6iexO57X+53JBCtqUyfRc+wFG95YUdUbsbKVQMdd8r/t6ut9Na4SHQMSTorUX85FWF3jPQjHhL3s+qAOYD2dbWjqQcTsgq9MQVyjecAx3YtQmMnoCT6NG1ZNMll0CvO5CnxKG/HgQ1jdXoRsSY1/b+WS1suKrDa+yPZZ5PC8Qwih7lKCwVB87nZbYR6QDk251ZnyK6354zOFkzhRAuyuaHSZFy0+/UakYO5heEq5sXju7LCcxa+hAQ02EVU5jkmBPQe+E2smMqBylPUAYrnyof2HD70Dy29EuehqVWCyyMoOBVCmkmmjE9oNeeL4cr5FM2LVMSBdhhXvWmXh6MSJTDwzZlerYAjz1t1RU1QsaDUXK3CiqNLBATzeyZXFhE6VxYgDi1QECnl2PaJyxCpHefDf8x3serKEKDTUUaJonFZFG6AJLKK5I9Kbw3oQBKqipJXDwvmdEBrinTt7SM6eG8auPc9QIZzKMXkEyvGFusrBbFA5gPt+VQ7lpN2LLbmZf8lP9EtDiozVCfYmZpjOoOWa5CtqZpkp8ONcBj/lp48Ql1oAhABk0CFpBLgdx8MDIr10arDDgk1m+HHzaGrsqJw9/BUkwTZMLR7DSyqR8X7WPF2YzBCz6mLxDJp43GcIhEWIu4LtloMVzzwxquhYzMerkU3SWS04LKo2rHbsQagcI+g1zp09jD0Zrryxp8nhfY7DOD7CngNH1tOZ4lAFceMCDbzbIe99+tChXwYCI+CvamIC/5INiPcqMsZr4VoMeJkTJig4UxJT2HIenOTrUAqL8bZ8F6ghVxVtlbCdcwC6lcKJLZ/DIA2OvtLFQcYezLyU0XOdHf6CDD/w32V+dlyFr0oRkUie9ng6ntl2zBFlxKzoCiUdFqJQys7DGaQG4fbvqPAaTQQQ4iAng22gamJHi/ih8cXMO1IYC2CG9IyNHpMzOqwKyoERQGFiWIrnvwjl6AN6VZ2nB4OEXBbH7//3/cMHfxN+Z16FCPiyTH5vQIeGTuG1c2Qat59kO3BAD1v+rNzMjOdwWaxTyGTBOYi2Ag4nU5WG2iwADPNCIdJmtBx8JTiaEMUxHs5B0xfQ0nMRXrHK9FMxeVVR69ZNOsyyHiNwZ6kBR3kFt6fwmWwzjyYfszW3AJgPOYu1lVg0GmjhCkrBQ3DKMnwCaBbxMrCFBbfikCfLhEfeaVCHPRr4eKtivqlfJs4fkulKE4ZV2B3nyEN7jkNSHMU+R74fmFV1nh7sb2cz2PF/94Ejw38AP+cbhKe4w3cZxrUMUVTOWatawS5+W6UwdxaVyl6VvZJYNIOaMCoI+CmzhGONVzEt1HGCLxYCWYSwCHMI4PpvdvAkFlbnqk2gYyHAKNfIsxrzmeSzBoBVEfmzTCWdR8gowSEo2uk8epihq88oQgCbLjcemmbkJRJicVQmiiqivLTx9d7EMXAeiy9NGQ6A7Dkm2XNQOdYBsEg58LZvBkuvlZ9eaeVgkqggFmOphGsfBGdTsEedw6uk00ekiLP11PZFmSTlEk2cpOM9lDj+B63J2UVrdiJURwCeo8T4AFCY04QAB0c8c5AnlwnzDe34gPxYUHqEkXHgY5Y+FeQVrIbVM8JrjRyTGpQjCDDmDg6XMz+pZMEeWu0PAqq1TA5GgrDoMHFa1BFHQx0lhFmdood1K20ckTZ+Yc5RPP8QnOw5knk2QllvqRzMz787cOTQHw/Zvp7u7iBsRUxMYVNn51HEdYAKzfNcRfQgczNn4U5aisuJMVm54vX2uBTMZZBipiCHB495A9ALORZGig1gVbj06X+Ahi66oblH+C5OAbfrsQ0jlVI6b6YnzT/lTiX12nUyz55mzDXUyQeKz8CoTym5EKgSCvOS4AuSoSzs5/BArEClM+rwDPiwaCw87TIuEe51ShvfNB7cDMNQi8rB1ariKOccnJAnPQf44K0eUw4cLfmJA8PDHx7iBuAlzlUxpuUa7x5yTzzxBGvvY6YQXEcWmRwdToS+XM4R38XCiw9wYTDFp6Ageg8OYo1e0gdPGmaFDYgCHSGxzYWn/puN6Zs0tvbhNj3cujE7aowNMcXG08MAo4sVjmm5hg3TGVKPVMKlecPDlUMB8FhuUzmxfEaAewO9Ln6oG5S0gztEkPhj7EBQHLMdPfJXh80rmRpVBiYybRgRyqs4eRSrVRxWXVg5kNM3Pn348F8N8WWnZW4ApqO8mNt7EE0l3rH6rCLjI5z55h0yfuqrsjA3oXsIJvSLsaof5nMQXhynPYhLOUrPHPr0R7BTIaGEGIdBaVuaHCvAAXSIpQg+wJrb+iSPDdeZ8aNQVPbCyLIyID5xjDctBdvSG9yMRwON3TX2rEqbptXyoc+QJ62DDNO04+nukK2Y/5hPDwh2oOREJqKAl3N02VnMNTSRwOD69B5Eh1hpBYHy4LuBlYURXLDwKHoOfo7B+WniY8+BuH8MPcdHVTku8LKTUlzhwxVEB3elbOVz2FE/jcjzmVxTZWFyv4ydeTLcRFGV0KVH62RQED0VrAJzYBDxIiEiXFEQHlCdghE7TN2eEicJwEAONhhOQSGamnulue8GmTr3mA2zMC/RyhUQ025lQXgqoiTcI7y6NtOjafJk0M8k88l/ehRCK5FjCI5hjk9c6zGU0CkVT3kZw4Qu5TeKGKTRRpiDCQg0nIBrXDrE8iqIcDVUGA6xFn25OM45wrDqY6utHEyOp47Jzx06dOg0GomPc1KL67BKje0Dcurpv5PZqTO2PBr2Rki4NMOC8bEjX8i3GyvYeicFk3BSoaYl60FBsEmFUGqEAjlNlCo0khKL4ubVNLz6pb3/Fpk7d1hmJ06gd+dSY+DD0sK/+slP+XiYAsguhHucClrzR13FQHpVDHjalII+m3MwLxqmAQmewZO8KI4+LJ8qA9IGmMonelLZThE6d3JQ47TuJzDCIHLtSVhCtYawFKJNQHBinY2dvDUOq1ax5/AUuYLQrykqZeWPcMCLmyAN6ONQHnNy5Im/kyImt1m+mKJCC4JL5wFuys/D6YmrFYDbEAvvG0eF8SQEsUbhG1OFqtPFbnBLJdyOD9ucgS4FtxgCLiZ9HX27MKYVGT/7LSgrr8qkopIVK5PRw6F/Ho+FKxIfylIxiB9pFLx6D42K+bT4LR3m9xQpjHiWejisEYrhDFOPIoWcMMmBIoQ5irYYnIiqYVzBCSumA8AIdgdsdxpvEiS0dKliKIwN0yJlqEY2auxyZPmqxzuwWvXnQ8s8kVvLcDn+tIKUh7BMhl7kKTRD78eOPZJWLOYb+2V27Mty8LG/lNnJ09qT4JCkZlLzyAelp3nF4QEccOSZJ/64nl2Yw861Honkq5spBQFJpE+lOA1TN8PIP3isSChUAzPe6A5ItQXIqsIri1o6t0jH5hfJ+PF/Qq+I6++ZsLB5SfZKl4pHK4U9lHPar3EGGqMLhAxYIUO++vPMK1/Ew3+Njo/E79VVl2+dhoj2jzJyN2wah6vXYbT5KWu81z3LA7AwlvGUW4EhBmPicSvTQGMc/ekY5tdiqzvEsmjCk0TYmMtmcQUuNgEPfWhI3wJc3oncKo7L9HgToWTDIXejY2MPdHd1fzfSNYi9i4VcQ39uYeawjB57AO8uN2tPQgXgSUvtJdgKIN8lrFIV5vBtDgxhRk89Lief/meZHnlUco0bIWN7S6yt93lQIhwapAFZ3BACDxOaPg3u4RZQHa4tjzExZ6ALuGyZWB/UEAHNTy6PA29Q4PMHviJZ3PPV3rsTwRyGGS1pmA9jEWDA0PDoNUfijS6LKzwjTUxDVXDi8fAA8WqUINAFJPtPgdOwwEQtcKDNZJkWgdRwSRz5K0gJFKphQZl4z/np4b1y6lsfkM6NL9WDq+xldYhDRBqSEh/xOBeNhp60SOD3cCouZczj7PML02icinifYxigdDtN5mo0NXa2qvyrBw4P/y6gueH0ZojhreqTbXvaMC9MbamUqbwBOduLbfU9+CwWlKSXZ98zp5/6f+XM07hNr/MFWDrdiMpvX48sFWalMDsiCzNYnps9rnUt17QBPQnC9U1CTtL5kZcCzgHgpj9mH5JMHw1RyQYhmlhtmOBHUKwqgy4MH2wMaxWCdVv56RMP8LGpBUvQCoZvqnX27Zb2HXfJ+eG/xY0tt0hb91b0LvxsGLLteGQFt1dyr2DmZ7oRrE/jHaJWiD0s3bFmEGgEKZyLOQNytZUwAdyCAgJZMb/OkgmK/oiM8Hpuo9JeUOmJxZEAbmbHvtHs5Cm8OGdHyiOO89Z4SOQxw66NO/D0qFVJCCMeCq3egUUjqZTxIZ48UvO+/cPDvwMYG3Of0CrKWjyqepAQIXObGxsbm+zq7v4bVJu7ctnsLrQgzFIx37QOLUovbo8Yzczj1sXZscdkbvxbUIwT6JZncNQYL/83r6/km/rQ5ODW5yg8TIpLk9LW+3zJNuJkPSsgazW54mFWYpPMKmR1uPpMG+g0HuYwHnzqv3IkQoAzJdaL5PD5hvMHHsJuU146+6/XnlCTmcIlnaVBmStPusx4Ot1PO8SXdhFEaWpQ2kNgyjhOANeEAhGQqrAUhjpTygG50sSn+qsVNlGUgBVojI7lggUVNGTjJ74kjV07cLPNdhQXVpa0xfG4QGv/Gl9USGNpKfDwCGNx8GwcexCc0sDqYmn6MHBVQMaHlCiooBwf2H/o0H8EiI02uaQ4wbcGpp6CMFomRJUEw60P93R3zaFKPB8nwvBhkDJeGOHn3Boq2XxHJdfYX8419OHV4DZkHhfYIjMQAbSBv1R+0EKXi6eltfdOXLIMNqisrIMqHNgXVAYKryZcqYzYRBvcZKgs0zQxCoahoqBQuCdSwPhrbN+nUQG2S2vnVsD9Um7nYUnzwjO+hEUXOSvP4FAreVTjJfCLuVLycrQA8mrpYJdtQgGX/QcULjxYGhQnPNJuIsZeIbhZZNYzY6NYX2XtxOLGHgBZVapTobxCpOZWjoRoWmglDsNgirgPNb/ArwPjm+pTRwjBz+WlbwJiuCF/s3/40E+mA+Bec0PNvJDh3ohqLrs43LN4Gw6E/Sfk4wuAj6GeQF8qOP9bwq22pby6M/zmIZa9RL4BQX8ediI3CgDzEE7+1AAhBsKhPgUEeFQuw0qHOz3tQKIgVhrHpiMWfsqtMHSG63cOSWNfr5x++s8wZzqOoSBuQeeEXXl4GhhB5GhO+v2n8RMXf6Qjavyl8KoD0kjmdn6R1qMIvJVpQqZxBS+sgGxR61P5Wa9BlkZOXgE38IvyUbCGajXlfCOHXdXG9ltlYWo/TnbjkCcKXDkEhpol8tF/o6UAIlyjtXAiGYbZbBzNoE6wwQnkhGEUTwN45SP0Y6/DNJOeq2Bq5yC1SXDVzj119OgJBP5X/gYHB3dgWWEXOuN10Ik2nKVkvqZxF8pIrlQ+8fTw8JM7d+68PlOWbyLHnJGDD3ONyQ2ulqRRD+WHltzbbMpJJ9YaCI+GEwZHKKCq+Ugabhwp4TD3sFhYCbxFdDfWHXTjcNOtPyWHP/9+ObnvH2XbzW/El7ParScJPbo1wEgd41F2rCSJiXDGHTKUDk8wQ77SgOC+EH5E9bgBWIQbwgyOpyMArmlXfwyN4QaOyKFSM0bSAQ56LsI04l6C2dFH9dWHhiZe4AEUDTdcPhOmgV8Mt9CIQWKlp6hCu6xVQttgoHmhGx1Q9Up6XAkaGCf81tJ1KQVhWphAXYKiNiPBJSwFHwaMvwuazAKuic5V5kEclqwsn/w+NdsR+rS6hXGt1WqDWiXXAZFjRcUhZV0lQQGoolHOYKNsPRaGqfwRIwsKg8AS7qnt6r9RNrzwzXLqwb+QkzjMuAWfl8vi+koOw3RlhckBj0WKQrAqLB00jNCLWCMyj9IjGCB3KnrtwwND2h3bwVXoTH8w5sIzAcEJj/MBbpWiELWqAiM80iZuyog3F+ahFPhsOeab1qiRN2VPWw35eWJgqzsGeaDbjJtIiV9JdQWLRJ5ohbJR827GAFfpuRQF8aRVUhf8MjdU/cxQCN1rNnPKX7ncUJ7EZIUfkWj3oEwG34gr2otYBuNTxQ7xUHB4ogCtRwlwCjT2HkAPFZPlTK1R7DSOCppsQ5gharnEO7GUFonEbeUbBl4m89MjMvaN/6nLwJt234tJOyapuvKGZWywYtI0neqhO9WrmFdhimbIgYaYMBZA1wVNiKJ+OPP3/7d3pjF2Jdd9r/deN5duckiORrNQMyI5Q43Go82WZDmIDE0bgeTIEhLDsWPETj7kQz4FDpwPygLlUxLkg4EACeIE+WA4cqDAgS3AiCYGpDiBGCuaROuMlhlrxK2HQ87CvUk22et7+f3/p6rufa+bO3sZ2dX9blWdOnXq1Klzart1781utTKUpNraZUL2VHg7r2ShBP0kOyMpVwlXgIB8rVY7kBr187Q4MJ0muDubXEbkLFclCq1wFfAosAoRHtTS+jR4y5me2OvEs9GtpI0I3o6BtPlTnbRGyQ/stpNCJyauXJmd37FDZ8tDkBJDd5JnMrQ4U1abRFUg9S4WHWgOq4QVBmBQC74KDq1uOgjfDQSxYhhWCGiGAWIg2tvnM2GPveevwxdvPn/pi2I2PfzExzGWrV5MarSRcx7xZEfDB5gYKYbXxIwTCA1eBl/PG8o+FGkpEPDhJKIZUOEZ4jgX/VsUFcGdkLMJVA0lp1N/Kb5kpZu+ctoGtzEIKLniuZRMN3IaaLJxMVq+hCc8Z6lrkJrscnRRuhz7WxHY4OudGshN2X7xzJm5g5M7sAY7SZxRk29UL17yXW0titUKQBGKhLva6EHeFUaCgqvFK3w1HGDQjrVHNLbtRayoHP4UV7o+XN9b2Jr2f/BXPWc894Nngc2lR574q+z/77RyMKS4PGWXGzIW8xHwuEYTh/kDCe1pI9w0HFlaGVtBZR5Kd2QIkhEyDP7aPFjRzQFw8R7WEzypPSLkUmQPbadokMsJFYF4/IMRaabkYKap9lDcl4aqpBU5DMsYfsjtLT2CNDVcGSr1VQUvSZ3UV8vXZxT6i3yGlzfnhYEoMwIcNZIVBiA8nBoEXIn8ZkYS6NlIyOZmKuXIJMUljaW1xvIi/GC8+z78a+nk1sl0/lv/nRO/F9MjBz/FFvA7WJPQg1KFcsfX83gVgDMfEcxXVzXoG6GoQBjOECpcSS5VRUaibVwlDeG14k5rLk1KVeDI20QztVaexnAyLl68XUQjCe+/Na9ZjkbJNAJdVxywFs2G34xr61pNDpG7fWUFuymGkLUaQbQ+0SJrBp1EuQhJOOyl93ktvb+F7V0RpjhSkKz4IdCsMNlIrECkO9rCvZGRiJ7KbUaLQlMlUGLpxSBqOhyZ6S/MpW5/a3rnT/4y25tvS28c+r10ghuhbz/4a2nPQ+/xuiQeGTbHqhA/FZGVIqIBFbPFVa0MJSngxh+BGz/4anAIVbQIDEdrLOtnjsuDv4YFALAW8VaeBiHKIUk3BpfoJHRcTV+ItROeGzTy+przSo658CEehgwvMjSVqfEg377yBY5NMYJIkdfCWUMQWpx2qxpJccuMIP4OnVAsIZfftJFFHWmWecZxOLO6aqMUhPCNkg0h5s85L2U2jSbaOc6ujbZ/l2Zm0953fTw9/oufTf25i+nU1/9DOvXysz7yr8W7plvKr3sF5r8wHqSAA3V60OXqWoZ/k6vzRf6cyUWYqOlkWrmsAlfNDIrCFcWB2zYOYdg4SmajmFejC58k/WQEksUcT/WNTez2bhYLMjCqdYlaRnZJutgFvBWOoMsxbeLFj5yrb1b1+91iIJlyJrTO3poYCNvBNhAkcWa0Pqrt8oLW7qVBSv2j8Y2PBAPK1f8Zx/AmLFxjZolHGKANg5hQa5qCOa/BSi9xfJ/q1dSLu7znzqXd9z+V3v2p3067n/5kOvfdL6UT3/mtdObEc/Sqlz1VZI7IxDFoqFz9mdnqE5UzmMto8mrxyFEykaX8iXeBRafJGCFwKlwEcp6ClgsOFAGzA6C/cKJRQjrh0GNnj3cSXPwWZ+4+wAsvJmNXL+MbNWcwjZqXQCRmLxKKnGs/WQoTVkwvKDxwCbjn7PUGeqXOhru1mWIdqvV6Pepb4wifQ3B86ERCCytCNArnoTvWI+BLdiAYx2FPjipcFOsNRNKNxyUaLE+D1IMqxfSdI5cLTBlEVxdcWdA7gZ2ruQt8QnhyZzrw4V9Pe975U+m1b/9+OvXc76WZA0+mPY8+w/GLd/GtPn01VUal9w5DiTqIbKEdEQECFKG4qtTMQhtMWEyZSoYHf22kqGMbonCuSUWPQFHONvYQTHw7kavkxJ/eIzZz+rt+s/uOt/8EM2PWjnrbIX/GBU+uzUcTLny0cAp2ZG6qp3g1ECMFJgziygjSJGxAaG0MpGz+druMIEjBmiNpMJx2ef3O/AUrlVQkRK5rMQBCVjTnI1zgIlPCpKFDjqmxwHd+FSFDc4ygLUx0Mq4CGTeCjSLSIMpMsnxCvN518eqVtMQNxd1vezrt/MRn07lXv5NOv/Af06tf/VGa3Pd42rX3Z9PO+w/6E9m68ywF0wikBb0Ldf1MjuKCr4gVHkv5UWak6TocjxjXYXBGV5lNzoJk0HACeG3Edj7g5j3qPfPmC+nKyf+RdrzjmTTJ6Wdt85aWKoVJ3oWfJuyQaQVHDY7jKl/tU/kgLiJFDE01BoNej1uUG+/WxEAOZdF1+51zXsT6jBaVRTD6kPvywgX3SN0er5UUTEqJMrcNYKWRKH/gSKLWYy7DRkKKhY/E1Q5KtZFI0IFrHtwg0MoNFaNHxlGb4cRTfLJ4kK6dO8MJ5e3cVPwoo8cH0oVT30tnX3o2nfq//zlt5aUb9z368zzO+2TavnOvD2I2xkKHQBn6U/mm6ysX85ALy7DMjipR0Av2iA/F4aykB6DUqZ2hwoSics1T8SOfplWq88zp76fzR383dbdPpgff9QlY4UYesx21RynU9cnlN+ECyH6Q5yoX/CplaE7vSsQ9MaPFhZJ4eFCFbgK3JgZCvSwlXhR/hgOOWoW5WQCjizxpyFavhuweL6iLxS7JVoobGYmIQDaPCmEYoqwmkkhVpPLjCeKockQegw0kFSTTCiBxIZNbSpBdgKADrMvXXZfZ5bp6Wt9NQXH2fTS97bEPpstnj6Xzx7+eLnz/y+ls/8tp2yM70uSDP8szJvs5Mfygn6PQDUc/uWi6UhTxI8PRvy9Rooo2GwTwzYrimaUh3MhRMjhW+K1JCgA0SdNxyOU39eUrTRiG8i6wITFz+oU0c/yPtA+R9j/zT9J4dxePMVxhNOW8YBQAPZCDVCvc0C7llzKEXHhrSddoQQtZwEPbAV/mS5vxivd2wgaE19ZA+v0zqNcsFd5J3UKKapClsz6+ML51lxtMWhDCk/Cl5FZ5wuRUf6Kshgszwo1hSGptPKLkUWHFaAJXcUpxQeA7WzGUXHpWAnMToMxf0OzyeMvS3FWmXrMeUXZzlmv3Q0+n+ff/tXTpzJE08+q308WXvpTO0vdpZ3T7w0+nbbsPpm07Hk5btu9hN2gnHyXa7ntA/hyDmMl36lWH+Jcv7sRjwBwWyK4GiEV6G1JxMlBerjLYegKUuMqkjGV2qhbmLqSrF6fT5Te+mq6eeDXtfOpn0mPcNO0OJtL8zAW2eVGRLJeGH3Pk4vOlkZO4yvjGMh8Nh2rZmg6eH3vguMmQ66QFFkJlitVkHkJan8haGUhwP7vtbNqxcBaF21mFYgHNxlZvrSOCUq/ulgSISFY3EsGzUkvZQQydjwb3NABoMQyjgDM8mkhhwHdZaqDI62i+CKr/Nkysug4qH0PRiLJ09qpPvY5N7kgPvvMvpQd4UnHhw3+Lh8hOpctnjqXZ17+Tzn/vi3zKLKYW43sSz5+8O22ZZCq2/X5OD+/kHsMkPx5jZrqph800PdMRj5jyMO2RMtOlhx2Jo2z84ie4F2t2oZdApVKayxCQLDRK62yZXuCtLXY9Fr3AWzOvzRxPV998LjHjTROPvTPt+4XfTHv2vp934c6n+cuNcYicBeKApWPaGVrDjgcTxo9g5FaanGUaQfJpJNUIImiDR3stXtPbQjaBW1MDefnsy7MHdxx4k3oeoPqhy0SkoEve6o1wyEENSYq1GQjhlUYiuBpISqMrvgmXMBGDlKIEFZYVyq2lfAI7k4KmI880nd0XJTh7ubgs8yYCwgHC1EM94MKlGX4XmYqNp7HtE2n3g+9Nex55f+q/9xf84j0dhpy7fNqGM3cRw3nzK2nxbD7M5pJCnzmqlvSEsl7a1+MLX70tO6CJAWnU0VSNO9o6gaD7MR6BdBdPfMAFHLm+8nVDU3f/NY3VQcNlTlAvsTGyePX1tDhzLDHDNf5WviJw3xOfTrsf+wDP5x9g1NiSrp09y/F2ThbkkcN0hZ0LyJ5Ky6DAcDwswikRbNKUbmfxFXg2ELdEhqm9BoN5XtLwYz/Fkv6pe3hDAS271JgSa6fDN7s5tOj1h0DVFSMRAIGNGgmCNImhNKEi1Ky8YV/QMV3ws2FEnLLdDiQScJCEQI0GKoZiPsVGFAiu+BHAGAFXXKR6sfTUMfn5yzMcsOEONPdJeuNbmFbx4NHuPRyt11N5mJMfGkNxOUKul4Oro1jiW9+Lc7NM3y7zu0j4PJ/65vn+i8fT8tWZ1Nf7DZi2qTizIDZuwale+rHUS2O7dsDHk2nykb+Rtu9+R9q+62HWSQ/AI5925pvo8xdnMKDTjI76EldMq5o6q7Air+DA12oQpNYweJGoTCsdaWXdGf7wiZJoi87cjvkdZYq1ksY6QtZyBJHW8IXh/us8005LhWpaep0Jpig0PD1dnBgNoUe9JeCW0hJW08QCOoRfwmEYUgJJXaIlHc+5RdJGoJjSFXfIeMGNkEVdoFaZikcu4NkgDHLzZXznCrrG1oUVlxa05FWC5vhLTMVcZ0ExGvXMGmn0xN749vtSZ4emUVobmHHnk+Jou1iPpmo00CuL9By3T9U6rDj6o/SqmGSVEw9MyXgzpqdr2iTgg5NsiGzxmSpN3dRXLS/wBporV9M13iUg+hoNu+N5q1rb1BJQrWIJB8DXVrkND9E+NWNwNHJV7qATp7rpQxuXEzrXxh4am0+Mshvt1sxAphDxIWqH2h0driQK191Cj3iJufl82sqc2/cNQvcyqpQWAOIKu0KxpahSIpwbhHBR/LouyXluNppkNFGyHojLxlDMs9MElotWEz/mKoBOywgFpypNbmfgYTCRRVcr+2L+SGXBF7rqo/pJuWUw6lQwKPk6LNjjLSNsK6XOVpWpDkdZFFYArzhoSj42Mh0P0W9uKS3yJGecpJah8UCYhStDwjCgr7rppz/TcxUcywIwIGQhXJxTIxixnMeJ171EWzpZ64+gOIzdGVzlZerDQ8swxrrF1sxADuUq0BG9oiDCZJ2ZW5K582DpsqcZnAzMmKOepC1hcnV3H4ItRuLGtJGIuJpKipIVeLXRRBxYodpGUZpnFJZbvYwqYs08CD/XoaUMGSJGhYkL3h3KymRwucgASngV3y/Xple3U91MA5rxD7gGHC6lNUUJkl3hST4/ya/HCCYnqVnADgdEoAjVANEIBx+t9IxiSg5XQCCtelV9YtTQKBkupKHcCvHTI4wl8VaIBpk1uK6ZgcBrSKHTP9XnaCZNoykXlZX2EuwzB/dn3h64QbVCNs3iPfc+ULCxSXnIHUYTpG0bQCNdpQWNgi/ph5KPGoXYaMEUJW/kVpIpGEdJolNc0CPWaKgibZQh/JLPfi0goDXaUuxWUZmmsASVsjWkkU6FK9jiXpHAl+dEA3Ish9s4OZyxydLCr+GARbRJN9HrXSR/GwgBpohtuqwX6cN8GJRVl11U8nq01gG+lgYSIl5cPNkZ33IRdeGec5GspLSEgVzx9qNf2najypJN6laWMVJWQ7ISuWdT7+iGFyFCQ6MJxdlQwAmurFWhwlxr2yqf8gcg4AaAP6RuImgVFbbxS1Nm9IAORYx540tlJNBGokGzXFuJNSgeayRXI+IVWpoAMhU3Jw7HW/mUR1Gq04wiAWthibEbO+dv0dBxq9IRlJwhsk1jIOrV19Rt27PnTXr4k0WXXZgjvBOJ10+Wcz43ZMJCo/nUGm6R3CytxlZiEyU9x6PRFVdexQJS4kpwkhmIfAbkomoOEW8QnVrS7JfkgmNfwPxTZoUrkVa84LSSo7ihEshZENpk2jjA5TK9SFGJuSyXH/GACdcZMk7OGzHI5HxCUQeR85uCkgTPVwdv8VJe+1Oer6k0cg9IOX5UG3JhLrdIdy3Q1tJAJL+Ov1w1SHzezd1HlqnHgzRgBFnko/EGRspN6uhmDT0rzUOjDTdc4AQhiMY/ngooEcXiL8CCV4hTXIgVpJWt5DK80Ir0aOQoo1Aa8gt9F0VKjQ9hlRIKUfwcNGlnbvIGp7noSIt6BMjXUgeTibLIlhFy2YW2E0iqcRWuuPh1SLGhsKC344JWXpyzQ+fp9iiBQac8qj2asu7xtTSQNJWmfIag3xkccc3qHAkxa6G+zN4/N7I8J73lviJat91goh1G4lZUxPGIcRVy/AszftULJRGNSIqEnCx1yPj4mU5FdWrkd/lOF16h1fKVyU6JI241/EzLClXLCdLO7TxchOf0UmyGZV5LqusRkYwfNTOvcfG1LUfXzPRVoujyLxoZX6Hbd1DNNP3VYy9Nh6nQmeo7eXK3rBWBfu+va2og5Z0nnIH6geuq1bYdI4juAvMKIL1ITnv8kX47FZSghxss4m7BXEw0RkAC2TikqvHd0NUTJKCRFPiBWbFznpzWEHN5TbTQavkkWtlX83PJLezKQhCOYmuFRcN/roFxmzTniPy6NkyZSMkXCFF5X42nUDgrcY2Si3BEK7Cg3obPGs/3eGIEGfi4lVQw08z6wRTsnIhO6bLBbi0X6XoqxDtZHJI7yoY8NtDayfIIwiKdeyFLHIkY48bW7Ys+N5kWzHWlrUaQAUqyxR6lFoT9Tx5naxbkxiq2S2INkqGSzdy106LtTLm2cUaLpFJ+i5Wc0HhDlR6KBE4GDaesCiwcDuUrEeeoRCIQsAo0aundSz4RbWEH+G6u2tpV+5gwNztHTvKKNHueZQS5m5LuSd41NRA4tGw7S53Dg7EBR+ISx/Xy9i9bvXrbO9+bZprFOkT3Q7I+337N1MNF5mIoEad4G4XSoqWDIe1ARVxlhfE4JVioVtA2FmGuNBhliJyRrmvj2jQb6GqhhsZoak5ZBSFArYRWUFzVqAM1FnANCS1n7AqKQINSE1o5bjMoEshKTz9YvLqB6acUhyYx2ukV67wNx/OPe1DwbfI5gj7E3UjaPYseOXXkNT4wd1gLdVdflN3Fs0jjdKlGEL2fyhK841IlSxkKV4vVF4GIK5zjok9csAZipIwrL/4CkLOaREkpfjst6LpwlVd+lVrJs7rfFN7Kaxq5jFpUkz/KqAkO1FTzK1AJuASimT5J4chRyrFEFM/Zcrxg3q3vbkozCbMkX23emmLl9yoxuciftjLm3RZ7V/nX2kAkCi3U9X6Dl2Ug6kTMsVoh8YpPjpzokJ8W67HT5dS7uFj6uZEjrBaJRg/1qcQB2lBAE2ZuObwAhFfyZFrZi0aOtNWvuZQh/KaIyD8SH4qupFr4qnlzoGLWsmqgsOl6On9li1yuvwCB7/oq2BSgyD1zGql1/k7Od9G1Bom5sEFcNKNdXO50NNvYFG6tDSRNlWGhM/iOa1zmQjRCfBNbZ6+X0wKnW2UosqB7467T6IBDMawJuSgDAw4kUnQNOAn6z2oT6lhirYQKCsSqtkRv/S/o1cJaNDM/Q7RINlj47fSczUwXeFS11l3gYLQWWeKBeY+vtKvmDz5GI6PAUAYeQdoNrins4HJnrrNpRpC1XoNooR5NMeh914NHeT2hwDx+O+BFcpqLLvOMgw4v6ok7t1hbbnfVVi4ekkGwrFHcXFYqiMfIFqVkmHOpISM7aRi0wpkvr1uUw/GKVJKV0sqrSM6o4ApX8gunhNuhnKEm1UClVCGlTjUl0xmCB3YDqrlbue59UKXECIKp+Pw+u5ec7HZ7k+bBZJAubNuz7UJ67d6XfycU19xAJBMxttxZ/jPOpr5JH/EQ/algBLVQ53MI3DDs8FzCAnfWxzGQukZWxnvmilKEorYNRQ1UVMSNVJTZGgSbARzhJOfQVFopVf9roAUTQilB4es5cIbQhiJDmWpKo+VD6SK0MilyNfBKZSTv2kQ1eslAkKg7xVCNKq9ghm/McHOZryParS+Dq1R7PQxElexMT0+/cXD/4y+hmA9xvD3eTuaW0uOrF1Nv8uG0qIeImJf2OA4/oimrsH6noJB5GVFUTqP/NJyTA2f2Kg8kwGp5DFbPrvT8OCzPdOg4OhllPJ6n4ksBwpUyQCkgJVRdyGi36FUSDugiQhVaqdjMV4AzAK9JakI185oHJB+eY9E2r59J0QIdV1hBeD7i3/dTINGBNqmBuwHX9TCQNBUf3lmi//gmM6yfQ6uyWLQO4dU/89wXYv3Bk9MeRSa26yM2SOMOFerW5FhahlZYMf0SjFGPqZ+2oNuMaIaonwxEBmOj4Qk8G44eiaXxw3h0pJ0KqA4tfa5jVTWmwm2pbMPXUMaCZr/grDZKCKGkRz0iawOL+DpeKVqdkG4I60ahHtriC0YwoK4l85V1ot/pl7dxKhFr2li3LgZSPqNFb/s1yYP/eAeBQlqHLJ5jzXaNJ9omMZAraSsf+Vz5pOFaCioaKXS2pagA4uUJBRY8qJGXeehI3/tuRg0pgUYUGRCP2+rpQRkQxmMjysZU6QnXlgNNy0Q8BB8qJeg2cXFgO25AQstuGNjY3jC8YG+MHztY4o2xxO3tN2OPMjMYvCoQnWoHvRlNXff4uhgItdJ4kLqLi9/u98bO09gcfTeMoB4B5T1ZvI60h2H4I/Pzl9LExP3rMIqIq1EnpVJjMqK5t2unR1qsScJo1DMOO82zeWrPvWWjoI3xaOSRAYXh6Gk+xWVEZXQKXBHWDxr+D7/EVaaoZwxFsxN0EzomDRqRLTtuEvLQPcxL/TK/eRhnmvWKud8ExiE+1stA3JY/Onny1MH9B77NTcOP89hnHmuVxCO482fTYPIRT1HmGUW28FuidB0AABTSSURBVC31HsdPPNeRFqyXM6eaDmgbUiy2pgHmITfodfnRKBIMr248ep6cR2Bbb7UpBlFGn/aIE8bD9gbKFOnQzvKIiWrhJ/slWvhbT9mVMkd9eNCIqM5PzPtdxmzO6PNr2WEevGZQI/ag87pgh6rlZIwN8tbLQNIUQwWV5i7R4CsI6eO0dm5KlJB3QvXn3mRn40k6FYwCBbrG2z128HbCogzrJh/rH1+eyiNAo+TSNLF8M1+cXg/vZsajgVZTt/m0kKWj4rQNIOPwugdDKUbjKZyeW6/GAx72HNMYTWQKL5nY9dgy3lpeNCKzlY9MVY/+EobSZ6OK6XXIylJlSzOxTl1+LXNSJLCWjN2U9roZyKGYUomhr/DOI1W+VbaeUWcdwquAemPbLMTFxbk0z6cGtm3bhXDVkyvr+jgtpJcov4wEUWppr7v1r1cHGY/SoqKj9a3rnqReOBbnBd/GYwMq78vK6x9P3YoBZeOEPP20S4mnLEt9rsfXXcIhLzlq9NC0VS+xGNABDPrIV5/hgxs5ccQa61xnbPykASUhRzbKaynpmrNgSTCEvEAzvog83suQql0KzWGQEO+/nTvNi9PiGXX1khpF9LqacYxGZ1VGlcb57vklFpO6aTlsIFJcVWGtfFXkevRDyaJs4Skeflzpd1G+ZUZeOS/wSZfSefTxjhtG4x22svaR4WhUGre/ZvpoPulwvBsYPA28gyVeayVks6rTySNHjmyak7ySZSinQmvv1Po97ofQdQz+JCufF+8aXPQyuf611xhJ2ocWO+nq1XNueNYtnjqsJZtlaqKdNB+JcAParil2I32VfaMfhoB8pPCh9GEMCutGjOoiBV3gDYvX5mbSLDK9wgdyLl1+I83RCdmV6kXsnl612aHyxY9G5wHPAYXq5UKxaPM/GJwgoXSaa8jRrVdvPQ2kcoU8nnUvFwcZQxA+dnKWxTrn1LRP7hGD3pxBZnb2tHtICVFKvCYOuqKvebI2CXwv45YKKr2g/NGfCLTT23GF5a6XfjvwIpTV/FWMx+uWMKbF236iM7i+pavZ0fRq3nKVfLU12efkRKw/MpVyD2QwOJIhG6KXq9VpvRnxiNEZH3+OjuQHCEzl51bF02eir54CorutYlfTKu60M3W4MvumBV0Vt+jCarW6E1jWx2u87Vzz/WBAhShBbMpv/4jagSM0We6KX4ELUUhyxY9YEy/w4pf04hf4nfjKs/InhdV29BL3oHweoJAuRd4DX5M8nZCIDpEOjtEsLV2iXZv1B4kh/Q5Tb9zUPSj3XpFYbwNRE4wxz5wn8EfuUerinWlWdzvb4ydYrKuHKVuAYSSaJlxhJJljiqC29rEEKywU76Jhy4ikhtSaZ5FpSGO3alC2e72o1LYvjVsyyGg8hYFPeuQb/zLuCkMbaUbVo/4IOFz8261n6NywURcDb5fb8WYIE7FAbSfdbVgGyPESGYjbmviAd1IPMJBoX1UQx91TDIh+iSdPcYeqTii2sW49F+mlprHuGOv+wWC5/xmA2/jlLpsG5MNCy7wvtqvv/0l+GpYJhDEN0lV6eM2lt/IE4hiL97jBFqi+ZpmT6foNXnAg3eWevnq3q9fOM7XiA53FMIXD4nZ59rW0dPF5ZgRvY5dF0xVEln/x1VvtHAnGorf4oqFfnso4jDHZ8GxUoajutV2/zKzCSrqRqwYqpFKRkqEVr3gtWEFzGbpE56M3yyzwEr+t4ztXuTlaMt2er+K1bpznAOoyRhLvPkPWfqyBTmhsN8VbFRg+JJR0ut/tlynWKkzfXvn3CnujDKR79OjRHxzcd+B/IsRPs42rVToahdfjG4azR1Nvxzs5eqKj72FPoQyoFGi6IzvL2897hGUk2uXS9rB2vvQ9jRixi4yLX0QWShjqwYcoaDAtXLVrJdrhyGMl0pGIWehxbkiPBzOCuKe18sGXeRN/KoOf4M6nSxk1wlh8U6wYlw1JN/7C2OwDKwYXhqU0GRU+hiqjbAysZWwUGCMeZdrY5FN8NTzCo858i2chCrWb5q7N8F4APrOg0bDWw8l3dPH0DcNwp+ORM8gMFvVGH8kqynbIwc6R6enj+lSGnJjbFG4jDEQVzy0z+B1a/9NIo9WcOgLPt9SvnEzdPU+GqJwqmYXc1KAioK1f9Xzz/KTcPV6ErW1hnQbusd8u5YqRJ4pTwVJyz7t1EJF7HTIMuTCOkXaB/kDfdO9okIttUSNHgzrYXADWYjIde4UmvqdobG9yGyj+WkZWlbZ0CA1lG5sNLhubDFk32fCLkXlUk5Flo+MV8hH2KCZjU+eh5qaT4UjP0D0I5KvNkGt0OpO6OXuXTvYlm1bHo/VjlS111Mnt1Fp/ILI+bdRjp4s337iBqdzGH1IsItgoA2EynxJdxh8zinybhfeHmOYIhlg1iuzCQH7IKLLXBxjRaIQq7ZOyNX4oPw0PVGnaStQNxrC26FnDmAoGakkj+Qc+GOBSpF1R5BwlbaDDiEsz4JQ7vm2cdvg6JAqp4psx8aKSswtmS6wAW/F2OSWMT++sj4ZUQ5NsbGQyOuHJ0IqxKU6J3ik8ncYf+GQav+8AyYg8y1VyWNCBUaaa2/n6leSp/4ZRwrfgbByixTpSN3qrcUBID8YNFs5TJKclCm95gc4Rk2+K/BQlHlJgk7iNMhBVXz3FEndz/x3z08/xmn5NiLNYNE2ih585mra87f0ZptaSG/UDqpaUwVQSRmVCZLsreSK9jECRs6QVOvgC0QVqO1InjWWwtUEDra19Aak7MYpWLkqFAqdeXWZOW6X8inejANmzcddCarHtfMIrcYV5D8A8vbiMyfBSPi9nYpSRUsvoJmQk0NP6bFWyhWTxMxntMmraqjWd11hKV5rkiQEOlvm0W1efrLTxivgYM2zmrr3nhXpoRNCCbaQr3edG8GAJbZuc/n0a4QV2pcaQo2HyOvqe+uyfpaVrpxEuduwGqC0NvyVcfFUht1Lxadkwmpizx4gjfOGVX8k/6jPOX3sDvAInGE43tXocZx/nw0DjKET8er0xjlGMkcSv08s/yZefNVnhSow6ayjTF3A0cjIctH4ZDoeSR/kVhlu++utWtKKWLPIhryL809N8PF6wcMa9eYsd8MQa+sqUTPeBrlzh3hM9fmyrZ7ZVlFzbL8Vb1jFyzPL9Qw9itqyCTEU0vdLI1xKD2oTf4fn+/Eum3VDP0Y31NnIEkeR6L76YFg4eSP+KG75/4JciWagSihprZ1o6/zzTrI/Fgn1oqlUEfzP/ZgIeya+WRZ/7rGv6s8cZPfT9EimaW67PpgJbkul/cbDji2jBozTvDjjdgQpN0O6T8ll/TrAInaAnBtaZALadPJpXyHjcKWn3rKUoIj/sYEM9edupN285RfTTUoyiudYDoC0sG6iMNDtGEJ17W+aG7Binp9vTrMCIkURrM9170m7hlvx8jpTZPIl1OXzqT0BHXViQz8/YuFSkcIO9wJOB9jlKFOu5kCcpXn9Qr2+cPHlS3wTZVOsP+GkfGFR03Z16z+6R48f/kGPwX6YH/nmGW53GiyGDIX/Aqc/F899LW97+YYROO1sbWsLPDeTWsr6UtNv1W3WncZcuv+KyOz22m7OBiKIcs4V/fvj49J9GbNVr7+DBg2NMG7dRn+1b+v2J5cH4RG8Mv9+f7HLijKnlBIPIJCrCirmvQvgmduc+FGuCnTgZ1yRsTDJz49OeGBqGhzLqDQfbGcJ45HKgUWoVYxsyItCgpNEqBISnDUM+gXf5OB8cfTtQkWjnCbkF6UG6xrM52qod45S1dgzjkWMXa2PRF7P0yiZ9wUpHSmLNAckhmrnDmX+T4rThkcvL01I4/Ipy4IqII7YJrhs5ggxVv7/U+QyTrGcAtu6LaMGODs2/mhbObfV6JJ5bxq7cQxUjEKnSyHfqQ0t6xOG9ZT5muXz5B5TdGAdUPXpQ0NcPHz/+tQ996EPjO3fudGH5iUmFy2+Zm6Eyfm2RcWfzjp0q2JWxLS0tbUeRto9jbP2xsUm62glGoUmGD379ic6gO9Hp9HfKyKgFi6b+LmQ0Dvx9iOqDjZHAoh4vmH+FVyM/msZ27gOVPqkaiqogJz+21RXWDdQFPjoaI0PRYxufm0IG1SzITcD53aExWvbnz1MON4DH+LSuZ5UQZf0BX5c6y8tfzTkks03lSk03lKmpqakxlGzpiX0HPkOj/1YzimS2NJIsz6TutgNpy/3vY52p+yPIUqOJnGvRrko0rho2Em/BFy2MQ082LpxWeylPq3dlXaA1Bjb0t4+8cuy/kHij6UCbGVDtCqz6UzlB3qEIq1A5+eVnwJ1ennj0iYNsoj6PKpe5Yikf8S2mrQ9OcVNW9sTaoBqJShNaYadmuQkbwm/nE7qmZbxr4PQ3Wftwm8M7WK7aMpszWnf+yZHp459YJaMyb7hTI2+444SvpgDdCzMXv3b/7t0fZGH4ND2LplqZPy3amdYvnqF3R8jc0JKRxI21GO6HjeVGVRppbLcpMDYCtLuzcPb/oRd6458GVyXKwzh8yz79HxrzHwIREfF8O85aQYbi96ehUX7ARa+k5YKBRFkqr/1TpUtc4e4UUtmP79/UVPenp6c7nfe8Z/zloy+fuX/3nr1sKHwEmWqFnAWm1QP3Ja6dQZwPU12WSOp0bCRg3dCpaLk2mwEZuiqZRb/kujTzAqSZLZY8WCyzAZ4iTP+Gdv/GFGPL9O3LFHpr60pN17aUW6Ouhus/+uij928dG3+OyLuZPujsu25CZAeUNh70ORKyZS8z+UeZLTzA9v5kGIuwPKpk3b1R+7nm0NNUDcVYmn09LV34DgSI+75H1X9R0cxC937/8uHp6a8Tl+FuuukAPI06y3Tfvn2PjHe6z2MgD4EgvgW35weXxu5jjfcRBlC2Xz2SKE0CctXv3FdbYHAL575Hx3aYYBnETJiJV+dCv9f5yWPHjp1oFUhw87jcQ28KhtQavUuXLl19cNeuP2Z745eY17IZ3x5JQuAaTdhi4vmRabaCT7A7chG7Ybpf1qK6a8xPq2k10Ko/CvMbHelBFy+8yJrje6BBV/lKLxdiWWZLt0eH91lubP5XTQcZ8d4KxiHuJdOxmZmZS/fft+eNbq/7S2wcaJWeDUTBLcjyKnI8Rb+wm7vsUmKclVsBGcrtOvJ4PRej8uLFb7WNQ7T7iFQPh3zh6PTxz0FdQq890u2Wtpb4d1L7teQnTaWpsUOJ9YjmzmP9L9N1P06baiTRnKfFr4JqZ+TKQDPgq7lK7vTYFOIgXGf8Pnx2WXnxQzliASJ4Op07x1pjJu4HsOWZMAw9sDUyKEi5lpiabEFXPnd4+tjfJZ4LJPTWclLA5Sf2H/i3vU73H/D04cqRmdsw2jEcu++nvHCX3DzlqoaiChfxSzQKj/rCweWRQ7dzFk5/A1mfpg20yy18O91L6vLmpGeOv3r8T4GYv5y2qbxS403FVFm079+//+HeoPP5XrfzV9geFY9lXTLCt6IFpPtvtL93izXllivpNJB6Nk2r6Dljy1F2J9q18ZRBRAasyXWX9wtHXjn+qxlJhIYQhfwWcJVvjvY8y0bIp5HniJGEjHQOrjP+UBrb9RRrE6avbFxY4d0R5ZoKdTVXJMO6Q899LF54iZHph9Cod85Fi/Ucmx2p/yVG5E9CZlN3Oter6mrVX29Y7VUO7t//j9Hof0qvswu9RfiaKOPqVKFaR+YxGhuEHC8t50wtmI0ux+0JUdMn3R3HEga/zT2a38gIm7ohM4838sw/nc42jjH+N254fgIjWdnhaIqJ7QzYku1uYY23Yx+7hw+wh8Hue5mZaYQY7SfU6VjeqD6PDSxe/CFT31c8ortTCs7cEBo9QH+G7fJNPXqI5aJBwf7mu6pR3Rrv3rfvAN+N+A1if5Pdj3eIVU2naSvAHgKEW1pJybfsKKBPRllLGEZf38jr/iO2c383E7Fy3TLBzYvoeugezsz58/+J+92/jpFQ/Q6dwkAdUnZIQ8agh5swFJ1F62x9mO1gDMUngcu0VeTkaAcd7OT0wTKvb1qePUZDQJYH4EKsRtJlUVNWivwdRuW/R7x2ghVjkwU2u4FIXJ0pBHkoziqlJ/fufWBpfPwT7KH/ImnP0Bv5fLZHFvdsVvRYRHOnVpPddiVlbflICwMEG1NxbspYjEyzQD7fWVz8l0dOnToJqhpwxfwL2FvZVWPnvtM/Qzj/QpVBfitHE/U3MhTWEtrtSnouhh0+b2bojrh3+8is2RrrlwEbJ9oej90qSX1ohF5i4BhH6IcX+8s/c+LEiQsgCElNsmldW3c2LZOZMTWs+K07SPtZo9Dlf3R5efBzvU76CJJ+ivSd1SQA0CA5e+NhFUEJEG+a1wm+F7GtL473Op//4bFjPxLm1FTi5qUPEDYZf3xCkqUEM2D6OoX/71HepzUi41YxFIHJoq7GnRB4umdSZas0+hIbk8gOGYYyL9ImbJelM0xcP/aj6ekfElbnU9uS8KZ0byUDKQIUz6Vnb7dE7+Bjj+1n+vUUTfRuRo4nMYRHQN7DmQYOEfIZURqENp6ljc+x0/gqBym+Oxh0nz964uj3oalFq5xor9rKTv0xupTNkL17905MbNnC48+d32RxsLtuiMQIK2NaRU9GQRLZiNM2Fk4nELinNd3pL3/qyIkTL03lncoR7E0ZHa3lpmTyBkyJ/+6vcPnDG/dGUno1tFqx3fURDTfFNvKh6PraRpdTf6y92pM/xZDMPEjrvL9Dj/92DRY+56g78HFS+DrG0pZPR8OL5MzmI0MKPRKj9BcGY92/z2PWp4tRtnNs5vBb3UBGZWuDmaLHO9SMAqt0be4RuxlPBiGc1fAA/7lwnSkU+lBe5z322GN7t/V6v8zZgV9hTfbTGItuYmidYilp8eaogLisRLoz7oimuDqDT+x/M9v610dOHH82MN8a06rMq71ctzboxzLcruefZ0O4WeN2pxhpD2VDEfLjjz/+vu7y4GNsd3wUA/gJjGQf4F0YgZ9oEU5YC9OpTucsQ8yPMKCvcRfp2aOvHH1O6TiNPHJvudG5rThRhb+4/oUEYlAoU6/aoWh6dPLw4Yf7W7c+wlNjuzEWPaeCXXSu9pe75zk196qmUS0BSr9kHJt+Md7ieSj4/wFb+gcGoEhIagAAAABJRU5ErkJggg==';
+    private static $wave = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAC4jAAAuIwF4pT92AAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgpMwidZAABAAElEQVR4Aey9CZylSVUveO6S+77UvmVWVXd10xtNL4DNkgjS6gAqiiPK8hQeLqD4nOcbHfyp6O/xc97D0acyjxGdJ4oOiIqIvpbNLmm6Wexumoam6epasvY1s3Lf7jb//zlx4vvuzVtVmVWZWdVNR+b9IuLEOSciTsSJ/YsvI985JoOsZvGjXcKvgt8ic9NNNzXOj4x0lVpaehHYlSllOrLZcjuQmzPlTKNkMg0gzVYqkslmM8VKplIE3jx+c5VydqqcLU9VKpUJ+MeKxeL4sWPH5uCuGxfgNNkh/PYaTlnMXAw/oDxnrYUEWFmerYZ5ywwNDWX37t27SCEGBga6s9nsbtT0nZWyXJfJyPWZTGYzKvcGVP5+1Ndu0DcBljUh4XkRaYFO5QiblXwBikQlOQ/6c5mKnClXSsfhPpCpZI+UynI025Qd3r9//whwXCmUPjxyQ4htr4WR8XMKEwSz1tZFinytk7Ji8bGX4I8tezSDg4M7oAy3I8MvQt27HQE3ojJvhpLkIhIcoZ7DlbFaWdEKrBU0I6jq0SROoIBtQLG4TZegdTRQjEBFG9jlcgnAc/AdhPcgeqHHs5XsE+iBvr1119bDUOiqtIMoO2S9DJWJESWRw/OcWT0JeMmtXgxrw5n5oFKw4miLfMcd0jA+MnBHpZL5HlTQV6Bhvz2byXSjYgIFlR+YGCXBLSU8QVORSrkIDYC3UshUKux0UE8rRUOOeoJoMuEnebCjfuUBUze4osPJZL0CgyliyVTKcGjqkA4kg70SEoKIXXm0B6rIFAD7QPMEkvQVuB/JTU098dS5c5NMaMq4UrvCpIKec66kBLSGrCTDNebF9LOyxBZ3944dt1ck+3pUyteibt6KDkIrOJUBP9b+cqW8kCmXZ7NSnkBd5GgI9TXbJdlcp2Ry7bBbYTfBbkINziEcUVAp1LCil8ClrLTl0gK8c/jN4jeN3mEKdZt8oWDUgUw7SMEvQ16YviBhxoZ1G3qjyqm6g4RCu5TGigU9TQWuQ6B5BAO3B6DsXyrnyt8cHh7mvMZNdijpXbRx8IDn7CuXgJXElfNZaw6ZISjG3qAYe/bs6SguLPwQEvGWTCXzMtSxBushsqxgxUp5LlMujWUr5SnoQrvkGrdIrnm9NDT1wt2FH2D5ZigE5uBZ9gSsyFnYFA9+9s8+gE5UfjzUxw4CHtTeSrkAd1HKpYKUi3NSKs5KaWFKSoVJKc6fh3tEyoUzwJsAXyhbFp1Ztg2/RudKPmRG7l7R80gDDSNkMLu0p5CpL2LB4HPzleJDR48ePaGB9nC5LJpzpXCecy5DAib5ZRBcA6gYz1iPsWvXrvWZUuVtqDlvw5LSLqYNbS7qT6ZYLs1my6VTqFpZdAa7paFtuzS2bZSG5h7JN7RBGZpROdEzaJUnZajsdIbKr073Rk9wRMm5AzZiU1+o0GTDKQyGblCceSgLlWZSClCY4uyIFOdOwn8S4VAa9jLZHvyalY+mQRWGSpNhd8XuKGf6YnEi+BwifBC94n3lYvHzB44d259KJrs8/p5TlpRQluv00l0u3dXA9zFOeefOnVh+rbwLc+Z3ZTPZjdqKZ/LoKVARi2dyUpmVfMvN0tS5W5raN0MpuqEQLdZyI+W20IRGWiswG2xXE1Zy9V7eQ1npbCPQs07TyQfd5M8RHyMuQWnmpLgwLYW581KYOYvfcSjNMBRmHIrSiTRjIU17GJDrnEgJQZwpw4XhmOSwyMAIyJPzlC+jM/uUNGTvO3DgQFpZ2BLQsGfSVKrvucclJXAl1eGSzFcKAUu1eV/Z2TUw8FaM4n8DPcZgUIwC5gHZSvEIuopN0tx9q7R07ZTGln7JYtjEiqkKwWGQ1g1v5VcqdUvkQ51QVD5dcVLDONTdUhG9DIZlC+hdFmZOSGH6MIZnB5Qqm1uP6VCr0kKDYOsojN2eOqB4eWoMNIugScjoC5hz/V2DlO578vDhk8rEHuyBI4MU/DlnHQlc6woSe43d27c/r5LJ/Tdszr3K6kS+gDF/rrwwnMk27ZTWvjugGIOSb+pC9WMlwchClUKrIx/XnlGNSaktKrjOT4JSl4vTsjA3JgvTp2R+chjDsm8jTzNQlI34tSE/yJT1LJa3SgbLxzqHaUj1LGcReB8mYB9byGT+JTXBf65XWUKNuBarjSebBcjxs+zaPvjzqPO/A21pxVAcu9fZTLlwHD1Gn7St+y5p7dmFeUUnWmg0jFxdwp9PbJ3ZM8bWngbpZ+XXhQK2EcgZVssK82MyP31S5icOond5CmDMXdBrmrIQLU43qnsWDMNsWIfl44z8NTj+9b7hYWhbNOxVInGEPudgKVx7ZggbC3sxEd/Tj9Wp9vn/B/OMN2LJE/Ulj+HUbL5SPCUt/fdKR/8t6DG6bZShlYOV6trLz2WnqEpZkt6lXIayYN4yP3VC5sb3S3HmceQb4exZslhOhkKZsmjM7KdKeKDz1Uk+OtbKNDToM2hn/kxyuU9jR59HZWieG36ZHOLzmqtOPt/ARHw7pqKfQqHeiu2AAjbiMJw6msk175LOzS+X5o6t0AXuSmNUQa245nISZbxyDleY2LNkdHWMc5a5iSPoWZ6U0tw+LID32gSfy8lJr8J0cDWM3WueQzCd8kvlGxDjn+fLxb96Klky9uGX9uArl4FnHqdrqloNhZ4DynF9tlz5HBK3DYuc2MnLNpQwWW3t/z7p3HgH9izaoBi2N8h56XekQe1m18A5i+3m4wxAYRpDsNMyi15lfgK9SnkM7coW61WSiT3FZb0KVsLQrXDpmHpzFtC/BtGf7j98+GtBphzfUcLfsYpyLVUvnXMMwGB37AEU1lY0ddimLjeUC8ekc+uPSVvvjVpunIA/Y+cYoeatpKXzC/ajoWehfDgEm5s4LLNjT0hp9kkMv9ZBWboQLbuhqvpe06tUsPhR+UcshHzg4JEjn0+lk+XD1S8q13eMuVYUhOmobNiwoa29pfUhtIm3oiR4hqMBO+DSs+PHsEI1AK/1Gt8Rw6nLqYKs+/hj42G9Cpr+4ozMTZ2U2fPfloXJfwPXPJa/N6BfQH2vHn5pr0IEdiumdPKv2Hb9w6cPH/x7wFWr3iBvyH1cPv4doyjXioJo77F7cPADWcn+XImzUJGGcnFEegbfJC2d23UV57leA1JZotHFXuB6r1LGUZjC7DmZOf+0zI19DbpxBoqyzTYi9ZWW2DHYChiEzUk9R1hQlodxQOGPoCEfSy0Tf0esfF0LCsJxbvm6gYEXou37EgoDVi5TWhhGz/GTuoTL803PKccSNaMOmopUe5U8+pcyduvHME85KDOjjwnndtkGLHhkW9CjsIeOigKnjcWwKcszYVSUb+DAyx/OFwofwYtgsyEqKkro2utE/gwHseW+2oYKUunt6vlVNFl3YwmmWF44km3f8Dos496Myfi1rhxsY1b6t7JF4o2LbZ5Cwg2t0owjOM3d10uuaTuUZAyrX9gWyfA8GE8f0EBRQvcDVxkFUQafTehVXpvP5n6wt6d7obO7+1tjY2Ps7WlYl1LapbBn/ONq9yCMX+ceHS2tWDnJXIfRVSmb78r27/ohPVCIZsvq31UXdbWo1FcNukQKHXnpdciHSdWMl05fTZfyKQvKlUf5szZPmTgq0yOPYQPyMQy9wuZj9coXa38ZcxLs00rSo0jldw8MD/8luLMXedatenmppaS3pk6de1y/fecry9nK5yqSw4bxfunY9KOZzvW3X+XeIxENRhd1TF1gHbwrBbE2My6t1cqsWnES+LJjAqlN6m2pmCeO5yahKOcek4WpR4KitAOpeugFMigKzjT40KtceRjLAr+DyfzfhjR4b8LJ/DPaXO0hFuMvd3d3/ixWTu5BRcCJ3Plcx4aXS76xjWNetHBrJV9GZD8OSRiv/xxebRu64RB/pX4xGSHjLoB0+pK0IdZagkC3BEvziAcVBdMNHv9vbO3HiuEuaWjdhaHXNM5/fRNwvrfCoZcpI8mQYZ074sWxMobGW/H70d7u7ld09fQcx7BrP5GHsCI2DAeMEZr7GfWkdK+2yWP16svone8oF2dKuaZN2f6dr0OBcO632nJNss+Knpgqj4GpAAnCJVzEZNqXa1+Mrbb1YFtPJgmsOjiBX4xzOswapaRHmcUO/fTZR3Cc5et4IbL+ZB6xaI+CRi5vMVb+Hun8bWw4PkreQ7YBjEWwVS9QRreiZullvqLRKjNtga4fHLwNu+VfxfCqobRwsNK+4QczXRvv1J1yn1yufNShslflvsqjdfuSKlGtVctQoPo5WlSdq2v7IiKqzOIql3BJyBPYIiYXAERFQa/CtyNnxw9DUb6KHuVJvIG5A/LBW5c69Eox0G4IXQvecwZ9AQh/IoX8+/Yf338sYD3jVryu2hBrCKsewxxedfb8KPalXiM4ql0un892bHiFHlnnkfaVVRAqAKs8/sypfmvlAeA/ewn/EZA2JPIwt6s5pLBJu5yfkS6i8HhC3JZw4hKTz1R6DRTCjJPlxfCS9CjpJR8u+wrOuqFjkKa29Rh67dYlYb7YVS4cwhy/B2xZ58NUw4ZduKICRLbheBeuAXgrVrxyza2tj05OTvJQpE/kl6+1l0z1yiMwsVfF7A1SzWYrr2DhVSrzUIzdksfbfyurHF5ZEIs6zW8VhrBQyUKli8IIlTIJdwpipHikK290k+/SfsaqDnI6jnSMYEzeMQImR01aWYjgxnh7epK0e/jFbVUUdEXci+JbmR3rbpH+3Tj2s+H1OAU0A0VB56D7iam2NhwOw/SkAC3og968r7Wx6eHd2wffgNioTWUeSoWdTujFE3KVQq9WAhlvZevWrb3NuQYMbnNbS4XT5eaeF2d6tr4cIZDhFafMGGhlUuGmGLKS1RP4heDEriGo9lb76rFeHixpXBNX4KCARVAbadUJWzwMM9rLGn6B1Fa9bHm4MDcqUyPfktmRvZBPI1a9+qzsvEexJDPCEhStgVLCwa9/xgrYe2rmJ9fsRmNK7S03a/RkvJWN/f33QHrvwqFSHM49hZefXpJpal2HHuRKDiOyGKyVNeUwP/OV7g3oV0Ol8J/DVBtARwYaRo78JX8OMRwNjKBqGHkwPG27u5bO/UqgniRGuoyN8UpwAI5h2uIzrmCUXvPgMKPT5MAZuDr6xW3ik5DahTLK4fKL5s5t0tRxg5RwoVJh+lGEN2GBhe+kRMMIcVEYWj0MDTA9uR5cfgobw12tHe0PPz4xMY1w4lyT5qoMsdC9qkDQBd+Dl6EgmEopm+vJNLagBdK28HLkRRoUNyz+TObGxxWAUDOGpHAHsYyc2J3kR7j/Uk4DWfjiJyn8z91p292Os9i2tHjUTBATagmI2DE9DHdPwIp5IdxMtRwCvpMG3o57UVtJ8S4Kpxp4ka2pdb30bf9unJv7GVyntBX37p0GOcI49AoGadalsXKpVMQEPo9l4f+tOd/wGI4YvREo7GWShDrRNWBfrUQx3srugcFPY3z6aizvFrNNG3K2vMt7oiiv5RiIP+YkOgBL3MoN/mpI8FVZKYyUk+VX5fXkLQIuAjjmJeyaPNd4SWygVEDKaeEpgDoTv3kTv+In46yEew0d8S5ldMWL8sFkniteY2e/KYUxvIdVxK1EvJlFJVe1Z8hYiiifRtCy89mNQ5DDAbE6kQBeTcOJ0lob1qAK77SCaG7F6hUaobFsU+vtEGYTOmKuXi01SYZo+AnRkhQjoAcOSYSRTR2FSIUlBCvV9EXmpgiJl+LS6HBTCUwSANHBhPoEK51inAgxXA3GhitRISjz6jM2IKzgzlcvfgRjw7AnSS9mXN48N8fL95o6d0gGl2eUpk9IaeIJjKz4zht25JO5CZOTR7wsbAy7MuvgH8aP8KVFCsS1MFdDQTimKuG1nFsgmI2QBq4Cnc00tm6AdPAaqL52oMV5ifyjOkQ0c9QqChEiinKDLwCqQiJSFTTiphxOnkpbZJiCXZnTFIE8vK6EChvTafC0wpiyBBoEx5wASdUjsFJOl1IUxEM83lVnxtMRvBewGCcpqGR4CVQasCycQ7kWxw9AWb4NGG5i0SG1MiAqY2jAPbC9gaVHGLxX31rzOcgQZQ+Db27cZcvmlVIm16U3HrJCxIK9oGxIDizlYm5ytFZMgfSoP/gU32BKmcQRyRkr/wxVHRpBAjdUJ4DNcP0FmjSpup32UjbTZD9YZhwQ43AejhsQYrjDademK9A6zxCbep3eo/X8qB90gVVN6gL2hSw0c1AO7ZWwkZjF69GNfbdK47pXoNCxuRiVHi4Ylhs+CcHJpwwtLyKSrLpZ8x5kb+hnIXscbYcpzWFktU1XRNjjavlpQL2HFZqFsIiBzlJMmWo/wuyfmIYVreBwWvUaLAmBK/E4ZgDVBNR4I/IlHQlhdFU12OwBYDQwYqBSEeiIaO81yPzVPUvAAYKxCPyUQPsW8A49FIZaigVEreBKAZj6lToVJ+OvY4CGlaokvSxTmBwm8sWpPinPHUEnwgvwMLoKGahkyusV6Rp8rLWCUMplvlqLtuMWSr5cnsw2tzwPY1csDXIs7OVQJSwDmi4EBFihyA0TgQmpBio8QmNghCSFCMwY7K4EECABkIInSSSQFTEJTFwJVj1XqL4hKPiqiEN6I2IdhUGYVfFQ0ZUeQIUbM5uTIJoqRUGY8jVFQXMOvwJCw5MMszhssiDyM5x6+SES7oFAeixe1S7ic7qB+Ym95hsodcLDKCubCdkbwNeSdTUUpNLe1HQDhDBAgfPi5oZmXCgAoertPi7YKKUgapW3Cb26l0DlMM0BBcK9XJQ+8TMgBAUc8yWw6HJK40dfdZCGV/FTnLpIAffCllKxvqkDj1TdS5xwRfbVCqPq4rRkEyo4CWKvouTGIIG5XMnB4lX1giw1XuUDHAZFt6XI5ibmrs0ZoexBrEzoM96ce9j+SNVqlpFnMt6D1GdaG8ka+td0DjIE2WnecrmbsA6eR6OEpb58hjeu1zdWQFY5rIATZQAFSi/xI9z+YRE3eNRnEAPTHTGUh9YCo0iwWTMCG3c4JeNkcAyv9qQDluZO09MdeCfOGHPgl7DVtIRUAwpa0huD+IwwZ02cwMNp1R8pwIJuM+pWbwiPbsdwRNockvETEnbvVsQgDXsQXclSBtQ8aCPxM14B6mhP5HBVHGuqIDI0ZJksl+9kCWHFqpJp2KTf57AxqQuOaKESekkiqLbQAjYD+K9FzWdCwoqlrAwnYBBkBMaBT8U0JkavEEKNh9YXRTRsQ4qUkR3TuLSfJ4H47nauqTjSaXK8JFWaFXiVUOMN6TWYETg3i8hJnCjxE6J09tB8KI2CLV8ROyKrw8DhyXRwmFXVHcJn30JJUDlDty4jw0k6GX1n9yDhY5qQee5migmH3TL5po24CK7VunGXtVYyYgQALKumBmMBmGGAhyiSkhCiUKIpruMEf6BXLLr15xyNNpApP+dBj7JUNnAraaCPIcbn0k/nREx3B15grJXdvelwukN6zbL0Gg9nZTA+1VhCAxent1B9Bn6WP4aTj9HqM7jJKy37BGy4Gpc+wJUT9RrDpV9jHtTCwyvlnt27d7N7oallZtCr9FzLOQgzXtm8eXM/NGNPBfczYf6BLxRg/pGD4HhswUojlI3JyQohyAye4DI5whOwEloXpAak8JPSBE0kDNgBz5gZ7xjijhgYALQSmLrcy/JPxZciqO9U/NB4wgquhD/4Gus0TohMLZtkh0kH6IHnwTrpUEhMk89TdFIOXF/10om8kpIYNMyD+vngaAg2UxXdkFvoA9LzElJjBA1aJVYafaiCVFU5nfAgib25mZkO4PgdwQnNVXZVpXaV06JSb21ouA5i24i4sKo7iwl6L8oSq1ksKExRrF4R1QpCHeYJZY4w+yeGBas/cRMefGSSsEgIA+wiihHJoiPFB84U3xjgjsUkHlLfVvxABKuKXOtkqOAeksZBJQzqAcJQgW0mzrodYMhnmg/TzrE/gvWpDrpQX+kmJRwKJqECEQ4605HgDniksFUuUyKy50SdUSo7ZQQaviVauxeiPKSzmNWJ6DnyupbMms1BhsIEHa3SHrxxhqv7eAQ6l8njG4E0PqQIIlW/BligCZpP+yeFoaqFR8AjMPjgNBefCk0C1K/BCosYSmLDCIMpW9LDa7/gYECt0SDGhD8gR5vuer8avIQd4w6GzipaD/Bw8ra04Ulk80SLMAMrH00V/YbAUMVQv7mZbgPSCm6GBzKlVboETzHpBR5VzVaylCQ+uFKJ41fwV83FqUc4t1jxibpFFKmurmPNepC92ixpZp9PYeoEHVdg8gOaNFoQLAy6Q2FUu60wDI9IGuqWAqJkvTCJQowkIIUfwgyDkRIQjfpqYBbIEGtBbQiRotMmE34HuR251jg8PNjV0QHI3oFh5BsNJOB0gFvfYgCDK5ApNAq0RCozx1UwINrzAIVECGOJKA3DtXcBRHsPhikQ/hSuuo234ykmaWB0s1Dp1IsH4JyX8JNypRmgsuopLthmsqVK5Zo8brJmCgJpaLMBYe9RkZXnsYO+HhN03OjHICtdWCwMM4kbMP0PYTVuLRglMTw6FTPNyxgY41BwhhOxNcxINCTgOolVE/OF8ORcUQL2oGpq+BjACuG2IVh1CkEhXRZCVMYJjMCTcB/iKA7gMVVe4Yms/6DTf3gYCRXFxk/wkicoCacPKMrJmAdF8MpvOERSJSJudJO34ZFZICeBzkGs/DQShWGMhf8mTDfxOfgAAQ0PK4K2wmO/15xZqyGWipU76CiP3RRpuTydzTfhO4KcoLPAYBKFSLtBqv8uUi1KxTcphyrCmh1R6A4eABVDvXwYvsalOIZHv8XvdJoghWmYxmj0FhHc/Nef0Roe+dfgqZ8MCKdJwg07RR/SoUmrwSVdOj4N9ofTpeNQmKVR4wzRWvo8GdEXEINfI1IqQ9SkMwyO6GaQehTHnObnKhaHVL7JyDLmHJNvHqaHWFQNMgSVDrGGAncgXRNmLRVEOpqaBtDObKM+cAedX4eiEFVAUdDwRTfEpv8m9Fq30lGMAZ9YSQGaW4OUXEMMNfInKeApv7EzmMVqXMnNwhKawFHhVQ8lCXSegIvaVdTBE9Kg6WOcjhP4MqcaRtvDYMNtcIcpIOAEWscJeWKg/Rm9+UlPRP3XcLoNGoAGZYQW4MjwMQ02zApBSohY9LgJBxPOjP2YNpBhN30oRXD1nWs1xDJp5HK7II4miANruhXsgaBXpXBVPiaMpLICrv9GWu1mcQYT6LWM9EF4CFckw7SgSKUF6CzMBk0Mjg4NqqW9MF11SEyks7ug7QFGb+LAM8rFwpP0+XAmofMwG+aQMORH2aT9oNWEAQZyDrsYauMt0ICB+d1NJIQDDghKDaFK6m6FAg4kx1EOuKe/drOQOJyD2J3YjDUxFcE3GUTWyTqNPgm4uq416UGGZIgiRq8h1/EVW3hwEXIrVrDaKfJEAl7KxNB/JavjJgkRLFyVyt2Aq1ODWHhE06fGk/jVq3wYbuQpPDgNnsCcgcMTOudFO+B7nLQv9EvlweiM3jgwTfaL9DGadFgqzpB30kV+Gj3wnVZ5pmgYrtgBg+GOre7AyYMZtsgdKDReBrP34A97XV68aiOEClK9iqUpg57qEAvfHnEKhV/tx5r0IHtlr4knU7mJDny+GYsY/Tji3qIC1AINhaHS1zKIpaACV0HV4BCmRRNRlVBRNUThIZC4oQADQsqfxmFo4lfcGK9TpnBqUReh1CBUhYe6ENJlLbvzRhhqDR5JaiIew4xRkv/qXsU28ND8KB4eIQ8+J1BWCFTu7BVgrDchbtoNj/cMmpxL9yTKFWmngtQa3U3X1xrIF6G2w8hy9Em6JaaW8Cr5F+dgdRKCIRVNZlAtrGDxiElWV7BCgVi4FY5XCchQK4CSRlfAUaC6IxYLMNBaXVKAQULlUlwDExkm4KRoE3AqTgUSPSGu53I0ZcuiJtIFbQR6eECN9HQgLKUerEwKJImF0QEYwQBY0tKKAmrnYZoCPwGswiRh/oivHOEHPtwW5m74Ag2xgs4yttRwy+HGj6wRrHMQklYZbhSmYFzjDTv0VBCNogr/KnvWYoil4sBZm06IcQcLo1yewesf+BJr2FWlWFU2sBSZQlF38GlBBklFtyMbtREGTloqRuu9k1EjPLC0mMxvPYvHhRCNI/DVhDAu+xGLIRZqPqKkf5He+SzBTtOrOwA8LkZhaaDDTEyLpi2BavxGAGBIKXGMsfKxPJMG4RpmbqIoaXAYNdEcSoS0O/AI5CmfKohzI5zGzmOx2qkahrg0pPNaPI+1ZgoiCwtb0XBtoigq5UlsEHZCWDofIUjl6GK3sjFfKKeA48XFQjKiYCkDc+tT8ZOCZzArgtF4ZBYe8GHR7zEYDoH6r3ANIxP82488jSb9tMj1aXge7UXsNL26YxwgojumAKGaBqZDAxhooZ42h0S/MTOyFE2aHm4LwdP+lYu5A03AV5+DInKg10gCKYZYJmP2QgbDsAFu/Ew/CLQuq1Luytp5rIB4bVhrpiCVbHY7hNWMjhtrfGW9fxej1NiOmPzwVEeQphZa4jaRJTgJaqpwVOJgEwqTNHQbl/BUFuZWnul4iEla+4dFvOgJPkKdp3JQFAskrtFYvMAL/OvZxjvQGFlk6LGo7WG0Q+zmxDPE5yGajjQXRbRQfabxU27yMVTytFiCQ2NUloofwoLbcdQ2JDzDm4W6F6JAhdkpX47sEw3hgA9DrU7J5zHKuLbMqivIUJAaItqhFYTnEgHjCpYaCllLJbHdG2VYVSikCgUZEM3Sp4WkCo5xGh/Y/Ncww9UKAb/5NNBwYgyE0aNV1HgrE0VQeMLDcZwkoQW24SotGdLPH2hC/OrVGAzGMPsFXA+LtOawWAMOaRxP6YlD4zzNrU+iAu5ucxFEjgrV4Gp3wNJ4FKk+jqKh+cOKZbgY0JCpE1AYG2ZFBTHsirRgadMO5inXwP8qW6uuIHtDBrFwwddsUVnL+DJRlx0xgWisgIPgERxkqy4rbwvTYguBVTjkGQosgSswgAFlodOKk1GCvCIEeobTyaciu5XG87gIMzhpDN/pgk04eanltnkV38M8XON0HkZJqhhLSBNp458haPwGUwL1GyWgTscg5J9ehmm4uumHIV8LNLcBFdXQ8NT/QET8ejhkZYjKx071qmYghIsG2BjmbjpXsswwEAF4/4G9yDVmVl1BkF+VBBqTHcx7pVzEqedeKAi+WIRJSRB3tfBNxCpg0kSBqzt5KG0oVLWcGWwDGyC66YXHi5aczU+XBhrI49Rwo3G6wELpNBJjDiQldS6JHeIzhUQs0W9xhlgjvjLSeC1t6oy8PY0MsxhjbjTIfCEoUFk8ltZAowjuhiedB3drOg3H06CREt0iVzpjpUBPEom4IIaeIiz1UgXcoCIkR96VmqtYpi3fgT0IJcDMQyoZXNqK8VVlAe9HddstJhz7sED0X4WlfnOlnh5kiGAXiigUZiwwDbdKokyJqTjOIMGsjhfhRFErOkgc46LLaEK4oWtKFKL5gKvWVjo+YJSJ28Slu5rGUu/PQJTCURJl4XSGoxTsIYkQUkWydB7MHcI1LLi1GJQQALbywQ3bXHjaPxmGfwshT3P508K5s84/2wtxDSFvLMygB+HnqN2Agqu9PF+hPciQxuChV9dek32QG7Zs6cGNxVtUkuU5bKbiDFbOJ2oULH9mBZeXA2yDaDGoMxRIhBudEYSwwC8WNFECvjN2rknUIeYQR0gOrZgGdSqgGqY8A9xT4GjKn/WDfOvZEZFTVSCFTTsDB25avxgOE/MBbAOw3YFRDziE/QkFqc/CObwiDujjZiGplIkljjLS7RJFC3iA2fETSxvRNSb1kiN9Hg+AyiDEhZBsrubVW+9BeNyE0aZMJRuPvKegV9e52kMsFcFCU9NmNBE4ZEOhT+MDnR06ebMKEeSkmEFisRK4BGHTaTUBboOzGNxN26EUaaIQaTfx9Z8YwUE6ozTLfAphPDEuogd/gGk8CjUeGicJ9UdcwzAe9GtAyiZuwIOtoWobv8DArCp4im+gUyRnr2kK6Ui7gauUtN3NWBWMR1AM8xNFAxTXXHjqv8MTUmVsuuLkmgB99TYFIUVy3MT5uKqL3rC4V5ldG4/V7kFUArh7dQvE0gD54c1aDrGwgsWWhEdOOPpSYxVEC662oFxWLJwg00DiIaEILDAWLEKjO1YI1gPERV6MndHDo7EjXraIqrgsbAbpIx1pgDGkCpx4qlz0kFdd2zHZEgcctS1yC8UTXm2pA7ql1dpuomv6Q8ttfEigWLGHsCoIGmY8zP20vQEqMRf3JMopJlsFFuJg1xWPpTiGyjDIDqnV2IHHIVYsA7Jk/NwgTibpmgU+sHzTHzwWeQy5eo5VVZAhiGMv8oYuejM3BeHiq+e5PD68AreKFg46qwxl6DATNIPhUjxDjkK/EFwLLLA1QmWZy2WlIQ8eqB0LxbLMzpelULTyyOWz0tyQlSZ8C4l4hBZLGC3jK6MxvRa9+gN3T6p5U2n08IjgtFW287Y0aKQgCL7AM1Q4AA2Op+dPYeYnModDTKtVePrJi+EAq9KklIS0lI0qTKCJWmNwFTpZggdlHo6FEAADnLSyME3gpTwZJ/7t1VuWvTIxEj1BkcxBlBUewPJl3oDsIRe1mbNasxz6WtoqP1O+emZoyHhnMjtCJJQyTjzzblYaz1tQFhaWGrOrlCMNT+GZM+A7OXCjM+A2NeSkAb+RiYJ89skpefDAlMwtVGTzuha55bpuuW1Pr+za0i6NwDl4el7u+/akPD48LVNTRWmAsjRCcbgqw0pG7vaEK+2IHk2spRgw/QNePTtJaWBEHqQxS+MxHGVg8Bi7ZZQVl9RqSAhjkEATfIYUcEMEih2INSQADBSeIZx13NgDYP8aV5XbIJZkpoOnJTBaUL31sHDEKCLx/BERMsKbTWguVcGzQ8k3Dolb+8sO4fMKgHvK4bw8s6o9CO7B0oziMaApRbdqeyC4h9elHQvX8pIupKrsxYJPMqogxsDCUvLAI+Cy3W1E5ab3iaPT7MLlh16ySX75hTvkul2bpK+3QzraW6ShEcMAsCmVyjIzOy9j49Ny+uy47DtwRh7+5kl58OujUpmvyLb1TdLUnNMehy1p0osxCeBg0ScJdJfCPbzaVjrHo438aIvvzBxdaxh7AxiFETH4tXKBk9MGwZifyIYLF0jcne5JwEcDKTHyBA5dwLWDjJbXCFcM4xt7KCaKdIg7Turh5xCavQi+sadhQEId4BCLuEaCuJkqmkv1IJzxE7WMuqVd0MDAAPYLpBuP5jmRuXw+f37//v3ze231FEESaehZrllVBUFiNBPIv53BqmCvNIcJOi6qDrJJ0kt506ePaClAy9sx3ZOyzWmEWmkhQnbzrU1ZOXYWFX6uLL/448+TV7/iZhkc2ICe5MLZbm1tkv6+Ttm9c5Pc88Ib5MfmC3Lo6Bl56JGD8k+fPyjDwzOyZUMzeGSliKFZWkk8iVdkIxuQl7FgPrQ+wBvyqyqhcCKyAtKESq0gQkhFD1HcrUQAURlUQHSpnIivVEaqeYorXVFJ+K0bUERlBC21KvDStKjCgremiGWAYNDwxal0g8KrSTU/5KW4jJgmwx6EFZqnv0Nq4EoquZ4K371jB762lLkXEdwDtJ1IST8+p9uUy8gcxsRndu8Y3Aea+8u5zKcOHjx4hAyGZCiP1y6W/bFQTxl5rLTxDDbgU2v/hozcVi4vlLL5zuzGPT+Od0G4UWhCN2EBg5VAU4RidJupMo+Fh1RaxTT8WKGIB5nzZR0OiT6NYdK7v3+7vP0tL0GPoReIK7XNKSLbwDGxQrlptBaPhR06PSL3P/ht+ftPPi3jYwVZ19+E3oTfprwwr4TrFboQiVUn58MKCjd/WknN6U8GajjlGGmBHJgoN3UHvopM1ICgZMTHj2JdFB74k6H+40EDPHXRpgNlMjl5SmZnx1EuWfhzUpo9JwtnPg8nOwxtQ9FyUotk/0xh/rYTJ07g2hOrCUNQjr2YCsIvuwcGfgDgd8I5BHx0Q5YuS5uqvsbnZVauVM5DNH9VyWf/zwMHDhwFOpWPEYbEwnUJQ4LVMiwawRHmvkqp8h+R6I5KaRbfQd+Y6eh/XqjsQREgRNUBfVAyIFXqADeIZp48DQ3CVrciGj6arByakSwQHjowLX/2nnvkZ9/2PajIXVrAoYxVgSjEpfwofNIxlp72Vrlhzxa58ZZ+FPiMPIqhV3cXhwtsWT1dmqyVf3h6I+eQfvVTXiYrPA2D/io3wcQLwcHLvkNBwFdQsF1WQdgIqg6nP0ACW/OpJygGqyHnbYXCLH4zYIXqBv6V8gK+ODUMp9ZxjVcDgNrQ2Pin58+f55dvtTIPo0IPDAy8sK+r+89xrutXUWa7UCZZ/Ir4XB9joqHtP+gFapztzrdBKe/GFdBv6enpHj8/NoaGWg0rj9MGUH3rwmON+vjLgVJiFVmQ9WjhcOcRJ2rzOO2M12y5xIsgVlAKzIzZKnZ1pgqACAFPaZzCSekPysGCPXh6Tv7h979f7nnRjYqJr+lq6xWjCvRLsUyJgjTBvAXj6efv2ip9P9kuOweflD/5H0/I+n58IxzMWV6XE8dS0hFxEAGzjQpgIPV7a44QNJlxXqBeHUhZ/QONDYtQ+1Bx81x0AD7Eo/MvVjfy5goe88E4OC8rsv0GXhJlMtSKQE2N8SMPTR29+Kt6sxBMTFFqq56muy1bKPAU6xn8dJi1a8fgexHHe3jZIL+Qa9FoBeL6Mbz8ufFYUdnMoOh5p6305TLZD6IHururr+9nHnnkkQJgxNHuy1DrP2tTWR/r8qCW8mxxHYSEixowGsYmIb+tjWYFEkTaQt7USuczBhgwrRSWFMAZBKWgrZUYXg6tvnVsVj72f71G7rrjOi1g4mvXTscVGEbHAmGlacBQYUtXp7zyVTdLZ2eL/P4fPIx5S6OV1xXEsRxSl4kqCuSgr9iifkDOSKdWtlBJg1srZkaaGjOo9BU5O74gB84tyJn5kmxvz8m61rw04wzhNJa9T40X5NR0SVqaMrKnu0HWdeWlqQlDI2hQoYD6FhSJCmOK5HFqEAWFn1ZWzZK9GJfKHcrfeo8Eh6HwNePEBS+QOzg4OLgDH1f/i1wm81LEi84CXwjVyQtC0ROZs4RqBJ3RugSe+oovG2KmkXqhCWEdh56Xy7ls7qfGzo3uuHXDhh94/PRp9lKXVJLVVxDsoLMVgTAxWC/iGqwWZI6ZoIJotQv5YG4oaHgJ8SDzBlgCjLgAsaCaUYD/jDnHfb97ryqHt+ZekVJsrshJfqyUTfm89DU1yx137ZT/8Asi/+X3/k22bmzWfZMrimCZxJoerYwQBP+RtkRJTDaENzfmsOdTlC8dmJH1bTl51Z3r5Z23bpKdO9ZLT08r5NeI1zG4QlfE8HFBRkcnZfjoOXly/xn5yjfOyD9+a0JugaJsWd/M+glFYePLCg7maqcSrumgn2HsrThaMjf91oNgeIU6nyporqvkKw0N87u27bo5Uyl/FnnbiIq9ABLWU3xbncNZfFRm4aSU5qex2APeTVtgt+IyuhkpzA1z7xnDeByGbeQd6exwqCja42RL5dJCLpt95UxL698B+P0eCJsZqWtWTUGGEN1e/BDzRooGmWXJ6XvoqjCA0ajYEtkZMAkhXYAldgQxBK0nleNL2Nf4o3fdLq942S1agYmT0AYWK2SRL5WkvblJZgtFef4dA/KOn5yRD/zJN2Xntla8PMnFhxWKbAlsPD2KiohdSSjwPDY/mZZHDk3LTVta5Hd/4U558V27ZeuWvouu5pHXS/BDBZVzoxPy1METcv9D++RTnzkk0+hhtm+BoqDeUVHI31e04vBOS5b7wraKZb14qIfag+DGE73MnVVQ4RCqFDG5eKvkKm8GcL32GlJp8B6jMMPFKZHOjd8rHetukJZ2rEhiT429CS8CKSzMyuzkSTl/8jGZOv2v0tC2FcqDi0FUx7RAGqhwUJJXY6Xrg/sPH/r3YMdeRLsb8q41VO1VMcOh++rt7v5hFCCW46DAxdFs+7oXS1NrH2QB0bEwKUhNO1xuM0XmURzzMlARIow4nJRPzhTljl1d8p/e/X0YCtjEj7xX0zj/1sYGmcDeyZZtvTI1Ni5PPT0u7W15HdevchKqsmeyDKAQMTdHKZtDZ+bl1//9rfLL7/puedGd10lPd7udFGBvo78qVoCxwltlZsVub22WHVvWyT13Xy8v+a7t0tldkUe+dkZmZ3D8tjOP8Us1vZZTlfgrMjc7oTxNbtCEmZOouGHi7gWrpZ65B3G3IfYSNAZTB1xVWpyU4uwR6d3xI7LtprfIum13S3v3Nmls5kuIzWh00fthZNLY0intXVuke8NN0trzPJkaPYhe5SCG9fgMO7sWqz85jNdKmGfd2dPVeXZ0fPyr3HQcHh6uOx9ZNQUJqan0dve8GUK5DQqCZI1mO9a/BJ886IawbInXK1q1otQoAjJmZZ7YViToPTB0+Mz+Gfnvv/ZK3btAq7Mic47aIq/nZyVi+tEiyUwJreq2bnnwi4d1LrSWyhHThkgpOaaLverhM3M4HdAmf/je75VXDd0ibajoGM5bew08pv1SP9MTKhKGLsjnhp5Oue3WAbn1+RtkYnxcvvTIOVnXy7uuEC+rGBLgumGpMdjcHBWkZPEBozRzCtME3NGrl1iTWg1JtaLCgUWrZlmY3ifNHc+Tgdt/RtZtvxtKgaVh5gG8WId0qK4KbW7CqdStnZuka/2tMj+LIeP5r2DIhXvpXEmQb8gIM9bsUF931yce/frXuSjAnsRaBTjcrKaCaBz9PT1vh8iux1VxUNyZbOf678L76NgPCgoCCQEvqfgqXIUBWmMbnmIwUPLoPc6MLcj/+pKN8pY3vlRbRUbqdJqAVXx4PJyPTMzMoVBacI6rKHu/eEr6uht1MhyysIqpqGbNIU0Ldvu/fWxGXvOSzfJbv/K/yLYt/aoYxORqmytFNWV9H9Pv+FQ8mkYcYd+8vkf23LIVK3jYb/rcESx326ISV8RCCUUH6efnJyEPzrNRD+EvzZ6RSmEMTipXul5y5QVTc0y45yf2ybrdPy47bnq9Dqc4p9CGVetLko90GrVMwI479/mGVunEUGyOSjL2ZSgJbjeFAmkCsLcCRcIdCbJ7dGzsIwTWJARe0xp1rPDDI8OQUvooWH4OJJvFEi8uq07EYaK0Z0hB8GhGFeShrkQBD0waML7+6sl5+eHXPR8bgxzWhI3HFc7Mxdh5pelubdEVnjvvGpRtm5tlfoGt5cUoVz6M9be5MStPYyXvja/eIe/5pe9DxW1TubhiXEmsaUVpQEXf0dslr3ntXfJbv/FyOX6KH4fikm51ps1HeHq6y7LkULh2VIMMaI+C3YGpp2X77b8o2/bcq5vKmF+DxpQi0cAL5AaRUhGpJDnUt203vkaa2p+PodoUAmKfkOeyMfDu3T04+IaQmBjonNmtrJrZunUrD13hjD+7NFTeXBsEZSsRGmm1LEM6qoFayaJGhTAAuY4/PlWQn3hRv9xy04CxW+saiVhdkduwCoRMSndPuwy9bKucGVnQCXKqNQj5Wx2LytGIBuPEyLy86q518os/+0ppxrotV/Nsgrxy8TLPbBga0XOua26RF2K/6b2//go5cnxO54SswKjKMULi20XWoSAZRIXRMZmjBeXAMKg4d0h23v1rsm7rnarcFWxluJwdeyk2abg63NjUKZtv+EHMY06CT6KoXB2n3FBGv3rTTTexK9PuJc17VRUkl8thsmF3rnLOlcFynK1VJxWLojRZsnVIJy3lZkAqDOthehbqSfQe3/PyXXrgkAV2OUJMxXJFzgYMO5pRYTjGv/mWLVpRtHdJpfuKIrgEMVvuOexR9HU2YDL+SmltweRW52OrkwDKmvlrRcPQkW+QF9y5W/6PX36xfGP/tDRiXmiqABwUHFNglzd4JgDTE73pHgQ05Xkpzh+GcvyWdK+/EUMy9BoguZJyZU/CoV1n74B07/ghKMk+8AsLOUgFlA+9SOb2+cmZHw2pq9KJKo8nfwVsLZWGSqUHg6sO09KiLrlRQSg2N/WKz0RKjCQ0whwEFiWk/rabtykrjcOZrrGtioA4uaJVxD7Cho3dsmd3B04GX17Lt9zkM++NeMflcQytfuWd3yXr13cF5Vit4rUUesXtwxGcBjTHL37pTfLTb7oBhztnoCQeN8uaPX7SctfPH/CgIDvveq909e+UUnHeFMPLuz7REqFQU2ya9G99IRowkujDaKFALD8k/6cDs7TW6sw9wFfewp4zb+ymuiIFriBIkCawXs4DzK06KFQUnu+Zww7wXbvbZeNGbryylVHrih8qrMvUNg45OKRpbWmUPdf1yATeJcGpjVU3nItxxernXjcoL7rreo2PLedaGG8c+tsxfEYZvPYH7pJd29tkdo6rSVQNAPGvbxbSUcfwFdzC9CFZv+v1UI7diXLUwb0cENPACX5rx3pp3/RaKS0cQZpcYSs55AGHJeUlO7fv5NYPtSfORVZFihjPaewYAfZiZs44MPIo2CYhCi4RkwkviPECeXecJJjDicnpoly/q1u6OluTgCt0sbDZKvLnBb80lpYjLoPSMMubt3RBiW3R4DL1bWlRozjZI89hw46LFWwo/BTB0hhcGZbKCixa0Hu2YJjZ3dsub3rTHfLkML5gDMU1Q7l6nQutt/q9Jae8gYlWXpdtUzUkMLgyCzJheeZwUUjX+pvi0C3FFON/zpPKP5yCqdNzUAu/XD9rSu6JJ55YuA4nMDEF+j2s7aIEWeMKkBHm7CxBmmCZJ/F7cBohooZA1sPJ2TKOdnRiWdXGk2n8yHMZDleOhYUFmZ6e1iQvmdyzhPRpawXCnh4uSLDqeiVYMrdlIXKn/Ah6jzd9/4DsxktgNLUrSctieDnIoQXobm3FSl4ReyQ75d571svYZMEm7Zomnp+KJZmqB4RxCIQhM079rq640Lt34MOx7XegR0FcyQCKp4Phz3wvFpb40cw4WV9JBWFO+Svt3LHzp5DlByCRXRYZr7ifQwPBF6WSKFPiApobg6Zl6ZWf1Y2Ggubrsl3dLcaNmavPzJle1HblOHTokLzjHe+Q1772tfLQQw8pjQnuouQx0JNApWhtbdR32zVpHhAxV8ZB3mwsRtBYvGroBhUBe4+1Nl7xOQfDgSnkvVle/eob5MDxeV3JUxmgd+Cwz+UZ64Em18qvjMn06mkIeymsvDW1SlPXTlOQpJKhfuLKz4rc0JRtekGQn5ZaUluvTKrOp4wjxb+BcfefIkLM0QUrBDxUjbiwpJdFF8dY6xdhvVoEWBU47UFm8apsfV5LzwyFph0c7A996EPy4Q9/WO6//355+9vfLmNj3MgywV6UI2hpKGE1sLCCt+rLvFzqnsBS9ytv75XrdlvvkZS5JWWtni7HdqxqLWCh4oYbt8lNg622H4REUDnivIjFyC6DpUe3lgFaVkzM0xfKIWTFjMoF8eSwetbUhqMnWdxRZ5uGjIOFrF/bxb0iLyJgKHQvXrEJu1xDHpz5V64b2Pn7OB/wmyUYxIklnGyuMLcfcbPHYmuHpeZ0CYb6nq72iph6xLDosEBufLE6WpWsCUzRX8rpCkC7pYW9q5menh6t5O5fil1CI8Dew7KIlKFALH1LoV4mDhjzHNrxkYK8+M4t0o5lXa+ky+S0ouici/Adkp6+Drn7rk1ydnRB00n56l4IGxFulquCeNQcYuEYTBFvlauyIHyVBMfhZwPuZZNGns+yzU1Nhb4voNXzbvr3Wp3WY8QafpkPVw7B6cgPQQhvx+YkLt9FH4KFgcLMAdl0wztk8ty3cTvIQWwUQkGqu4SqaJNqnrgW41sYj5nMzhUEr5VJI4VNwVvNrOK5HM/b3vY2nX+cOnVK3v3ud0tHR8eyKl0BFYPJoOFYnNcJXWGSjFm9J8RA3rMYUt2wZ6NiXIkIrli5QkYbOUqADHh0/oYbNsn/+PgBzBUzeA3AFIRNhrXKLEcrSxVZpgk9yBzkx4UNw6iX7SuBMR4uEeVxuDHb2AP9OAwA0oAA/Ps8ZDfQuMikpxt9rety4mXuNG9Qjj+BZr4N5+25VIUrLIqZwtxhGbzzPbpsN3H2m8qfPYiJhF53uU2Qu8nW3cRN+QBmReDdVePjszKPitjYSMW7fMPWjRVk8+bN8r73vQ8tYAkbkWEzKabpwvxJTzOHtNDQPz01j7RhWAk3XgJKsqYYK/PgpRFb+xtkI/Y9aJaQ1EURM99GmwwlPT+LkC8C8NLigJpDP06FNm/ulY5mm3dwmG1fvTUmiRKE+DH0KRdngoJwxcvgF4ny8oIgJO6JZPDiHr6zbJUJnJB+3VVHR7J1YGCgH6d7TzGCy1VVyoO/CpTjD7GsCeUoY5kqn8fZ+0ypOCK7X/Rb0oNjx6XiApYdMcRCTEyYZ9sFykTEkk0VlrFn4GIKorXiQN7pM1MyNYtueQWMKwmXaKkcXnGWyprzj7kC2gcUANN3bmQ6klblNUKvzMH0zmMvaOuGFj1JcDncvNcgLz/HdjnKkY6b8qMMyK+zq1U24k1LvZgPsOrjJqmqB3mhXcdLT+hBuOq5BiaTw/ssOEofRlKMEcWkQ+IeyEA/SU1YKpXEWbIhXRnvC/82BPIuDqswfsqVsRNaKc3L7rvfg639wTDpQu6xSchKUn1grU5cEKIakKhRb4AFAH22GZeTo4cnZQR3WNm4P41n5Mt9snKw0njFWQq9K9LsQkEW0PNwjFsqluTIkTFpa0FnSm258qQtSgpFtYC7bvp6mtGD+lL3IrQLAjyP3Pn/xCc+Ie985zvlM5/5jOJ7ni5IfIkAlSO6EJ4F6+lqkqK+VGUtN8VhhkLx6gcgdtqtB7EV1ojm6Cto65uG3NnHsE5bM+PNKDk7wnZvvJ8rpnDJ0Q/ZjXalXdsHfx6V4deKrA3ZPM60FDLl4oTsuus/6Mss7Dm0NdIK5z0IBLKUyqI4KRHV0FDITbjz6iiOdJ84NSpz4Y2dKy1YCoFp1nQvWSKGODGHxgHp4oUHU1Nzsm/febTstrO+TFZLQqeC8FrUtvYGnQQviSiF5LLCBQby+te/Xj74wQ/KvffeK08++aTmnz3A5RitZSAkf1zihndQ8ppODvWtBwlc2TYzE6GYuZFYxq03PJi4pDpyOYkL6eLdDzrc081K5lMrGB9MDadQvIyOZnk9CJUDN9oVdw0MfC8o/wBCxHvEyCgm5KX5I7Lzzl825UAvYqxDnJh4aWzhKLN6wkOTlgZEN0etNSYFYDc+i1db9+07JVY5Oc5PIdSQroZXpYk4F9BGTEJBGDsV5PixUdl/eEZfWgpZX43oWQu1xwp17LLimJ3lhhnOtN2Gd9pg5ue5snP5hoplvSakwf/QSTCNyQgCPg3w8mIoFQS3X+JIiJX8leSqTvoZJaLjIkCR57wwFLygseskNfgiWIvIc1SO3dt274KKfSSElnH4MLuAczQDd/yadPYNYILLQ2aBLfOPhOmbZJiEcQ5C42JJuzSg9uEyctvDwYCtJ99ke/irx+X0yLjMYahA4y2jo66qzS4DZnRmRlfTbOxdka997RjeywiT3iSzK54UDufmF7haZnlfTgTemNx9993y/ve/X0ZGRuSP//iPBceElI2HL5Wny72IlTy+x84eg4OLOZzJ4nI06wHrBfmiKVO7qvwJx8ULOFyLKFdLaBj+Yh2pULDGLL5hWJPJcjkbBYrh1pIMU1zimfn5qZmPQfv60FIUMMnJz48/Jdtf8IvSs/4GnZBH5Uixpdbq4TBV4RBAjqxfF5OFh5GOJoXPEQDf/X708TH0IiehLDh2giVGVpq1MKwQLGzOPcawUMAmIY9j3qdOjMneB05IP5SX1+uslqFu8pb6SVzG++ThlgAAQABJREFUPYPrUXExybKMVlQwacXxkF/6pV/SjdGuLlsN87wti2FA5jyMPQj5z1M2uF6I6WR6bYjF8vGCpNRMRuw1KmXMJ1dpiKXLy1DQwgJvJ8ViCuLl8XrryTQNfHCpt4x12MmQncqSehC8bqV4UI7fhXLcgVWpBVWOyadkww1vkf4tL1DNrFfbmTCkBALjEq8fWAuVmKO9YJZUrR0JZNzX4T1NvT15+fxnnpJz41O4g9eGC96aOe+VtplqVgBWhFMTkCVLnzD8PfjF/TKNVzy51BnKXsNW+sEoG3CkfHR0XiamL28lz5WENpWDcrsS5WAeZ7GSx3yzoZqamEHvbi+OsR5wnmENKBB0lJGqfkgD21HuFHgxr7TMWEL2bjzix4tUdh6rOjbIYhqV+VyIe0kKkv84eo/d2wd/BHngihXenW1sKGKfo2vTq2TTrpdBqD7HqJMlhPEkryqICgWJiwaJY/rSoIuJx/E0T+wu8QZfZ6N84avn5OuPHJJxHDSc4lyAwg6VNka1Qg4mwUV6cnwyDu14m8rBA6fl7/9pWDbh7igOASPiCsWdZsP88QLtkXPzcnYEt37Ar/lOIy3BTRoaVwz3L4G0CoV0bDCm0WuwbaD/9JlxOT9lK3ssY8KUv5YjkVIKAmGxyHgNFnJSxXslPGy8uN0wPTWqR57KuApVd9JTadC0iZycKhZ1D4TxplNYLx0MLw4MDGyEKv0B88UWgOvVuYYtsvXG16GlwAcZtYeoJWc2raLyziJ9F/hC+a6Cq/RqmdX1Q94YT5ZlB94B//OPPC4njo/KWdyZO4dCYmZXWkm0EoWUnEbPMT5nQytOzKen5+WjH31MOlp5ZLtuclcWiDjYS03hBsSjWBSYLfKgH8xlRh4qh/FY5tPlPDO/oOewOBfjcZOD+09LVxvqC9OEHt/mIDq4YUXS+pG0jihMoPHd85U2Gj0m5fPzU3iJbQJXQuAtw/nziAYzDJcXKnGQwcHU5dmX7EG06uYrmfcj05sgCMw7GrOF6aOy7ZYfl+bWXlt1YE29kGEC9AY9JAZd7KLWAcHV5iK8HFFpjJDs8xjj8t2Lv/qLr2pFPT45iXG5LTMTy2Xg5Jdjq3Ko0qGJQc8xMjPLuzesoCH8T33yMfnmt8extMuzSJa2y4lnyTSImhWvBTvVTz11RkanMMHFkPNKKvqS465FDOU/hgaDsuZBzcnJWXnk0ZPYKMQREsoD/0wbzuppgVA9tNFM8wIOX7NV5DT8it1gDDMxflptbEng5cXT6MB49s7CkDh1IP2PEGloaEjnAxfrQYhQwo0Pr0PGfkJvgMg25hemMO/Y8xYcIblOM3OpAuHY03oYnuRl5Q8JYipS7gSauBQl/SB52hAVMB654DU7X/naiHz8Y1/Fqk5Jjk9MyPlpXExGFDxYwb2lS7O4mJvsnYb55CnVI+fPy3ksjfpsiieKP/fpb8jf/MOwbN3Ugs07zrcuxnXlwljxuvAO+mNfOycnTo/JTOhFPM0rF9OFOTEuZncGvTaXujm8yuHCuuGDJ+XhJ8bxdiWWb20EDjz8oTFRo0IyZYncQVtGHqyeROgVOaiwXByYx1Wl41CQfB4KOz+OT2VCWfTddK1vfPDNQurJA4wQK7YacCEFYZ5L+vJIufI+VnJoOzYCJ6W563ZZv+PFseKQ2aUN381mDwK2Gq1TMJplGKetIaN3HhcWbMdQ6x/uOyof//++ghW1spxFK390dEzmUbFZwV2ZKQj9gY4sq34hjKkiX9KwpR6Fsg2DFysCLlXGODYLYefk0/c9Ln/84SdlAO/ZrPWVo0iWfgflBG5O/NY3j2GRYg6NFhW0RkDMzCoZj+vsFK7UgaG/gCuPvvAA7rTCXVlUDksOEguHf0wHHvynqx/D2YPwyDvcK2aM1+jIUZS5aWpp+jji8ibOIkK6qdvDOPP+5RC1IqdTGJPk3QsuRPt5aPxNqEwYWuWzvC5y857XSgMuftO9jaUUBEuRvyphIKqlyMBxSE/j5e5wBZqHBTOPjcPBbS3yyfuOyIf+5AFdRVlAz3lo5LycGJvQym2thCkL2S36gY8XegFLlqoYoD81OYXCxvo+KJqaG9AiFeWv0Vt9CMoxCOWwr01pgtbsQfFz32EDDix+/vPDcvrcuCoJE8B8rrbxOEbQeHByTlny2MvBAyfkU/98FOnCMROkz43KurYHSVUEVpEyNvGWVjmc64Vtpo+bk5OT50Lv0YzeYwy3Ou5HdeRXFmLa9JVbnDP5p4MHD44jgNqjAqy3D5LhhuDg4OAGSPmXWClwTUqugOtSegdfj83AnbYUtxTl0FjYWnMCSfHQpAuObodrYP1HHZR6lESjkrAn+cq/nZXDw/8ib33r7XLj87bKNJYPx0fnsFeSE95h1YIDiXm4OdHlpJL1qYwWpoj8ssdhT8GLqYtQEnb5nG/kMXSg8nC16qMf/bp848kxKOTaX1adFhJb6JbmvOzD5dT/9uWD0v297fp5hs6WZlUSV/Y0zUq4vaGZxlzv7BQ+awG54B8Nx4J88hOPSg/u7GXa3Fh5WQ/COqDLvdpoekkShjLgKYwVUG5Tjhx69Vk5c3o/5kW84BpfNJ444ElK2xxeoaKW/zINpLueglB7irlK5ucg3A0YXuBIXBlvUnZiaHWPZkxXpZZSsRkDuzUcH9Dc019jXDxVYAUivRQ6AxzJ7Srkao8WEpRkXW+TTOPi5t/8zw/Ka+7dJt/93Xtky1bcgIKh0RjGyiPTs8qb+FqJwJuvO+mKC9yEc7WDN5Xw89CcAJ/GOP8h7HP8/T8O69h668a1H1ZV59bSyc/AbdvULB/7+NOy58ZNkhtYp1/mbWnkCiMrnkqxlvSy/c6TDcnx8QnlQ/m04KWtf/nc1+Sf/uWk3HxdG5SFBw9ThrL2HoTgqCBwazrxDRKc4XP+sdxTLJbipH5RAfnawumTTylPfnajMHlMyrghPpNHPQgv8SGyUhbagzg/vf/w4S+BP0dVMeG1CkJJFnft2rW+Uiq/A2/pIg+NuYWpfbLh+n8nLR3roOE2nl9KQlkDqbXp1yhZ5S84xrScIXfkTmKzkrhIaRwCUhIEl6OzPrDSNOCdkR2bW+Tze4/L/V84IS/HF27vvHO7bN/eJ+0dLTqHIBXp7EHB8qcJwLCJ6+ZzWD4+r8dH9j5wXCaxrr9pA9/e42natZuQV2W0xsO00DTgeMtf/sWj8gu/+DJV6E0d7bhtxJSEGbNcGe7lPF1OlA9PEBzDbfbsddkGUjn2PXVU/tsHHpbn7WyL8zFNGwn5QwKSd0KYmmSEr6WQbUVlDi9NXWZqTbnsHZTTJ78tMzNjOOHQgqHVhBTHvoaph79qGySAzJCmXM683yHBVqtKQYbQaO6FgmCc8WbshG6EfhSwJIaJ/0bp2/L8WInSDC7lNqFSqdAxQbCJcgSJkQGlyErJH734EZPP+qYePOAHXsRgxqko67DUSPOvuFT6f372OOYMrbLnhm7Zsa1H+vrboCw4Mo7hEw2PZk/PzMvoyBT2F/A5g6fOy358L53KxrNfXMYtgidNSK66r+aD6eCKFtP25P4JzI0ekTe9+UVyDMvR69tapQv3BtNQHkx0PeldLP2ULMtIGw4Qj2EV7/TElJYQh/E81n7ixDn5vd/bq0OrpIyVsIo1exAL57ksrHDB5+nhjYd87ZaNKi8YZJzLMcwfV6x4Wpc9xwTmHg34WCznNYXRx6DImCfh1V6OFYLhBdYN6Aj+5uCRg58DjJUg9h7EqVKQvagf+OhmU6ZYegsj04OIuER4/XVvxTc9sOexnN6D3GmYSe3OaAeQWigo+ikdl5AFG16EOZLbRIKbJ/eJ4850sPJJAFzRYsXo72mEsvBGlJJ88cHT8um5k9rS8ou43EshO+6A8z0L/rXhpaxOHFnnZdSMh2H+wRiN4hp6UEmYNu7if+b+EzhJ/LD8yI/eKadxhdE0zmqt72zHnMtabEpGy+UiymJ105SCcqH8eM7qHOYbdvaM8zYbVp08MSL/9b98FhUSV3xCXmyU1GhEoGZBq5t9BuZxyo88WR9DAG2sdPKdEO2SQojiEv8SxpQjj55rRk6h55idmTDlwO75wug3pYyvUnGakKr/TCQuFqkAMfcrgb0nJsaWVhDVnkqx+Aqk9FYQ8gMm6BFz0rPxZiR6qUmNvOEgDeOErRKHm3JwobBU6Y6VnYH140GICRa2mrpoCVbicgJWcLRMZXsltA+9wboQl+pwSBPZ+hCL8xFONItQGI/8AslLIrmKLqaNS83bMaz81D8fQU+4ID/2xrsk15GVg+dGpBcHE7twJQ/vEb6QnD35lk8TMuca4ziQScXgIoYtc+NT2xi+Pb3vmPYc4xML0tXRgMalqgEGO5aEGza6VFIvPNohHLLWHgTvhPBISDj47YQXtkFODpyET0+dl5NQjiL2UvLsOTD3LVA5Zp6G7nUDkYd0Q9yo4Jh7UBd/df/+/QeGwqsctRGlFUTDUDl+RNvSTA693ZFs16bvw7cZ+jUyrzi1TC7m18rHQWo9w5y5rOBMvHVcDkrZFbRM1u47MAzM3Ot2nbg5JOH5JZraSs/WqAqeSqMGXMMPV5JtUJIvfumMHD9+v7zlzS+Qnbs3yggOc3JJlqt4vJ6nGZ+M0JU8ELFsNdfIu36sE5WU79hzlYpLuEVWWkibq36NTfh2B5a57//c1+UPP/iwdKHXMOXgnAx8gvyimEycWsC6eqUBECon6cRlohE7w8pFvjSF+kJYLZ/I0BxOyt35sfMn5NSp/Rhi2aUMPLKyMPo4lONAUA4qbizIApSjEUO5v9p/ePj/RkCWK7c17NXrCkLK0sDAAG9jf5VOqjP5XAmH/7o33Ix84B1tPQIQI6jHaxFMsX21YFEoAZRcqNTBvQjNUFJgDn5MLVJAc7rEqgIcfxEjK5cqXPNoedWBP1NATD97kvXYhziDw4y//tsPyBt+cKe85KXXSd+6TtyEUsQxeXsxihe96VJ3WF1ir8n3OdhT6NEVZJrvmWNPDKt5OV24ePqp4/LJT35d7rv/pOwZwDcAIVoOq6rlRrkvNlQCa2iRyKohFnA5xMJLU3wlliVsHOrXOSqhKVsFy7gHcKr5KIbJ/NIw5jWYxyycexTDqmMp5YhpKUKhoByVrzdNt/10hF7A4QrCfq8Ezwth78ALVZDTvDS2D0obvvnGTcGU9l2A1WIwBaStCRzMrPqrONXPPDlZXSdFgrPIF4dmwKe8SajGMKvwg8cEm2A6xbPNZmXlnKQFn2LjcY+P/t0BrOYdlVe/crvc9vxtsmFDt254UixUBL3Ti0LHPyswP0jE1pjuMoamk1OzcvjQGczd9st9nz2G7xZm5aZdWMrFfE7LuFaAOiQn98SoD/yseUsquGEwYvQgYYiVUC12MT6djGModerUU7oR2IAjJBXQlwrTsnD2qxhNjUL/8H5LeliF0TLy04CaeKSSy772ibNPcPt/0cQ8HaMqyJAMZfbiqiwoxkspFCS0hI8m5ru3hF1ztCYU+HINSbgioUaFv1hgi9iaZpASPw91t9vGkk+qnQvc8RMsuFRzEiylTBASRs9CF8uMPQJveOKeDVffPvKxp+Xjnzggt93ULTfeuE62YSWvp7dNWlqbdNlbFQLlvYA3FaegFGfPTMihg2flscdOy2NPjuN0bg4f9OT4Ht+ohXLQMJ6oJJQtjU7MzaNPFiXSomXllQkVmiXoBtuIGKnMgTc2lr3oPTDYphyYjONs1YkTT2KohxXGoBzlhQkoB7YyoGSZHHbK6ygH2JwoZzPfc/DAgaNDWKTaq9IJzOtYqiBQDs0p0n0X04tXYzNlTLbae3bAjR3IyxheMa6UeOBBFEFZmEkWhGKECuxdAGlqZbNIZwCIm4iMKBijDRyqrRoMVyqnfJbbEKitvuEeLWwocn/ryafG5MGHz2qRdKDSd2Pnm1cpoehxlgo9xnRBRvH9xwncot+CCzL6u/Ny/QC+R861f/RMakIRpqXHpkiNWkBg4TmMATrEQk+hhYrGO6ArDeoEX2Li5HpxLSArOzoyi72NE8e/haEgvkPIT/phWFWaG8Ww6kHoJdLGpdzqUU8BpyUaETKMZadXHzx48OkLTco1HakHFUSzubt3dyeYXseJL1Kp+znNbbweKJ2DFOWSnC4gImPFG4mmXkSZMeZgGEvKq1CVIdNjSayHkcAWoaUA3ovAtlPNtTFpdM/qh8udZ8ZYAO2cWEMpKGNOyrkUPoaVKGu8MO7ASGLjuibbFGW4Ln9jJJGWEkV8AWNBKQQ4tR8HA20cETF7jOr6xQk+ILVvFQZarlRNTpzVnoPzD56zUuWYPQvleAD8GsCclwgGBba0FTCHaoRCfiNXLHzfvmPHji9VOUgeFQRfpt6OGDarPlTwHnHLID7XDJ3RVr9KLBbtEp8uIpvHpIkY4hP0AKd0tCQ1CA/DCaFqxd7Hg2AvXs0KQ6qA46jGAE9kJ/JJM38Wu5lfE6e18exFsK1BQag8KHa+oUg/5UV8Lovru26EsWITrqEUFLFoACEPc5odw4K3yuIgi5xgaoZYCgMrnsei+rif3KkMXKk6eWqf9hoaBvrS9ClZGIFy6LsdVLgq5eBGICfkGCJVfujAsWNjmE7ozTxKv4QHOWpKcg0V3KAq2HLOYBkaHz9p3YQxKbzIfEjqEtgtRtFP9yo4CBK5DeIMyO5zW0W+iFES6kFJUTmEjBUvIrsjCTBIgHvBRgbPcgcLMiUS9SjMZEmlwb9V+ICnwQFHpeOiqyMqZx3jSEXnEZOVrz4tVhCGoker6UG4isbj6iexO57X+53JBCtqUyfRc+wFG95YUdUbsbKVQMdd8r/t6ut9Na4SHQMSTorUX85FWF3jPQjHhL3s+qAOYD2dbWjqQcTsgq9MQVyjecAx3YtQmMnoCT6NG1ZNMll0CvO5CnxKG/HgQ1jdXoRsSY1/b+WS1suKrDa+yPZZ5PC8Qwih7lKCwVB87nZbYR6QDk251ZnyK6354zOFkzhRAuyuaHSZFy0+/UakYO5heEq5sXju7LCcxa+hAQ02EVU5jkmBPQe+E2smMqBylPUAYrnyof2HD70Dy29EuehqVWCyyMoOBVCmkmmjE9oNeeL4cr5FM2LVMSBdhhXvWmXh6MSJTDwzZlerYAjz1t1RU1QsaDUXK3CiqNLBATzeyZXFhE6VxYgDi1QECnl2PaJyxCpHefDf8x3serKEKDTUUaJonFZFG6AJLKK5I9Kbw3oQBKqipJXDwvmdEBrinTt7SM6eG8auPc9QIZzKMXkEyvGFusrBbFA5gPt+VQ7lpN2LLbmZf8lP9EtDiozVCfYmZpjOoOWa5CtqZpkp8ONcBj/lp48Ql1oAhABk0CFpBLgdx8MDIr10arDDgk1m+HHzaGrsqJw9/BUkwTZMLR7DSyqR8X7WPF2YzBCz6mLxDJp43GcIhEWIu4LtloMVzzwxquhYzMerkU3SWS04LKo2rHbsQagcI+g1zp09jD0Zrryxp8nhfY7DOD7CngNH1tOZ4lAFceMCDbzbIe99+tChXwYCI+CvamIC/5INiPcqMsZr4VoMeJkTJig4UxJT2HIenOTrUAqL8bZ8F6ghVxVtlbCdcwC6lcKJLZ/DIA2OvtLFQcYezLyU0XOdHf6CDD/w32V+dlyFr0oRkUie9ng6ntl2zBFlxKzoCiUdFqJQys7DGaQG4fbvqPAaTQQQ4iAng22gamJHi/ih8cXMO1IYC2CG9IyNHpMzOqwKyoERQGFiWIrnvwjl6AN6VZ2nB4OEXBbH7//3/cMHfxN+Z16FCPiyTH5vQIeGTuG1c2Qat59kO3BAD1v+rNzMjOdwWaxTyGTBOYi2Ag4nU5WG2iwADPNCIdJmtBx8JTiaEMUxHs5B0xfQ0nMRXrHK9FMxeVVR69ZNOsyyHiNwZ6kBR3kFt6fwmWwzjyYfszW3AJgPOYu1lVg0GmjhCkrBQ3DKMnwCaBbxMrCFBbfikCfLhEfeaVCHPRr4eKtivqlfJs4fkulKE4ZV2B3nyEN7jkNSHMU+R74fmFV1nh7sb2cz2PF/94Ejw38AP+cbhKe4w3cZxrUMUVTOWatawS5+W6UwdxaVyl6VvZJYNIOaMCoI+CmzhGONVzEt1HGCLxYCWYSwCHMI4PpvdvAkFlbnqk2gYyHAKNfIsxrzmeSzBoBVEfmzTCWdR8gowSEo2uk8epihq88oQgCbLjcemmbkJRJicVQmiiqivLTx9d7EMXAeiy9NGQ6A7Dkm2XNQOdYBsEg58LZvBkuvlZ9eaeVgkqggFmOphGsfBGdTsEedw6uk00ekiLP11PZFmSTlEk2cpOM9lDj+B63J2UVrdiJURwCeo8T4AFCY04QAB0c8c5AnlwnzDe34gPxYUHqEkXHgY5Y+FeQVrIbVM8JrjRyTGpQjCDDmDg6XMz+pZMEeWu0PAqq1TA5GgrDoMHFa1BFHQx0lhFmdood1K20ckTZ+Yc5RPP8QnOw5knk2QllvqRzMz787cOTQHw/Zvp7u7iBsRUxMYVNn51HEdYAKzfNcRfQgczNn4U5aisuJMVm54vX2uBTMZZBipiCHB495A9ALORZGig1gVbj06X+Ahi66oblH+C5OAbfrsQ0jlVI6b6YnzT/lTiX12nUyz55mzDXUyQeKz8CoTym5EKgSCvOS4AuSoSzs5/BArEClM+rwDPiwaCw87TIuEe51ShvfNB7cDMNQi8rB1ariKOccnJAnPQf44K0eUw4cLfmJA8PDHx7iBuAlzlUxpuUa7x5yTzzxBGvvY6YQXEcWmRwdToS+XM4R38XCiw9wYTDFp6Ageg8OYo1e0gdPGmaFDYgCHSGxzYWn/puN6Zs0tvbhNj3cujE7aowNMcXG08MAo4sVjmm5hg3TGVKPVMKlecPDlUMB8FhuUzmxfEaAewO9Ln6oG5S0gztEkPhj7EBQHLMdPfJXh80rmRpVBiYybRgRyqs4eRSrVRxWXVg5kNM3Pn348F8N8WWnZW4ApqO8mNt7EE0l3rH6rCLjI5z55h0yfuqrsjA3oXsIJvSLsaof5nMQXhynPYhLOUrPHPr0R7BTIaGEGIdBaVuaHCvAAXSIpQg+wJrb+iSPDdeZ8aNQVPbCyLIyID5xjDctBdvSG9yMRwON3TX2rEqbptXyoc+QJ62DDNO04+nukK2Y/5hPDwh2oOREJqKAl3N02VnMNTSRwOD69B5Eh1hpBYHy4LuBlYURXLDwKHoOfo7B+WniY8+BuH8MPcdHVTku8LKTUlzhwxVEB3elbOVz2FE/jcjzmVxTZWFyv4ydeTLcRFGV0KVH62RQED0VrAJzYBDxIiEiXFEQHlCdghE7TN2eEicJwEAONhhOQSGamnulue8GmTr3mA2zMC/RyhUQ025lQXgqoiTcI7y6NtOjafJk0M8k88l/ehRCK5FjCI5hjk9c6zGU0CkVT3kZw4Qu5TeKGKTRRpiDCQg0nIBrXDrE8iqIcDVUGA6xFn25OM45wrDqY6utHEyOp47Jzx06dOg0GomPc1KL67BKje0Dcurpv5PZqTO2PBr2Rki4NMOC8bEjX8i3GyvYeicFk3BSoaYl60FBsEmFUGqEAjlNlCo0khKL4ubVNLz6pb3/Fpk7d1hmJ06gd+dSY+DD0sK/+slP+XiYAsguhHucClrzR13FQHpVDHjalII+m3MwLxqmAQmewZO8KI4+LJ8qA9IGmMonelLZThE6d3JQ47TuJzDCIHLtSVhCtYawFKJNQHBinY2dvDUOq1ax5/AUuYLQrykqZeWPcMCLmyAN6ONQHnNy5Im/kyImt1m+mKJCC4JL5wFuys/D6YmrFYDbEAvvG0eF8SQEsUbhG1OFqtPFbnBLJdyOD9ucgS4FtxgCLiZ9HX27MKYVGT/7LSgrr8qkopIVK5PRw6F/Ho+FKxIfylIxiB9pFLx6D42K+bT4LR3m9xQpjHiWejisEYrhDFOPIoWcMMmBIoQ5irYYnIiqYVzBCSumA8AIdgdsdxpvEiS0dKliKIwN0yJlqEY2auxyZPmqxzuwWvXnQ8s8kVvLcDn+tIKUh7BMhl7kKTRD78eOPZJWLOYb+2V27Mty8LG/lNnJ09qT4JCkZlLzyAelp3nF4QEccOSZJ/64nl2Yw861Honkq5spBQFJpE+lOA1TN8PIP3isSChUAzPe6A5ItQXIqsIri1o6t0jH5hfJ+PF/Qq+I6++ZsLB5SfZKl4pHK4U9lHPar3EGGqMLhAxYIUO++vPMK1/Ew3+Njo/E79VVl2+dhoj2jzJyN2wah6vXYbT5KWu81z3LA7AwlvGUW4EhBmPicSvTQGMc/ekY5tdiqzvEsmjCk0TYmMtmcQUuNgEPfWhI3wJc3oncKo7L9HgToWTDIXejY2MPdHd1fzfSNYi9i4VcQ39uYeawjB57AO8uN2tPQgXgSUvtJdgKIN8lrFIV5vBtDgxhRk89Lief/meZHnlUco0bIWN7S6yt93lQIhwapAFZ3BACDxOaPg3u4RZQHa4tjzExZ6ALuGyZWB/UEAHNTy6PA29Q4PMHviJZ3PPV3rsTwRyGGS1pmA9jEWDA0PDoNUfijS6LKzwjTUxDVXDi8fAA8WqUINAFJPtPgdOwwEQtcKDNZJkWgdRwSRz5K0gJFKphQZl4z/np4b1y6lsfkM6NL9WDq+xldYhDRBqSEh/xOBeNhp60SOD3cCouZczj7PML02icinifYxigdDtN5mo0NXa2qvyrBw4P/y6gueH0ZojhreqTbXvaMC9MbamUqbwBOduLbfU9+CwWlKSXZ98zp5/6f+XM07hNr/MFWDrdiMpvX48sFWalMDsiCzNYnps9rnUt17QBPQnC9U1CTtL5kZcCzgHgpj9mH5JMHw1RyQYhmlhtmOBHUKwqgy4MH2wMaxWCdVv56RMP8LGpBUvQCoZvqnX27Zb2HXfJ+eG/xY0tt0hb91b0LvxsGLLteGQFt1dyr2DmZ7oRrE/jHaJWiD0s3bFmEGgEKZyLOQNytZUwAdyCAgJZMb/OkgmK/oiM8Hpuo9JeUOmJxZEAbmbHvtHs5Cm8OGdHyiOO89Z4SOQxw66NO/D0qFVJCCMeCq3egUUjqZTxIZ48UvO+/cPDvwMYG3Of0CrKWjyqepAQIXObGxsbm+zq7v4bVJu7ctnsLrQgzFIx37QOLUovbo8Yzczj1sXZscdkbvxbUIwT6JZncNQYL/83r6/km/rQ5ODW5yg8TIpLk9LW+3zJNuJkPSsgazW54mFWYpPMKmR1uPpMG+g0HuYwHnzqv3IkQoAzJdaL5PD5hvMHHsJuU146+6/XnlCTmcIlnaVBmStPusx4Ot1PO8SXdhFEaWpQ2kNgyjhOANeEAhGQqrAUhjpTygG50sSn+qsVNlGUgBVojI7lggUVNGTjJ74kjV07cLPNdhQXVpa0xfG4QGv/Gl9USGNpKfDwCGNx8GwcexCc0sDqYmn6MHBVQMaHlCiooBwf2H/o0H8EiI02uaQ4wbcGpp6CMFomRJUEw60P93R3zaFKPB8nwvBhkDJeGOHn3Boq2XxHJdfYX8419OHV4DZkHhfYIjMQAbSBv1R+0EKXi6eltfdOXLIMNqisrIMqHNgXVAYKryZcqYzYRBvcZKgs0zQxCoahoqBQuCdSwPhrbN+nUQG2S2vnVsD9Um7nYUnzwjO+hEUXOSvP4FAreVTjJfCLuVLycrQA8mrpYJdtQgGX/QcULjxYGhQnPNJuIsZeIbhZZNYzY6NYX2XtxOLGHgBZVapTobxCpOZWjoRoWmglDsNgirgPNb/ArwPjm+pTRwjBz+WlbwJiuCF/s3/40E+mA+Bec0PNvJDh3ohqLrs43LN4Gw6E/Sfk4wuAj6GeQF8qOP9bwq22pby6M/zmIZa9RL4BQX8ediI3CgDzEE7+1AAhBsKhPgUEeFQuw0qHOz3tQKIgVhrHpiMWfsqtMHSG63cOSWNfr5x++s8wZzqOoSBuQeeEXXl4GhhB5GhO+v2n8RMXf6Qjavyl8KoD0kjmdn6R1qMIvJVpQqZxBS+sgGxR61P5Wa9BlkZOXgE38IvyUbCGajXlfCOHXdXG9ltlYWo/TnbjkCcKXDkEhpol8tF/o6UAIlyjtXAiGYbZbBzNoE6wwQnkhGEUTwN45SP0Y6/DNJOeq2Bq5yC1SXDVzj119OgJBP5X/gYHB3dgWWEXOuN10Ik2nKVkvqZxF8pIrlQ+8fTw8JM7d+68PlOWbyLHnJGDD3ONyQ2ulqRRD+WHltzbbMpJJ9YaCI+GEwZHKKCq+Ugabhwp4TD3sFhYCbxFdDfWHXTjcNOtPyWHP/9+ObnvH2XbzW/El7ParScJPbo1wEgd41F2rCSJiXDGHTKUDk8wQ77SgOC+EH5E9bgBWIQbwgyOpyMArmlXfwyN4QaOyKFSM0bSAQ56LsI04l6C2dFH9dWHhiZe4AEUDTdcPhOmgV8Mt9CIQWKlp6hCu6xVQttgoHmhGx1Q9Up6XAkaGCf81tJ1KQVhWphAXYKiNiPBJSwFHwaMvwuazAKuic5V5kEclqwsn/w+NdsR+rS6hXGt1WqDWiXXAZFjRcUhZV0lQQGoolHOYKNsPRaGqfwRIwsKg8AS7qnt6r9RNrzwzXLqwb+QkzjMuAWfl8vi+koOw3RlhckBj0WKQrAqLB00jNCLWCMyj9IjGCB3KnrtwwND2h3bwVXoTH8w5sIzAcEJj/MBbpWiELWqAiM80iZuyog3F+ahFPhsOeab1qiRN2VPWw35eWJgqzsGeaDbjJtIiV9JdQWLRJ5ohbJR827GAFfpuRQF8aRVUhf8MjdU/cxQCN1rNnPKX7ncUJ7EZIUfkWj3oEwG34gr2otYBuNTxQ7xUHB4ogCtRwlwCjT2HkAPFZPlTK1R7DSOCppsQ5gharnEO7GUFonEbeUbBl4m89MjMvaN/6nLwJt234tJOyapuvKGZWywYtI0neqhO9WrmFdhimbIgYaYMBZA1wVNiKJ+OPP3/7d3pjF2Jdd9r/deN5duckiORrNQMyI5Q43Go82WZDmIDE0bgeTIEhLDsWPETj7kQz4FDpwPygLlUxLkg4EACeIE+WA4cqDAgS3AiCYGpDiBGCuaROuMlhlrxK2HQ87CvUk22et7+f3/p6rufa+bO3sZ2dX9blWdOnXq1Klzart1781utTKUpNraZUL2VHg7r2ShBP0kOyMpVwlXgIB8rVY7kBr187Q4MJ0muDubXEbkLFclCq1wFfAosAoRHtTS+jR4y5me2OvEs9GtpI0I3o6BtPlTnbRGyQ/stpNCJyauXJmd37FDZ8tDkBJDd5JnMrQ4U1abRFUg9S4WHWgOq4QVBmBQC74KDq1uOgjfDQSxYhhWCGiGAWIg2tvnM2GPveevwxdvPn/pi2I2PfzExzGWrV5MarSRcx7xZEfDB5gYKYbXxIwTCA1eBl/PG8o+FGkpEPDhJKIZUOEZ4jgX/VsUFcGdkLMJVA0lp1N/Kb5kpZu+ctoGtzEIKLniuZRMN3IaaLJxMVq+hCc8Z6lrkJrscnRRuhz7WxHY4OudGshN2X7xzJm5g5M7sAY7SZxRk29UL17yXW0titUKQBGKhLva6EHeFUaCgqvFK3w1HGDQjrVHNLbtRayoHP4UV7o+XN9b2Jr2f/BXPWc894Nngc2lR574q+z/77RyMKS4PGWXGzIW8xHwuEYTh/kDCe1pI9w0HFlaGVtBZR5Kd2QIkhEyDP7aPFjRzQFw8R7WEzypPSLkUmQPbadokMsJFYF4/IMRaabkYKap9lDcl4aqpBU5DMsYfsjtLT2CNDVcGSr1VQUvSZ3UV8vXZxT6i3yGlzfnhYEoMwIcNZIVBiA8nBoEXIn8ZkYS6NlIyOZmKuXIJMUljaW1xvIi/GC8+z78a+nk1sl0/lv/nRO/F9MjBz/FFvA7WJPQg1KFcsfX83gVgDMfEcxXVzXoG6GoQBjOECpcSS5VRUaibVwlDeG14k5rLk1KVeDI20QztVaexnAyLl68XUQjCe+/Na9ZjkbJNAJdVxywFs2G34xr61pNDpG7fWUFuymGkLUaQbQ+0SJrBp1EuQhJOOyl93ktvb+F7V0RpjhSkKz4IdCsMNlIrECkO9rCvZGRiJ7KbUaLQlMlUGLpxSBqOhyZ6S/MpW5/a3rnT/4y25tvS28c+r10ghuhbz/4a2nPQ+/xuiQeGTbHqhA/FZGVIqIBFbPFVa0MJSngxh+BGz/4anAIVbQIDEdrLOtnjsuDv4YFALAW8VaeBiHKIUk3BpfoJHRcTV+ItROeGzTy+przSo658CEehgwvMjSVqfEg377yBY5NMYJIkdfCWUMQWpx2qxpJccuMIP4OnVAsIZfftJFFHWmWecZxOLO6aqMUhPCNkg0h5s85L2U2jSbaOc6ujbZ/l2Zm0953fTw9/oufTf25i+nU1/9DOvXysz7yr8W7plvKr3sF5r8wHqSAA3V60OXqWoZ/k6vzRf6cyUWYqOlkWrmsAlfNDIrCFcWB2zYOYdg4SmajmFejC58k/WQEksUcT/WNTez2bhYLMjCqdYlaRnZJutgFvBWOoMsxbeLFj5yrb1b1+91iIJlyJrTO3poYCNvBNhAkcWa0Pqrt8oLW7qVBSv2j8Y2PBAPK1f8Zx/AmLFxjZolHGKANg5hQa5qCOa/BSi9xfJ/q1dSLu7znzqXd9z+V3v2p3067n/5kOvfdL6UT3/mtdObEc/Sqlz1VZI7IxDFoqFz9mdnqE5UzmMto8mrxyFEykaX8iXeBRafJGCFwKlwEcp6ClgsOFAGzA6C/cKJRQjrh0GNnj3cSXPwWZ+4+wAsvJmNXL+MbNWcwjZqXQCRmLxKKnGs/WQoTVkwvKDxwCbjn7PUGeqXOhru1mWIdqvV6Pepb4wifQ3B86ERCCytCNArnoTvWI+BLdiAYx2FPjipcFOsNRNKNxyUaLE+D1IMqxfSdI5cLTBlEVxdcWdA7gZ2ruQt8QnhyZzrw4V9Pe975U+m1b/9+OvXc76WZA0+mPY8+w/GLd/GtPn01VUal9w5DiTqIbKEdEQECFKG4qtTMQhtMWEyZSoYHf22kqGMbonCuSUWPQFHONvYQTHw7kavkxJ/eIzZz+rt+s/uOt/8EM2PWjnrbIX/GBU+uzUcTLny0cAp2ZG6qp3g1ECMFJgziygjSJGxAaG0MpGz+druMIEjBmiNpMJx2ef3O/AUrlVQkRK5rMQBCVjTnI1zgIlPCpKFDjqmxwHd+FSFDc4ygLUx0Mq4CGTeCjSLSIMpMsnxCvN518eqVtMQNxd1vezrt/MRn07lXv5NOv/Af06tf/VGa3Pd42rX3Z9PO+w/6E9m68ywF0wikBb0Ldf1MjuKCr4gVHkv5UWak6TocjxjXYXBGV5lNzoJk0HACeG3Edj7g5j3qPfPmC+nKyf+RdrzjmTTJ6Wdt85aWKoVJ3oWfJuyQaQVHDY7jKl/tU/kgLiJFDE01BoNej1uUG+/WxEAOZdF1+51zXsT6jBaVRTD6kPvywgX3SN0er5UUTEqJMrcNYKWRKH/gSKLWYy7DRkKKhY/E1Q5KtZFI0IFrHtwg0MoNFaNHxlGb4cRTfLJ4kK6dO8MJ5e3cVPwoo8cH0oVT30tnX3o2nfq//zlt5aUb9z368zzO+2TavnOvD2I2xkKHQBn6U/mm6ysX85ALy7DMjipR0Av2iA/F4aykB6DUqZ2hwoSics1T8SOfplWq88zp76fzR383dbdPpgff9QlY4UYesx21RynU9cnlN+ECyH6Q5yoX/CplaE7vSsQ9MaPFhZJ4eFCFbgK3JgZCvSwlXhR/hgOOWoW5WQCjizxpyFavhuweL6iLxS7JVoobGYmIQDaPCmEYoqwmkkhVpPLjCeKockQegw0kFSTTCiBxIZNbSpBdgKADrMvXXZfZ5bp6Wt9NQXH2fTS97bEPpstnj6Xzx7+eLnz/y+ls/8tp2yM70uSDP8szJvs5Mfygn6PQDUc/uWi6UhTxI8PRvy9Rooo2GwTwzYrimaUh3MhRMjhW+K1JCgA0SdNxyOU39eUrTRiG8i6wITFz+oU0c/yPtA+R9j/zT9J4dxePMVxhNOW8YBQAPZCDVCvc0C7llzKEXHhrSddoQQtZwEPbAV/mS5vxivd2wgaE19ZA+v0zqNcsFd5J3UKKapClsz6+ML51lxtMWhDCk/Cl5FZ5wuRUf6Kshgszwo1hSGptPKLkUWHFaAJXcUpxQeA7WzGUXHpWAnMToMxf0OzyeMvS3FWmXrMeUXZzlmv3Q0+n+ff/tXTpzJE08+q308WXvpTO0vdpZ3T7w0+nbbsPpm07Hk5btu9hN2gnHyXa7ntA/hyDmMl36lWH+Jcv7sRjwBwWyK4GiEV6G1JxMlBerjLYegKUuMqkjGV2qhbmLqSrF6fT5Te+mq6eeDXtfOpn0mPcNO0OJtL8zAW2eVGRLJeGH3Pk4vOlkZO4yvjGMh8Nh2rZmg6eH3vguMmQ66QFFkJlitVkHkJan8haGUhwP7vtbNqxcBaF21mFYgHNxlZvrSOCUq/ulgSISFY3EsGzUkvZQQydjwb3NABoMQyjgDM8mkhhwHdZaqDI62i+CKr/Nkysug4qH0PRiLJ09qpPvY5N7kgPvvMvpQd4UnHhw3+Lh8hOpctnjqXZ17+Tzn/vi3zKLKYW43sSz5+8O22ZZCq2/X5OD+/kHsMkPx5jZrqph800PdMRj5jyMO2RMtOlhx2Jo2z84ie4F2t2oZdApVKayxCQLDRK62yZXuCtLXY9Fr3AWzOvzRxPV998LjHjTROPvTPt+4XfTHv2vp934c6n+cuNcYicBeKApWPaGVrDjgcTxo9g5FaanGUaQfJpJNUIImiDR3stXtPbQjaBW1MDefnsy7MHdxx4k3oeoPqhy0SkoEve6o1wyEENSYq1GQjhlUYiuBpISqMrvgmXMBGDlKIEFZYVyq2lfAI7k4KmI880nd0XJTh7ubgs8yYCwgHC1EM94MKlGX4XmYqNp7HtE2n3g+9Nex55f+q/9xf84j0dhpy7fNqGM3cRw3nzK2nxbD7M5pJCnzmqlvSEsl7a1+MLX70tO6CJAWnU0VSNO9o6gaD7MR6BdBdPfMAFHLm+8nVDU3f/NY3VQcNlTlAvsTGyePX1tDhzLDHDNf5WviJw3xOfTrsf+wDP5x9g1NiSrp09y/F2ThbkkcN0hZ0LyJ5Ky6DAcDwswikRbNKUbmfxFXg2ELdEhqm9BoN5XtLwYz/Fkv6pe3hDAS271JgSa6fDN7s5tOj1h0DVFSMRAIGNGgmCNImhNKEi1Ky8YV/QMV3ws2FEnLLdDiQScJCEQI0GKoZiPsVGFAiu+BHAGAFXXKR6sfTUMfn5yzMcsOEONPdJeuNbmFbx4NHuPRyt11N5mJMfGkNxOUKul4Oro1jiW9+Lc7NM3y7zu0j4PJ/65vn+i8fT8tWZ1Nf7DZi2qTizIDZuwale+rHUS2O7dsDHk2nykb+Rtu9+R9q+62HWSQ/AI5925pvo8xdnMKDTjI76EldMq5o6q7Air+DA12oQpNYweJGoTCsdaWXdGf7wiZJoi87cjvkdZYq1ksY6QtZyBJHW8IXh/us8005LhWpaep0Jpig0PD1dnBgNoUe9JeCW0hJW08QCOoRfwmEYUgJJXaIlHc+5RdJGoJjSFXfIeMGNkEVdoFaZikcu4NkgDHLzZXznCrrG1oUVlxa05FWC5vhLTMVcZ0ExGvXMGmn0xN749vtSZ4emUVobmHHnk+Jou1iPpmo00CuL9By3T9U6rDj6o/SqmGSVEw9MyXgzpqdr2iTgg5NsiGzxmSpN3dRXLS/wBporV9M13iUg+hoNu+N5q1rb1BJQrWIJB8DXVrkND9E+NWNwNHJV7qATp7rpQxuXEzrXxh4am0+Mshvt1sxAphDxIWqH2h0driQK191Cj3iJufl82sqc2/cNQvcyqpQWAOIKu0KxpahSIpwbhHBR/LouyXluNppkNFGyHojLxlDMs9MElotWEz/mKoBOywgFpypNbmfgYTCRRVcr+2L+SGXBF7rqo/pJuWUw6lQwKPk6LNjjLSNsK6XOVpWpDkdZFFYArzhoSj42Mh0P0W9uKS3yJGecpJah8UCYhStDwjCgr7rppz/TcxUcywIwIGQhXJxTIxixnMeJ171EWzpZ64+gOIzdGVzlZerDQ8swxrrF1sxADuUq0BG9oiDCZJ2ZW5K582DpsqcZnAzMmKOepC1hcnV3H4ItRuLGtJGIuJpKipIVeLXRRBxYodpGUZpnFJZbvYwqYs08CD/XoaUMGSJGhYkL3h3KymRwucgASngV3y/Xple3U91MA5rxD7gGHC6lNUUJkl3hST4/ya/HCCYnqVnADgdEoAjVANEIBx+t9IxiSg5XQCCtelV9YtTQKBkupKHcCvHTI4wl8VaIBpk1uK6ZgcBrSKHTP9XnaCZNoykXlZX2EuwzB/dn3h64QbVCNs3iPfc+ULCxSXnIHUYTpG0bQCNdpQWNgi/ph5KPGoXYaMEUJW/kVpIpGEdJolNc0CPWaKgibZQh/JLPfi0goDXaUuxWUZmmsASVsjWkkU6FK9jiXpHAl+dEA3Ish9s4OZyxydLCr+GARbRJN9HrXSR/GwgBpohtuqwX6cN8GJRVl11U8nq01gG+lgYSIl5cPNkZ33IRdeGec5GspLSEgVzx9qNf2najypJN6laWMVJWQ7ISuWdT7+iGFyFCQ6MJxdlQwAmurFWhwlxr2yqf8gcg4AaAP6RuImgVFbbxS1Nm9IAORYx540tlJNBGokGzXFuJNSgeayRXI+IVWpoAMhU3Jw7HW/mUR1Gq04wiAWthibEbO+dv0dBxq9IRlJwhsk1jIOrV19Rt27PnTXr4k0WXXZgjvBOJ10+Wcz43ZMJCo/nUGm6R3CytxlZiEyU9x6PRFVdexQJS4kpwkhmIfAbkomoOEW8QnVrS7JfkgmNfwPxTZoUrkVa84LSSo7ihEshZENpk2jjA5TK9SFGJuSyXH/GACdcZMk7OGzHI5HxCUQeR85uCkgTPVwdv8VJe+1Oer6k0cg9IOX5UG3JhLrdIdy3Q1tJAJL+Ov1w1SHzezd1HlqnHgzRgBFnko/EGRspN6uhmDT0rzUOjDTdc4AQhiMY/ngooEcXiL8CCV4hTXIgVpJWt5DK80Ir0aOQoo1Aa8gt9F0VKjQ9hlRIKUfwcNGlnbvIGp7noSIt6BMjXUgeTibLIlhFy2YW2E0iqcRWuuPh1SLGhsKC344JWXpyzQ+fp9iiBQac8qj2asu7xtTSQNJWmfIag3xkccc3qHAkxa6G+zN4/N7I8J73lviJat91goh1G4lZUxPGIcRVy/AszftULJRGNSIqEnCx1yPj4mU5FdWrkd/lOF16h1fKVyU6JI241/EzLClXLCdLO7TxchOf0UmyGZV5LqusRkYwfNTOvcfG1LUfXzPRVoujyLxoZX6Hbd1DNNP3VYy9Nh6nQmeo7eXK3rBWBfu+va2og5Z0nnIH6geuq1bYdI4juAvMKIL1ITnv8kX47FZSghxss4m7BXEw0RkAC2TikqvHd0NUTJKCRFPiBWbFznpzWEHN5TbTQavkkWtlX83PJLezKQhCOYmuFRcN/roFxmzTniPy6NkyZSMkXCFF5X42nUDgrcY2Si3BEK7Cg3obPGs/3eGIEGfi4lVQw08z6wRTsnIhO6bLBbi0X6XoqxDtZHJI7yoY8NtDayfIIwiKdeyFLHIkY48bW7Ys+N5kWzHWlrUaQAUqyxR6lFoT9Tx5naxbkxiq2S2INkqGSzdy106LtTLm2cUaLpFJ+i5Wc0HhDlR6KBE4GDaesCiwcDuUrEeeoRCIQsAo0aundSz4RbWEH+G6u2tpV+5gwNztHTvKKNHueZQS5m5LuSd41NRA4tGw7S53Dg7EBR+ISx/Xy9i9bvXrbO9+bZprFOkT3Q7I+337N1MNF5mIoEad4G4XSoqWDIe1ARVxlhfE4JVioVtA2FmGuNBhliJyRrmvj2jQb6GqhhsZoak5ZBSFArYRWUFzVqAM1FnANCS1n7AqKQINSE1o5bjMoEshKTz9YvLqB6acUhyYx2ukV67wNx/OPe1DwbfI5gj7E3UjaPYseOXXkNT4wd1gLdVdflN3Fs0jjdKlGEL2fyhK841IlSxkKV4vVF4GIK5zjok9csAZipIwrL/4CkLOaREkpfjst6LpwlVd+lVrJs7rfFN7Kaxq5jFpUkz/KqAkO1FTzK1AJuASimT5J4chRyrFEFM/Zcrxg3q3vbkozCbMkX23emmLl9yoxuciftjLm3RZ7V/nX2kAkCi3U9X6Dl2Ug6kTMsVoh8YpPjpzokJ8W67HT5dS7uFj6uZEjrBaJRg/1qcQB2lBAE2ZuObwAhFfyZFrZi0aOtNWvuZQh/KaIyD8SH4qupFr4qnlzoGLWsmqgsOl6On9li1yuvwCB7/oq2BSgyD1zGql1/k7Od9G1Bom5sEFcNKNdXO50NNvYFG6tDSRNlWGhM/iOa1zmQjRCfBNbZ6+X0wKnW2UosqB7467T6IBDMawJuSgDAw4kUnQNOAn6z2oT6lhirYQKCsSqtkRv/S/o1cJaNDM/Q7RINlj47fSczUwXeFS11l3gYLQWWeKBeY+vtKvmDz5GI6PAUAYeQdoNrins4HJnrrNpRpC1XoNooR5NMeh914NHeT2hwDx+O+BFcpqLLvOMgw4v6ok7t1hbbnfVVi4ekkGwrFHcXFYqiMfIFqVkmHOpISM7aRi0wpkvr1uUw/GKVJKV0sqrSM6o4ApX8gunhNuhnKEm1UClVCGlTjUl0xmCB3YDqrlbue59UKXECIKp+Pw+u5ec7HZ7k+bBZJAubNuz7UJ67d6XfycU19xAJBMxttxZ/jPOpr5JH/EQ/algBLVQ53MI3DDs8FzCAnfWxzGQukZWxnvmilKEorYNRQ1UVMSNVJTZGgSbARzhJOfQVFopVf9roAUTQilB4es5cIbQhiJDmWpKo+VD6SK0MilyNfBKZSTv2kQ1eslAkKg7xVCNKq9ghm/McHOZryParS+Dq1R7PQxElexMT0+/cXD/4y+hmA9xvD3eTuaW0uOrF1Nv8uG0qIeImJf2OA4/oimrsH6noJB5GVFUTqP/NJyTA2f2Kg8kwGp5DFbPrvT8OCzPdOg4OhllPJ6n4ksBwpUyQCkgJVRdyGi36FUSDugiQhVaqdjMV4AzAK9JakI185oHJB+eY9E2r59J0QIdV1hBeD7i3/dTINGBNqmBuwHX9TCQNBUf3lmi//gmM6yfQ6uyWLQO4dU/89wXYv3Bk9MeRSa26yM2SOMOFerW5FhahlZYMf0SjFGPqZ+2oNuMaIaonwxEBmOj4Qk8G44eiaXxw3h0pJ0KqA4tfa5jVTWmwm2pbMPXUMaCZr/grDZKCKGkRz0iawOL+DpeKVqdkG4I60ahHtriC0YwoK4l85V1ot/pl7dxKhFr2li3LgZSPqNFb/s1yYP/eAeBQlqHLJ5jzXaNJ9omMZAraSsf+Vz5pOFaCioaKXS2pagA4uUJBRY8qJGXeehI3/tuRg0pgUYUGRCP2+rpQRkQxmMjysZU6QnXlgNNy0Q8BB8qJeg2cXFgO25AQstuGNjY3jC8YG+MHztY4o2xxO3tN2OPMjMYvCoQnWoHvRlNXff4uhgItdJ4kLqLi9/u98bO09gcfTeMoB4B5T1ZvI60h2H4I/Pzl9LExP3rMIqIq1EnpVJjMqK5t2unR1qsScJo1DMOO82zeWrPvWWjoI3xaOSRAYXh6Gk+xWVEZXQKXBHWDxr+D7/EVaaoZwxFsxN0EzomDRqRLTtuEvLQPcxL/TK/eRhnmvWKud8ExiE+1stA3JY/Onny1MH9B77NTcOP89hnHmuVxCO482fTYPIRT1HmGUW28FuidB0AABTSSURBVC31HsdPPNeRFqyXM6eaDmgbUiy2pgHmITfodfnRKBIMr248ep6cR2Bbb7UpBlFGn/aIE8bD9gbKFOnQzvKIiWrhJ/slWvhbT9mVMkd9eNCIqM5PzPtdxmzO6PNr2WEevGZQI/ag87pgh6rlZIwN8tbLQNIUQwWV5i7R4CsI6eO0dm5KlJB3QvXn3mRn40k6FYwCBbrG2z128HbCogzrJh/rH1+eyiNAo+TSNLF8M1+cXg/vZsajgVZTt/m0kKWj4rQNIOPwugdDKUbjKZyeW6/GAx72HNMYTWQKL5nY9dgy3lpeNCKzlY9MVY/+EobSZ6OK6XXIylJlSzOxTl1+LXNSJLCWjN2U9roZyKGYUomhr/DOI1W+VbaeUWcdwquAemPbLMTFxbk0z6cGtm3bhXDVkyvr+jgtpJcov4wEUWppr7v1r1cHGY/SoqKj9a3rnqReOBbnBd/GYwMq78vK6x9P3YoBZeOEPP20S4mnLEt9rsfXXcIhLzlq9NC0VS+xGNABDPrIV5/hgxs5ccQa61xnbPykASUhRzbKaynpmrNgSTCEvEAzvog83suQql0KzWGQEO+/nTvNi9PiGXX1khpF9LqacYxGZ1VGlcb57vklFpO6aTlsIFJcVWGtfFXkevRDyaJs4Skeflzpd1G+ZUZeOS/wSZfSefTxjhtG4x22svaR4WhUGre/ZvpoPulwvBsYPA28gyVeayVks6rTySNHjmyak7ySZSinQmvv1Po97ofQdQz+JCufF+8aXPQyuf611xhJ2ocWO+nq1XNueNYtnjqsJZtlaqKdNB+JcAParil2I32VfaMfhoB8pPCh9GEMCutGjOoiBV3gDYvX5mbSLDK9wgdyLl1+I83RCdmV6kXsnl612aHyxY9G5wHPAYXq5UKxaPM/GJwgoXSaa8jRrVdvPQ2kcoU8nnUvFwcZQxA+dnKWxTrn1LRP7hGD3pxBZnb2tHtICVFKvCYOuqKvebI2CXwv45YKKr2g/NGfCLTT23GF5a6XfjvwIpTV/FWMx+uWMKbF236iM7i+pavZ0fRq3nKVfLU12efkRKw/MpVyD2QwOJIhG6KXq9VpvRnxiNEZH3+OjuQHCEzl51bF02eir54CorutYlfTKu60M3W4MvumBV0Vt+jCarW6E1jWx2u87Vzz/WBAhShBbMpv/4jagSM0We6KX4ELUUhyxY9YEy/w4pf04hf4nfjKs/InhdV29BL3oHweoJAuRd4DX5M8nZCIDpEOjtEsLV2iXZv1B4kh/Q5Tb9zUPSj3XpFYbwNRE4wxz5wn8EfuUerinWlWdzvb4ydYrKuHKVuAYSSaJlxhJJljiqC29rEEKywU76Jhy4ikhtSaZ5FpSGO3alC2e72o1LYvjVsyyGg8hYFPeuQb/zLuCkMbaUbVo/4IOFz8261n6NywURcDb5fb8WYIE7FAbSfdbVgGyPESGYjbmviAd1IPMJBoX1UQx91TDIh+iSdPcYeqTii2sW49F+mlprHuGOv+wWC5/xmA2/jlLpsG5MNCy7wvtqvv/0l+GpYJhDEN0lV6eM2lt/IE4hiL97jBFqi+ZpmT6foNXnAg3eWevnq3q9fOM7XiA53FMIXD4nZ59rW0dPF5ZgRvY5dF0xVEln/x1VvtHAnGorf4oqFfnso4jDHZ8GxUoajutV2/zKzCSrqRqwYqpFKRkqEVr3gtWEFzGbpE56M3yyzwEr+t4ztXuTlaMt2er+K1bpznAOoyRhLvPkPWfqyBTmhsN8VbFRg+JJR0ut/tlynWKkzfXvn3CnujDKR79OjRHxzcd+B/IsRPs42rVToahdfjG4azR1Nvxzs5eqKj72FPoQyoFGi6IzvL2897hGUk2uXS9rB2vvQ9jRixi4yLX0QWShjqwYcoaDAtXLVrJdrhyGMl0pGIWehxbkiPBzOCuKe18sGXeRN/KoOf4M6nSxk1wlh8U6wYlw1JN/7C2OwDKwYXhqU0GRU+hiqjbAysZWwUGCMeZdrY5FN8NTzCo858i2chCrWb5q7N8F4APrOg0bDWw8l3dPH0DcNwp+ORM8gMFvVGH8kqynbIwc6R6enj+lSGnJjbFG4jDEQVzy0z+B1a/9NIo9WcOgLPt9SvnEzdPU+GqJwqmYXc1KAioK1f9Xzz/KTcPV6ErW1hnQbusd8u5YqRJ4pTwVJyz7t1EJF7HTIMuTCOkXaB/kDfdO9okIttUSNHgzrYXADWYjIde4UmvqdobG9yGyj+WkZWlbZ0CA1lG5sNLhubDFk32fCLkXlUk5Flo+MV8hH2KCZjU+eh5qaT4UjP0D0I5KvNkGt0OpO6OXuXTvYlm1bHo/VjlS111Mnt1Fp/ILI+bdRjp4s337iBqdzGH1IsItgoA2EynxJdxh8zinybhfeHmOYIhlg1iuzCQH7IKLLXBxjRaIQq7ZOyNX4oPw0PVGnaStQNxrC26FnDmAoGakkj+Qc+GOBSpF1R5BwlbaDDiEsz4JQ7vm2cdvg6JAqp4psx8aKSswtmS6wAW/F2OSWMT++sj4ZUQ5NsbGQyOuHJ0IqxKU6J3ik8ncYf+GQav+8AyYg8y1VyWNCBUaaa2/n6leSp/4ZRwrfgbByixTpSN3qrcUBID8YNFs5TJKclCm95gc4Rk2+K/BQlHlJgk7iNMhBVXz3FEndz/x3z08/xmn5NiLNYNE2ih585mra87f0ZptaSG/UDqpaUwVQSRmVCZLsreSK9jECRs6QVOvgC0QVqO1InjWWwtUEDra19Aak7MYpWLkqFAqdeXWZOW6X8inejANmzcddCarHtfMIrcYV5D8A8vbiMyfBSPi9nYpSRUsvoJmQk0NP6bFWyhWTxMxntMmraqjWd11hKV5rkiQEOlvm0W1efrLTxivgYM2zmrr3nhXpoRNCCbaQr3edG8GAJbZuc/n0a4QV2pcaQo2HyOvqe+uyfpaVrpxEuduwGqC0NvyVcfFUht1Lxadkwmpizx4gjfOGVX8k/6jPOX3sDvAInGE43tXocZx/nw0DjKET8er0xjlGMkcSv08s/yZefNVnhSow6ayjTF3A0cjIctH4ZDoeSR/kVhlu++utWtKKWLPIhryL809N8PF6wcMa9eYsd8MQa+sqUTPeBrlzh3hM9fmyrZ7ZVlFzbL8Vb1jFyzPL9Qw9itqyCTEU0vdLI1xKD2oTf4fn+/Eum3VDP0Y31NnIEkeR6L76YFg4eSP+KG75/4JciWagSihprZ1o6/zzTrI/Fgn1oqlUEfzP/ZgIeya+WRZ/7rGv6s8cZPfT9EimaW67PpgJbkul/cbDji2jBozTvDjjdgQpN0O6T8ll/TrAInaAnBtaZALadPJpXyHjcKWn3rKUoIj/sYEM9edupN285RfTTUoyiudYDoC0sG6iMNDtGEJ17W+aG7Binp9vTrMCIkURrM9170m7hlvx8jpTZPIl1OXzqT0BHXViQz8/YuFSkcIO9wJOB9jlKFOu5kCcpXn9Qr2+cPHlS3wTZVOsP+GkfGFR03Z16z+6R48f/kGPwX6YH/nmGW53GiyGDIX/Aqc/F899LW97+YYROO1sbWsLPDeTWsr6UtNv1W3WncZcuv+KyOz22m7OBiKIcs4V/fvj49J9GbNVr7+DBg2NMG7dRn+1b+v2J5cH4RG8Mv9+f7HLijKnlBIPIJCrCirmvQvgmduc+FGuCnTgZ1yRsTDJz49OeGBqGhzLqDQfbGcJ45HKgUWoVYxsyItCgpNEqBISnDUM+gXf5OB8cfTtQkWjnCbkF6UG6xrM52qod45S1dgzjkWMXa2PRF7P0yiZ9wUpHSmLNAckhmrnDmX+T4rThkcvL01I4/Ipy4IqII7YJrhs5ggxVv7/U+QyTrGcAtu6LaMGODs2/mhbObfV6JJ5bxq7cQxUjEKnSyHfqQ0t6xOG9ZT5muXz5B5TdGAdUPXpQ0NcPHz/+tQ996EPjO3fudGH5iUmFy2+Zm6Eyfm2RcWfzjp0q2JWxLS0tbUeRto9jbP2xsUm62glGoUmGD379ic6gO9Hp9HfKyKgFi6b+LmQ0Dvx9iOqDjZHAoh4vmH+FVyM/msZ27gOVPqkaiqogJz+21RXWDdQFPjoaI0PRYxufm0IG1SzITcD53aExWvbnz1MON4DH+LSuZ5UQZf0BX5c6y8tfzTkks03lSk03lKmpqakxlGzpiX0HPkOj/1YzimS2NJIsz6TutgNpy/3vY52p+yPIUqOJnGvRrko0rho2Em/BFy2MQ082LpxWeylPq3dlXaA1Bjb0t4+8cuy/kHij6UCbGVDtCqz6UzlB3qEIq1A5+eVnwJ1ennj0iYNsoj6PKpe5Yikf8S2mrQ9OcVNW9sTaoBqJShNaYadmuQkbwm/nE7qmZbxr4PQ3Wftwm8M7WK7aMpszWnf+yZHp459YJaMyb7hTI2+444SvpgDdCzMXv3b/7t0fZGH4ND2LplqZPy3amdYvnqF3R8jc0JKRxI21GO6HjeVGVRppbLcpMDYCtLuzcPb/oRd6458GVyXKwzh8yz79HxrzHwIREfF8O85aQYbi96ehUX7ARa+k5YKBRFkqr/1TpUtc4e4UUtmP79/UVPenp6c7nfe8Z/zloy+fuX/3nr1sKHwEmWqFnAWm1QP3Ja6dQZwPU12WSOp0bCRg3dCpaLk2mwEZuiqZRb/kujTzAqSZLZY8WCyzAZ4iTP+Gdv/GFGPL9O3LFHpr60pN17aUW6Ouhus/+uij928dG3+OyLuZPujsu25CZAeUNh70ORKyZS8z+UeZLTzA9v5kGIuwPKpk3b1R+7nm0NNUDcVYmn09LV34DgSI+75H1X9R0cxC937/8uHp6a8Tl+FuuukAPI06y3Tfvn2PjHe6z2MgD4EgvgW35weXxu5jjfcRBlC2Xz2SKE0CctXv3FdbYHAL575Hx3aYYBnETJiJV+dCv9f5yWPHjp1oFUhw87jcQ28KhtQavUuXLl19cNeuP2Z745eY17IZ3x5JQuAaTdhi4vmRabaCT7A7chG7Ybpf1qK6a8xPq2k10Ko/CvMbHelBFy+8yJrje6BBV/lKLxdiWWZLt0eH91lubP5XTQcZ8d4KxiHuJdOxmZmZS/fft+eNbq/7S2wcaJWeDUTBLcjyKnI8Rb+wm7vsUmKclVsBGcrtOvJ4PRej8uLFb7WNQ7T7iFQPh3zh6PTxz0FdQq890u2Wtpb4d1L7teQnTaWpsUOJ9YjmzmP9L9N1P06baiTRnKfFr4JqZ+TKQDPgq7lK7vTYFOIgXGf8Pnx2WXnxQzliASJ4Op07x1pjJu4HsOWZMAw9sDUyKEi5lpiabEFXPnd4+tjfJZ4LJPTWclLA5Sf2H/i3vU73H/D04cqRmdsw2jEcu++nvHCX3DzlqoaiChfxSzQKj/rCweWRQ7dzFk5/A1mfpg20yy18O91L6vLmpGeOv3r8T4GYv5y2qbxS403FVFm079+//+HeoPP5XrfzV9geFY9lXTLCt6IFpPtvtL93izXllivpNJB6Nk2r6Dljy1F2J9q18ZRBRAasyXWX9wtHXjn+qxlJhIYQhfwWcJVvjvY8y0bIp5HniJGEjHQOrjP+UBrb9RRrE6avbFxY4d0R5ZoKdTVXJMO6Q899LF54iZHph9Cod85Fi/Ucmx2p/yVG5E9CZlN3Oter6mrVX29Y7VUO7t//j9Hof0qvswu9RfiaKOPqVKFaR+YxGhuEHC8t50wtmI0ux+0JUdMn3R3HEga/zT2a38gIm7ohM4838sw/nc42jjH+N254fgIjWdnhaIqJ7QzYku1uYY23Yx+7hw+wh8Hue5mZaYQY7SfU6VjeqD6PDSxe/CFT31c8ortTCs7cEBo9QH+G7fJNPXqI5aJBwf7mu6pR3Rrv3rfvAN+N+A1if5Pdj3eIVU2naSvAHgKEW1pJybfsKKBPRllLGEZf38jr/iO2c383E7Fy3TLBzYvoeugezsz58/+J+92/jpFQ/Q6dwkAdUnZIQ8agh5swFJ1F62x9mO1gDMUngcu0VeTkaAcd7OT0wTKvb1qePUZDQJYH4EKsRtJlUVNWivwdRuW/R7x2ghVjkwU2u4FIXJ0pBHkoziqlJ/fufWBpfPwT7KH/ImnP0Bv5fLZHFvdsVvRYRHOnVpPddiVlbflICwMEG1NxbspYjEyzQD7fWVz8l0dOnToJqhpwxfwL2FvZVWPnvtM/Qzj/QpVBfitHE/U3MhTWEtrtSnouhh0+b2bojrh3+8is2RrrlwEbJ9oej90qSX1ohF5i4BhH6IcX+8s/c+LEiQsgCElNsmldW3c2LZOZMTWs+K07SPtZo9Dlf3R5efBzvU76CJJ+ivSd1SQA0CA5e+NhFUEJEG+a1wm+F7GtL473Op//4bFjPxLm1FTi5qUPEDYZf3xCkqUEM2D6OoX/71HepzUi41YxFIHJoq7GnRB4umdSZas0+hIbk8gOGYYyL9ImbJelM0xcP/aj6ekfElbnU9uS8KZ0byUDKQIUz6Vnb7dE7+Bjj+1n+vUUTfRuRo4nMYRHQN7DmQYOEfIZURqENp6ljc+x0/gqBym+Oxh0nz964uj3oalFq5xor9rKTv0xupTNkL17905MbNnC48+d32RxsLtuiMQIK2NaRU9GQRLZiNM2Fk4nELinNd3pL3/qyIkTL03lncoR7E0ZHa3lpmTyBkyJ/+6vcPnDG/dGUno1tFqx3fURDTfFNvKh6PraRpdTf6y92pM/xZDMPEjrvL9Dj/92DRY+56g78HFS+DrG0pZPR8OL5MzmI0MKPRKj9BcGY92/z2PWp4tRtnNs5vBb3UBGZWuDmaLHO9SMAqt0be4RuxlPBiGc1fAA/7lwnSkU+lBe5z322GN7t/V6v8zZgV9hTfbTGItuYmidYilp8eaogLisRLoz7oimuDqDT+x/M9v610dOHH82MN8a06rMq71ctzboxzLcruefZ0O4WeN2pxhpD2VDEfLjjz/+vu7y4GNsd3wUA/gJjGQf4F0YgZ9oEU5YC9OpTucsQ8yPMKCvcRfp2aOvHH1O6TiNPHJvudG5rThRhb+4/oUEYlAoU6/aoWh6dPLw4Yf7W7c+wlNjuzEWPaeCXXSu9pe75zk196qmUS0BSr9kHJt+Md7ieSj4/wFb+gcGoEhIagAAAABJRU5ErkJggg==';
 
     /**
      * @param $image openMouth | smile | wave
@@ -34,13 +34,13 @@ public function getImage($image)
     }
 
     /**
-     * Static alternative to retrieve image
+     * Static alternative to retrieve image.
      *
      * @param $image openMouth | smile | wave
      *
      * @return string
      */
-    static public function get($image)
+    public static function get($image)
     {
         return (isset(static::$$image)) ? static::$$image : '';
     }
diff --git a/app/bundles/CoreBundle/Templating/Helper/MenuHelper.php b/app/bundles/CoreBundle/Templating/Helper/MenuHelper.php
index 51bee30b020..309ea35cc26 100644
--- a/app/bundles/CoreBundle/Templating/Helper/MenuHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/MenuHelper.php
@@ -1,30 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Templating\Helper;
 
-use Mautic\CoreBundle\Security\Permissions\CorePermissions;
-use Mautic\UserBundle\Entity\User;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Knp\Menu\Twig\Helper as KnpHelper;
-use Knp\Menu\Matcher\MatcherInterface;
 use Knp\Menu\ItemInterface;
+use Knp\Menu\Matcher\MatcherInterface;
+use Knp\Menu\Twig\Helper as KnpHelper;
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class MenuHelper
+ * Class MenuHelper.
  */
 class MenuHelper extends Helper
 {
-
     /**
      * @var KnpHelper
      */
@@ -49,17 +44,17 @@ public function getName()
     }
 
     /**
-     * Parses attributes for the menu view
+     * Parses attributes for the menu view.
      *
      * @param $attributes
      * @param $overrides
      *
      * @return string
      */
-    public function parseAttributes($attributes, $overrides = array())
+    public function parseAttributes($attributes, $overrides = [])
     {
         if (!is_array($attributes)) {
-            $attributes = array();
+            $attributes = [];
         }
 
         $attributes = array_merge($attributes, $overrides);
@@ -79,7 +74,7 @@ public function parseAttributes($attributes, $overrides = array())
     }
 
     /**
-     * Concats the appropriate classes for menu links
+     * Concats the appropriate classes for menu links.
      *
      * @param ItemInterface    $item
      * @param MatcherInterface $matcher
@@ -87,17 +82,17 @@ public function parseAttributes($attributes, $overrides = array())
      */
     public function buildClasses(ItemInterface &$item, MatcherInterface &$matcher, $options)
     {
-        $isAncestor   = $matcher->isAncestor($item, $options['matchingDepth']);
-        $isCurrent    = $matcher->isCurrent($item);
-
-        $class    = $item->getAttribute('class');
-        $classes  = ($class) ? " {$class}" : "";
-        $classes .= ($isCurrent) ? " {$options['currentClass']}" : "";
-        $classes .= ($isAncestor) ? " {$options['ancestorClass']}" : "";
-        $classes .= ($isAncestor && $this->invisibleChildSelected($item, $matcher)) ? " {$options['currentClass']}" : "";
-        $classes .= ($item->actsLikeFirst()) ? " {$options['firstClass']}" : "";
-        $classes .= ($item->actsLikeLast()) ? " {$options['lastClass']}" : "";
-        $item->setAttribute("class", trim($classes));
+        $isAncestor = $matcher->isAncestor($item, $options['matchingDepth']);
+        $isCurrent  = $matcher->isCurrent($item);
+
+        $class   = $item->getAttribute('class');
+        $classes = ($class) ? " {$class}" : '';
+        $classes .= ($isCurrent) ? " {$options['currentClass']}" : '';
+        $classes .= ($isAncestor) ? " {$options['ancestorClass']}" : '';
+        $classes .= ($isAncestor && $this->invisibleChildSelected($item, $matcher)) ? " {$options['currentClass']}" : '';
+        $classes .= ($item->actsLikeFirst()) ? " {$options['firstClass']}" : '';
+        $classes .= ($item->actsLikeLast()) ? " {$options['lastClass']}" : '';
+        $item->setAttribute('class', trim($classes));
     }
 
     /**
@@ -127,7 +122,7 @@ public function invisibleChildSelected($menu, MatcherInterface $matcher)
      *
      * @return \Knp\Menu\ItemInterface
      */
-    public function get($menu, array $path = array(), array $options = array())
+    public function get($menu, array $path = [], array $options = [])
     {
         return $this->helper->get($menu, $path, $options);
     }
@@ -141,7 +136,7 @@ public function get($menu, array $path = array(), array $options = array())
      *
      * @return string
      */
-    public function render($menu, array $options = array(), $renderer = null)
+    public function render($menu, array $options = [], $renderer = null)
     {
         if (null === $renderer) {
             $renderer = $menu;
diff --git a/app/bundles/CoreBundle/Templating/Helper/SecurityHelper.php b/app/bundles/CoreBundle/Templating/Helper/SecurityHelper.php
index ebc41e3bd8b..aa400276ae7 100644
--- a/app/bundles/CoreBundle/Templating/Helper/SecurityHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/SecurityHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,7 +19,7 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class SecurityHelper
+ * Class SecurityHelper.
  */
 class SecurityHelper extends Helper
 {
@@ -40,9 +41,9 @@ class SecurityHelper extends Helper
     /**
      * SecurityHelper constructor.
      *
-     * @param CorePermissions $security
-     * @param RequestStack    $requestStack
-     * @param EventDispatcherInterface      $dispatcher
+     * @param CorePermissions          $security
+     * @param RequestStack             $requestStack
+     * @param EventDispatcherInterface $dispatcher
      */
     public function __construct(CorePermissions $security, RequestStack $requestStack, EventDispatcherInterface $dispatcher)
     {
@@ -60,7 +61,7 @@ public function getName()
     }
 
     /**
-     * Helper function to check if the logged in user has access to an entity
+     * Helper function to check if the logged in user has access to an entity.
      *
      * @param $ownPermission
      * @param $otherPermission
@@ -84,7 +85,7 @@ public function isGranted($permission)
     }
 
     /**
-     * Get content from listeners
+     * Get content from listeners.
      */
     public function getAuthenticationContent()
     {
diff --git a/app/bundles/CoreBundle/Templating/Helper/SidebarCanvasHelper.php b/app/bundles/CoreBundle/Templating/Helper/SidebarCanvasHelper.php
index c67a18ef151..4f20a31891b 100644
--- a/app/bundles/CoreBundle/Templating/Helper/SidebarCanvasHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/SidebarCanvasHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,12 +16,12 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * Class SidebarCanvasHelper
+ * Class SidebarCanvasHelper.
  */
 class SidebarCanvasHelper extends Helper
 {
-    private $canvases = array('left', 'main', 'right');
-    private $content  = array();
+    private $canvases = ['left', 'main', 'right'];
+    private $content  = [];
 
     /**
      * @param MauticFactory $factory
@@ -43,11 +44,11 @@ public function renderCanvasContent($templating)
         $adminMenuContent = $templating['menu']->render('admin');
 
         if (!empty($adminMenuContent)) {
-            $settingsMenu = array(
+            $settingsMenu = [
                 'header'  => 'mautic.core.settings',
-                'content' => '<nav class="nav-sidebar">' . $adminMenuContent . '</nav>',
-                'footer'  => ''
-            );
+                'content' => '<nav class="nav-sidebar">'.$adminMenuContent.'</nav>',
+                'footer'  => '',
+            ];
 
             if (empty($this->content['main'])) {
                 //insert settings menu
@@ -69,11 +70,11 @@ public function renderCanvasContent($templating)
         }
 
         if (!$hasContent) {
-            $this->content['main'] = array(
+            $this->content['main'] = [
                 'header'  => false,
                 'content' => '<img class="img-responsive mt-lg" style="margin-right: auto; margin-left: auto;" src="'.MautibotHelper::get('wave').'" />',
-                'footer'  => ''
-            );
+                'footer'  => '',
+            ];
         }
     }
 
diff --git a/app/bundles/CoreBundle/Templating/Helper/SlotsHelper.php b/app/bundles/CoreBundle/Templating/Helper/SlotsHelper.php
index abe1ee66d7d..dfdfe8a84d4 100644
--- a/app/bundles/CoreBundle/Templating/Helper/SlotsHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/SlotsHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\Templating\Helper\SlotsHelper as BaseSlotsHelper;
 
 /**
- * Class SlotsHelper
+ * Class SlotsHelper.
  */
 class SlotsHelper extends BaseSlotsHelper
 {
@@ -22,7 +23,7 @@ class SlotsHelper extends BaseSlotsHelper
     protected $inBuilder = false;
 
     /**
-     * Appends a slot value if already set
+     * Appends a slot value if already set.
      *
      * @param $name
      * @param $content
@@ -33,7 +34,7 @@ public function append($name, $content)
             if (is_array($this->slots[$name])) {
                 $this->slots[$name][] = $content;
             } else {
-                $this->slots[$name] .= " " . $content;
+                $this->slots[$name] .= ' '.$content;
             }
         } else {
             $this->slots[$name] = $content;
@@ -58,14 +59,14 @@ public function hasContent($names)
         }
 
         if (is_string($names)) {
-            $names = array($names);
+            $names = [$names];
         }
 
         if (is_array($names)) {
             foreach ($names as $n) {
                 // strip tags used to ensure we don't have empty tags.
                 // Caused a bug with hasContent returning incorrectly. Whitelisted img to fix
-                $hasContent = (boolean) strip_tags(trim($this->slots[$n]), "<img><iframe>");
+                $hasContent = (bool) strip_tags(trim($this->slots[$n]), '<img><iframe>');
                 if ($hasContent) {
                     return true;
                 }
diff --git a/app/bundles/CoreBundle/Templating/Helper/ThemeHelper.php b/app/bundles/CoreBundle/Templating/Helper/ThemeHelper.php
index 7964b79551d..fb66682a604 100644
--- a/app/bundles/CoreBundle/Templating/Helper/ThemeHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/ThemeHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Mautic\CoreBundle\Helper\PathsHelper;
 
 /**
- * Class ThemeHelper
+ * Class ThemeHelper.
  */
 class ThemeHelper
 {
-
     /**
      * @var MauticFactory
      */
@@ -54,29 +54,29 @@ class ThemeHelper
      */
     public function __construct(PathsHelper $pathsHelper, $theme)
     {
-        $this->theme = $theme;
-        $this->themeDir  = $pathsHelper->getSystemPath('themes') . '/' . $this->theme;
-        $this->themePath = $pathsHelper->getSystemPath('themes_root') . '/' . $this->themeDir;
+        $this->theme     = $theme;
+        $this->themeDir  = $pathsHelper->getSystemPath('themes').'/'.$this->theme;
+        $this->themePath = $pathsHelper->getSystemPath('themes_root').'/'.$this->themeDir;
 
         // check to make sure the theme exists
-        if (! file_exists($this->themePath)) {
-            throw new FileNotFoundException($this->theme . ' not found!');
+        if (!file_exists($this->themePath)) {
+            throw new FileNotFoundException($this->theme.' not found!');
         }
 
         // get the config
-        if (file_exists($this->themePath . '/config.json')) {
-            $this->config = json_decode(file_get_contents($this->themePath . '/config.json'), true);
+        if (file_exists($this->themePath.'/config.json')) {
+            $this->config = json_decode(file_get_contents($this->themePath.'/config.json'), true);
         } else {
-            throw new BadConfigurationException($this->theme . ' is missing a required config file');
+            throw new BadConfigurationException($this->theme.' is missing a required config file');
         }
 
-        if (! isset($this->config['name'])) {
-            throw new BadConfigurationException($this->theme . ' does not have a valid config file');
+        if (!isset($this->config['name'])) {
+            throw new BadConfigurationException($this->theme.' does not have a valid config file');
         }
     }
 
     /**
-     * Return  name of the template
+     * Return  name of the template.
      *
      * @return mixed
      */
@@ -86,7 +86,7 @@ public function getName()
     }
 
     /**
-     * Returns the theme folder name
+     * Returns the theme folder name.
      *
      * @return string
      */
@@ -96,7 +96,7 @@ public function getTheme()
     }
 
     /**
-     * Get the theme's config
+     * Get the theme's config.
      *
      * @return mixed
      */
@@ -106,7 +106,7 @@ public function getConfig()
     }
 
     /**
-     * Get the theme's slots
+     * Get the theme's slots.
      *
      * @param $type
      *
@@ -114,11 +114,11 @@ public function getConfig()
      */
     public function getSlots($type)
     {
-        return (isset($this->config['slots'][$type])) ? $this->config['slots'][$type] : array();
+        return (isset($this->config['slots'][$type])) ? $this->config['slots'][$type] : [];
     }
 
     /**
-     * Returns path to this theme
+     * Returns path to this theme.
      *
      * @param bool $relative
      *
@@ -130,7 +130,7 @@ public function getThemePath($relative = false)
     }
 
     /**
-     * Returns template
+     * Returns template.
      *
      * @param $code
      *
diff --git a/app/bundles/CoreBundle/Templating/Helper/TranslatorHelper.php b/app/bundles/CoreBundle/Templating/Helper/TranslatorHelper.php
index 72d00f588a7..71945fe6f95 100644
--- a/app/bundles/CoreBundle/Templating/Helper/TranslatorHelper.php
+++ b/app/bundles/CoreBundle/Templating/Helper/TranslatorHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,12 +13,12 @@
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper as BaseHelper;
 
 /**
- * Extended TranslatorHelper
+ * Extended TranslatorHelper.
  */
 class TranslatorHelper extends BaseHelper
 {
     /**
-     * Check if the specified message ID exists
+     * Check if the specified message ID exists.
      *
      * @param string      $id     The message id (may also be an object that can be cast to string)
      * @param string|null $domain The domain for the message or null to use the default
@@ -32,7 +33,7 @@ public function hasId($id, $domain = null, $locale = null)
 
     /**
      * Checks for $preferred string existence and returns translation if it does.  Otherwise, returns translation for
-     * $alternative
+     * $alternative.
      *
      * @param      $preferred
      * @param      $alternative
@@ -42,7 +43,7 @@ public function hasId($id, $domain = null, $locale = null)
      *
      * @return string
      */
-    public function transConditional($preferred, $alternative, $parameters = array(), $domain = null, $locale = null)
+    public function transConditional($preferred, $alternative, $parameters = [], $domain = null, $locale = null)
     {
         return $this->translator->transConditional($preferred, $alternative, $parameters, $domain, $locale);
     }
@@ -54,15 +55,15 @@ public function getJsLang()
         $messages = $this->translator->getMessages();
 
         $oldKeys = [
-            "chosenChooseOne" => $this->trans('mautic.core.form.chooseone'),
-            "chosenChooseMore" => $this->trans('mautic.core.form.choosemultiple'),
-            "chosenNoResults" => $this->trans('mautic.core.form.nomatches'),
-            "pleaseWait" => $this->trans('mautic.core.wait'),
-            "popupBlockerMessage" => $this->trans('mautic.core.popupblocked')
+            'chosenChooseOne'     => $this->trans('mautic.core.form.chooseone'),
+            'chosenChooseMore'    => $this->trans('mautic.core.form.choosemultiple'),
+            'chosenNoResults'     => $this->trans('mautic.core.form.nomatches'),
+            'pleaseWait'          => $this->trans('mautic.core.wait'),
+            'popupBlockerMessage' => $this->trans('mautic.core.popupblocked'),
         ];
 
         $jsLang = array_merge($messages['javascript'], $oldKeys);
 
-        return json_encode($jsLang, JSON_PRETTY_PRINT|JSON_FORCE_OBJECT);
+        return json_encode($jsLang, JSON_PRETTY_PRINT | JSON_FORCE_OBJECT);
     }
 }
diff --git a/app/bundles/CoreBundle/Templating/TemplateNameParser.php b/app/bundles/CoreBundle/Templating/TemplateNameParser.php
index 3a935c0c176..8fe0c9f4137 100644
--- a/app/bundles/CoreBundle/Templating/TemplateNameParser.php
+++ b/app/bundles/CoreBundle/Templating/TemplateNameParser.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -23,11 +24,10 @@
 use Symfony\Component\Templating\TemplateReferenceInterface;
 
 /**
- * Class TemplateNameParser
+ * Class TemplateNameParser.
  */
 class TemplateNameParser extends BaseTemplateNameParser
 {
-
     /**
      * @var \Mautic\CoreBundle\Factory\MauticFactory
      */
diff --git a/app/bundles/CoreBundle/Templating/TemplateReference.php b/app/bundles/CoreBundle/Templating/TemplateReference.php
index 992e4d3f638..f8e4b0d97de 100644
--- a/app/bundles/CoreBundle/Templating/TemplateReference.php
+++ b/app/bundles/CoreBundle/Templating/TemplateReference.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference as BaseTemplateReference;
 
 /**
- * Class TemplateReference
+ * Class TemplateReference.
  */
 class TemplateReference extends BaseTemplateReference
 {
@@ -50,7 +51,7 @@ public function setPathsHelper(PathsHelper $pathsHelper)
     }
 
     /**
-     * Set a template specific theme override
+     * Set a template specific theme override.
      *
      * @param $theme
      */
@@ -70,7 +71,8 @@ public function getPath()
             try {
                 $theme    = $this->themeHelper->getTheme($this->themeOverride);
                 $themeDir = $theme->getThemePath();
-            } catch (\Exception $e) {}
+            } catch (\Exception $e) {
+            }
         } else {
             $theme    = $this->themeHelper->getTheme();
             $themeDir = $theme->getThemePath();
diff --git a/app/bundles/CoreBundle/Templating/Twig/Extension/AssetExtension.php b/app/bundles/CoreBundle/Templating/Twig/Extension/AssetExtension.php
index 6b1b3bc3eb8..8232225b966 100644
--- a/app/bundles/CoreBundle/Templating/Twig/Extension/AssetExtension.php
+++ b/app/bundles/CoreBundle/Templating/Twig/Extension/AssetExtension.php
@@ -1,20 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Templating\Twig\Extension;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Twig_Environment;
+use Mautic\CoreBundle\Templating\Helper\AssetsHelper;
 use Twig_Extension;
 use Twig_SimpleFunction;
-use Mautic\CoreBundle\Templating\Helper\AssetsHelper;
-
 
 class AssetExtension extends Twig_Extension
 {
@@ -38,14 +36,14 @@ public function __construct(AssetsHelper $assetsHelper)
      */
     public function getFunctions()
     {
-        return array(
-            'outputScripts' => new Twig_SimpleFunction('outputScripts', array($this, 'outputScripts'), array('is_safe' => array('all'))),
-            'outputHeadDeclarations' => new Twig_SimpleFunction('outputHeadDeclarations', array($this, 'outputHeadDeclarations'), array('is_safe' => array('all'))),
-            'getAssetUrl' => new Twig_SimpleFunction('getAssetUrl', array($this, 'getAssetUrl'), array('is_safe' => array('html'))),
-            'outputStyles' => new Twig_SimpleFunction('outputStyles', array($this, 'outputStyles'), array('is_safe' => array('html'))),
-            'outputSystemScripts' => new Twig_SimpleFunction('outputSystemScripts', array($this, 'outputSystemScripts'), array('is_safe' => array('html'))),
-            'outputSystemStylesheets' => new Twig_SimpleFunction('outputSystemStylesheets', array($this, 'outputSystemStylesheets'), array('is_safe' => array('html'))),
-        );
+        return [
+            'outputScripts'           => new Twig_SimpleFunction('outputScripts', [$this, 'outputScripts'], ['is_safe' => ['all']]),
+            'outputHeadDeclarations'  => new Twig_SimpleFunction('outputHeadDeclarations', [$this, 'outputHeadDeclarations'], ['is_safe' => ['all']]),
+            'getAssetUrl'             => new Twig_SimpleFunction('getAssetUrl', [$this, 'getAssetUrl'], ['is_safe' => ['html']]),
+            'outputStyles'            => new Twig_SimpleFunction('outputStyles', [$this, 'outputStyles'], ['is_safe' => ['html']]),
+            'outputSystemScripts'     => new Twig_SimpleFunction('outputSystemScripts', [$this, 'outputSystemScripts'], ['is_safe' => ['html']]),
+            'outputSystemStylesheets' => new Twig_SimpleFunction('outputSystemStylesheets', [$this, 'outputSystemStylesheets'], ['is_safe' => ['html']]),
+        ];
     }
 
     public function getName()
@@ -64,6 +62,7 @@ public function outputSystemStylesheets()
 
     /**
      * @param bool $includeEditor
+     *
      * @return string
      */
     public function outputSystemScripts($includeEditor = false)
@@ -106,4 +105,4 @@ public function getAssetUrl($path, $packageName = null, $version = null, $absolu
     {
         return $this->assetsHelper->getUrl($path, $packageName, $version, $absolute, $ignorePrefix);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Templating/Twig/Extension/SlotExtension.php b/app/bundles/CoreBundle/Templating/Twig/Extension/SlotExtension.php
index 87e390aa119..65c583055e4 100644
--- a/app/bundles/CoreBundle/Templating/Twig/Extension/SlotExtension.php
+++ b/app/bundles/CoreBundle/Templating/Twig/Extension/SlotExtension.php
@@ -1,20 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Templating\Twig\Extension;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Twig_Environment;
+use Mautic\CoreBundle\Templating\Helper\SlotsHelper;
 use Twig_Extension;
 use Twig_SimpleFunction;
-use Mautic\CoreBundle\Templating\Helper\SlotsHelper;
-
 
 class SlotExtension extends Twig_Extension
 {
@@ -33,10 +32,10 @@ public function __construct(MauticFactory $factory)
      */
     public function getFunctions()
     {
-        return array(
-            'slot' => new Twig_SimpleFunction('slot', array($this, 'getSlot'), array('is_safe' => array('html'))),
-            'slotHasContent' => new Twig_SimpleFunction('slotHasContent', array($this, 'slotHasContent'), array('is_safe' => array('html')))
-        );
+        return [
+            'slot'           => new Twig_SimpleFunction('slot', [$this, 'getSlot'], ['is_safe' => ['html']]),
+            'slotHasContent' => new Twig_SimpleFunction('slotHasContent', [$this, 'slotHasContent'], ['is_safe' => ['html']]),
+        ];
     }
 
     public function getName()
@@ -57,4 +56,4 @@ public function slotHasContent($name)
     {
         return $this->helper->hasContent($name);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Test/MauticWebTestCase.php b/app/bundles/CoreBundle/Test/MauticWebTestCase.php
index ef1e6d560e4..01f8bf0c28d 100644
--- a/app/bundles/CoreBundle/Test/MauticWebTestCase.php
+++ b/app/bundles/CoreBundle/Test/MauticWebTestCase.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,7 +21,6 @@
 
 class MauticWebTestCase extends WebTestCase
 {
-
     /**
      * @var \Symfony\Bundle\FrameworkBundle\Client
      */
@@ -41,7 +41,7 @@ class MauticWebTestCase extends WebTestCase
      */
     protected $container;
 
-    protected function getClient(array $options = array(), array $server = array())
+    protected function getClient(array $options = [], array $server = [])
     {
         if (empty($server['PHP_AUTH_USER'])) {
             $server['PHP_AUTH_USER'] = 'admin';
@@ -50,10 +50,11 @@ protected function getClient(array $options = array(), array $server = array())
         $client = static::createClient($options, $server);
 
         $client->followRedirects(true);
+
         return $client;
     }
 
-    protected function getNonAdminClient($user = 'sales', array $options = array(), array $server = array())
+    protected function getNonAdminClient($user = 'sales', array $options = [], array $server = [])
     {
         if (empty($server['PHP_AUTH_USER'])) {
             $server['PHP_AUTH_USER'] = $user;
@@ -64,11 +65,12 @@ protected function getNonAdminClient($user = 'sales', array $options = array(),
         return $client;
     }
 
-    protected function getAnonClient(array $options = array(), array $server = array())
+    protected function getAnonClient(array $options = [], array $server = [])
     {
         $client = static::createClient($options, $server);
 
         $client->followRedirects(true);
+
         return $client;
     }
 
@@ -78,10 +80,10 @@ protected function getOAuthAccessToken($fullTest = false)
 
         $anonClient->followRedirects(false);
 
-        $client = $this->em->getRepository('MauticApiBundle:oAuth2\Client')->findOneByName('Mautic');
+        $client       = $this->em->getRepository('MauticApiBundle:oAuth2\Client')->findOneByName('Mautic');
         $redirectUris = $client->getRedirectUris();
         $redirectUri  = urlencode($redirectUris[0]);
-        $anonClient->request('GET', 'oauth/v2/auth?client_id=' . $client->getPublicId() . '&response_type=code&redirect_uri=' . $redirectUri);
+        $anonClient->request('GET', 'oauth/v2/auth?client_id='.$client->getPublicId().'&response_type=code&redirect_uri='.$redirectUri);
         $crawler = $anonClient->followRedirect();
 
         $this->assertNoError($anonClient->getResponse(), $crawler);
@@ -99,10 +101,10 @@ protected function getOAuthAccessToken($fullTest = false)
 
         // submit the form
         $crawler = $anonClient->submit($form,
-            array(
+            [
                 '_username' => 'admin',
-                '_password' => 'mautic'
-            )
+                '_password' => 'mautic',
+            ]
         );
         $this->assertNoError($anonClient->getResponse(), $crawler);
 
@@ -118,7 +120,7 @@ protected function getOAuthAccessToken($fullTest = false)
             //Let's authorize
             $crawler = $anonClient->submit($form);
         } elseif ($fullTest) {
-            $this->assertTrue($authorize, "Could not find the authorization form.");
+            $this->assertTrue($authorize, 'Could not find the authorization form.');
         }
 
         //should get a redirect header
@@ -126,16 +128,16 @@ protected function getOAuthAccessToken($fullTest = false)
         $this->assertTrue(!empty($location));
 
         //get the code
-        $code = str_replace($redirectUris[0]."?code=", "", $location);
+        $code = str_replace($redirectUris[0].'?code=', '', $location);
         $this->assertTrue(!empty($code));
 
         //reset the client
         $anonClient = $this->getAnonClient();
 
         //submit for a token
-        $anonClient->request('GET', 'oauth/v2/token?client_id=' . $client->getPublicId() . '&client_secret=' .
-            $client->getSecret() . '&grant_type=authorization_code&redirect_uri=' . $redirectUri .
-            '&code=' . $code);
+        $anonClient->request('GET', 'oauth/v2/token?client_id='.$client->getPublicId().'&client_secret='.
+            $client->getSecret().'&grant_type=authorization_code&redirect_uri='.$redirectUri.
+            '&code='.$code);
 
         $this->assertNoError($anonClient->getResponse(), $crawler);
 
@@ -145,28 +147,27 @@ protected function getOAuthAccessToken($fullTest = false)
 
         $content = $response->getContent();
         $decoded = json_decode($content, true);
-        $this->assertTrue(!empty($decoded["access_token"]));
-
-        return $decoded["access_token"];
+        $this->assertTrue(!empty($decoded['access_token']));
 
+        return $decoded['access_token'];
     }
 
-    protected function assertContentType($response, $type = "application/json")
+    protected function assertContentType($response, $type = 'application/json')
     {
         $this->assertTrue(
-            $response->headers->contains('Content-Type', $type), 'Unrecognized content type. Expecting ' . $type .
-            '; received ' . $response->headers->get('Content-Type')
+            $response->headers->contains('Content-Type', $type), 'Unrecognized content type. Expecting '.$type.
+            '; received '.$response->headers->get('Content-Type')
         );
     }
 
     protected function assertNoError($response, $crawler, $fullOutput = false)
     {
         $noException = true;
-        $msg         = "Status code " . $response->getStatusCode();
+        $msg         = 'Status code '.$response->getStatusCode();
         if ($response->getStatusCode() >= 400) {
             //symfony inserts the exception into the title so extract it from that
             if (count($crawler)) {
-                $msg .= ": " . trim($crawler->filter('title')->text());
+                $msg .= ': '.trim($crawler->filter('title')->text());
             } elseif ($response->getContent()) {
                 if ($response->headers->get('Content-Type') == 'application/json') {
                     $content = json_decode($response->getContent());
@@ -179,9 +180,9 @@ protected function assertNoError($response, $crawler, $fullOutput = false)
                     } else {
                         $message = print_r($content, true);
                     }
-                    $msg .= ": " . $message;
+                    $msg .= ': '.$message;
                 } else {
-                    $msg .= ": " . $response->getContent();
+                    $msg .= ': '.$response->getContent();
                 }
             }
             $noException = false;
@@ -189,7 +190,6 @@ protected function assertNoError($response, $crawler, $fullOutput = false)
         $this->assertTrue($noException, $msg);
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -200,7 +200,7 @@ public function setUp()
         $this->container = static::$kernel->getContainer();
 
         //setup the request stack
-        $request = Request::createFromGlobals();
+        $request      = Request::createFromGlobals();
         $requestStack = new RequestStack();
         $requestStack->push($request);
         $this->container->set('request_stack', $requestStack);
diff --git a/app/bundles/CoreBundle/Tests/Doctrine/ArrayTypeTest.php b/app/bundles/CoreBundle/Tests/Doctrine/ArrayTypeTest.php
index 42aa969953b..69cb9b79693 100644
--- a/app/bundles/CoreBundle/Tests/Doctrine/ArrayTypeTest.php
+++ b/app/bundles/CoreBundle/Tests/Doctrine/ArrayTypeTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,28 +17,28 @@
 
 class ExampleClassWithPrivateProperty
 {
-    private /** @noinspection PhpUnusedPrivateFieldInspection */
-        $test = "value";
+    /** @noinspection PhpUnusedPrivateFieldInspection */
+        private $test = 'value';
 }
 
 class ExampleClassWithProtectedProperty
 {
-    protected $test = "value";
+    protected $test = 'value';
 }
 
 class ExampleClassWithPublicProperty
 {
-    public $test = "value";
+    public $test = 'value';
 }
 
 /**
- * Class IpLookupFactoryTest
+ * Class IpLookupFactoryTest.
  */
 class ArrayTypeTest extends \PHPUnit_Framework_TestCase
 {
-    const MAUTIC_ARRAY_TYPE_NAME = "mautic-array-type";
+    const MAUTIC_ARRAY_TYPE_NAME = 'mautic-array-type';
 
-    /** @var  ArrayType */
+    /** @var ArrayType */
     private $arrayType;
 
     /** @var AbstractPlatform */
@@ -47,7 +48,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        if(!Type::hasType(self::MAUTIC_ARRAY_TYPE_NAME)) {
+        if (!Type::hasType(self::MAUTIC_ARRAY_TYPE_NAME)) {
             Type::addType(self::MAUTIC_ARRAY_TYPE_NAME, 'Mautic\CoreBundle\Doctrine\Type\ArrayType');
         }
 
@@ -58,8 +59,8 @@ protected function setUp()
 
     public function testGiven_simpleArray_when_convertsToDatabaseValue_then_getEncodedData()
     {
-        $stringWithUtf8Characters = "--ěš--";
-        $result = $this->arrayType->convertToDatabaseValue(array($stringWithUtf8Characters), $this->platform);
+        $stringWithUtf8Characters = '--ěš--';
+        $result                   = $this->arrayType->convertToDatabaseValue([$stringWithUtf8Characters], $this->platform);
         $this->assertEquals('a:1:{i:0;s:8:"--ěš--";}', $result);
     }
 
@@ -67,26 +68,26 @@ public function testGiven_nullPoisonedString_when_convertsToDatabaseValue_then_e
     {
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
 
-        $this->arrayType->convertToDatabaseValue(array("abcd\0efgh"), $this->platform);
+        $this->arrayType->convertToDatabaseValue(["abcd\0efgh"], $this->platform);
     }
 
     public function testGiven_objectWithPrivateProperty_when_convertsToDatabaseValue_then_error()
     {
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
 
-        $this->arrayType->convertToDatabaseValue(array(new ExampleClassWithPrivateProperty()), $this->platform);
+        $this->arrayType->convertToDatabaseValue([new ExampleClassWithPrivateProperty()], $this->platform);
     }
 
     public function testGiven_objectWithProtectedProperty_when_convertsToDatabaseValue_then_error()
     {
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
 
-        $this->arrayType->convertToDatabaseValue(array(new ExampleClassWithProtectedProperty()), $this->platform);
+        $this->arrayType->convertToDatabaseValue([new ExampleClassWithProtectedProperty()], $this->platform);
     }
 
     public function testGiven_objectWithPublicProperty_when_convertsToDatabaseValue_then_getEncodedData()
     {
-        $result = $this->arrayType->convertToDatabaseValue(array(new ExampleClassWithPublicProperty()), $this->platform);
+        $result = $this->arrayType->convertToDatabaseValue([new ExampleClassWithPublicProperty()], $this->platform);
         $this->assertEquals(
             'a:1:{i:0;O:63:"Mautic\CoreBundle\Tests\Doctrine\ExampleClassWithPublicProperty":1:{s:4:"test";s:5:"value";}}',
             $result
@@ -95,13 +96,13 @@ public function testGiven_objectWithPublicProperty_when_convertsToDatabaseValue_
 
     public function testGiven_stdClass_when_convertsToDatabaseValue_then_getEncodedData()
     {
-        $object = new \stdClass();
-        $object->test = "value";
+        $object       = new \stdClass();
+        $object->test = 'value';
 
-        $result = $this->arrayType->convertToDatabaseValue(array($object), $this->platform);
+        $result = $this->arrayType->convertToDatabaseValue([$object], $this->platform);
         $this->assertEquals(
             'a:1:{i:0;O:8:"stdClass":1:{s:4:"test";s:5:"value";}}',
             $result
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Tests/Helper/Chart/LineChartTest.php b/app/bundles/CoreBundle/Tests/Helper/Chart/LineChartTest.php
index bf87d08e033..6452d7b7d8f 100644
--- a/app/bundles/CoreBundle/Tests/Helper/Chart/LineChartTest.php
+++ b/app/bundles/CoreBundle/Tests/Helper/Chart/LineChartTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\Helper\Chart\LineChart;
 
 /**
- * Class ColorHelper test
+ * Class ColorHelper test.
  */
 class LineChartTest extends \PHPUnit_Framework_TestCase
 {
@@ -23,18 +24,18 @@ class LineChartTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetUnitInterval()
     {
-        $units = array(
+        $units = [
             'Y' => new \DateInterval('P1Y'),
             'm' => new \DateInterval('P1M'),
             'W' => new \DateInterval('P1W'),
             'd' => new \DateInterval('P1D'),
             'H' => new \DateInterval('PT1H'),
             'i' => new \DateInterval('PT1M'),
-            's' => new \DateInterval('PT1S')
-        );
+            's' => new \DateInterval('PT1S'),
+        ];
 
         foreach ($units as $unit => $expected) {
-            $chart = new LineChart($unit, new \DateTime, new \DateTime);
+            $chart    = new LineChart($unit, new \DateTime(), new \DateTime());
             $interval = $chart->getUnitInterval();
             $this->assertEquals($expected, $interval);
         }
diff --git a/app/bundles/CoreBundle/Tests/Helper/ColorHelperTest.php b/app/bundles/CoreBundle/Tests/Helper/ColorHelperTest.php
index 3e005214735..7ac8478304a 100644
--- a/app/bundles/CoreBundle/Tests/Helper/ColorHelperTest.php
+++ b/app/bundles/CoreBundle/Tests/Helper/ColorHelperTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\Helper\ColorHelper;
 
 /**
- * Class ColorHelper test
+ * Class ColorHelper test.
  */
 class ColorHelperTest extends \PHPUnit_Framework_TestCase
 {
@@ -23,7 +24,7 @@ class ColorHelperTest extends \PHPUnit_Framework_TestCase
      */
     public function testTheHelperIsInstantiatedWithoutAttributeCorrectly()
     {
-        $helper = new ColorHelper;
+        $helper = new ColorHelper();
         $this->assertAttributeSame(0, 'red', $helper);
         $this->assertAttributeSame(0, 'green', $helper);
         $this->assertAttributeSame(0, 'blue', $helper);
@@ -36,14 +37,14 @@ public function testTheHelperIsInstantiatedWithoutAttributeCorrectly()
      */
     public function testThatColorHexAreSetCorrectly()
     {
-        $colors = array(
-            '#ccc'      => array(204, 204, 204),
-            '#fff'      => array(255, 255, 255),
-            '#000'      => array(0, 0, 0),
-            '#333333'   => array(51, 51, 51),
-            '#369'      => array(51, 102, 153),
-            '#f8Ac30'   => array(248, 172, 48)
-        );
+        $colors = [
+            '#ccc'    => [204, 204, 204],
+            '#fff'    => [255, 255, 255],
+            '#000'    => [0, 0, 0],
+            '#333333' => [51, 51, 51],
+            '#369'    => [51, 102, 153],
+            '#f8Ac30' => [248, 172, 48],
+        ];
 
         foreach ($colors as $hex => $rgb) {
             $helper = new ColorHelper($hex);
@@ -61,17 +62,17 @@ public function testThatColorHexAreSetCorrectly()
      */
     public function testThatColorHexAreConvertedBackToHexCorrectly()
     {
-        $colors = array(
-            '#ccc'      => '#cccccc',
-            '#fff'      => '#ffffff',
-            '#000'      => '#000000',
-            '#333333'   => '#333333',
-            '#369'      => '#336699',
-            '#f8Ac30'   => '#f8ac30'
-        );
+        $colors = [
+            '#ccc'    => '#cccccc',
+            '#fff'    => '#ffffff',
+            '#000'    => '#000000',
+            '#333333' => '#333333',
+            '#369'    => '#336699',
+            '#f8Ac30' => '#f8ac30',
+        ];
 
         foreach ($colors as $hex1 => $hex2) {
-            $helper = new ColorHelper;
+            $helper = new ColorHelper();
             $helper->setHex($hex1);
             $this->assertEquals($hex2, $helper->toHex());
         }
@@ -84,14 +85,14 @@ public function testThatColorHexAreConvertedBackToHexCorrectly()
      */
     public function testThatColorHexAreConvertedToRgbCorrectly()
     {
-        $colors = array(
-            '#ccc'      => 'rgb(204,204,204)',
-            '#fff'      => 'rgb(255,255,255)',
-            '#000'      => 'rgb(0,0,0)',
-            '#333333'   => 'rgb(51,51,51)',
-            '#369'      => 'rgb(51,102,153)',
-            '#f8Ac30'   => 'rgb(248,172,48)'
-        );
+        $colors = [
+            '#ccc'    => 'rgb(204,204,204)',
+            '#fff'    => 'rgb(255,255,255)',
+            '#000'    => 'rgb(0,0,0)',
+            '#333333' => 'rgb(51,51,51)',
+            '#369'    => 'rgb(51,102,153)',
+            '#f8Ac30' => 'rgb(248,172,48)',
+        ];
 
         foreach ($colors as $hex => $rgb) {
             $helper = new ColorHelper($hex);
@@ -106,18 +107,18 @@ public function testThatColorHexAreConvertedToRgbCorrectly()
      */
     public function testThatColorHexAreConvertedToRgbaCorrectly()
     {
-        $colors = array(
-            '#ccc'      => 'rgba(204,204,204,%g)',
-            '#fff'      => 'rgba(255,255,255,%g)',
-            '#000'      => 'rgba(0,0,0,%g)',
-            '#333333'   => 'rgba(51,51,51,%g)',
-            '#369'      => 'rgba(51,102,153,%g)',
-            '#f8Ac30'   => 'rgba(248,172,48,%g)'
-        );
+        $colors = [
+            '#ccc'    => 'rgba(204,204,204,%g)',
+            '#fff'    => 'rgba(255,255,255,%g)',
+            '#000'    => 'rgba(0,0,0,%g)',
+            '#333333' => 'rgba(51,51,51,%g)',
+            '#369'    => 'rgba(51,102,153,%g)',
+            '#f8Ac30' => 'rgba(248,172,48,%g)',
+        ];
 
         foreach ($colors as $hex => $rgba) {
             $helper = new ColorHelper($hex);
-            $randA = round((mt_rand(0, mt_getrandmax() - 1) / mt_getrandmax()), 2);
+            $randA  = round((mt_rand(0, mt_getrandmax() - 1) / mt_getrandmax()), 2);
             $this->assertEquals(sprintf($rgba, $randA), $helper->toRgba($randA, $randA));
         }
     }
@@ -130,7 +131,7 @@ public function testThatColorHexAreConvertedToRgbaCorrectly()
      */
     public function testThatRandomColorIsWithinBorders()
     {
-        $helper = new ColorHelper;
+        $helper = new ColorHelper();
         $helper->buildRandomColor();
         $rgb = $helper->getColorArray();
 
diff --git a/app/bundles/CoreBundle/Tests/Helper/IpLookupHelperTest.php b/app/bundles/CoreBundle/Tests/Helper/IpLookupHelperTest.php
index 716766f0c1b..4e83b3a08f3 100644
--- a/app/bundles/CoreBundle/Tests/Helper/IpLookupHelperTest.php
+++ b/app/bundles/CoreBundle/Tests/Helper/IpLookupHelperTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * Class IpLookupHelperTest
+ * Class IpLookupHelperTest.
  */
 class IpLookupHelperTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/FreegeoipLookupTest.php b/app/bundles/CoreBundle/Tests/IpLookup/FreegeoipLookupTest.php
index efe89b223fb..d7572f41d46 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/FreegeoipLookupTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/FreegeoipLookupTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\IpLookup\FreegeoipLookup;
 
 /**
- * Class FreegeoipLookupTest
+ * Class FreegeoipLookupTest.
  */
 class FreegeoipLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -45,4 +46,4 @@ public function testIpLookupSuccessful()
         $this->assertEquals('-122.3933', $details['longitude']);
         $this->assertEquals('America/Los_Angeles', $details['timezone']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/GeobytesLookupTest.php b/app/bundles/CoreBundle/Tests/IpLookup/GeobytesLookupTest.php
index 5001182d8d3..3f31e91ab4d 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/GeobytesLookupTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/GeobytesLookupTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\IpLookup\GeobytesLookup;
 
 /**
- * Class GeobytesLookupTest
+ * Class GeobytesLookupTest.
  */
 class GeobytesLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -45,4 +46,4 @@ public function testIpLookupSuccessful()
         $this->assertEquals('-77.664101', $details['longitude']);
         $this->assertEquals('-05:00', $details['timezone']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/GeoipsLookupTest.php b/app/bundles/CoreBundle/Tests/IpLookup/GeoipsLookupTest.php
index 827add308fd..7861268b682 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/GeoipsLookupTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/GeoipsLookupTest.php
@@ -1,20 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Tests\IpLookup;
 
-use Joomla\Http\HttpFactory;
 use Mautic\CoreBundle\IpLookup\GeoipsLookup;
 
 /**
- * Class GeoipsLookupTest
- *
+ * Class GeoipsLookupTest.
  */
 class GeoipsLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -48,4 +47,4 @@ public function testIpLookupSuccessful()
         $this->assertEquals('PST', $details['timezone']);
         $this->assertEquals('LEVEL 3 COMMUNICATIONS INC', $details['isp']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/IpLookupFactoryTest.php b/app/bundles/CoreBundle/Tests/IpLookup/IpLookupFactoryTest.php
index c86751cfaf5..6e2aa7822fe 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/IpLookupFactoryTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/IpLookupFactoryTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Class IpLookupFactoryTest
+ * Class IpLookupFactoryTest.
  */
 class IpLookupFactoryTest extends WebTestCase
 {
@@ -40,4 +41,4 @@ public function testIpLookupServiceInstantiation()
         'class'        => 'Mautic\CoreBundle\Tests\IpLookup\BC\BcIpLookup',
         'display_name' => 'Freegoip.com'
     )
- */
\ No newline at end of file
+ */
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/IpinfodbLookupTest.php b/app/bundles/CoreBundle/Tests/IpLookup/IpinfodbLookupTest.php
index 4b7c36b1ee4..973c683c953 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/IpinfodbLookupTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/IpinfodbLookupTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\IpLookup\IpinfodbLookup;
 
 /**
- * Class IpinfodbLookupTest
+ * Class IpinfodbLookupTest.
  */
 class IpinfodbLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -45,4 +46,4 @@ public function testIpLookupSuccessful()
         $this->assertEquals('-122.395', $details['longitude']);
         $this->assertEquals('-08:00', $details['timezone']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/MaxmindDownloadLookupTest.php b/app/bundles/CoreBundle/Tests/IpLookup/MaxmindDownloadLookupTest.php
index b21023d9a53..50907ea923d 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/MaxmindDownloadLookupTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/MaxmindDownloadLookupTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\IpLookup\MaxmindDownloadLookup;
 
 /**
- * Class MaxmindDownloadTest
+ * Class MaxmindDownloadTest.
  */
 class MaxmindDownloadLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +22,7 @@ public function testDownloadDataStore()
         // Keep the file contained to cache/test
         $ipService = new MaxmindDownloadLookup(null, null, __DIR__.'/../../../../cache/test');
 
-        $result  = $ipService->downloadRemoteDataStore();
+        $result = $ipService->downloadRemoteDataStore();
 
         $this->assertTrue($result);
     }
@@ -41,4 +42,4 @@ public function testIpLookupSuccessful()
         $this->assertEquals('-122.3933', $details['longitude']);
         $this->assertEquals('America/Los_Angeles', $details['timezone']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/MaxmindLookupTest.php b/app/bundles/CoreBundle/Tests/IpLookup/MaxmindLookupTest.php
index 83257b579b9..6ab1b7a6488 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/MaxmindLookupTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/MaxmindLookupTest.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\CoreBundle\Tests\IpLookup;
 
-use Joomla\Http\HttpFactory;
 use Mautic\CoreBundle\IpLookup\MaxmindCountryLookup;
 use Mautic\CoreBundle\IpLookup\MaxmindOmniLookup;
 use Mautic\CoreBundle\IpLookup\MaxmindPrecisionLookup;
 
 /**
- * Class MaxmindLookupTest
+ * Class MaxmindLookupTest.
  *
  * Maxmind requires API key and thus cannot test actual lookup so just make API endpoint works and
  * classes are initiated
@@ -35,7 +35,7 @@ public function setUp()
         $mockResponse = $this->getMockBuilder('Joomla\Http\Response')
             ->getMock();
         $mockResponse->code = 200;
-        $mockResponse->body = <<<RESPONSE
+        $mockResponse->body = <<<'RESPONSE'
 {
   "city":  {
       "confidence":  25,
@@ -159,7 +159,6 @@ public function setUp()
         $this->mockHttp->expects($this->once())
             ->method('get')
             ->willReturn($mockResponse);
-
     }
 
     public function testCountryIpLookupSuccessful()
@@ -201,4 +200,4 @@ private function checkDetails($details)
         $this->assertEquals('Linkem spa', $details['isp']);
         $this->assertEquals('Linkem IR WiMax Network', $details['organization']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Tests/IpLookup/TelizeLookupTest.php b/app/bundles/CoreBundle/Tests/IpLookup/TelizeLookupTest.php
index 8e6c24f7a2a..b4562093f26 100644
--- a/app/bundles/CoreBundle/Tests/IpLookup/TelizeLookupTest.php
+++ b/app/bundles/CoreBundle/Tests/IpLookup/TelizeLookupTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\IpLookup\TelizeLookup;
 
 /**
- * Class TelizeLookupTest
+ * Class TelizeLookupTest.
  */
 class TelizeLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -46,4 +47,4 @@ public function testIpLookupSuccessful()
         $this->assertEquals('America/New_York', $details['timezone']);
         $this->assertEquals('AS14618 Amazon.com, Inc.', $details['organization']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/CoreBundle/Translation/Translator.php b/app/bundles/CoreBundle/Translation/Translator.php
index 61ed18de4c3..818d13a5a81 100644
--- a/app/bundles/CoreBundle/Translation/Translator.php
+++ b/app/bundles/CoreBundle/Translation/Translator.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,12 +13,12 @@
 use Symfony\Bundle\FrameworkBundle\Translation\Translator as BaseTranslator;
 
 /**
- * Extended Translator service
+ * Extended Translator service.
  */
 class Translator extends BaseTranslator
 {
     /**
-     * Check if the specified message ID exists
+     * Check if the specified message ID exists.
      *
      * @param string      $id     The message id (may also be an object that can be cast to string)
      * @param string|null $domain The domain for the message or null to use the default
@@ -61,7 +62,7 @@ protected function loadCatalogue($locale)
 
     /**
      * Checks for $preferred string existence and returns translation if it does.  Otherwise, returns translation for
-     * $alternative
+     * $alternative.
      *
      * @param      $preferred
      * @param      $alternative
@@ -71,13 +72,11 @@ protected function loadCatalogue($locale)
      *
      * @return string
      */
-    public function transConditional($preferred, $alternative, $parameters = array(), $domain = null, $locale = null)
+    public function transConditional($preferred, $alternative, $parameters = [], $domain = null, $locale = null)
     {
         if ($this->hasId($preferred, $domain, $locale)) {
-
             return $this->trans($preferred, $parameters, $domain, $locale);
         } else {
-
             return $this->trans($alternative, $parameters, $domain, $locale);
         }
     }
diff --git a/app/bundles/CoreBundle/Translations/en_US/config.php b/app/bundles/CoreBundle/Translations/en_US/config.php
index 8065813d1c2..e6ddedccef9 100644
--- a/app/bundles/CoreBundle/Translations/en_US/config.php
+++ b/app/bundles/CoreBundle/Translations/en_US/config.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$config = array(
+$config = [
     'name'   => 'English - United States',
     'locale' => 'en_US',
-    'author' => 'Mautic Team'
-);
+    'author' => 'Mautic Team',
+];
 
-return $config;
\ No newline at end of file
+return $config;
diff --git a/app/bundles/CoreBundle/Views/Default/base.html.php b/app/bundles/CoreBundle/Views/Default/base.html.php
index 34935b66670..a949d70716f 100644
--- a/app/bundles/CoreBundle/Views/Default/base.html.php
+++ b/app/bundles/CoreBundle/Views/Default/base.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <!DOCTYPE html>
 <html>
@@ -14,7 +14,7 @@
     <body class="header-fixed">
         <!-- start: app-wrapper -->
         <section id="app-wrapper">
-            <?php $view['assets']->outputScripts("bodyOpen"); ?>
+            <?php $view['assets']->outputScripts('bodyOpen'); ?>
 
             <!-- start: app-sidebar(left) -->
             <aside class="app-sidebar sidebar-left">
@@ -40,7 +40,7 @@
             <footer id="app-footer">
                 <div class="container-fluid">
                     <div class="row">
-                        <div class="col-xs-6 text-muted"><?php echo $view['translator']->trans('mautic.core.copyright', array('%date%' => date('Y'))); ?></div>
+                        <div class="col-xs-6 text-muted"><?php echo $view['translator']->trans('mautic.core.copyright', ['%date%' => date('Y')]); ?></div>
                         <div class="col-xs-6 text-muted text-right small">v<?php echo $view['formatter']->getVersion(); ?></div>
                     </div>
                 </div>
@@ -58,7 +58,7 @@
 
         <script>
             Mautic.onPageLoad('body');
-            <?php if ($app->getEnvironment() === "dev"): ?>
+            <?php if ($app->getEnvironment() === 'dev'): ?>
             mQuery( document ).ajaxComplete(function(event, XMLHttpRequest, ajaxOption){
                 if(XMLHttpRequest.responseJSON && typeof XMLHttpRequest.responseJSON.ignore_wdt == 'undefined' && XMLHttpRequest.getResponseHeader('x-debug-token')) {
                     if (mQuery('[class*="sf-tool"]').length) {
@@ -72,10 +72,10 @@
             });
             <?php endif; ?>
         </script>
-        <?php $view['assets']->outputScripts("bodyClose"); ?>
-        <?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', array(
+        <?php $view['assets']->outputScripts('bodyClose'); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
             'id'            => 'MauticSharedModal',
-            'footerButtons' => true
-        )); ?>
+            'footerButtons' => true,
+        ]); ?>
     </body>
 </html>
diff --git a/app/bundles/CoreBundle/Views/Default/content.html.php b/app/bundles/CoreBundle/Views/Default/content.html.php
index b506530f35f..8f2d2aaba25 100644
--- a/app/bundles/CoreBundle/Views/Default/content.html.php
+++ b/app/bundles/CoreBundle/Views/Default/content.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $request = $app->getRequest();
 if (!$request->isXmlHttpRequest() && $view['slots']->get('contentOnly', false) === false):
     //load base template
diff --git a/app/bundles/CoreBundle/Views/Default/head.html.php b/app/bundles/CoreBundle/Views/Default/head.html.php
index 5b3c29d0541..83f411bfc97 100644
--- a/app/bundles/CoreBundle/Views/Default/head.html.php
+++ b/app/bundles/CoreBundle/Views/Default/head.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Default/navbar.html.php b/app/bundles/CoreBundle/Views/Default/navbar.html.php
index 7bc92508d50..f17c4e0b520 100644
--- a/app/bundles/CoreBundle/Views/Default/navbar.html.php
+++ b/app/bundles/CoreBundle/Views/Default/navbar.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -32,7 +33,7 @@
 
     <!-- start: right nav -->
     <ul class="nav navbar-nav navbar-right">
-        <?php echo $view->render("MauticCoreBundle:Menu:profile.html.php"); ?>
+        <?php echo $view->render('MauticCoreBundle:Menu:profile.html.php'); ?>
         <li>
             <a href="javascript: void(0);" data-toggle="sidebar" data-direction="rtl">
                 <i class="fa fa-cog fs-16"></i>
diff --git a/app/bundles/CoreBundle/Views/Default/pageheader.html.php b/app/bundles/CoreBundle/Views/Default/pageheader.html.php
index 0290cabec12..41b6de2e9e2 100644
--- a/app/bundles/CoreBundle/Views/Default/pageheader.html.php
+++ b/app/bundles/CoreBundle/Views/Default/pageheader.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Default/script.html.php b/app/bundles/CoreBundle/Views/Default/script.html.php
index b3b213622aa..ec202e30b00 100644
--- a/app/bundles/CoreBundle/Views/Default/script.html.php
+++ b/app/bundles/CoreBundle/Views/Default/script.html.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <script>
     var mauticBasePath    = '<?php echo $app->getRequest()->getBasePath(); ?>';
-    var mauticBaseUrl     = '<?php echo $view['router']->path("mautic_base_index"); ?>';
-    var mauticAjaxUrl     = '<?php echo $view['router']->path("mautic_core_ajax"); ?>';
+    var mauticBaseUrl     = '<?php echo $view['router']->path('mautic_base_index'); ?>';
+    var mauticAjaxUrl     = '<?php echo $view['router']->path('mautic_core_ajax'); ?>';
     var mauticAssetPrefix = '<?php echo $view['assets']->getAssetPrefix(true); ?>';
-    var mauticContent     = '<?php $view['slots']->output('mauticContent',''); ?>';
+    var mauticContent     = '<?php $view['slots']->output('mauticContent', ''); ?>';
     var mauticEnv         = '<?php echo $app->getEnvironment(); ?>';
     var mauticLang        = <?php echo $view['translator']->getJsLang(); ?>;
 </script>
diff --git a/app/bundles/CoreBundle/Views/Default/slim.html.php b/app/bundles/CoreBundle/Views/Default/slim.html.php
index b8529d1fad5..73058ff5bf2 100644
--- a/app/bundles/CoreBundle/Views/Default/slim.html.php
+++ b/app/bundles/CoreBundle/Views/Default/slim.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -11,16 +12,16 @@
 <html>
     <?php echo $view->render('MauticCoreBundle:Default:head.html.php'); ?>
     <body>
-        <?php $view['assets']->outputScripts("bodyOpen"); ?>
+        <?php $view['assets']->outputScripts('bodyOpen'); ?>
         <section id="app-content" class="container content-only">
-            <?php echo $view->render('MauticCoreBundle:Notification:flashes.html.php', array('alertType' => 'standard')); ?>
+            <?php echo $view->render('MauticCoreBundle:Notification:flashes.html.php', ['alertType' => 'standard']); ?>
             <?php $view['slots']->output('_content'); ?>
         </section>
-        <?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', array(
+        <?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
             'id'            => 'MauticSharedModal',
-            'footerButtons' => true
-        )); ?>
-        <?php $view['assets']->outputScripts("bodyClose"); ?>
+            'footerButtons' => true,
+        ]); ?>
+        <?php $view['assets']->outputScripts('bodyClose'); ?>
         <script>
             Mautic.onPageLoad('body');
         </script>
diff --git a/app/bundles/CoreBundle/Views/Error/403.html.php b/app/bundles/CoreBundle/Views/Error/403.html.php
index 31ee54dc62f..42473d422a1 100644
--- a/app/bundles/CoreBundle/Views/Error/403.html.php
+++ b/app/bundles/CoreBundle/Views/Error/403.html.php
@@ -1,12 +1,11 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('message', 'mautic.core.error.403');
 $view->extend('MauticCoreBundle:Error:base.html.php');
-?>
diff --git a/app/bundles/CoreBundle/Views/Error/404.html.php b/app/bundles/CoreBundle/Views/Error/404.html.php
index b2344535647..f7c41a31956 100644
--- a/app/bundles/CoreBundle/Views/Error/404.html.php
+++ b/app/bundles/CoreBundle/Views/Error/404.html.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('mautibot', 'openMouth');
 $view['slots']->set('message', 'mautic.core.error.404');
 $view->extend('MauticCoreBundle:Error:base.html.php');
-?>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Error/500.html.php b/app/bundles/CoreBundle/Views/Error/500.html.php
index 8d8fd99c16c..e5acf05316c 100644
--- a/app/bundles/CoreBundle/Views/Error/500.html.php
+++ b/app/bundles/CoreBundle/Views/Error/500.html.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('mautibot', 'openMouth');
 $view['slots']->set('message', 'mautic.core.error.500');
 $view->extend('MauticCoreBundle:Error:base.html.php');
-?>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Error/base.html.php b/app/bundles/CoreBundle/Views/Error/base.html.php
index e6329fe5a5c..24866601191 100644
--- a/app/bundles/CoreBundle/Views/Error/base.html.php
+++ b/app/bundles/CoreBundle/Views/Error/base.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!$app->getRequest()->isXmlHttpRequest()) {
     $view->extend($baseTemplate);
     $view['slots']->set('pageTitle', $status_text);
@@ -25,7 +25,7 @@
         </div>
         <div class="mautibot-content col-xs-8 col-md-9">
             <blockquote class="np break-word">
-                <h1><i class="fa fa-quote-left"></i> <?php echo $view['translator']->trans($message, array('%code%' => $status_code)); ?> <i class="fa fa-quote-right"></i></h1>
+                <h1><i class="fa fa-quote-left"></i> <?php echo $view['translator']->trans($message, ['%code%' => $status_code]); ?> <i class="fa fa-quote-right"></i></h1>
                 <h4 class="mt-5"><strong><?php echo $status_code; ?></strong> <?php echo $status_text; ?></h4>
 
                 <footer class="text-right">Mautibot</footer>
diff --git a/app/bundles/CoreBundle/Views/Exception/403.html.php b/app/bundles/CoreBundle/Views/Exception/403.html.php
index 83ee51af365..e8a9172bd3f 100644
--- a/app/bundles/CoreBundle/Views/Exception/403.html.php
+++ b/app/bundles/CoreBundle/Views/Exception/403.html.php
@@ -1,12 +1,11 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('message', 'mautic.core.error.403');
 $view->extend('MauticCoreBundle:Exception:base.html.php');
-?>
diff --git a/app/bundles/CoreBundle/Views/Exception/404.html.php b/app/bundles/CoreBundle/Views/Exception/404.html.php
index 44af146f846..01552bece96 100644
--- a/app/bundles/CoreBundle/Views/Exception/404.html.php
+++ b/app/bundles/CoreBundle/Views/Exception/404.html.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('mautibot', 'openMouth');
 $view['slots']->set('message', 'mautic.core.error.404');
 $view->extend('MauticCoreBundle:Exception:base.html.php');
-?>
diff --git a/app/bundles/CoreBundle/Views/Exception/500.html.php b/app/bundles/CoreBundle/Views/Exception/500.html.php
index e1fa5b7aca0..a03ec3b677e 100644
--- a/app/bundles/CoreBundle/Views/Exception/500.html.php
+++ b/app/bundles/CoreBundle/Views/Exception/500.html.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('mautibot', 'openMouth');
 $view['slots']->set('message', 'mautic.core.error.500');
 $view->extend('MauticCoreBundle:Exception:base.html.php');
-?>
diff --git a/app/bundles/CoreBundle/Views/Exception/base.html.php b/app/bundles/CoreBundle/Views/Exception/base.html.php
index fe5634910dc..5cf0ecea3db 100644
--- a/app/bundles/CoreBundle/Views/Exception/base.html.php
+++ b/app/bundles/CoreBundle/Views/Exception/base.html.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 /** @var $exception \Symfony\Component\HttpKernel\Exception\FlattenException */
-/** @var $logger    \Symfony\Component\HttpKernel\Log\DebugLoggerInterface */
-
+/** @var $logger \Symfony\Component\HttpKernel\Log\DebugLoggerInterface */
 $message            = $view['slots']->get('message', 'mautic.core.error.generic');
 $previousExceptions = $exception->getAllPrevious();
 
 $exceptionMessage = $exception->getMessage();
 if ($exceptionMessage) {
-    $exceptionMessage = ' - ' . $exceptionMessage;
+    $exceptionMessage = ' - '.$exceptionMessage;
 }
 
 if (!$app->getRequest()->isXmlHttpRequest()) {
@@ -50,9 +50,9 @@
     <div class="row mt-20"">
         <h5 class="ml-lg text-danger"><?php echo $exception->getClass(); ?></h5>
         <div class="well well-sm ma-md">
-            <?php echo $view->render('MauticCoreBundle:Exception:traces.html.php', array(
-                'traces' => $exception->getTrace()
-            )); ?>
+            <?php echo $view->render('MauticCoreBundle:Exception:traces.html.php', [
+                'traces' => $exception->getTrace(),
+            ]); ?>
         </div>
     </div>
 
@@ -72,9 +72,9 @@
                 <div id="previous_body_<?php echo $key; ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
                     <div class="panel-body">
                         <div class="pa-sm">
-                            <?php echo $view->render('MauticCoreBundle:Exception:traces.html.php', array(
-                                'traces' => $e->getTrace()
-                            )); ?>
+                            <?php echo $view->render('MauticCoreBundle:Exception:traces.html.php', [
+                                'traces' => $e->getTrace(),
+                            ]); ?>
                         </div>
                     </div>
                 </div>
diff --git a/app/bundles/CoreBundle/Views/Exception/traces.html.php b/app/bundles/CoreBundle/Views/Exception/traces.html.php
index a8b57c2d9fc..2e52a1fb079 100644
--- a/app/bundles/CoreBundle/Views/Exception/traces.html.php
+++ b/app/bundles/CoreBundle/Views/Exception/traces.html.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$formatArgs = function($args) use (&$formatArgs) {
-    $result = array();
+$formatArgs = function ($args) use (&$formatArgs) {
+    $result = [];
     foreach ($args as $key => $item) {
         if ('object' === $item[0]) {
-            $parts = explode('\\', $item[1]);
-            $short = array_pop($parts);
-            $formattedValue = sprintf("<em>object</em>(<abbr title=\"%s\">%s</abbr>)", $item[1], $short);
+            $parts          = explode('\\', $item[1]);
+            $short          = array_pop($parts);
+            $formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short);
         } elseif ('array' === $item[0]) {
-            $formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $formatArgs($item[1]) : $item[1]);
+            $formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $formatArgs($item[1]) : $item[1]);
         } elseif ('string' === $item[0]) {
             $formattedValue = sprintf("'%s'", htmlspecialchars($item[1]));
         } elseif ('null' === $item[0]) {
@@ -35,19 +35,19 @@
 };
 
 echo "<ol>\n";
-foreach($traces as $trace) {
-    echo "<li class=\"pt-3 break-word\">";
+foreach ($traces as $trace) {
+    echo '<li class="pt-3 break-word">';
     echo "<strong>{$trace['file']}</strong>";
     if ($trace['line']) {
-        echo " (line #" .$trace['line']."): ";
+        echo ' (line #'.$trace['line'].'): ';
     }
     if (!empty($trace['function'])) {
         echo "at {$trace['class']} {$trace['type']} {$trace['function']} ( ";
         if (!empty($trace['args'])) {
             echo $formatArgs($trace['args']);
         }
-        echo " )";
+        echo ' )';
     }
-    echo "</li>";
+    echo '</li>';
 }
 echo "</ol>\n";
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_ip_lookup_config_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_ip_lookup_config_widget.html.php
index ac56329a098..9743b5d5cd7 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_ip_lookup_config_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_ip_lookup_config_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_widget.html.php
index 7a203a0c6fe..276e3476f8a 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_widget.html.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $fields    = $form->children;
 $fieldKeys = array_keys($fields);
-$template = '<div class="col-md-6">{content}</div>';
+$template  = '<div class="col-md-6">{content}</div>';
 ?>
 
-<?php if (count(array_intersect($fieldKeys, array('site_url', 'update_stability', 'cache_path', 'log_path', 'theme', 'image_path')))): ?>
+<?php if (count(array_intersect($fieldKeys, ['site_url', 'update_stability', 'cache_path', 'log_path', 'theme', 'image_path']))): ?>
 <div class="panel panel-primary">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.core.config.header.general'); ?></h3>
@@ -31,7 +31,7 @@
 </div>
 <?php endif; ?>
 
-<?php if (count(array_intersect($fieldKeys, array('default_pagelist', 'timezone', 'locale', 'date_format_full', 'date_format_short', 'date_format_dateonly', 'date_format_timeonly')))): ?>
+<?php if (count(array_intersect($fieldKeys, ['default_pagelist', 'timezone', 'locale', 'date_format_full', 'date_format_short', 'date_format_dateonly', 'date_format_timeonly']))): ?>
 <div class="panel panel-primary">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.core.config.header.defaults'); ?></h3>
@@ -56,9 +56,9 @@
 </div>
 <?php endif; ?>
 
-<?php // Email specific settings moved to EmailBundle to prevent confusion due to tab names ?>
+<?php // Email specific settings moved to EmailBundle to prevent confusion due to tab names?>
 
-<?php if (count(array_intersect($fieldKeys, array('cookie_path')))): ?>
+<?php if (count(array_intersect($fieldKeys, ['cookie_path']))): ?>
 <div class="panel panel-primary">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.core.config.header.cookie'); ?></h3>
@@ -87,7 +87,7 @@
 </div>
 <?php endif; ?>
 
-<?php if (count(array_intersect($fieldKeys, array('cors_restrict_domains')))): ?>
+<?php if (count(array_intersect($fieldKeys, ['cors_restrict_domains']))): ?>
 <div class="panel panel-primary">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.core.config.header.cors'); ?></h3>
@@ -101,7 +101,7 @@
 </div>
 <?php endif; ?>
 
-<?php if (count(array_intersect($fieldKeys, array('trusted_hosts', 'trusted_proxies', 'ip_lookup_service', 'transifex_username', 'do_not_track_ips')))): ?>
+<?php if (count(array_intersect($fieldKeys, ['trusted_hosts', 'trusted_proxies', 'ip_lookup_service', 'transifex_username', 'do_not_track_ips']))): ?>
 <div class="panel panel-primary">
     <div class="panel-heading">
         <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.core.config.header.misc'); ?></h3>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Config/ip_lookup_config_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Config/ip_lookup_config_row.html.php
index 333f94476e1..7626eeb1dcf 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Config/ip_lookup_config_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Config/ip_lookup_config_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Config/iplookup_download_data_store_button_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Config/iplookup_download_data_store_button_row.html.php
index 420c0a3bf6c..1179ce705d7 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Config/iplookup_download_data_store_button_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Config/iplookup_download_data_store_button_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_attributes.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_attributes.html.php
index 25219374f86..ea1bf1dd486 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_attributes.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_attributes.html.php
@@ -1,8 +1,10 @@
 id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>" <?php if ($disabled): ?>disabled="disabled" <?php endif ?>
 <?php foreach ($attr as $k => $v): ?>
-<?php if (in_array($k, array('icon'))) continue; ?>
-<?php if (in_array($v, array('placeholder', 'title'), true)): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($view['translator']->trans($v, array(), $translation_domain))) ?>
+<?php if (in_array($k, ['icon'])) {
+    continue;
+} ?>
+<?php if (in_array($v, ['placeholder', 'title'], true)): ?>
+<?php printf('%s="%s" ', $view->escape($k), $view->escape($view['translator']->trans($v, [], $translation_domain))) ?>
 <?php elseif ($v === true): ?>
 <?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
 <?php elseif ($v !== false): ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_row.html.php
index d41aec5664d..ecd4f9ade1b 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_row.html.php
@@ -1,5 +1,5 @@
 <?php
-$hasErrors = count($form->vars['errors']);
+$hasErrors     = count($form->vars['errors']);
 $feedbackClass = ($app->getRequest()->getMethod() == 'POST' && !empty($hasErrors)) ? ' has-error' : '';
 
 ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_widget.html.php
index 1a2d013d6a8..6fee4f183ef 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_group_widget.html.php
@@ -5,10 +5,10 @@
 <div class="btn-group <?php echo $buttonBlockClass; ?>" data-toggle="buttons">
     <?php foreach ($form as $child): ?>
         <?php $class =
-            (!empty($child->vars['checked']) ? ' active' : '') .
+            (!empty($child->vars['checked']) ? ' active' : '').
             (!empty($child->vars['disabled']) || !empty($child->vars['read_only']) ? ' disabled' : ''); ?>
         <label class="btn btn-default<?php echo $class; ?>">
-            <?php echo $view['form']->widget($child, array('attr' => $attr)); ?>
+            <?php echo $view['form']->widget($child, ['attr' => $attr]); ?>
             <?php echo $view['translator']->trans($child->vars['label']); ?>
         </label>
     <?php endforeach; ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_row.html.php
index 3239d8f415b..8f6ebb1bb7c 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_row.html.php
@@ -1 +1,3 @@
-<?php echo $view['form']->widget($form) ?>
+<?php
+
+echo $view['form']->widget($form);
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_widget.html.php
index 09812eaf542..f8a0eb32692 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/button_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/button_widget.html.php
@@ -1,8 +1,10 @@
-<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
+<?php if (!$label) {
+    $label = $view['form']->humanize($name);
+} ?>
 <button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>"
     <?php echo $view['form']->block($form, 'button_attributes') ?>>
     <?php if (!empty($form->vars['attr']['icon'])): ?>
     <i class="<?php echo $form->vars['attr']['icon']; ?> "></i>
     <?php endif; ?>
-    <?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?>
+    <?php echo $view->escape($view['translator']->trans($label, [], $translation_domain)) ?>
 </button>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/checkbox_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/checkbox_row.html.php
index c2111d7e57d..c9ad20103ce 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/checkbox_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/checkbox_row.html.php
@@ -1,6 +1,6 @@
 <?php
-$hasErrors = count($form->vars['errors']);
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : ""; ?>
+$hasErrors     = count($form->vars['errors']);
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : ''; ?>
 <div class="row">
     <div class="form-group col-xs-12<?php echo $feedbackClass; ?>">
         <div class="checkbox">
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/choice_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/choice_row.html.php
index 18fc0e39975..712b5a63c43 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/choice_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/choice_row.html.php
@@ -13,7 +13,7 @@
             <?php foreach ($form->children as $child): ?>
                 <div class="checkbox">
                     <label>
-                        <?php echo $view['form']->widget($child, array('attr' => $attr)); ?>
+                        <?php echo $view['form']->widget($child, ['attr' => $attr]); ?>
                         <?php echo $view['translator']->trans($child->vars['label']); ?>
                     </label>
                 </div>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_entry_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_entry_row.html.php
index 3ef5808465c..cd6d1a0afeb 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_entry_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_entry_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_row.html.php
index 1a21ae65e04..742783b08fb 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/dynamiclist_row.html.php
@@ -1,10 +1,10 @@
 <?php
-$list      = $form->children;
-$hasErrors = count($list->vars['errors']);
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : "";
+$list          = $form->children;
+$hasErrors     = count($list->vars['errors']);
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
 $datePrototype = (isset($list->vars['prototype'])) ?
     $view->escape('<div class="sortable">'.$view['form']->widget($list->vars['prototype']).'</div>') : '';
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : "";
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
 ?>
 <div class="row">
     <div data-toggle="sortablelist" data-prefix="<?php echo $form->vars['id']; ?>" class="form-group col-xs-12 <?php echo $feedbackClass; ?>" id="<?php echo $form->vars['id']; ?>_list">
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_buttons_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_buttons_row.html.php
index 35d1b915ef3..c483cf88e4f 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_buttons_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_buttons_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_label.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_label.html.php
index dd3c9aa2e16..8ca57274618 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_label.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_label.html.php
@@ -1,7 +1,15 @@
 <?php if (false !== $label): ?>
-<?php if ($required) { $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required'); } ?>
-<?php if (!$compound) { $label_attr['for'] = $id; } ?>
-<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
+<?php if ($required) {
+    $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required');
+} ?>
+<?php if (!$compound) {
+    $label_attr['for'] = $id;
+} ?>
+<?php if (!$label) {
+    $label = $view['form']->humanize($name);
+} ?>
 <?php $tooltip = (!empty($form->vars['attr']['tooltip'])) ? $form->vars['attr']['tooltip'] : false; ?>
-<label <?php foreach ($label_attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?><?php if ($tooltip): ?>data-toggle="tooltip" data-container="body" data-placement="top" title="<?php echo $view['translator']->trans($tooltip); ?>"<?php endif; ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?><?php if ($tooltip): ?> <i class="fa fa-question-circle"></i><?php endif; ?></label>
+<label <?php foreach ($label_attr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+} ?><?php if ($tooltip): ?>data-toggle="tooltip" data-container="body" data-placement="top" title="<?php echo $view['translator']->trans($tooltip); ?>"<?php endif; ?>><?php echo $view->escape($view['translator']->trans($label, [], $translation_domain)) ?><?php if ($tooltip): ?> <i class="fa fa-question-circle"></i><?php endif; ?></label>
 <?php endif ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_row.html.php
index a10122974ea..b55696d5b02 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_row.html.php
@@ -1,6 +1,6 @@
 <?php
-$hasErrors = count($form->vars['errors']);
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : "";
+$hasErrors     = count($form->vars['errors']);
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
 ?>
 <div class="row">
     <div class="form-group col-xs-12 <?php echo $feedbackClass; ?>">
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_start.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_start.html.php
index a56c1e270c0..1cac9366eaf 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_start.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_start.html.php
@@ -1,6 +1,8 @@
-<?php $method = strtoupper($method) ?>
+<?php $method      = strtoupper($method) ?>
 <?php $form_method = $method === 'GET' || $method === 'POST' ? $method : 'POST' ?>
-<form novalidate autocomplete="false" data-toggle="ajax" role="form" name="<?php echo $form->vars['name'] ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) { printf(' %s="%s"', $view->escape($k), $view->escape($v)); } ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
+<form novalidate autocomplete="false" data-toggle="ajax" role="form" name="<?php echo $form->vars['name'] ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) {
+    printf(' %s="%s"', $view->escape($k), $view->escape($v));
+} ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
 <?php if ($form_method !== $method): ?>
     <input type="hidden" name="_method" value="<?php echo $method ?>" />
 <?php endif ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_widget_simple.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_widget_simple.html.php
index 7845040c1dd..f27e3791027 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/form_widget_simple.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/form_widget_simple.html.php
@@ -1,16 +1,20 @@
 <?php
-$preaddonAttr  = (isset($attr['preaddon_attr'])) ? $attr['preaddon_attr'] : array();
-$postaddonAttr = (isset($attr['postaddon_attr'])) ? $attr['postaddon_attr'] : array();
+$preaddonAttr  = (isset($attr['preaddon_attr'])) ? $attr['preaddon_attr'] : [];
+$postaddonAttr = (isset($attr['postaddon_attr'])) ? $attr['postaddon_attr'] : [];
 
 if (!empty($attr['preaddon']) || !empty($attr['postaddon']) || !empty($attr['preaddon_text']) || !empty($attr['postaddon_text'])): ?>
     <div class="input-group">
         <?php if (!empty($attr['preaddon'])): ?>
-            <span class="input-group-addon preaddon" <?php foreach ($preaddonAttr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); }?>>
+            <span class="input-group-addon preaddon" <?php foreach ($preaddonAttr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+}?>>
         <i class="<?php echo $attr['preaddon']; ?>"></i>
     </span>
         <?php endif; ?>
         <?php if (!empty($attr['preaddon_text'])): ?>
-            <span class="input-group-addon preaddon" <?php foreach ($preaddonAttr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); }?>>
+            <span class="input-group-addon preaddon" <?php foreach ($preaddonAttr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+}?>>
         <span><?php echo $attr['preaddon_text']; ?></span>
     </span>
         <?php endif; ?>
@@ -19,12 +23,16 @@
             value="<?php echo $view->escape($value) ?>"<?php endif ?> />
 
         <?php if (!empty($attr['postaddon'])): ?>
-            <span class="input-group-addon postaddon" <?php foreach ($postaddonAttr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); }?>>
+            <span class="input-group-addon postaddon" <?php foreach ($postaddonAttr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+}?>>
         <i class="<?php echo $attr['postaddon']; ?>"></i>
     </span>
         <?php endif; ?>
         <?php if (!empty($attr['postaddon_text'])): ?>
-            <span class="input-group-addon postaddon" <?php foreach ($postaddonAttr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); }?>>
+            <span class="input-group-addon postaddon" <?php foreach ($postaddonAttr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+}?>>
         <span><?php echo $attr['postaddon_text']; ?></span>
     </span>
         <?php endif; ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/sortable_value_label_list_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/sortable_value_label_list_widget.html.php
index 3b89893d83e..98b8c55e920 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/sortable_value_label_list_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/sortable_value_label_list_widget.html.php
@@ -1,16 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <div class="input-group sortable-no-reorder">
     <?php if (!empty($preaddon)): ?>
-    <span class="input-group-addon preaddon" <?php foreach ($preaddonAttr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); }?>>
+    <span class="input-group-addon preaddon" <?php foreach ($preaddonAttr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+}?>>
     <i class="<?php echo $preaddon; ?>"></i>
     </span>
     <?php endif; ?>
@@ -25,7 +28,9 @@
         </div>
     </div>
     <?php if (!empty($postaddon)): ?>
-    <span class="input-group-addon postaddon" <?php foreach ($postaddonAttr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); }?>>
+    <span class="input-group-addon postaddon" <?php foreach ($postaddonAttr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+}?>>
         <i class="<?php echo $postaddon; ?>"></i>
     </span>
     <?php endif; ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_entry_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_entry_row.html.php
index 587c7198deb..4972d132339 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_entry_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_entry_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_row.html.php
index e3e37b7e624..5b12e39e645 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/sortablelist_row.html.php
@@ -1,10 +1,10 @@
 <?php
-$list      = $form->children['list'];
-$hasErrors = count($list->vars['errors']);
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : "";
+$list          = $form->children['list'];
+$hasErrors     = count($list->vars['errors']);
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
 $datePrototype = (isset($list->vars['prototype'])) ?
     $view->escape('<div class="sortable">'.$view['form']->widget($list->vars['prototype']).'</div>') : '';
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : "";
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
 ?>
 <div class="row">
     <div data-toggle="sortablelist" data-prefix="<?php echo $form->vars['id']; ?>" class="form-group col-xs-12 <?php echo $feedbackClass; ?>" id="<?php echo $form->vars['id']; ?>_list" style="overflow:auto">
@@ -14,7 +14,9 @@ class="btn btn-warning btn-xs btn-add-item" href="#" id="<?php echo $form->vars[
             <?php echo $view['translator']->trans('mautic.core.form.list.additem'); ?>
         </a>
         <?php if ($isSortable): ?>
-        <div id="sortable-<?php echo $form->vars['id']; ?>" class="list-sortable" <?php foreach ($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); }?>>
+        <div id="sortable-<?php echo $form->vars['id']; ?>" class="list-sortable" <?php foreach ($attr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+}?>>
         <?php endif; ?>
             <?php foreach ($list->children as $key => $item): ?>
             <?php echo $view['form']->block($item, 'sortablelist_entry_row'); ?>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/spacer_row.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/spacer_row.html.php
index bacb2384988..55150a09897 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/spacer_row.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/spacer_row.html.php
@@ -1,4 +1,6 @@
 <?php $class = (!empty($class)) ? ' class="'.$class.'"' : ''; ?>
-<<?php echo $tag ?><?php echo $class; ?><?php if (!empty($form->vars['id'])) echo ' id="' . $form->vars['id'] . '"'; ?>>
+<<?php echo $tag ?><?php echo $class; ?><?php if (!empty($form->vars['id'])) {
+    echo ' id="'.$form->vars['id'].'"';
+} ?>>
     <span><?php echo $view['translator']->trans($text); ?></span>
 </<?php echo $tag ?>>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/standalone_button_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/standalone_button_widget.html.php
index 09812eaf542..f8a0eb32692 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/standalone_button_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/standalone_button_widget.html.php
@@ -1,8 +1,10 @@
-<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
+<?php if (!$label) {
+    $label = $view['form']->humanize($name);
+} ?>
 <button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>"
     <?php echo $view['form']->block($form, 'button_attributes') ?>>
     <?php if (!empty($form->vars['attr']['icon'])): ?>
     <i class="<?php echo $form->vars['attr']['icon']; ?> "></i>
     <?php endif; ?>
-    <?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?>
+    <?php echo $view->escape($view['translator']->trans($label, [], $translation_domain)) ?>
 </button>
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/tel_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/tel_widget.html.php
index a485f9a2dda..c8ac7489820 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/tel_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/tel_widget.html.php
@@ -1 +1,3 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "tel")) ?>
+<?php
+
+echo $view['form']->block($form, 'form_widget_simple',  ['type' => isset($type) ? $type : 'tel']);
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/time_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/time_widget.html.php
index 77e3ccaad83..8875667c6a8 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/time_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/time_widget.html.php
@@ -9,7 +9,7 @@
         $size = 6;
     }
     ?>
-    <?php $vars = $widget == 'text' ? array('attr' => array('size' => 1, 'class' => 'not-chosen')) : array('attr' => array('class' => 'not-chosen')); ?>
+    <?php $vars = $widget == 'text' ? ['attr' => ['size' => 1, 'class' => 'not-chosen']] : ['attr' => ['class' => 'not-chosen']]; ?>
     <div <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
         <?php
         // There should be no spaces between the colons and the widgets, that's why
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/widget_attributes.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/widget_attributes.html.php
index 40fd399aab1..57df14b219b 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/widget_attributes.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/widget_attributes.html.php
@@ -5,9 +5,11 @@
 <?php if ($pattern): ?>pattern="<?php echo $view->escape($pattern) ?>" <?php endif ?>
 <?php
 foreach ($attr as $k => $v):
-if (in_array($k, array("tooltip", "preaddon", "preaddon_attr", "postaddon_attr"))) continue;
-if (in_array($k, array('placeholder', 'title'), true)):
-printf('%s="%s" ', $view->escape($k), $view->escape($view['translator']->trans($v, array(), $translation_domain)));
+if (in_array($k, ['tooltip', 'preaddon', 'preaddon_attr', 'postaddon_attr'])) {
+    continue;
+}
+if (in_array($k, ['placeholder', 'title'], true)):
+printf('%s="%s" ', $view->escape($k), $view->escape($view['translator']->trans($v, [], $translation_domain)));
 elseif ($v === true):
 printf('%s="%s" ', $view->escape($k), $view->escape($k));
 elseif ($v !== false):
@@ -17,4 +19,3 @@
 if (!isset($attr['autocomplete'])): // Disable by default and use false for chrome support
 printf('autocomplete="false" ');
 endif;
-
diff --git a/app/bundles/CoreBundle/Views/FormTheme/Custom/yesno_button_group_widget.html.php b/app/bundles/CoreBundle/Views/FormTheme/Custom/yesno_button_group_widget.html.php
index 6d6ebb36afa..facaaa6f8b1 100644
--- a/app/bundles/CoreBundle/Views/FormTheme/Custom/yesno_button_group_widget.html.php
+++ b/app/bundles/CoreBundle/Views/FormTheme/Custom/yesno_button_group_widget.html.php
@@ -1,6 +1,6 @@
 <?php
 //apply attributes to radios
-$attr = $form->vars['attr'];
+$attr     = $form->vars['attr'];
 $onchange = "Mautic.toggleYesNoButtonClass(mQuery(this).attr('id'));";
 if (isset($attr['onchange'])) {
     if (substr($attr['onchange'], 0, -1) !== ';') {
@@ -16,13 +16,13 @@
 <div class="btn-group btn-block" data-toggle="buttons">
     <?php foreach ($form as $child): ?>
         <?php $class =
-            (!empty($child->vars['checked']) ? ' active' : '') .
-            (!empty($child->vars['disabled']) || !empty($child->vars['read_only']) ? ' disabled' : '') .
-            ($child->vars['name'] === '0' ? ' btn-no' : ($child->vars['name'] === '1' ? ' btn-yes' : ' btn-extra')) .
-            ($child->vars['name'] === '0' && !empty($child->vars['checked']) ? ' btn-danger' : '') .
+            (!empty($child->vars['checked']) ? ' active' : '').
+            (!empty($child->vars['disabled']) || !empty($child->vars['read_only']) ? ' disabled' : '').
+            ($child->vars['name'] === '0' ? ' btn-no' : ($child->vars['name'] === '1' ? ' btn-yes' : ' btn-extra')).
+            ($child->vars['name'] === '0' && !empty($child->vars['checked']) ? ' btn-danger' : '').
             ($child->vars['name'] === '1' && !empty($child->vars['checked']) ? ' btn-success' : ''); ?>
         <label class="btn btn-default <?php echo $class; ?>">
-            <?php echo $view['form']->widget($child, array('attr' => $attr)); ?>
+            <?php echo $view['form']->widget($child, ['attr' => $attr]); ?>
             <span><?php echo $view['translator']->trans($child->vars['label']); ?></span>
         </label>
     <?php endforeach; ?>
diff --git a/app/bundles/CoreBundle/Views/GlobalSearch/globalsearch.html.php b/app/bundles/CoreBundle/Views/GlobalSearch/globalsearch.html.php
index 9a0d23f73c7..59a2da3e2b4 100644
--- a/app/bundles/CoreBundle/Views/GlobalSearch/globalsearch.html.php
+++ b/app/bundles/CoreBundle/Views/GlobalSearch/globalsearch.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -18,9 +19,9 @@
             </div>
             <div class="pt-0 pb-xs pl-0 pr-0">
                 <div class="scroll-content slimscroll" style="height:250px;" id="globalSearchResults">
-                    <?php echo $view->render('MauticCoreBundle:GlobalSearch:results.html.php', array(
-                        'results' => $results
-                    )); ?>
+                    <?php echo $view->render('MauticCoreBundle:GlobalSearch:results.html.php', [
+                        'results' => $results,
+                    ]); ?>
                 </div>
             </div>
         </div>
@@ -31,6 +32,6 @@
         <a href="javascript: void(0);" class="search-button">
             <i class="fa fa-search fs-16"></i>
         </a>
-        <input type="search" value="<?php echo $searchString; ?>" class="form-control search" id="globalSearchInput" name="global_search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.everything.placeholder'); ?>" value="" autocomplete="false" data-toggle="livesearch" data-target="#globalSearchResults" data-action="<?php echo $view['router']->path('mautic_core_ajax', array('action' => 'globalSearch')); ?>" data-overlay="true" data-overlay-text="<?php echo $view['translator']->trans('mautic.core.search.livesearch'); ?>" />
+        <input type="search" value="<?php echo $searchString; ?>" class="form-control search" id="globalSearchInput" name="global_search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.everything.placeholder'); ?>" value="" autocomplete="false" data-toggle="livesearch" data-target="#globalSearchResults" data-action="<?php echo $view['router']->path('mautic_core_ajax', ['action' => 'globalSearch']); ?>" data-overlay="true" data-overlay-text="<?php echo $view['translator']->trans('mautic.core.search.livesearch'); ?>" />
     </div>
 </li>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/GlobalSearch/results.html.php b/app/bundles/CoreBundle/Views/GlobalSearch/results.html.php
index aca01737476..a38b39808ad 100644
--- a/app/bundles/CoreBundle/Views/GlobalSearch/results.html.php
+++ b/app/bundles/CoreBundle/Views/GlobalSearch/results.html.php
@@ -1,16 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <div class="panel-group" id="globalSearchPanel">
 <?php foreach ($results as $header => $result): ?>
-<?php if (isset($result['count'])) { $count = $result['count']; unset($result['count']); } ?>
+<?php if (isset($result['count'])) {
+    $count = $result['count'];
+    unset($result['count']);
+} ?>
     <div class="panel panel-info">
         <div class="panel-heading">
             <h4 class="panel-title">
diff --git a/app/bundles/CoreBundle/Views/Helper/action_button_helper.php b/app/bundles/CoreBundle/Views/Helper/action_button_helper.php
index 2d4e078d714..655e0a7a648 100644
--- a/app/bundles/CoreBundle/Views/Helper/action_button_helper.php
+++ b/app/bundles/CoreBundle/Views/Helper/action_button_helper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -31,13 +32,13 @@
 
 //Edit mode for edit/actions (allows use of ajaxmodal)
 if (!isset($editMode)) {
-    $editMode = "ajax";
+    $editMode = 'ajax';
 }
 
 if (!isset($editAttr)) {
     $editAttr = '';
 } elseif (is_array($editAttr)) {
-    $string = "";
+    $string = '';
     foreach ($editAttr as $attr => $val) {
         $string .= " $attr=\"$val\"";
     }
@@ -99,4 +100,4 @@
     $postCustomButtons = [];
 }
 
-$view['buttons']->setCustomButtons($preCustomButtons, $postCustomButtons);
\ No newline at end of file
+$view['buttons']->setCustomButtons($preCustomButtons, $postCustomButtons);
diff --git a/app/bundles/CoreBundle/Views/Helper/blank_form.html.php b/app/bundles/CoreBundle/Views/Helper/blank_form.html.php
index cc018cf8b32..73b8032aa5f 100644
--- a/app/bundles/CoreBundle/Views/Helper/blank_form.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/blank_form.html.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (empty($function)) {
     $function = 'form';
 }
 
 if (empty($variables)) {
-    $variables = array();
+    $variables = [];
 }
 
-echo $view['form']->$function($form, $variables);
\ No newline at end of file
+echo $view['form']->$function($form, $variables);
diff --git a/app/bundles/CoreBundle/Views/Helper/builder.html.php b/app/bundles/CoreBundle/Views/Helper/builder.html.php
index 6bbb12f956e..d94a1a25c38 100644
--- a/app/bundles/CoreBundle/Views/Helper/builder.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/builder.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -12,7 +13,7 @@
         <?php echo htmlspecialchars($builderAssets); ?>
     </script>
     <div class="builder-content">
-        <input type="hidden" id="builder_url" value="<?php echo $view['router']->path('mautic_'.$type.'_action', array('objectAction' => 'builder', 'objectId' => $objectId)); ?>" />
+        <input type="hidden" id="builder_url" value="<?php echo $view['router']->path('mautic_'.$type.'_action', ['objectAction' => 'builder', 'objectId' => $objectId]); ?>" />
     </div>
     <div class="builder-panel">
         <div class="builder-panel-top">
diff --git a/app/bundles/CoreBundle/Views/Helper/chart.html.php b/app/bundles/CoreBundle/Views/Helper/chart.html.php
index 9e7521d5d95..26cea912c14 100644
--- a/app/bundles/CoreBundle/Views/Helper/chart.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/chart.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Helper/confirm.html.php b/app/bundles/CoreBundle/Views/Helper/confirm.html.php
index c137cdc04cf..b72d287245b 100644
--- a/app/bundles/CoreBundle/Views/Helper/confirm.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/confirm.html.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (isset($template)) {
     switch ($template) {
         case 'batchdelete':
-            $confirmText = (!isset($confirmText)) ? $view["translator"]->trans("mautic.core.form.delete")
+            $confirmText = (!isset($confirmText)) ? $view['translator']->trans('mautic.core.form.delete')
                 : $confirmText;
-            $iconClass = (!isset($iconClass)) ? 'fa fa-fw fa-trash-o' : $iconClass;
-            $btnText = (!isset($btnText)) ? false : $btnText;
-            $btnClass = (!isset($btnClass)) ? 'btn btn-sm btn-danger' : $btnClass;
+            $iconClass       = (!isset($iconClass)) ? 'fa fa-fw fa-trash-o' : $iconClass;
+            $btnText         = (!isset($btnText)) ? false : $btnText;
+            $btnClass        = (!isset($btnClass)) ? 'btn btn-sm btn-danger' : $btnClass;
             $confirmCallback = (!isset($confirmCallback)) ? 'executeBatchAction' : $confirmCallback;
             break;
         case 'delete':
-            $confirmText = (!isset($confirmText)) ? $view["translator"]->trans("mautic.core.form.delete")
+            $confirmText = (!isset($confirmText)) ? $view['translator']->trans('mautic.core.form.delete')
                 : $confirmText;
-            $iconClass   = (!isset($iconClass)) ? 'fa fa-fw fa-trash-o text-danger' : $iconClass;
+            $iconClass = (!isset($iconClass)) ? 'fa fa-fw fa-trash-o text-danger' : $iconClass;
 
             $btnText = (!isset($btnText)) ? $view['translator']->trans('mautic.core.form.delete') : $btnText;
             break;
@@ -28,7 +28,7 @@
 }
 
 if (!isset($btnClass)) {
-    $btnClass = "btn btn-default";
+    $btnClass = 'btn btn-default';
 }
 
 if (!isset($btnTextClass)) {
@@ -44,15 +44,15 @@
 }
 
 if (!isset($cancelText)) {
-    $cancelText = $view["translator"]->trans("mautic.core.form.cancel");
+    $cancelText = $view['translator']->trans('mautic.core.form.cancel');
 }
 
 if (!isset($cancelCallback)) {
-    $cancelCallback = "dismissConfirmation";
+    $cancelCallback = 'dismissConfirmation';
 }
 
 if (!isset($attr)) {
-    $attr = array();
+    $attr = [];
 }
 
 if (isset($confirmCallback)) {
@@ -69,7 +69,7 @@
 }
 
 if (!isset($openTag)) {
-    $tag = "a";
+    $tag = 'a';
 }
 $buttonType = ($tag == 'button') ? ' type="button"' : '';
 
@@ -92,7 +92,7 @@
 ?>
 <?php echo $wrapOpeningTag; ?><<?php echo $tag; ?><?php echo $buttonType; ?> class="<?php echo $btnClass; ?>" href="<?php echo $confirmAction; ?>" data-toggle="confirmation" data-precheck="<?php echo $precheck; ?>" data-message="<?php echo $view->escape(
     $message
-); ?>" data-confirm-text="<?php echo $view->escape($confirmText); ?>" <?php echo implode(" ", $attr); ?>>
+); ?>" data-confirm-text="<?php echo $view->escape($confirmText); ?>" <?php echo implode(' ', $attr); ?>>
 <span<?php echo $tooltipAttr; ?>><?php if (isset($iconClass)): ?><i
         class="<?php echo $iconClass; ?>"></i> <?php endif; ?><?php if (isset($btnText)): ?><span
         class="<?php echo $btnTextClass; ?>"><?php echo $btnText; ?></span><?php endif; ?></span>
diff --git a/app/bundles/CoreBundle/Views/Helper/details.html.php b/app/bundles/CoreBundle/Views/Helper/details.html.php
index 8b8b958ca0b..36fee2da733 100644
--- a/app/bundles/CoreBundle/Views/Helper/details.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/details.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -47,7 +48,7 @@
 </tr>
 <tr>
     <td width="20%"><span class="fw-b"><?php echo $view['translator']->trans('mautic.page.publish.down'); ?></span></td>
-    <td><?php echo (!is_null($entity->getPublishDown())) ? $view['date']->toFull($entity->getPublishDown()) : $view['translator']->trans('mautic.core.never');; ?></td>
+    <td><?php echo (!is_null($entity->getPublishDown())) ? $view['date']->toFull($entity->getPublishDown()) : $view['translator']->trans('mautic.core.never'); ?></td>
 </tr>
 <?php endif; ?>
 <?php if (method_exists($entity, 'getId')): ?>
diff --git a/app/bundles/CoreBundle/Views/Helper/form_selecttype.html.php b/app/bundles/CoreBundle/Views/Helper/form_selecttype.html.php
index dbbd5e322fd..3d649dbb062 100644
--- a/app/bundles/CoreBundle/Views/Helper/form_selecttype.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/form_selecttype.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <script>
     <?php foreach ($mauticLang as $key => $string): ?>
diff --git a/app/bundles/CoreBundle/Views/Helper/graph_dateselect.html.php b/app/bundles/CoreBundle/Views/Helper/graph_dateselect.html.php
index 89473a56808..8fe937bc028 100644
--- a/app/bundles/CoreBundle/Views/Helper/graph_dateselect.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/graph_dateselect.html.php
@@ -1,16 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-if (!isset($class)) $class = '';
+if (!isset($class)) {
+    $class = '';
+}
 ?>
 
-<?php echo $view['form']->start($dateRangeForm, array('attr' => array('class' => 'form-filter ' . $class, 'style' => 'max-width: 380px'))); ?>
+<?php echo $view['form']->start($dateRangeForm, ['attr' => ['class' => 'form-filter '.$class, 'style' => 'max-width: 380px']]); ?>
     <div class="input-group">
         <span class="input-group-addon">
             <?php echo $view['form']->label($dateRangeForm['date_from']); ?>
diff --git a/app/bundles/CoreBundle/Views/Helper/lifecycle.html.php b/app/bundles/CoreBundle/Views/Helper/lifecycle.html.php
index 3a395d42289..bcb19ce7aa6 100644
--- a/app/bundles/CoreBundle/Views/Helper/lifecycle.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/lifecycle.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -21,7 +22,7 @@
         <div class="clearfix"></div>
         <div class="pull-left"> <a href="<?php echo $link[$key]; ?>">  <?php echo $value[$key]; ?> Contacts</div></a>
         <div class="clearfix"></div>
-        <div style="height:<?php echo $chartHeight/2.3; ?>px;">
+        <div style="height:<?php echo $chartHeight / 2.3; ?>px;">
 
             <canvas class="chart <?php echo $chartType; ?>-chart"
                     style="font-size: 9px!important;"><?php echo json_encode($chartData); ?></canvas>
@@ -35,7 +36,7 @@
                 <div>
                     <div class="chart-legend pt-sd pr-md pb-md pl-md"><h5><?php echo $view['translator']->trans('mautic.lead.lifecycle.graph.stage.cycle'); ?></h5></div>
                     <div class="clearfix"></div>
-                    <div style="height:<?php echo $chartHeight/2.3; ?>px;">
+                    <div style="height:<?php echo $chartHeight / 2.3; ?>px;">
                      <canvas class="chart simple-bar-chart" style="font-size: 9px!important;"><?php echo json_encode($stages[$key]); ?></canvas>
                     </div>
                     <div class="legend" style="font-size: 9px;"></div>
@@ -47,7 +48,7 @@
                 <div>
                     <div class="chart-legend pt-sd pr-md pb-md pl-md"><h5><?php echo $view['translator']->trans('mautic.lead.lifecycle.graph.device.granularity'); ?></h5></div>
                     <div class="clearfix"></div>
-                    <div style="height:<?php echo $chartHeight/5; ?>px;">
+                    <div style="height:<?php echo $chartHeight / 5; ?>px;">
                         <canvas class="chart horizontal-bar-chart" style="font-size: 9px!important;"><?php echo json_encode($devices[$key]); ?></canvas>
                     </div>
                     <div class="legend" style="font-size: 9px;"></div>
diff --git a/app/bundles/CoreBundle/Views/Helper/list_actions.html.php b/app/bundles/CoreBundle/Views/Helper/list_actions.html.php
index 3800f290b1f..36c75f7b8a8 100644
--- a/app/bundles/CoreBundle/Views/Helper/list_actions.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/list_actions.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $groupType = 'dropdown';
 include 'action_button_helper.php';
 
@@ -33,7 +33,7 @@
 
             <?php if (!empty($templateButtons['edit'])): ?>
             <li>
-                <a href="<?php echo $view['router']->path($actionRoute, array_merge(array("objectAction" => "edit", "objectId" => $id), $query)); ?>" data-toggle="<?php echo $editMode; ?>"<?php echo $editAttr.$menuLink; ?>>
+                <a href="<?php echo $view['router']->path($actionRoute, array_merge(['objectAction' => 'edit', 'objectId' => $id], $query)); ?>" data-toggle="<?php echo $editMode; ?>"<?php echo $editAttr.$menuLink; ?>>
                     <span><i class="fa fa-pencil-square-o"></i> <?php echo $view['translator']->trans('mautic.core.form.edit'); ?></span>
                 </a>
             </li>
@@ -41,7 +41,7 @@
 
             <?php if (!empty($templateButtons['clone'])): ?>
             <li>
-                <a href="<?php echo $view['router']->path($actionRoute, array_merge(array("objectAction" => "clone", "objectId" => $id), $query)); ?>" data-toggle="ajax"<?php echo $menuLink; ?>>
+                <a href="<?php echo $view['router']->path($actionRoute, array_merge(['objectAction' => 'clone', 'objectId' => $id], $query)); ?>" data-toggle="ajax"<?php echo $menuLink; ?>>
                     <span><i class="fa fa-copy"></i> <?php echo $view['translator']->trans('mautic.core.form.clone'); ?></span>
                 </a>
             </li>
@@ -49,12 +49,12 @@
 
             <?php if (!empty($templateButtons['delete'])): ?>
             <li>
-                <?php echo $view->render('MauticCoreBundle:Helper:confirm.html.php', array(
+                <?php echo $view->render('MauticCoreBundle:Helper:confirm.html.php', [
                     'btnClass'      => false,
-                    'message'       => $view["translator"]->trans("mautic." . $langVar . ".form.confirmdelete", array("%name%" => $name . " (" . $id . ")")),
-                    'confirmAction' => $view['router']->path($actionRoute, array_merge(array("objectAction" => "delete", "objectId" => $id), $query)),
-                    'template'      => 'delete'
-                )); ?>
+                    'message'       => $view['translator']->trans('mautic.'.$langVar.'.form.confirmdelete', ['%name%' => $name.' ('.$id.')']),
+                    'confirmAction' => $view['router']->path($actionRoute, array_merge(['objectAction' => 'delete', 'objectId' => $id], $query)),
+                    'template'      => 'delete',
+                ]); ?>
             </li>
             <?php endif; ?>
 
diff --git a/app/bundles/CoreBundle/Views/Helper/list_filters.html.php b/app/bundles/CoreBundle/Views/Helper/list_filters.html.php
index 2178965f619..4219430daef 100644
--- a/app/bundles/CoreBundle/Views/Helper/list_filters.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/list_filters.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -14,37 +15,39 @@
         foreach ($filters as $filterName => $filter):
 
         $filterName = $view['translator']->trans($filterName);
-        $attr = array(
-                'id="' . $filterName . '"',
-                'name="' . $filterName . '"'
-            );
+        $attr       = [
+                'id="'.$filterName.'"',
+                'name="'.$filterName.'"',
+            ];
         if (!empty($filter['multiple'])) {
             $attr[] = 'multiple';
         }
 
         if (!empty($filter['placeholder'])) {
-            $attr[] = 'data-placeholder="' . $filter['placeholder'] . '"';
+            $attr[] = 'data-placeholder="'.$filter['placeholder'].'"';
         } else {
-            $attr[] = 'data-placeholder="' . $view['translator']->trans('mautic.core.list.filter') . '"';
+            $attr[] = 'data-placeholder="'.$view['translator']->trans('mautic.core.list.filter').'"';
         }
 
         if (!empty($filter['onchange'])) {
-            $attr[] = 'onchange="' . $filter['onchange'] . '"';
+            $attr[] = 'onchange="'.$filter['onchange'].'"';
         } else {
             $attr[] = 'data-toggle="listfilter"';
-            $attr[] = 'data-target="' . (!empty($target) ? $target : '.page-list') . '"';
+            $attr[] = 'data-target="'.(!empty($target) ? $target : '.page-list').'"';
         }
 
-        $attr[] = 'data-tmpl="' . (!empty($tmpl) ? $tmpl : 'list') . '"';
+        $attr[] = 'data-tmpl="'.(!empty($tmpl) ? $tmpl : 'list').'"';
 
         if (!empty($filter['prefix-exceptions'])) {
-            $attr[] = 'data-prefix-exceptions="' . implode(',', $filter['prefix-exceptions']) . '"';
+            $attr[] = 'data-prefix-exceptions="'.implode(',', $filter['prefix-exceptions']).'"';
         }
         ?>
         <select <?php echo implode(' ', $attr); ?>>
             <?php if (isset($filter['groups'])): ?>
             <?php foreach ($filter['groups'] as $groupLabel => $groupFilter): ?>
-            <optgroup label="<?php echo $view['translator']->trans($groupLabel); ?>"<?php if (isset($groupFilter['prefix'])) echo ' data-prefix="' . $groupFilter['prefix'] . '"'; ?>>
+            <optgroup label="<?php echo $view['translator']->trans($groupLabel); ?>"<?php if (isset($groupFilter['prefix'])) {
+            echo ' data-prefix="'.$groupFilter['prefix'].'"';
+        } ?>>
                 <?php if (isset($groupFilter['options'])): ?>
                 <?php foreach ($groupFilter['options'] as $value => $label):
                     if (is_array($label)):
@@ -54,8 +57,9 @@
 
                     $selected = (isset($groupFilter['values']) && in_array($value, $groupFilter['values'])) ? ' selected' : '';
 
-                    if (isset($groupFilter['prefix']))
-                        $value = $groupFilter['prefix'] . ':' . $value;
+                    if (isset($groupFilter['prefix'])) {
+                        $value = $groupFilter['prefix'].':'.$value;
+                    }
 
                 ?>
                 <option value="<?php echo $value; ?>"<?php echo $selected; ?>><?php echo $label; ?></option>
diff --git a/app/bundles/CoreBundle/Views/Helper/list_toolbar.html.php b/app/bundles/CoreBundle/Views/Helper/list_toolbar.html.php
index 7f44b360ae4..ed4b82c7d45 100644
--- a/app/bundles/CoreBundle/Views/Helper/list_toolbar.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/list_toolbar.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $wrap = true;
 include 'action_button_helper.php';
 ?>
@@ -14,22 +14,22 @@
     <div class="box-layout">
         <div class="col-xs-6 col-lg-8 va-m form-inline">
             <?php if (isset($searchValue)): ?>
-            <?php echo $view->render('MauticCoreBundle:Helper:search.html.php', array(
+            <?php echo $view->render('MauticCoreBundle:Helper:search.html.php', [
                     'searchId'    => (empty($searchId)) ? null : $searchId,
                     'searchValue' => $searchValue,
                     'action'      => $action,
                     'searchHelp'  => (isset($searchHelp)) ? $searchHelp : '',
                     'target'      => (empty($target)) ? null : $target,
-                    'tmpl'        => (empty($tmpl)) ? null : $tmpl
-                )); ?>
+                    'tmpl'        => (empty($tmpl)) ? null : $tmpl,
+                ]); ?>
             <?php endif; ?>
 
             <?php if (!empty($filters)): ?>
-            <?php echo $view->render('MauticCoreBundle:Helper:list_filters.html.php', array(
+            <?php echo $view->render('MauticCoreBundle:Helper:list_filters.html.php', [
                     'filters' => $filters,
                     'target'  => (empty($target)) ? null : $target,
-                    'tmpl'    => (empty($tmpl)) ? null : $tmpl
-                )); ?>
+                    'tmpl'    => (empty($tmpl)) ? null : $tmpl,
+                ]); ?>
             <?php endif; ?>
         </div>
 
@@ -40,15 +40,15 @@
             echo $view['buttons']->renderPreCustomButtons($buttonCount);
 
             if (!empty($templateButtons['delete'])):
-                echo $view->render('MauticCoreBundle:Helper:confirm.html.php', array(
-                    'message'       => $view['translator']->trans('mautic.' . $langVar . '.form.confirmbatchdelete'),
-                    'confirmAction' => $view['router']->path($actionRoute, array_merge(array('objectAction' => 'batchDelete'), $query)),
+                echo $view->render('MauticCoreBundle:Helper:confirm.html.php', [
+                    'message'       => $view['translator']->trans('mautic.'.$langVar.'.form.confirmbatchdelete'),
+                    'confirmAction' => $view['router']->path($actionRoute, array_merge(['objectAction' => 'batchDelete'], $query)),
                     'template'      => 'batchdelete',
                     'tooltip'       => $view['translator']->trans('mautic.core.form.tooltip.bulkdelete'),
                     'precheck'      => 'batchActionPrecheck',
-                    'target'        => (empty($target)) ? null : $target
-                ));
-                $buttonCount++;
+                    'target'        => (empty($target)) ? null : $target,
+                ]);
+                ++$buttonCount;
             endif;
 
             echo $view['buttons']->renderPostCustomButtons($buttonCount);
diff --git a/app/bundles/CoreBundle/Views/Helper/map.html.php b/app/bundles/CoreBundle/Views/Helper/map.html.php
index e89bd489811..e76656dc72c 100644
--- a/app/bundles/CoreBundle/Views/Helper/map.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/map.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Helper/modal.html.php b/app/bundles/CoreBundle/Views/Helper/modal.html.php
index 7e35af36f57..8d7d248289d 100644
--- a/app/bundles/CoreBundle/Views/Helper/modal.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/modal.html.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $size            = (empty($size)) ? '' : ' modal-'.$size;
-$class           = (!empty($class)) ? " $class" : "";
-$body            = (empty($body)) ? "" : $body;
-$footer          = (empty($footer)) ? "" : $footer;
+$class           = (!empty($class)) ? " $class" : '';
+$body            = (empty($body)) ? '' : $body;
+$footer          = (empty($footer)) ? '' : $footer;
 $hidePlaceholder = (empty($body)) ? '' : ' hide';
-$header          = (!isset($header)) ? "" : $header;
-$padding         = (empty($padding)) ? "" : $padding;
+$header          = (!isset($header)) ? '' : $header;
+$padding         = (empty($padding)) ? '' : $padding;
 ?>
 
 <div class="modal fade" id="<?php echo $id; ?>" tabindex="-1" role="dialog" aria-labelledby="<?php echo $id; ?>-label" aria-hidden="true">
diff --git a/app/bundles/CoreBundle/Views/Helper/noresults.html.php b/app/bundles/CoreBundle/Views/Helper/noresults.html.php
index f65b010edff..1280ca9765a 100644
--- a/app/bundles/CoreBundle/Views/Helper/noresults.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/noresults.html.php
@@ -1,7 +1,11 @@
 <div class="alert alert-warning col-md-6 col-md-offset-3 mt-md" style="white-space: normal;">
-    <?php if (!isset($header)) $header = 'mautic.core.noresults.header'; ?>
+    <?php if (!isset($header)) {
+    $header = 'mautic.core.noresults.header';
+} ?>
     <h4><?php echo $view['translator']->trans($header); ?></h4>
-    <?php if (!isset($message)) $message = 'mautic.core.noresults'; ?>
+    <?php if (!isset($message)) {
+    $message = 'mautic.core.noresults';
+} ?>
     <p><?php echo $view['translator']->trans($message); ?></p>
 </div>
 
diff --git a/app/bundles/CoreBundle/Views/Helper/page_actions.html.php b/app/bundles/CoreBundle/Views/Helper/page_actions.html.php
index 279d8473641..a66758c3442 100644
--- a/app/bundles/CoreBundle/Views/Helper/page_actions.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/page_actions.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $buttonCount = 0;
@@ -23,11 +24,12 @@
 
 foreach ($templateButtons as $action => $enabled) {
     if (!$enabled) {
-
         continue;
     }
 
-    if (!$enabled) continue;
+    if (!$enabled) {
+        continue;
+    }
 
     $btnClass = 'btn btn-default';
 
@@ -35,7 +37,7 @@
         case 'clone':
         case 'abtest':
             $actionQuery = [
-                'objectId' => ('abtest' == $action && method_exists($item, 'getVariantParent') && $item->getVariantParent()) ? $item->getVariantParent()->getId() : $item->getId()
+                'objectId' => ('abtest' == $action && method_exists($item, 'getVariantParent') && $item->getVariantParent()) ? $item->getVariantParent()->getId() : $item->getId(),
             ];
             $icon = ($action == 'clone') ? 'copy' : 'sitemap';
             echo '<a class="'.$btnClass.'" href="'.$view['router']->path($actionRoute, array_merge(['objectAction' => $action], $actionQuery, $query))
@@ -67,26 +69,24 @@
             echo $view->render(
                 'MauticCoreBundle:Helper:confirm.html.php',
                 [
-                    'message'       => $view["translator"]->trans(
-                        "mautic.".$langVar.".form.confirmdelete",
-                        ["%name%" => $item->$nameGetter()." (".$item->getId().")"]
+                    'message' => $view['translator']->trans(
+                        'mautic.'.$langVar.'.form.confirmdelete',
+                        ['%name%' => $item->$nameGetter().' ('.$item->getId().')']
                     ),
                     'confirmAction' => $view['router']->path(
                         $actionRoute,
                         array_merge(['objectAction' => 'delete', 'objectId' => $item->getId()], $query)
                     ),
-                    'template'      => 'delete',
-                    'btnTextClass'  => 'hidden-xs hidden-sm',
-                    'btnClass'      => $btnClass,
+                    'template'     => 'delete',
+                    'btnTextClass' => 'hidden-xs hidden-sm',
+                    'btnClass'     => $btnClass,
                 ]
             );
             break;
     }
-
 }
 
 if ($buttonCount > 0) {
-
     echo '<div class="dropdown-toolbar btn-group">';
 
     $dropdownOpenHtml = '<button type="button" class="btn btn-default btn-nospin  dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-caret-down"></i></button>'
@@ -97,8 +97,7 @@
     echo $view['buttons']->renderPostCustomButtons($buttonCount, $dropdownOpenHtml);
 
     echo '</ul></div>';
-
 }
 
 echo '</div>';
-echo $extraHtml;
\ No newline at end of file
+echo $extraHtml;
diff --git a/app/bundles/CoreBundle/Views/Helper/pagination.html.php b/app/bundles/CoreBundle/Views/Helper/pagination.html.php
index a241fa67e66..26716d5ea0b 100644
--- a/app/bundles/CoreBundle/Views/Helper/pagination.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/pagination.html.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$target     = (!empty($target)) ? $target : '.page-list';
-$tmpl       = (!empty($tmpl)) ? $tmpl : 'list';
+$target = (!empty($target)) ? $target : '.page-list';
+$tmpl   = (!empty($tmpl)) ? $tmpl : 'list';
 
 if (empty($fixedPages)) {
     $limit = (!isset($limit)) ? 30 : (int) $limit;
@@ -31,9 +31,9 @@
     $page = (int) $page;
 }
 
-$pageClass           = (!isset($paginationClass)) ? "" : " pagination-$paginationClass";
-$menuLink            = (!empty($menuLinkId)) ? " data-menu-link=\"$menuLinkId\"" : "";
-$paginationWrapper   = isset($paginationWrapper) ? $paginationWrapper : "pagination-wrapper ml-md mr-md";
+$pageClass           = (!isset($paginationClass)) ? '' : " pagination-$paginationClass";
+$menuLink            = (!empty($menuLinkId)) ? " data-menu-link=\"$menuLinkId\"" : '';
+$paginationWrapper   = isset($paginationWrapper) ? $paginationWrapper : 'pagination-wrapper ml-md mr-md';
 $queryString         = '?tmpl='.$tmpl.(isset($queryString) ? $queryString : '');
 $formExit            = (!empty($ignoreFormExit)) ? ' data-ignore-formexit="true"' : '';
 $responsiveViewports = ['desktop', 'mobile'];
@@ -54,7 +54,7 @@
         $paginationClass   = 'sm';
         $pageClass         = 'pagination-sm';
         $responsiveClass   = 'visible-xs hidden-sm hidden-md hidden-lg';
-        $paginationWrapper = "pagination-wrapper pull-left nm";
+        $paginationWrapper = 'pagination-wrapper pull-left nm';
     else:
         $responsiveClass = 'hidden-xs visible-sm visible-md visible-lg';
     endif;
@@ -63,7 +63,7 @@
     <div class="<?php echo $responsiveClass; ?>">
         <?php if (empty($fixedLimit)): ?>
             <div class="pull-right">
-                <?php $class = (!empty($paginationClass)) ? " input-{$paginationClass}" : ""; ?>
+                <?php $class = (!empty($paginationClass)) ? " input-{$paginationClass}" : ''; ?>
                 <select autocomplete="false" class="form-control not-chosen pagination-limit<?php echo $class; ?>" onchange="Mautic.limitTableData('<?php echo $sessionVar; ?>',this.value,'<?php echo $tmpl; ?>','<?php echo $target; ?>'<?php if (!empty($baseUrl)): ?>, '<?php echo $baseUrl; ?>'<?php endif; ?>);">
                     <?php foreach ($limitOptions as $value => $label): ?>
                         <?php $selected = ($limit === $value) ? ' selected="selected"' : ''; ?>
@@ -78,7 +78,7 @@
         <div class="<?php echo $paginationWrapper; ?>">
             <ul class="pagination nm <?php echo $pageClass; ?>">
                 <?php
-                $urlPage = "/1";
+                $urlPage = '/1';
                 $url     = ($page > 1) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
                 $data    = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
                 $class   = ($page <= 1) ? ' class="disabled"' : '';
@@ -91,7 +91,7 @@
                 </li>
 
                 <?php
-                $urlPage = "/".($page - 1);
+                $urlPage = '/'.($page - 1);
                 $url     = (($page - 1) >= 1) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
                 $data    = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
                 $class   = (($page - 1) <= 0) ? ' class="disabled"' : '';
@@ -113,10 +113,10 @@
                     $lastPage = $totalPages;
                 }
                 ?>
-                <?php for ($i = $startPage; $i <= $lastPage; $i++): ?>
+                <?php for ($i = $startPage; $i <= $lastPage; ++$i): ?>
                     <?php
                     $class = ($page === (int) $i) ? ' class="active"' : '';
-                    $url   = ($page === (int) $i) ? 'javascript: void(0);' : $baseUrl."/".$i.$queryString;
+                    $url   = ($page === (int) $i) ? 'javascript: void(0);' : $baseUrl.'/'.$i.$queryString;
                     $data  = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
                     ?>
                     <li<?php echo $class; ?>>
@@ -127,7 +127,7 @@
                 <?php endfor; ?>
 
                 <?php
-                $urlPage = "/".($page + 1);
+                $urlPage = '/'.($page + 1);
                 $url     = (($page + 1) <= $totalPages) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
                 $data    = ($url == 'javascript: void(0);') ? '' : 'data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
                 $class   = (($page + 1) > $totalPages) ? ' class="disabled"' : '';
@@ -140,7 +140,7 @@
                 </li>
 
                 <?php
-                $urlPage = "/".$totalPages;
+                $urlPage = '/'.$totalPages;
                 $url     = ($page < $totalPages) ? $baseUrl.$urlPage.$queryString : 'javascript: void(0);';
                 $data    = ($url == 'javascript: void(0);') ? '' : ' data-toggle="ajax" data-target="'.$target.'"'.$menuLink;
                 $class   = ($page === $totalPages) ? ' class="disabled"' : '';
diff --git a/app/bundles/CoreBundle/Views/Helper/publishstatus_badge.html.php b/app/bundles/CoreBundle/Views/Helper/publishstatus_badge.html.php
index 223c1c4c644..ac8932ac121 100644
--- a/app/bundles/CoreBundle/Views/Helper/publishstatus_badge.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/publishstatus_badge.html.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 <?php switch ($entity->getPublishStatus()) {
     case 'published':
-        $labelColor = "success";
+        $labelColor = 'success';
         break;
     case 'unpublished':
-    case 'expired'    :
-        $labelColor = "danger";
+    case 'expired':
+        $labelColor = 'danger';
         break;
     case 'pending':
-        $labelColor = "warning";
+        $labelColor = 'warning';
         break;
 } ?>
-<?php $labelText = $view['translator']->trans('mautic.core.form.' . $entity->getPublishStatus()); ?>
+<?php $labelText = $view['translator']->trans('mautic.core.form.'.$entity->getPublishStatus()); ?>
 <h4 class="fw-sb"><span class="tt-u label label-<?php echo $labelColor; ?>"><?php echo $labelText; ?></span></h4>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Helper/publishstatus_icon.html.php b/app/bundles/CoreBundle/Views/Helper/publishstatus_icon.html.php
index 6342961129a..f2ae170b925 100644
--- a/app/bundles/CoreBundle/Views/Helper/publishstatus_icon.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/publishstatus_icon.html.php
@@ -1,44 +1,44 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $query  = (!isset($query)) ? '' : $query;
 $status = $item->getPublishStatus();
 $size   = (empty($size)) ? 'fa-lg' : $size;
 switch ($status) {
     case 'published':
-        $icon = " fa-toggle-on text-success";
+        $icon = ' fa-toggle-on text-success';
         $text = $view['translator']->trans('mautic.core.form.published');
         break;
     case 'unpublished':
-        $icon = " fa-toggle-off text-danger";
+        $icon = ' fa-toggle-off text-danger';
         $text = $view['translator']->trans('mautic.core.form.unpublished');
         break;
     case 'expired':
-        $icon = " fa-clock-o text-danger";
-        $text = $view['translator']->trans('mautic.core.form.expired', array(
-            '%date%' => $view['date']->toFull($item->getPublishDown())
-        ));
+        $icon = ' fa-clock-o text-danger';
+        $text = $view['translator']->trans('mautic.core.form.expired', [
+            '%date%' => $view['date']->toFull($item->getPublishDown()),
+        ]);
         break;
     case 'pending':
-        $icon = " fa-clock-o text-warning";
-        $text = $view['translator']->trans('mautic.core.form.pending', array(
-            '%date%' => $view['date']->toFull($item->getPublishUp())
-        ));
+        $icon = ' fa-clock-o text-warning';
+        $text = $view['translator']->trans('mautic.core.form.pending', [
+            '%date%' => $view['date']->toFull($item->getPublishUp()),
+        ]);
         break;
 }
 
 if (!empty($disableToggle)) {
-    $icon = str_replace(array('success', 'danger', 'warning'), 'muted', $icon);
+    $icon = str_replace(['success', 'danger', 'warning'], 'muted', $icon);
 }
 
 $clickAction = (isset($disableToggle) && $disableToggle === true) ? ' disabled' : ' has-click-event';
-$idClass     = str_replace('.', '-', $model) . '-publish-icon' . $item->getId();
+$idClass     = str_replace('.', '-', $model).'-publish-icon'.$item->getId();
 ?>
 
-<i class="fa fa-fw <?php echo $size . " " . $icon . $clickAction . " " . $idClass; ?>" data-toggle="tooltip" data-container="body" data-placement="right" data-status="<?php echo $status; ?>" title="<?php echo $text ?>"<?php if (empty($disableToggle)): ?> onclick="Mautic.togglePublishStatus(event, '.<?php echo $idClass; ?>', '<?php echo $model; ?>', <?php echo $item->getId(); ?>, '<?php echo $query; ?>', <?php echo (isset($backdrop)) ? 'true' : 'false'; ?>);"<?php endif; ?>></i>
+<i class="fa fa-fw <?php echo $size.' '.$icon.$clickAction.' '.$idClass; ?>" data-toggle="tooltip" data-container="body" data-placement="right" data-status="<?php echo $status; ?>" title="<?php echo $text ?>"<?php if (empty($disableToggle)): ?> onclick="Mautic.togglePublishStatus(event, '.<?php echo $idClass; ?>', '<?php echo $model; ?>', <?php echo $item->getId(); ?>, '<?php echo $query; ?>', <?php echo (isset($backdrop)) ? 'true' : 'false'; ?>);"<?php endif; ?>></i>
diff --git a/app/bundles/CoreBundle/Views/Helper/recentactivity.html.php b/app/bundles/CoreBundle/Views/Helper/recentactivity.html.php
index 3bd05051bec..0d4f812a536 100644
--- a/app/bundles/CoreBundle/Views/Helper/recentactivity.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/recentactivity.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -25,9 +26,9 @@
                 <?php endif; ?>
                 </div>
                 <div class="media-body">
-                    <?php echo $view['translator']->trans('mautic.core.' . $log['action'] . '.by.past.tense'); ?>
+                    <?php echo $view['translator']->trans('mautic.core.'.$log['action'].'.by.past.tense'); ?>
                     <?php if (isset($log['userId']) && $log['userId']) : ?>
-                        <a href="<?php echo $view['router']->path('mautic_user_action', array('objectAction' => 'edit', 'objectId' => $log['userId'])); ?>" data-toggle="ajax">
+                        <a href="<?php echo $view['router']->path('mautic_user_action', ['objectAction' => 'edit', 'objectId' => $log['userId']]); ?>" data-toggle="ajax">
                             <?php echo $log['userName']; ?>
                         </a>
                     <?php else: ?>
diff --git a/app/bundles/CoreBundle/Views/Helper/search.html.php b/app/bundles/CoreBundle/Views/Helper/search.html.php
index 4ccf44ac3e4..0fbb09eff85 100644
--- a/app/bundles/CoreBundle/Views/Helper/search.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/search.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $searchValue    = (empty($searchValue)) ? '' : $searchValue;
 $target         = (empty($target)) ? '.page-list' : $target;
 $overlayTarget  = (empty($overlayTarget)) ? $target : $overlayTarget;
@@ -34,10 +34,10 @@
 
 <?php
 if ($searchHelp):
-echo $view->render('MauticCoreBundle:Helper:modal.html.php', array(
-    'id'     => $searchId . '-search-help',
+echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
+    'id'     => $searchId.'-search-help',
     'header' => $view['translator']->trans('mautic.core.search.header'),
-    'body'   => $view['translator']->trans('mautic.core.search.help') . $view['translator']->trans($searchHelp)
-));
+    'body'   => $view['translator']->trans('mautic.core.search.help').$view['translator']->trans($searchHelp),
+]);
 endif;
 ?>
diff --git a/app/bundles/CoreBundle/Views/Helper/table.html.php b/app/bundles/CoreBundle/Views/Helper/table.html.php
index dda1ce48c12..43aaeee3d58 100644
--- a/app/bundles/CoreBundle/Views/Helper/table.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/table.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!isset($class)) {
     $class = 'table';
 }
@@ -41,12 +41,12 @@
                                         data-toggle="ajax"
                                         <?php endif; ?>
                                         >
-                                        <?php $item = str_replace(array('http://', 'https://'), '', $item); ?>
+                                        <?php $item = str_replace(['http://', 'https://'], '', $item); ?>
                                         <?php echo $view['assets']->shortenText($item['value'], $shortenLinkText); ?>
                                     </a>
-                                <?php elseif(isset($item['value'])): ?>
+                                <?php elseif (isset($item['value'])): ?>
                                     <?php echo $item['value']; ?>
-                                <?php elseif(is_string($item)): ?>
+                                <?php elseif (is_string($item)): ?>
                                     <?php echo $item; ?>
                                 <?php endif; ?>
                             </td>
diff --git a/app/bundles/CoreBundle/Views/Helper/tableheader.html.php b/app/bundles/CoreBundle/Views/Helper/tableheader.html.php
index 326f58447f9..facbfcd6de9 100644
--- a/app/bundles/CoreBundle/Views/Helper/tableheader.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/tableheader.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-if (!isset($target))
+if (!isset($target)) {
     $target = '.page-list';
+}
 
 if (!empty($checkall)):
 ?>
@@ -21,18 +22,18 @@
     </div>
 </th>
 <?php elseif (empty($sessionVar)) : ?>
-<th<?php echo (!empty($class)) ? ' class="' . $class . '"': ""; ?>>
+<th<?php echo (!empty($class)) ? ' class="'.$class.'"' : ''; ?>>
     <span><?php echo $view['translator']->trans($text); ?></span>
 </th>
 <?php
 else:
-$defaultOrder = (!empty($default)) ? $orderBy : "";
+$defaultOrder = (!empty($default)) ? $orderBy : '';
 $order        = (!empty($order)) ? $order : $app->getSession()->get("mautic.{$sessionVar}.orderby", $defaultOrder);
-$dir          = (!empty($dir))? $dir : $app->getSession()->get("mautic.{$sessionVar}.orderbydir", "ASC");
-$filters      = (!empty($filters)) ? $filters : $app->getSession()->get("mautic.{$sessionVar}.filters", array());
+$dir          = (!empty($dir)) ? $dir : $app->getSession()->get("mautic.{$sessionVar}.orderbydir", 'ASC');
+$filters      = (!empty($filters)) ? $filters : $app->getSession()->get("mautic.{$sessionVar}.filters", []);
 $tmpl         = (!empty($tmpl)) ? $tmpl : 'list';
 ?>
-<th<?php echo (!empty($class)) ? ' class="' . $class . '"': ""; ?>>
+<th<?php echo (!empty($class)) ? ' class="'.$class.'"' : ''; ?>>
     <div class="thead-filter">
         <?php if (!empty($orderBy)): ?>
         <a href="javascript: void(0);" onclick="Mautic.reorderTableData('<?php echo $sessionVar; ?>','<?php echo $orderBy; ?>','<?php echo $tmpl; ?>','<?php echo $target; ?>'<?php if (!empty($baseUrl)): ?>, '<?php echo $baseUrl; ?>'<?php endif; ?>);">
@@ -48,11 +49,11 @@
         <?php if (!empty($filterBy)): ?>
         <?php $value = (isset($filters[$filterBy])) ? $filters[$filterBy]['value'] : ''; ?>
         <div class="input-group input-group-sm">
-            <?php $toggle = (!empty($dataToggle)) ? ' data-toggle="'.$dataToggle.'"' : ""; ?>
+            <?php $toggle = (!empty($dataToggle)) ? ' data-toggle="'.$dataToggle.'"' : ''; ?>
             <input type="text" placeholder="<?php echo $view['translator']->trans('mautic.core.form.thead.filter'); ?>" autocomplete="false" class="form-control input-sm" value="<?php echo $value; ?>"<?php echo $toggle; ?> onchange="Mautic.filterTableData('<?php echo $sessionVar; ?>','<?php echo $filterBy; ?>',this.value,'<?php echo $tmpl; ?>','<?php echo $target; ?>'<?php if (!empty($baseUrl)): ?>, '<?php echo $baseUrl; ?>'<?php endif; ?>);" />
-            <?php $inputClass =  (!empty($value)) ? 'fa-times' : 'fa-filter'; ?>
+            <?php $inputClass = (!empty($value)) ? 'fa-times' : 'fa-filter'; ?>
             <span class="input-group-btn">
-                <button class="btn btn-default btn-xs" onclick="Mautic.filterTableData('<?php echo $sessionVar; ?>','<?php echo $filterBy; ?>',<?php echo (!empty($value)) ? "''," : "mQuery(this).parent().prev().val(),"; ?>'<?php echo $tmpl; ?>','<?php echo $target; ?>'<?php if (!empty($baseUrl)): ?>, '<?php echo $baseUrl; ?>'<?php endif; ?>);">
+                <button class="btn btn-default btn-xs" onclick="Mautic.filterTableData('<?php echo $sessionVar; ?>','<?php echo $filterBy; ?>',<?php echo (!empty($value)) ? "''," : 'mQuery(this).parent().prev().val(),'; ?>'<?php echo $tmpl; ?>','<?php echo $target; ?>'<?php if (!empty($baseUrl)): ?>, '<?php echo $baseUrl; ?>'<?php endif; ?>);">
                     <i class="fa fa-fw fa-lg <?php echo $inputClass; ?>"></i>
                 </button>
             </span>
diff --git a/app/bundles/CoreBundle/Views/Helper/theme_select.html.php b/app/bundles/CoreBundle/Views/Helper/theme_select.html.php
index 989e4e9eb78..d4a5ce21dd7 100644
--- a/app/bundles/CoreBundle/Views/Helper/theme_select.html.php
+++ b/app/bundles/CoreBundle/Views/Helper/theme_select.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -11,8 +12,12 @@
 <div class="row">
     <?php foreach ($themes as $themeKey => $themeInfo) : ?>
         <?php $isSelected = ($active === $themeKey); ?>
-        <?php if (!empty($themeInfo['config']['onlyForBC']) && !$isSelected) continue; ?>
-        <?php if (isset($themeInfo['config']['features']) && !in_array($type, $themeInfo['config']['features'])) continue; ?>
+        <?php if (!empty($themeInfo['config']['onlyForBC']) && !$isSelected) {
+    continue;
+} ?>
+        <?php if (isset($themeInfo['config']['features']) && !in_array($type, $themeInfo['config']['features'])) {
+    continue;
+} ?>
         <?php $thumbnailUrl = $view['assets']->getUrl('themes/'.$themeKey.'/thumbnail.png'); ?>
         <?php $hasThumbnail = file_exists($themeInfo['dir'].'/thumbnail.png'); ?>
         <div class="col-md-3 theme-list">
diff --git a/app/bundles/CoreBundle/Views/LeftPanel/index.html.php b/app/bundles/CoreBundle/Views/LeftPanel/index.html.php
index c90cbb22012..0ecd62c27a2 100644
--- a/app/bundles/CoreBundle/Views/LeftPanel/index.html.php
+++ b/app/bundles/CoreBundle/Views/LeftPanel/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $extraMenu = $view['menu']->render('extra');
 ?>
 <!-- start: sidebar-header -->
diff --git a/app/bundles/CoreBundle/Views/Menu/admin.html.php b/app/bundles/CoreBundle/Views/Menu/admin.html.php
index 2c714d7cadf..c933e52e6d1 100644
--- a/app/bundles/CoreBundle/Views/Menu/admin.html.php
+++ b/app/bundles/CoreBundle/Views/Menu/admin.html.php
@@ -1,11 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 //Can override if needed but otherwise just mimic main menu
-$view->extend('MauticCoreBundle:Menu:main.html.php');
\ No newline at end of file
+$view->extend('MauticCoreBundle:Menu:main.html.php');
diff --git a/app/bundles/CoreBundle/Views/Menu/extra.html.php b/app/bundles/CoreBundle/Views/Menu/extra.html.php
index 3f97b42c4a5..cdf26c15952 100644
--- a/app/bundles/CoreBundle/Views/Menu/extra.html.php
+++ b/app/bundles/CoreBundle/Views/Menu/extra.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($item->hasChildren() && $options['depth'] !== 0 && $item->getDisplayChildren()) {
     $childrenAttributes = $item->getChildrenAttributes();
     if (!isset($childrenAttributes['class'])) {
@@ -24,15 +24,15 @@
         //builds the class attributes based on options
         $view['menu']->buildClasses($child, $matcher, $options);
 
-        $showChildren   = ($child->hasChildren() && $child->getDisplayChildren());
-        $liAttributes   = $child->getAttributes();
-        $isAncestor     = $matcher->isAncestor($child, $options["matchingDepth"]);
-        $extras         = $child->getExtras();
+        $showChildren = ($child->hasChildren() && $child->getDisplayChildren());
+        $liAttributes = $child->getAttributes();
+        $isAncestor   = $matcher->isAncestor($child, $options['matchingDepth']);
+        $extras       = $child->getExtras();
 
         if (!empty($extras['divider'])) {
             echo "<li role=\"separator\" class=\"divider\"></li>\n";
         } elseif (!empty($extras['header'])) {
-            echo "<li class=\"dropdown-header\">".$view['translator']->trans($extras['header'])."</li>\n";
+            echo '<li class="dropdown-header">'.$view['translator']->trans($extras['header'])."</li>\n";
         } else {
             echo "<li{$view['menu']->parseAttributes($liAttributes)}>\n";
 
diff --git a/app/bundles/CoreBundle/Views/Menu/main.html.php b/app/bundles/CoreBundle/Views/Menu/main.html.php
index f00f4836f5a..2da732dfcc9 100644
--- a/app/bundles/CoreBundle/Views/Menu/main.html.php
+++ b/app/bundles/CoreBundle/Views/Menu/main.html.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($item->hasChildren() && $options['depth'] !== 0 && $item->getDisplayChildren()) {
 
-    /** Top menu level start */
+    /* Top menu level start */
     if ($item->isRoot()) {
-        echo '<ul class="nav mt-10" data-toggle="menu">' . "\n";
+        echo '<ul class="nav mt-10" data-toggle="menu">'."\n";
     } else {
         echo "<ul{$view['menu']->parseAttributes($item->getChildrenAttributes())}>\n";
     }
 
-    /** Submenu levels  start*/
+    /* Submenu levels  start*/
     foreach ($item->getChildren() as $child) {
         if (!$child->isDisplayed()) {
             continue;
@@ -27,21 +27,21 @@
 
         $showChildren = ($child->hasChildren() && $child->getDisplayChildren());
         $liAttributes = $child->getAttributes();
-        $isAncestor   = $matcher->isAncestor($child, $options["matchingDepth"]);
+        $isAncestor   = $matcher->isAncestor($child, $options['matchingDepth']);
 
-        $liAttributes['class'] = (isset($liAttributes['class'])) ? $liAttributes['class'] . ' nav-group' : 'nav-group';
+        $liAttributes['class'] = (isset($liAttributes['class'])) ? $liAttributes['class'].' nav-group' : 'nav-group';
 
-        /** Menu item start */
+        /* Menu item start */
         echo "<li{$view['menu']->parseAttributes($liAttributes)}>\n";
 
         $linkAttributes = $child->getLinkAttributes();
         $extras         = $child->getExtras();
 
-        /** Menu link start */
+        /* Menu link start */
         if ($showChildren) {
             //Main item
-            echo '<a href="javascript:void(0);" data-target="#' . $linkAttributes['id'] . '_child" data-toggle="submenu" data-parent=".nav" ' . $view['menu']->parseAttributes($linkAttributes) . ">\n";
-            echo '<span class="arrow pull-right text-right"></span>' . "\n";
+            echo '<a href="javascript:void(0);" data-target="#'.$linkAttributes['id'].'_child" data-toggle="submenu" data-parent=".nav" '.$view['menu']->parseAttributes($linkAttributes).">\n";
+            echo '<span class="arrow pull-right text-right"></span>'."\n";
         } else {
             //Submenu item
             $url = $child->getUri();
@@ -52,8 +52,8 @@
             echo "<a href=\"$url\"{$view['menu']->parseAttributes($linkAttributes)}>";
         }
 
-        if (!empty($extras["iconClass"])) {
-            echo "<span class=\"icon pull-left fa {$extras["iconClass"]}\"></span>";
+        if (!empty($extras['iconClass'])) {
+            echo "<span class=\"icon pull-left fa {$extras['iconClass']}\"></span>";
         }
 
         $labelAttributes = $child->getLabelAttributes();
@@ -61,36 +61,36 @@
             $labelAttributes['class'] = 'nav-item-name';
         }
         $labelPull = $extras['depth'] === 0 ? ' pull-left' : '';
-        $labelAttributes['class'] .= ' text' . $labelPull;
+        $labelAttributes['class'] .= ' text'.$labelPull;
 
         echo "<span{$view['menu']->parseAttributes($labelAttributes)}>{$view['translator']->trans($child->getLabel())}</span>";
 
         echo "</a>\n";
-        /** Menu link end */
+        /* Menu link end */
 
-        /** Submenu items start */
+        /* Submenu items start */
         if ($showChildren) {
-            $options["depth"]         = ($options["depth"]) ? $options["depth"]-- : "";
-            $options["matchingDepth"] = ($options["matchingDepth"]) ? $options["matchingDepth"]-- : "";
+            $options['depth']         = ($options['depth']) ? $options['depth']-- : '';
+            $options['matchingDepth'] = ($options['matchingDepth']) ? $options['matchingDepth']-- : '';
 
-            $levelClass = $isAncestor ? "nav-submenu collapse in" : "nav-submenu collapse";
+            $levelClass = $isAncestor ? 'nav-submenu collapse in' : 'nav-submenu collapse';
 
             //set the class
-            $child->setChildrenAttribute("class", $levelClass);
-            $child->setChildrenAttribute("id", $linkAttributes['id'] . '_child');
-            echo $view->render('MauticCoreBundle:Menu:main.html.php', array(
-                "item"    => $child,
-                "options" => $options,
-                "matcher" => $matcher
-            ));
+            $child->setChildrenAttribute('class', $levelClass);
+            $child->setChildrenAttribute('id', $linkAttributes['id'].'_child');
+            echo $view->render('MauticCoreBundle:Menu:main.html.php', [
+                'item'    => $child,
+                'options' => $options,
+                'matcher' => $matcher,
+            ]);
         }
-        /** Submenu items end */
+        /* Submenu items end */
 
-        /** Menu item end */
+        /* Menu item end */
         echo "</li>\n";
     }
-    /** Submenu items end */
+    /* Submenu items end */
 
-    /** Top menu level end*/
+    /* Top menu level end*/
     echo "</ul>\n";
 }
diff --git a/app/bundles/CoreBundle/Views/Menu/profile.html.php b/app/bundles/CoreBundle/Views/Menu/profile.html.php
index 60d65930ac7..06a2571724b 100644
--- a/app/bundles/CoreBundle/Views/Menu/profile.html.php
+++ b/app/bundles/CoreBundle/Views/Menu/profile.html.php
@@ -1,31 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 /** @var \Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables $app */
-
 $inline = $view['menu']->render('profile');
 ?>
 <li class="dropdown">
     <a class="dropdown-toggle" data-toggle="dropdown" href="#">
         <span class="img-wrapper img-rounded" style="width:32px;"><img src="<?php echo $view['gravatar']->getImage($app->getUser()->getEmail()); ?>"></span>
-        <span class="text fw-sb ml-xs hidden-xs"><?php echo $app->getUser()->getName();?></span>
+        <span class="text fw-sb ml-xs hidden-xs"><?php echo $app->getUser()->getName(); ?></span>
         <span class="caret ml-xs"></span>
     </a>
     <ul class="dropdown-menu dropdown-menu-right">
         <li>
-            <a href="<?php echo $view['router']->path("mautic_user_account"); ?>" data-toggle="ajax">
-                <i class="fa fa-user fs-14"></i><span><?php echo $view["translator"]->trans("mautic.user.account.settings"); ?></span>
+            <a href="<?php echo $view['router']->path('mautic_user_account'); ?>" data-toggle="ajax">
+                <i class="fa fa-user fs-14"></i><span><?php echo $view['translator']->trans('mautic.user.account.settings'); ?></span>
             </a>
         </li>
         <li>
-            <a href="<?php echo $view['router']->path("mautic_user_logout"); ?>">
-                <i class="fa fa-sign-out fs-14"></i><span><?php echo $view["translator"]->trans("mautic.user.auth.logout"); ?></span>
+            <a href="<?php echo $view['router']->path('mautic_user_logout'); ?>">
+                <i class="fa fa-sign-out fs-14"></i><span><?php echo $view['translator']->trans('mautic.user.auth.logout'); ?></span>
             </a>
         </li>
 
diff --git a/app/bundles/CoreBundle/Views/Menu/profile_inline.html.php b/app/bundles/CoreBundle/Views/Menu/profile_inline.html.php
index ef4afabbf25..43623fad2cc 100644
--- a/app/bundles/CoreBundle/Views/Menu/profile_inline.html.php
+++ b/app/bundles/CoreBundle/Views/Menu/profile_inline.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($item->hasChildren() && $options['depth'] !== 0 && $item->getDisplayChildren()) {
     foreach ($item->getChildren() as $child) {
         if (!$child->isDisplayed()) {
@@ -16,15 +16,15 @@
         //builds the class attributes based on options
         $view['menu']->buildClasses($child, $matcher, $options);
 
-        $showChildren   = ($child->hasChildren() && $child->getDisplayChildren());
-        $liAttributes   = $child->getAttributes();
-        $isAncestor     = $matcher->isAncestor($child, $options["matchingDepth"]);
-        $extras         = $child->getExtras();
+        $showChildren = ($child->hasChildren() && $child->getDisplayChildren());
+        $liAttributes = $child->getAttributes();
+        $isAncestor   = $matcher->isAncestor($child, $options['matchingDepth']);
+        $extras       = $child->getExtras();
 
         if (!empty($extras['divider'])) {
             echo "<li role=\"separator\" class=\"divider\"></li>\n";
         } elseif (!empty($extras['header'])) {
-            echo "<li class=\"dropdown-header\">".$view['translator']->trans($extras['header'])."</li>\n";
+            echo '<li class="dropdown-header">'.$view['translator']->trans($extras['header'])."</li>\n";
         } else {
             echo "<li{$view['menu']->parseAttributes($liAttributes)}>\n";
 
diff --git a/app/bundles/CoreBundle/Views/Notification/flash_messages.html.php b/app/bundles/CoreBundle/Views/Notification/flash_messages.html.php
index d1b445d1e7d..82122c29b5a 100644
--- a/app/bundles/CoreBundle/Views/Notification/flash_messages.html.php
+++ b/app/bundles/CoreBundle/Views/Notification/flash_messages.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if (!isset($dismissable)) {
@@ -14,9 +15,9 @@
     $alertType = 'growl';
 }
 
-$alertClasses  = ($alertType == 'growl') ?
-    array('notice' => 'alert-growl',   'warning' => 'alert-growl',   'error' => 'alert-growl') :
-    array('notice' => 'alert-success', 'warning' => 'alert-warning', 'error' => 'alert-danger');
+$alertClasses = ($alertType == 'growl') ?
+    ['notice' => 'alert-growl',   'warning' => 'alert-growl',   'error' => 'alert-growl'] :
+    ['notice' => 'alert-success', 'warning' => 'alert-warning', 'error' => 'alert-danger'];
 
 $flashes = $view['session']->getFlashes();
 ?>
diff --git a/app/bundles/CoreBundle/Views/Notification/flashes.html.php b/app/bundles/CoreBundle/Views/Notification/flashes.html.php
index db9380b2b01..04e198267ab 100644
--- a/app/bundles/CoreBundle/Views/Notification/flashes.html.php
+++ b/app/bundles/CoreBundle/Views/Notification/flashes.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if (!isset($alertType)) {
@@ -12,8 +13,8 @@
 
 ?>
 <div id="flashes"<?php echo ($alertType == 'growl') ? ' class="alert-growl-container"' : ''; ?>>
-    <?php echo $view->render('MauticCoreBundle:Notification:flash_messages.html.php', array(
+    <?php echo $view->render('MauticCoreBundle:Notification:flash_messages.html.php', [
         'dismissable' => (empty($notDismissable)) ? ' alert-dismissable' : '',
-        'alertType'   => $alertType
-    )); ?>
+        'alertType'   => $alertType,
+    ]); ?>
 </div>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Notification/notification.html.php b/app/bundles/CoreBundle/Views/Notification/notification.html.php
index f551fceb451..90dd95f6c2c 100644
--- a/app/bundles/CoreBundle/Views/Notification/notification.html.php
+++ b/app/bundles/CoreBundle/Views/Notification/notification.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -15,7 +16,7 @@
             <img class="media-object" src="<?php echo substr($n['iconClass'], 4); ?>" />
         </span>
         <?php else: ?>
-        <?php $tooltip = (!empty($n['type'])) ? ' data-toggle="tooltip" title="' . $view['translator']->trans('mautic.notifications.type.' . $n['type']) . '"' : ''; ?>
+        <?php $tooltip = (!empty($n['type'])) ? ' data-toggle="tooltip" title="'.$view['translator']->trans('mautic.notifications.type.'.$n['type']).'"' : ''; ?>
         <i class="fa fa-2x <?php echo (!empty($n['iconClass'])) ? $n['iconClass'] : 'fa-star'; ?>"<?php echo $tooltip; ?>></i>
         <?php endif; ?>
     </span>
@@ -26,7 +27,7 @@
     <div class="media-body">
         <?php if (!empty($n['header'])): ?>
             <div class="media-heading fw-sb mb-0 text-primary"><?php echo $n['header']; ?></div>
-        <?php endif;?>
+        <?php endif; ?>
         <div><?php echo $n['message']; ?></div>
         <div class="clearfix mt-xs">
             <span class="fa fa-clock-o text-success pull-left mr-xs"></span>
diff --git a/app/bundles/CoreBundle/Views/Notification/notification_messages.html.php b/app/bundles/CoreBundle/Views/Notification/notification_messages.html.php
index 6ae1981779f..4701a5cd9a4 100644
--- a/app/bundles/CoreBundle/Views/Notification/notification_messages.html.php
+++ b/app/bundles/CoreBundle/Views/Notification/notification_messages.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -18,5 +19,5 @@
 </div>
 <?php endif; ?>
 <?php foreach ($notifications as $n): ?>
-    <?php echo $view->render('MauticCoreBundle:Notification:notification.html.php', array('n' => $n)); ?>
+    <?php echo $view->render('MauticCoreBundle:Notification:notification.html.php', ['n' => $n]); ?>
 <?php endforeach; ?>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Notification/notifications.html.php b/app/bundles/CoreBundle/Views/Notification/notifications.html.php
index 1b0b33a8a45..75a064f74f2 100644
--- a/app/bundles/CoreBundle/Views/Notification/notifications.html.php
+++ b/app/bundles/CoreBundle/Views/Notification/notifications.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -25,10 +26,10 @@
             </div>
             <div class="pt-0 pb-xs pl-0 pr-0">
                 <div class="scroll-content slimscroll" style="height:250px;" id="notifications">
-                    <?php echo $view->render('MauticCoreBundle:Notification:notification_messages.html.php', array(
+                    <?php echo $view->render('MauticCoreBundle:Notification:notification_messages.html.php', [
                         'notifications' => $notifications,
-                        'updateMessage' => $updateMessage
-                    )); ?>
+                        'updateMessage' => $updateMessage,
+                    ]); ?>
                     <?php $class = (!empty($notifications)) ? ' hide' : ''; ?>
                     <div style="width: 100px; margin: 75px auto 0 auto;" class="<?php echo $class; ?>" id="notificationMautibot">
                         <img class="img img-responsive" src="<?php echo $view['mautibot']->getImage('wave'); ?>" />
diff --git a/app/bundles/CoreBundle/Views/RightPanel/content.html.php b/app/bundles/CoreBundle/Views/RightPanel/content.html.php
index ea02336a506..d7bdc068c0e 100644
--- a/app/bundles/CoreBundle/Views/RightPanel/content.html.php
+++ b/app/bundles/CoreBundle/Views/RightPanel/content.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
diff --git a/app/bundles/CoreBundle/Views/RightPanel/index.html.php b/app/bundles/CoreBundle/Views/RightPanel/index.html.php
index 0072fe009b1..10e3d2d704a 100644
--- a/app/bundles/CoreBundle/Views/RightPanel/index.html.php
+++ b/app/bundles/CoreBundle/Views/RightPanel/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['canvas']->renderCanvasContent($view);
 $canvasContent = $view['canvas']->getContent();
 ?>
@@ -14,13 +14,13 @@
 <div class="offcanvas-container" data-toggle="offcanvas" data-options='{"openerClass":"offcanvas-opener", "closerClass":"offcanvas-closer"}'>
     <!-- START Wrapper -->
     <div class="offcanvas-wrapper">
-        <?php echo $view->render('MauticCoreBundle:RightPanel:left.html.php', array('canvasContent' => $canvasContent['left'])); ?>
-        <?php echo $view->render('MauticCoreBundle:RightPanel:main.html.php', array(
+        <?php echo $view->render('MauticCoreBundle:RightPanel:left.html.php', ['canvasContent' => $canvasContent['left']]); ?>
+        <?php echo $view->render('MauticCoreBundle:RightPanel:main.html.php', [
             'canvasContent' => $canvasContent['main'],
             'hasRight'      => !empty($canvasContent['right']),
-            'hasLeft'       => !empty($canvasContent['left'])
-        )); ?>
-        <?php echo $view->render('MauticCoreBundle:RightPanel:right.html.php', array('canvasContent' => $canvasContent['right'])); ?>
+            'hasLeft'       => !empty($canvasContent['left']),
+        ]); ?>
+        <?php echo $view->render('MauticCoreBundle:RightPanel:right.html.php', ['canvasContent' => $canvasContent['right']]); ?>
     </div>
     <!--/ END Wrapper -->
 </div>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/RightPanel/left.html.php b/app/bundles/CoreBundle/Views/RightPanel/left.html.php
index 9dcb72bf0df..0579ef39d7b 100644
--- a/app/bundles/CoreBundle/Views/RightPanel/left.html.php
+++ b/app/bundles/CoreBundle/Views/RightPanel/left.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <div class="offcanvas-left" id="OffCanvasLeft">
     <?php if ($canvasContent): ?>
-        <?php echo $view->render('MauticCoreBundle:RightPanel:content.html.php', array('canvasContent' => $canvasContent, 'canvas' => 'Left')); ?>
+        <?php echo $view->render('MauticCoreBundle:RightPanel:content.html.php', ['canvasContent' => $canvasContent, 'canvas' => 'Left']); ?>
     <?php endif; ?>
 </div>
 <!--/ Offcanvas Left -->
diff --git a/app/bundles/CoreBundle/Views/RightPanel/main.html.php b/app/bundles/CoreBundle/Views/RightPanel/main.html.php
index 6baa1f56e5e..32e7bb01e3f 100644
--- a/app/bundles/CoreBundle/Views/RightPanel/main.html.php
+++ b/app/bundles/CoreBundle/Views/RightPanel/main.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <div class="offcanvas-main" id="OffCanvasMain">
     <?php if ($canvasContent): ?>
-    <?php echo $view->render('MauticCoreBundle:RightPanel:content.html.php', array('canvasContent' => $canvasContent, 'canvas' => 'Main', 'hasLeft' => $hasLeft, 'hasRight' => $hasRight)); ?>
+    <?php echo $view->render('MauticCoreBundle:RightPanel:content.html.php', ['canvasContent' => $canvasContent, 'canvas' => 'Main', 'hasLeft' => $hasLeft, 'hasRight' => $hasRight]); ?>
     <?php endif; ?>
 </div>
 <!--/ Offcanvas Main -->
diff --git a/app/bundles/CoreBundle/Views/RightPanel/right.html.php b/app/bundles/CoreBundle/Views/RightPanel/right.html.php
index cd0c6e52509..611a74678e7 100644
--- a/app/bundles/CoreBundle/Views/RightPanel/right.html.php
+++ b/app/bundles/CoreBundle/Views/RightPanel/right.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <div class="offcanvas-right" id="OffCanvasRight">
     <?php if ($canvasContent): ?>
-        <?php echo $view->render('MauticCoreBundle:RightPanel:content.html.php', array('canvasContent' => $canvasContent, 'canvas' => 'Right')); ?>
+        <?php echo $view->render('MauticCoreBundle:RightPanel:content.html.php', ['canvasContent' => $canvasContent, 'canvas' => 'Right']); ?>
     <?php endif; ?>
 </div>
 <!--/ Offcanvas Right -->
diff --git a/app/bundles/CoreBundle/Views/Slots/button.html.php b/app/bundles/CoreBundle/Views/Slots/button.html.php
index d14fbea4a22..718f2a82677 100644
--- a/app/bundles/CoreBundle/Views/Slots/button.html.php
+++ b/app/bundles/CoreBundle/Views/Slots/button.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Slots/image.html.php b/app/bundles/CoreBundle/Views/Slots/image.html.php
index 8d7b95447ee..a9a7ec6ecbd 100644
--- a/app/bundles/CoreBundle/Views/Slots/image.html.php
+++ b/app/bundles/CoreBundle/Views/Slots/image.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Slots/text.html.php b/app/bundles/CoreBundle/Views/Slots/text.html.php
index 280fea85f29..5240ba07746 100644
--- a/app/bundles/CoreBundle/Views/Slots/text.html.php
+++ b/app/bundles/CoreBundle/Views/Slots/text.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Theme/form.html.php b/app/bundles/CoreBundle/Views/Theme/form.html.php
index dd9bdf9481d..5ee40356c15 100644
--- a/app/bundles/CoreBundle/Views/Theme/form.html.php
+++ b/app/bundles/CoreBundle/Views/Theme/form.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/CoreBundle/Views/Theme/index.html.php b/app/bundles/CoreBundle/Views/Theme/index.html.php
index 9980fffc1db..ce990f88d31 100644
--- a/app/bundles/CoreBundle/Views/Theme/index.html.php
+++ b/app/bundles/CoreBundle/Views/Theme/index.html.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'theme');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.core.themes'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.core.themes'));
 $view['slots']->set('actions', $view->render('MauticCoreBundle:Theme:form.html.php', ['form' => $form]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
-        'action'      => $currentRoute,
-        'langVar'     => 'core.theme',
-        'routeBase'   => 'themes',
+        'action'          => $currentRoute,
+        'langVar'         => 'core.theme',
+        'routeBase'       => 'themes',
         'templateButtons' => [
-            'delete' => $permissions['core:themes:delete']
-        ]
+            'delete' => $permissions['core:themes:delete'],
+        ],
     ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/CoreBundle/Views/Theme/list.html.php b/app/bundles/CoreBundle/Views/Theme/list.html.php
index 591bfb3a41b..f1ea1946e2e 100644
--- a/app/bundles/CoreBundle/Views/Theme/list.html.php
+++ b/app/bundles/CoreBundle/Views/Theme/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 // if ($tmpl == 'index')
@@ -17,59 +18,61 @@
                 <?php
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#themeTable'
+                    'target'   => '#themeTable',
                 ]);
 
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
-                    'text'     => 'mautic.core.title',
+                    'text' => 'mautic.core.title',
                 ]);
 
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
-                    'text'     => 'mautic.core.author',
+                    'text' => 'mautic.core.author',
                 ]);
 
                 echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
-                    'text'     => 'mautic.core.features',
+                    'text' => 'mautic.core.features',
                 ]);
                 ?>
             </tr>
             </thead>
             <tbody>
             <?php foreach ($items as $k => $item): ?>
-                <?php if(!empty($item['config']['onlyForBC'])) continue; ?>
+                <?php if (!empty($item['config']['onlyForBC'])) {
+                    continue;
+                } ?>
                 <?php $thumbnailUrl = $view['assets']->getUrl('themes/'.$k.'/thumbnail.png'); ?>
                 <?php $hasThumbnail = file_exists($item['dir'].'/thumbnail.png'); ?>
                 <tr>
                     <td>
                         <?php
-                        $item['id'] = $item['key'];
+                        $item['id']            = $item['key'];
                         $previewButtonSettings = [
                             'attr' => [
                                 'data-toggle' => 'modal',
-                                'data-target' => '#theme-'.$k
+                                'data-target' => '#theme-'.$k,
                             ],
                             'btnText'   => $view['translator']->trans('mautic.asset.asset.preview'),
-                            'iconClass' => 'fa fa-image'
+                            'iconClass' => 'fa fa-image',
                         ];
-                        $previewButton = $hasThumbnail ? $previewButtonSettings : [];
-                        $deleteButton = ['delete' => $permissions['core:themes:delete']];
+                        $previewButton   = $hasThumbnail ? $previewButtonSettings : [];
+                        $deleteButton    = ['delete' => $permissions['core:themes:delete']];
                         $templateButtons = !in_array($k, $defaultThemes) ? $deleteButton : [];
                         echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
-                            'item'       => $item,
+                            'item'            => $item,
                             'templateButtons' => $templateButtons,
-                            'routeBase'  => 'themes',
-                            'langVar'    => 'core.theme',
-                            'customButtons' => [
+                            'routeBase'       => 'themes',
+                            'langVar'         => 'core.theme',
+                            'customButtons'   => [
                                 [
                                     'attr' => [
-                                        'href' => $view['router']->path('mautic_themes_action', ['objectAction' => 'download', 'objectId' => $k]),
-                                        'data-toggle' => '0'
+                                        'href'        => $view['router']->path('mautic_themes_action', ['objectAction' => 'download', 'objectId' => $k]),
+                                        'data-toggle' => '0',
                                     ],
                                     'btnText'   => $view['translator']->trans('mautic.core.download'),
-                                    'iconClass' => 'fa fa-download'
+                                    'iconClass' => 'fa fa-download',
                                 ],
-                                $previewButton
-                            ]
+                                $previewButton,
+                            ],
                         ]);
                         ?>
                         <?php if ($hasThumbnail) : ?>
@@ -100,7 +103,7 @@
                             <a href="<?php echo $item['config']['authorUrl']; ?>" target="_blank">
                                 <?php echo $item['config']['author']; ?>
                             </a>
-                        <?php elseif(isset($item['config']['author'])) : ?>
+                        <?php elseif (isset($item['config']['author'])) : ?>
                             <?php echo $item['config']['author']; ?>
                         <?php endif; ?>
                         </div>
diff --git a/app/bundles/CoreBundle/Views/Translation/index.html.php b/app/bundles/CoreBundle/Views/Translation/index.html.php
index 1e0edd9dacf..f93f9da0de4 100644
--- a/app/bundles/CoreBundle/Views/Translation/index.html.php
+++ b/app/bundles/CoreBundle/Views/Translation/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!isset($nameGetter)) {
     $nameGetter = 'getName';
 }
@@ -18,12 +18,12 @@
     if ($translations['parent']) :
         echo $view->render('MauticCoreBundle:Translation:row.html.php',
             [
-                'translation'   => $translations['parent'],
-                'translations'  => $translations,
-                'actionRoute'   => $actionRoute,
-                'activeEntity'  => $activeEntity,
-                'model'         => $model,
-                'nameGetter'    => $nameGetter,
+                'translation'  => $translations['parent'],
+                'translations' => $translations,
+                'actionRoute'  => $actionRoute,
+                'activeEntity' => $activeEntity,
+                'model'        => $model,
+                'nameGetter'   => $nameGetter,
             ]
         );
     endif;
@@ -31,12 +31,12 @@
         foreach ($translations['children'] as $translation) :
             echo $view->render('MauticCoreBundle:Translation:row.html.php',
                 [
-                    'translation'   => $translation,
-                    'translations'  => $translations,
-                    'actionRoute'   => $actionRoute,
-                    'activeEntity'  => $activeEntity,
-                    'model'         => $model,
-                    'nameGetter'    => $nameGetter,
+                    'translation'  => $translation,
+                    'translations' => $translations,
+                    'actionRoute'  => $actionRoute,
+                    'activeEntity' => $activeEntity,
+                    'model'        => $model,
+                    'nameGetter'   => $nameGetter,
                 ]
             );
     endforeach;
diff --git a/app/bundles/CoreBundle/Views/Translation/row.html.php b/app/bundles/CoreBundle/Views/Translation/row.html.php
index 1893a44ef43..2deccb4f928 100644
--- a/app/bundles/CoreBundle/Views/Translation/row.html.php
+++ b/app/bundles/CoreBundle/Views/Translation/row.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $isCurrent = ($translation->getId() === $activeEntity->getId());
 ?>
 <li class="list-group-item bg-auto bg-<?php echo ($isCurrent) ? 'dark' : 'light'; ?>-xs">
diff --git a/app/bundles/CoreBundle/Views/Update/index.html.php b/app/bundles/CoreBundle/Views/Update/index.html.php
index b18c6c95f62..583ff2c583e 100644
--- a/app/bundles/CoreBundle/Views/Update/index.html.php
+++ b/app/bundles/CoreBundle/Views/Update/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
@@ -45,7 +46,7 @@
                             </tbody>
                         </table>
                         <div class="text-right">
-                            <button class="btn btn-primary" onclick="Mautic.processUpdate('update-panel', 1, '<?php echo base64_encode(json_encode(array())); ?>');"><?php echo $view['translator']->trans('mautic.core.update.now'); ?></button>
+                            <button class="btn btn-primary" onclick="Mautic.processUpdate('update-panel', 1, '<?php echo base64_encode(json_encode([])); ?>');"><?php echo $view['translator']->trans('mautic.core.update.now'); ?></button>
                         </div>
                     </div>
                 </div>
diff --git a/app/bundles/CoreBundle/Views/Update/schema.html.php b/app/bundles/CoreBundle/Views/Update/schema.html.php
index 2da05d2f040..6d8c99c6791 100644
--- a/app/bundles/CoreBundle/Views/Update/schema.html.php
+++ b/app/bundles/CoreBundle/Views/Update/schema.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
diff --git a/app/bundles/CoreBundle/Views/Update/update.html.php b/app/bundles/CoreBundle/Views/Update/update.html.php
index 98956787aed..b84ffbaa9ad 100644
--- a/app/bundles/CoreBundle/Views/Update/update.html.php
+++ b/app/bundles/CoreBundle/Views/Update/update.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
diff --git a/app/bundles/CoreBundle/Views/Variant/index.html.php b/app/bundles/CoreBundle/Views/Variant/index.html.php
index 89e1b3847f9..6575034f55a 100644
--- a/app/bundles/CoreBundle/Views/Variant/index.html.php
+++ b/app/bundles/CoreBundle/Views/Variant/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if (!isset($nameGetter)) {
@@ -88,7 +89,7 @@
             $abTestResults['supportTemplate'],
             ['results' => $abTestResults, 'variants' => $variants]
         ) : $view['translator']->trans('mautic.core.ab_test.noresults'),
-        'size'   => 'lg',
+        'size' => 'lg',
     ]
 ); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/bundles/CoreBundle/Views/Variant/row.html.php b/app/bundles/CoreBundle/Views/Variant/row.html.php
index 171126c8d7f..ed89b7f8a25 100644
--- a/app/bundles/CoreBundle/Views/Variant/row.html.php
+++ b/app/bundles/CoreBundle/Views/Variant/row.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $id = $variant->getId();
 if (!isset($variants['properties'][$id])):
     $settings                    = $variant->getVariantSettings();
@@ -23,8 +23,8 @@
     $thisCriteria = $criteriaLabel = '';
     $weight       = 0;
 endif;
-$isPublished   = $variant->isPublished();
-$totalWeight  += ($isPublished) ? $weight : 0;
+$isPublished = $variant->isPublished();
+$totalWeight += ($isPublished) ? $weight : 0;
 $firstCriteria = (!isset($firstCriteria)) ? $thisCriteria : $firstCriteria;
 $isWinner      = (isset($abTestResults['winners'])
     && in_array(
@@ -61,7 +61,7 @@
                 </div>
                 <div class="col-xs-11">
                     <?php if ($isWinner): ?>
-                        <div class="mr-xs pull-left" data-toggle="tooltip" title="<?php echo $view['translator']->trans(              'mautic.core.ab_test.make_winner'); ?>">
+                        <div class="mr-xs pull-left" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.core.ab_test.make_winner'); ?>">
                             <a class="btn btn-warning"
                                data-toggle="confirmation"
                                href="<?php echo $view['router']->path(
@@ -72,20 +72,20 @@
                                    ]
                                ); ?>"
                                data-message="<?php echo $view->escape(
-                                   $view["translator"]->trans(
-                                       "mautic.core.ab_test.confirm_make_winner",
-                                       ["%name%" => $variant->$nameGetter()]
+                                   $view['translator']->trans(
+                                       'mautic.core.ab_test.confirm_make_winner',
+                                       ['%name%' => $variant->$nameGetter()]
                                    )
                                ); ?>"
                                data-confirm-text="<?php echo $view->escape(
-                                   $view["translator"]->trans(
-                                       "mautic.core.ab_test.make_winner"
+                                   $view['translator']->trans(
+                                       'mautic.core.ab_test.make_winner'
                                    )
                                ); ?>"
                                data-confirm-callback="executeAction"
                                data-cancel-text="<?php echo $view->escape(
-                                   $view["translator"]->trans(
-                                       "mautic.core.form.cancel"
+                                   $view['translator']->trans(
+                                       'mautic.core.form.cancel'
                                    )
                                ); ?>">
                                 <i class="fa fa-trophy"></i>
diff --git a/app/bundles/DashboardBundle/Config/config.php b/app/bundles/DashboardBundle/Config/config.php
index eff05bbbc21..43e31230638 100644
--- a/app/bundles/DashboardBundle/Config/config.php
+++ b/app/bundles/DashboardBundle/Config/config.php
@@ -1,82 +1,83 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes' => array(
-        'main' => array(
-            'mautic_dashboard_index' => array(
-                'path' => '/dashboard',
-                'controller' => 'MauticDashboardBundle:Dashboard:index'
-            ),
-            'mautic_dashboard_action'       => array(
-                'path'         => '/dashboard/{objectAction}/{objectId}',
-                'controller'   => 'MauticDashboardBundle:Dashboard:execute'
-            )
-        ),
-        'api' => array(
-            'mautic_widget_types'             => array(
+return [
+    'routes' => [
+        'main' => [
+            'mautic_dashboard_index' => [
+                'path'       => '/dashboard',
+                'controller' => 'MauticDashboardBundle:Dashboard:index',
+            ],
+            'mautic_dashboard_action' => [
+                'path'       => '/dashboard/{objectAction}/{objectId}',
+                'controller' => 'MauticDashboardBundle:Dashboard:execute',
+            ],
+        ],
+        'api' => [
+            'mautic_widget_types' => [
                 'path'       => '/data',
-                'controller' => 'MauticDashboardBundle:Api\WidgetApi:getTypes'
-            ),
-            'mautic_widget_data'             => array(
+                'controller' => 'MauticDashboardBundle:Api\WidgetApi:getTypes',
+            ],
+            'mautic_widget_data' => [
                 'path'       => '/data/{type}',
-                'controller' => 'MauticDashboardBundle:Api\WidgetApi:getData'
-            )
-        )
-    ),
+                'controller' => 'MauticDashboardBundle:Api\WidgetApi:getData',
+            ],
+        ],
+    ],
 
-    'menu' => array(
-        'main' => array(
+    'menu' => [
+        'main' => [
             'priority' => 100,
-            'items'    => array(
-                'mautic.dashboard.menu.index' => array(
+            'items'    => [
+                'mautic.dashboard.menu.index' => [
                     'route'     => 'mautic_dashboard_index',
-                    'iconClass' => 'fa-th-large'
-                )
-            )
-        )
-    ),
-    'services' => array(
-        'events'  => array(
+                    'iconClass' => 'fa-th-large',
+                ],
+            ],
+        ],
+    ],
+    'services' => [
+        'events' => [
             // 'mautic.dashboard.subscriber' => array(
             //     'class' => 'Mautic\DashboardBundle\EventListener\DashboardSubscriber'
             // ),
-        ),
-        'forms'   => array(
-            'mautic.dashboard.form.type.widget' => array(
+        ],
+        'forms' => [
+            'mautic.dashboard.form.type.widget' => [
                 'class'     => 'Mautic\DashboardBundle\Form\Type\WidgetType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'widget'
-            ),
-            'mautic.dashboard.form.uplload' => array(
+                'alias'     => 'widget',
+            ],
+            'mautic.dashboard.form.uplload' => [
                 'class'     => 'Mautic\DashboardBundle\Form\Type\UploadType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'dashboard_upload'
-            ),
-            'mautic.dashboard.form.filter' => array(
+                'alias'     => 'dashboard_upload',
+            ],
+            'mautic.dashboard.form.filter' => [
                 'class'     => 'Mautic\DashboardBundle\Form\Type\FilterType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'dashboard_filter'
-            )
-        ),
-        'models' =>  array(
-            'mautic.dashboard.model.dashboard' => array(
-                'class' => 'Mautic\DashboardBundle\Model\DashboardModel',
-                'arguments' => array(
+                'alias'     => 'dashboard_filter',
+            ],
+        ],
+        'models' => [
+            'mautic.dashboard.model.dashboard' => [
+                'class'     => 'Mautic\DashboardBundle\Model\DashboardModel',
+                'arguments' => [
                     'mautic.helper.core_parameters',
-                    'mautic.helper.paths'
-                )
-            )
-        )
-    ),
-    'parameters' => array(
+                    'mautic.helper.paths',
+                ],
+            ],
+        ],
+    ],
+    'parameters' => [
         'dashboard_import_dir'      => '%kernel.root_dir%/../media/dashboards',
-        'dashboard_import_user_dir' => null
-    )
-);
\ No newline at end of file
+        'dashboard_import_user_dir' => null,
+    ],
+];
diff --git a/app/bundles/DashboardBundle/Controller/AjaxController.php b/app/bundles/DashboardBundle/Controller/AjaxController.php
index 79776945521..002cd51e40b 100644
--- a/app/bundles/DashboardBundle/Controller/AjaxController.php
+++ b/app/bundles/DashboardBundle/Controller/AjaxController.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\DashboardBundle\Controller;
 
 use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
-use Symfony\Component\HttpFoundation\Request;
 use Mautic\DashboardBundle\Entity\Widget;
-use Mautic\DashboardBundle\DashboardEvents;
-use Mautic\DashboardBundle\Event\WidgetFormEvent;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
@@ -29,10 +28,10 @@ class AjaxController extends CommonAjaxController
      */
     protected function viewingVisitorsAction(Request $request)
     {
-        $dataArray  = array('success' => 0);
+        $dataArray = ['success' => 0];
 
         /** @var \Mautic\PageBundle\Entity\PageRepository $pageRepository */
-        $pageRepository = $this->get('doctrine.orm.entity_manager')->getRepository('MauticPageBundle:Hit');
+        $pageRepository               = $this->get('doctrine.orm.entity_manager')->getRepository('MauticPageBundle:Hit');
         $dataArray['viewingVisitors'] = $pageRepository->countVisitors(60, true);
 
         $dataArray['success'] = 1;
@@ -44,22 +43,23 @@ protected function viewingVisitorsAction(Request $request)
      * Returns HTML of a new widget based on its values.
      *
      * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     protected function updateWidgetFormAction(Request $request)
     {
-        $data = $request->request->get('widget');
-        $dataArray = array('success' => 0);
+        $data      = $request->request->get('widget');
+        $dataArray = ['success' => 0];
 
         // Clear params if type is not selected
         if (empty($data['type'])) {
             unset($data['params']);
         }
 
-        $widget = new Widget();
-        $form = $this->get('form.factory')->create('widget', $widget);
-        $formHtml = $this->render("MauticDashboardBundle::Widget\\form.html.php",
-            array('form' => $form->bind($data)->createView())
+        $widget   = new Widget();
+        $form     = $this->get('form.factory')->create('widget', $widget);
+        $formHtml = $this->render('MauticDashboardBundle::Widget\\form.html.php',
+            ['form' => $form->bind($data)->createView()]
         )->getContent();
 
         $dataArray['formHtml'] = $formHtml;
@@ -72,6 +72,7 @@ protected function updateWidgetFormAction(Request $request)
      * Saves the new ordering of dashboard widgets.
      *
      * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     protected function updateWidgetOrderingAction(Request $request)
@@ -79,13 +80,13 @@ protected function updateWidgetOrderingAction(Request $request)
         $data = $request->request->get('ordering');
         $repo = $this->getModel('dashboard')->getRepository();
         $repo->updateOrdering(array_flip($data), $this->user->getId());
-        $dataArray = array('success' => 1);
+        $dataArray = ['success' => 1];
 
         return $this->sendJsonResponse($dataArray);
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param Request $request
      *
@@ -93,8 +94,8 @@ protected function updateWidgetOrderingAction(Request $request)
      */
     public function deleteAction(Request $request)
     {
-        $objectId = $request->request->get('widget');
-        $dataArray = array('success' => 0);
+        $objectId  = $request->request->get('widget');
+        $dataArray = ['success' => 0];
 
         // @todo: build permissions
         // if (!$this->get('mautic.security')->isGranted('dashobard:widgets:delete')) {
@@ -106,7 +107,7 @@ public function deleteAction(Request $request)
         $entity = $model->getEntity($objectId);
         if ($entity) {
             $model->deleteEntity($entity);
-            $name = $entity->getName();
+            $name                 = $entity->getName();
             $dataArray['success'] = 1;
         }
 
diff --git a/app/bundles/DashboardBundle/Controller/Api/WidgetApiController.php b/app/bundles/DashboardBundle/Controller/Api/WidgetApiController.php
index 4be2d4c771d..970ed7cea3d 100644
--- a/app/bundles/DashboardBundle/Controller/Api/WidgetApiController.php
+++ b/app/bundles/DashboardBundle/Controller/Api/WidgetApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,19 +14,15 @@
 use Mautic\ApiBundle\Controller\CommonApiController;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\DashboardBundle\DashboardEvents;
-use Mautic\DashboardBundle\Event\WidgetTypeListEvent;
-use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\Entity\Widget;
+use Mautic\DashboardBundle\Event\WidgetTypeListEvent;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class WidgetApiController
- *
- * @package Mautic\DashboardBundle\Controller\Api
+ * Class WidgetApiController.
  */
 class WidgetApiController extends CommonApiController
 {
-
     public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
@@ -34,11 +31,11 @@ public function initialize(FilterControllerEvent $event)
         $this->entityNameOne    = 'widget';
         $this->entityNameMulti  = 'widgets';
         $this->permissionBase   = 'dashboard:widgets';
-        $this->serializerGroups = array();
+        $this->serializerGroups = [];
     }
 
     /**
-     * Obtains a list of available widget types
+     * Obtains a list of available widget types.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -48,48 +45,48 @@ public function getTypesAction()
         $event      = new WidgetTypeListEvent();
         $event->setTranslator($this->get('translator'));
         $dispatcher->dispatch(DashboardEvents::DASHBOARD_ON_MODULE_LIST_GENERATE, $event);
-        $view = $this->view(array('success' => 1, 'types' => $event->getTypes()), Codes::HTTP_OK);
+        $view = $this->view(['success' => 1, 'types' => $event->getTypes()], Codes::HTTP_OK);
 
         return $this->handleView($view);
     }
 
     /**
-     * Obtains a list of available widget types
+     * Obtains a list of available widget types.
      *
-     * @param  string $type of the widget
+     * @param string $type of the widget
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function getDataAction($type)
     {
-        $start = microtime(true);
-        $timezone = InputHelper::clean($this->request->get('timezone', null));
-        $from = InputHelper::clean($this->request->get('dateFrom', null));
-        $to = InputHelper::clean($this->request->get('dateTo', null));
+        $start      = microtime(true);
+        $timezone   = InputHelper::clean($this->request->get('timezone', null));
+        $from       = InputHelper::clean($this->request->get('dateFrom', null));
+        $to         = InputHelper::clean($this->request->get('dateTo', null));
         $dataFormat = InputHelper::clean($this->request->get('dataFormat', null));
-        $response = array('success' => 0);
+        $response   = ['success' => 0];
 
         if ($timezone) {
             $fromDate = new \DateTime($from, new \DateTimeZone($timezone));
-            $toDate = new \DateTime($to, new \DateTimeZone($timezone));
+            $toDate   = new \DateTime($to, new \DateTimeZone($timezone));
         } else {
             $fromDate = new \DateTime($from);
-            $toDate = new \DateTime($to);
+            $toDate   = new \DateTime($to);
         }
 
-        $params = array(
+        $params = [
             'timeUnit'   => InputHelper::clean($this->request->get('timeUnit', 'Y')),
             'dateFormat' => InputHelper::clean($this->request->get('dateFormat', null)),
             'dateFrom'   => $fromDate,
             'dateTo'     => $toDate,
             'limit'      => InputHelper::int($this->request->get('limit', null)),
-            'filter'     => $this->request->get('filter', array())
-        );
+            'filter'     => $this->request->get('filter', []),
+        ];
 
         $cacheTimeout = InputHelper::int($this->request->get('cacheTimeout', null));
         $widgetHeight = InputHelper::int($this->request->get('height', 300));
 
-        $widget = new Widget;
+        $widget = new Widget();
         $widget->setParams($params);
         $widget->setType($type);
         $widget->setHeight($widgetHeight);
@@ -107,9 +104,9 @@ public function getDataAction($type)
 
         if ($dataFormat == 'raw') {
             if (isset($data['chartData']['labels']) && isset($data['chartData']['datasets'])) {
-                $rawData = array();
+                $rawData = [];
                 foreach ($data['chartData']['datasets'] as $dataset) {
-                    $rawData[$dataset['label']] = array();
+                    $rawData[$dataset['label']] = [];
                     foreach ($dataset['data'] as $key => $value) {
                         $rawData[$dataset['label']][$data['chartData']['labels'][$key]] = $value;
                     }
@@ -124,10 +121,10 @@ public function getDataAction($type)
             }
         }
 
-        $response['cached'] = $widget->isCached();
+        $response['cached']         = $widget->isCached();
         $response['execution_time'] = microtime(true) - $start;
-        $response['success'] = 1;
-        $response['data'] = $data;
+        $response['success']        = 1;
+        $response['data']           = $data;
 
         $view = $this->view($response, Codes::HTTP_OK);
 
diff --git a/app/bundles/DashboardBundle/Controller/DashboardController.php b/app/bundles/DashboardBundle/Controller/DashboardController.php
index 55469e0f4d2..0892165e014 100644
--- a/app/bundles/DashboardBundle/Controller/DashboardController.php
+++ b/app/bundles/DashboardBundle/Controller/DashboardController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,18 +12,17 @@
 
 use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\InputHelper;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Mautic\DashboardBundle\Entity\Widget;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class DashboardController
+ * Class DashboardController.
  */
 class DashboardController extends FormController
 {
-
     /**
-     * Generates the default view
+     * Generates the default view.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -40,8 +40,7 @@ public function indexAction()
         $humanFormat     = 'M j, Y';
         $mysqlFormat     = 'Y-m-d';
         $action          = $this->generateUrl('mautic_dashboard_index');
-        $dateRangeFilter = $this->request->get('daterange', array());
-
+        $dateRangeFilter = $this->request->get('daterange', []);
 
         // Set new date range to the session
         if ($this->request->isMethod('POST')) {
@@ -60,32 +59,32 @@ public function indexAction()
         }
 
         // Load date range from session
-        $filter          = $model->getDefaultFilter();
+        $filter = $model->getDefaultFilter();
 
         // Set the final date range to the form
         $dateRangeFilter['date_from'] = $filter['dateFrom']->format($humanFormat);
-        $dateRangeFilter['date_to'] = $filter['dateTo']->format($humanFormat);
-        $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeFilter, array('action' => $action));
+        $dateRangeFilter['date_to']   = $filter['dateTo']->format($humanFormat);
+        $dateRangeForm                = $this->get('form.factory')->create('daterange', $dateRangeFilter, ['action' => $action]);
 
         $model->populateWidgetsContent($widgets, $filter);
 
-        return $this->delegateView(array(
-            'viewParameters'  =>  array(
-                'security'          => $this->get('mautic.security'),
-                'widgets'           => $widgets,
-                'dateRangeForm'     => $dateRangeForm->createView()
-            ),
+        return $this->delegateView([
+            'viewParameters' => [
+                'security'      => $this->get('mautic.security'),
+                'widgets'       => $widgets,
+                'dateRangeForm' => $dateRangeForm->createView(),
+            ],
             'contentTemplate' => 'MauticDashboardBundle:Dashboard:index.html.php',
-            'passthroughVars' => array(
-                'activeLink'     => '#mautic_dashboard_index',
-                'mauticContent'  => 'dashboard',
-                'route'          => $this->generateUrl('mautic_dashboard_index')
-            )
-        ));
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_dashboard_index',
+                'mauticContent' => 'dashboard',
+                'route'         => $this->generateUrl('mautic_dashboard_index'),
+            ],
+        ]);
     }
 
     /**
-     * Generate's new dashboard widget and processes post data
+     * Generate's new dashboard widget and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -95,7 +94,7 @@ public function newAction()
         $widget = new Widget();
 
         $model  = $this->getModel('dashboard');
-        $action = $this->generateUrl('mautic_dashboard_action', array('objectAction' => 'new'));
+        $action = $this->generateUrl('mautic_dashboard_action', ['objectAction' => 'new']);
 
         //get the user form factory
         $form       = $model->createForm($widget, $this->get('form.factory'), $action);
@@ -118,21 +117,21 @@ public function newAction()
 
         if ($closeModal) {
             //just close the modal
-            $passthroughVars = array(
+            $passthroughVars = [
                 'closeModal'    => 1,
-                'mauticContent' => 'widget'
-            );
+                'mauticContent' => 'widget',
+            ];
 
             $filter = $model->getDefaultFilter();
             $model->populateWidgetContent($widget, $filter);
 
             if ($valid && !$cancelled) {
                 $passthroughVars['upWidgetCount'] = 1;
-                $passthroughVars['widgetHtml'] = $this->renderView('MauticDashboardBundle:Widget:detail.html.php', array(
-                    'widget'      => $widget,
-                ));
-                $passthroughVars['widgetId'] = $widget->getId();
-                $passthroughVars['widgetWidth'] = $widget->getWidth();
+                $passthroughVars['widgetHtml']    = $this->renderView('MauticDashboardBundle:Widget:detail.html.php', [
+                    'widget' => $widget,
+                ]);
+                $passthroughVars['widgetId']     = $widget->getId();
+                $passthroughVars['widgetWidth']  = $widget->getWidth();
                 $passthroughVars['widgetHeight'] = $widget->getHeight();
             }
 
@@ -140,18 +139,17 @@ public function newAction()
 
             return $response;
         } else {
-
-            return $this->delegateView(array(
-                'viewParameters'  => array(
-                    'form'        => $form->createView()
-                ),
-                'contentTemplate' => 'MauticDashboardBundle:Widget:form.html.php'
-            ));
+            return $this->delegateView([
+                'viewParameters' => [
+                    'form' => $form->createView(),
+                ],
+                'contentTemplate' => 'MauticDashboardBundle:Widget:form.html.php',
+            ]);
         }
     }
 
     /**
-     * edit widget and processes post data
+     * edit widget and processes post data.
      *
      * @param $objectId
      *
@@ -161,7 +159,7 @@ public function editAction($objectId)
     {
         $model  = $this->getModel('dashboard');
         $widget = $model->getEntity($objectId);
-        $action = $this->generateUrl('mautic_dashboard_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action = $this->generateUrl('mautic_dashboard_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
 
         //get the user form factory
         $form       = $model->createForm($widget, $this->get('form.factory'), $action);
@@ -183,41 +181,39 @@ public function editAction($objectId)
 
         if ($closeModal) {
             //just close the modal
-            $passthroughVars = array(
+            $passthroughVars = [
                 'closeModal'    => 1,
-                'mauticContent' => 'widget'
-            );
+                'mauticContent' => 'widget',
+            ];
 
             $filter = $model->getDefaultFilter();
             $model->populateWidgetContent($widget, $filter);
 
             if ($valid && !$cancelled) {
                 $passthroughVars['upWidgetCount'] = 1;
-                $passthroughVars['widgetHtml'] = $this->renderView('MauticDashboardBundle:Widget:detail.html.php', array(
-                    'widget'      => $widget,
-                ));
-                $passthroughVars['widgetId'] = $widget->getId();
-                $passthroughVars['widgetWidth'] = $widget->getWidth();
+                $passthroughVars['widgetHtml']    = $this->renderView('MauticDashboardBundle:Widget:detail.html.php', [
+                    'widget' => $widget,
+                ]);
+                $passthroughVars['widgetId']     = $widget->getId();
+                $passthroughVars['widgetWidth']  = $widget->getWidth();
                 $passthroughVars['widgetHeight'] = $widget->getHeight();
             }
 
-
             $response = new JsonResponse($passthroughVars);
 
             return $response;
         } else {
-
-            return $this->delegateView(array(
-                'viewParameters'  => array(
-                    'form'        => $form->createView(),
-                ),
-                'contentTemplate' => 'MauticDashboardBundle:Widget:form.html.php'
-            ));
+            return $this->delegateView([
+                'viewParameters' => [
+                    'form' => $form->createView(),
+                ],
+                'contentTemplate' => 'MauticDashboardBundle:Widget:form.html.php',
+            ]);
         }
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -227,52 +223,52 @@ public function deleteAction($objectId)
     {
         $returnUrl = $this->generateUrl('mautic_dashboard_index');
         $success   = 0;
-        $flashes   = array();
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'contentTemplate' => 'MauticDashboardBundle:Dashboard:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_dashboard_index',
                 'success'       => $success,
-                'mauticContent' => 'dashboard'
-            )
-        );
+                'mauticContent' => 'dashboard',
+            ],
+        ];
 
         /** @var \Mautic\DashboardBundle\Model\DashboardModel $model */
         $model  = $this->getModel('dashboard');
         $entity = $model->getEntity($objectId);
         if ($entity === null) {
-            $flashes[] = array(
+            $flashes[] = [
                 'type'    => 'error',
                 'msg'     => 'mautic.api.client.error.notfound',
-                'msgVars' => array('%id%' => $objectId)
-            );
+                'msgVars' => ['%id%' => $objectId],
+            ];
         } else {
             $model->deleteEntity($entity);
             $name      = $entity->getName();
-            $flashes[] = array(
+            $flashes[] = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $name,
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         }
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => $flashes
-                )
+                [
+                    'flashes' => $flashes,
+                ]
             )
         );
     }
 
     /**
-     * Exports the widgets of current user into a json file
+     * Exports the widgets of current user into a json file.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -282,29 +278,29 @@ public function exportAction()
         $model            = $this->getModel('dashboard');
         $widgetsPaginator = $model->getWidgets();
         $usersName        = $this->user->getName();
-        $dateTime         = new \DateTime;
+        $dateTime         = new \DateTime();
         $dateStamp        = $dateTime->format('Y-m-d H:i:s');
         $name             = $this->request->get(
             'name',
-            'dashboard-of-'.str_replace(' ', '-', $usersName).'-'. $dateStamp
+            'dashboard-of-'.str_replace(' ', '-', $usersName).'-'.$dateStamp
         );
 
-        $description      = $this->get('translator')->trans(
+        $description = $this->get('translator')->trans(
             'mautic.dashboard.generated_by',
-            array(
+            [
                 '%name%' => $usersName,
-                '%date%' => $dateStamp
-            )
+                '%date%' => $dateStamp,
+            ]
         );
 
-        $dashboard = array(
+        $dashboard = [
             'name'        => $name,
             'description' => $description,
-            'widgets'     => array()
-        );
+            'widgets'     => [],
+        ];
 
         foreach ($widgetsPaginator as $widget) {
-            $dashboard['widgets'][] = array(
+            $dashboard['widgets'][] = [
                 'name'     => $widget->getName(),
                 'width'    => $widget->getWidth(),
                 'height'   => $widget->getHeight(),
@@ -312,18 +308,18 @@ public function exportAction()
                 'type'     => $widget->getType(),
                 'params'   => $widget->getParams(),
                 'template' => $widget->getTemplate(),
-            );
+            ];
         }
 
         // Make the filename safe
-        $filename = InputHelper::alphanum($name, false, '_'). '.json';
+        $filename = InputHelper::alphanum($name, false, '_').'.json';
 
         if ($this->request->get('save', false)) {
             // Save to the user's folder
             $dir = $this->factory->getSystemPath('dashboard.user');
-            file_put_contents($dir . '/' . $filename, json_encode($dashboard));
+            file_put_contents($dir.'/'.$filename, json_encode($dashboard));
 
-            return $this->redirect($this->get('router')->generate('mautic_dashboard_action', array('objectAction' => 'import')));
+            return $this->redirect($this->get('router')->generate('mautic_dashboard_action', ['objectAction' => 'import']));
         }
 
         $response = new JsonResponse($dashboard);
@@ -339,7 +335,7 @@ public function exportAction()
     }
 
     /**
-     * Exports the widgets of current user into a json file
+     * Exports the widgets of current user into a json file.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -354,16 +350,15 @@ public function deleteDashboardFileAction()
         $dir  = $this->factory->getSystemPath("dashboard.$type");
         $path = $dir.'/'.$name.'.json';
 
-
         if (file_exists($path) && is_writable($path)) {
             unlink($path);
         }
 
-        return $this->redirect($this->generateUrl('mautic_dashboard_action', array('objectAction' => 'import')));
+        return $this->redirect($this->generateUrl('mautic_dashboard_action', ['objectAction' => 'import']));
     }
 
     /**
-     * Applies dashboard layout
+     * Applies dashboard layout.
      *
      * @param null $file
      *
@@ -380,7 +375,7 @@ public function applyDashboardFileAction($file = null)
         $name  = implode('.', $parts);
 
         $dir  = $this->factory->getSystemPath("dashboard.$type");
-        $path = $dir . '/' . $name . '.json';
+        $path = $dir.'/'.$name.'.json';
 
         if (file_exists($path) && is_writable($path)) {
             $widgets = json_decode(file_get_contents($path), true);
@@ -412,7 +407,7 @@ public function applyDashboardFileAction($file = null)
             }
         }
 
-        return $this->redirect($this->generateUrl('mautic_dashboard_action', array('objectAction' => 'import')));
+        return $this->redirect($this->generateUrl('mautic_dashboard_action', ['objectAction' => 'import']));
     }
 
     /**
@@ -425,13 +420,13 @@ public function importAction()
         /** @var \Mautic\DashboardBundle\Model\DashboardModel $model */
         $model = $this->getModel('dashboard');
 
-        $directories = array(
+        $directories = [
             'user'   => $this->factory->getSystemPath('dashboard.user'),
-            'global' => $this->factory->getSystemPath('dashboard.global')
-        );
+            'global' => $this->factory->getSystemPath('dashboard.global'),
+        ];
 
-        $action = $this->generateUrl('mautic_dashboard_action', array('objectAction' => 'import'));
-        $form   = $this->get('form.factory')->create('dashboard_upload', array(), array('action' => $action));
+        $action = $this->generateUrl('mautic_dashboard_action', ['objectAction' => 'import']);
+        $form   = $this->get('form.factory')->create('dashboard_upload', [], ['action' => $action]);
 
         if ($this->request->getMethod() == 'POST') {
             if (isset($form) && !$cancelled = $this->isFormCancelled($form)) {
@@ -442,7 +437,7 @@ public function importAction()
                     } else {
                         $form->addError(
                             new FormError(
-                                $this->translator->trans('mautic.dashboard.upload.filenotfound', array(), 'validators')
+                                $this->translator->trans('mautic.dashboard.upload.filenotfound', [], 'validators')
                             )
                         );
                     }
@@ -450,8 +445,8 @@ public function importAction()
             }
         }
 
-        $dashboardFiles = array();
-        $dashboards     = array();
+        $dashboardFiles = [];
+        $dashboards     = [];
 
         // User specific layouts
         chdir($directories['user']);
@@ -462,7 +457,7 @@ public function importAction()
         $dashboardFiles['global'] = glob('*.json');
 
         foreach ($dashboardFiles as $type => $dirDashboardFiles) {
-            $tempDashboard = array();
+            $tempDashboard = [];
             foreach ($dirDashboardFiles as $dashId => $dashboard) {
                 $dashboard = str_replace('.json', '', $dashboard);
                 $config    = json_decode(
@@ -471,18 +466,17 @@ public function importAction()
                 );
 
                 // Check for name, description, etc
-                $tempDashboard[$dashboard] = array(
+                $tempDashboard[$dashboard] = [
                     'type'        => $type,
                     'name'        => (isset($config['name'])) ? $config['name'] : $dashboard,
                     'description' => (isset($config['description'])) ? $config['description'] : '',
-                    'widgets'     => (isset($config['widgets'])) ? $config['widgets'] : $config
-                );
+                    'widgets'     => (isset($config['widgets'])) ? $config['widgets'] : $config,
+                ];
             }
 
             // Sort by name
             uasort($tempDashboard,
-                function($a, $b) {
-
+                function ($a, $b) {
                     return strnatcasecmp($a['name'], $b['name']);
                 }
             );
@@ -499,29 +493,29 @@ function($a, $b) {
             $filter  = $model->getDefaultFilter();
             $model->populateWidgetsContent($widgets, $filter);
         } else {
-            $widgets = array();
+            $widgets = [];
         }
 
         return $this->delegateView(
-            array(
-                'viewParameters'  => array(
+            [
+                'viewParameters' => [
                     'form'       => $form->createView(),
                     'dashboards' => $dashboards,
                     'widgets'    => $widgets,
-                    'preview'    => $preview
-                ),
+                    'preview'    => $preview,
+                ],
                 'contentTemplate' => 'MauticDashboardBundle:Dashboard:import.html.php',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_dashboard_index',
                     'mauticContent' => 'dashboardImport',
                     'route'         => $this->generateUrl(
                         'mautic_dashboard_action',
-                        array(
-                            'objectAction' => 'import'
-                        )
-                    )
-                )
-            )
+                        [
+                            'objectAction' => 'import',
+                        ]
+                    ),
+                ],
+            ]
         );
     }
 }
diff --git a/app/bundles/DashboardBundle/DashboardEvents.php b/app/bundles/DashboardBundle/DashboardEvents.php
index 5ea4db98210..2c1219eeb5b 100644
--- a/app/bundles/DashboardBundle/DashboardEvents.php
+++ b/app/bundles/DashboardBundle/DashboardEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,14 +12,12 @@
 
 /**
  * Class LeadEvents
- * Events available for DashboardBundle
- *
- * @package Mautic\DashboardBundle
+ * Events available for DashboardBundle.
  */
 final class DashboardEvents
 {
     /**
-     * The mautic.dashboard_on_widget_list_generate event is dispatched when generating a list of available widget types
+     * The mautic.dashboard_on_widget_list_generate event is dispatched when generating a list of available widget types.
      *
      * The event listener receives a
      * Mautic\DashbardBundle\Event\WidgetTypeListEvent instance.
@@ -28,7 +27,7 @@ final class DashboardEvents
     const DASHBOARD_ON_MODULE_LIST_GENERATE = 'mautic.dashboard_on_widget_list_generate';
 
     /**
-     * The mautic.dashboard_on_widget_form_generate event is dispatched when generating the form of a widget type
+     * The mautic.dashboard_on_widget_form_generate event is dispatched when generating the form of a widget type.
      *
      * The event listener receives a
      * Mautic\DashbardBundle\Event\WidgetFormEvent instance.
@@ -38,7 +37,7 @@ final class DashboardEvents
     const DASHBOARD_ON_MODULE_FORM_GENERATE = 'mautic.dashboard_on_widget_form_generate';
 
     /**
-     * The mautic.dashboard_on_widget_detail_generate event is dispatched when generating the detail of a widget type
+     * The mautic.dashboard_on_widget_detail_generate event is dispatched when generating the detail of a widget type.
      *
      * The event listener receives a
      * Mautic\DashbardBundle\Event\WidgetDetailEvent instance.
diff --git a/app/bundles/DashboardBundle/Entity/Widget.php b/app/bundles/DashboardBundle/Entity/Widget.php
index 0093bf0215f..a58f28dca90 100644
--- a/app/bundles/DashboardBundle/Entity/Widget.php
+++ b/app/bundles/DashboardBundle/Entity/Widget.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,9 +17,7 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Widget
- *
- * @package Mautic\DashboardBundle\Entity
+ * Class Widget.
  */
 class Widget extends FormEntity
 {
@@ -33,17 +32,17 @@ class Widget extends FormEntity
     private $name;
 
     /**
-     * @var integer
+     * @var int
      */
     private $width;
 
     /**
-     * @var integer
+     * @var int
      */
     private $height;
 
     /**
-     * @var integer
+     * @var int
      */
     private $ordering;
 
@@ -55,7 +54,7 @@ class Widget extends FormEntity
     /**
      * @var array
      */
-    private $params = array();
+    private $params = [];
 
     /**
      * @var string
@@ -68,24 +67,24 @@ class Widget extends FormEntity
     private $errorMessage;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $cached = false;
 
     /**
-     * @var integer
+     * @var int
      */
     private $loadTime = 0;
 
     /**
-     * @var integer (minutes)
+     * @var int (minutes)
      */
     private $cacheTimeout;
 
     /**
      * @var array
      */
-    private $templateData = array();
+    private $templateData = [];
 
     public function __clone()
     {
@@ -97,7 +96,7 @@ public function __clone()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -127,17 +126,17 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('type', new NotBlank(array(
-            'message' => 'mautic.core.type.required'
-        )));
+        $metadata->addPropertyConstraint('type', new NotBlank([
+            'message' => 'mautic.core.type.required',
+        ]));
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -145,7 +144,7 @@ public function getId()
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
@@ -160,7 +159,7 @@ public function setName($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
@@ -170,7 +169,7 @@ public function getName()
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
@@ -185,7 +184,7 @@ public function setType($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -195,9 +194,9 @@ public function getType()
     }
 
     /**
-     * Set width
+     * Set width.
      *
-     * @param integer $width
+     * @param int $width
      *
      * @return Widget
      */
@@ -210,9 +209,9 @@ public function setWidth($width)
     }
 
     /**
-     * Get width
+     * Get width.
      *
-     * @return integer
+     * @return int
      */
     public function getWidth()
     {
@@ -220,9 +219,9 @@ public function getWidth()
     }
 
     /**
-     * Set height
+     * Set height.
      *
-     * @param integer $height
+     * @param int $height
      *
      * @return Widget
      */
@@ -235,9 +234,9 @@ public function setHeight($height)
     }
 
     /**
-     * Get cache timeout
+     * Get cache timeout.
      *
-     * @return integer (minutes)
+     * @return int (minutes)
      */
     public function getCacheTimeout()
     {
@@ -245,9 +244,9 @@ public function getCacheTimeout()
     }
 
     /**
-     * Set cache timeout
+     * Set cache timeout.
      *
-     * @param integer $cacheTimeout (minutes)
+     * @param int $cacheTimeout (minutes)
      *
      * @return Widget
      */
@@ -260,9 +259,9 @@ public function setCacheTimeout($cacheTimeout)
     }
 
     /**
-     * Get height
+     * Get height.
      *
-     * @return integer
+     * @return int
      */
     public function getHeight()
     {
@@ -270,9 +269,9 @@ public function getHeight()
     }
 
     /**
-     * Set ordering
+     * Set ordering.
      *
-     * @param integer $ordering
+     * @param int $ordering
      *
      * @return Widget
      */
@@ -285,9 +284,9 @@ public function setOrdering($ordering)
     }
 
     /**
-     * Get ordering
+     * Get ordering.
      *
-     * @return integer
+     * @return int
      */
     public function getOrdering()
     {
@@ -295,7 +294,7 @@ public function getOrdering()
     }
 
     /**
-     * Get params
+     * Get params.
      *
      * @return array $params
      */
@@ -305,7 +304,7 @@ public function getParams()
     }
 
     /**
-     * Set params
+     * Set params.
      *
      * @param array $params
      *
@@ -320,7 +319,7 @@ public function setParams(array $params)
     }
 
     /**
-     * Set template
+     * Set template.
      *
      * @param string $template
      *
@@ -335,7 +334,7 @@ public function setTemplate($template)
     }
 
     /**
-     * Get template
+     * Get template.
      *
      * @return string
      */
@@ -345,7 +344,7 @@ public function getTemplate()
     }
 
     /**
-     * Get template data
+     * Get template data.
      *
      * @return array $templateData
      */
@@ -355,7 +354,7 @@ public function getTemplateData()
     }
 
     /**
-     * Set template data
+     * Set template data.
      *
      * @param array $templateData
      *
@@ -370,7 +369,7 @@ public function setTemplateData(array $templateData)
     }
 
     /**
-     * Set errorMessage
+     * Set errorMessage.
      *
      * @param string $errorMessage
      *
@@ -384,7 +383,7 @@ public function setErrorMessage($errorMessage)
     }
 
     /**
-     * Get errorMessage
+     * Get errorMessage.
      *
      * @return string
      */
@@ -394,7 +393,7 @@ public function getErrorMessage()
     }
 
     /**
-     * Set cached flag
+     * Set cached flag.
      *
      * @param string $cached
      *
@@ -408,9 +407,9 @@ public function setCached($cached)
     }
 
     /**
-     * Get cached
+     * Get cached.
      *
-     * @return boolean
+     * @return bool
      */
     public function isCached()
     {
@@ -418,7 +417,7 @@ public function isCached()
     }
 
     /**
-     * Set loadTime
+     * Set loadTime.
      *
      * @param string $loadTime
      *
@@ -432,12 +431,12 @@ public function setLoadTime($loadTime)
     }
 
     /**
-     * Get loadTime
+     * Get loadTime.
      *
-     * @return integer
+     * @return int
      */
     public function getLoadTime()
     {
         return $this->loadTime;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/DashboardBundle/Entity/WidgetRepository.php b/app/bundles/DashboardBundle/Entity/WidgetRepository.php
index 95f330e5935..1fec3e6ec4e 100644
--- a/app/bundles/DashboardBundle/Entity/WidgetRepository.php
+++ b/app/bundles/DashboardBundle/Entity/WidgetRepository.php
@@ -1,38 +1,38 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\DashboardBundle\Entity;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * WidgetRepository
+ * WidgetRepository.
  */
 class WidgetRepository extends CommonRepository
 {
     /**
-     * Update widget ordering
+     * Update widget ordering.
      *
-     * @param  array   $ordering
-     * @param  integer $userId
+     * @param array $ordering
+     * @param int   $userId
      *
      * @return string
      */
     public function updateOrdering($ordering, $userId)
     {
         $widgets = $this->getEntities(
-            array(
-                'filter' => array(
-                    'createdBy' => $userId
-                )
-            )
+            [
+                'filter' => [
+                    'createdBy' => $userId,
+                ],
+            ]
         );
 
         foreach ($widgets as &$widget) {
@@ -49,9 +49,9 @@ public function updateOrdering($ordering, $userId)
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('w.ordering', 'ASC')
-        );
+        return [
+            ['w.ordering', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/DashboardBundle/Event/WidgetDetailEvent.php b/app/bundles/DashboardBundle/Event/WidgetDetailEvent.php
index b2d575559f7..e28d59b78cd 100644
--- a/app/bundles/DashboardBundle/Event/WidgetDetailEvent.php
+++ b/app/bundles/DashboardBundle/Event/WidgetDetailEvent.php
@@ -1,64 +1,63 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\DashboardBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
-use Mautic\DashboardBundle\Entity\Widget;
 use Mautic\CoreBundle\Helper\CacheStorageHelper;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
+use Mautic\DashboardBundle\Entity\Widget;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class WidgetDetailEvent
- *
- * @package Mautic\DashboardBundle\Event
+ * Class WidgetDetailEvent.
  */
 class WidgetDetailEvent extends CommonEvent
 {
     protected $widget;
     protected $type;
     protected $template;
-    protected $templateData = array();
+    protected $templateData = [];
     protected $errorMessage;
     protected $uniqueId;
     protected $cacheDir;
     protected $uniqueCacheDir;
     protected $cacheTimeout;
     protected $startTime = 0;
-    protected $loadTime = 0;
+    protected $loadTime  = 0;
     protected $translator;
 
     /**
-     * @var CorePermissions $security
+     * @var CorePermissions
      */
     protected $security = null;
 
     public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
-        $this->startTime = microtime();
+        $this->startTime  = microtime();
     }
 
     /**
-     * Set the cache dir
+     * Set the cache dir.
      *
      * @param string $cacheDir
      */
     public function setCacheDir($cacheDir, $uniqueCacheDir = null)
     {
-        $this->cacheDir = $cacheDir;
+        $this->cacheDir       = $cacheDir;
         $this->uniqueCacheDir = $uniqueCacheDir;
     }
 
     /**
-     * Set the cache timeout
+     * Set the cache timeout.
      *
      * @param string $cacheTimeout
      */
@@ -68,7 +67,7 @@ public function setCacheTimeout($cacheTimeout)
     }
 
     /**
-     * Set the widget type
+     * Set the widget type.
      *
      * @param string $type
      */
@@ -78,7 +77,7 @@ public function setType($type)
     }
 
     /**
-     * Get the widget type
+     * Get the widget type.
      *
      * @return string $type
      */
@@ -88,7 +87,7 @@ public function getType()
     }
 
     /**
-     * Set the widget entity
+     * Set the widget entity.
      *
      * @param Widget $widget
      */
@@ -112,7 +111,7 @@ public function setWidget(Widget $widget)
         }
 
         if (!isset($params['filter'])) {
-            $params['filter'] = array();
+            $params['filter'] = [];
         }
 
         $widget->setParams($params);
@@ -122,7 +121,7 @@ public function setWidget(Widget $widget)
     }
 
     /**
-     * Returns the widget entity
+     * Returns the widget entity.
      *
      * @param Widget $widget
      */
@@ -132,7 +131,7 @@ public function getWidget()
     }
 
     /**
-     * Set the widget template
+     * Set the widget template.
      *
      * @param string $template
      */
@@ -143,7 +142,7 @@ public function setTemplate($template)
     }
 
     /**
-     * Get the widget template
+     * Get the widget template.
      *
      * @return string $template
      */
@@ -153,9 +152,9 @@ public function getTemplate()
     }
 
     /**
-     * Set the widget template data
+     * Set the widget template data.
      *
-     * @param array  $templateData
+     * @param array $templateData
      */
     public function setTemplateData(array $templateData, $skipCache = false)
     {
@@ -171,7 +170,7 @@ public function setTemplateData(array $templateData, $skipCache = false)
     }
 
     /**
-     * Get the widget template data
+     * Get the widget template data.
      *
      * @return string $templateData
      */
@@ -181,9 +180,9 @@ public function getTemplateData()
     }
 
     /**
-     * Set en error message
+     * Set en error message.
      *
-     * @param array  $errorMessage
+     * @param array $errorMessage
      */
     public function setErrorMessage($errorMessage)
     {
@@ -192,7 +191,7 @@ public function setErrorMessage($errorMessage)
     }
 
     /**
-     * Get an error message
+     * Get an error message.
      *
      * @return string $errorMessage
      */
@@ -202,7 +201,7 @@ public function getErrorMessage()
     }
 
     /**
-     * Build a unique ID from type and widget params
+     * Build a unique ID from type and widget params.
      *
      * @return string
      */
@@ -216,12 +215,12 @@ public function getUniqueWidgetId()
         // Unset dateFrom and dateTo since they constantly change
         unset($params['dateFrom'], $params['dateTo']);
 
-        $uniqueSettings = array(
+        $uniqueSettings = [
             'params' => $params,
             'width'  => $this->getWidget()->getWidth(),
             'height' => $this->getWidget()->getHeight(),
-            'locale' => $this->translator->getLocale()
-        );
+            'locale' => $this->translator->getLocale(),
+        ];
 
         return $this->uniqueId = $this->getType().'_'.substr(md5(json_encode($uniqueSettings)), 0, 16);
     }
@@ -244,6 +243,7 @@ public function isCached()
         if ($data) {
             $this->widget->setCached(true);
             $this->setTemplateData($data, true);
+
             return true;
         }
 
@@ -251,7 +251,7 @@ public function isCached()
     }
 
     /**
-     * Get the Translator object
+     * Get the Translator object.
      *
      * @return Translator $translator
      */
@@ -261,7 +261,7 @@ public function getTranslator()
     }
 
     /**
-     * Set security object to check the perimissions
+     * Set security object to check the perimissions.
      *
      * @param CorePermissions $security
      */
@@ -271,29 +271,35 @@ public function setSecurity(CorePermissions $security)
     }
 
     /**
-     * Check if the user has at least one permission of defined array of permissions
+     * Check if the user has at least one permission of defined array of permissions.
      *
-     * @param  array $permissions
+     * @param array $permissions
      *
-     * @return boolean
+     * @return bool
      */
     public function hasPermissions(array $permissions)
     {
-        if (!$this->security) return true;
-        $perm = $this->security->isGranted($permissions, "RETURN_ARRAY");
+        if (!$this->security) {
+            return true;
+        }
+        $perm = $this->security->isGranted($permissions, 'RETURN_ARRAY');
+
         return in_array(true, $perm);
     }
 
     /**
-     * Check if the user has defined permission to see the widgets
+     * Check if the user has defined permission to see the widgets.
      *
-     * @param  string $permission
+     * @param string $permission
      *
-     * @return boolean
+     * @return bool
      */
     public function hasPermission($permission)
     {
-        if (!$this->security) return true;
+        if (!$this->security) {
+            return true;
+        }
+
         return $this->security->isGranted($permission);
     }
 }
diff --git a/app/bundles/DashboardBundle/Event/WidgetFormEvent.php b/app/bundles/DashboardBundle/Event/WidgetFormEvent.php
index 10e5887c8e6..8dba6502aaa 100644
--- a/app/bundles/DashboardBundle/Event/WidgetFormEvent.php
+++ b/app/bundles/DashboardBundle/Event/WidgetFormEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\DashboardBundle\Entity\Widget;
 
 /**
- * Class WidgetFormEvent
- *
- * @package Mautic\DashboardBundle\Event
+ * Class WidgetFormEvent.
  */
 class WidgetFormEvent extends CommonEvent
 {
@@ -23,7 +22,7 @@ class WidgetFormEvent extends CommonEvent
     protected $type;
 
     /**
-     * Set the widget type
+     * Set the widget type.
      *
      * @param string $type
      */
@@ -33,7 +32,7 @@ public function setType($type)
     }
 
     /**
-     * Get the widget type
+     * Get the widget type.
      *
      * @return string $type
      */
@@ -43,7 +42,7 @@ public function getType()
     }
 
     /**
-     * Set the widget form
+     * Set the widget form.
      *
      * @param string $form
      */
@@ -53,7 +52,7 @@ public function setForm($form)
     }
 
     /**
-     * Returns the widget edit form
+     * Returns the widget edit form.
      *
      * @param string $form
      */
diff --git a/app/bundles/DashboardBundle/Event/WidgetTypeListEvent.php b/app/bundles/DashboardBundle/Event/WidgetTypeListEvent.php
index dfbf3bc4a43..1201899c084 100644
--- a/app/bundles/DashboardBundle/Event/WidgetTypeListEvent.php
+++ b/app/bundles/DashboardBundle/Event/WidgetTypeListEvent.php
@@ -1,54 +1,53 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\DashboardBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
-use Mautic\DashboardBundle\Entity\Widget;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
+use Mautic\DashboardBundle\Entity\Widget;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class WidgetTypeListEvent
- *
- * @package Mautic\DashboardBundle\Event
+ * Class WidgetTypeListEvent.
  */
 class WidgetTypeListEvent extends CommonEvent
 {
     /**
-     * @var array $widgetTypes
+     * @var array
      */
-    protected $widgetTypes = array();
+    protected $widgetTypes = [];
 
     /**
-     * @var TranslatorInterface $translator
+     * @var TranslatorInterface
      */
     protected $translator;
 
     /**
-     * @var CorePermissions $security
+     * @var CorePermissions
      */
     protected $security = null;
 
     /**
-     * Adds a new widget type to the widget types list
+     * Adds a new widget type to the widget types list.
      *
-     * @param  string $widgetType
-     * @param  string $bundle name (widget category)
+     * @param string $widgetType
+     * @param string $bundle     name (widget category)
      */
     public function addType($widgetType, $bundle = 'others')
     {
-        $bundle = 'mautic.' . $bundle . '.dashboard.widgets';
-        $widgetTypeName = 'mautic.widget.' . $widgetType;
+        $bundle         = 'mautic.'.$bundle.'.dashboard.widgets';
+        $widgetTypeName = 'mautic.widget.'.$widgetType;
 
         if ($this->translator) {
-            $bundle = $this->translator->trans($bundle);
+            $bundle         = $this->translator->trans($bundle);
             $widgetTypeName = $this->translator->trans($widgetTypeName);
         }
 
@@ -60,7 +59,7 @@ public function addType($widgetType, $bundle = 'others')
     }
 
     /**
-     * Set translator if you want the strings to be translated
+     * Set translator if you want the strings to be translated.
      *
      * @param TranslatorInterface $translator
      */
@@ -70,7 +69,7 @@ public function setTranslator(TranslatorInterface $translator)
     }
 
     /**
-     * Set security object to check the perimissions
+     * Set security object to check the perimissions.
      *
      * @param CorePermissions $security
      */
@@ -80,21 +79,24 @@ public function setSecurity(CorePermissions $security)
     }
 
     /**
-     * Check if the user has permission to see the widgets
+     * Check if the user has permission to see the widgets.
      *
      * @param array $permissions
      *
-     * @return boolean
+     * @return bool
      */
     public function hasPermissions(array $permissions)
     {
-        if (!$this->security) return true;
-        $perm = $this->security->isGranted($permissions, "RETURN_ARRAY");
+        if (!$this->security) {
+            return true;
+        }
+        $perm = $this->security->isGranted($permissions, 'RETURN_ARRAY');
+
         return !in_array(false, $perm);
     }
 
     /**
-     * Returns the array of widget types
+     * Returns the array of widget types.
      *
      * @return array $widgetTypes
      */
diff --git a/app/bundles/DashboardBundle/EventListener/DashboardSubscriber.php b/app/bundles/DashboardBundle/EventListener/DashboardSubscriber.php
index 6ac37d55fc3..d5151764367 100644
--- a/app/bundles/DashboardBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/DashboardBundle/EventListener/DashboardSubscriber.php
@@ -1,69 +1,69 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DashboardBundle\EventListener;
 
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\DashboardBundle\DashboardEvents;
-use Mautic\DashboardBundle\Event\WidgetTypeListEvent;
-use Mautic\DashboardBundle\Event\WidgetFormEvent;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\DashboardBundle\Event\WidgetFormEvent;
+use Mautic\DashboardBundle\Event\WidgetTypeListEvent;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\DashboardBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends CommonSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'others';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var array
      */
-    protected $types = array();
+    protected $types = [];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array();
+    protected $permissions = [];
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            DashboardEvents::DASHBOARD_ON_MODULE_LIST_GENERATE => array('onWidgetListGenerate', 0),
-            DashboardEvents::DASHBOARD_ON_MODULE_FORM_GENERATE => array('onWidgetFormGenerate', 0),
-            DashboardEvents::DASHBOARD_ON_MODULE_DETAIL_GENERATE => array('onWidgetDetailGenerate', 0),
-        );
+        return [
+            DashboardEvents::DASHBOARD_ON_MODULE_LIST_GENERATE   => ['onWidgetListGenerate', 0],
+            DashboardEvents::DASHBOARD_ON_MODULE_FORM_GENERATE   => ['onWidgetFormGenerate', 0],
+            DashboardEvents::DASHBOARD_ON_MODULE_DETAIL_GENERATE => ['onWidgetDetailGenerate', 0],
+        ];
     }
 
     /**
-     * Adds widget new widget types to the list of available widget types 
+     * Adds widget new widget types to the list of available widget types.
      *
      * @param WidgetTypeListEvent $event
-     *
-     * @return void
      */
     public function onWidgetListGenerate(WidgetTypeListEvent $event)
     {
-        if ($this->permissions && !$event->hasPermissions($this->permissions)) return;
+        if ($this->permissions && !$event->hasPermissions($this->permissions)) {
+            return;
+        }
 
         $widgetTypes = array_keys($this->types);
 
@@ -73,11 +73,9 @@ public function onWidgetListGenerate(WidgetTypeListEvent $event)
     }
 
     /**
-     * Set a widget edit form when needed 
+     * Set a widget edit form when needed.
      *
      * @param WidgetFormEvent $event
-     *
-     * @return void
      */
     public function onWidgetFormGenerate(WidgetFormEvent $event)
     {
@@ -88,30 +86,27 @@ public function onWidgetFormGenerate(WidgetFormEvent $event)
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function checkPermissions(WidgetDetailEvent $event)
     {
         $widgetTypes = array_keys($this->types);
         if ($this->permissions && !$event->hasPermissions($this->permissions) && in_array($event->getType(), $widgetTypes)) {
             $translator = $event->getTranslator();
-            $event->setErrorMessage($translator->trans('mautic.dashboard.missing.permission', array('%section%' => $this->bundle)));
+            $event->setErrorMessage($translator->trans('mautic.dashboard.missing.permission', ['%section%' => $this->bundle]));
             $event->stopPropagation();
+
             return;
         }
     }
diff --git a/app/bundles/DashboardBundle/Form/Type/UploadType.php b/app/bundles/DashboardBundle/Form/Type/UploadType.php
index 98cf6011d62..6836a8a3948 100644
--- a/app/bundles/DashboardBundle/Form/Type/UploadType.php
+++ b/app/bundles/DashboardBundle/Form/Type/UploadType.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DashboardBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+
 /**
- * Class UploadType
- *
- * @package Mautic\DashboardBundle\Form\Type
+ * Class UploadType.
  */
 class UploadType extends AbstractType
 {
@@ -21,37 +22,37 @@ class UploadType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('file', 'file', [
             'label' => 'mautic.lead.import.file',
             'attr'  => [
                 'accept' => '.json',
-                'class'  => 'form-control'
-            ]
+                'class'  => 'form-control',
+            ],
         ]);
         $constraints = [
             new \Symfony\Component\Validator\Constraints\NotBlank(
                 ['message' => 'mautic.core.value.required']
-            )
+            ),
         ];
         $builder->add('start', 'submit', [
-            'attr'  => [
+            'attr' => [
                 'class'   => 'btn btn-primary',
                 'icon'    => 'fa fa-upload',
-                'onclick' => "mQuery(this).prop('disabled', true); mQuery('form[name=\'dashboard_upload\']').submit();"
+                'onclick' => "mQuery(this).prop('disabled', true); mQuery('form[name=\'dashboard_upload\']').submit();",
             ],
-            'label' => 'mautic.lead.import.upload'
+            'label' => 'mautic.lead.import.upload',
         ]);
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "dashboard_upload";
+        return 'dashboard_upload';
     }
 }
diff --git a/app/bundles/DashboardBundle/Form/Type/WidgetType.php b/app/bundles/DashboardBundle/Form/Type/WidgetType.php
index c60ceea24e2..935271a14f3 100644
--- a/app/bundles/DashboardBundle/Form/Type/WidgetType.php
+++ b/app/bundles/DashboardBundle/Form/Type/WidgetType.php
@@ -1,42 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\DashboardBundle\Form\Type;
 
-use Doctrine\ORM\EntityRepository;
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
-use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Mautic\DashboardBundle\DashboardEvents;
-use Mautic\DashboardBundle\Event\WidgetTypeListEvent;
 use Mautic\DashboardBundle\Event\WidgetFormEvent;
+use Mautic\DashboardBundle\Event\WidgetTypeListEvent;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 
 /**
- * Class WidgetType
- *
- * @package Mautic\DashboardBundle\Form\Type
+ * Class WidgetType.
  */
 class WidgetType extends AbstractType
 {
-
     private $factory;
 
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
@@ -45,70 +38,70 @@ public function __construct (MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('name', 'text', array(
+        $builder->add('name', 'text', [
             'label'      => 'mautic.dashboard.widget.form.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => false,
+        ]);
 
         $dispatcher = $this->factory->getDispatcher();
         $event      = new WidgetTypeListEvent();
         $event->setSecurity($this->factory->getSecurity());
         $dispatcher->dispatch(DashboardEvents::DASHBOARD_ON_MODULE_LIST_GENERATE, $event);
 
-        $builder->add('type', 'choice', array(
+        $builder->add('type', 'choice', [
             'label'       => 'mautic.dashboard.widget.form.type',
             'choices'     => $event->getTypes(),
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class' => 'form-control'),
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => ['class' => 'form-control'],
             'empty_value' => 'mautic.core.select',
-            'attr'        => array(
-                'class'     => 'form-control',
-                'onchange'  => 'Mautic.updateWidgetForm(this)'
-            )
-        ));
-
-        $builder->add('width', 'choice', array(
-            'label'       => 'mautic.dashboard.widget.form.width',
-            'choices'     => array(
-                '25' => '25%',
-                '50' => '50%',
-                '75' => '75%',
+            'attr'        => [
+                'class'    => 'form-control',
+                'onchange' => 'Mautic.updateWidgetForm(this)',
+            ],
+        ]);
+
+        $builder->add('width', 'choice', [
+            'label'   => 'mautic.dashboard.widget.form.width',
+            'choices' => [
+                '25'  => '25%',
+                '50'  => '50%',
+                '75'  => '75%',
                 '100' => '100%',
-            ),
-            'empty_data'  => '100',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class' => 'form-control'),
-            'required'    => false
-        ));
-
-        $builder->add('height', 'choice', array(
-            'label'       => 'mautic.dashboard.widget.form.height',
-            'choices'     => array(
+            ],
+            'empty_data' => '100',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => false,
+        ]);
+
+        $builder->add('height', 'choice', [
+            'label'   => 'mautic.dashboard.widget.form.height',
+            'choices' => [
                 '215' => '215px',
                 '330' => '330px',
                 '445' => '445px',
                 '560' => '560px',
                 '675' => '675px',
-            ),
-            'empty_data'  => '330',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class' => 'form-control'),
-            'required'    => false
-        ));
+            ],
+            'empty_data' => '330',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => false,
+        ]);
 
         $ff = $builder->getFormFactory();
 
         // function to add a form for specific widget type dynamically
         $func = function (FormEvent $e) use ($ff, $dispatcher) {
-            $data    = $e->getData();
-            $form    = $e->getForm();
-            $event   = new WidgetFormEvent();
-            $type    = null;
-            $params  = array();
+            $data   = $e->getData();
+            $form   = $e->getForm();
+            $event  = new WidgetFormEvent();
+            $type   = null;
+            $params = [];
 
             // $data is object on load, array on save (??)
             if (is_array($data)) {
@@ -119,7 +112,7 @@ public function buildForm (FormBuilderInterface $builder, array $options)
                     $params = $data['params'];
                 }
             } else {
-                $type = $data->getType();
+                $type   = $data->getType();
                 $params = $data->getParams();
             }
 
@@ -129,24 +122,23 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $form->setData($params);
 
             if (isset($widgetForm['formAlias'])) {
-                $form->add('params', $widgetForm['formAlias'], array(
-                    'label' => false
-                ));
+                $form->add('params', $widgetForm['formAlias'], [
+                    'label' => false,
+                ]);
             }
-            
         };
 
-        $builder->add('id', 'hidden', array(
-            'mapped' => false
-        ));
+        $builder->add('id', 'hidden', [
+            'mapped' => false,
+        ]);
 
-        $builder->add('buttons', 'form_buttons', array(
+        $builder->add('buttons', 'form_buttons', [
             'apply_text' => false,
-            'save_text'  => 'mautic.core.form.save'
-        ));
+            'save_text'  => 'mautic.core.form.save',
+        ]);
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
 
         // Register the function above as EventListener on PreSet and PreBind
@@ -157,8 +149,8 @@ public function buildForm (FormBuilderInterface $builder, array $options)
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "widget";
+        return 'widget';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/DashboardBundle/MauticDashboardBundle.php b/app/bundles/DashboardBundle/MauticDashboardBundle.php
index c6c6703bfe4..ac3aebf94e3 100644
--- a/app/bundles/DashboardBundle/MauticDashboardBundle.php
+++ b/app/bundles/DashboardBundle/MauticDashboardBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticDashboardBundle
+ * Class MauticDashboardBundle.
  */
 class MauticDashboardBundle extends Bundle
 {
diff --git a/app/bundles/DashboardBundle/Model/DashboardModel.php b/app/bundles/DashboardBundle/Model/DashboardModel.php
index 84a508d5786..aba42811253 100644
--- a/app/bundles/DashboardBundle/Model/DashboardModel.php
+++ b/app/bundles/DashboardBundle/Model/DashboardModel.php
@@ -1,27 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\DashboardBundle\Model;
 
+use Mautic\CoreBundle\Helper\CacheStorageHelper;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\PathsHelper;
 use Mautic\CoreBundle\Model\FormModel;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Entity\Widget;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
-use Mautic\DashboardBundle\DashboardEvents;
-use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\CoreBundle\Helper\CacheStorageHelper;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class DashboardModel
+ * Class DashboardModel.
  */
 class DashboardModel extends FormModel
 {
@@ -29,7 +29,7 @@ class DashboardModel extends FormModel
      * @var Session
      */
     protected $session;
-    
+
     /**
      * @var CoreParametersHelper
      */
@@ -42,14 +42,14 @@ class DashboardModel extends FormModel
 
     /**
      * DashboardModel constructor.
-     * 
+     *
      * @param CoreParametersHelper $coreParametersHelper
-     * @param PathsHelper $pathsHelper
+     * @param PathsHelper          $pathsHelper
      */
     public function __construct(CoreParametersHelper $coreParametersHelper, PathsHelper $pathsHelper)
     {
         $this->coreParametersHelper = $coreParametersHelper;
-        $this->pathsHelper = $pathsHelper;
+        $this->pathsHelper          = $pathsHelper;
     }
 
     /**
@@ -59,7 +59,7 @@ public function setSession(Session $session)
     {
         $this->session = $session;
     }
-    
+
     /**
      * {@inheritdoc}
      *
@@ -81,9 +81,10 @@ public function getPermissionBase()
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
+     *
      * @return null|object
      */
     public function getEntity($id = null)
@@ -98,35 +99,35 @@ public function getEntity($id = null)
     }
 
     /**
-     * Load widgets for the current user from database
+     * Load widgets for the current user from database.
      *
      * @return array
      */
     public function getWidgets()
     {
-        $widgets = $this->getEntities(array(
+        $widgets = $this->getEntities([
             'orderBy' => 'w.ordering',
-            'filter' => array(
-                'force' => array(
-                    array(
+            'filter'  => [
+                'force' => [
+                    [
                         'column' => 'w.createdBy',
                         'expr'   => 'eq',
-                        'value'  => $this->user->getId()
-                    )
-                )
-            )
-        ));
+                        'value'  => $this->user->getId(),
+                    ],
+                ],
+            ],
+        ]);
 
         return $widgets;
     }
 
     /**
-     * Fill widgets with their content
+     * Fill widgets with their content.
      *
      * @param array $widgets
      * @param array $filter
      */
-    public function populateWidgetsContent(&$widgets, $filter = array())
+    public function populateWidgetsContent(&$widgets, $filter = [])
     {
         if (count($widgets)) {
             foreach ($widgets as &$widget) {
@@ -139,7 +140,7 @@ public function populateWidgetsContent(&$widgets, $filter = array())
     }
 
     /**
-     * Creates a new Widget object from an array data
+     * Creates a new Widget object from an array data.
      *
      * @param array $data
      *
@@ -147,10 +148,10 @@ public function populateWidgetsContent(&$widgets, $filter = array())
      */
     public function populateWidgetEntity($data)
     {
-        $entity = new Widget;
+        $entity = new Widget();
 
         foreach ($data as $property => $value) {
-            $method = "set".ucfirst($property);
+            $method = 'set'.ucfirst($property);
             if (method_exists($entity, $method)) {
                 $entity->$method($value);
             }
@@ -161,14 +162,14 @@ public function populateWidgetEntity($data)
     }
 
     /**
-     * Load widget content from the onWidgetDetailGenerate event
+     * Load widget content from the onWidgetDetailGenerate event.
      *
      * @param Widget $widget
      * @param array  $filter
      */
-    public function populateWidgetContent(Widget &$widget, $filter = array())
+    public function populateWidgetContent(Widget &$widget, $filter = [])
     {
-        $cacheDir   = $this->coreParametersHelper->getParameter('cached_data_dir', $this->pathsHelper->getSystemPath('cache', true));
+        $cacheDir = $this->coreParametersHelper->getParameter('cached_data_dir', $this->pathsHelper->getSystemPath('cache', true));
 
         if ($widget->getCacheTimeout() == null || $widget->getCacheTimeout() == -1) {
             $widget->setCacheTimeout($this->coreParametersHelper->getParameter('cached_data_timeout'));
@@ -201,11 +202,11 @@ public function populateWidgetContent(Widget &$widget, $filter = array())
     }
 
     /**
-     * Clears the temporary widget cache
+     * Clears the temporary widget cache.
      */
     public function clearDashboardCache()
     {
-        $cacheDir = $this->coreParametersHelper->getParameter('cached_data_dir', $this->pathsHelper->getSystemPath('cache', true));
+        $cacheDir     = $this->coreParametersHelper->getParameter('cached_data_dir', $this->pathsHelper->getSystemPath('cache', true));
         $cacheStorage = new CacheStorageHelper($cacheDir, $this->user->getId());
         $cacheStorage->clear();
     }
@@ -213,21 +214,22 @@ public function clearDashboardCache()
     /**
      * {@inheritdoc}
      *
-     * @param Widget                                $entity
+     * @param Widget                              $entity
      * @param \Symfony\Component\Form\FormFactory $formFactory
      * @param string|null                         $action
      * @param array                               $options
      *
      * @return \Symfony\Component\Form\Form
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Widget) {
-            throw new MethodNotAllowedHttpException(array('Widget'), 'Entity must be of class Widget()');
+            throw new MethodNotAllowedHttpException(['Widget'], 'Entity must be of class Widget()');
         }
 
-        if (!empty($action))  {
+        if (!empty($action)) {
             $options['action'] = $action;
         }
 
@@ -235,7 +237,7 @@ public function createForm($entity, $formFactory, $action = null, $options = arr
     }
 
     /**
-     * Create/edit entity
+     * Create/edit entity.
      *
      * @param object $entity
      * @param bool   $unlock
@@ -244,14 +246,14 @@ public function saveEntity($entity, $unlock = true)
     {
         // Set widget name from widget type if empty
         if (!$entity->getName()) {
-            $entity->setName($this->translator->trans('mautic.widget.' . $entity->getType()));
+            $entity->setName($this->translator->trans('mautic.widget.'.$entity->getType()));
         }
 
         parent::saveEntity($entity, $unlock);
     }
 
     /**
-     * Generate default date range filter and time unit
+     * Generate default date range filter and time unit.
      *
      * @return array
      */
@@ -260,13 +262,13 @@ public function getDefaultFilter()
         $lastMonth = new \DateTime();
         $lastMonth->sub(new \DateInterval('P30D'));
 
-        $today       = new \DateTime();
-        $dateFrom    = new \DateTime($this->session->get('mautic.dashboard.date.from', $lastMonth->format('Y-m-d 00:00:00')));
-        $dateTo      = new \DateTime($this->session->get('mautic.dashboard.date.to', $today->format('Y-m-d H:i:s')));
+        $today    = new \DateTime();
+        $dateFrom = new \DateTime($this->session->get('mautic.dashboard.date.from', $lastMonth->format('Y-m-d 00:00:00')));
+        $dateTo   = new \DateTime($this->session->get('mautic.dashboard.date.to', $today->format('Y-m-d H:i:s')));
 
-        return array(
+        return [
             'dateFrom' => $dateFrom,
             'dateTo'   => $dateTo,
-        );
+        ];
     }
 }
diff --git a/app/bundles/DashboardBundle/Views/Dashboard/import.html.php b/app/bundles/DashboardBundle/Views/Dashboard/import.html.php
index 4585b8a6e7e..9501fb4b2a4 100644
--- a/app/bundles/DashboardBundle/Views/Dashboard/import.html.php
+++ b/app/bundles/DashboardBundle/Views/Dashboard/import.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
@@ -28,13 +29,13 @@
                                 <p class="small"><?php echo $config['description']; ?></p>
                                 <?php endif; ?>
                                 <p class="list-group-item-text">
-                                    <a href="<?php echo $view['router']->path('mautic_dashboard_action', array('objectAction' => 'import', 'preview' => $dashboard)); ?>">
+                                    <a href="<?php echo $view['router']->path('mautic_dashboard_action', ['objectAction' => 'import', 'preview' => $dashboard]); ?>">
                                         <?php echo $view['translator']->trans('mautic.dashboard.preview'); ?>
                                     </a>&#183;
-                                    <a href="<?php echo $view['router']->path('mautic_dashboard_action', array('objectAction' => 'applyDashboardFile', 'file' => "{$config['type']}.{$dashboard}")); ?>">
+                                    <a href="<?php echo $view['router']->path('mautic_dashboard_action', ['objectAction' => 'applyDashboardFile', 'file' => "{$config['type']}.{$dashboard}"]); ?>">
                                         <?php echo $view['translator']->trans('mautic.core.form.apply'); ?>
                                     </a><?php if ($config['type'] == 'user'): ?>&#183;
-                                    <a href="<?php echo $view['router']->path('mautic_dashboard_action', array('objectAction' => 'deleteDashboardFile', 'file' => "{$config['type']}.{$dashboard}")); ?>" data-toggle="confirmation" data-message="<?php echo $view['translator']->trans('mautic.dashboard.delete_layout'); ?>" data-confirm-text="<?php echo $view->escape($view["translator"]->trans("mautic.core.form.delete")); ?>" data-confirm-callback="executeAction" data-cancel-text="<?php echo $view->escape($view["translator"]->trans("mautic.core.form.cancel")); ?>">
+                                    <a href="<?php echo $view['router']->path('mautic_dashboard_action', ['objectAction' => 'deleteDashboardFile', 'file' => "{$config['type']}.{$dashboard}"]); ?>" data-toggle="confirmation" data-message="<?php echo $view['translator']->trans('mautic.dashboard.delete_layout'); ?>" data-confirm-text="<?php echo $view->escape($view['translator']->trans('mautic.core.form.delete')); ?>" data-confirm-callback="executeAction" data-cancel-text="<?php echo $view->escape($view['translator']->trans('mautic.core.form.cancel')); ?>">
                                         <?php echo $view['translator']->trans('mautic.core.form.delete'); ?>
                                     </a><?php endif; ?>
                                 </p>
@@ -73,8 +74,8 @@
     <div id="dashboard-widgets" class="dashboard-widgets cards">
         <?php if ($widgets): ?>
             <?php foreach ($widgets as $widget): ?>
-                <div class="card-flex widget" data-widget-id="<?php echo $widget->getId(); ?>" style="width: <?php echo $widget->getHeight() ? $widget->getWidth() . '' : '100' ?>%; height: <?php echo $widget->getHeight() ? $widget->getHeight() . 'px' : '300px' ?>">
-                    <?php echo $view->render('MauticDashboardBundle:Widget:detail.html.php', array('widget' => $widget)); ?>
+                <div class="card-flex widget" data-widget-id="<?php echo $widget->getId(); ?>" style="width: <?php echo $widget->getHeight() ? $widget->getWidth().'' : '100' ?>%; height: <?php echo $widget->getHeight() ? $widget->getHeight().'px' : '300px' ?>">
+                    <?php echo $view->render('MauticDashboardBundle:Widget:detail.html.php', ['widget' => $widget]); ?>
                 </div>
             <?php endforeach; ?>
         <?php endif; ?>
diff --git a/app/bundles/DashboardBundle/Views/Dashboard/index.html.php b/app/bundles/DashboardBundle/Views/Dashboard/index.html.php
index 8bad1cfc77f..8c4ea062150 100644
--- a/app/bundles/DashboardBundle/Views/Dashboard/index.html.php
+++ b/app/bundles/DashboardBundle/Views/Dashboard/index.html.php
@@ -1,75 +1,76 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.dashboard.header.index'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.dashboard.header.index'));
 $view['slots']->set('mauticContent', 'dashboard');
 
-$buttons = array(
-    array(
-        'attr'      => array(
+$buttons = [
+    [
+        'attr' => [
             'class'       => 'btn btn-default btn-nospin',
             'data-toggle' => 'ajaxmodal',
             'data-target' => '#MauticSharedModal',
-            'href'        => $view['router']->path('mautic_dashboard_action', array('objectAction' => 'new')),
+            'href'        => $view['router']->path('mautic_dashboard_action', ['objectAction' => 'new']),
             'data-header' => $view['translator']->trans('mautic.dashboard.widget.add'),
-        ),
+        ],
         'iconClass' => 'fa fa-plus',
-        'btnText'   => 'mautic.dashboard.widget.add'
-    ),
-    array(
-        'attr'      => array(
+        'btnText'   => 'mautic.dashboard.widget.add',
+    ],
+    [
+        'attr' => [
             'class'       => 'btn btn-default btn-nospin',
             'href'        => 'javascript:void()',
-            'onclick'     => "Mautic.exportDashboardLayout('{$view['translator']->trans('mautic.dashboard.confirmation_layout_name')}', '{$view['router']->path('mautic_dashboard_action', array('objectAction' => 'export'))}', true);",
-            'data-toggle' => ''
-        ),
+            'onclick'     => "Mautic.exportDashboardLayout('{$view['translator']->trans('mautic.dashboard.confirmation_layout_name')}', '{$view['router']->path('mautic_dashboard_action', ['objectAction' => 'export'])}', true);",
+            'data-toggle' => '',
+        ],
         'iconClass' => 'fa fa-save',
-        'btnText'   => 'mautic.core.form.save'
-    ),
-    array(
-        'attr'      => array(
+        'btnText'   => 'mautic.core.form.save',
+    ],
+    [
+        'attr' => [
             'class'       => 'btn btn-default btn-nospin',
             'href'        => 'javascript:void()',
-            'onclick'     => "Mautic.exportDashboardLayout('{$view['translator']->trans('mautic.dashboard.confirmation_layout_name')}', '{$view['router']->path('mautic_dashboard_action', array('objectAction' => 'export'))}', false);",
-            'data-toggle' => ''
-        ),
+            'onclick'     => "Mautic.exportDashboardLayout('{$view['translator']->trans('mautic.dashboard.confirmation_layout_name')}', '{$view['router']->path('mautic_dashboard_action', ['objectAction' => 'export'])}', false);",
+            'data-toggle' => '',
+        ],
         'iconClass' => 'fa fa-cloud-download',
-        'btnText'   => 'mautic.dashboard.export.widgets'
-    ),
-    array(
-        'attr'      => array(
+        'btnText'   => 'mautic.dashboard.export.widgets',
+    ],
+    [
+        'attr' => [
             'class'       => 'btn btn-default',
-            'href'        => $view['router']->path('mautic_dashboard_action', array('objectAction' => 'import')),
+            'href'        => $view['router']->path('mautic_dashboard_action', ['objectAction' => 'import']),
             'data-header' => $view['translator']->trans('mautic.dashboard.widget.import'),
-        ),
+        ],
         'iconClass' => 'fa fa-cloud-upload',
-        'btnText'   => 'mautic.dashboard.widget.import'
-    )
-);
+        'btnText'   => 'mautic.dashboard.widget.import',
+    ],
+];
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'routeBase' => 'dashboard',
-    'langVar'   => 'dashboard',
-    'customButtons' => $buttons
-)));
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'routeBase'     => 'dashboard',
+    'langVar'       => 'dashboard',
+    'customButtons' => $buttons,
+]));
 ?>
 <div class="row pt-md pl-md">
     <div class="col-sm-6">
-        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', array('dateRangeForm' => $dateRangeForm)); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['dateRangeForm' => $dateRangeForm]); ?>
     </div>
 </div>
 
 <?php if (count($widgets)): ?>
     <div id="dashboard-widgets" class="dashboard-widgets cards">
         <?php foreach ($widgets as $widget): ?>
-            <div class="card-flex widget" data-widget-id="<?php echo $widget->getId(); ?>" style="width: <?php echo $widget->getWidth() ? $widget->getWidth() . '' : '100' ?>%; height: <?php echo $widget->getHeight() ? $widget->getHeight() . 'px' : '300px' ?>">
-                <?php echo $view->render('MauticDashboardBundle:Widget:detail.html.php', array('widget' => $widget)); ?>
+            <div class="card-flex widget" data-widget-id="<?php echo $widget->getId(); ?>" style="width: <?php echo $widget->getWidth() ? $widget->getWidth().'' : '100' ?>%; height: <?php echo $widget->getHeight() ? $widget->getHeight().'px' : '300px' ?>">
+                <?php echo $view->render('MauticDashboardBundle:Widget:detail.html.php', ['widget' => $widget]); ?>
             </div>
         <?php endforeach; ?>
     </div>
@@ -83,7 +84,7 @@
             <div class="col-xs-9">
                 <h4><i class="fa fa-quote-left"></i> <?php echo $view['translator']->trans('mautic.dashboard.nowidgets.tip.header'); ?> <i class="fa fa-quote-right"></i></h4>
                 <p class="mt-md"><?php echo $view['translator']->trans('mautic.dashboard.nowidgets.tip'); ?></p>
-                <a href="<?php echo $view['router']->path('mautic_dashboard_action', array('objectAction' => 'applyDashboardFile', 'file' => 'default.json')); ?>" class="btn btn-success">
+                <a href="<?php echo $view['router']->path('mautic_dashboard_action', ['objectAction' => 'applyDashboardFile', 'file' => 'default.json']); ?>" class="btn btn-success">
                     Apply the default dashboard
                 </a>
             </div>
diff --git a/app/bundles/DashboardBundle/Views/Dashboard/recentactivity.html.php b/app/bundles/DashboardBundle/Views/Dashboard/recentactivity.html.php
index 73c790f18f2..9b455fe02b9 100644
--- a/app/bundles/DashboardBundle/Views/Dashboard/recentactivity.html.php
+++ b/app/bundles/DashboardBundle/Views/Dashboard/recentactivity.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -12,8 +13,10 @@
 <div class="pt-md pr-md pb-md pl-md">
     <ul class="media-list media-list-feed">
         <?php foreach ($logs as $log) : ?>
-        <?php // If the data are loaded from cache array: ?>
-        <?php if (is_array($log['dateAdded']) && isset($log['dateAdded']['date'])) $log['dateAdded'] = new \DateTime($log['dateAdded']['date'], (new \DateTimeZone($log['dateAdded']['timezone']))); ?>
+        <?php // If the data are loaded from cache array:?>
+        <?php if (is_array($log['dateAdded']) && isset($log['dateAdded']['date'])) {
+    $log['dateAdded'] = new \DateTime($log['dateAdded']['date'], (new \DateTimeZone($log['dateAdded']['timezone'])));
+} ?>
         <li class="media">
             <div class="media-object pull-left">
                 <span class="figure featured <?php echo ($log['action'] == 'create') ? 'bg-success' : ''; ?>">
@@ -22,7 +25,7 @@
             </div>
             <div class="media-body">
                 <?php if (isset($log['userId']) && $log['userId']) : ?>
-                    <a href="<?php echo $view['router']->path('mautic_user_action', array('objectAction' => 'edit', 'objectId' => $log['userId'])); ?>" data-toggle="ajax">
+                    <a href="<?php echo $view['router']->path('mautic_user_action', ['objectAction' => 'edit', 'objectId' => $log['userId']]); ?>" data-toggle="ajax">
                         <?php echo $log['userName']; ?>
                     </a>
                 <?php elseif ($log['userName']) : ?>
@@ -30,7 +33,7 @@
                 <?php else: ?>
                     <?php echo $view['translator']->trans('mautic.core.system'); ?>
                 <?php endif; ?>
-                <?php echo $view['translator']->trans('mautic.dashboard.' . $log['action'] . '.past.tense'); ?>
+                <?php echo $view['translator']->trans('mautic.dashboard.'.$log['action'].'.past.tense'); ?>
 
                 <?php if (!empty($log['route'])): ?>
                 <a href="<?php echo $log['route']; ?>" data-toggle="ajax">
diff --git a/app/bundles/DashboardBundle/Views/Dashboard/upcomingemails.html.php b/app/bundles/DashboardBundle/Views/Dashboard/upcomingemails.html.php
index a2ef8eb9118..4966b9ccb04 100644
--- a/app/bundles/DashboardBundle/Views/Dashboard/upcomingemails.html.php
+++ b/app/bundles/DashboardBundle/Views/Dashboard/upcomingemails.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -18,14 +19,14 @@
                     </div>
                     <div class="col-md-4 va-m">
                         <h5 class="fw-sb text-primary">
-                            <a href="<?php echo $view['router']->path('mautic_campaign_action', array('objectAction' => 'view', 'objectId' => $email['campaign_id'])); ?>" data-toggle="ajax">
+                            <a href="<?php echo $view['router']->path('mautic_campaign_action', ['objectAction' => 'view', 'objectId' => $email['campaign_id']]); ?>" data-toggle="ajax">
                                 <?php echo $email['campaign_name']; ?>
                             </a>
                         </h5>
                         <span class="text-white dark-sm"><?php echo $email['event_name']; ?></span>
                     </div>
                     <div class="col-md-4 va-m text-right">
-                        <a class="btn btn-sm btn-success"  href="<?php echo $view['router']->path('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $email['lead_id'])); ?>" data-toggle="ajax">
+                        <a class="btn btn-sm btn-success"  href="<?php echo $view['router']->path('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $email['lead_id']]); ?>" data-toggle="ajax">
                             <span class="fa <?php echo isset($icons['lead']) ? $icons['lead'] : ''; ?>"></span>
                             <?php echo $email['lead_name']; ?>
                         </a>
diff --git a/app/bundles/DashboardBundle/Views/Widget/detail.html.php b/app/bundles/DashboardBundle/Views/Widget/detail.html.php
index 39d48985cae..b5bd8870d0f 100644
--- a/app/bundles/DashboardBundle/Views/Widget/detail.html.php
+++ b/app/bundles/DashboardBundle/Views/Widget/detail.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
-<div class="card" style="height: <?php echo ($widget->getHeight() ? ($widget->getHeight() - 10) . 'px' : '300px') ?>">
+<div class="card" style="height: <?php echo $widget->getHeight() ? ($widget->getHeight() - 10).'px' : '300px' ?>">
     <div class="card-header">
         <h4><?php echo $widget->getName(); ?></h4>
         <?php if ($widget->getId()) : ?>
@@ -18,7 +19,7 @@
             </a>
             <ul class="dropdown-menu dropdown-menu-right">
                 <li>
-                    <a  href="<?php echo $this->container->get('router')->generate('mautic_dashboard_action', array('objectAction' => 'edit', 'objectId' => $widget->getId())); ?>"
+                    <a  href="<?php echo $this->container->get('router')->generate('mautic_dashboard_action', ['objectAction' => 'edit', 'objectId' => $widget->getId()]); ?>"
                         data-toggle="ajaxmodal"
                         data-target="#MauticSharedModal"
                         data-header="<?php echo $view['translator']->trans('mautic.dashboard.widget.header.edit'); ?>">
@@ -27,7 +28,7 @@
                 </li>
                 <li role="separator" class="divider"></li>
                 <li  class="dropdown-header">
-                    <?php echo $view['translator']->trans('mautic.dashboard.widget.load.time', array('%time%' => round($widget->getLoadTime() * 1000, 1))); ?>
+                    <?php echo $view['translator']->trans('mautic.dashboard.widget.load.time', ['%time%' => round($widget->getLoadTime() * 1000, 1)]); ?>
                 </li>
                 <li  class="dropdown-header">
                     <?php if ($widget->isCached()) : ?>
@@ -38,7 +39,7 @@
                 </li>
                 <li role="separator" class="divider"></li>
                 <li>
-                    <a  href="<?php echo $this->container->get('router')->generate('mautic_dashboard_action', array('objectAction' => 'delete', 'objectId' => $widget->getId())); ?>"
+                    <a  href="<?php echo $this->container->get('router')->generate('mautic_dashboard_action', ['objectAction' => 'delete', 'objectId' => $widget->getId()]); ?>"
                         data-header="<?php echo $view['translator']->trans('mautic.dashboard.widget.header.delete'); ?>"
                         class="remove-widget">
                         <i class="fa fa-remove"></i> Remove
diff --git a/app/bundles/DashboardBundle/Views/Widget/form.html.php b/app/bundles/DashboardBundle/Views/Widget/form.html.php
index 0832cc97b13..75b174a4f21 100644
--- a/app/bundles/DashboardBundle/Views/Widget/form.html.php
+++ b/app/bundles/DashboardBundle/Views/Widget/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('mauticContent', 'widget');
 $userId = $form->vars['data']->getId();
 if (!empty($userId)) {
diff --git a/app/bundles/DynamicContentBundle/Config/config.php b/app/bundles/DynamicContentBundle/Config/config.php
index 444f0553fec..f2596f24fa0 100644
--- a/app/bundles/DynamicContentBundle/Config/config.php
+++ b/app/bundles/DynamicContentBundle/Config/config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -13,9 +13,9 @@
         'main' => [
             'items' => [
                 'mautic.dynamicContent.dynamicContent' => [
-                    'route' => 'mautic_dynamicContent_index',
-                    'access' => ['dynamicContent:dynamicContents:viewown', 'dynamicContent:dynamicContents:viewother'],
-                    'parent' => 'mautic.core.components',
+                    'route'    => 'mautic_dynamicContent_index',
+                    'access'   => ['dynamicContent:dynamicContents:viewown', 'dynamicContent:dynamicContents:viewother'],
+                    'parent'   => 'mautic.core.components',
                     'priority' => 90,
                 ],
             ],
@@ -24,79 +24,79 @@
     'routes' => [
         'main' => [
             'mautic_dynamicContent_index' => [
-                'path' => '/dwc/{page}',
+                'path'       => '/dwc/{page}',
                 'controller' => 'MauticDynamicContentBundle:DynamicContent:index',
             ],
             'mautic_dynamicContent_action' => [
-                'path' => '/dwc/{objectAction}/{objectId}',
+                'path'       => '/dwc/{objectAction}/{objectId}',
                 'controller' => 'MauticDynamicContentBundle:DynamicContent:execute',
             ],
         ],
         'public' => [
             'mautic_api_dynamicContent_index' => [
-                'path' => '/dwc',
-                'controller' => 'MauticDynamicContentBundle:Api\DynamicContentApi:getEntities'
+                'path'       => '/dwc',
+                'controller' => 'MauticDynamicContentBundle:Api\DynamicContentApi:getEntities',
             ],
             'mautic_api_dynamicContent_action' => [
-                'path' => '/dwc/{objectAlias}',
-                'controller' => 'MauticDynamicContentBundle:Api\DynamicContentApi:process'
-            ]
+                'path'       => '/dwc/{objectAlias}',
+                'controller' => 'MauticDynamicContentBundle:Api\DynamicContentApi:process',
+            ],
         ],
     ],
     'services' => [
         'events' => [
             'mautic.dynamicContent.campaignbundle.subscriber' => [
-                'class' => 'Mautic\DynamicContentBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\DynamicContentBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.lead.model.lead',
                     'mautic.dynamicContent.model.dynamicContent',
-                    'session'
+                    'session',
                 ],
             ],
             'mautic.dynamicContent.js.subscriber' => [
-                'class' => 'Mautic\DynamicContentBundle\EventListener\BuildJsSubscriber'
+                'class' => 'Mautic\DynamicContentBundle\EventListener\BuildJsSubscriber',
             ],
             'mautic.dynamicContent.subscriber' => [
-                'class' => 'Mautic\DynamicContentBundle\EventListener\DynamicContentSubscriber',
+                'class'     => 'Mautic\DynamicContentBundle\EventListener\DynamicContentSubscriber',
                 'arguments' => [
                     'mautic.page.model.trackable',
                     'mautic.page.helper.token',
                     'mautic.asset.helper.token',
-                    'mautic.core.model.auditlog'
-                ]
+                    'mautic.core.model.auditlog',
+                ],
             ],
         ],
         'forms' => [
             'mautic.form.type.dwc' => [
-                'class' => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentType',
+                'class'     => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentType',
                 'arguments' => [
                     'doctrine.orm.entity_manager',
                 ],
                 'alias' => 'dwc',
             ],
             'mautic.form.type.dwcsend_list' => [
-                'class' => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentSendType',
+                'class'     => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentSendType',
                 'arguments' => [
                     'router',
                 ],
                 'alias' => 'dwcsend_list',
             ],
             'mautic.form.type.dwcdecision_list' => [
-                'class' => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentDecisionType',
+                'class'     => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentDecisionType',
                 'arguments' => [
                     'router',
                 ],
                 'alias' => 'dwcdecision_list',
             ],
             'mautic.form.type.dwc_list' => [
-                'class' => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentListType',
+                'class'     => 'Mautic\DynamicContentBundle\Form\Type\DynamicContentListType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'dwc_list',
+                'alias'     => 'dwc_list',
             ],
         ],
         'models' => [
             'mautic.dynamicContent.model.dynamicContent' => [
-                'class' => 'Mautic\DynamicContentBundle\Model\DynamicContentModel',
+                'class'     => 'Mautic\DynamicContentBundle\Model\DynamicContentModel',
                 'arguments' => [
 
                 ],
@@ -108,8 +108,8 @@
                 'arguments' => [
                     'mautic.dynamicContent.model.dynamicContent',
                     'mautic.campaign.model.event',
-                    'event_dispatcher'
-                ]
-            ],]
+                    'event_dispatcher',
+                ],
+            ], ],
     ],
 ];
diff --git a/app/bundles/DynamicContentBundle/Controller/Api/DynamicContentApiController.php b/app/bundles/DynamicContentBundle/Controller/Api/DynamicContentApiController.php
index e38cdbf060c..a4089e01510 100644
--- a/app/bundles/DynamicContentBundle/Controller/Api/DynamicContentApiController.php
+++ b/app/bundles/DynamicContentBundle/Controller/Api/DynamicContentApiController.php
@@ -1,22 +1,17 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Controller\Api;
 
-use Mautic\CampaignBundle\Model\EventModel;
 use Mautic\CoreBundle\Controller\CommonController;
-use Mautic\CoreBundle\Event\TokenReplacementEvent;
-use Mautic\DynamicContentBundle\DynamicContentEvents;
 use Mautic\DynamicContentBundle\Entity\DynamicContent;
-use Mautic\DynamicContentBundle\Event\DynamicContentEvent;
-use Mautic\DynamicContentBundle\Model\DynamicContentModel;
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
@@ -45,7 +40,7 @@ public function getAction($objectAlias)
     {
         $lead    = $this->getModel('lead')->getCurrentLead();
         $content = $this->get('mautic.helper.dynamicContent')->getDynamicContentForLead($objectAlias, $lead);
-        
+
         return empty($content) ? new Response('', Response::HTTP_NO_CONTENT) : new Response($content);
     }
 }
diff --git a/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php b/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php
index 22a8472b720..63acb827a2f 100644
--- a/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php
+++ b/app/bundles/DynamicContentBundle/Controller/DynamicContentController.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Controller;
 
-use Mautic\DynamicContentBundle\Entity\DynamicContent;
 use Mautic\CoreBundle\Controller\FormController;
+use Mautic\DynamicContentBundle\Entity\DynamicContent;
 use Mautic\DynamicContentBundle\Model\DynamicContentModel;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
@@ -97,7 +98,7 @@ public function indexAction($page = 1)
                     'mauticContent' => 'dynamicContent',
                     'route'         => $this->generateUrl('mautic_dynamicContent_index', ['page' => $page]),
                 ],
-                'viewParameters'  => [
+                'viewParameters' => [
                     'searchValue' => $search,
                     'items'       => $entities,
                     'categories'  => $categories,
@@ -161,10 +162,10 @@ public function newAction($entity = null)
                     if ($form->get('buttons')->get('save')->isClicked()) {
                         $viewParameters = [
                             'objectAction' => 'view',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ];
-                        $retUrl         = $this->generateUrl('mautic_dynamicContent_action', $viewParameters);
-                        $template       = 'MauticDynamicContentBundle:DynamicContent:view';
+                        $retUrl   = $this->generateUrl('mautic_dynamicContent_action', $viewParameters);
+                        $template = 'MauticDynamicContentBundle:DynamicContent:view';
                     } else {
                         //return edit view so that all the session stuff is loaded
                         return $this->editAction($entity->getId(), true);
@@ -190,7 +191,7 @@ public function newAction($entity = null)
                         'updateSelect'       => $form['updateSelect']->getData(),
                         'dynamicContentId'   => $entity->getId(),
                         'dynamicContentName' => $entity->getName(),
-                        'dynamicContentLang' => $entity->getLanguage()
+                        'dynamicContentLang' => $entity->getLanguage(),
                     ]
                 );
             }
@@ -201,7 +202,7 @@ public function newAction($entity = null)
                         'returnUrl'       => $retUrl,
                         'viewParameters'  => $viewParameters,
                         'contentTemplate' => $template,
-                        'passthroughVars' => $passthrough
+                        'passthroughVars' => $passthrough,
                     ]
                 );
             } elseif ($valid && !$cancelled) {
@@ -213,11 +214,11 @@ public function newAction($entity = null)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form' => $this->setFormTheme($form, 'MauticDynamicContentBundle:DynamicContent:form.html.php'),
                 ],
                 'contentTemplate' => 'MauticDynamicContentBundle:DynamicContent:form.html.php',
-                'passthroughVars' => $passthrough
+                'passthroughVars' => $passthrough,
             ]
         );
     }
@@ -317,7 +318,7 @@ public function editAction($objectId, $ignorePost = false)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form'          => $this->setFormTheme($form, 'MauticDynamicContentBundle:DynamicContent:form.html.php'),
                     'currentListId' => $objectId,
                 ],
@@ -361,7 +362,7 @@ public function viewAction($objectId)
                         'activeLink'    => '#mautic_dynamicContent_index',
                         'mauticContent' => 'dynamicContent',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.dynamicContent.error.notfound',
@@ -379,8 +380,8 @@ public function viewAction($objectId)
             return $this->accessDenied();
         }
 
-        /** @var DynamicContent $parent */
-        /** @var DynamicContent[] $children */
+        /* @var DynamicContent $parent */
+        /* @var DynamicContent[] $children */
         list($translationParent, $translationChildren) = $entity->getTranslations();
 
         // Audit Log
@@ -402,23 +403,23 @@ public function viewAction($objectId)
 
         return $this->delegateView(
             [
-                'returnUrl' => $action,
+                'returnUrl'       => $action,
                 'contentTemplate' => 'MauticDynamicContentBundle:DynamicContent:details.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_dynamicContent_index',
                     'mauticContent' => 'dynamicContent',
                 ],
-                'viewParameters'  => [
-                    'entity'        => $entity,
-                    'permissions'   => $this->getPermissions(),
-                    'logs'          => $logs,
-                    'translations'  => [
+                'viewParameters' => [
+                    'entity'       => $entity,
+                    'permissions'  => $this->getPermissions(),
+                    'logs'         => $logs,
+                    'translations' => [
                         'parent'   => $translationParent,
-                        'children' => $translationChildren
+                        'children' => $translationChildren,
                     ],
                     'trackables'    => $trackables,
                     'entityViews'   => $entityViews,
-                    'dateRangeForm' => $dateRangeForm->createView()
+                    'dateRangeForm' => $dateRangeForm->createView(),
                 ],
             ]
         );
diff --git a/app/bundles/DynamicContentBundle/DynamicContentEvents.php b/app/bundles/DynamicContentBundle/DynamicContentEvents.php
index 62606473ab8..429505c7ff7 100644
--- a/app/bundles/DynamicContentBundle/DynamicContentEvents.php
+++ b/app/bundles/DynamicContentBundle/DynamicContentEvents.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle;
 
 /**
diff --git a/app/bundles/DynamicContentBundle/Entity/DynamicContent.php b/app/bundles/DynamicContentBundle/Entity/DynamicContent.php
index b4dfc1743ce..a557fcfc7a6 100644
--- a/app/bundles/DynamicContentBundle/Entity/DynamicContent.php
+++ b/app/bundles/DynamicContentBundle/Entity/DynamicContent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -76,7 +77,7 @@ class DynamicContent extends FormEntity implements VariantEntityInterface, Trans
      */
     public function __construct()
     {
-        $this->stats = new ArrayCollection();
+        $this->stats           = new ArrayCollection();
         $this->variantChildren = new ArrayCollection();
     }
 
@@ -85,16 +86,16 @@ public function __construct()
      */
     public function __clone()
     {
-        $this->id = null;
-        $this->sentCount = 0;
-        $this->stats = new ArrayCollection();
+        $this->id              = null;
+        $this->sentCount       = 0;
+        $this->stats           = new ArrayCollection();
         $this->variantChildren = new ArrayCollection();
 
         parent::__clone();
     }
 
     /**
-     * Clear stats
+     * Clear stats.
      */
     public function clearStats()
     {
@@ -174,12 +175,12 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
      */
     protected function isChanged($prop, $val)
     {
-        $getter = 'get'.ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
 
         if ($prop == 'variantParent' || $prop == 'translationParent' || $prop == 'category') {
             $currentId = ($current) ? $current->getId() : '';
-            $newId = ($val) ? $val->getId() : null;
+            $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
                 $this->changes[$prop] = [$currentId, $newId];
             }
diff --git a/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php b/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php
index 03c8dc1f5a2..04cab4d0a96 100644
--- a/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php
+++ b/app/bundles/DynamicContentBundle/Entity/DynamicContentLeadData.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
@@ -56,7 +57,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
         $builder->setTable('dynamic_content_lead_data');
 
         $builder->addIdColumns(false, false);
-        
+
         $builder->addDateAdded(true);
 
         $builder->createManyToOne('lead', 'Mautic\LeadBundle\Entity\Lead')
diff --git a/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php b/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php
index 1d22948fc7a..1fbca9b2eda 100644
--- a/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php
+++ b/app/bundles/DynamicContentBundle/Entity/DynamicContentRepository.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Entity;
 
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
@@ -49,17 +49,17 @@ public function getEntities($args = [])
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
     {
-        $command = $filter->command;
-        $unique = $this->generateRandomParameterName();
+        $command         = $filter->command;
+        $unique          = $this->generateRandomParameterName();
         $returnParameter = true; //returning a parameter that is not used will lead to a Doctrine error
-        $expr = false;
+        $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq('e.isPublished', ":$unique");
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
                 $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq('e.isPublished', ":$unique");
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
                 $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
@@ -70,19 +70,19 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->eq('IDENTITY(e.createdBy)', $this->currentUser->getId());
+                $expr            = $q->expr()->eq('IDENTITY(e.createdBy)', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.category'):
-                $expr = $q->expr()->like('e.alias', ":$unique");
+                $expr           = $q->expr()->like('e.alias', ":$unique");
                 $filter->strict = true;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.lang'):
-                $langUnique = $this->generateRandomParameterName();
-                $langValue = $filter->string.'_%';
+                $langUnique      = $this->generateRandomParameterName();
+                $langValue       = $filter->string.'_%';
                 $forceParameters = [
                     $langUnique => $langValue,
-                    $unique => $filter->string,
+                    $unique     => $filter->string,
                 ];
                 $expr = $q->expr()->orX(
                     $q->expr()->eq('e.language', ":$unique"),
@@ -100,7 +100,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         } elseif (!$returnParameter) {
             $parameters = [];
         } else {
-            $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+            $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
             $parameters = ["$unique" => $string];
         }
 
diff --git a/app/bundles/DynamicContentBundle/Entity/Stat.php b/app/bundles/DynamicContentBundle/Entity/Stat.php
index 01496cca008..3ee412e6a71 100644
--- a/app/bundles/DynamicContentBundle/Entity/Stat.php
+++ b/app/bundles/DynamicContentBundle/Entity/Stat.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -11,19 +11,15 @@
 namespace Mautic\DynamicContentBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 
 /**
- * Class Stat
- *
- * @package Mautic\DynamicContentBundle\Entity
+ * Class Stat.
  */
 class Stat
 {
-
     /**
      * @var int
      */
@@ -77,14 +73,14 @@ class Stat
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('dynamic_content_stats')
             ->setCustomRepositoryClass('Mautic\DynamicContentBundle\Entity\StatRepository')
-            ->addIndex(array('dynamic_content_id', 'lead_id'), 'stat_dynamic_content_search')
-            ->addIndex(array('source', 'source_id'), 'stat_dynamic_content_source_search');
+            ->addIndex(['dynamic_content_id', 'lead_id'], 'stat_dynamic_content_search')
+            ->addIndex(['source', 'source_id'], 'stat_dynamic_content_source_search');
 
         $builder->addId();
 
@@ -120,7 +116,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -128,7 +124,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('stat')
             ->addProperties(
-                array(
+                [
                     'id',
                     'dateSent',
                     'source',
@@ -136,8 +132,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'lastSent',
                     'sourceId',
                     'lead',
-                    'dynamicContent'
-                )
+                    'dynamicContent',
+                ]
             )
             ->build();
     }
@@ -149,17 +145,17 @@ public function addSentDetails($details)
     {
         $this->sentDetails[] = $details;
 
-        $this->sentCount++;
+        ++$this->sentCount;
     }
 
     /**
-     * Up the sent count
+     * Up the sent count.
      *
      * @return Stat
      */
     public function upSentCount()
     {
-        $count = (int) $this->sentCount + 1;
+        $count           = (int) $this->sentCount + 1;
         $this->sentCount = $count;
 
         return $this;
diff --git a/app/bundles/DynamicContentBundle/Entity/StatRepository.php b/app/bundles/DynamicContentBundle/Entity/StatRepository.php
index ccc20a4fbac..f4ee9890c69 100644
--- a/app/bundles/DynamicContentBundle/Entity/StatRepository.php
+++ b/app/bundles/DynamicContentBundle/Entity/StatRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -10,22 +10,19 @@
 
 namespace Mautic\DynamicContentBundle\Entity;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\LeadBundle\Entity\TimelineTrait;
 
 /**
- * Class StatRepository
- *
- * @package Mautic\DynamicContentBundle\Entity
+ * Class StatRepository.
  */
 class StatRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * @param      $dynamicContentId
+     * @param   $dynamicContentId
      *
      * @return array
      */
@@ -65,7 +62,7 @@ public function getSentCount($dynamicContentIds = null)
 
         if ($dynamicContentIds) {
             if (!is_array($dynamicContentIds)) {
-                $dynamicContentIds = array((int) $dynamicContentIds);
+                $dynamicContentIds = [(int) $dynamicContentIds];
             }
             $q->where(
                 $q->expr()->in('s.dynamic_content_id', $dynamicContentIds)
@@ -78,7 +75,7 @@ public function getSentCount($dynamicContentIds = null)
     }
 
     /**
-     * Get sent counts based grouped by dynamic content Id
+     * Get sent counts based grouped by dynamic content Id.
      *
      * @param array     $dynamicContentIds
      * @param \DateTime $fromDate
@@ -106,7 +103,7 @@ public function getSentCounts($dynamicContentIds = [], \DateTime $fromDate = nul
         //get a total number of sent emails first
         $results = $q->execute()->fetchAll();
 
-        $counts = array();
+        $counts = [];
 
         foreach ($results as $r) {
             $counts[$r['dynamic_content_id']] = $r['sent_count'];
@@ -116,12 +113,13 @@ public function getSentCounts($dynamicContentIds = [], \DateTime $fromDate = nul
     }
 
     /**
-     * Get a lead's dynamic content stat
+     * Get a lead's dynamic content stat.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -136,15 +134,15 @@ public function getLeadStats($leadId, array $options = [])
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere(
-                $query->expr()->like('dc.name', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('dc.name', $query->expr()->literal('%'.$options['search'].'%'))
             );
         }
 
-        return $this->getTimelineResults($query, $options, 'dc.name', 's.date_sent', ['sentDetails'], ['dateSent'] );
+        return $this->getTimelineResults($query, $options, 'dc.name', 's.date_sent', ['sentDetails'], ['dateSent']);
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -152,14 +150,14 @@ public function getLeadStats($leadId, array $options = [])
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'dynamic_content_stats')
+        $q->update(MAUTIC_TABLE_PREFIX.'dynamic_content_stats')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 
     /**
-     * Delete a stat
+     * Delete a stat.
      *
      * @param $id
      */
diff --git a/app/bundles/DynamicContentBundle/Event/DynamicContentEvent.php b/app/bundles/DynamicContentBundle/Event/DynamicContentEvent.php
index d745e0eff57..defbfe8c241 100644
--- a/app/bundles/DynamicContentBundle/Event/DynamicContentEvent.php
+++ b/app/bundles/DynamicContentBundle/Event/DynamicContentEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
@@ -16,14 +17,14 @@ class DynamicContentEvent extends CommonEvent
 {
     /**
      * DynamicContentEvent constructor.
-     * 
+     *
      * @param DynamicContent $entity
      * @param bool           $isNew
      */
     public function __construct(DynamicContent $entity, $isNew = false)
     {
         $this->entity = $entity;
-        $this->isNew = $isNew;
+        $this->isNew  = $isNew;
     }
 
     /**
diff --git a/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php b/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php
index c51a41d1f1a..5bb27b76cac 100644
--- a/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/DynamicContentBundle/EventListener/BuildJsSubscriber.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\EventListener;
 
 use Mautic\CoreBundle\CoreEvents;
@@ -15,7 +16,7 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
- * Class BuildJsSubscriber
+ * Class BuildJsSubscriber.
  */
 class BuildJsSubscriber extends CommonSubscriber
 {
@@ -25,18 +26,16 @@ class BuildJsSubscriber extends CommonSubscriber
     public static function getSubscribedEvents()
     {
         return [
-            CoreEvents::BUILD_MAUTIC_JS => array('onBuildJs', 200)
+            CoreEvents::BUILD_MAUTIC_JS => ['onBuildJs', 200],
         ];
     }
 
     /**
      * Adds the MauticJS definition and core
      * JS functions for use in Bundles. This
-     * must retain top priority of 1000
+     * must retain top priority of 1000.
      *
      * @param BuildJsEvent $event
-     *
-     * @return void
      */
     public function onBuildJs(BuildJsEvent $event)
     {
diff --git a/app/bundles/DynamicContentBundle/EventListener/CampaignSubscriber.php b/app/bundles/DynamicContentBundle/EventListener/CampaignSubscriber.php
index fb1a25c4403..34b4c8b14ba 100644
--- a/app/bundles/DynamicContentBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/DynamicContentBundle/EventListener/CampaignSubscriber.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\EventListener;
 
+use Mautic\CampaignBundle\CampaignEvents;
+use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\Event\TokenReplacementEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
-use Mautic\CampaignBundle\CampaignEvents;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\DynamicContentBundle\DynamicContentEvents;
 use Mautic\DynamicContentBundle\Entity\DynamicContent;
 use Mautic\DynamicContentBundle\Model\DynamicContentModel;
@@ -49,9 +49,9 @@ class CampaignSubscriber extends CommonSubscriber
      */
     public function __construct(LeadModel $leadModel, DynamicContentModel $dynamicContentModel, Session $session)
     {
-        $this->leadModel = $leadModel;
+        $this->leadModel           = $leadModel;
         $this->dynamicContentModel = $dynamicContentModel;
-        $this->session = $session;
+        $this->session             = $session;
     }
 
     /**
@@ -60,9 +60,9 @@ public function __construct(LeadModel $leadModel, DynamicContentModel $dynamicCo
     public static function getSubscribedEvents()
     {
         return [
-            CampaignEvents::CAMPAIGN_ON_BUILD => ['onCampaignBuild', 0],
+            CampaignEvents::CAMPAIGN_ON_BUILD                  => ['onCampaignBuild', 0],
             DynamicContentEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0],
-            DynamicContentEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerAction', 0],
+            DynamicContentEvents::ON_CAMPAIGN_TRIGGER_ACTION   => ['onCampaignTriggerAction', 0],
         ];
     }
 
@@ -80,7 +80,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
                 'timelineTemplate'    => 'MauticDynamicContentBundle:SubscribedEvents\Timeline:index.html.php',
                 'hideTriggerMode'     => true,
                 'associatedDecisions' => ['dwc.decision'],
-                'anchorRestrictions'  => ['decision.inaction']
+                'anchorRestrictions'  => ['decision.inaction'],
             ]
         );
 
@@ -115,9 +115,10 @@ public function onCampaignTriggerDecision(CampaignExecutionEvent $event)
                 $this->dynamicContentModel->setSlotContentForLead($defaultDwc, $lead, $eventDetails);
             }
 
-            $this->session->set('dwc.slot_name.lead.' . $lead->getId(), $eventDetails);
+            $this->session->set('dwc.slot_name.lead.'.$lead->getId(), $eventDetails);
 
             $event->stopPropagation();
+
             return $event->setResult(true);
         }
     }
@@ -127,9 +128,9 @@ public function onCampaignTriggerDecision(CampaignExecutionEvent $event)
      */
     public function onCampaignTriggerAction(CampaignExecutionEvent $event)
     {
-        $eventConfig  = $event->getConfig();
-        $lead         = $event->getLead();
-        $slot         = $this->session->get('dwc.slot_name.lead.'.$lead->getId());
+        $eventConfig = $event->getConfig();
+        $lead        = $event->getLead();
+        $slot        = $this->session->get('dwc.slot_name.lead.'.$lead->getId());
 
         $dwc = $this->dynamicContentModel->getRepository()->getEntity($eventConfig['dynamicContent']);
 
diff --git a/app/bundles/DynamicContentBundle/EventListener/DynamicContentSubscriber.php b/app/bundles/DynamicContentBundle/EventListener/DynamicContentSubscriber.php
index d56a84186a7..ce03cf5b5c1 100644
--- a/app/bundles/DynamicContentBundle/EventListener/DynamicContentSubscriber.php
+++ b/app/bundles/DynamicContentBundle/EventListener/DynamicContentSubscriber.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\AssetBundle\Helper\TokenHelper as AssetTokenHelper;
 use Mautic\CoreBundle\Event as MauticEvents;
-use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\DynamicContentBundle\DynamicContentEvents;
 use Mautic\DynamicContentBundle\Event as Events;
@@ -19,13 +20,10 @@
 use Mautic\LeadBundle\Helper\TokenHelper;
 use Mautic\PageBundle\Entity\Trackable;
 use Mautic\PageBundle\Helper\TokenHelper as PageTokenHelper;
-use Mautic\AssetBundle\Helper\TokenHelper as AssetTokenHelper;
 use Mautic\PageBundle\Model\TrackableModel;
 
 /**
- * Class DynamicContentSubscriber
- *
- * @package Mautic\DynamicContentBundle\EventListener
+ * Class DynamicContentSubscriber.
  */
 class DynamicContentSubscriber extends CommonSubscriber
 {
@@ -62,28 +60,27 @@ public function __construct(
         PageTokenHelper $pageTokenHelper,
         AssetTokenHelper $assetTokenHelper,
         AuditLogModel $auditLogModel
-    )
-    {
-        $this->trackableModel = $trackableModel;
-        $this->pageTokenHelper = $pageTokenHelper;
+    ) {
+        $this->trackableModel   = $trackableModel;
+        $this->pageTokenHelper  = $pageTokenHelper;
         $this->assetTokenHelper = $assetTokenHelper;
-        $this->auditLogModel = $auditLogModel;
+        $this->auditLogModel    = $auditLogModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
-            DynamicContentEvents::POST_SAVE    => ['onPostSave', 0],
-            DynamicContentEvents::POST_DELETE  => ['onDelete', 0],
-            DynamicContentEvents::TOKEN_REPLACEMENT => ['onTokenReplacement', 0]
+            DynamicContentEvents::POST_SAVE         => ['onPostSave', 0],
+            DynamicContentEvents::POST_DELETE       => ['onDelete', 0],
+            DynamicContentEvents::TOKEN_REPLACEMENT => ['onTokenReplacement', 0],
         ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\DynamicContentEvent $event
      */
@@ -92,30 +89,30 @@ public function onPostSave(Events\DynamicContentEvent $event)
         $entity = $event->getDynamicContent();
         if ($details = $event->getChanges()) {
             $log = [
-                "bundle"    => "dynamicContent",
-                "object"    => "dynamicContent",
-                "objectId"  => $entity->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details
+                'bundle'   => 'dynamicContent',
+                'object'   => 'dynamicContent',
+                'objectId' => $entity->getId(),
+                'action'   => ($event->isNew()) ? 'create' : 'update',
+                'details'  => $details,
             ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\DynamicContentEvent $event
      */
     public function onDelete(Events\DynamicContentEvent $event)
     {
         $entity = $event->getDynamicContent();
-        $log = [
-            "bundle"     => "dynamicContent",
-            "object"     => "dynamicContent",
-            "objectId"   => $entity->getId(),
-            "action"     => "delete",
-            "details"    => ['name' => $entity->getName()]
+        $log    = [
+            'bundle'   => 'dynamicContent',
+            'object'   => 'dynamicContent',
+            'objectId' => $entity->getId(),
+            'action'   => 'delete',
+            'details'  => ['name' => $entity->getName()],
         ];
         $this->auditLogModel->writeToLog($log);
     }
@@ -123,8 +120,8 @@ public function onDelete(Events\DynamicContentEvent $event)
     public function onTokenReplacement(MauticEvents\TokenReplacementEvent $event)
     {
         /** @var Lead $lead */
-        $lead = $event->getLead();
-        $content = $event->getContent();
+        $lead         = $event->getLead();
+        $content      = $event->getContent();
         $clickthrough = $event->getClickthrough();
 
         if ($content) {
@@ -142,7 +139,7 @@ public function onTokenReplacement(MauticEvents\TokenReplacementEvent $event)
             );
 
             /**
-             * @var string $token
+             * @var string
              * @var Trackable $trackable
              */
             foreach ($trackables as $token => $trackable) {
@@ -154,4 +151,4 @@ public function onTokenReplacement(MauticEvents\TokenReplacementEvent $event)
             $event->setContent($content);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/DynamicContentBundle/EventListener/LeadSubscriber.php b/app/bundles/DynamicContentBundle/EventListener/LeadSubscriber.php
index 918f8e2d064..35e15ac4930 100644
--- a/app/bundles/DynamicContentBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/DynamicContentBundle/EventListener/LeadSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -16,26 +16,23 @@
 use Mautic\LeadBundle\LeadEvents;
 
 /**
- * Class LeadSubscriber
- *
- * @package Mautic\DynamicContent\EventListener
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             LeadEvents::TIMELINE_ON_GENERATE => ['onTimelineGenerate', 0],
-            LeadEvents::LEAD_POST_MERGE      => ['onLeadMerge', 0]
+            LeadEvents::LEAD_POST_MERGE      => ['onLeadMerge', 0],
         ];
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -47,7 +44,6 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
         $event->addEventType($eventTypeKey, $eventTypeNameSent);
 
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
@@ -67,22 +63,22 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                 if ($stat['dateSent']) {
                     $event->addEvent(
                         [
-                            'event'           => $eventTypeKey,
-                            'eventLabel'      => [
+                            'event'      => $eventTypeKey,
+                            'eventLabel' => [
                                 'label' => $stat['name'],
                                 'href'  => $this->router->generate(
                                     'mautic_dynamicContent_action',
                                     ['objectId' => $stat['dynamic_content_id'], 'objectAction' => 'view']
-                                )
+                                ),
                             ],
-                            'eventType'       => $eventTypeNameSent,
-                            'timestamp'       => $stat['dateSent'],
-                            'extra'           => [
+                            'eventType' => $eventTypeNameSent,
+                            'timestamp' => $stat['dateSent'],
+                            'extra'     => [
                                 'stat' => $stat,
-                                'type' => 'sent'
+                                'type' => 'sent',
                             ],
                             'contentTemplate' => 'MauticDynamicContentBundle:SubscribedEvents\Timeline:index.html.php',
-                            'icon'            => 'fa-envelope'
+                            'icon'            => 'fa-envelope',
                         ]
                     );
                 }
@@ -100,4 +96,4 @@ public function onLeadMerge(LeadMergeEvent $event)
             $event->getVictor()->getId()
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentDecisionType.php b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentDecisionType.php
index b787e101e74..102066caaa0 100644
--- a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentDecisionType.php
+++ b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentDecisionType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Form\Type;
 
 use Symfony\Component\Form\FormBuilderInterface;
@@ -23,9 +24,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'dwc_slot_name',
             'text',
             [
-                'label'       => 'mautic.dynamicContent.send.slot_name',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.dynamicContent.send.slot_name',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
                     'tooltip' => 'mautic.dynamicContent.send.slot_name.tooltip',
                 ],
@@ -42,9 +43,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'dynamicContent',
             'dwc_list',
             [
-                'label'       => 'mautic.dynamicContent.send.selectDynamicContents.default',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.dynamicContent.send.selectDynamicContents.default',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.dynamicContent.choose.dynamicContents',
                     'onchange' => 'Mautic.disabledDynamicContentAction()',
diff --git a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentListType.php b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentListType.php
index b9306a79d35..6eef940c637 100644
--- a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentListType.php
+++ b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentListType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
@@ -47,7 +48,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
         $resolver->setDefaults(
             [
-                'choices'     => function (Options $options) use ($repo, $viewOther) {
+                'choices' => function (Options $options) use ($repo, $viewOther) {
                     static $choices;
 
                     if (is_array($choices)) {
@@ -74,7 +75,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'empty_value' => function (Options $options) {
                     return (empty($options['choices'])) ? 'mautic.dynamicContent.no.dynamicContent.note' : 'mautic.core.form.chooseone';
                 },
-                'disabled'    => function (Options $options) {
+                'disabled' => function (Options $options) {
                     return empty($options['choices']);
                 },
             ]
diff --git a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentSendType.php b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentSendType.php
index 143fda365a9..aff69dad715 100644
--- a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentSendType.php
+++ b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentSendType.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Form\Type;
 
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
  * Class DynamicContentSendType.
@@ -28,7 +29,7 @@ class DynamicContentSendType extends AbstractType
     /**
      * DynamicContentSendType constructor.
      *
-     * @param RouterInterface   $router
+     * @param RouterInterface $router
      */
     public function __construct(RouterInterface $router)
     {
@@ -45,16 +46,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'dynamicContent',
             'dwc_list',
             [
-                'label'         => 'mautic.dynamicContent.send.selectDynamicContents',
-                'label_attr'    => ['class' => 'control-label'],
-                'attr'          => [
+                'label'      => 'mautic.dynamicContent.send.selectDynamicContents',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.dynamicContent.choose.dynamicContents',
                     'onchange' => 'Mautic.disabledDynamicContentAction()',
                 ],
-                'multiple'      => false,
-                'required'      => true,
-                'constraints'   => [
+                'multiple'    => false,
+                'required'    => true,
+                'constraints' => [
                     new NotBlank(['message' => 'mautic.core.value.required']),
                 ],
             ]
@@ -80,7 +81,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'onclick' => 'Mautic.loadNewDynamicContentWindow({
                             "windowUrl": "'.$windowUrl.'"
                         })',
-                        'icon'    => 'fa fa-plus',
+                        'icon' => 'fa fa-plus',
                     ],
                 ]
             );
diff --git a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentType.php b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentType.php
index 34a88691a50..436c34520ab 100644
--- a/app/bundles/DynamicContentBundle/Form/Type/DynamicContentType.php
+++ b/app/bundles/DynamicContentBundle/Form/Type/DynamicContentType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Form\Type;
 
 use Doctrine\ORM\EntityManager;
@@ -79,7 +80,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class' => 'form-control',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -94,8 +95,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false,
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
             ]
         );
 
@@ -110,8 +111,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false,
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
             ]
         );
 
@@ -126,7 +127,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'   => 'form-control editor editor-advanced editor-builder-tokens',
                     'rows'    => '15',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -136,9 +137,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'translationParent',
                 'dwc_list',
                 [
-                    'label'       => 'mautic.core.form.translation_parent',
-                    'label_attr'  => ['class' => 'control-label'],
-                    'attr'        => [
+                    'label'      => 'mautic.core.form.translation_parent',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'   => 'form-control',
                         'tooltip' => 'mautic.core.form.translation_parent.help',
                     ],
@@ -169,7 +170,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'hidden',
                 [
                     'data'   => $options['update_select'],
-                    'mapped' => false
+                    'mapped' => false,
                 ]
             );
         } else {
diff --git a/app/bundles/DynamicContentBundle/Helper/DynamicContentHelper.php b/app/bundles/DynamicContentBundle/Helper/DynamicContentHelper.php
index 6ddd0dff97b..197d7b9ab6a 100644
--- a/app/bundles/DynamicContentBundle/Helper/DynamicContentHelper.php
+++ b/app/bundles/DynamicContentBundle/Helper/DynamicContentHelper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -39,9 +39,9 @@ class DynamicContentHelper
     /**
      * DynamicContentHelper constructor.
      *
-     * @param DynamicContentModel           $dynamicContentModel
-     * @param EventModel                    $campaignEventModel
-     * @param EventDispatcherInterface      $dispatcher
+     * @param DynamicContentModel      $dynamicContentModel
+     * @param EventModel               $campaignEventModel
+     * @param EventDispatcherInterface $dispatcher
      */
     public function __construct(DynamicContentModel $dynamicContentModel, EventModel $campaignEventModel, EventDispatcherInterface $dispatcher)
     {
@@ -58,7 +58,7 @@ public function __construct(DynamicContentModel $dynamicContentModel, EventModel
      */
     public function getDynamicContentForLead($slot, $lead)
     {
-        $response = $this->campaignEventModel->triggerEvent('dwc.decision', $slot, 'dwc.decision.' . $slot);
+        $response = $this->campaignEventModel->triggerEvent('dwc.decision', $slot, 'dwc.decision.'.$slot);
         $content  = '';
 
         if (is_array($response) && !empty($response['action']['dwc.push_content'])) {
@@ -92,8 +92,8 @@ public function getDynamicContentForLead($slot, $lead)
     }
 
     /**
-     * @param string $content
-     * @param Lead|array   $lead
+     * @param string     $content
+     * @param Lead|array $lead
      *
      * @return string Content with the {content} tokens replaced with dynamic content
      */
@@ -103,7 +103,7 @@ public function replaceTokensInContent($content, $lead)
         preg_match_all('/{(dynamiccontent)=(\w+)(?:\/}|}(?:([^{]*(?:{(?!\/\1})[^{]*)*){\/\1})?)/is', $content, $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
-            $slot = $match[2];
+            $slot           = $match[2];
             $defaultContent = $match[3];
 
             $dwcContent = $this->getDynamicContentForLead($slot, $lead);
diff --git a/app/bundles/DynamicContentBundle/MauticDynamicContentBundle.php b/app/bundles/DynamicContentBundle/MauticDynamicContentBundle.php
index 9cff1ef7b91..765ed323d79 100644
--- a/app/bundles/DynamicContentBundle/MauticDynamicContentBundle.php
+++ b/app/bundles/DynamicContentBundle/MauticDynamicContentBundle.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/app/bundles/DynamicContentBundle/Model/DynamicContentModel.php b/app/bundles/DynamicContentBundle/Model/DynamicContentModel.php
index 903edbb63c4..70a2ebced23 100644
--- a/app/bundles/DynamicContentBundle/Model/DynamicContentModel.php
+++ b/app/bundles/DynamicContentBundle/Model/DynamicContentModel.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Model;
 
 use Doctrine\DBAL\Query\QueryBuilder;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Model\FormModel;
 use Mautic\CoreBundle\Model\TranslationModelTrait;
 use Mautic\CoreBundle\Model\VariantModelTrait;
@@ -30,7 +31,7 @@ class DynamicContentModel extends FormModel
     use TranslationModelTrait;
 
     /**
-     * Retrieve the permissions base
+     * Retrieve the permissions base.
      *
      * @return string
      */
@@ -123,17 +124,17 @@ public function setSlotContentForLead(DynamicContent $dwc, Lead $lead, $slot)
 
         $qb->insert(MAUTIC_TABLE_PREFIX.'dynamic_content_lead_data')
             ->values([
-                'lead_id' => $lead->getId(),
+                'lead_id'            => $lead->getId(),
                 'dynamic_content_id' => $dwc->getId(),
-                'slot' => ':slot',
-                'date_added' => $qb->expr()->literal((new \DateTime())->format('Y-m-d H:i:s'))
+                'slot'               => ':slot',
+                'date_added'         => $qb->expr()->literal((new \DateTime())->format('Y-m-d H:i:s')),
             ])->setParameter('slot', $slot);
 
         $qb->execute();
     }
 
     /**
-     * @param      $slot
+     * @param            $slot
      * @param Lead|array $lead
      *
      * @return DynamicContent
@@ -194,16 +195,16 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = DynamicContentEvents::PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = DynamicContentEvents::POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = DynamicContentEvents::PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = DynamicContentEvents::POST_DELETE;
                 break;
             default:
@@ -225,7 +226,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     }
 
     /**
-     * Joins the page table and limits created_by to currently logged in user
+     * Joins the page table and limits created_by to currently logged in user.
      *
      * @param QueryBuilder $q
      */
@@ -237,18 +238,18 @@ public function limitQueryToCreator(QueryBuilder &$q)
     }
 
     /**
-     * Get line chart data of hits
+     * Get line chart data of hits.
      *
-     * @param char      $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getHitsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getHitsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
         $flag = null;
 
diff --git a/app/bundles/DynamicContentBundle/Security/Permissions/DynamicContentPermissions.php b/app/bundles/DynamicContentBundle/Security/Permissions/DynamicContentPermissions.php
index 101e396a76c..e89d41aeeb5 100644
--- a/app/bundles/DynamicContentBundle/Security/Permissions/DynamicContentPermissions.php
+++ b/app/bundles/DynamicContentBundle/Security/Permissions/DynamicContentPermissions.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\DynamicContentBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Class NotificationPermissions.
diff --git a/app/bundles/DynamicContentBundle/Views/DynamicContent/details.html.php b/app/bundles/DynamicContentBundle/Views/DynamicContent/details.html.php
index f87956e9238..ed6c15a0e75 100644
--- a/app/bundles/DynamicContentBundle/Views/DynamicContent/details.html.php
+++ b/app/bundles/DynamicContentBundle/Views/DynamicContent/details.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -13,7 +13,6 @@
 $view['slots']->set('mauticContent', 'dynamicContent');
 $view['slots']->set('headerTitle', $entity->getName());
 
-
 $translationContent = $view->render(
     'MauticCoreBundle:Translation:index.html.php',
     [
@@ -23,7 +22,7 @@
         'actionRoute'  => 'mautic_dynamicContent_action',
     ]
 );
-$showTranslations   = !empty(trim($translationContent));
+$showTranslations = !empty(trim($translationContent));
 
 $customButtons = [];
 
@@ -32,8 +31,8 @@
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
         [
-            'item' => $entity,
-            'customButtons' => (isset($customButtons)) ? $customButtons : [],
+            'item'            => $entity,
+            'customButtons'   => (isset($customButtons)) ? $customButtons : [],
             'templateButtons' => [
                 'edit' => $view['security']->hasEntityAccess(
                     $permissions['dynamicContent:dynamicContents:editown'],
diff --git a/app/bundles/DynamicContentBundle/Views/DynamicContent/form.html.php b/app/bundles/DynamicContentBundle/Views/DynamicContent/form.html.php
index 0fc835ab0d3..ef16f9b4e25 100644
--- a/app/bundles/DynamicContentBundle/Views/DynamicContent/form.html.php
+++ b/app/bundles/DynamicContentBundle/Views/DynamicContent/form.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/DynamicContentBundle/Views/DynamicContent/index.html.php b/app/bundles/DynamicContentBundle/Views/DynamicContent/index.html.php
index f2ea43b2a35..ac0614fad7a 100644
--- a/app/bundles/DynamicContentBundle/Views/DynamicContent/index.html.php
+++ b/app/bundles/DynamicContentBundle/Views/DynamicContent/index.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -28,10 +28,10 @@
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
-        'searchValue' => $searchValue,
-        'searchHelp' => 'mautic.page.help.searchcommands',
-        'action' => $currentRoute,
-        'routeBase' => 'dynamicContent',
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.page.help.searchcommands',
+        'action'          => $currentRoute,
+        'routeBase'       => 'dynamicContent',
         'templateButtons' => [
             'delete' => $permissions['dynamicContent:dynamicContents:deleteown'] || $permissions['dynamicContent:dynamicContents:deleteother'],
         ],
diff --git a/app/bundles/DynamicContentBundle/Views/DynamicContent/list.html.php b/app/bundles/DynamicContentBundle/Views/DynamicContent/list.html.php
index ac0efb7fbe6..f6eac9c77ca 100644
--- a/app/bundles/DynamicContentBundle/Views/DynamicContent/list.html.php
+++ b/app/bundles/DynamicContentBundle/Views/DynamicContent/list.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -21,29 +21,29 @@
                     <?php
                     echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'checkall' => 'true',
-                        'target' => '#dwcTable',
+                        'target'   => '#dwcTable',
                     ]);
 
                     echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'dynamicContent',
-                        'orderBy' => 'e.title',
-                        'text' => 'mautic.core.title',
-                        'class' => 'col-dwc-title',
-                        'default' => true,
+                        'orderBy'    => 'e.title',
+                        'text'       => 'mautic.core.title',
+                        'class'      => 'col-dwc-title',
+                        'default'    => true,
                     ]);
 
                     echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'dynamicContent',
-                        'orderBy' => 'e.name',
-                        'text' => 'mautic.core.category',
-                        'class' => 'visible-md visible-lg col-dwc-category',
+                        'orderBy'    => 'e.name',
+                        'text'       => 'mautic.core.category',
+                        'class'      => 'visible-md visible-lg col-dwc-category',
                     ]);
 
                     echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'dynamicContent',
-                        'orderBy' => 'e.id',
-                        'text' => 'mautic.core.id',
-                        'class' => 'col-dwc-id visible-md visible-lg',
+                        'orderBy'    => 'e.id',
+                        'text'       => 'mautic.core.id',
+                        'class'      => 'col-dwc-id visible-md visible-lg',
                     ]);
                     ?>
                 </tr>
@@ -54,10 +54,10 @@
                         <td>
                             <?php
                             echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
-                                'item' => $item,
+                                'item'            => $item,
                                 'templateButtons' => [
-                                    'edit' => $view['security']->hasEntityAccess($permissions['dynamicContent:dynamicContents:editown'], $permissions['dynamicContent:dynamicContents:editother'], $item->getCreatedBy()),
-                                    'clone' => $permissions['dynamicContent:dynamicContents:create'],
+                                    'edit'   => $view['security']->hasEntityAccess($permissions['dynamicContent:dynamicContents:editown'], $permissions['dynamicContent:dynamicContents:editother'], $item->getCreatedBy()),
+                                    'clone'  => $permissions['dynamicContent:dynamicContents:create'],
                                     'delete' => $view['security']->hasEntityAccess($permissions['dynamicContent:dynamicContents:deleteown'], $permissions['dynamicContent:dynamicContents:deleteother'], $item->getCreatedBy()),
                                 ],
                                 'routeBase'  => 'dynamicContent',
@@ -91,8 +91,8 @@
                         </td>
                         <td class="visible-md visible-lg">
                             <?php $category = $item->getCategory(); ?>
-                            <?php $catName = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                            <?php $color = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
+                            <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
+                            <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                             <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                         </td>
                         <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
@@ -103,10 +103,10 @@
         <div class="panel-footer">
         <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
             'totalItems' => count($items),
-            'page' => $page,
-            'limit' => $limit,
+            'page'       => $page,
+            'limit'      => $limit,
             'menuLinkId' => 'mautic_dynamicContent_index',
-            'baseUrl' => $view['router']->generate('mautic_dynamicContent_index'),
+            'baseUrl'    => $view['router']->generate('mautic_dynamicContent_index'),
             'sessionVar' => 'dynamicContent',
         ]); ?>
         </div>
diff --git a/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentDecisionList/dynamiccontentdecision_list_row.html.php b/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentDecisionList/dynamiccontentdecision_list_row.html.php
index a547c9efd8d..ea274b96a60 100644
--- a/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentDecisionList/dynamiccontentdecision_list_row.html.php
+++ b/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentDecisionList/dynamiccontentdecision_list_row.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentPushList/dynamiccontentpush_list_row.html.php b/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentPushList/dynamiccontentpush_list_row.html.php
index a547c9efd8d..ea274b96a60 100644
--- a/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentPushList/dynamiccontentpush_list_row.html.php
+++ b/app/bundles/DynamicContentBundle/Views/FormTheme/DynamicContentPushList/dynamiccontentpush_list_row.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/DynamicContentBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/DynamicContentBundle/Views/SubscribedEvents/Timeline/index.html.php
index ceb3da58452..9bfe4c957e1 100644
--- a/app/bundles/DynamicContentBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/DynamicContentBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -10,7 +10,6 @@
 $data = $event['extra']['log']['metadata'];
 
 if (isset($data['failed'])) {
-
     return;
 }
 ?>
diff --git a/app/bundles/EmailBundle/Command/ProcessEmailQueueCommand.php b/app/bundles/EmailBundle/Command/ProcessEmailQueueCommand.php
index 4a9204335e5..62f2a97023d 100644
--- a/app/bundles/EmailBundle/Command/ProcessEmailQueueCommand.php
+++ b/app/bundles/EmailBundle/Command/ProcessEmailQueueCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,11 +20,10 @@
 use Symfony\Component\Finder\Finder;
 
 /**
- * CLI command to process the e-mail queue
+ * CLI command to process the e-mail queue.
  */
 class ProcessEmailQueueCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -37,7 +37,7 @@ protected function configure()
             ->addOption('--do-not-clear', null, InputOption::VALUE_NONE, 'By default, failed messages older than the --recover-timeout setting will be attempted one more time then deleted if it fails again.  If this is set, sending of failed messages will continue to be attempted.')
             ->addOption('--recover-timeout', null, InputOption::VALUE_OPTIONAL, 'Sets the amount of time in seconds before attempting to resend failed messages.  Defaults to value set in config.')
             ->addOption('--clear-timeout', null, InputOption::VALUE_OPTIONAL, 'Sets the amount of time in seconds before deleting failed messages.  Defaults to value set in config.')
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>%command.name%</info> command is used to process the application's e-mail queue
 
 <info>php %command.full_name%</info>
@@ -51,16 +51,16 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $options    = $input->getOptions();
-        $env        =  (!empty($options['env'])) ? $options['env'] : 'dev';
+        $env        = (!empty($options['env'])) ? $options['env'] : 'dev';
         $container  = $this->getContainer();
         $dispatcher = $container->get('event_dispatcher');
 
-        $skipClear  = $input->getOption('do-not-clear');
-        $quiet      = $input->getOption('quiet');
-        $timeout    = $input->getOption('clear-timeout');
+        $skipClear = $input->getOption('do-not-clear');
+        $quiet     = $input->getOption('quiet');
+        $timeout   = $input->getOption('clear-timeout');
 
-        $factory    = $container->get('mautic.factory');
-        $queueMode  = $factory->getParameter('mailer_spool_type');
+        $factory   = $container->get('mautic.factory');
+        $queueMode = $factory->getParameter('mailer_spool_type');
 
         if ($queueMode != 'file') {
             $output->writeln('Mautic is not set to queue email.');
@@ -94,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     }
 
                     //rename the file so no other process tries to find it
-                    $tmpFilename = str_replace(array('.finalretry','.sending','.tryagain'), '', $failedFile);
+                    $tmpFilename = str_replace(['.finalretry', '.sending', '.tryagain'], '', $failedFile);
                     $tmpFilename .= '.finalretry';
                     rename($failedFile, $tmpFilename);
 
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                             $dispatcher->dispatch(EmailEvents::EMAIL_RESEND, $event);
                             $tryAgain = $event->shouldTryAgain();
                         }
-                        
+
                         try {
                             $transport->send($message);
                         } catch (\Swift_TransportException $e) {
@@ -135,11 +135,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
         }
 
-        $command = $this->getApplication()->find('swiftmailer:spool:send');
-        $commandArgs = array(
-            'command'           => 'swiftmailer:spool:send',
-            '--env'             => $env
-        );
+        $command     = $this->getApplication()->find('swiftmailer:spool:send');
+        $commandArgs = [
+            'command' => 'swiftmailer:spool:send',
+            '--env'   => $env,
+        ];
         if ($quiet) {
             $commandArgs['--quiet'] = true;
         }
@@ -164,7 +164,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } elseif ($timeout = $container->getParameter('mautic.mailer_spool_recover_timeout')) {
             $commandArgs['--recover-timeout'] = $timeout;
         }
-        $input = new ArrayInput($commandArgs);
+        $input      = new ArrayInput($commandArgs);
         $returnCode = $command->run($input, $output);
 
         if ($returnCode !== 0) {
diff --git a/app/bundles/EmailBundle/Command/ProcessFetchEmailCommand.php b/app/bundles/EmailBundle/Command/ProcessFetchEmailCommand.php
index b8c45e4ddf3..52fc7175756 100644
--- a/app/bundles/EmailBundle/Command/ProcessFetchEmailCommand.php
+++ b/app/bundles/EmailBundle/Command/ProcessFetchEmailCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 use Mautic\EmailBundle\EmailEvents;
 use Mautic\EmailBundle\Event\ParseEmailEvent;
-use Mautic\EmailBundle\Helper\ImapHelper;
 use Mautic\EmailBundle\MonitoredEmail\Mailbox;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
@@ -19,11 +19,10 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * CLI command to check for messages
+ * CLI command to check for messages.
  */
 class ProcessFetchEmailCommand extends ContainerAwareCommand
 {
-
     /**
      * {@inheritdoc}
      */
@@ -33,13 +32,13 @@ protected function configure()
             ->setName('mautic:email:fetch')
             ->setAliases(
                 [
-                    'mautic:emails:fetch'
+                    'mautic:emails:fetch',
                 ]
             )
             ->setDescription('Fetch and process monitored email.')
             ->addOption('--message-limit', '-m', InputOption::VALUE_OPTIONAL, 'Limit number of messages to process at a time.')
             ->setHelp(
-                <<<EOT
+                <<<'EOT'
                 The <info>%command.name%</info> command is used to fetch and process messages such as bounces and unsubscribe requests. Configure the Monitored Email settings in Mautic's Configuration.
 
 <info>php %command.full_name%</info>
@@ -107,8 +106,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     if (count($mailIds)) {
                         foreach ($mailIds as $id) {
                             $messages[] = $imapHelper->getMail($id);
-                            $counter++;
-                            $processed++;
+                            ++$counter;
+                            ++$processed;
 
                             if ($limit && $counter >= $limit) {
                                 break;
@@ -148,7 +147,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if (empty($searchMailboxes)) {
-
             $output->writeln('No mailboxes are configured.');
         }
 
diff --git a/app/bundles/EmailBundle/Config/config.php b/app/bundles/EmailBundle/Config/config.php
index 36300029cfb..ad063b2ef0b 100644
--- a/app/bundles/EmailBundle/Config/config.php
+++ b/app/bundles/EmailBundle/Config/config.php
@@ -1,315 +1,316 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
-    'routes'     => [
-        'main'   => [
-            'mautic_email_index'  => [
+    'routes' => [
+        'main' => [
+            'mautic_email_index' => [
                 'path'       => '/emails/{page}',
-                'controller' => 'MauticEmailBundle:Email:index'
+                'controller' => 'MauticEmailBundle:Email:index',
             ],
             'mautic_email_action' => [
                 'path'       => '/emails/{objectAction}/{objectId}',
-                'controller' => 'MauticEmailBundle:Email:execute'
-            ]
+                'controller' => 'MauticEmailBundle:Email:execute',
+            ],
         ],
-        'api'    => [
-            'mautic_api_getemails'     => [
+        'api' => [
+            'mautic_api_getemails' => [
                 'path'       => '/emails',
-                'controller' => 'MauticEmailBundle:Api\EmailApi:getEntities'
+                'controller' => 'MauticEmailBundle:Api\EmailApi:getEntities',
             ],
-            'mautic_api_getemail'      => [
+            'mautic_api_getemail' => [
                 'path'       => '/emails/{id}',
-                'controller' => 'MauticEmailBundle:Api\EmailApi:getEntity'
+                'controller' => 'MauticEmailBundle:Api\EmailApi:getEntity',
             ],
-            'mautic_api_sendemail'     => [
+            'mautic_api_sendemail' => [
                 'path'       => '/emails/{id}/send',
                 'controller' => 'MauticEmailBundle:Api\EmailApi:send',
-                'method'     => 'POST'
+                'method'     => 'POST',
             ],
             'mautic_api_sendcontactemail' => [
                 'path'       => '/emails/{id}/send/contact/{leadId}',
                 'controller' => 'MauticEmailBundle:Api\EmailApi:sendLead',
-                'method'     => 'POST'
-            ]
+                'method'     => 'POST',
+            ],
         ],
         'public' => [
-            'mautic_email_tracker'             => [
+            'mautic_email_tracker' => [
                 'path'       => '/email/{idHash}.gif',
-                'controller' => 'MauticEmailBundle:Public:trackingImage'
+                'controller' => 'MauticEmailBundle:Public:trackingImage',
             ],
-            'mautic_email_webview'             => [
+            'mautic_email_webview' => [
                 'path'       => '/email/view/{idHash}',
-                'controller' => 'MauticEmailBundle:Public:index'
+                'controller' => 'MauticEmailBundle:Public:index',
             ],
-            'mautic_email_unsubscribe'         => [
+            'mautic_email_unsubscribe' => [
                 'path'       => '/email/unsubscribe/{idHash}',
-                'controller' => 'MauticEmailBundle:Public:unsubscribe'
+                'controller' => 'MauticEmailBundle:Public:unsubscribe',
             ],
-            'mautic_email_resubscribe'         => [
+            'mautic_email_resubscribe' => [
                 'path'       => '/email/resubscribe/{idHash}',
-                'controller' => 'MauticEmailBundle:Public:resubscribe'
+                'controller' => 'MauticEmailBundle:Public:resubscribe',
             ],
             'mautic_mailer_transport_callback' => [
                 'path'       => '/mailer/{transport}/callback',
-                'controller' => 'MauticEmailBundle:Public:mailerCallback'
+                'controller' => 'MauticEmailBundle:Public:mailerCallback',
             ],
-            'mautic_email_preview'             => [
+            'mautic_email_preview' => [
                 'path'       => '/email/preview/{objectId}',
-                'controller' => 'MauticEmailBundle:Public:preview'
-            ]
-        ]
+                'controller' => 'MauticEmailBundle:Public:preview',
+            ],
+        ],
     ],
-    'menu'       => [
+    'menu' => [
         'main' => [
-            'items'    => [
+            'items' => [
                 'mautic.email.emails' => [
-                    'route'     => 'mautic_email_index',
-                    'access'    => ['email:emails:viewown', 'email:emails:viewother'],
-                    'parent'    => 'mautic.core.channels',
-                    'priority'  => 100
-                ]
-            ]
-        ]
+                    'route'    => 'mautic_email_index',
+                    'access'   => ['email:emails:viewown', 'email:emails:viewother'],
+                    'parent'   => 'mautic.core.channels',
+                    'priority' => 100,
+                ],
+            ],
+        ],
     ],
     'categories' => [
-        'email' => null
+        'email' => null,
     ],
-    'services'   => [
+    'services' => [
         'events' => [
-            'mautic.email.subscriber'                => [
-                'class' => 'Mautic\EmailBundle\EventListener\EmailSubscriber',
+            'mautic.email.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\EmailSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.core.model.auditlog',
-                    'mautic.email.model.email'
-                ]
+                    'mautic.email.model.email',
+                ],
             ],
-            'mautic.emailbuilder.subscriber'         => [
-                'class' => 'Mautic\EmailBundle\EventListener\BuilderSubscriber',
+            'mautic.emailbuilder.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\BuilderSubscriber',
                 'arguments' => [
                     'mautic.helper.core_parameters',
                     'mautic.email.model.email',
                     'mautic.page.model.trackable',
-                    'mautic.page.model.redirect'
-                ]
+                    'mautic.page.model.redirect',
+                ],
             ],
-            'mautic.emailtoken.subscriber'     => [
-                'class' => 'Mautic\EmailBundle\EventListener\TokenSubscriber'
+            'mautic.emailtoken.subscriber' => [
+                'class' => 'Mautic\EmailBundle\EventListener\TokenSubscriber',
             ],
             'mautic.email.campaignbundle.subscriber' => [
-                'class' => 'Mautic\EmailBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\EmailBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.lead.model.lead',
                     'mautic.email.model.email',
                     'mautic.campaign.model.event',
-                    'mautic.core.model.messagequeue'
-                ]
+                    'mautic.core.model.messagequeue',
+                ],
             ],
-            'mautic.email.formbundle.subscriber'     => [
-                'class' => 'Mautic\EmailBundle\EventListener\FormSubscriber'
+            'mautic.email.formbundle.subscriber' => [
+                'class' => 'Mautic\EmailBundle\EventListener\FormSubscriber',
             ],
-            'mautic.email.reportbundle.subscriber'   => [
-                'class' => 'Mautic\EmailBundle\EventListener\ReportSubscriber'
+            'mautic.email.reportbundle.subscriber' => [
+                'class' => 'Mautic\EmailBundle\EventListener\ReportSubscriber',
             ],
-            'mautic.email.leadbundle.subscriber'     => [
-                'class'       => 'Mautic\EmailBundle\EventListener\LeadSubscriber',
+            'mautic.email.leadbundle.subscriber' => [
+                'class' => 'Mautic\EmailBundle\EventListener\LeadSubscriber',
             ],
-            'mautic.email.pointbundle.subscriber'    => [
-                'class' => 'Mautic\EmailBundle\EventListener\PointSubscriber',
+            'mautic.email.pointbundle.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\PointSubscriber',
                 'arguments' => [
-                    'mautic.point.model.point'
-                ]
+                    'mautic.point.model.point',
+                ],
             ],
             'mautic.email.calendarbundle.subscriber' => [
-                'class' => 'Mautic\EmailBundle\EventListener\CalendarSubscriber'
+                'class' => 'Mautic\EmailBundle\EventListener\CalendarSubscriber',
             ],
-            'mautic.email.search.subscriber'         => [
-                'class' => 'Mautic\EmailBundle\EventListener\SearchSubscriber',
+            'mautic.email.search.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\SearchSubscriber',
                 'arguments' => [
                     'mautic.helper.user',
-                    'mautic.email.model.email'
-                ]
+                    'mautic.email.model.email',
+                ],
             ],
-            'mautic.email.webhook.subscriber'        => [
-                'class' => 'Mautic\EmailBundle\EventListener\WebhookSubscriber'
+            'mautic.email.webhook.subscriber' => [
+                'class' => 'Mautic\EmailBundle\EventListener\WebhookSubscriber',
             ],
-            'mautic.email.configbundle.subscriber'   => [
-                'class' => 'Mautic\EmailBundle\EventListener\ConfigSubscriber',
+            'mautic.email.configbundle.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\ConfigSubscriber',
                 'arguments' => [
-                    'mautic.helper.core_parameters'
-                ]
+                    'mautic.helper.core_parameters',
+                ],
             ],
-            'mautic.email.pagebundle.subscriber'     => [
-                'class' => 'Mautic\EmailBundle\EventListener\PageSubscriber',
+            'mautic.email.pagebundle.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\PageSubscriber',
                 'arguments' => [
-                    'mautic.email.model.email'
-                ]
+                    'mautic.email.model.email',
+                ],
             ],
-            'mautic.email.dashboard.subscriber'      => [
-                'class' => 'Mautic\EmailBundle\EventListener\DashboardSubscriber',
+            'mautic.email.dashboard.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
-                    'mautic.email.model.email'
-                ]
+                    'mautic.email.model.email',
+                ],
             ],
-            'mautic.email.broadcast.subscriber'      => [
-                'class' => 'Mautic\EmailBundle\EventListener\BroadcastSubscriber',
+            'mautic.email.broadcast.subscriber' => [
+                'class'     => 'Mautic\EmailBundle\EventListener\BroadcastSubscriber',
                 'arguments' => [
                     'mautic.email.model.email',
                     'doctrine.orm.entity_manager',
                     'translator',
                     'mautic.lead.model.lead',
                     'mautic.email.model.email',
-                ]
+                ],
             ],
             'mautic.email.messagequeue.subscriber' => [
-                'class' => \Mautic\EmailBundle\EventListener\MessageQueueSubscriber::class,
+                'class'     => \Mautic\EmailBundle\EventListener\MessageQueueSubscriber::class,
                 'arguments' => [
                     'mautic.email.model.email',
-                ]
-            ]
+                ],
+            ],
         ],
-        'forms'  => [
-            'mautic.form.type.email'                          => [
+        'forms' => [
+            'mautic.form.type.email' => [
                 'class'     => 'Mautic\EmailBundle\Form\Type\EmailType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'emailform'
+                'alias'     => 'emailform',
             ],
-            'mautic.form.type.emailvariant'                   => [
+            'mautic.form.type.emailvariant' => [
                 'class'     => 'Mautic\EmailBundle\Form\Type\VariantType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'emailvariant'
+                'alias'     => 'emailvariant',
             ],
-            'mautic.form.type.email_list'                     => [
+            'mautic.form.type.email_list' => [
                 'class'     => 'Mautic\EmailBundle\Form\Type\EmailListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'email_list'
+                'alias'     => 'email_list',
             ],
-            'mautic.form.type.emailopen_list'                 => [
+            'mautic.form.type.emailopen_list' => [
                 'class' => 'Mautic\EmailBundle\Form\Type\EmailOpenType',
-                'alias' => 'emailopen_list'
+                'alias' => 'emailopen_list',
             ],
-            'mautic.form.type.emailsend_list'                 => [
+            'mautic.form.type.emailsend_list' => [
                 'class'     => 'Mautic\EmailBundle\Form\Type\EmailSendType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'emailsend_list'
+                'alias'     => 'emailsend_list',
             ],
-            'mautic.form.type.formsubmit_sendemail_admin'     => [
+            'mautic.form.type.formsubmit_sendemail_admin' => [
                 'class' => 'Mautic\EmailBundle\Form\Type\FormSubmitActionUserEmailType',
-                'alias' => 'email_submitaction_useremail'
+                'alias' => 'email_submitaction_useremail',
             ],
-            'mautic.email.type.email_abtest_settings'         => [
+            'mautic.email.type.email_abtest_settings' => [
                 'class' => 'Mautic\EmailBundle\Form\Type\AbTestPropertiesType',
-                'alias' => 'email_abtest_settings'
+                'alias' => 'email_abtest_settings',
             ],
-            'mautic.email.type.batch_send'                    => [
+            'mautic.email.type.batch_send' => [
                 'class' => 'Mautic\EmailBundle\Form\Type\BatchSendType',
-                'alias' => 'batch_send'
+                'alias' => 'batch_send',
             ],
-            'mautic.form.type.emailconfig'                    => [
+            'mautic.form.type.emailconfig' => [
                 'class'     => 'Mautic\EmailBundle\Form\Type\ConfigType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'emailconfig'
+                'alias'     => 'emailconfig',
             ],
             'mautic.form.type.coreconfig_monitored_mailboxes' => [
                 'class'     => 'Mautic\EmailBundle\Form\Type\ConfigMonitoredMailboxesType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'monitored_mailboxes'
+                'alias'     => 'monitored_mailboxes',
             ],
-            'mautic.form.type.coreconfig_monitored_email'     => [
+            'mautic.form.type.coreconfig_monitored_email' => [
                 'class'     => 'Mautic\EmailBundle\Form\Type\ConfigMonitoredEmailType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'monitored_email'
+                'alias'     => 'monitored_email',
             ],
             'mautic.form.type.email_dashboard_emails_in_time_widget' => [
-                'class'     => 'Mautic\EmailBundle\Form\Type\DashboardEmailsInTimeWidgetType',
-                'alias'     => 'email_dashboard_emails_in_time_widget'
-            ]
+                'class' => 'Mautic\EmailBundle\Form\Type\DashboardEmailsInTimeWidgetType',
+                'alias' => 'email_dashboard_emails_in_time_widget',
+            ],
         ],
-        'other'  => [
+        'other' => [
             'mautic.validator.leadlistaccess' => [
                 'class'     => 'Mautic\LeadBundle\Form\Validator\Constraints\LeadListAccessValidator',
                 'arguments' => 'mautic.factory',
                 'tag'       => 'validator.constraint_validator',
-                'alias'     => 'leadlist_access'
+                'alias'     => 'leadlist_access',
             ],
-            'mautic.helper.mailbox'              => [
+            'mautic.helper.mailbox' => [
                 'class'     => 'Mautic\EmailBundle\MonitoredEmail\Mailbox',
                 'arguments' => [
                     'mautic.helper.core_parameters',
-                    'mautic.helper.paths'
-                ]
+                    'mautic.helper.paths',
+                ],
             ],
-            'mautic.helper.message'            => [
+            'mautic.helper.message' => [
                 'class'     => 'Mautic\EmailBundle\Helper\MessageHelper',
-                'arguments' => 'mautic.factory'
+                'arguments' => 'mautic.factory',
             ],
-            'mautic.helper.mailer'             => [
+            'mautic.helper.mailer' => [
                 'class'     => 'Mautic\EmailBundle\Helper\MailHelper',
                 'arguments' => [
                     'mautic.factory',
-                    'mailer'
-                ]
+                    'mailer',
+                ],
             ],
             // Mailers
-            'mautic.transport.amazon'            => [
+            'mautic.transport.amazon' => [
                 'class'        => 'Mautic\EmailBundle\Swiftmailer\Transport\AmazonTransport',
                 'serviceAlias' => 'swiftmailer.mailer.transport.%s',
                 'arguments'    => [
                     '%mautic.mailer_amazon_region%',
-                    'mautic.http.connector'
+                    'mautic.http.connector',
                 ],
-                'methodCalls'  => [
+                'methodCalls' => [
                     'setUsername' => ['%mautic.mailer_user%'],
-                    'setPassword' => ['%mautic.mailer_password%']
-                ]
+                    'setPassword' => ['%mautic.mailer_password%'],
+                ],
             ],
-            'mautic.transport.mandrill'          => [
+            'mautic.transport.mandrill' => [
                 'class'        => 'Mautic\EmailBundle\Swiftmailer\Transport\MandrillTransport',
                 'serviceAlias' => 'swiftmailer.mailer.transport.%s',
                 'methodCalls'  => [
                     'setUsername'      => ['%mautic.mailer_user%'],
                     'setPassword'      => ['%mautic.mailer_password%'],
-                    'setMauticFactory' => ['mautic.factory']
-                ]
+                    'setMauticFactory' => ['mautic.factory'],
+                ],
             ],
-            'mautic.transport.sendgrid'          => [
+            'mautic.transport.sendgrid' => [
                 'class'        => 'Mautic\EmailBundle\Swiftmailer\Transport\SendgridTransport',
                 'serviceAlias' => 'swiftmailer.mailer.transport.%s',
                 'methodCalls'  => [
                     'setUsername' => ['%mautic.mailer_user%'],
-                    'setPassword' => ['%mautic.mailer_password%']
-                ]
+                    'setPassword' => ['%mautic.mailer_password%'],
+                ],
             ],
-            'mautic.transport.postmark'          => [
+            'mautic.transport.postmark' => [
                 'class'        => 'Mautic\EmailBundle\Swiftmailer\Transport\PostmarkTransport',
                 'serviceAlias' => 'swiftmailer.mailer.transport.%s',
                 'methodCalls'  => [
                     'setUsername' => ['%mautic.mailer_user%'],
-                    'setPassword' => ['%mautic.mailer_password%']
-                ]
+                    'setPassword' => ['%mautic.mailer_password%'],
+                ],
             ],
-            'mautic.transport.sparkpost'          => [
+            'mautic.transport.sparkpost' => [
                 'class'        => 'Mautic\EmailBundle\Swiftmailer\Transport\SparkpostTransport',
                 'serviceAlias' => 'swiftmailer.mailer.transport.%s',
                 'arguments'    => [
                     '%mautic.mailer_api_key%',
-                    'translator'
+                    'translator',
+                ],
+                'methodCalls' => [
+                    'setMauticFactory' => ['mautic.factory'],
                 ],
-                'methodCalls'  => [
-                    'setMauticFactory' => ['mautic.factory']
-                ]
             ],
         ],
         'models' => [
             'mautic.email.model.email' => [
-                'class' => 'Mautic\EmailBundle\Model\EmailModel',
+                'class'     => 'Mautic\EmailBundle\Model\EmailModel',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.helper.theme',
@@ -321,9 +322,9 @@
                     'mautic.user.model.user',
                     'mautic.helper.core_parameters',
                     'mautic.core.model.messagequeue',
-                ]
-            ]
-        ]
+                ],
+            ],
+        ],
     ],
     'parameters' => [
         'mailer_api_key'               => null, // Api key from mail delivery provider.
@@ -354,6 +355,6 @@
         'mailer_is_owner'              => false,
         'default_signature_text'       => null,
         'email_frequency_number'       => null,
-        'email_frequency_time'         => null
-    ]
+        'email_frequency_time'         => null,
+    ],
 ];
diff --git a/app/bundles/EmailBundle/Controller/AjaxController.php b/app/bundles/EmailBundle/Controller/AjaxController.php
index 58e2e8396bc..371588c6baf 100644
--- a/app/bundles/EmailBundle/Controller/AjaxController.php
+++ b/app/bundles/EmailBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,19 +13,11 @@
 use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
 use Mautic\CoreBundle\Controller\VariantAjaxControllerTrait;
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
-use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\EmailBundle\Helper\PlainTextHelper;
 use Symfony\Component\HttpFoundation\Request;
-use Mautic\EmailBundle\Swiftmailer\Transport\AmazonTransport;
-use Mautic\EmailBundle\Swiftmailer\Transport\MandrillTransport;
-use Mautic\EmailBundle\Swiftmailer\Transport\PostmarkTransport;
-use Mautic\EmailBundle\Swiftmailer\Transport\SendgridTransport;
-use Mautic\EmailBundle\Swiftmailer\Transport\SparkpostTransport;
 
 /**
- * Class AjaxController
- *
- * @package Mautic\EmailBundle\Controller
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
@@ -54,7 +47,7 @@ protected function getAbTestFormAction(Request $request)
      */
     protected function sendBatchAction(Request $request)
     {
-        $dataArray = array('success' => 0);
+        $dataArray = ['success' => 0];
 
         /** @var \Mautic\EmailBundle\Model\EmailModel $model */
         $model    = $this->getModel('email');
@@ -65,8 +58,8 @@ protected function sendBatchAction(Request $request)
         if ($objectId && $entity = $model->getEntity($objectId)) {
             $dataArray['success'] = 1;
             $session              = $this->get('session');
-            $progress             = $session->get('mautic.email.send.progress', array(0, (int) $pending));
-            $stats                = $session->get('mautic.email.send.stats', array('sent' => 0, 'failed' => 0, 'failedRecipients' => array()));
+            $progress             = $session->get('mautic.email.send.progress', [0, (int) $pending]);
+            $stats                = $session->get('mautic.email.send.stats', ['sent' => 0, 'failed' => 0, 'failedRecipients' => []]);
 
             if ($pending && !$inProgress = $session->get('mautic.email.send.active', false)) {
                 $session->set('mautic.email.send.active', true);
@@ -95,7 +88,7 @@ protected function sendBatchAction(Request $request)
     }
 
     /**
-     * Called by parent::getBuilderTokensAction()
+     * Called by parent::getBuilderTokensAction().
      *
      * @param $query
      *
@@ -106,7 +99,7 @@ protected function getBuilderTokens($query)
         /** @var \Mautic\EmailBundle\Model\EmailModel $model */
         $model = $this->getModel('email');
 
-        return $model->getBuilderComponents(null, array('tokens'), $query, false);
+        return $model->getBuilderComponents(null, ['tokens'], $query, false);
     }
 
     /**
@@ -116,20 +109,20 @@ protected function getBuilderTokens($query)
      */
     protected function generatePlaintTextAction(Request $request)
     {
-        $custom    = $request->request->get('custom');
-        $id        = $request->request->get('id');
+        $custom = $request->request->get('custom');
+        $id     = $request->request->get('id');
 
         $parser = new PlainTextHelper(
-            array(
-                'base_url' => $request->getSchemeAndHttpHost().$request->getBasePath()
-            )
+            [
+                'base_url' => $request->getSchemeAndHttpHost().$request->getBasePath(),
+            ]
         );
 
         // Convert placeholders into raw tokens
         BuilderTokenHelper::replaceVisualPlaceholdersWithTokens($custom);
 
         $dataArray = [
-            'text' => $parser->setHtml($custom)->getText()
+            'text' => $parser->setHtml($custom)->getText(),
         ];
 
         return $this->sendJsonResponse($dataArray);
@@ -142,7 +135,7 @@ protected function generatePlaintTextAction(Request $request)
      */
     protected function getAttachmentsSizeAction(Request $request)
     {
-        $assets = $request->get('assets', array(), true);
+        $assets = $request->get('assets', [], true);
         $size   = 0;
         if ($assets) {
             /** @var \Mautic\AssetBundle\Model\AssetModel $assetModel */
@@ -150,11 +143,11 @@ protected function getAttachmentsSizeAction(Request $request)
             $size       = $assetModel->getTotalFilesize($assets);
         }
 
-        return $this->sendJsonResponse(array('size' => $size));
+        return $this->sendJsonResponse(['size' => $size]);
     }
 
     /**
-     * Tests monitored email connection settings
+     * Tests monitored email connection settings.
      *
      * @param Request $request
      *
@@ -162,7 +155,7 @@ protected function getAttachmentsSizeAction(Request $request)
      */
     protected function testMonitoredEmailServerConnectionAction(Request $request)
     {
-        $dataArray = array('success' => 0, 'message' => '');
+        $dataArray = ['success' => 0, 'message' => ''];
 
         if ($this->user->isAdmin()) {
             $settings = $request->request->all();
@@ -197,7 +190,7 @@ protected function testMonitoredEmailServerConnectionAction(Request $request)
     }
 
     /**
-     * Tests mail transport settings
+     * Tests mail transport settings.
      *
      * @param Request $request
      *
@@ -275,7 +268,6 @@ protected function testEmailServerConnectionAction(Request $request)
 
                     $dataArray['success'] = 1;
                     $dataArray['message'] = $translator->trans('mautic.core.success');
-
                 } catch (\Exception $e) {
                     $dataArray['message'] = $e->getMessage().'<br />'.$logger->dump();
                 }
@@ -284,4 +276,4 @@ protected function testEmailServerConnectionAction(Request $request)
 
         return $this->sendJsonResponse($dataArray);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Controller/Api/EmailApiController.php b/app/bundles/EmailBundle/Controller/Api/EmailApiController.php
index 367edd641e9..e047f20f6d0 100644
--- a/app/bundles/EmailBundle/Controller/Api/EmailApiController.php
+++ b/app/bundles/EmailBundle/Controller/Api/EmailApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,14 +17,11 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class EmailApiController
- *
- * @package Mautic\EmailBundle\Controller\Api
+ * Class EmailApiController.
  */
 class EmailApiController extends CommonApiController
 {
-
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('email');
@@ -31,43 +29,44 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'email';
         $this->entityNameMulti  = 'emails';
         $this->permissionBase   = 'email:emails';
-        $this->serializerGroups = array("emailDetails", "categoryList", "publishDetails", "assetList");
+        $this->serializerGroups = ['emailDetails', 'categoryList', 'publishDetails', 'assetList'];
     }
 
     /**
-     * Obtains a list of emails
+     * Obtains a list of emails.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function getEntitiesAction ()
+    public function getEntitiesAction()
     {
         if (!$this->security->isGranted('email:emails:viewother')) {
             $this->listFilters[] =
-                array(
+                [
                     'column' => 'e.createdBy',
                     'expr'   => 'eq',
-                    'value'  => $this->user->getId()
-                );
+                    'value'  => $this->user->getId(),
+                ];
         }
 
         //get parent level only
-        $this->listFilters[] = array(
+        $this->listFilters[] = [
             'column' => 'e.variantParent',
-            'expr'   => 'isNull'
-        );
+            'expr'   => 'isNull',
+        ];
 
         return parent::getEntitiesAction();
     }
 
     /**
-     * Sends the email to it's assigned lists
+     * Sends the email to it's assigned lists.
      *
      * @param int $id Email ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function sendAction ($id)
+    public function sendAction($id)
     {
         $entity = $this->model->getEntity($id);
         if (null !== $entity) {
@@ -81,31 +80,31 @@ public function sendAction ($id)
             list($count, $failed) = $this->model->sendEmailToLists($entity, $lists, $limit);
 
             $view = $this->view(
-                array(
+                [
                     'success'          => 1,
                     'sentCount'        => $count,
-                    'failedRecipients' => $failed
-                ),
+                    'failedRecipients' => $failed,
+                ],
                 Codes::HTTP_OK
             );
 
             return $this->handleView($view);
-
         }
 
         return $this->notFound();
     }
 
     /**
-     * Sends the email to a specific lead
+     * Sends the email to a specific lead.
      *
      * @param int $id     Email ID
      * @param int $leadId Lead ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function sendLeadAction ($id, $leadId)
+    public function sendLeadAction($id, $leadId)
     {
         $entity = $this->model->getEntity($id);
         if (null !== $entity) {
@@ -123,26 +122,26 @@ public function sendLeadAction ($id, $leadId)
             }
 
             $post   = $this->request->request->all();
-            $tokens = (!empty($post['tokens'])) ? $post['tokens'] : array();
+            $tokens = (!empty($post['tokens'])) ? $post['tokens'] : [];
 
             $cleantokens = array_map(function ($v) {
                 return InputHelper::clean($v);
             }, $tokens);
 
-            $leadFields = array_merge(array('id' => $leadId), $leadModel->flattenFields($lead->getFields()));
+            $leadFields = array_merge(['id' => $leadId], $leadModel->flattenFields($lead->getFields()));
 
-            if(MailHelper::applyFrequencyRules($lead)) {
+            if (MailHelper::applyFrequencyRules($lead)) {
                 $this->model->sendEmail(
                     $entity,
                     $leadFields,
-                    array(
-                        'source' => array('api', 0),
-                        'tokens' => $cleantokens
-                    )
+                    [
+                        'source' => ['api', 0],
+                        'tokens' => $cleantokens,
+                    ]
                 );
             }
 
-            $view = $this->view(array('success' => 1), Codes::HTTP_OK);
+            $view = $this->view(['success' => 1], Codes::HTTP_OK);
 
             return $this->handleView($view);
         }
diff --git a/app/bundles/EmailBundle/Controller/EmailController.php b/app/bundles/EmailBundle/Controller/EmailController.php
index 51894adc454..07d056c2a5f 100644
--- a/app/bundles/EmailBundle/Controller/EmailController.php
+++ b/app/bundles/EmailBundle/Controller/EmailController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,11 @@
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
 use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\CoreBundle\Helper\InputHelper;
-use Mautic\EmailBundle\EmailEvents;
-use Mautic\EmailBundle\Event\EmailSendEvent;
 use Mautic\EmailBundle\Entity\Email;
 use Symfony\Component\HttpFoundation\Response;
-use Mautic\CoreBundle\Templating\TemplateNameParser;
 
 class EmailController extends FormController
 {
-
     /**
      * @param int $page
      *
@@ -42,9 +39,9 @@ public function indexAction($page = 1)
                 'email:emails:deleteown',
                 'email:emails:deleteother',
                 'email:emails:publishown',
-                'email:emails:publishother'
+                'email:emails:publishother',
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if (!$permissions['email:emails:viewown'] && !$permissions['email:emails:viewother']) {
@@ -60,7 +57,7 @@ public function indexAction($page = 1)
         $listFilters = [
             'filters' => [
                 'placeholder' => $this->get('translator')->trans('mautic.email.filter.placeholder'),
-                'multiple'    => true
+                'multiple'    => true,
             ],
         ];
 
@@ -81,8 +78,8 @@ public function indexAction($page = 1)
             'string' => $search,
             'force'  => [
                 ['column' => 'e.variantParent', 'expr' => 'isNull'],
-                ['column' => 'e.translationParent', 'expr' => 'isNull']
-            ]
+                ['column' => 'e.translationParent', 'expr' => 'isNull'],
+            ],
         ];
         if (!$permissions['email:emails:viewother']) {
             $filter['force'][] =
@@ -92,13 +89,13 @@ public function indexAction($page = 1)
         //retrieve a list of Lead Lists
         $listFilters['filters']['groups']['mautic.core.filter.lists'] = [
             'options' => $this->getModel('lead.list')->getUserLists(),
-            'prefix'  => 'list'
+            'prefix'  => 'list',
         ];
 
         //retrieve a list of themes
         $listFilters['filters']['groups']['mautic.core.filter.themes'] = [
             'options' => $this->factory->getInstalledThemes('email'),
-            'prefix'  => 'theme'
+            'prefix'  => 'theme',
         ];
 
         $currentFilters = $session->get('mautic.email.list_filters', []);
@@ -180,7 +177,7 @@ public function indexAction($page = 1)
                 'filter'         => $filter,
                 'orderBy'        => $orderBy,
                 'orderByDir'     => $orderByDir,
-                'ignoreListJoin' => true
+                'ignoreListJoin' => true,
             ]
         );
 
@@ -203,8 +200,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticEmailBundle:Email:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_email_index',
-                        'mauticContent' => 'email'
-                    ]
+                        'mauticContent' => 'email',
+                    ],
                 ]
             );
         }
@@ -212,7 +209,7 @@ public function indexAction($page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'searchValue' => $search,
                     'filters'     => $listFilters,
                     'items'       => $emails,
@@ -228,14 +225,14 @@ public function indexAction($page = 1)
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_email_index',
                     'mauticContent' => 'email',
-                    'route'         => $this->generateUrl('mautic_email_index', ['page' => $page])
-                ]
+                    'route'         => $this->generateUrl('mautic_email_index', ['page' => $page]),
+                ],
             ]
         );
     }
 
     /**
-     * Loads a specific form into the detailed panel
+     * Loads a specific form into the detailed panel.
      *
      * @param $objectId
      *
@@ -268,15 +265,15 @@ public function viewAction($objectId)
                     'contentTemplate' => 'MauticEmailBundle:Email:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_email_index',
-                        'mauticContent' => 'email'
+                        'mauticContent' => 'email',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.email.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -290,9 +287,9 @@ public function viewAction($objectId)
 
         //get A/B test information
         list($parent, $children) = $email->getVariants();
-        $properties   = [];
-        $variantError = false;
-        $weight       = 0;
+        $properties              = [];
+        $variantError            = false;
+        $weight                  = 0;
         if (count($children)) {
             foreach ($children as $c) {
                 $variantSettings = $c->getVariantSettings();
@@ -333,7 +330,7 @@ public function viewAction($objectId)
                     'email'      => $email,
                     'parent'     => $parent,
                     'children'   => $children,
-                    'properties' => $properties
+                    'properties' => $properties,
                 ];
 
                 //execute the callback
@@ -402,32 +399,32 @@ public function viewAction($objectId)
 
         return $this->delegateView(
             [
-                'returnUrl'       => $this->generateUrl(
+                'returnUrl' => $this->generateUrl(
                     'mautic_email_action',
                     [
                         'objectAction' => 'view',
-                        'objectId'     => $email->getId()
+                        'objectId'     => $email->getId(),
                     ]
                 ),
-                'viewParameters'  => [
-                    'email'         => $email,
-                    'stats'         => $stats,
-                    'statsDevices'  => $statsDevices,
-                    'showAllStats'  => $includeVariants,
-                    'trackables'    => $trackableLinks,
-                    'pending'       => $model->getPendingLeads($email, null, true),
-                    'logs'          => $logs,
-                    'variants'      => [
+                'viewParameters' => [
+                    'email'        => $email,
+                    'stats'        => $stats,
+                    'statsDevices' => $statsDevices,
+                    'showAllStats' => $includeVariants,
+                    'trackables'   => $trackableLinks,
+                    'pending'      => $model->getPendingLeads($email, null, true),
+                    'logs'         => $logs,
+                    'variants'     => [
                         'parent'     => $parent,
                         'children'   => $children,
                         'properties' => $properties,
-                        'criteria'   => $criteria['criteria']
+                        'criteria'   => $criteria['criteria'],
                     ],
-                    'translations'  => [
+                    'translations' => [
                         'parent'   => $translationParent,
-                        'children' => $translationChildren
+                        'children' => $translationChildren,
                     ],
-                    'permissions'   => $security->isGranted(
+                    'permissions' => $security->isGranted(
                         [
                             'email:emails:viewown',
                             'email:emails:viewother',
@@ -437,9 +434,9 @@ public function viewAction($objectId)
                             'email:emails:deleteown',
                             'email:emails:deleteother',
                             'email:emails:publishown',
-                            'email:emails:publishother'
+                            'email:emails:publishother',
                         ],
-                        "RETURN_ARRAY"
+                        'RETURN_ARRAY'
                     ),
                     'abTestResults' => $abTestResults,
                     'security'      => $security,
@@ -448,21 +445,21 @@ public function viewAction($objectId)
                         ['objectId' => $email->getId()],
                         true
                     ),
-                    'dateRangeForm' => $dateRangeForm->createView()
+                    'dateRangeForm' => $dateRangeForm->createView(),
                 ],
                 'contentTemplate' => 'MauticEmailBundle:Email:details.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_email_index',
-                    'mauticContent' => 'email'
-                ]
+                    'mauticContent' => 'email',
+                ],
             ]
         );
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
-     * @param  \Mautic\EmailBundle\Entity\Email $entity
+     * @param \Mautic\EmailBundle\Entity\Email $entity
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -524,19 +521,19 @@ public function newAction($entity = null)
                                 'mautic_email_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
+                                    'objectId'     => $entity->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
                         $viewParameters = [
                             'objectAction' => 'view',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ];
-                        $returnUrl      = $this->generateUrl('mautic_email_action', $viewParameters);
-                        $template       = 'MauticEmailBundle:Email:view';
+                        $returnUrl = $this->generateUrl('mautic_email_action', $viewParameters);
+                        $template  = 'MauticEmailBundle:Email:view';
                     } else {
                         //return edit view so that all the session stuff is loaded
                         return $this->editAction($entity->getId(), true);
@@ -552,7 +549,7 @@ public function newAction($entity = null)
 
             $passthrough = [
                 'activeLink'    => 'mautic_email_index',
-                'mauticContent' => 'email'
+                'mauticContent' => 'email',
             ];
 
             // Check to see if this is a popup
@@ -565,7 +562,7 @@ public function newAction($entity = null)
                         'emailId'      => $entity->getId(),
                         'emailSubject' => $entity->getSubject(),
                         'emailName'    => $entity->getName(),
-                        'emailLang'    => $entity->getLanguage()
+                        'emailLang'    => $entity->getLanguage(),
                     ]
                 );
             }
@@ -576,7 +573,7 @@ public function newAction($entity = null)
                         'returnUrl'       => $returnUrl,
                         'viewParameters'  => $viewParameters,
                         'contentTemplate' => $template,
-                        'passthroughVars' => $passthrough
+                        'passthroughVars' => $passthrough,
                     ]
                 );
             }
@@ -587,7 +584,7 @@ public function newAction($entity = null)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form'          => $this->setFormTheme($form, 'MauticEmailBundle:Email:form.html.php', 'MauticEmailBundle:FormTheme\Email'),
                     'isVariant'     => $entity->isVariant(true),
                     'tokens'        => $model->getBuilderComponents($entity, 'tokenSections'),
@@ -595,7 +592,7 @@ public function newAction($entity = null)
                     'slots'         => $this->buildSlotForms($slotTypes),
                     'themes'        => $this->factory->getInstalledThemes('email', true),
                     'builderAssets' => trim(preg_replace('/\s+/', ' ', $this->getAssetsForBuilder())), // strip new lines
-                    'sectionForm'   => $sectionForm->createView()
+                    'sectionForm'   => $sectionForm->createView(),
                 ],
                 'contentTemplate' => 'MauticEmailBundle:Email:form.html.php',
                 'passthroughVars' => [
@@ -605,10 +602,10 @@ public function newAction($entity = null)
                     'route'         => $this->generateUrl(
                         'mautic_email_action',
                         [
-                            'objectAction' => 'new'
+                            'objectAction' => 'new',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
@@ -623,8 +620,8 @@ public function newAction($entity = null)
     public function editAction($objectId, $ignorePost = false, $forceTypeSelection = false)
     {
         /** @var \Mautic\EmailBundle\Model\EmailModel $model */
-        $model   = $this->getModel('email');
-        $method  = $this->request->getMethod();
+        $model  = $this->getModel('email');
+        $method = $this->request->getMethod();
 
         $entity  = $model->getEntity($objectId);
         $session = $this->get('session');
@@ -639,8 +636,8 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             'contentTemplate' => 'MauticEmailBundle:Email:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_email_index',
-                'mauticContent' => 'email'
-            ]
+                'mauticContent' => 'email',
+            ],
         ];
 
         //not found
@@ -653,9 +650,9 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.email.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -693,7 +690,6 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
                 if ($valid = $this->isFormValid($form)) {
-
                     $content = $entity->getCustomHtml();
                     BuilderTokenHelper::replaceVisualPlaceholdersWithTokens($content);
 
@@ -711,9 +707,9 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                                 'mautic_email_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
+                                    'objectId'     => $entity->getId(),
                                 ]
-                            )
+                            ),
                         ],
                         'warning'
                     );
@@ -728,7 +724,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             $template    = 'MauticEmailBundle:Email:view';
             $passthrough = [
                 'activeLink'    => 'mautic_email_index',
-                'mauticContent' => 'email'
+                'mauticContent' => 'email',
             ];
 
             // Check to see if this is a popup
@@ -741,7 +737,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                         'emailId'      => $entity->getId(),
                         'emailSubject' => $entity->getSubject(),
                         'emailName'    => $entity->getName(),
-                        'emailLang'    => $entity->getLanguage()
+                        'emailLang'    => $entity->getLanguage(),
                     ]
                 );
             }
@@ -749,7 +745,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId'     => $entity->getId()
+                    'objectId'     => $entity->getId(),
                 ];
 
                 return $this->postActionRedirect(
@@ -759,7 +755,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                             'returnUrl'       => $this->generateUrl('mautic_email_action', $viewParameters),
                             'viewParameters'  => $viewParameters,
                             'contentTemplate' => $template,
-                            'passthroughVars' => $passthrough
+                            'passthroughVars' => $passthrough,
                         ]
                     )
                 );
@@ -790,7 +786,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form'               => $this->setFormTheme($form, 'MauticEmailBundle:Email:form.html.php', 'MauticEmailBundle:FormTheme\Email'),
                     'isVariant'          => $entity->isVariant(true),
                     'tokens'             => (!empty($tokens)) ? $tokens['tokenSections'] : $model->getBuilderComponents($entity, 'tokenSections'),
@@ -800,7 +796,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                     'forceTypeSelection' => $forceTypeSelection,
                     'attachmentSize'     => $attachmentSize,
                     'builderAssets'      => trim(preg_replace('/\s+/', ' ', $this->getAssetsForBuilder())), // strip new lines
-                    'sectionForm'        => $sectionForm->createView()
+                    'sectionForm'        => $sectionForm->createView(),
                 ],
                 'contentTemplate' => 'MauticEmailBundle:Email:form.html.php',
                 'passthroughVars' => [
@@ -811,16 +807,16 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                         'mautic_email_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param $objectId
      *
@@ -853,9 +849,9 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -871,8 +867,8 @@ public function deleteAction($objectId)
             'contentTemplate' => 'MauticEmailBundle:Email:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_email_index',
-                'mauticContent' => 'email'
-            ]
+                'mauticContent' => 'email',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -883,7 +879,7 @@ public function deleteAction($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.email.error.notfound',
-                    'msgVars' => ['%id%' => $objectId]
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'email:emails:deleteown',
@@ -903,8 +899,8 @@ public function deleteAction($objectId)
                 'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $entity->getName(),
-                    '%id%'   => $objectId
-                ]
+                    '%id%'   => $objectId,
+                ],
             ];
         } //else don't do anything
 
@@ -912,18 +908,19 @@ public function deleteAction($objectId)
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Activate the builder
+     * Activate the builder.
      *
      * @param $objectId
      *
      * @return array|\Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     *
      * @throws \Exception
      * @throws \Mautic\CoreBundle\Exception\FileNotFoundException
      */
@@ -982,13 +979,13 @@ public function builderAction($objectId)
                 'content'  => $content,
                 'email'    => $entity,
                 'template' => $template,
-                'basePath' => $this->request->getBasePath()
+                'basePath' => $this->request->getBasePath(),
             ]
         );
     }
 
     /**
-     * Create an AB test
+     * Create an AB test.
      *
      * @param $objectId
      *
@@ -1032,7 +1029,7 @@ public function abtestAction($objectId)
     }
 
     /**
-     * Make the variant the main
+     * Make the variant the main.
      *
      * @param $objectId
      *
@@ -1051,8 +1048,8 @@ public function winnerAction($objectId)
             'contentTemplate' => 'MauticEmailBundle:Page:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_email_index',
-                'mauticContent' => 'page'
-            ]
+                'mauticContent' => 'page',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -1063,7 +1060,7 @@ public function winnerAction($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.email.error.notfound',
-                    'msgVars' => ['%id%' => $objectId]
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'email:emails:editown',
@@ -1083,31 +1080,30 @@ public function winnerAction($objectId)
                 'msg'     => 'mautic.email.notice.activated',
                 'msgVars' => [
                     '%name%' => $entity->getName(),
-                    '%id%'   => $objectId
-                ]
+                    '%id%'   => $objectId,
+                ],
             ];
 
-            $postActionVars['viewParameters']  = [
+            $postActionVars['viewParameters'] = [
                 'objectAction' => 'view',
-                'objectId'     => $objectId
+                'objectId'     => $objectId,
             ];
             $postActionVars['returnUrl']       = $this->generateUrl('mautic_page_action', $postActionVars['viewParameters']);
             $postActionVars['contentTemplate'] = 'MauticEmailBundle:Page:view';
-
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Manually sends emails
+     * Manually sends emails.
      *
      * @param $objectId
      *
@@ -1130,8 +1126,8 @@ public function sendAction($objectId)
             'contentTemplate' => 'MauticEmailBundle:Email:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_email_index',
-                'mauticContent' => 'email'
-            ]
+                'mauticContent' => 'email',
+            ],
         ];
 
         //not found
@@ -1144,9 +1140,9 @@ public function sendAction($objectId)
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.email.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -1162,20 +1158,18 @@ public function sendAction($objectId)
 
         // Check that the parent is getting sent
         if ($variantParent = $entity->getVariantParent()) {
-
             return $this->redirect($this->generateUrl('mautic_email_action',
                 [
                     'objectAction' => 'send',
-                    'objectId' => $variantParent->getId()
+                    'objectId'     => $variantParent->getId(),
                 ]
             ));
         }
         if ($translationParent = $entity->getTranslationParent()) {
-
             return $this->redirect($this->generateUrl('mautic_email_action',
                 [
                     'objectAction' => 'send',
-                    'objectId' => $translationParent->getId()
+                    'objectId'     => $translationParent->getId(),
                 ]
             ));
         }
@@ -1194,9 +1188,9 @@ public function sendAction($objectId)
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.email.error.send',
-                                'msgVars' => ['%name%' => $entity->getName()]
-                            ]
-                        ]
+                                'msgVars' => ['%name%' => $entity->getName()],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -1232,16 +1226,15 @@ public function sendAction($objectId)
                 'stats'      => $stats,
                 'status'     => $status,
                 'email'      => $entity,
-                'batchlimit' => $batchlimit
+                'batchlimit' => $batchlimit,
             ];
-
         } else {
             //process and send
             $contentTemplate = 'MauticEmailBundle:Send:form.html.php';
             $viewParameters  = [
                 'form'    => $form->createView(),
                 'email'   => $entity,
-                'pending' => $pending
+                'pending' => $pending,
             ];
         }
 
@@ -1251,15 +1244,14 @@ public function sendAction($objectId)
                 'contentTemplate' => $contentTemplate,
                 'passthroughVars' => [
                     'mauticContent' => 'emailSend',
-                    'route'         => $action
-                ]
+                    'route'         => $action,
+                ],
             ]
         );
     }
 
-
     /**
-     * Send example email to current user
+     * Send example email to current user.
      *
      * @param $objectId
      *
@@ -1301,8 +1293,8 @@ function (&$field) {
                 'id'        => $user->getId(),
                 'firstname' => $user->getFirstName(),
                 'lastname'  => $user->getLastName(),
-                'email'     => $user->getEmail()
-            ]
+                'email'     => $user->getEmail(),
+            ],
         ];
 
         // Send to current user
@@ -1317,7 +1309,7 @@ function (&$field) {
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -1333,8 +1325,8 @@ public function batchDeleteAction()
             'contentTemplate' => 'MauticEmailBundle:Email:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_email_index',
-                'mauticContent' => 'email'
-            ]
+                'mauticContent' => 'email',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -1351,7 +1343,7 @@ public function batchDeleteAction()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.email.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     'email:emails:viewown',
@@ -1375,8 +1367,8 @@ public function batchDeleteAction()
                     'type'    => 'notice',
                     'msg'     => 'mautic.email.notice.batch_deleted',
                     'msgVars' => [
-                        '%count%' => count($entities)
-                    ]
+                        '%count%' => count($entities),
+                    ],
                 ];
             }
         } //else don't do anything
@@ -1385,7 +1377,7 @@ public function batchDeleteAction()
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
@@ -1414,7 +1406,7 @@ private function processSlots($slots, $entity)
                 $slotConfig = [];
             }
 
-            $value       = isset($content[$slot]) ? $content[$slot] : "";
+            $value       = isset($content[$slot]) ? $content[$slot] : '';
             $placeholder = isset($slotConfig['placeholder']) ? $slotConfig['placeholder'] : 'mautic.page.builder.addcontent';
             $slotsHelper->set($slot, "<div data-slot=\"text\" id=\"slot-{$slot}\">{$value}</div>");
         }
@@ -1427,7 +1419,7 @@ private function processSlots($slots, $entity)
     }
 
     /**
-     * Get assets for builder
+     * Get assets for builder.
      */
     private function getAssetsForBuilder()
     {
@@ -1437,8 +1429,8 @@ private function getAssetsForBuilder()
         $routerHelper = $this->factory->getHelper('template.router');
 
         $assetsHelper->addScriptDeclaration("var mauticBasePath    = '".$this->request->getBasePath()."';");
-        $assetsHelper->addScriptDeclaration("var mauticAjaxUrl     = '".$routerHelper->generate("mautic_core_ajax")."';");
-        $assetsHelper->addScriptDeclaration("var mauticBaseUrl     = '".$routerHelper->generate("mautic_base_index")."';");
+        $assetsHelper->addScriptDeclaration("var mauticAjaxUrl     = '".$routerHelper->generate('mautic_core_ajax')."';");
+        $assetsHelper->addScriptDeclaration("var mauticBaseUrl     = '".$routerHelper->generate('mautic_base_index')."';");
         $assetsHelper->addScriptDeclaration("var mauticAssetPrefix = '".$assetsHelper->getAssetPrefix(true)."';");
         $assetsHelper->addCustomDeclaration($assetsHelper->getSystemScripts(true, true));
         $assetsHelper->addStylesheet('app/bundles/CoreBundle/Assets/css/libraries/builder.css');
diff --git a/app/bundles/EmailBundle/Controller/PublicController.php b/app/bundles/EmailBundle/Controller/PublicController.php
index cd38ac20864..227f3bfcf55 100644
--- a/app/bundles/EmailBundle/Controller/PublicController.php
+++ b/app/bundles/EmailBundle/Controller/PublicController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,12 +12,12 @@
 
 use Mautic\CoreBundle\Controller\FormController as CommonFormController;
 use Mautic\CoreBundle\Helper\EmojiHelper;
-use Mautic\EmailBundle\Helper\MailHelper;
-use Mautic\EmailBundle\Entity\Email;
 use Mautic\CoreBundle\Helper\TrackingPixelHelper;
-use Mautic\EmailBundle\Swiftmailer\Transport\InterfaceCallbackTransport;
 use Mautic\EmailBundle\EmailEvents;
+use Mautic\EmailBundle\Entity\Email;
 use Mautic\EmailBundle\Event\EmailSendEvent;
+use Mautic\EmailBundle\Helper\MailHelper;
+use Mautic\EmailBundle\Swiftmailer\Transport\InterfaceCallbackTransport;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -102,6 +103,7 @@ public function trackingImageAction($idHash)
      * @param $idHash
      *
      * @return Response
+     *
      * @throws \Exception
      * @throws \Mautic\CoreBundle\Exception\FileNotFoundException
      */
@@ -130,21 +132,21 @@ public function unsubscribeAction($idHash)
             if (!$message) {
                 $message = $translator->trans(
                     'mautic.email.unsubscribed.success',
-                    array(
+                    [
                         '%resubscribeUrl%' => '|URL|',
-                        '%email%'          => '|EMAIL|'
-                    )
+                        '%email%'          => '|EMAIL|',
+                    ]
                 );
             }
             $message = str_replace(
-                array(
+                [
                     '|URL|',
-                    '|EMAIL|'
-                ),
-                array(
-                    $this->generateUrl('mautic_email_resubscribe', array('idHash' => $idHash)),
-                    $stat->getEmailAddress()
-                ),
+                    '|EMAIL|',
+                ],
+                [
+                    $this->generateUrl('mautic_email_resubscribe', ['idHash' => $idHash]),
+                    $stat->getEmailAddress(),
+                ],
                 $message
             );
 
@@ -161,13 +163,13 @@ public function unsubscribeAction($idHash)
                 }
             }
         } else {
-            $email   = $lead = false;
+            $email   = $lead   = false;
             $message = $translator->trans('mautic.email.stat_record.not_found');
         }
 
         if (empty($template) && empty($formTemplate)) {
             $template = $this->coreParametersHelper->getParameter('theme');
-        } else if (!empty($formTemplate)) {
+        } elseif (!empty($formTemplate)) {
             $template = $formTemplate;
         }
         $theme = $this->factory->getTheme($template);
@@ -176,21 +178,21 @@ public function unsubscribeAction($idHash)
         }
         $config = $theme->getConfig();
 
-        $viewParams      = array(
+        $viewParams = [
             'email'    => $email,
             'lead'     => $lead,
             'template' => $template,
             'message'  => $message,
             'type'     => 'notice',
-            'name'     => $translator->trans('mautic.email.unsubscribe')
-        );
+            'name'     => $translator->trans('mautic.email.unsubscribe'),
+        ];
 
-        $contentTemplate = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $template . ':message.html.php');
+        $contentTemplate = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$template.':message.html.php');
 
         if (!empty($formContent)) {
             $viewParams['content'] = $formContent;
             if (in_array('form', $config['features'])) {
-                $contentTemplate = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $template . ':form.html.php');
+                $contentTemplate = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$template.':form.html.php');
             } else {
                 $contentTemplate = 'MauticFormBundle::form.html.php';
             }
@@ -203,6 +205,7 @@ public function unsubscribeAction($idHash)
      * @param $idHash
      *
      * @return Response
+     *
      * @throws \Exception
      * @throws \Mautic\CoreBundle\Exception\FileNotFoundException
      */
@@ -229,26 +232,25 @@ public function resubscribeAction($idHash)
             if (!$message) {
                 $message = $this->translator->trans(
                     'mautic.email.resubscribed.success',
-                    array(
+                    [
                         '%unsubscribedUrl%' => '|URL|',
-                        '%email%'           => '|EMAIL|'
-                    )
+                        '%email%'           => '|EMAIL|',
+                    ]
                 );
             }
             $message = str_replace(
-                array(
+                [
                     '|URL|',
-                    '|EMAIL|'
-                ),
-                array(
-                    $this->generateUrl('mautic_email_unsubscribe', array('idHash' => $idHash)),
-                    $stat->getEmailAddress()
-                ),
+                    '|EMAIL|',
+                ],
+                [
+                    $this->generateUrl('mautic_email_unsubscribe', ['idHash' => $idHash]),
+                    $stat->getEmailAddress(),
+                ],
                 $message
             );
-
         } else {
-            $email   = $lead = false;
+            $email   = $lead   = false;
             $message = $this->translator->trans('mautic.email.stat_record.not_found');
         }
 
@@ -267,26 +269,26 @@ public function resubscribeAction($idHash)
 
         $analytics = $this->factory->getHelper('template.analytics')->getCode();
 
-        if (! empty($analytics)) {
+        if (!empty($analytics)) {
             $this->factory->getHelper('template.assets')->addCustomDeclaration($analytics);
         }
 
-        $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $template . ':message.html.php');
+        $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$template.':message.html.php');
 
         return $this->render(
             $logicalName,
-            array(
+            [
                 'message'  => $message,
                 'type'     => 'notice',
                 'email'    => $email,
                 'lead'     => $lead,
-                'template' => $template
-            )
+                'template' => $template,
+            ]
         );
     }
 
     /**
-     * Handles mailer transport webhook post
+     * Handles mailer transport webhook post.
      *
      * @param $transport
      *
@@ -318,7 +320,7 @@ public function mailerCallbackAction($transport)
     }
 
     /**
-     * Preview email
+     * Preview email.
      *
      * @param $objectId
      *
@@ -346,10 +348,10 @@ public function previewAction($objectId)
         $idHash = 'xxxxxxxxxxxxxx';
 
         $BCcontent = $emailEntity->getContent();
-        $content = $emailEntity->getCustomHtml();
+        $content   = $emailEntity->getCustomHtml();
         if (empty($content) && !empty($BCcontent)) {
             $template = $emailEntity->getTemplate();
-            $slots = $this->factory->getTheme($template)->getSlots('email');
+            $slots    = $this->factory->getTheme($template)->getSlots('email');
 
             $assetsHelper = $this->factory->getHelper('template.assets');
 
@@ -357,18 +359,18 @@ public function previewAction($objectId)
 
             $this->processSlots($slots, $emailEntity);
 
-            $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $template . ':email.html.php');
+            $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$template.':email.html.php');
 
             $response = $this->render(
                 $logicalName,
-                array(
+                [
                     'inBrowser' => true,
                     'slots'     => $slots,
                     'content'   => $emailEntity->getContent(),
                     'email'     => $emailEntity,
                     'lead'      => null,
-                    'template'  => $template
-                )
+                    'template'  => $template,
+                ]
             );
 
             //replace tokens
@@ -379,7 +381,7 @@ public function previewAction($objectId)
         $content = EmojiHelper::toEmoji($content, 'short');
 
         // Override tracking_pixel
-        $tokens = array('{tracking_pixel}' => '');
+        $tokens = ['{tracking_pixel}' => ''];
 
         // Prepare a fake lead
         /** @var \Mautic\LeadBundle\Model\FieldModel $fieldModel */
@@ -396,21 +398,20 @@ function (&$field) {
         // Generate and replace tokens
         $event = new EmailSendEvent(
             null,
-            array(
+            [
                 'content'      => $content,
                 'email'        => $emailEntity,
                 'idHash'       => $idHash,
                 'tokens'       => $tokens,
                 'internalSend' => true,
-                'lead'         => $fields
-            )
+                'lead'         => $fields,
+            ]
         );
         $this->dispatcher->dispatch(EmailEvents::EMAIL_ON_DISPLAY, $event);
 
         $content = $event->getContent(true);
 
         return new Response($content);
-
     }
 
     /**
@@ -426,11 +427,11 @@ public function processSlots($slots, $entity)
 
         foreach ($slots as $slot => $slotConfig) {
             if (is_numeric($slot)) {
-                $slot = $slotConfig;
-                $slotConfig = array();
+                $slot       = $slotConfig;
+                $slotConfig = [];
             }
 
-            $value = isset($content[$slot]) ? $content[$slot] : "";
+            $value = isset($content[$slot]) ? $content[$slot] : '';
             $slotsHelper->set($slot, $value);
         }
     }
diff --git a/app/bundles/EmailBundle/DataFixtures/ORM/LoadEmailData.php b/app/bundles/EmailBundle/DataFixtures/ORM/LoadEmailData.php
index 407086ed8fa..4ce02e61e2a 100644
--- a/app/bundles/EmailBundle/DataFixtures/ORM/LoadEmailData.php
+++ b/app/bundles/EmailBundle/DataFixtures/ORM/LoadEmailData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,13 +19,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadEmailData
- *
- * @package Mautic\EmailBundle\DataFixtures\ORM
+ * Class LoadEmailData.
  */
 class LoadEmailData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -33,7 +31,6 @@ class LoadEmailData extends AbstractFixture implements OrderedFixtureInterface,
     /**
      * {@inheritdoc}
      */
-
     public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
@@ -47,16 +44,16 @@ public function load(ObjectManager $manager)
         $factory = $this->container->get('mautic.factory');
         $model   = $factory->getModel('email');
         $repo    = $model->getRepository();
-        $emails  = CsvHelper::csv_to_array(__DIR__ . '/fakeemaildata.csv');
+        $emails  = CsvHelper::csv_to_array(__DIR__.'/fakeemaildata.csv');
 
         foreach ($emails as $count => $rows) {
             $email = new Email();
-            $email->setDateAdded(new \DateTime);
-            $key = $count+1;
+            $email->setDateAdded(new \DateTime());
+            $key = $count + 1;
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set" . ucfirst($col);
-                    if (in_array($col, array('content','variantSettings'))) {
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
+                    if (in_array($col, ['content', 'variantSettings'])) {
                         $val = unserialize(stripslashes($val));
                     }
                     $email->$setter($val);
@@ -76,4 +73,4 @@ public function getOrder()
     {
         return 9;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/EmailEvents.php b/app/bundles/EmailBundle/EmailEvents.php
index 28dd445b5ce..e8f0d823d38 100644
--- a/app/bundles/EmailBundle/EmailEvents.php
+++ b/app/bundles/EmailBundle/EmailEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,9 +12,7 @@
 
 /**
  * Class EmailEvents
- * Events available for EmailBundle
- *
- * @package Mautic\EmailBundle
+ * Events available for EmailBundle.
  */
 final class EmailEvents
 {
@@ -28,45 +27,44 @@ final class EmailEvents
     const TOKEN_REPLACEMENT = 'mautic.email_token_replacement';
 
     /**
-     * The mautic.email_on_open event is dispatched when an email is opened
+     * The mautic.email_on_open event is dispatched when an email is opened.
      *
      * The event listener receives a
      * Mautic\EmailBundle\Event\EmailOpenEvent instance.
      *
      * @var string
      */
-    const EMAIL_ON_OPEN  = 'mautic.email_on_open';
+    const EMAIL_ON_OPEN = 'mautic.email_on_open';
 
     /**
-     * The mautic.email_on_send event is dispatched when an email is sent
+     * The mautic.email_on_send event is dispatched when an email is sent.
      *
      * The event listener receives a
      * Mautic\EmailBundle\Event\EmailSendEvent instance.
      *
      * @var string
      */
-    const EMAIL_ON_SEND  = 'mautic.email_on_send';
-
+    const EMAIL_ON_SEND = 'mautic.email_on_send';
 
     /**
-     * The mautic.email_on_display event is dispatched when an email is viewed via a browser
+     * The mautic.email_on_display event is dispatched when an email is viewed via a browser.
      *
      * The event listener receives a
      * Mautic\EmailBundle\Event\EmailSendEvent instance.
      *
      * @var string
      */
-    const EMAIL_ON_DISPLAY  = 'mautic.email_on_display';
+    const EMAIL_ON_DISPLAY = 'mautic.email_on_display';
 
     /**
-     * The mautic.email_on_build event is dispatched before displaying the email builder form to allow adding of tokens
+     * The mautic.email_on_build event is dispatched before displaying the email builder form to allow adding of tokens.
      *
      * The event listener receives a
      * Mautic\EmailBundle\Event\EmailEvent instance.
      *
      * @var string
      */
-    const EMAIL_ON_BUILD   = 'mautic.email_on_build';
+    const EMAIL_ON_BUILD = 'mautic.email_on_build';
 
     /**
      * The mautic.email_pre_save event is dispatched right before a email is persisted.
@@ -76,7 +74,7 @@ final class EmailEvents
      *
      * @var string
      */
-    const EMAIL_PRE_SAVE   = 'mautic.email_pre_save';
+    const EMAIL_PRE_SAVE = 'mautic.email_pre_save';
 
     /**
      * The mautic.email_post_save event is dispatched right after a email is persisted.
@@ -86,7 +84,7 @@ final class EmailEvents
      *
      * @var string
      */
-    const EMAIL_POST_SAVE   = 'mautic.email_post_save';
+    const EMAIL_POST_SAVE = 'mautic.email_post_save';
 
     /**
      * The mautic.email_pre_delete event is dispatched prior to when a email is deleted.
@@ -96,7 +94,7 @@ final class EmailEvents
      *
      * @var string
      */
-    const EMAIL_PRE_DELETE   = 'mautic.email_pre_delete';
+    const EMAIL_PRE_DELETE = 'mautic.email_pre_delete';
 
     /**
      * The mautic.email_post_delete event is dispatched after a email is deleted.
@@ -106,10 +104,10 @@ final class EmailEvents
      *
      * @var string
      */
-    const EMAIL_POST_DELETE   = 'mautic.email_post_delete';
+    const EMAIL_POST_DELETE = 'mautic.email_post_delete';
 
     /**
-     * The mautic.monitored_email_config event is dispatched during the configuration in order to inject custom folder locations
+     * The mautic.monitored_email_config event is dispatched during the configuration in order to inject custom folder locations.
      *
      * The event listener receives a Mautic\CoreBundle\Event\MonitoredEmailEvent instance.
      *
@@ -128,7 +126,7 @@ final class EmailEvents
 
     /**
      * The mautic.on_email_pre_fetch event is dispatched prior to fetching email through a configured monitored inbox in order to set
-     * search criteria for the mail to be fetched
+     * search criteria for the mail to be fetched.
      *
      * The event listener receives a Mautic\EmailBundle\Event\ParseEmailEvent instance.
      *
@@ -138,7 +136,7 @@ final class EmailEvents
 
     /**
      * The mautic.on_email_failed event is dispatched when an email has failed to clear the queue and is about to be deleted
-     * in order to give a bundle a chance to do an action based on failed email if required
+     * in order to give a bundle a chance to do an action based on failed email if required.
      *
      * The event listener receives a Mautic\EmailBundle\Event\QueueEmailEvent instance.
      *
@@ -148,7 +146,7 @@ final class EmailEvents
 
     /**
      * The mautic.on_email_resend event is dispatched when an attempt to resend an email occurs
-     * in order to give a bundle a chance to do an action based on failed email if required
+     * in order to give a bundle a chance to do an action based on failed email if required.
      *
      * The event listener receives a Mautic\EmailBundle\Event\QueueEmailEvent instance.
      *
@@ -175,4 +173,4 @@ final class EmailEvents
      * @var string
      */
     const ON_CAMPAIGN_TRIGGER_DECISION = 'mautic.email.on_campaign_trigger_decision';
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Entity/Copy.php b/app/bundles/EmailBundle/Entity/Copy.php
index fc347d8fe34..36de6183dfb 100644
--- a/app/bundles/EmailBundle/Entity/Copy.php
+++ b/app/bundles/EmailBundle/Entity/Copy.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,15 +15,12 @@
 use Mautic\CoreBundle\Helper\EmojiHelper;
 
 /**
- * Class Copy
- *
- * @package Mautic\EmailBundle\Entity
+ * Class Copy.
  */
 class Copy
 {
-
     /**
-     * MD5 hash of the content
+     * MD5 hash of the content.
      *
      * @var string
      */
@@ -46,7 +44,7 @@ class Copy
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
diff --git a/app/bundles/EmailBundle/Entity/CopyRepository.php b/app/bundles/EmailBundle/Entity/CopyRepository.php
index be566add487..2f1223e7794 100644
--- a/app/bundles/EmailBundle/Entity/CopyRepository.php
+++ b/app/bundles/EmailBundle/Entity/CopyRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Helper\EmojiHelper;
 
 /**
- * Class CopyRepository
+ * Class CopyRepository.
  */
 class CopyRepository extends CommonRepository
 {
@@ -36,7 +37,7 @@ public function saveCopy($hash, $subject, $body)
                     'id'           => $hash,
                     'body'         => $body,
                     'subject'      => $subject,
-                    'date_created' => (new \DateTime())->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s')
+                    'date_created' => (new \DateTime())->setTimezone(new \DateTimeZone('UTC'))->format('Y-m-d H:i:s'),
                 ]
             );
 
@@ -49,8 +50,8 @@ public function saveCopy($hash, $subject, $body)
     }
 
     /**
-     * @param      $string   md5 hash or content
-     * @param null $subject  If $string is the content, pass the subject to include it in the hash
+     * @param      $string  md5 hash or content
+     * @param null $subject If $string is the content, pass the subject to include it in the hash
      *
      * @return array
      */
@@ -58,7 +59,7 @@ public function findByHash($string, $subject = null)
     {
         if (null !== $subject) {
             // Combine subject with $string and hash together
-            $string = $subject . $string;
+            $string = $subject.$string;
         }
 
         // Assume that $string is already a md5 hash if 32 characters
@@ -79,7 +80,6 @@ public function findByHash($string, $subject = null)
         return $result;
     }
 
-
     /**
      * @return string
      */
diff --git a/app/bundles/EmailBundle/Entity/Email.php b/app/bundles/EmailBundle/Entity/Email.php
index 84c9b11159f..33de069272d 100644
--- a/app/bundles/EmailBundle/Entity/Email.php
+++ b/app/bundles/EmailBundle/Entity/Email.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,8 +14,8 @@
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
-use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\AssetBundle\Entity\Asset;
+use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\DynamicContentEntityTrait;
 use Mautic\CoreBundle\Entity\FormEntity;
 use Mautic\CoreBundle\Entity\TranslationEntityInterface;
@@ -31,9 +32,7 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Email
- *
- * @package Mautic\EmailBundle\Entity
+ * Class Email.
  */
 class Email extends FormEntity implements VariantEntityInterface, TranslationEntityInterface
 {
@@ -89,7 +88,7 @@ class Email extends FormEntity implements VariantEntityInterface, TranslationEnt
     /**
      * @var array
      */
-    private $content = array();
+    private $content = [];
 
     /**
      * @var string
@@ -167,7 +166,7 @@ class Email extends FormEntity implements VariantEntityInterface, TranslationEnt
     private $assetAttachments;
 
     /**
-     * Used to identify the page for the builder
+     * Used to identify the page for the builder.
      *
      * @var
      */
@@ -183,7 +182,7 @@ public function __clone()
         $this->variantSentCount = 0;
         $this->variantStartDate = null;
         $this->emailType        = null;
-        $this->sessionId        = 'new_' . hash('sha1', uniqid(mt_rand()));
+        $this->sessionId        = 'new_'.hash('sha1', uniqid(mt_rand()));
         $this->clearTranslations();
         $this->clearVariants();
 
@@ -193,7 +192,7 @@ public function __clone()
     /**
      * Email constructor.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->lists            = new ArrayCollection();
         $this->stats            = new ArrayCollection();
@@ -202,7 +201,7 @@ public function __construct ()
     }
 
     /**
-     * Clear stats
+     * Clear stats.
      */
     public function clearStats()
     {
@@ -212,7 +211,7 @@ public function clearStats()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -325,41 +324,41 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint(
             'name',
             new NotBlank(
-                array(
-                    'message' => 'mautic.core.name.required'
-                )
+                [
+                    'message' => 'mautic.core.name.required',
+                ]
             )
         );
 
         $metadata->addPropertyConstraint(
             'fromAddress',
             new \Symfony\Component\Validator\Constraints\Email(
-                array(
-                    'message' => 'mautic.core.email.required'
-                )
+                [
+                    'message' => 'mautic.core.email.required',
+                ]
             )
         );
 
         $metadata->addPropertyConstraint(
             'replyToAddress',
             new \Symfony\Component\Validator\Constraints\Email(
-                array(
-                    'message' => 'mautic.core.email.required'
-                )
+                [
+                    'message' => 'mautic.core.email.required',
+                ]
             )
         );
 
         $metadata->addPropertyConstraint(
             'bccAddress',
             new \Symfony\Component\Validator\Constraints\Email(
-                array(
-                    'message' => 'mautic.core.email.required'
-                )
+                [
+                    'message' => 'mautic.core.email.required',
+                ]
             )
         );
 
@@ -369,16 +368,16 @@ public static function loadValidatorMetadata (ClassMetadata $metadata)
                 $translationParent = $email->getTranslationParent();
 
                 if ($type == 'list' && null == $translationParent) {
-                    $validator  = $context->getValidator();
+                    $validator = $context->getValidator();
                     $violations = $validator->validate(
                         $email->getLists(),
                         [
                             new LeadListAccess(),
                             new NotBlank(
                                 [
-                                    'message' => 'mautic.lead.lists.required'
+                                    'message' => 'mautic.lead.lists.required',
                                 ]
-                            )
+                            ),
                         ]
                     );
                     if (count($violations) > 0) {
@@ -407,12 +406,12 @@ public static function loadValidatorMetadata (ClassMetadata $metadata)
                             ->addViolation();
                     }
                 }
-            }
+            },
         ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -420,17 +419,17 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('email')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'subject',
                     'language',
                     'category',
 
-                )
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'fromAddress',
                     'fromName',
                     'replyToAddress',
@@ -446,8 +445,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'variantReadCount',
                     'variantParent',
                     'variantChildren',
-                    'dynamicContent'
-                )
+                    'dynamicContent',
+                ]
             )
             ->build();
     }
@@ -456,16 +455,16 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
      * @param $prop
      * @param $val
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
 
         if ($prop == 'variantParent' || $prop == 'translationParent' || $prop == 'category' || $prop == 'list') {
             $currentId = ($current) ? $current->getId() : '';
             $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
-                $this->changes[$prop] = array($currentId, $newId);
+                $this->changes[$prop] = [$currentId, $newId];
             }
         } else {
             parent::isChanged($prop, $val);
@@ -513,11 +512,11 @@ public function setDescription($description)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
@@ -525,7 +524,7 @@ public function getId ()
     /**
      * @return mixed
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
@@ -535,7 +534,7 @@ public function getCategory ()
      *
      * @return $this
      */
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->isChanged('category', $category);
         $this->category = $category;
@@ -546,7 +545,7 @@ public function setCategory ($category)
     /**
      * @return array
      */
-    public function getContent ()
+    public function getContent()
     {
         return $this->content;
     }
@@ -556,7 +555,7 @@ public function getContent ()
      *
      * @return $this
      */
-    public function setContent ($content)
+    public function setContent($content)
     {
         // Ensure safe emoji
         $content = EmojiHelper::toShort($content);
@@ -570,7 +569,7 @@ public function setContent ($content)
     /**
      * @return mixed
      */
-    public function getReadCount ($includeVariants = false)
+    public function getReadCount($includeVariants = false)
     {
         return ($includeVariants) ? $this->getAccumulativeVariantCount('getReadCount') : $this->readCount;
     }
@@ -580,7 +579,7 @@ public function getReadCount ($includeVariants = false)
      *
      * @return $this
      */
-    public function setReadCount ($readCount)
+    public function setReadCount($readCount)
     {
         $this->readCount = $readCount;
 
@@ -590,7 +589,7 @@ public function setReadCount ($readCount)
     /**
      * @return mixed
      */
-    public function getRevision ()
+    public function getRevision()
     {
         return $this->revision;
     }
@@ -600,7 +599,7 @@ public function getRevision ()
      *
      * @return $this
      */
-    public function setRevision ($revision)
+    public function setRevision($revision)
     {
         $this->revision = $revision;
 
@@ -610,7 +609,7 @@ public function setRevision ($revision)
     /**
      * @return mixed
      */
-    public function getSessionId ()
+    public function getSessionId()
     {
         return $this->sessionId;
     }
@@ -620,7 +619,7 @@ public function getSessionId ()
      *
      * @return $this
      */
-    public function setSessionId ($sessionId)
+    public function setSessionId($sessionId)
     {
         $this->sessionId = $sessionId;
 
@@ -630,7 +629,7 @@ public function setSessionId ($sessionId)
     /**
      * @return mixed
      */
-    public function getSubject ()
+    public function getSubject()
     {
         return $this->subject;
     }
@@ -640,7 +639,7 @@ public function getSubject ()
      *
      * @return $this
      */
-    public function setSubject ($subject)
+    public function setSubject($subject)
     {
         $this->isChanged('subject', $subject);
         $this->subject = $subject;
@@ -731,7 +730,7 @@ public function setBccAddress($bccAddress)
     /**
      * @return mixed
      */
-    public function getTemplate ()
+    public function getTemplate()
     {
         return $this->template;
     }
@@ -741,7 +740,7 @@ public function getTemplate ()
      *
      * @return $this
      */
-    public function setTemplate ($template)
+    public function setTemplate($template)
     {
         $this->isChanged('template', $template);
         $this->template = $template;
@@ -749,11 +748,10 @@ public function setTemplate ($template)
         return $this;
     }
 
-
     /**
      * @return mixed
      */
-    public function getPublishDown ()
+    public function getPublishDown()
     {
         return $this->publishDown;
     }
@@ -763,7 +761,7 @@ public function getPublishDown ()
      *
      * @return $this
      */
-    public function setPublishDown ($publishDown)
+    public function setPublishDown($publishDown)
     {
         $this->isChanged('publishDown', $publishDown);
         $this->publishDown = $publishDown;
@@ -774,7 +772,7 @@ public function setPublishDown ($publishDown)
     /**
      * @return mixed
      */
-    public function getPublishUp ()
+    public function getPublishUp()
     {
         return $this->publishUp;
     }
@@ -784,7 +782,7 @@ public function getPublishUp ()
      *
      * @return $this
      */
-    public function setPublishUp ($publishUp)
+    public function setPublishUp($publishUp)
     {
         $this->isChanged('publishUp', $publishUp);
         $this->publishUp = $publishUp;
@@ -797,7 +795,7 @@ public function setPublishUp ($publishUp)
      *
      * @return mixed
      */
-    public function getSentCount ($includeVariants = false)
+    public function getSentCount($includeVariants = false)
     {
         return ($includeVariants) ? $this->getAccumulativeVariantCount('getSentCount') : $this->sentCount;
     }
@@ -807,7 +805,7 @@ public function getSentCount ($includeVariants = false)
      *
      * @return $this
      */
-    public function setSentCount ($sentCount)
+    public function setSentCount($sentCount)
     {
         $this->sentCount = $sentCount;
 
@@ -817,11 +815,9 @@ public function setSentCount ($sentCount)
     /**
      * @return mixed
      */
-    public function getVariantSentCount ($includeVariants = false)
+    public function getVariantSentCount($includeVariants = false)
     {
-
         return ($includeVariants) ? $this->getAccumulativeVariantCount('getVariantSentCount') : $this->variantSentCount;
-
     }
 
     /**
@@ -829,7 +825,7 @@ public function getVariantSentCount ($includeVariants = false)
      *
      * @return $this
      */
-    public function setVariantSentCount ($variantSentCount)
+    public function setVariantSentCount($variantSentCount)
     {
         $this->variantSentCount = $variantSentCount;
 
@@ -839,15 +835,16 @@ public function setVariantSentCount ($variantSentCount)
     /**
      * @return mixed
      */
-    public function getLists ()
+    public function getLists()
     {
         return $this->lists;
     }
 
     /**
-     * Add list
+     * Add list.
      *
      * @param LeadList $list
+     *
      * @return Email
      */
     public function addList(LeadList $list)
@@ -858,7 +855,7 @@ public function addList(LeadList $list)
     }
 
     /**
-     * Set the lists for this translation
+     * Set the lists for this translation.
      *
      * @param array $lists
      */
@@ -870,7 +867,7 @@ public function setLists(array $lists = [])
     }
 
     /**
-     * Remove list
+     * Remove list.
      *
      * @param LeadList $list
      */
@@ -882,7 +879,7 @@ public function removeList(LeadList $list)
     /**
      * @return mixed
      */
-    public function getPlainText ()
+    public function getPlainText()
     {
         return $this->plainText;
     }
@@ -892,7 +889,7 @@ public function getPlainText ()
      *
      * @return $this
      */
-    public function setPlainText ($plainText)
+    public function setPlainText($plainText)
     {
         $this->plainText = $plainText;
 
@@ -902,7 +899,7 @@ public function setPlainText ($plainText)
     /**
      * @return mixed
      */
-    public function getVariantReadCount ()
+    public function getVariantReadCount()
     {
         return $this->variantReadCount;
     }
@@ -912,7 +909,7 @@ public function getVariantReadCount ()
      *
      * @return $this
      */
-    public function setVariantReadCount ($variantReadCount)
+    public function setVariantReadCount($variantReadCount)
     {
         $this->variantReadCount = $variantReadCount;
 
@@ -922,7 +919,7 @@ public function setVariantReadCount ($variantReadCount)
     /**
      * @return mixed
      */
-    public function getStats ()
+    public function getStats()
     {
         return $this->stats;
     }
@@ -930,7 +927,7 @@ public function getStats ()
     /**
      * @return mixed
      */
-    public function getCustomHtml ()
+    public function getCustomHtml()
     {
         return $this->customHtml;
     }
@@ -940,7 +937,7 @@ public function getCustomHtml ()
      *
      * @return $this
      */
-    public function setCustomHtml ($customHtml)
+    public function setCustomHtml($customHtml)
     {
         $this->customHtml = $customHtml;
 
@@ -950,7 +947,7 @@ public function setCustomHtml ($customHtml)
     /**
      * @return mixed
      */
-    public function getUnsubscribeForm ()
+    public function getUnsubscribeForm()
     {
         return $this->unsubscribeForm;
     }
@@ -960,7 +957,7 @@ public function getUnsubscribeForm ()
      *
      * @return $this
      */
-    public function setUnsubscribeForm (Form $unsubscribeForm = null)
+    public function setUnsubscribeForm(Form $unsubscribeForm = null)
     {
         $this->unsubscribeForm = $unsubscribeForm;
 
@@ -988,9 +985,9 @@ public function setEmailType($emailType)
     }
 
     /**
-     * Add asset
+     * Add asset.
      *
-     * @param Asset  $asset
+     * @param Asset $asset
      *
      * @return Email
      */
@@ -1002,7 +999,7 @@ public function addAssetAttachment(Asset $asset)
     }
 
     /**
-     * Remove asset
+     * Remove asset.
      *
      * @param Asset $asset
      */
@@ -1012,7 +1009,7 @@ public function removeAssetAttachment(Asset $asset)
     }
 
     /**
-     * Get assetAttachments
+     * Get assetAttachments.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
@@ -1022,7 +1019,7 @@ public function getAssetAttachments()
     }
 
     /**
-     * Lifecycle callback to clean URLs in the content
+     * Lifecycle callback to clean URLs in the content.
      */
     public function cleanUrlsInContent()
     {
@@ -1032,7 +1029,7 @@ public function cleanUrlsInContent()
 
     /**
      * Check all links in content and decode &amp;
-     * This even works with double encoded ampersands
+     * This even works with double encoded ampersands.
      *
      * @param $content
      */
@@ -1050,4 +1047,4 @@ private function decodeAmpersands(&$content)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Entity/EmailRepository.php b/app/bundles/EmailBundle/Entity/EmailRepository.php
index f0cbb96ead0..a3a98223b7c 100644
--- a/app/bundles/EmailBundle/Entity/EmailRepository.php
+++ b/app/bundles/EmailBundle/Entity/EmailRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,14 +17,12 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class EmailRepository
- *
- * @package Mautic\EmailBundle\Entity
+ * Class EmailRepository.
  */
 class EmailRepository extends CommonRepository
 {
     /**
-     * Get an array of do not email emails
+     * Get an array of do not email emails.
      *
      * @return array
      */
@@ -31,8 +30,8 @@ public function getDoNotEmailList($leadIds = [])
     {
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $q->select('l.id, l.email')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_donotcontact', 'dnc')
-            ->leftJoin('dnc', MAUTIC_TABLE_PREFIX . 'leads', 'l', 'l.id = dnc.lead_id')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_donotcontact', 'dnc')
+            ->leftJoin('dnc', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = dnc.lead_id')
             ->where('dnc.channel = "email"')
             ->andWhere($q->expr()->neq('l.email', $q->expr()->literal('')));
 
@@ -44,7 +43,7 @@ public function getDoNotEmailList($leadIds = [])
 
         $results = $q->execute()->fetchAll();
 
-        $dnc = array();
+        $dnc = [];
         foreach ($results as $r) {
             $dnc[$r['id']] = strtolower($r['email']);
         }
@@ -53,7 +52,7 @@ public function getDoNotEmailList($leadIds = [])
     }
 
     /**
-     * Check to see if an email is set as do not contact
+     * Check to see if an email is set as do not contact.
      *
      * @param $email
      *
@@ -63,14 +62,14 @@ public function checkDoNotEmail($email)
     {
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $q->select('dnc.*')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_donotcontact', 'dnc')
-            ->leftJoin('dnc', MAUTIC_TABLE_PREFIX . 'leads', 'l', 'l.id = dnc.lead_id')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_donotcontact', 'dnc')
+            ->leftJoin('dnc', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = dnc.lead_id')
             ->where('dnc.channel = "email"')
             ->andWhere('l.email = :email')
             ->setParameter('email', $email);
 
         $results = $q->execute()->fetchAll();
-        $dnc = count($results) ? $results[0] : null;
+        $dnc     = count($results) ? $results[0] : null;
 
         if ($dnc === null) {
             return false;
@@ -78,17 +77,17 @@ public function checkDoNotEmail($email)
 
         $dnc['reason'] = (int) $dnc['reason'];
 
-        return array(
-            'id' => $dnc['id'],
+        return [
+            'id'           => $dnc['id'],
             'unsubscribed' => ($dnc['reason'] === DoNotContact::UNSUBSCRIBED),
-            'bounced' => ($dnc['reason'] === DoNotContact::BOUNCED),
-            'manual' => ($dnc['reason'] === DoNotContact::MANUAL),
-            'comments' => $dnc['comments']
-        );
+            'bounced'      => ($dnc['reason'] === DoNotContact::BOUNCED),
+            'manual'       => ($dnc['reason'] === DoNotContact::MANUAL),
+            'comments'     => $dnc['comments'],
+        ];
     }
 
     /**
-     * Remove email from DNE list
+     * Remove email from DNE list.
      *
      * @param $email
      */
@@ -99,10 +98,10 @@ public function removeFromDoNotEmailList($email)
 
         /** @var \Mautic\LeadBundle\Entity\LeadRepository $leadRepo */
         $leadRepo = $this->getEntityManager()->getRepository('MauticLeadBundle:Lead');
-        $leadId = (array) $leadRepo->getLeadByEmail($email, true);
+        $leadId   = (array) $leadRepo->getLeadByEmail($email, true);
 
         /** @var \Mautic\LeadBundle\Entity\Lead[] $leads */
-        $leads = array();
+        $leads = [];
 
         foreach ($leadId as $lead) {
             $leads[] = $leadRepo->getEntity($lead['id']);
@@ -114,22 +113,23 @@ public function removeFromDoNotEmailList($email)
     }
 
     /**
-     * Delete DNC row
+     * Delete DNC row.
      *
      * @param $id
      */
     public function deleteDoNotEmailEntry($id)
     {
-        $this->getEntityManager()->getConnection()->delete(MAUTIC_TABLE_PREFIX.'lead_donotcontact', array('id' => (int) $id));
+        $this->getEntityManager()->getConnection()->delete(MAUTIC_TABLE_PREFIX.'lead_donotcontact', ['id' => (int) $id]);
     }
 
     /**
-     * Get a list of entities
+     * Get a list of entities.
+     *
+     * @param array $args
      *
-     * @param array      $args
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this->getEntityManager()
             ->createQueryBuilder()
@@ -149,7 +149,7 @@ public function getEntities($args = array())
     }
 
     /**
-     * Get amounts of sent and read emails
+     * Get amounts of sent and read emails.
      *
      * @return array
      */
@@ -184,16 +184,16 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
         // Do not include leads in the do not contact table
         $dncQb = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $dncQb->select('null')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_donotcontact', 'dnc')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_donotcontact', 'dnc')
             ->where(
                 $dncQb->expr()->eq('dnc.lead_id', 'l.id')
             )
             ->andWhere('dnc.channel = "email"');
 
         // Do not include leads that have already been emailed
-        $statQb    = $this->getEntityManager()->getConnection()->createQueryBuilder()
+        $statQb = $this->getEntityManager()->getConnection()->createQueryBuilder()
             ->select('null')
-            ->from(MAUTIC_TABLE_PREFIX . 'email_stats', 'stat');
+            ->from(MAUTIC_TABLE_PREFIX.'email_stats', 'stat');
 
         $statExpr = $statQb->expr()->andX(
             $statQb->expr()->eq('stat.lead_id', 'l.id')
@@ -218,31 +218,31 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
             // Get a list of lists associated with this email
             $lists = $this->getEntityManager()->getConnection()->createQueryBuilder()
                 ->select('el.leadlist_id')
-                ->from(MAUTIC_TABLE_PREFIX . 'email_list_xref', 'el')
-                ->where('el.email_id = ' . (int) $emailId)
+                ->from(MAUTIC_TABLE_PREFIX.'email_list_xref', 'el')
+                ->where('el.email_id = '.(int) $emailId)
                 ->execute()
                 ->fetchAll();
 
-            $listIds = array();
+            $listIds = [];
             foreach ($lists as $list) {
                 $listIds[] = $list['leadlist_id'];
             }
 
             if (empty($listIds)) {
                 // Prevent fatal error
-                return ($countOnly) ? 0 : array();
+                return ($countOnly) ? 0 : [];
             }
         } elseif (!is_array($listIds)) {
-            $listIds = array($listIds);
+            $listIds = [$listIds];
         }
 
         // Main query
-        $q  = $this->getEntityManager()->getConnection()->createQueryBuilder();
+        $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
         if ($countOnly) {
             // distinct with an inner join seems faster
             $q->select('count(distinct(l.id)) as count');
 
-            $q->innerJoin('l', MAUTIC_TABLE_PREFIX . 'lead_lists_leads', 'll',
+            $q->innerJoin('l', MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'll',
                 $q->expr()->andX(
                     $q->expr()->in('ll.leadlist_id', $listIds),
                     $q->expr()->eq('ll.lead_id', 'l.id'),
@@ -256,7 +256,7 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
             // lead lists associated with this email
             $listQb = $this->getEntityManager()->getConnection()->createQueryBuilder();
             $listQb->select('distinct(ll.lead_id) lead_id')
-                ->from(MAUTIC_TABLE_PREFIX . 'lead_lists_leads', 'll')
+                ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'll')
                 ->where(
                     $listQb->expr()->andX(
                         $listQb->expr()->in('ll.leadlist_id', $listIds),
@@ -286,10 +286,9 @@ public function getEmailPendingLeads($emailId, $variantIds = null, $listIds = nu
         $results = $q->execute()->fetchAll();
 
         if ($countOnly) {
-
             return (isset($results[0])) ? $results[0]['count'] : 0;
         } else {
-            $leads = array();
+            $leads = [];
             foreach ($results as $r) {
                 $leads[$r['id']] = $r;
             }
@@ -365,13 +364,14 @@ public function getEmailList($search = '', $limit = 10, $start = 0, $viewOther =
 
     /**
      * @param \Doctrine\ORM\QueryBuilder $q
-     * @param              $filter
+     * @param                            $filter
+     *
      * @return array
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('e.name',  ":$unique"),
@@ -381,15 +381,17 @@ protected function addCatchAllWhereClause(&$q, $filter)
         if ($filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
      * @param \Doctrine\ORM\QueryBuilder $q
-     * @param              $filter
+     * @param                            $filter
+     *
      * @return array
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
@@ -400,12 +402,12 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq("e.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq("e.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
                 $expr = $q->expr()->orX(
@@ -415,20 +417,20 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->eq("IDENTITY(e.createdBy)", $this->currentUser->getId());
+                $expr            = $q->expr()->eq('IDENTITY(e.createdBy)', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.category'):
-                $expr = $q->expr()->like('c.alias', ":$unique");
+                $expr           = $q->expr()->like('c.alias', ":$unique");
                 $filter->strict = true;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.lang'):
-                $langUnique       = $this->generateRandomParameterName();
-                $langValue        = $filter->string . "_%";
-                $forceParameters = array(
+                $langUnique      = $this->generateRandomParameterName();
+                $langValue       = $filter->string.'_%';
+                $forceParameters = [
                     $langUnique => $langValue,
-                    $unique     => $filter->string
-                );
+                    $unique     => $filter->string,
+                ];
                 $expr = $q->expr()->orX(
                     $q->expr()->eq('e.language', ":$unique"),
                     $q->expr()->like('e.language', ":$langUnique")
@@ -443,13 +445,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif (!$returnParameter) {
-            $parameters = array();
+            $parameters = [];
         } else {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array( $expr, $parameters );
+        return [$expr, $parameters];
     }
 
     /**
@@ -457,14 +459,14 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isunpublished',
             'mautic.core.searchcommand.isuncategorized',
             'mautic.core.searchcommand.ismine',
             'mautic.core.searchcommand.category',
-            'mautic.core.searchcommand.lang'
-        );
+            'mautic.core.searchcommand.lang',
+        ];
     }
 
     /**
@@ -472,9 +474,9 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('e.name', 'ASC')
-        );
+        return [
+            ['e.name', 'ASC'],
+        ];
     }
 
     /**
@@ -486,7 +488,7 @@ public function getTableAlias()
     }
 
     /**
-     * Resets variant_start_date, variant_read_count, variant_sent_count
+     * Resets variant_start_date, variant_read_count, variant_sent_count.
      *
      * @param $variantParentId
      * @param $date
@@ -499,7 +501,7 @@ public function resetVariants($relatedIds, $date)
 
         $qb = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
-        $qb->update(MAUTIC_TABLE_PREFIX . 'emails')
+        $qb->update(MAUTIC_TABLE_PREFIX.'emails')
             ->set('variant_read_count', 0)
             ->set('variant_sent_count', 0)
             ->set('variant_start_date', ':date')
@@ -511,7 +513,7 @@ public function resetVariants($relatedIds, $date)
     }
 
     /**
-     * Up the read/sent counts
+     * Up the read/sent counts.
      *
      * @param            $id
      * @param string     $type
@@ -523,11 +525,11 @@ public function upCount($id, $type = 'sent', $increaseBy = 1, $variant = false)
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
         $q->update(MAUTIC_TABLE_PREFIX.'emails')
-            ->set($type . '_count', $type . '_count + ' . (int) $increaseBy)
-            ->where('id = ' . (int) $id);
+            ->set($type.'_count', $type.'_count + '.(int) $increaseBy)
+            ->where('id = '.(int) $id);
 
         if ($variant) {
-            $q->set('variant_' . $type . '_count', 'variant_' . $type . '_count + ' . (int) $increaseBy);
+            $q->set('variant_'.$type.'_count', 'variant_'.$type.'_count + '.(int) $increaseBy);
         }
 
         $q->execute();
@@ -540,7 +542,7 @@ public function upCount($id, $type = 'sent', $increaseBy = 1, $variant = false)
      */
     public function getPublishedBroadcasts($id = null)
     {
-        $qb = $this->createQueryBuilder($this->getTableAlias());
+        $qb   = $this->createQueryBuilder($this->getTableAlias());
         $expr = $this->getPublishedByDateExpression($qb, null, true, true, false);
 
         if (!empty($id)) {
diff --git a/app/bundles/EmailBundle/Entity/Stat.php b/app/bundles/EmailBundle/Entity/Stat.php
index 7c294b8ec80..4a4b392e702 100644
--- a/app/bundles/EmailBundle/Entity/Stat.php
+++ b/app/bundles/EmailBundle/Entity/Stat.php
@@ -1,29 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\IpAddress;
-use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
+
 /**
- * Class Stat
- *
- * @package Mautic\EmailBundle\Entity
+ * Class Stat.
  */
 class Stat
 {
-
     /**
      * @var int
      */
@@ -102,7 +99,7 @@ class Stat
     /**
      * @var array
      */
-    private $tokens = array();
+    private $tokens = [];
 
     /**
      * @var Copy
@@ -122,12 +119,12 @@ class Stat
     /**
      * @var array
      */
-    private $openDetails = array();
+    private $openDetails = [];
 
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -141,7 +138,6 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->addIndex(['date_sent'], 'email_date_sent')
             ->addIndex(['date_read'], 'email_date_read');
 
-
         $builder->addId();
 
         $builder->createManyToOne('email', 'Email')
@@ -217,7 +213,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -225,7 +221,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('stat')
             ->addProperties(
-                array(
+                [
                     'id',
                     'emailAddress',
                     'ipAddress',
@@ -241,8 +237,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'trackingHash',
                     'viewedInBrowser',
                     'lead',
-                    'email'
-                )
+                    'email',
+                ]
             )
             ->build();
     }
@@ -250,7 +246,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @return mixed
      */
-    public function getDateRead ()
+    public function getDateRead()
     {
         return $this->dateRead;
     }
@@ -258,7 +254,7 @@ public function getDateRead ()
     /**
      * @param mixed $dateRead
      */
-    public function setDateRead ($dateRead)
+    public function setDateRead($dateRead)
     {
         $this->dateRead = $dateRead;
     }
@@ -266,7 +262,7 @@ public function setDateRead ($dateRead)
     /**
      * @return mixed
      */
-    public function getDateSent ()
+    public function getDateSent()
     {
         return $this->dateSent;
     }
@@ -274,7 +270,7 @@ public function getDateSent ()
     /**
      * @param mixed $dateSent
      */
-    public function setDateSent ($dateSent)
+    public function setDateSent($dateSent)
     {
         $this->dateSent = $dateSent;
     }
@@ -282,7 +278,7 @@ public function setDateSent ($dateSent)
     /**
      * @return Email
      */
-    public function getEmail ()
+    public function getEmail()
     {
         return $this->email;
     }
@@ -290,7 +286,7 @@ public function getEmail ()
     /**
      * @param mixed $email
      */
-    public function setEmail (Email $email = null)
+    public function setEmail(Email $email = null)
     {
         $this->email = $email;
     }
@@ -298,7 +294,7 @@ public function setEmail (Email $email = null)
     /**
      * @return mixed
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
@@ -306,7 +302,7 @@ public function getId ()
     /**
      * @return IpAddress
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
@@ -314,7 +310,7 @@ public function getIpAddress ()
     /**
      * @param mixed $ip
      */
-    public function setIpAddress (IpAddress $ip)
+    public function setIpAddress(IpAddress $ip)
     {
         $this->ipAddress = $ip;
     }
@@ -322,7 +318,7 @@ public function setIpAddress (IpAddress $ip)
     /**
      * @return mixed
      */
-    public function getIsRead ()
+    public function getIsRead()
     {
         return $this->isRead;
     }
@@ -330,7 +326,7 @@ public function getIsRead ()
     /**
      * @return mixed
      */
-    public function isRead ()
+    public function isRead()
     {
         return $this->getIsRead();
     }
@@ -338,7 +334,7 @@ public function isRead ()
     /**
      * @param mixed $isRead
      */
-    public function setIsRead ($isRead)
+    public function setIsRead($isRead)
     {
         $this->isRead = $isRead;
     }
@@ -346,7 +342,7 @@ public function setIsRead ($isRead)
     /**
      * @return Lead
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -354,7 +350,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead (Lead $lead = null)
+    public function setLead(Lead $lead = null)
     {
         $this->lead = $lead;
     }
@@ -362,7 +358,7 @@ public function setLead (Lead $lead = null)
     /**
      * @return mixed
      */
-    public function getTrackingHash ()
+    public function getTrackingHash()
     {
         return $this->trackingHash;
     }
@@ -370,7 +366,7 @@ public function getTrackingHash ()
     /**
      * @param mixed $trackingHash
      */
-    public function setTrackingHash ($trackingHash)
+    public function setTrackingHash($trackingHash)
     {
         $this->trackingHash = $trackingHash;
     }
@@ -378,7 +374,7 @@ public function setTrackingHash ($trackingHash)
     /**
      * @return \Mautic\LeadBundle\Entity\LeadList
      */
-    public function getList ()
+    public function getList()
     {
         return $this->list;
     }
@@ -386,7 +382,7 @@ public function getList ()
     /**
      * @param mixed $list
      */
-    public function setList ($list)
+    public function setList($list)
     {
         $this->list = $list;
     }
@@ -394,7 +390,7 @@ public function setList ($list)
     /**
      * @return mixed
      */
-    public function getRetryCount ()
+    public function getRetryCount()
     {
         return $this->retryCount;
     }
@@ -402,23 +398,20 @@ public function getRetryCount ()
     /**
      * @param mixed $retryCount
      */
-    public function setRetryCount ($retryCount)
+    public function setRetryCount($retryCount)
     {
         $this->retryCount = $retryCount;
     }
 
-    /**
-     *
-     */
-    public function upRetryCount ()
+    public function upRetryCount()
     {
-        $this->retryCount++;
+        ++$this->retryCount;
     }
 
     /**
      * @return mixed
      */
-    public function getIsFailed ()
+    public function getIsFailed()
     {
         return $this->isFailed;
     }
@@ -426,7 +419,7 @@ public function getIsFailed ()
     /**
      * @param mixed $isFailed
      */
-    public function setIsFailed ($isFailed)
+    public function setIsFailed($isFailed)
     {
         $this->isFailed = $isFailed;
     }
@@ -434,7 +427,7 @@ public function setIsFailed ($isFailed)
     /**
      * @return mixed
      */
-    public function isFailed ()
+    public function isFailed()
     {
         return $this->getIsFailed();
     }
@@ -442,7 +435,7 @@ public function isFailed ()
     /**
      * @return mixed
      */
-    public function getEmailAddress ()
+    public function getEmailAddress()
     {
         return $this->emailAddress;
     }
@@ -450,7 +443,7 @@ public function getEmailAddress ()
     /**
      * @param mixed $emailAddress
      */
-    public function setEmailAddress ($emailAddress)
+    public function setEmailAddress($emailAddress)
     {
         $this->emailAddress = $emailAddress;
     }
@@ -458,7 +451,7 @@ public function setEmailAddress ($emailAddress)
     /**
      * @return mixed
      */
-    public function getViewedInBrowser ()
+    public function getViewedInBrowser()
     {
         return $this->viewedInBrowser;
     }
@@ -466,7 +459,7 @@ public function getViewedInBrowser ()
     /**
      * @param mixed $viewedInBrowser
      */
-    public function setViewedInBrowser ($viewedInBrowser)
+    public function setViewedInBrowser($viewedInBrowser)
     {
         $this->viewedInBrowser = $viewedInBrowser;
     }
@@ -474,7 +467,7 @@ public function setViewedInBrowser ($viewedInBrowser)
     /**
      * @return mixed
      */
-    public function getSource ()
+    public function getSource()
     {
         return $this->source;
     }
@@ -482,7 +475,7 @@ public function getSource ()
     /**
      * @param mixed $source
      */
-    public function setSource ($source)
+    public function setSource($source)
     {
         $this->source = $source;
     }
@@ -490,7 +483,7 @@ public function setSource ($source)
     /**
      * @return mixed
      */
-    public function getSourceId ()
+    public function getSourceId()
     {
         return $this->sourceId;
     }
@@ -498,15 +491,15 @@ public function getSourceId ()
     /**
      * @param mixed $sourceId
      */
-    public function setSourceId ($sourceId)
+    public function setSourceId($sourceId)
     {
-        $this->sourceId = (int)$sourceId;
+        $this->sourceId = (int) $sourceId;
     }
 
     /**
      * @return mixed
      */
-    public function getTokens ()
+    public function getTokens()
     {
         return $this->tokens;
     }
@@ -514,7 +507,7 @@ public function getTokens ()
     /**
      * @param mixed $tokens
      */
-    public function setTokens ($tokens)
+    public function setTokens($tokens)
     {
         $this->tokens = $tokens;
     }
@@ -546,17 +539,17 @@ public function addOpenDetails($details)
     {
         $this->openDetails[] = $details;
 
-        $this->openCount++;
+        ++$this->openCount;
     }
 
     /**
-     * Up the sent count
+     * Up the sent count.
      *
      * @return Stat
      */
     public function upOpenCount()
     {
-        $count = (int) $this->openCount + 1;
+        $count           = (int) $this->openCount + 1;
         $this->openCount = $count;
 
         return $this;
diff --git a/app/bundles/EmailBundle/Entity/StatDevice.php b/app/bundles/EmailBundle/Entity/StatDevice.php
index 2780970b3de..da72799f03d 100644
--- a/app/bundles/EmailBundle/Entity/StatDevice.php
+++ b/app/bundles/EmailBundle/Entity/StatDevice.php
@@ -1,29 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\IpAddress;
-use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\LeadBundle\Entity\LeadDevice;
 
 /**
- * Class StatDevice
- *
- * @package Mautic\EmailBundle\Entity
+ * Class StatDevice.
  */
 class StatDevice
 {
-
     /**
      * @var int
      */
@@ -49,11 +46,10 @@ class StatDevice
      */
     private $dateOpened;
 
-
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -69,7 +65,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
 
         $builder->createManyToOne('stat', 'Stat')
             ->addJoinColumn('stat_id', 'id', true, false, 'CASCADE')
-            ->build();;
+            ->build();
 
         $builder->addIpAddress(true);
 
@@ -79,7 +75,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -87,12 +83,12 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('stat')
             ->addProperties(
-                array(
+                [
                     'id',
                     'device',
                     'ipAddress',
-                    'stat'
-                )
+                    'stat',
+                ]
             )
             ->build();
     }
@@ -100,7 +96,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @return mixed
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
@@ -108,7 +104,7 @@ public function getId ()
     /**
      * @return IpAddress
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
@@ -116,7 +112,7 @@ public function getIpAddress ()
     /**
      * @param mixed $ip
      */
-    public function setIpAddress (IpAddress $ip)
+    public function setIpAddress(IpAddress $ip)
     {
         $this->ipAddress = $ip;
     }
@@ -124,7 +120,7 @@ public function setIpAddress (IpAddress $ip)
     /**
      * @return Stat
      */
-    public function getStat ()
+    public function getStat()
     {
         return $this->stat;
     }
@@ -132,7 +128,7 @@ public function getStat ()
     /**
      * @param Stat
      */
-    public function setStat (Stat $stat)
+    public function setStat(Stat $stat)
     {
         $this->stat = $stat;
     }
@@ -140,7 +136,7 @@ public function setStat (Stat $stat)
     /**
      * @return mixed
      */
-    public function getDateOpened ()
+    public function getDateOpened()
     {
         return $this->dateOpened;
     }
@@ -148,7 +144,7 @@ public function getDateOpened ()
     /**
      * @param mixed $dateOpened
      */
-    public function setDateOpened ($dateOpened)
+    public function setDateOpened($dateOpened)
     {
         $this->dateOpened = $dateOpened;
     }
@@ -156,7 +152,7 @@ public function setDateOpened ($dateOpened)
     /**
      * @return mixed
      */
-    public function getDevice ()
+    public function getDevice()
     {
         return $this->device;
     }
@@ -164,7 +160,7 @@ public function getDevice ()
     /**
      * @param mixed $device
      */
-    public function setDevice (LeadDevice $device)
+    public function setDevice(LeadDevice $device)
     {
         $this->device = $device;
     }
diff --git a/app/bundles/EmailBundle/Entity/StatDeviceRepository.php b/app/bundles/EmailBundle/Entity/StatDeviceRepository.php
index 4b6d94c3cfa..bae4bf2bbdf 100644
--- a/app/bundles/EmailBundle/Entity/StatDeviceRepository.php
+++ b/app/bundles/EmailBundle/Entity/StatDeviceRepository.php
@@ -1,22 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Entity;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class StatDeviceRepository
- *
- * @package Mautic\EmailBundle\Entity
+ * Class StatDeviceRepository.
  */
 class StatDeviceRepository extends CommonRepository
 {
@@ -32,18 +30,18 @@ public function getDeviceStats($emailIds, \DateTime $fromDate = null, \DateTime
 
         $qb->select('count(es.id) as count, d.device as device, es.list_id')
             ->from(MAUTIC_TABLE_PREFIX.'email_stats_devices', 'ed')
-            ->join('ed',MAUTIC_TABLE_PREFIX.'lead_devices','d','d.id = ed.device_id')
-            ->join('ed',MAUTIC_TABLE_PREFIX.'email_stats','es','es.id = ed.stat_id');
+            ->join('ed', MAUTIC_TABLE_PREFIX.'lead_devices', 'd', 'd.id = ed.device_id')
+            ->join('ed', MAUTIC_TABLE_PREFIX.'email_stats', 'es', 'es.id = ed.stat_id');
         if ($emailIds != null) {
             if (!is_array($emailIds)) {
                 $emailIds = [(int) $emailIds];
             }
-            $qb ->where(
+            $qb->where(
                 $qb->expr()->in('es.email_id', $emailIds)
             );
         }
 
-            $qb->groupBy('es.list_id, d.device');
+        $qb->groupBy('es.list_id, d.device');
 
         if ($fromDate !== null) {
             //make sure the date is UTC
@@ -62,4 +60,4 @@ public function getDeviceStats($emailIds, \DateTime $fromDate = null, \DateTime
 
         return $qb->execute()->fetchAll();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Entity/StatRepository.php b/app/bundles/EmailBundle/Entity/StatRepository.php
index 679e75e866b..e622b0877e8 100755
--- a/app/bundles/EmailBundle/Entity/StatRepository.php
+++ b/app/bundles/EmailBundle/Entity/StatRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,9 +16,7 @@
 use Mautic\LeadBundle\Entity\TimelineTrait;
 
 /**
- * Class StatRepository
- *
- * @package Mautic\EmailBundle\Entity
+ * Class StatRepository.
  */
 class StatRepository extends CommonRepository
 {
@@ -27,6 +26,7 @@ class StatRepository extends CommonRepository
      * @param $trackingHash
      *
      * @return mixed
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -72,7 +72,7 @@ public function getSentStats($emailIds, $listId = null)
         $result = $q->execute()->fetchAll();
 
         //index by lead
-        $stats = array();
+        $stats = [];
         foreach ($result as $r) {
             $stats[$r['lead_id']] = $r['lead_id'];
         }
@@ -98,7 +98,7 @@ public function getSentCount($emailIds = null, $listId = null, ChartQuery $chart
 
         if ($emailIds) {
             if (!is_array($emailIds)) {
-                $emailIds = array((int) $emailIds);
+                $emailIds = [(int) $emailIds];
             }
             $q->where(
                 $q->expr()->in('s.email_id', $emailIds)
@@ -109,7 +109,7 @@ public function getSentCount($emailIds = null, $listId = null, ChartQuery $chart
             $q->addSelect('s.list_id')
                 ->groupBy('s.list_id');
         } elseif ($listId) {
-            $q->andWhere('s.list_id = ' . (int) $listId);
+            $q->andWhere('s.list_id = '.(int) $listId);
         }
 
         $q->andWhere('s.is_failed = :false')
@@ -150,7 +150,7 @@ public function getReadCount($emailIds = null, $listId = null, ChartQuery $chart
 
         if ($emailIds) {
             if (!is_array($emailIds)) {
-                $emailIds = array((int) $emailIds);
+                $emailIds = [(int) $emailIds];
             }
             $q->where(
                 $q->expr()->in('s.email_id', $emailIds)
@@ -161,7 +161,7 @@ public function getReadCount($emailIds = null, $listId = null, ChartQuery $chart
             $q->addSelect('s.list_id')
                 ->groupBy('s.list_id');
         } elseif ($listId) {
-            $q->andWhere('s.list_id = ' . (int) $listId);
+            $q->andWhere('s.list_id = '.(int) $listId);
         }
 
         $q->andWhere('is_read = :true')
@@ -194,7 +194,7 @@ public function getReadCount($emailIds = null, $listId = null, ChartQuery $chart
      */
     public function getOpenedRates($emailIds, \DateTime $fromDate = null)
     {
-        $inIds = (!is_array($emailIds)) ? array($emailIds) : $emailIds;
+        $inIds = (!is_array($emailIds)) ? [$emailIds] : $emailIds;
 
         $sq = $this->_em->getConnection()->createQueryBuilder();
         $sq->select('e.email_id, count(e.id) as the_count')
@@ -218,13 +218,13 @@ public function getOpenedRates($emailIds, \DateTime $fromDate = null)
         //get a total number of sent emails first
         $totalCounts = $sq->execute()->fetchAll();
 
-        $return  = array();
+        $return = [];
         foreach ($inIds as $id) {
-            $return[$id] = array(
+            $return[$id] = [
                 'totalCount' => 0,
                 'readCount'  => 0,
-                'readRate'   => 0
-            );
+                'readRate'   => 0,
+            ];
         }
 
         foreach ($totalCounts as $t) {
@@ -264,7 +264,7 @@ public function getFailedCount($emailIds = null, $listId = null, ChartQuery $cha
 
         if ($emailIds) {
             if (!is_array($emailIds)) {
-                $emailIds = array((int) $emailIds);
+                $emailIds = [(int) $emailIds];
             }
             $q->where(
                 $q->expr()->in('s.email_id', $emailIds)
@@ -275,7 +275,7 @@ public function getFailedCount($emailIds = null, $listId = null, ChartQuery $cha
             $q->addSelect('s.list_id')
                 ->groupBy('s.list_id');
         } elseif ($listId) {
-            $q->andWhere('s.list_id = ' . (int) $listId);
+            $q->andWhere('s.list_id = '.(int) $listId);
         }
 
         $q->andWhere('is_failed = :true')
@@ -314,7 +314,7 @@ public function getOpenedStatIds($emailIds = null, $listId = null)
 
         if ($emailIds) {
             if (!is_array($emailIds)) {
-                $emailIds = array((int) $emailIds);
+                $emailIds = [(int) $emailIds];
             }
             $q->where(
                 $q->expr()->in('s.email_id', $emailIds)
@@ -324,7 +324,7 @@ public function getOpenedStatIds($emailIds = null, $listId = null)
         $q->andWhere('open_count > 0');
 
         if ($listId) {
-            $q->andWhere('s.list_id = ' . (int) $listId);
+            $q->andWhere('s.list_id = '.(int) $listId);
         }
 
         $results = $q->execute()->fetchAll();
@@ -333,16 +333,17 @@ public function getOpenedStatIds($emailIds = null, $listId = null)
     }
 
     /**
-     * Get a lead's email stat
+     * Get a lead's email stat.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getLeadStats($leadId, array $options = array())
+    public function getLeadStats($leadId, array $options = [])
     {
         $query = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $query->from(MAUTIC_TABLE_PREFIX.'email_stats', 's')
@@ -407,7 +408,6 @@ public function getLeadStats($leadId, array $options = array())
             );
         }
 
-
         $timeToReadParser = function (&$stat) {
             $dateSent = new DateTimeHelper($stat['dateSent']);
             if (!empty($stat['dateSent']) && !empty($stat['dateRead'])) {
@@ -429,11 +429,12 @@ public function getLeadStats($leadId, array $options = array())
     }
 
     /**
-     * Get counts for Sent, Read and Failed emails
+     * Get counts for Sent, Read and Failed emails.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -450,11 +451,12 @@ public function getIgnoredReadFailed($query = null)
     }
 
     /**
-     * Get pie graph data for Sent, Read and Failed email count
+     * Get pie graph data for Sent, Read and Failed email count.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -465,17 +467,18 @@ public function getMostEmails($query, $limit = 10, $offset = 0)
             ->setFirstResult($offset);
 
         $results = $query->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Get sent counts based grouped by email Id
+     * Get sent counts based grouped by email Id.
      *
      * @param array $emailIds
      *
      * @return array
      */
-    public function getSentCounts($emailIds = array(), \DateTime $fromDate = null)
+    public function getSentCounts($emailIds = [], \DateTime $fromDate = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('e.email_id, count(e.id) as sentcount')
@@ -499,7 +502,7 @@ public function getSentCounts($emailIds = array(), \DateTime $fromDate = null)
         //get a total number of sent emails first
         $results = $q->execute()->fetchAll();
 
-        $counts = array();
+        $counts = [];
 
         foreach ($results as $r) {
             $counts[$r['email_id']] = $r['sentcount'];
@@ -509,7 +512,7 @@ public function getSentCounts($emailIds = array(), \DateTime $fromDate = null)
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -517,21 +520,21 @@ public function getSentCounts($emailIds = array(), \DateTime $fromDate = null)
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'email_stats')
+        $q->update(MAUTIC_TABLE_PREFIX.'email_stats')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 
     /**
-     * Delete a stat
+     * Delete a stat.
      *
      * @param $id
      */
     public function deleteStat($id)
     {
-        $this->_em->getConnection()->delete(MAUTIC_TABLE_PREFIX.'email_stats', array('id' => (int) $id));
-        $this->_em->getConnection()->delete(MAUTIC_TABLE_PREFIX.'email_stats_devices', array('stat_id' => (int) $id));
+        $this->_em->getConnection()->delete(MAUTIC_TABLE_PREFIX.'email_stats', ['id' => (int) $id]);
+        $this->_em->getConnection()->delete(MAUTIC_TABLE_PREFIX.'email_stats_devices', ['stat_id' => (int) $id]);
     }
 
     /**
@@ -551,7 +554,7 @@ public function getTableAlias()
     public function findContactEmailStats($leadId, $emailId)
     {
         return $this->createQueryBuilder('s')
-            ->where("IDENTITY(s.lead) = ".(int)$leadId." AND IDENTITY(s.email) = ".(int)$emailId)
+            ->where('IDENTITY(s.lead) = '.(int) $leadId.' AND IDENTITY(s.email) = '.(int) $emailId)
             ->getQuery()
             ->getResult();
     }
@@ -571,7 +574,7 @@ public function checkContactsSentEmail($contacts, $emailId)
         ->andWhere('s.lead_id in (:contacts)')
             ->andWhere('is_failed = 0')
         ->setParameter(':email', $emailId)
-        ->setParameter(':contacts',$contacts);
+        ->setParameter(':contacts', $contacts);
 
         $results = $query->execute()->fetch();
 
diff --git a/app/bundles/EmailBundle/Event/EmailBuilderEvent.php b/app/bundles/EmailBundle/Event/EmailBuilderEvent.php
index 314242c4869..6215b5fa4ea 100644
--- a/app/bundles/EmailBundle/Event/EmailBuilderEvent.php
+++ b/app/bundles/EmailBundle/Event/EmailBuilderEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\EmailBundle\Entity\Email;
 
 /**
- * Class EmailBuilderEvent
- *
- * @package Mautic\PageBundle\Event
+ * Class EmailBuilderEvent.
  */
 class EmailBuilderEvent extends BuilderEvent
 {
@@ -26,4 +25,4 @@ public function getEmail()
     {
         return $this->entity;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Event/EmailEvent.php b/app/bundles/EmailBundle/Event/EmailEvent.php
index 5a7ceceb7c8..60adea994d2 100644
--- a/app/bundles/EmailBundle/Event/EmailEvent.php
+++ b/app/bundles/EmailBundle/Event/EmailEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\EmailBundle\Entity\Email;
 
 /**
- * Class EmailEvent
- *
- * @package Mautic\EmailBundle\Event
+ * Class EmailEvent.
  */
 class EmailEvent extends CommonEvent
 {
@@ -25,12 +24,12 @@ class EmailEvent extends CommonEvent
      */
     public function __construct(Email &$email, $isNew = false)
     {
-        $this->entity  =& $email;
-        $this->isNew   = $isNew;
+        $this->entity = &$email;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Email entity
+     * Returns the Email entity.
      *
      * @return Email
      */
@@ -40,7 +39,7 @@ public function getEmail()
     }
 
     /**
-     * Sets the Email entity
+     * Sets the Email entity.
      *
      * @param Email $email
      */
@@ -48,4 +47,4 @@ public function setEmail(Email $email)
     {
         $this->entity = $email;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Event/EmailOpenEvent.php b/app/bundles/EmailBundle/Event/EmailOpenEvent.php
index 46ffc8f249b..2679ec5b544 100644
--- a/app/bundles/EmailBundle/Event/EmailOpenEvent.php
+++ b/app/bundles/EmailBundle/Event/EmailOpenEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,9 +16,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class EmailOpenEvent
- *
- * @package Mautic\EmailBundle\Event
+ * Class EmailOpenEvent.
  */
 class EmailOpenEvent extends CommonEvent
 {
@@ -48,7 +47,7 @@ public function __construct(Stat $stat, $request, $firstTime = false)
     }
 
     /**
-     * Returns the Email entity
+     * Returns the Email entity.
      *
      * @return Email
      */
@@ -58,7 +57,7 @@ public function getEmail()
     }
 
     /**
-     * Get email request
+     * Get email request.
      *
      * @return string
      */
@@ -76,7 +75,7 @@ public function getStat()
     }
 
     /**
-     * Returns if this is first time the email is read
+     * Returns if this is first time the email is read.
      *
      * @return bool
      */
@@ -84,4 +83,4 @@ public function isFirstTime()
     {
         return $this->firstTime;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Event/EmailSendEvent.php b/app/bundles/EmailBundle/Event/EmailSendEvent.php
index 80f3ce2d48f..80cddf4308c 100644
--- a/app/bundles/EmailBundle/Event/EmailSendEvent.php
+++ b/app/bundles/EmailBundle/Event/EmailSendEvent.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
-use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\EmailBundle\Entity\Email;
+use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class EmailSendEvent
- *
- * @package Mautic\EmailBundle\Event
+ * Class EmailSendEvent.
  */
 class EmailSendEvent extends CommonEvent
 {
@@ -59,7 +58,7 @@ class EmailSendEvent extends CommonEvent
     /**
      * @var array
      */
-    private $tokens = array();
+    private $tokens = [];
 
     /**
      * @var internalSend
@@ -69,13 +68,13 @@ class EmailSendEvent extends CommonEvent
     /**
      * @var array
      */
-    private $textHeaders = array();
+    private $textHeaders = [];
 
     /**
      * @param MailHelper $helper
      * @param array      $args
      */
-    public function __construct(MailHelper $helper = null, $args = array())
+    public function __construct(MailHelper $helper = null, $args = [])
     {
         $this->helper = $helper;
 
@@ -122,9 +121,8 @@ public function __construct(MailHelper $helper = null, $args = array())
         }
     }
 
-
     /**
-     * Check if this email is an internal send or to the lead; if an internal send, don't append lead tracking
+     * Check if this email is an internal send or to the lead; if an internal send, don't append lead tracking.
      *
      * @return internalSend
      */
@@ -134,7 +132,7 @@ public function isInternalSend()
     }
 
     /**
-     * Return if the transport and mailer is in batch mode (tokenized emails)
+     * Return if the transport and mailer is in batch mode (tokenized emails).
      *
      * @return bool
      */
@@ -144,7 +142,7 @@ public function inTokenizationMode()
     }
 
     /**
-     * Returns the Email entity
+     * Returns the Email entity.
      *
      * @return Email
      */
@@ -154,7 +152,7 @@ public function getEmail()
     }
 
     /**
-     * Get email content
+     * Get email content.
      *
      * @param $replaceTokens
      *
@@ -165,7 +163,6 @@ public function getContent($replaceTokens = false)
         if ($this->helper !== null) {
             $content = $this->helper->getBody();
         } else {
-
             $content = $this->content;
         }
 
@@ -173,7 +170,7 @@ public function getContent($replaceTokens = false)
     }
 
     /**
-     * Set email content
+     * Set email content.
      *
      * @param $content
      */
@@ -187,17 +184,15 @@ public function setContent($content)
     }
 
     /**
-     * Get email content
+     * Get email content.
      *
      * @return array
      */
     public function getPlainText()
     {
         if ($this->helper !== null) {
-
             return $this->helper->getPlainText();
         } else {
-
             return $this->plainText;
         }
     }
@@ -220,10 +215,8 @@ public function setPlainText($content)
     public function getSubject()
     {
         if ($this->helper !== null) {
-
             return $this->helper->getSubject();
         } else {
-
             return $this->subject;
         }
     }
@@ -243,7 +236,7 @@ public function setSubject($subject)
     }
 
     /**
-     * Get the MailHelper object
+     * Get the MailHelper object.
      *
      * @return MailHelper
      */
@@ -294,7 +287,7 @@ public function addToken($key, $value)
     }
 
     /**
-     * Get token array
+     * Get token array.
      *
      * @return array
      */
@@ -325,17 +318,17 @@ public function getTextHeaders()
     }
 
     /**
-     * Check if the listener should append it's own clickthrough in URLs or if the email tracking URL conversion process should take care of it
+     * Check if the listener should append it's own clickthrough in URLs or if the email tracking URL conversion process should take care of it.
      *
      * @return bool
      */
     public function shouldAppendClickthrough()
     {
-        return (!$this->isInternalSend() && null === $this->getEmail());
+        return !$this->isInternalSend() && null === $this->getEmail();
     }
 
     /**
-     * Generate a clickthrough array for URLs
+     * Generate a clickthrough array for URLs.
      *
      * @return array
      */
@@ -343,14 +336,14 @@ public function generateClickthrough()
     {
         $source       = $this->getSource();
         $email        = $this->getEmail();
-        $clickthrough = array(
+        $clickthrough = [
             //what entity is sending the email?
             'source' => $source,
             //the email being sent to be logged in page hit if applicable
-            'email'  => ($email != null) ? $email->getId() : null,
-            'stat'   => $this->getIdHash()
-        );
-        $lead         = $this->getLead();
+            'email' => ($email != null) ? $email->getId() : null,
+            'stat'  => $this->getIdHash(),
+        ];
+        $lead = $this->getLead();
         if ($lead !== null) {
             $clickthrough['lead'] = $lead['id'];
         }
@@ -359,17 +352,15 @@ public function generateClickthrough()
     }
 
     /**
-     * Get the content hash to note if the content has been changed
+     * Get the content hash to note if the content has been changed.
      *
      * @return string
      */
     public function getContentHash()
     {
         if (null !== $this->helper) {
-
             return $this->helper->getContentHash();
         } else {
-
             return md5($this->getContent().$this->getPlainText());
         }
     }
diff --git a/app/bundles/EmailBundle/Event/MonitoredEmailEvent.php b/app/bundles/EmailBundle/Event/MonitoredEmailEvent.php
index 9b88f6f37e6..a1b218cea0c 100644
--- a/app/bundles/EmailBundle/Event/MonitoredEmailEvent.php
+++ b/app/bundles/EmailBundle/Event/MonitoredEmailEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -27,7 +28,7 @@ class MonitoredEmailEvent extends Event
     /**
      * @var array
      */
-    private $folders = array();
+    private $folders = [];
 
     /**
      * @param FormBuilder $builder
@@ -40,7 +41,7 @@ public function __construct(FormBuilder $builder, array $data)
     }
 
     /**
-     * Get the FormBuilder for monitored_mailboxes FormType
+     * Get the FormBuilder for monitored_mailboxes FormType.
      *
      * @return FormBuilder
      */
@@ -50,7 +51,7 @@ public function getFormBuilder()
     }
 
     /**
-     * Insert a folder to configure
+     * Insert a folder to configure.
      *
      * @param        $bundleKey
      * @param        $folderKey
@@ -61,14 +62,14 @@ public function addFolder($bundleKey, $folderKey, $label, $default = '')
     {
         $keyName = ($folderKey) ? $bundleKey.'_'.$folderKey : $bundleKey;
 
-        $this->folders[$keyName] = array(
+        $this->folders[$keyName] = [
             'label'   => $label,
-            'default' => $default
-        );
+            'default' => $default,
+        ];
     }
 
     /**
-     * Get the value set for a specific bundle/folder
+     * Get the value set for a specific bundle/folder.
      *
      * @param $bundleKey
      * @param $folderKey
@@ -84,7 +85,7 @@ public function getData($bundleKey, $folderKey, $default = '')
     }
 
     /**
-     * Get array of folders
+     * Get array of folders.
      *
      * @return array
      */
@@ -92,4 +93,4 @@ public function getFolders()
     {
         return $this->folders;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Event/ParseEmailEvent.php b/app/bundles/EmailBundle/Event/ParseEmailEvent.php
index 46ad03d9f84..4c747e9ee65 100644
--- a/app/bundles/EmailBundle/Event/ParseEmailEvent.php
+++ b/app/bundles/EmailBundle/Event/ParseEmailEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class ParseEmailEvent
+ * Class ParseEmailEvent.
  */
 class ParseEmailEvent extends Event
 {
@@ -42,7 +43,7 @@ public function __construct(array $messages = [], array $applicableKeys = [])
     }
 
     /**
-     * Get the array of messages
+     * Get the array of messages.
      *
      * @return \Mautic\EmailBundle\MonitoredEmail\Message[]
      */
@@ -84,7 +85,7 @@ public function setKeys($keys)
     }
 
     /**
-     * Check if the set of messages is applicable and should be processed by the listener
+     * Check if the set of messages is applicable and should be processed by the listener.
      *
      * @param $bundleKey
      * @param $folderKeys
@@ -101,7 +102,6 @@ public function isApplicable($bundleKey, $folderKeys)
             $key = $bundleKey.'_'.$folderKey;
 
             if (in_array($key, $this->keys)) {
-
                 return true;
             }
         }
@@ -110,7 +110,7 @@ public function isApplicable($bundleKey, $folderKeys)
     }
 
     /**
-     * Set a criteria request for filtering fetched mail
+     * Set a criteria request for filtering fetched mail.
      *
      * @param $bundleKey
      * @param $folderKeys
diff --git a/app/bundles/EmailBundle/Event/QueueEmailEvent.php b/app/bundles/EmailBundle/Event/QueueEmailEvent.php
index 5879b694b63..dbebf73849e 100644
--- a/app/bundles/EmailBundle/Event/QueueEmailEvent.php
+++ b/app/bundles/EmailBundle/Event/QueueEmailEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class QueueEmailEvent
+ * Class QueueEmailEvent.
  */
 class QueueEmailEvent extends Event
 {
-
     /**
      * @var \Swift_Message
      */
@@ -44,9 +44,7 @@ public function getMessage()
     }
 
     /**
-     * Sets whether the sending of the message should be tried again
-     *
-     * @return void
+     * Sets whether the sending of the message should be tried again.
      */
     public function tryAgain()
     {
diff --git a/app/bundles/EmailBundle/EventListener/BroadcastSubscriber.php b/app/bundles/EmailBundle/EventListener/BroadcastSubscriber.php
index b5a10b30c7a..ae3772b3e02 100644
--- a/app/bundles/EmailBundle/EventListener/BroadcastSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/BroadcastSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,9 +19,7 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class BroadcastSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class BroadcastSubscriber.
  */
 class BroadcastSubscriber implements EventSubscriberInterface
 {
@@ -54,10 +53,10 @@ public function __construct(EmailModel $emailModel, EntityManager $em, Translato
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
-            CoreEvents::CHANNEL_BROADCAST => ['onBroadcast', 0]
+            CoreEvents::CHANNEL_BROADCAST => ['onBroadcast', 0],
         ];
     }
 
diff --git a/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php b/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php
index 00184977b4e..4a024f77f68 100644
--- a/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/BuilderSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,9 +21,7 @@
 use Mautic\PageBundle\Model\TrackableModel;
 
 /**
- * Class BuilderSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class BuilderSubscriber.
  */
 class BuilderSubscriber extends CommonSubscriber
 {
@@ -59,32 +58,31 @@ public function __construct(
         EmailModel $emailModel,
         TrackableModel $trackableModel,
         RedirectModel $redirectModel
-    )
-    {
+    ) {
         $this->coreParametersHelper = $coreParametersHelper;
-        $this->emailModel = $emailModel;
-        $this->pageTrackableModel = $trackableModel;
-        $this->pageRedirectModel = $redirectModel;
+        $this->emailModel           = $emailModel;
+        $this->pageTrackableModel   = $trackableModel;
+        $this->pageRedirectModel    = $redirectModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_ON_BUILD   => array('onEmailBuild', 0),
-            EmailEvents::EMAIL_ON_SEND    => array(
-                array('onEmailGenerate', 0),
+        return [
+            EmailEvents::EMAIL_ON_BUILD => ['onEmailBuild', 0],
+            EmailEvents::EMAIL_ON_SEND  => [
+                ['onEmailGenerate', 0],
                 // Ensure this is done last in order to catch all tokenized URLs
-                array('convertUrlsToTokens', -9999)
-            ),
-            EmailEvents::EMAIL_ON_DISPLAY => array(
-                array('onEmailGenerate', 0),
+                ['convertUrlsToTokens', -9999],
+            ],
+            EmailEvents::EMAIL_ON_DISPLAY => [
+                ['onEmailGenerate', 0],
                 // Ensure this is done last in order to catch all tokenized URLs
-                array('convertUrlsToTokens', -9999)
-            )
-        );
+                ['convertUrlsToTokens', -9999],
+            ],
+        ];
     }
 
     /**
@@ -100,27 +98,27 @@ public function onEmailBuild(EmailBuilderEvent $event)
 
         if ($event->abTestWinnerCriteriaRequested()) {
             //add AB Test Winner Criteria
-            $openRate = array(
+            $openRate = [
                 'group'    => 'mautic.email.stats',
                 'label'    => 'mautic.email.abtest.criteria.open',
-                'callback' => '\Mautic\EmailBundle\Helper\AbTestHelper::determineOpenRateWinner'
-            );
+                'callback' => '\Mautic\EmailBundle\Helper\AbTestHelper::determineOpenRateWinner',
+            ];
             $event->addAbTestWinnerCriteria('email.openrate', $openRate);
 
-            $clickThrough = array(
+            $clickThrough = [
                 'group'    => 'mautic.email.stats',
                 'label'    => 'mautic.email.abtest.criteria.clickthrough',
-                'callback' => '\Mautic\EmailBundle\Helper\AbTestHelper::determineClickthroughRateWinner'
-            );
+                'callback' => '\Mautic\EmailBundle\Helper\AbTestHelper::determineClickthroughRateWinner',
+            ];
             $event->addAbTestWinnerCriteria('email.clickthrough', $clickThrough);
         }
 
-        $tokens = array(
+        $tokens = [
             '{unsubscribe_text}' => $this->translator->trans('mautic.email.token.unsubscribe_text'),
             '{webview_text}'     => $this->translator->trans('mautic.email.token.webview_text'),
             '{signature}'        => $this->translator->trans('mautic.email.token.signature'),
-            '{subject}'          => $this->translator->trans('mautic.email.subject')
-        );
+            '{subject}'          => $this->translator->trans('mautic.email.subject'),
+        ];
 
         if ($event->tokensRequested(array_keys($tokens))) {
             $event->addTokens(
@@ -130,10 +128,10 @@ public function onEmailBuild(EmailBuilderEvent $event)
         }
 
         // these should not allow visual tokens
-        $tokens = array(
+        $tokens = [
             '{unsubscribe_url}' => $this->translator->trans('mautic.email.token.unsubscribe_url'),
-            '{webview_url}'     => $this->translator->trans('mautic.email.token.webview_url')
-        );
+            '{webview_url}'     => $this->translator->trans('mautic.email.token.webview_url'),
+        ];
         if ($event->tokensRequested(array_keys($tokens))) {
             $event->addTokens(
                 $event->filterTokens($tokens)
@@ -192,25 +190,25 @@ public function onEmailGenerate(EmailSendEvent $event)
 
         $unsubscribeText = $this->coreParametersHelper->getParameter('unsubscribe_text');
         if (!$unsubscribeText) {
-            $unsubscribeText = $this->translator->trans('mautic.email.unsubscribe.text', array('%link%' => '|URL|'));
+            $unsubscribeText = $this->translator->trans('mautic.email.unsubscribe.text', ['%link%' => '|URL|']);
         }
-        $unsubscribeText = str_replace('|URL|', $this->emailModel->buildUrl('mautic_email_unsubscribe', array('idHash' => $idHash)), $unsubscribeText);
+        $unsubscribeText = str_replace('|URL|', $this->emailModel->buildUrl('mautic_email_unsubscribe', ['idHash' => $idHash]), $unsubscribeText);
         $event->addToken('{unsubscribe_text}', $unsubscribeText);
 
-        $event->addToken('{unsubscribe_url}', $this->emailModel->buildUrl('mautic_email_unsubscribe', array('idHash' => $idHash)));
+        $event->addToken('{unsubscribe_url}', $this->emailModel->buildUrl('mautic_email_unsubscribe', ['idHash' => $idHash]));
 
         $webviewText = $this->coreParametersHelper->getParameter('webview_text');
         if (!$webviewText) {
-            $webviewText = $this->translator->trans('mautic.email.webview.text', array('%link%' => '|URL|'));
+            $webviewText = $this->translator->trans('mautic.email.webview.text', ['%link%' => '|URL|']);
         }
-        $webviewText = str_replace('|URL|', $this->emailModel->buildUrl('mautic_email_webview', array('idHash' => $idHash)), $webviewText);
+        $webviewText = str_replace('|URL|', $this->emailModel->buildUrl('mautic_email_webview', ['idHash' => $idHash]), $webviewText);
         $event->addToken('{webview_text}', $webviewText);
 
         // Show public email preview if the lead is not known to prevent 404
         if (empty($lead['id']) && $email) {
-            $event->addToken('{webview_url}', $this->emailModel->buildUrl('mautic_email_preview', array('objectId' => $email->getId())));
+            $event->addToken('{webview_url}', $this->emailModel->buildUrl('mautic_email_preview', ['objectId' => $email->getId()]));
         } else {
-            $event->addToken('{webview_url}', $this->emailModel->buildUrl('mautic_email_webview', array('idHash' => $idHash)));
+            $event->addToken('{webview_url}', $this->emailModel->buildUrl('mautic_email_webview', ['idHash' => $idHash]));
         }
 
         $signatureText = $this->coreParametersHelper->getParameter('default_signature_text');
@@ -250,7 +248,7 @@ public function convertUrlsToTokens(EmailSendEvent $event)
         $trackables   = $this->parseContentForUrls($event, $emailId);
 
         /**
-         * @var string    $token
+         * @var string
          * @var Trackable $trackable
          */
         foreach ($trackables as $token => $trackable) {
@@ -265,7 +263,7 @@ public function convertUrlsToTokens(EmailSendEvent $event)
     }
 
     /**
-     * Parses content for URLs and tokens
+     * Parses content for URLs and tokens.
      *
      * @param EmailSendEvent $event
      * @param                $emailId
@@ -274,17 +272,17 @@ public function convertUrlsToTokens(EmailSendEvent $event)
      */
     protected function parseContentForUrls(EmailSendEvent $event, $emailId)
     {
-        static $convertedContent = array();
+        static $convertedContent = [];
 
         // Prevent parsing the exact same content over and over
         if (!isset($convertedContent[$event->getContentHash()])) {
             $html = $event->getContent();
             $text = $event->getPlainText();
 
-            $contentTokens  = $event->getTokens();
+            $contentTokens = $event->getTokens();
 
             list($content, $trackables) = $this->pageTrackableModel->parseContentForTrackables(
-                array($html, $text),
+                [$html, $text],
                 $contentTokens,
                 ($emailId) ? 'email' : null,
                 $emailId
diff --git a/app/bundles/EmailBundle/EventListener/CalendarSubscriber.php b/app/bundles/EmailBundle/EventListener/CalendarSubscriber.php
index bc59bfb5660..2c4821d5c39 100644
--- a/app/bundles/EmailBundle/EventListener/CalendarSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/CalendarSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\EmailBundle\EventListener;
 
 use Mautic\CalendarBundle\CalendarEvents;
@@ -14,40 +16,35 @@
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class CalendarSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class CalendarSubscriber.
  */
 class CalendarSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CalendarEvents::CALENDAR_ON_GENERATE => array('onCalendarGenerate', 0)
-        );
+        return [
+            CalendarEvents::CALENDAR_ON_GENERATE => ['onCalendarGenerate', 0],
+        ];
     }
 
     /**
-     * Adds events to the calendar
+     * Adds events to the calendar.
      *
      * @param CalendarGeneratorEvent $event
-     *
-     * @return void
      */
     public function onCalendarGenerate(CalendarGeneratorEvent $event)
     {
-        $dates  = $event->getDates();
+        $dates = $event->getDates();
 
         $query = $this->em->getConnection()->createQueryBuilder();
         $query->select('es.email_id, e.subject AS title, COUNT(es.id) AS quantity, es.date_sent AS start, e.plain_text AS description, cat.color, es.lead_id, l.firstname, l.lastname, l.email')
-            ->from(MAUTIC_TABLE_PREFIX . 'email_stats', 'es')
-            ->leftJoin('es', MAUTIC_TABLE_PREFIX . 'emails', 'e', 'es.email_id = e.id')
-            ->leftJoin('e', MAUTIC_TABLE_PREFIX . 'categories', 'cat', 'cat.id = e.category_id AND cat.bundle=:bundle')
-            ->leftJoin('es', MAUTIC_TABLE_PREFIX . 'leads', 'l', 'l.id = es.lead_id')
+            ->from(MAUTIC_TABLE_PREFIX.'email_stats', 'es')
+            ->leftJoin('es', MAUTIC_TABLE_PREFIX.'emails', 'e', 'es.email_id = e.id')
+            ->leftJoin('e', MAUTIC_TABLE_PREFIX.'categories', 'cat', 'cat.id = e.category_id AND cat.bundle=:bundle')
+            ->leftJoin('es', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = es.lead_id')
             ->where($query->expr()->andX(
                 $query->expr()->gte('es.date_sent', ':start'),
                 $query->expr()->lte('es.date_sent', ':end')
@@ -63,26 +60,26 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
 
         // We need to convert the date to a ISO8601 compliant string
         foreach ($results as &$object) {
-            $date = new DateTimeHelper($object['start']);
+            $date            = new DateTimeHelper($object['start']);
             $object['start'] = $date->toLocalString(\DateTime::ISO8601);
             if ($object['email_id']) {
-                $object['url']          = $this->router->generate('mautic_email_action', array('objectAction' => 'view', 'objectId' => $object['email_id']), true);
-                $object['attr']         = 'data-toggle="ajax"';
-                $object['description']  = html_entity_decode($object['description']);
-                $object['title']        = $this->translator->trans('mautic.email.event.sent', array('%email%' => $object['title'], '%x%' => $object['quantity']));
+                $object['url']         = $this->router->generate('mautic_email_action', ['objectAction' => 'view', 'objectId' => $object['email_id']], true);
+                $object['attr']        = 'data-toggle="ajax"';
+                $object['description'] = html_entity_decode($object['description']);
+                $object['title']       = $this->translator->trans('mautic.email.event.sent', ['%email%' => $object['title'], '%x%' => $object['quantity']]);
             } else {
                 if ($object['firstname'] || $object['lastname']) {
-                    $contactName = trim($object['firstname'] . ' ' . $object['lastname']);
+                    $contactName = trim($object['firstname'].' '.$object['lastname']);
                 } elseif ($object['email']) {
                     $contactName = $object['email'];
                 } else {
                     $contactName = $this->translator->trans('mautic.lead.lead.anonymous');
                 }
-                $details                = $this->translator->trans('mautic.email.event.sent.direct', array('%contact%' => $contactName));
-                $object['url']          = $this->router->generate('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $object['lead_id']), true);
-                $object['attr']         = 'data-toggle="ajax"';
-                $object['title']        = $details;
-                $object['description']  = $details;
+                $details               = $this->translator->trans('mautic.email.event.sent.direct', ['%contact%' => $contactName]);
+                $object['url']         = $this->router->generate('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $object['lead_id']], true);
+                $object['attr']        = 'data-toggle="ajax"';
+                $object['title']       = $details;
+                $object['description'] = $details;
             }
         }
 
diff --git a/app/bundles/EmailBundle/EventListener/CampaignSubscriber.php b/app/bundles/EmailBundle/EventListener/CampaignSubscriber.php
index cb0b4bd93ec..f14c5cf266e 100644
--- a/app/bundles/EmailBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/CampaignSubscriber.php
@@ -1,29 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\EmailBundle\EventListener;
 
 use Mautic\CampaignBundle\CampaignEvents;
-use Mautic\CampaignBundle\Model\EventModel;
-use Mautic\EmailBundle\Model\EmailModel;
-use Mautic\CoreBundle\Model\MessageQueueModel;
-use Mautic\LeadBundle\Entity\Lead;
 use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
+use Mautic\CampaignBundle\Model\EventModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\CoreBundle\Model\MessageQueueModel;
 use Mautic\EmailBundle\EmailEvents;
 use Mautic\EmailBundle\Event\EmailOpenEvent;
+use Mautic\EmailBundle\Model\EmailModel;
+use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\LeadModel;
 
 /**
- * Class CampaignSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -56,22 +56,22 @@ class CampaignSubscriber extends CommonSubscriber
      */
     public function __construct(LeadModel $leadModel, EmailModel $emailModel, EventModel $eventModel, MessageQueueModel $messageQueueModel)
     {
-        $this->leadModel  = $leadModel;
-        $this->emailModel = $emailModel;
+        $this->leadModel          = $leadModel;
+        $this->emailModel         = $emailModel;
         $this->campaignEventModel = $eventModel;
-        $this->messageQueueModel = $messageQueueModel;
+        $this->messageQueueModel  = $messageQueueModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             CampaignEvents::CAMPAIGN_ON_BUILD         => ['onCampaignBuild', 0],
             EmailEvents::EMAIL_ON_OPEN                => ['onEmailOpen', 0],
             EmailEvents::ON_CAMPAIGN_TRIGGER_ACTION   => ['onCampaignTriggerAction', 0],
-            EmailEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0]
+            EmailEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0],
         ];
     }
 
@@ -94,13 +94,13 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'eventName'       => EmailEvents::ON_CAMPAIGN_TRIGGER_ACTION,
             'formType'        => 'emailsend_list',
             'formTypeOptions' => ['update_select' => 'campaignevent_properties_email', 'with_email_types' => true],
-            'formTheme'       => 'MauticEmailBundle:FormTheme\EmailSendList'
+            'formTheme'       => 'MauticEmailBundle:FormTheme\EmailSendList',
         ];
         $event->addAction('email.send', $action);
     }
 
     /**
-     * Trigger campaign event for opening of an email
+     * Trigger campaign event for opening of an email.
      *
      * @param EmailOpenEvent $event
      */
@@ -151,12 +151,12 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
 
             $email = $this->emailModel->getEntity($emailId);
 
-            $options      = [
+            $options = [
                 'source'         => ['campaign.event', $event->getEvent()['id']],
                 'email_type'     => $config['email_type'],
                 'email_attempts' => $config['attempts'],
                 'email_priority' => $config['priority'],
-                'email_type'     => $config['email_type']
+                'email_type'     => $config['email_type'],
             ];
             $event->setChannel('email', $emailId);
 
@@ -166,7 +166,7 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
                 $stats = [];
                 if ('marketing' == $type) {
                     // Determine if this lead has received the email before
-                    $leadIds   = implode(",", [$leadCredentials['id']]);
+                    $leadIds   = implode(',', [$leadCredentials['id']]);
                     $stats     = $this->emailModel->getStatRepository()->checkContactsSentEmail($leadIds, $emailId);
                     $emailSent = true; // Assume it was sent to prevent the campaign event from getting rescheduled over and over
                 }
diff --git a/app/bundles/EmailBundle/EventListener/ConfigSubscriber.php b/app/bundles/EmailBundle/EventListener/ConfigSubscriber.php
index 107b882a7e8..b2aac12c034 100644
--- a/app/bundles/EmailBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/ConfigSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\EventListener;
 
 use Mautic\ConfigBundle\ConfigEvents;
-use Mautic\ConfigBundle\Event\ConfigEvent;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\ConfigBundle\Event\ConfigEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 
 /**
- * Class ConfigSubscriber
- *
- * @package Mautic\CoreBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
@@ -40,31 +39,31 @@ public function __construct(CoreParametersHelper $coreParametersHelper)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE    => array('onConfigGenerate', 0),
-            ConfigEvents::CONFIG_PRE_SAVE       => array('onConfigBeforeSave', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+            ConfigEvents::CONFIG_PRE_SAVE    => ['onConfigBeforeSave', 0],
+        ];
     }
 
     public function onConfigGenerate(ConfigBuilderEvent $event)
     {
-        $event->addForm(array(
-            'bundle'        => 'EmailBundle',
-            'formAlias'     => 'emailconfig',
-            'formTheme'     => 'MauticEmailBundle:FormTheme\Config',
-            'parameters'    => $event->getParametersFromConfig('MauticEmailBundle')
-        ));
+        $event->addForm([
+            'bundle'     => 'EmailBundle',
+            'formAlias'  => 'emailconfig',
+            'formTheme'  => 'MauticEmailBundle:FormTheme\Config',
+            'parameters' => $event->getParametersFromConfig('MauticEmailBundle'),
+        ]);
     }
 
     public function onConfigBeforeSave(ConfigEvent $event)
     {
         $event->unsetIfEmpty(
-            array(
+            [
                 'mailer_password',
-                'mailer_api_key'
-            )
+                'mailer_api_key',
+            ]
         );
 
         $data = $event->getConfig('emailconfig');
@@ -92,12 +91,12 @@ public function onConfigBeforeSave(ConfigEvent $event)
         }
 
         // Ensure that percent signs are decoded in the unsubscribe/webview settings
-        $decode = array(
+        $decode = [
             'unsubscribe_text',
             'webview_text',
             'unsubscribe_message',
-            'resubscribe_message'
-        );
+            'resubscribe_message',
+        ];
         foreach ($decode as $key) {
             if (strpos($data[$key], '%') !== false) {
                 $data[$key] = urldecode($data[$key]);
diff --git a/app/bundles/EmailBundle/EventListener/DashboardSubscriber.php b/app/bundles/EmailBundle/EventListener/DashboardSubscriber.php
index aaba12116ce..275bbea4ff0 100644
--- a/app/bundles/EmailBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/DashboardSubscriber.php
@@ -1,59 +1,57 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\EmailBundle\EventListener;
 
-use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\EmailBundle\Model\EmailModel;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'email';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'emails.in.time' => array(
-            'formAlias' => 'email_dashboard_emails_in_time_widget'
-        ),
-        'ignored.vs.read.emails' => array(),
-        'upcoming.emails' => array(),
-        'most.sent.emails' => array(),
-        'most.read.emails' => array(),
-        'created.emails' => array(),
-        'device.granularity.email' => array()
-    );
+    protected $types = [
+        'emails.in.time' => [
+            'formAlias' => 'email_dashboard_emails_in_time_widget',
+        ],
+        'ignored.vs.read.emails'   => [],
+        'upcoming.emails'          => [],
+        'most.sent.emails'         => [],
+        'most.read.emails'         => [],
+        'created.emails'           => [],
+        'device.granularity.email' => [],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'email:emails:viewown',
-        'email:emails:viewother'
-    );
+        'email:emails:viewother',
+    ];
 
     /**
      * @var EmailModel
@@ -71,19 +69,16 @@ public function __construct(EmailModel $emailModel)
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
         $this->checkPermissions($event);
         $canViewOthers = $event->hasPermission('email:emails:viewother');
-        
-        if ($event->getType() == 'emails.in.time') {
 
+        if ($event->getType() == 'emails.in.time') {
             $widget = $event->getWidget();
             $params = $widget->getParams();
 
@@ -92,7 +87,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             }
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->emailModel->getEmailsLineChartData(
@@ -102,8 +97,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateFormat'],
                         $params['filter'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -115,11 +110,11 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'pie',
                     'chartHeight' => $widget->getHeight() - 80,
-                    'chartData'   => $this->emailModel->getIgnoredVsReadPieChartData($params['dateFrom'], $params['dateTo'], array(), $canViewOthers)
-                ));
+                    'chartData'   => $this->emailModel->getIgnoredVsReadPieChartData($params['dateFrom'], $params['dateTo'], [], $canViewOthers),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -135,7 +130,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $upcomingEmails = $this->emailModel->getUpcomingEmails($limit, $canViewOthers);
 
             $event->setTemplate('MauticDashboardBundle:Dashboard:upcomingemails.html.php');
-            $event->setTemplateData(array('upcomingEmails' => $upcomingEmails));
+            $event->setTemplateData(['upcomingEmails' => $upcomingEmails]);
             $event->stopPropagation();
         }
 
@@ -154,39 +149,39 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit,
                     $params['dateFrom'],
                     $params['dateTo'],
-                    array(),
-                    array('groupBy' => 'sends', 'canViewOthers' => $canViewOthers)
+                    [],
+                    ['groupBy' => 'sends', 'canViewOthers' => $canViewOthers]
                 );
-                $items = array();
+                $items = [];
 
                 // Build table rows with links
                 if ($emails) {
                     foreach ($emails as &$email) {
-                        $emailUrl = $this->router->generate('mautic_email_action', array('objectAction' => 'view', 'objectId' => $email['id']));
-                        $row = array(
-                            array(
+                        $emailUrl = $this->router->generate('mautic_email_action', ['objectAction' => 'view', 'objectId' => $email['id']]);
+                        $row      = [
+                            [
                                 'value' => $email['name'],
-                                'type' => 'link',
-                                'link' => $emailUrl
-                            ),
-                            array(
-                                'value' => $email['count']
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $emailUrl,
+                            ],
+                            [
+                                'value' => $email['count'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.dashboard.label.title'),
-                        $event->getTranslator()->trans('mautic.email.label.sends')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $emails
-                ));
+                        $event->getTranslator()->trans('mautic.email.label.sends'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $emails,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
@@ -206,39 +201,39 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit,
                     $params['dateFrom'],
                     $params['dateTo'],
-                    array(),
-                    array('groupBy' => 'reads', 'canViewOthers' => $canViewOthers)
+                    [],
+                    ['groupBy' => 'reads', 'canViewOthers' => $canViewOthers]
                 );
-                $items = array();
+                $items = [];
 
                 // Build table rows with links
                 if ($emails) {
                     foreach ($emails as &$email) {
-                        $emailUrl = $this->router->generate('mautic_email_action', array('objectAction' => 'view', 'objectId' => $email['id']));
-                        $row = array(
-                            array(
+                        $emailUrl = $this->router->generate('mautic_email_action', ['objectAction' => 'view', 'objectId' => $email['id']]);
+                        $row      = [
+                            [
                                 'value' => $email['name'],
-                                'type' => 'link',
-                                'link' => $emailUrl
-                            ),
-                            array(
-                                'value' => $email['count']
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $emailUrl,
+                            ],
+                            [
+                                'value' => $email['count'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.dashboard.label.title'),
-                        $event->getTranslator()->trans('mautic.email.label.reads')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $emails
-                ));
+                        $event->getTranslator()->trans('mautic.email.label.reads'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $emails,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
@@ -258,41 +253,41 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit,
                     $params['dateFrom'],
                     $params['dateTo'],
-                    array(),
-                    array('groupBy' => 'creations', 'canViewOthers' => $canViewOthers)
+                    [],
+                    ['groupBy' => 'creations', 'canViewOthers' => $canViewOthers]
                 );
-                $items = array();
+                $items = [];
 
                 // Build table rows with links
                 if ($emails) {
                     foreach ($emails as &$email) {
                         $emailUrl = $this->router->generate(
-                            'mautic_email_action', 
-                            array(
+                            'mautic_email_action',
+                            [
                                 'objectAction' => 'view',
-                                'objectId' => $email['id']
-                            )
+                                'objectId'     => $email['id'],
+                            ]
                         );
-                        $row = array(
-                            array(
+                        $row = [
+                            [
                                 'value' => $email['name'],
-                                'type' => 'link',
-                                'link' => $emailUrl
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $emailUrl,
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
-                        $event->getTranslator()->trans('mautic.dashboard.label.title')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $emails
-                ));
+                $event->setTemplateData([
+                    'headItems' => [
+                        $event->getTranslator()->trans('mautic.dashboard.label.title'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $emails,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
@@ -301,16 +296,15 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'pie',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->emailModel->getDeviceGranularityPieChartData(
                         $params['dateFrom'],
                         $params['dateTo'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
diff --git a/app/bundles/EmailBundle/EventListener/EmailSubscriber.php b/app/bundles/EmailBundle/EventListener/EmailSubscriber.php
index c371cceacab..b9d49e54f9d 100644
--- a/app/bundles/EmailBundle/EventListener/EmailSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/EmailSubscriber.php
@@ -1,27 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
-use Mautic\EmailBundle\Event as Events;
 use Mautic\EmailBundle\EmailEvents;
+use Mautic\EmailBundle\Event as Events;
 use Mautic\EmailBundle\Model\EmailModel;
 
 /**
- * Class EmailSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class EmailSubscriber.
  */
 class EmailSubscriber extends CommonSubscriber
 {
@@ -50,27 +48,27 @@ class EmailSubscriber extends CommonSubscriber
     public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel, EmailModel $emailModel)
     {
         $this->ipLookupHelper = $ipLookupHelper;
-        $this->auditLogModel = $auditLogModel;
-        $this->emailModel = $emailModel;
+        $this->auditLogModel  = $auditLogModel;
+        $this->emailModel     = $emailModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_POST_SAVE    => array('onEmailPostSave', 0),
-            EmailEvents::EMAIL_POST_DELETE  => array('onEmailDelete', 0),
-            EmailEvents::EMAIL_FAILED       => array('onEmailFailed', 0),
-            EmailEvents::EMAIL_ON_SEND      => array('onEmailSend', 0),
-            EmailEvents::EMAIL_RESEND       => array('onEmailResend', 0),
-            EmailEvents::EMAIL_PARSE        => array('onEmailParse', 0)
-        );
+        return [
+            EmailEvents::EMAIL_POST_SAVE   => ['onEmailPostSave', 0],
+            EmailEvents::EMAIL_POST_DELETE => ['onEmailDelete', 0],
+            EmailEvents::EMAIL_FAILED      => ['onEmailFailed', 0],
+            EmailEvents::EMAIL_ON_SEND     => ['onEmailSend', 0],
+            EmailEvents::EMAIL_RESEND      => ['onEmailResend', 0],
+            EmailEvents::EMAIL_PARSE       => ['onEmailParse', 0],
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\EmailEvent $event
      */
@@ -78,39 +76,39 @@ public function onEmailPostSave(Events\EmailEvent $event)
     {
         $email = $event->getEmail();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "email",
-                "object"    => "email",
-                "objectId"  => $email->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'email',
+                'object'    => 'email',
+                'objectId'  => $email->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\EmailEvent $event
      */
     public function onEmailDelete(Events\EmailEvent $event)
     {
         $email = $event->getEmail();
-        $log = array(
-            "bundle"     => "email",
-            "object"     => "email",
-            "objectId"   => $email->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $email->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log   = [
+            'bundle'    => 'email',
+            'object'    => 'email',
+            'objectId'  => $email->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $email->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 
     /**
-     * Process if an email has failed
+     * Process if an email has failed.
      *
      * @param Events\QueueEmailEvent $event
      */
@@ -122,16 +120,16 @@ public function onEmailFailed(Events\QueueEmailEvent $event)
             $stat = $this->emailModel->getEmailStatus($message->leadIdHash);
 
             if ($stat !== null) {
-                $reason = $this->translator->trans('mautic.email.dnc.failed', array(
-                    "%subject%" => EmojiHelper::toShort($message->getSubject())
-                ));
+                $reason = $this->translator->trans('mautic.email.dnc.failed', [
+                    '%subject%' => EmojiHelper::toShort($message->getSubject()),
+                ]);
                 $this->emailModel->setDoNotContact($stat, $reason);
             }
         }
     }
 
     /**
-     * Add an unsubscribe email to the List-Unsubscribe header if applicable
+     * Add an unsubscribe email to the List-Unsubscribe header if applicable.
      *
      * @param Events\EmailSendEvent $event
      */
@@ -142,14 +140,14 @@ public function onEmailSend(Events\EmailSendEvent $event)
             $headers          = $event->getTextHeaders();
             $existing         = (isset($headers['List-Unsubscribe'])) ? $headers['List-Unsubscribe'] : '';
             $unsubscribeEmail = "<mailto:$unsubscribeEmail>";
-            $updatedHeader    = ($existing) ? $unsubscribeEmail.", ".$existing : $unsubscribeEmail;
+            $updatedHeader    = ($existing) ? $unsubscribeEmail.', '.$existing : $unsubscribeEmail;
 
             $event->addTextHeader('List-Unsubscribe', $updatedHeader);
         }
     }
 
     /**
-     * Process if an email is resent
+     * Process if an email is resent.
      *
      * @param Events\QueueEmailEvent $event
      */
@@ -158,16 +156,16 @@ public function onEmailResend(Events\QueueEmailEvent $event)
         $message = $event->getMessage();
 
         if (isset($message->leadIdHash)) {
-            $stat  = $this->emailModel->getEmailStatus($message->leadIdHash);
+            $stat = $this->emailModel->getEmailStatus($message->leadIdHash);
             if ($stat !== null) {
                 $stat->upRetryCount();
 
                 $retries = $stat->getRetryCount();
                 if (true || $retries > 3) {
                     //tried too many times so just fail
-                    $reason = $this->translator->trans('mautic.email.dnc.retries', array(
-                        "%subject%" => EmojiHelper::toShort($message->getSubject())
-                    ));
+                    $reason = $this->translator->trans('mautic.email.dnc.retries', [
+                        '%subject%' => EmojiHelper::toShort($message->getSubject()),
+                    ]);
                     $this->emailModel->setDoNotContact($stat, $reason);
                 } else {
                     //set it to try again
@@ -201,4 +199,4 @@ public function onEmailParse(Events\ParseEmailEvent $event)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/EventListener/FormSubscriber.php b/app/bundles/EmailBundle/EventListener/FormSubscriber.php
index 04a4f33b3b8..501be174840 100644
--- a/app/bundles/EmailBundle/EventListener/FormSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/FormSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,17 +15,14 @@
 use Mautic\FormBundle\FormEvents;
 
 /**
- * Class FormSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class FormSubscriber.
  */
 class FormSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             FormEvents::FORM_ON_BUILD => ['onFormBuilder', 0],
@@ -32,7 +30,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Add a send email actions to available form submit actions
+     * Add a send email actions to available form submit actions.
      *
      * @param FormBuilderEvent $event
      */
@@ -54,15 +52,15 @@ public function onFormBuilder(FormBuilderEvent $event)
 
         // Send email to lead
         $action = [
-            'group'             => 'mautic.email.actions',
-            'label'             => 'mautic.email.form.action.sendemail.lead',
-            'description'       => 'mautic.email.form.action.sendemail.lead.descr',
-            'formType'          => 'emailsend_list',
-            'formTypeOptions'   => ['update_select' => 'formaction_properties_email'],
-            'formTheme'         => 'MauticEmailBundle:FormTheme\EmailSendList',
-            'callback'          => '\Mautic\EmailBundle\Helper\FormSubmitHelper::sendEmail',
+            'group'           => 'mautic.email.actions',
+            'label'           => 'mautic.email.form.action.sendemail.lead',
+            'description'     => 'mautic.email.form.action.sendemail.lead.descr',
+            'formType'        => 'emailsend_list',
+            'formTypeOptions' => ['update_select' => 'formaction_properties_email'],
+            'formTheme'       => 'MauticEmailBundle:FormTheme\EmailSendList',
+            'callback'        => '\Mautic\EmailBundle\Helper\FormSubmitHelper::sendEmail',
         ];
 
         $event->addSubmitAction('email.send.lead', $action);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/EventListener/LeadSubscriber.php b/app/bundles/EmailBundle/EventListener/LeadSubscriber.php
index c7e72dbe0a6..34b115daa64 100644
--- a/app/bundles/EmailBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/LeadSubscriber.php
@@ -1,30 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\EmailBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\EmailBundle\EmailEvents;
 use Mautic\LeadBundle\Event\LeadMergeEvent;
 use Mautic\LeadBundle\Event\LeadTimelineEvent;
 use Mautic\LeadBundle\LeadEvents;
 
 /**
- * Class LeadSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             LeadEvents::TIMELINE_ON_GENERATE => ['onTimelineGenerate', 0],
@@ -33,7 +32,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -68,7 +67,6 @@ protected function addEmailEvents(LeadTimelineEvent $event, $state)
 
         // Decide if those events are filtered
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
@@ -98,7 +96,7 @@ protected function addEmailEvents(LeadTimelineEvent $event, $state)
                     $eventName = [
                         'label'      => $label,
                         'href'       => $this->router->generate('mautic_email_webview', ['idHash' => $stat['idHash']]),
-                        'isExternal' => true
+                        'isExternal' => true,
                     ];
                 } else {
                     $eventName = $label;
@@ -110,20 +108,20 @@ protected function addEmailEvents(LeadTimelineEvent $event, $state)
                 }
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => $eventName,
-                        'eventType'       => $eventTypeName,
-                        'timestamp'       => $stat['date'.ucfirst($dateSent)],
-                        'dateSent'        => $stat['dateSent'],
-                        'extra'           => [
+                        'event'      => $eventTypeKey,
+                        'eventLabel' => $eventName,
+                        'eventType'  => $eventTypeName,
+                        'timestamp'  => $stat['date'.ucfirst($dateSent)],
+                        'dateSent'   => $stat['dateSent'],
+                        'extra'      => [
                             'stat' => $stat,
-                            'type' => $state
+                            'type' => $state,
                         ],
                         'contentTemplate' => 'MauticEmailBundle:SubscribedEvents\Timeline:index.html.php',
-                        'icon'            => ($state == 'read') ? 'fa-envelope-o' : 'fa-envelope'
+                        'icon'            => ($state == 'read') ? 'fa-envelope-o' : 'fa-envelope',
                     ]
                 );
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/EventListener/MessageQueueSubscriber.php b/app/bundles/EmailBundle/EventListener/MessageQueueSubscriber.php
index 2e76e600dc1..c251dbac458 100644
--- a/app/bundles/EmailBundle/EventListener/MessageQueueSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/MessageQueueSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,17 +13,14 @@
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Entity\MessageQueue;
 use Mautic\CoreBundle\Event\MessageQueueBatchProcessEvent;
-use Mautic\EmailBundle\Model\EmailModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\EmailBundle\Model\EmailModel;
 
 /**
- * Class CalendarSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class CalendarSubscriber.
  */
 class MessageQueueSubscriber extends CommonSubscriber
 {
-
     /**
      * @var EmailModel
      */
@@ -41,7 +39,7 @@ public function __construct(EmailModel $emailModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             CoreEvents::PROCESS_MESSAGE_QUEUE_BATCH => ['onProcessMessageQueueBatch', 0],
@@ -49,11 +47,9 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Sends campaign emails
+     * Sends campaign emails.
      *
      * @param MessageQueueBatchProcessEvent $event
-     *
-     * @return void
      */
     public function onProcessMessageQueueBatch(MessageQueueBatchProcessEvent $event)
     {
@@ -65,7 +61,7 @@ public function onProcessMessageQueueBatch(MessageQueueBatchProcessEvent $event)
         $emailId  = $event->getChannelId();
         $email    = $this->emailModel->getEntity($emailId);
 
-        $sendTo = [];
+        $sendTo            = [];
         $messagesByContact = [];
 
         /** @var MessageQueue $message */
@@ -77,7 +73,7 @@ public function onProcessMessageQueueBatch(MessageQueueBatchProcessEvent $event)
                 $message->setSuccess(true);
             }
 
-            $sendTo[$contact['id']] = $contact;
+            $sendTo[$contact['id']]            = $contact;
             $messagesByContact[$contact['id']] = $id;
         }
 
diff --git a/app/bundles/EmailBundle/EventListener/PageSubscriber.php b/app/bundles/EmailBundle/EventListener/PageSubscriber.php
index 664bb0bd604..ca311171eb2 100644
--- a/app/bundles/EmailBundle/EventListener/PageSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/PageSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,9 @@
 use Mautic\EmailBundle\Model\EmailModel;
 use Mautic\PageBundle\Event as Events;
 use Mautic\PageBundle\PageEvents;
-use Mautic\PointBundle\Event\PointBuilderEvent;
-use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PageSubscriber
+ * Class PageSubscriber.
  */
 class PageSubscriber extends CommonSubscriber
 {
@@ -41,13 +40,13 @@ public function __construct(EmailModel $emailModel)
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            PageEvents::PAGE_ON_HIT => array('onPageHit', 0)
-        );
+        return [
+            PageEvents::PAGE_ON_HIT => ['onPageHit', 0],
+        ];
     }
 
     /**
-     * Trigger point actions for page hits
+     * Trigger point actions for page hits.
      *
      * @param Events\PageHitEvent $event
      */
diff --git a/app/bundles/EmailBundle/EventListener/PointSubscriber.php b/app/bundles/EmailBundle/EventListener/PointSubscriber.php
index b7d453104c7..cf6c7d0dc94 100644
--- a/app/bundles/EmailBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/PointSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,7 +20,7 @@
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
@@ -41,14 +42,14 @@ public function __construct(PointModel $pointModel)
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::POINT_ON_BUILD     => array('onPointBuild', 0),
-            PointEvents::TRIGGER_ON_BUILD   => array('onTriggerBuild', 0),
-            EmailEvents::EMAIL_ON_OPEN      => array('onEmailOpen', 0),
-            EmailEvents::EMAIL_ON_SEND      => array('onEmailSend', 0)
-        );
+        return [
+            PointEvents::POINT_ON_BUILD   => ['onPointBuild', 0],
+            PointEvents::TRIGGER_ON_BUILD => ['onTriggerBuild', 0],
+            EmailEvents::EMAIL_ON_OPEN    => ['onEmailOpen', 0],
+            EmailEvents::EMAIL_ON_SEND    => ['onEmailSend', 0],
+        ];
     }
 
     /**
@@ -56,21 +57,21 @@ static public function getSubscribedEvents()
      */
     public function onPointBuild(PointBuilderEvent $event)
     {
-        $action = array(
-            'group'       => 'mautic.email.actions',
-            'label'       => 'mautic.email.point.action.open',
-            'callback'    => array('\\Mautic\\EmailBundle\\Helper\\PointEventHelper', 'validateEmail'),
-            'formType'    => 'emailopen_list'
-        );
+        $action = [
+            'group'    => 'mautic.email.actions',
+            'label'    => 'mautic.email.point.action.open',
+            'callback' => ['\\Mautic\\EmailBundle\\Helper\\PointEventHelper', 'validateEmail'],
+            'formType' => 'emailopen_list',
+        ];
 
         $event->addAction('email.open', $action);
 
-        $action = array(
-            'group'       => 'mautic.email.actions',
-            'label'       => 'mautic.email.point.action.send',
-            'callback'    => array('\\Mautic\\EmailBundle\\Helper\\PointEventHelper', 'validateEmail'),
-            'formType'    => 'emailopen_list'
-        );
+        $action = [
+            'group'    => 'mautic.email.actions',
+            'label'    => 'mautic.email.point.action.send',
+            'callback' => ['\\Mautic\\EmailBundle\\Helper\\PointEventHelper', 'validateEmail'],
+            'formType' => 'emailopen_list',
+        ];
 
         $event->addAction('email.send', $action);
     }
@@ -80,20 +81,20 @@ public function onPointBuild(PointBuilderEvent $event)
      */
     public function onTriggerBuild(TriggerBuilderEvent $event)
     {
-        $sendEvent = array(
+        $sendEvent = [
             'group'           => 'mautic.email.point.trigger',
             'label'           => 'mautic.email.point.trigger.sendemail',
-            'callback'        => array('\\Mautic\\EmailBundle\\Helper\\PointEventHelper', 'sendEmail'),
+            'callback'        => ['\\Mautic\\EmailBundle\\Helper\\PointEventHelper', 'sendEmail'],
             'formType'        => 'emailsend_list',
-            'formTypeOptions' => array('update_select' => 'pointtriggerevent_properties_email'),
+            'formTypeOptions' => ['update_select' => 'pointtriggerevent_properties_email'],
             'formTheme'       => 'MauticEmailBundle:FormTheme\EmailSendList',
-        );
+        ];
 
         $event->addEvent('email.send', $sendEvent);
     }
 
     /**
-     * Trigger point actions for email open
+     * Trigger point actions for email open.
      *
      * @param EmailOpenEvent $event
      */
@@ -103,7 +104,7 @@ public function onEmailOpen(EmailOpenEvent $event)
     }
 
     /**
-     * Trigger point actions for email send
+     * Trigger point actions for email send.
      *
      * @param EmailSendEvent $event
      */
@@ -112,7 +113,6 @@ public function onEmailSend(EmailSendEvent $event)
         if ($leadArray = $event->getLead()) {
             $lead = $this->em->getReference('MauticLeadBundle:Lead', $leadArray['id']);
         } else {
-
             return;
         }
 
diff --git a/app/bundles/EmailBundle/EventListener/ReportSubscriber.php b/app/bundles/EmailBundle/EventListener/ReportSubscriber.php
index 28011ddf37b..afeb589769f 100644
--- a/app/bundles/EmailBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/ReportSubscriber.php
@@ -1,48 +1,44 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
+use Mautic\CoreBundle\Helper\Chart\PieChart;
 use Mautic\ReportBundle\Event\ReportBuilderEvent;
 use Mautic\ReportBundle\Event\ReportGeneratorEvent;
 use Mautic\ReportBundle\Event\ReportGraphEvent;
 use Mautic\ReportBundle\ReportEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
 
 /**
- * Class ReportSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class ReportSubscriber.
  */
 class ReportSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             ReportEvents::REPORT_ON_BUILD          => ['onReportBuilder', 0],
             ReportEvents::REPORT_ON_GENERATE       => ['onReportGenerate', 0],
-            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0]
+            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0],
         ];
     }
 
     /**
-     * Add available tables and columns to the report builder lookup
+     * Add available tables and columns to the report builder lookup.
      *
      * @param ReportBuilderEvent $event
-     *
-     * @return void
      */
     public function onReportBuilder(ReportBuilderEvent $event)
     {
@@ -50,94 +46,94 @@ public function onReportBuilder(ReportBuilderEvent $event)
             $prefix        = 'e.';
             $variantParent = 'vp.';
             $columns       = [
-                $prefix.'subject'            => [
+                $prefix.'subject' => [
                     'label' => 'mautic.email.subject',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'lang'               => [
+                $prefix.'lang' => [
                     'label' => 'mautic.core.language',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'read_count'         => [
+                $prefix.'read_count' => [
                     'label' => 'mautic.email.report.read_count',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                $prefix.'revision'           => [
+                $prefix.'revision' => [
                     'label' => 'mautic.email.report.revision',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                $variantParent.'id'          => [
+                $variantParent.'id' => [
                     'label' => 'mautic.email.report.variant_parent_id',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                $variantParent.'subject'     => [
+                $variantParent.'subject' => [
                     'label' => 'mautic.email.report.variant_parent_subject',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
                 $prefix.'variant_start_date' => [
                     'label' => 'mautic.email.report.variant_start_date',
-                    'type'  => 'datetime'
+                    'type'  => 'datetime',
                 ],
                 $prefix.'variant_sent_count' => [
                     'label' => 'mautic.email.report.variant_sent_count',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
                 $prefix.'variant_read_count' => [
                     'label' => 'mautic.email.report.variant_read_count',
-                    'type'  => 'int'
-                ]
+                    'type'  => 'int',
+                ],
             ];
-            $columns       = array_merge($columns, $event->getStandardColumns($prefix, [], 'mautic_email_action'), $event->getCategoryColumns());
-            $data          = [
+            $columns = array_merge($columns, $event->getStandardColumns($prefix, [], 'mautic_email_action'), $event->getCategoryColumns());
+            $data    = [
                 'display_name' => 'mautic.email.emails',
-                'columns'      => $columns
+                'columns'      => $columns,
             ];
             $event->addTable('emails', $data);
 
             if ($event->checkContext('email.stats')) {
                 $statPrefix  = 'es.';
                 $statColumns = [
-                    $statPrefix.'email_address'     => [
+                    $statPrefix.'email_address' => [
                         'label' => 'mautic.email.report.stat.email_address',
-                        'type'  => 'email'
+                        'type'  => 'email',
                     ],
-                    $statPrefix.'date_sent'         => [
+                    $statPrefix.'date_sent' => [
                         'label' => 'mautic.email.report.stat.date_sent',
-                        'type'  => 'datetime'
+                        'type'  => 'datetime',
                     ],
-                    $statPrefix.'is_read'           => [
+                    $statPrefix.'is_read' => [
                         'label' => 'mautic.email.report.stat.is_read',
-                        'type'  => 'bool'
+                        'type'  => 'bool',
                     ],
-                    $statPrefix.'is_failed'         => [
+                    $statPrefix.'is_failed' => [
                         'label' => 'mautic.email.report.stat.is_failed',
-                        'type'  => 'bool'
+                        'type'  => 'bool',
                     ],
                     $statPrefix.'viewed_in_browser' => [
                         'label' => 'mautic.email.report.stat.viewed_in_browser',
-                        'type'  => 'bool'
+                        'type'  => 'bool',
                     ],
-                    $statPrefix.'date_read'         => [
+                    $statPrefix.'date_read' => [
                         'label' => 'mautic.email.report.stat.date_read',
-                        'type'  => 'datetime'
+                        'type'  => 'datetime',
                     ],
-                    $statPrefix.'retry_count'       => [
+                    $statPrefix.'retry_count' => [
                         'label' => 'mautic.email.report.stat.retry_count',
-                        'type'  => 'int'
+                        'type'  => 'int',
                     ],
-                    $statPrefix.'source'            => [
+                    $statPrefix.'source' => [
                         'label' => 'mautic.report.field.source',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $statPrefix.'source_id'         => [
+                    $statPrefix.'source_id' => [
                         'label' => 'mautic.report.field.source_id',
-                        'type'  => 'int'
-                    ]
+                        'type'  => 'int',
+                    ],
                 ];
 
                 $data = [
                     'display_name' => 'mautic.email.stats.report.table',
-                    'columns'      => array_merge($columns, $statColumns, $event->getLeadColumns(), $event->getIpColumn())
+                    'columns'      => array_merge($columns, $statColumns, $event->getLeadColumns(), $event->getIpColumn()),
                 ];
                 $event->addTable('email.stats', $data, 'emails');
 
@@ -154,11 +150,9 @@ public function onReportBuilder(ReportBuilderEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGeneratorEvent $event
-     *
-     * @return void
      */
     public function onReportGenerate(ReportGeneratorEvent $event)
     {
@@ -187,17 +181,14 @@ public function onReportGenerate(ReportGeneratorEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGraphEvent $event
-     *
-     * @return void
      */
     public function onReportGraphGenerate(ReportGraphEvent $event)
     {
         // Context check, we only want to fire for Lead reports
         if (!$event->checkContext('email.stats')) {
-
             return;
         }
 
@@ -247,7 +238,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
                         [
                             'data'      => $chart->render(),
                             'name'      => $g,
-                            'iconClass' => 'fa-flag-checkered'
+                            'iconClass' => 'fa-flag-checkered',
                         ]
                     );
                     break;
@@ -316,4 +307,4 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
             unset($queryBuilder);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/EventListener/SearchSubscriber.php b/app/bundles/EmailBundle/EventListener/SearchSubscriber.php
index 0191b267189..4a1c7c8129e 100644
--- a/app/bundles/EmailBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/SearchSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\UserHelper;
 use Mautic\EmailBundle\Model\EmailModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -47,61 +46,61 @@ public function __construct(UserHelper $userHelper, EmailModel $emailModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH      => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
      * @param MauticEvents\GlobalSearchEvent $event
      */
-    public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
+    public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
     {
         $str = $event->getSearchString();
         if (empty($str)) {
             return;
         }
 
-        $filter      = array("string" => $str, "force" => array());
+        $filter      = ['string' => $str, 'force' => []];
         $permissions = $this->security->isGranted(
-            array('email:emails:viewown', 'email:emails:viewother'),
+            ['email:emails:viewown', 'email:emails:viewother'],
             'RETURN_ARRAY'
         );
         if ($permissions['email:emails:viewown'] || $permissions['email:emails:viewother']) {
             if (!$permissions['email:emails:viewother']) {
-                $filter['force'][] = array(
+                $filter['force'][] = [
                     'column' => 'IDENTITY(e.createdBy)',
                     'expr'   => 'eq',
-                    'value'  => $this->userHelper->getUser()->getId()
-                );
+                    'value'  => $this->userHelper->getUser()->getId(),
+                ];
             }
 
             $emails = $this->emailModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $filter
-                ));
+                    'filter' => $filter,
+                ]);
 
             if (count($emails) > 0) {
-                $emailResults = array();
+                $emailResults = [];
 
                 foreach ($emails as $email) {
                     $emailResults[] = $this->templating->renderResponse(
                         'MauticEmailBundle:SubscribedEvents\Search:global.html.php',
-                        array('email' => $email)
+                        ['email' => $email]
                     )->getContent();
                 }
                 if (count($emails) > 5) {
                     $emailResults[] = $this->templating->renderResponse(
                         'MauticEmailBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($emails) - 5)
-                        )
+                            'remaining'    => (count($emails) - 5),
+                        ]
                     )->getContent();
                 }
                 $emailResults['count'] = count($emails);
@@ -113,13 +112,13 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
     /**
      * @param MauticEvents\CommandListEvent $event
      */
-    public function onBuildCommandList (MauticEvents\CommandListEvent $event)
+    public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        if ($this->security->isGranted(array('email:emails:viewown', 'email:emails:viewother'), "MATCH_ONE")) {
+        if ($this->security->isGranted(['email:emails:viewown', 'email:emails:viewother'], 'MATCH_ONE')) {
             $event->addCommands(
                 'mautic.email.emails',
                 $this->emailModel->getCommandList()
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/EventListener/TokenSubscriber.php b/app/bundles/EmailBundle/EventListener/TokenSubscriber.php
index b8824388c4b..6c1fdf58a1f 100644
--- a/app/bundles/EmailBundle/EventListener/TokenSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/TokenSubscriber.php
@@ -1,26 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\EventListener;
 
-use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
-use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\TokenReplacementEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\EmailBundle\EmailEvents;
 use Mautic\EmailBundle\Entity\Email;
 use Mautic\EmailBundle\Event\EmailSendEvent;
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class TokenSubscriber
+ * Class TokenSubscriber.
  */
 class TokenSubscriber extends CommonSubscriber
 {
@@ -29,17 +27,15 @@ class TokenSubscriber extends CommonSubscriber
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_ON_SEND     => array('decodeTokens', 254),
-            EmailEvents::EMAIL_ON_DISPLAY  => array('decodeTokens', 254),
-            EmailEvents::TOKEN_REPLACEMENT => ['onTokenReplacement', 254]
-        );
+        return [
+            EmailEvents::EMAIL_ON_SEND     => ['decodeTokens', 254],
+            EmailEvents::EMAIL_ON_DISPLAY  => ['decodeTokens', 254],
+            EmailEvents::TOKEN_REPLACEMENT => ['onTokenReplacement', 254],
+        ];
     }
 
     /**
      * @param EmailSendEvent $event
-     *
-     * @return void
      */
     public function decodeTokens(EmailSendEvent $event)
     {
@@ -53,11 +49,11 @@ public function decodeTokens(EmailSendEvent $event)
             $event->setPlainText($plainText);
         }
 
-        $lead = $event->getLead();
-        $email = $event->getEmail();
+        $lead                  = $event->getLead();
+        $email                 = $event->getEmail();
         $dynamicContentAsArray = $email instanceof Email ? $email->getDynamicContent() : null;
 
-        if (! empty($dynamicContentAsArray)) {
+        if (!empty($dynamicContentAsArray)) {
             $tokenEvent = new TokenReplacementEvent(null, $lead, ['lead' => null, 'dynamicContent' => $dynamicContentAsArray]);
             $this->dispatcher->dispatch(EmailEvents::TOKEN_REPLACEMENT, $tokenEvent);
             $event->addTokens($tokenEvent->getTokens());
@@ -71,7 +67,7 @@ public function onTokenReplacement(TokenReplacementEvent $event)
     {
         $clickthrough = $event->getClickthrough();
 
-        if (! array_key_exists('dynamicContent', $clickthrough)) {
+        if (!array_key_exists('dynamicContent', $clickthrough)) {
             return;
         }
 
@@ -115,17 +111,17 @@ private function matchFilterForLead(array $filter, array $lead)
                 continue;
             }
 
-            /**
+            /*
              * Split the filters into groups based on the glue.
              * The first filter and any filters whose glue is
              * "or" will start a new group.
              */
             if ($groupNum === 0 || $data['glue'] === 'or') {
-                $groupNum++;
+                ++$groupNum;
                 $groups[$groupNum] = null;
             }
 
-            /**
+            /*
              * If the group has been marked as false, there
              * is no need to continue checking the others
              * in the group.
@@ -142,7 +138,7 @@ private function matchFilterForLead(array $filter, array $lead)
             }
 
             if (in_array($data['operator'], ['like', '!like'])) {
-                $leadVal = (string) $leadVal;
+                $leadVal   = (string) $leadVal;
                 $filterVal = (string) $filterVal;
             }
 
diff --git a/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php b/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php
index a68b711f9a7..34214bf7f0a 100644
--- a/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/EmailBundle/EventListener/WebhookSubscriber.php
@@ -1,50 +1,49 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\EventListener;
 
-use Mautic\WebhookBundle\WebhookEvents;
-use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\EmailBundle\EmailEvents;
+use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\WebhookEvents;
 
 /**
- * Class WebhookSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class WebhookSubscriber.
  */
 class WebhookSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            WebhookEvents::WEBHOOK_ON_BUILD => array('onWebhookBuild', 0)
-        );
+        return [
+            WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
+        ];
     }
 
     /**
-     * Add event triggers and actions
+     * Add event triggers and actions.
      *
      * @param WebhookBuilderEvent $event
      */
     public function onWebhookBuild(WebhookBuilderEvent $event)
     {
         // add checkbox to the webhook form for new leads
-        $mailOpen  = array(
+        $mailOpen = [
             'label'       => 'mautic.email.webhook.event.open',
             'description' => 'mautic.email.webhook.event.open_desc',
-        );
+        ];
 
         // add it to the list
         $event->addEvent(EmailEvents::EMAIL_ON_OPEN, $mailOpen);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Exception/MailboxException.php b/app/bundles/EmailBundle/Exception/MailboxException.php
index f41d6f9730e..f74c3894834 100644
--- a/app/bundles/EmailBundle/Exception/MailboxException.php
+++ b/app/bundles/EmailBundle/Exception/MailboxException.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Exception;
 
-
 class MailboxException extends \Exception
 {
     public function __construct($message = null, $code = 0, \Exception $previous = null)
@@ -24,4 +24,4 @@ public function __construct($message = null, $code = 0, \Exception $previous = n
 
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Form/Type/AbTestPropertiesType.php b/app/bundles/EmailBundle/Form/Type/AbTestPropertiesType.php
index 4a9d1eaae0b..b848ed85d0c 100644
--- a/app/bundles/EmailBundle/Form/Type/AbTestPropertiesType.php
+++ b/app/bundles/EmailBundle/Form/Type/AbTestPropertiesType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,17 +15,16 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class AbTestPropertiesType
+ * Class AbTestPropertiesType.
  */
 class AbTestPropertiesType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $options = array('label' => false);
+        $options = ['label' => false];
         if (isset($options['formTypeOptions'])) {
             $options = array_merge($options, $options['formTypeOptions']);
         }
@@ -36,10 +36,10 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(array(
+        $resolver->setOptional([
             'formType',
-            'formTypeOptions'
-        ));
+            'formTypeOptions',
+        ]);
     }
 
     /**
@@ -47,6 +47,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "email_abtest_settings";
+        return 'email_abtest_settings';
     }
 }
diff --git a/app/bundles/EmailBundle/Form/Type/BatchSendType.php b/app/bundles/EmailBundle/Form/Type/BatchSendType.php
index ac305f242fb..b3b03a39dd2 100644
--- a/app/bundles/EmailBundle/Form/Type/BatchSendType.php
+++ b/app/bundles/EmailBundle/Form/Type/BatchSendType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class LeadImportType
+ * Class LeadImportType.
  */
 class BatchSendType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -28,20 +28,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'batchlimit',
             'text',
-            array(
+            [
                 'label'       => false,
-                'attr'        => array('class' => 'form-control'),
+                'attr'        => ['class' => 'form-control'],
                 'data'        => $default,
-                'constraints' => array(
+                'constraints' => [
                     new \Symfony\Component\Validator\Constraints\NotBlank(
-                        array('message' => 'mautic.core.value.required')
-                    )
-                )
-            )
+                        ['message' => 'mautic.core.value.required']
+                    ),
+                ],
+            ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -50,6 +50,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "batch_send";
+        return 'batch_send';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Form/Type/ConfigMonitoredEmailType.php b/app/bundles/EmailBundle/Form/Type/ConfigMonitoredEmailType.php
index 360da7fd60f..10b5424a85a 100644
--- a/app/bundles/EmailBundle/Form/Type/ConfigMonitoredEmailType.php
+++ b/app/bundles/EmailBundle/Form/Type/ConfigMonitoredEmailType.php
@@ -1,26 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Form\Type;
 
-use Mautic\EmailBundle\Event\MonitoredEmailEvent;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\EmailBundle\EmailEvents;
+use Mautic\EmailBundle\Event\MonitoredEmailEvent;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
 
 /**
- * Class ConfigMonitoredEmailType
- *
- * @package Mautic\CoreBundle\Form\Type
+ * Class ConfigMonitoredEmailType.
  */
 class ConfigMonitoredEmailType extends AbstractType
 {
@@ -56,18 +53,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             $folderSettings = $event->getFolders();
             foreach ($folderSettings as $key => $settings) {
-                $folderData = (array_key_exists($key, $data)) ? $data[$key] : array();
+                $folderData = (array_key_exists($key, $data)) ? $data[$key] : [];
                 $builder->add(
                     $key,
                     'monitored_mailboxes',
-                    array(
+                    [
                         'label'            => $settings['label'],
                         'mailbox'          => $key,
                         'default_folder'   => $settings['default'],
                         'data'             => $folderData,
                         'required'         => false,
-                        'general_settings' => (array_key_exists('general', $data)) ? $data['general'] : array(),
-                    )
+                        'general_settings' => (array_key_exists('general', $data)) ? $data['general'] : [],
+                    ]
                 );
             }
         }
diff --git a/app/bundles/EmailBundle/Form/Type/ConfigMonitoredMailboxesType.php b/app/bundles/EmailBundle/Form/Type/ConfigMonitoredMailboxesType.php
index a5f5808e10e..76d79fb96a3 100644
--- a/app/bundles/EmailBundle/Form/Type/ConfigMonitoredMailboxesType.php
+++ b/app/bundles/EmailBundle/Form/Type/ConfigMonitoredMailboxesType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,11 +19,10 @@
 use Symfony\Component\Validator\Constraints\Email;
 
 /**
- * Class ConfigType
+ * Class ConfigType.
  */
 class ConfigMonitoredMailboxesType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
@@ -45,129 +45,129 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'address',
             'text',
-            array(
-                'label'       => 'mautic.email.config.monitored_email_address',
-                'label_attr'  => array('class' => 'control-label'),
-                'attr'        => array(
+            [
+                'label'      => 'mautic.email.config.monitored_email_address',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'tooltip'      => 'mautic.email.config.monitored_email_address.tooltip',
-                    'data-show-on' => $monitoredShowOn
-                ),
-                'constraints' => array(
+                    'data-show-on' => $monitoredShowOn,
+                ],
+                'constraints' => [
                     new Email(
-                        array(
-                            'message' => 'mautic.core.email.required'
-                        )
-                    )
-                ),
-                'required'    => false
-            )
+                        [
+                            'message' => 'mautic.core.email.required',
+                        ]
+                    ),
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'host',
             'text',
-            array(
+            [
                 'label'      => 'mautic.email.config.monitored_email_host',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'tooltip'      => 'mautic.email.config.monitored_email_host.tooltip',
-                    'data-show-on' => $monitoredShowOn
-                ),
-                'required'   => false
-            )
+                    'data-show-on' => $monitoredShowOn,
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'port',
             'text',
-            array(
+            [
                 'label'      => 'mautic.email.config.monitored_email_port',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'tooltip'      => 'mautic.email.config.monitored_email_port.tooltip',
-                    'data-show-on' => $monitoredShowOn
-                ),
-                'required'   => false,
-                'data'       => (array_key_exists('port', $options['data']))
-                    ? $options['data']['port'] : 993
-            )
+                    'data-show-on' => $monitoredShowOn,
+                ],
+                'required' => false,
+                'data'     => (array_key_exists('port', $options['data']))
+                    ? $options['data']['port'] : 993,
+            ]
         );
 
         if (extension_loaded('openssl')) {
             $builder->add(
                 'encryption',
                 'choice',
-                array(
-                    'choices'     => array(
-                        '/ssl' => 'mautic.email.config.mailer_encryption.ssl',
+                [
+                    'choices' => [
+                        '/ssl'                 => 'mautic.email.config.mailer_encryption.ssl',
                         '/ssl/novalidate-cert' => 'mautic.email.config.monitored_email_encryption.ssl_novalidate',
-                        '/tls' => 'mautic.email.config.mailer_encryption.tls',
-                        '/tls/novalidate-cert' => 'mautic.email.config.monitored_email_encryption.tls_novalidate'
-                    ),
-                    'label'       => 'mautic.email.config.monitored_email_encryption',
-                    'required'    => false,
-                    'attr'        => array(
+                        '/tls'                 => 'mautic.email.config.mailer_encryption.tls',
+                        '/tls/novalidate-cert' => 'mautic.email.config.monitored_email_encryption.tls_novalidate',
+                    ],
+                    'label'    => 'mautic.email.config.monitored_email_encryption',
+                    'required' => false,
+                    'attr'     => [
                         'class'        => 'form-control',
                         'data-show-on' => $monitoredShowOn,
-                        'tooltip'      => 'mautic.email.config.monitored_email_encryption.tooltip'
-                    ),
+                        'tooltip'      => 'mautic.email.config.monitored_email_encryption.tooltip',
+                    ],
                     'empty_value' => 'mautic.email.config.mailer_encryption.none',
-                    'data'        => (isset($options['data']['encryption'])) ? $options['data']['encryption'] : '/ssl'
-                )
+                    'data'        => (isset($options['data']['encryption'])) ? $options['data']['encryption'] : '/ssl',
+                ]
             );
         }
 
         $builder->add(
             'user',
             'text',
-            array(
+            [
                 'label'      => 'mautic.email.config.monitored_email_user',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'tooltip'      => 'mautic.email.config.monitored_email_user.tooltip',
                     'autocomplete' => 'off',
-                    'data-show-on' => $monitoredShowOn
-                ),
-                'required'   => false
-            )
+                    'data-show-on' => $monitoredShowOn,
+                ],
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'password',
             'password',
-            array(
+            [
                 'label'      => 'mautic.email.config.monitored_email_password',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'placeholder'  => 'mautic.user.user.form.passwordplaceholder',
                     'preaddon'     => 'fa fa-lock',
                     'tooltip'      => 'mautic.email.config.monitored_email_password.tooltip',
                     'autocomplete' => 'off',
-                    'data-show-on' => $monitoredShowOn
-                ),
-                'required'   => false
-            )
+                    'data-show-on' => $monitoredShowOn,
+                ],
+                'required' => false,
+            ]
         );
 
         if ($options['mailbox'] != 'general') {
             $builder->add(
                 'override_settings',
                 'yesno_button_group',
-                array(
+                [
                     'label'      => 'mautic.email.config.monitored_email_override_settings',
-                    'label_attr' => array('class' => 'control-label'),
+                    'label_attr' => ['class' => 'control-label'],
                     'data'       => (array_key_exists('override_settings', $options['data']) && !empty($options['data']['override_settings'])) ? true : false,
-                    'attr'       => array(
-                        'class'        => 'form-control',
-                        'tooltip'      => 'mautic.email.config.monitored_email_override_settings.tooltip'
-                    ),
-                    'required'   => false
-                )
+                    'attr'       => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.email.config.monitored_email_override_settings.tooltip',
+                    ],
+                    'required' => false,
+                ]
             );
 
             /** @var \Mautic\EmailBundle\MonitoredEmail\Mailbox $mailbox */
@@ -177,10 +177,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $mailbox->setMailboxSettings($settings);
 
             // Check for IMAP connection and get a folder list
-            $choices = array(
+            $choices = [
                 'INBOX' => 'INBOX',
-                'Trash' => 'Trash'
-            );
+                'Trash' => 'Trash',
+            ];
 
             if ($mailbox->isConfigured()) {
                 try {
@@ -197,35 +197,35 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 'folder',
                 'choice',
-                array(
+                [
                     'choices'    => $choices,
                     'label'      => 'mautic.email.config.monitored_email_folder',
-                    'label_attr' => array('class' => 'control-label'),
+                    'label_attr' => ['class' => 'control-label'],
                     'attr'       => array_merge(
-                        array(
+                        [
                             'class'             => 'form-control',
                             'tooltip'           => 'mautic.email.config.monitored_email_folder.tooltip',
-                            'data-imap-folders' => $options['mailbox']
-                        )
+                            'data-imap-folders' => $options['mailbox'],
+                        ]
                     ),
-                    'data'       => (array_key_exists('folder', $options['data']))
+                    'data' => (array_key_exists('folder', $options['data']))
                         ? $options['data']['folder'] : $options['default_folder'],
-                    'required'   => false
-                )
+                    'required' => false,
+                ]
             );
         }
 
         $builder->add(
             'test_connection_button',
             'standalone_button',
-            array(
+            [
                 'label'    => 'mautic.email.config.monitored_email.test_connection',
                 'required' => false,
-                'attr'     => array(
+                'attr'     => [
                     'class'   => 'btn btn-success',
-                    'onclick' => 'Mautic.testMonitoredEmailServerConnection(\''.$options['mailbox'].'\')'
-                )
-            )
+                    'onclick' => 'Mautic.testMonitoredEmailServerConnection(\''.$options['mailbox'].'\')',
+                ],
+            ]
         );
     }
 
@@ -234,7 +234,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array('mailbox', 'default_folder', 'general_settings'));
+        $resolver->setRequired(['mailbox', 'default_folder', 'general_settings']);
     }
 
     /**
@@ -252,4 +252,4 @@ public function getName()
     {
         return 'monitored_mailboxes';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Form/Type/ConfigType.php b/app/bundles/EmailBundle/Form/Type/ConfigType.php
index 4fd0100ee06..ad3b39bb969 100644
--- a/app/bundles/EmailBundle/Form/Type/ConfigType.php
+++ b/app/bundles/EmailBundle/Form/Type/ConfigType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,11 +17,10 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class ConfigType
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
@@ -45,15 +45,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.unsubscribe_text.tooltip'
+                    'tooltip' => 'mautic.email.config.unsubscribe_text.tooltip',
                 ],
-                'required'   => false,
-                'data'       => (array_key_exists('unsubscribe_text', $options['data']) && !empty($options['data']['unsubscribe_text']))
+                'required' => false,
+                'data'     => (array_key_exists('unsubscribe_text', $options['data']) && !empty($options['data']['unsubscribe_text']))
                     ? $options['data']['unsubscribe_text']
                     : $this->factory->getTranslator()->trans(
                         'mautic.email.unsubscribe.text',
                         ['%link%' => '|URL|']
-                    )
+                    ),
             ]
         );
 
@@ -65,15 +65,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.webview_text.tooltip'
+                    'tooltip' => 'mautic.email.config.webview_text.tooltip',
                 ],
-                'required'   => false,
-                'data'       => (array_key_exists('webview_text', $options['data']) && !empty($options['data']['webview_text']))
+                'required' => false,
+                'data'     => (array_key_exists('webview_text', $options['data']) && !empty($options['data']['webview_text']))
                     ? $options['data']['webview_text']
                     : $this->factory->getTranslator()->trans(
                         'mautic.email.webview.text',
                         ['%link%' => '|URL|']
-                    )
+                    ),
             ]
         );
 
@@ -85,18 +85,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.unsubscribe_message.tooltip'
+                    'tooltip' => 'mautic.email.config.unsubscribe_message.tooltip',
                 ],
-                'required'   => false,
-                'data'       => (array_key_exists('unsubscribe_message', $options['data']) && !empty($options['data']['unsubscribe_message']))
+                'required' => false,
+                'data'     => (array_key_exists('unsubscribe_message', $options['data']) && !empty($options['data']['unsubscribe_message']))
                     ? $options['data']['unsubscribe_message']
                     : $this->factory->getTranslator()->trans(
                         'mautic.email.unsubscribed.success',
                         [
                             '%resubscribeUrl%' => '|URL|',
-                            '%email%'          => '|EMAIL|'
+                            '%email%'          => '|EMAIL|',
                         ]
-                    )
+                    ),
             ]
         );
 
@@ -108,18 +108,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.resubscribe_message.tooltip'
+                    'tooltip' => 'mautic.email.config.resubscribe_message.tooltip',
                 ],
-                'required'   => false,
-                'data'       => (array_key_exists('resubscribe_message', $options['data']) && !empty($options['data']['resubscribe_message']))
+                'required' => false,
+                'data'     => (array_key_exists('resubscribe_message', $options['data']) && !empty($options['data']['resubscribe_message']))
                     ? $options['data']['resubscribe_message']
                     : $this->factory->getTranslator()->trans(
                         'mautic.email.resubscribed.success',
                         [
                             '%unsubscribeUrl%' => '|URL|',
-                            '%email%'          => '|EMAIL|'
+                            '%email%'          => '|EMAIL|',
                         ]
-                    )
+                    ),
             ]
         );
 
@@ -131,17 +131,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.default_signature_text.tooltip'
+                    'tooltip' => 'mautic.email.config.default_signature_text.tooltip',
                 ],
-                'required'   => false,
-                'data'       => (!empty($options['data']['default_signature_text']))
+                'required' => false,
+                'data'     => (!empty($options['data']['default_signature_text']))
                     ? $options['data']['default_signature_text']
                     : $this->factory->getTranslator()->trans(
                         'mautic.email.default.signature',
                         [
-                            '%from_name%' => '|FROM_NAME|'
+                            '%from_name%' => '|FROM_NAME|',
                         ]
-                    )
+                    ),
             ]
         );
 
@@ -149,19 +149,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_from_name',
             'text',
             [
-                'label'       => 'mautic.email.config.mailer.from.name',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.email.config.mailer.from.name',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.mailer.from.name.tooltip'
+                    'tooltip' => 'mautic.email.config.mailer.from.name.tooltip',
                 ],
                 'constraints' => [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -169,24 +169,24 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_from_email',
             'text',
             [
-                'label'       => 'mautic.email.config.mailer.from.email',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.email.config.mailer.from.email',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.mailer.from.email.tooltip'
+                    'tooltip' => 'mautic.email.config.mailer.from.email.tooltip',
                 ],
                 'constraints' => [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.email.required'
+                            'message' => 'mautic.core.email.required',
                         ]
                     ),
                     new Email(
                         [
-                            'message' => 'mautic.core.email.required'
+                            'message' => 'mautic.core.email.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -198,9 +198,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.mailer.return.path.tooltip'
+                    'tooltip' => 'mautic.email.config.mailer.return.path.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -208,7 +208,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_transport',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'mautic.transport.amazon'    => 'mautic.email.config.mailer_transport.amazon',
                     'gmail'                      => 'mautic.email.config.mailer_transport.gmail',
                     'mautic.transport.mandrill'  => 'mautic.email.config.mailer_transport.mandrill',
@@ -217,15 +217,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'mautic.transport.postmark'  => 'mautic.email.config.mailer_transport.postmark',
                     'mautic.transport.sendgrid'  => 'mautic.email.config.mailer_transport.sendgrid',
                     'sendmail'                   => 'mautic.email.config.mailer_transport.sendmail',
-                    'mautic.transport.sparkpost' => 'mautic.email.config.mailer_transport.sparkpost'
+                    'mautic.transport.sparkpost' => 'mautic.email.config.mailer_transport.sparkpost',
                 ],
-                'label'       => 'mautic.email.config.mailer.transport',
-                'required'    => false,
-                'attr'        => [
+                'label'    => 'mautic.email.config.mailer.transport',
+                'required' => false,
+                'attr'     => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.mailer.transport.tooltip'
+                    'tooltip' => 'mautic.email.config.mailer.transport.tooltip',
                 ],
-                'empty_value' => false
+                'empty_value' => false,
             ]
         );
 
@@ -240,8 +240,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'tooltip' => 'mautic.email.config.mailer.convert.embed.images.tooltip',
 
                 ],
-                'data'       => empty($options['data']['mailer_convert_embed_images']) ? false : true,
-                'required'   => false
+                'data'     => empty($options['data']['mailer_convert_embed_images']) ? false : true,
+                'required' => false,
             ]
         );
 
@@ -256,8 +256,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'tooltip' => 'mautic.email.config.mailer.append.tracking.pixel.tooltip',
 
                 ],
-                'data'       => empty($options['data']['mailer_append_tracking_pixel']) ? false : true,
-                'required'   => false
+                'data'     => empty($options['data']['mailer_append_tracking_pixel']) ? false : true,
+                'required' => false,
             ]
         );
 
@@ -273,34 +273,32 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'data-show-on' => $smtpServiceShowConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.host.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.host.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
-
         $builder->add(
             'mailer_amazon_region',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'email-smtp.eu-west-1.amazonaws.com' => 'mautic.email.config.mailer.amazon_host.eu_west_1',
                     'email-smtp.us-east-1.amazonaws.com' => 'mautic.email.config.mailer.amazon_host.us_east_1',
-                    'email-smtp.us-west-2.amazonaws.com' => 'mautic.email.config.mailer.amazon_host.eu_west_2'
+                    'email-smtp.us-west-2.amazonaws.com' => 'mautic.email.config.mailer.amazon_host.eu_west_2',
                 ],
-                'label'       => 'mautic.email.config.mailer.amazon_host',
-                'required'    => false,
-                'attr'        => [
+                'label'    => 'mautic.email.config.mailer.amazon_host',
+                'required' => false,
+                'attr'     => [
                     'class'        => 'form-control',
                     'data-show-on' => $amazonRegionShowConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.amazon_host.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.amazon_host.tooltip',
                 ],
-                'empty_value' => false
+                'empty_value' => false,
             ]
         );
 
-
         $builder->add(
             'mailer_port',
             'text',
@@ -310,9 +308,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'data-show-on' => $smtpServiceShowConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.port.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.port.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -320,20 +318,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_auth_mode',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'plain'    => 'mautic.email.config.mailer_auth_mode.plain',
                     'login'    => 'mautic.email.config.mailer_auth_mode.login',
-                    'cram-md5' => 'mautic.email.config.mailer_auth_mode.cram-md5'
+                    'cram-md5' => 'mautic.email.config.mailer_auth_mode.cram-md5',
                 ],
-                'label'       => 'mautic.email.config.mailer.auth.mode',
-                'label_attr'  => ['class' => 'control-label'],
-                'required'    => false,
-                'attr'        => [
+                'label'      => 'mautic.email.config.mailer.auth.mode',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
                     'class'        => 'form-control',
                     'data-show-on' => $smtpServiceShowConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.auth.mode.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.auth.mode.tooltip',
                 ],
-                'empty_value' => 'mautic.email.config.mailer_auth_mode.none'
+                'empty_value' => 'mautic.email.config.mailer_auth_mode.none',
             ]
         );
 
@@ -392,9 +390,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-show-on' => $mailerLoginUserShowConditions,
                     'data-hide-on' => $mailerLoginUserHideConditions,
                     'tooltip'      => 'mautic.email.config.mailer.user.tooltip',
-                    'autocomplete' => 'off'
+                    'autocomplete' => 'off',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -411,9 +409,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-show-on' => $mailerLoginPasswordShowConditions,
                     'data-hide-on' => $mailerLoginPasswordHideConditions,
                     'tooltip'      => 'mautic.email.config.mailer.password.tooltip',
-                    'autocomplete' => 'off'
+                    'autocomplete' => 'off',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -429,7 +427,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-show-on' => $apiKeyShowConditions,
                     'tooltip'      => 'mautic.email.config.mailer.apikey.tooltop',
                     'autocomplete' => 'off',
-                    'placeholder'  => 'mautic.email.config.mailer.apikey.placeholder'
+                    'placeholder'  => 'mautic.email.config.mailer.apikey.placeholder',
                 ],
                 'required' => false,
             ]
@@ -439,18 +437,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_encryption',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'ssl' => 'mautic.email.config.mailer_encryption.ssl',
-                    'tls' => 'mautic.email.config.mailer_encryption.tls'
+                    'tls' => 'mautic.email.config.mailer_encryption.tls',
                 ],
-                'label'       => 'mautic.email.config.mailer.encryption',
-                'required'    => false,
-                'attr'        => [
+                'label'    => 'mautic.email.config.mailer.encryption',
+                'required' => false,
+                'attr'     => [
                     'class'        => 'form-control',
                     'data-show-on' => $smtpServiceShowConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.encryption.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.encryption.tooltip',
                 ],
-                'empty_value' => 'mautic.email.config.mailer_encryption.none'
+                'empty_value' => 'mautic.email.config.mailer_encryption.none',
             ]
         );
 
@@ -462,8 +460,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false,
                 'attr'     => [
                     'class'   => 'btn btn-success',
-                    'onclick' => 'Mautic.testEmailServerConnection()'
-                ]
+                    'onclick' => 'Mautic.testEmailServerConnection()',
+                ],
             ]
         );
 
@@ -475,8 +473,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false,
                 'attr'     => [
                     'class'   => 'btn btn-info',
-                    'onclick' => 'Mautic.testEmailServerConnection(true)'
-                ]
+                    'onclick' => 'Mautic.testEmailServerConnection(true)',
+                ],
             ]
         );
 
@@ -486,18 +484,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_spool_type',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'memory' => 'mautic.email.config.mailer_spool_type.memory',
-                    'file'   => 'mautic.email.config.mailer_spool_type.file'
+                    'file'   => 'mautic.email.config.mailer_spool_type.file',
                 ],
-                'label'       => 'mautic.email.config.mailer.spool.type',
-                'label_attr'  => ['class' => 'control-label'],
-                'required'    => false,
-                'attr'        => [
+                'label'      => 'mautic.email.config.mailer.spool.type',
+                'label_attr' => ['class' => 'control-label'],
+                'required'   => false,
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.email.config.mailer.spool.type.tooltip'
+                    'tooltip' => 'mautic.email.config.mailer.spool.type.tooltip',
                 ],
-                'empty_value' => false
+                'empty_value' => false,
             ]
         );
 
@@ -510,9 +508,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'data-hide-on' => $spoolConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.spool.path.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.spool.path.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -525,9 +523,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'data-hide-on' => $spoolConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.spool.msg.limit.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.spool.msg.limit.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -540,9 +538,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'data-hide-on' => $spoolConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.spool.time.limit.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.spool.time.limit.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -555,9 +553,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'data-hide-on' => $spoolConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.spool.recover.timeout.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.spool.recover.timeout.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -570,9 +568,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'data-hide-on' => $spoolConditions,
-                    'tooltip'      => 'mautic.email.config.mailer.spool.clear.timeout.tooltip'
+                    'tooltip'      => 'mautic.email.config.mailer.spool.clear.timeout.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -582,7 +580,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'    => false,
                 'data'     => (array_key_exists('monitored_email', $options['data'])) ? $options['data']['monitored_email'] : [],
-                'required' => false
+                'required' => false,
             ]
         );
 
@@ -596,35 +594,35 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'   => 'form-control',
                     'tooltip' => 'mautic.email.config.mailer.is.owner.tooltip',
                 ],
-                'data'       => empty($options['data']['mailer_is_owner']) ? false : true,
-                'required'   => false
+                'data'     => empty($options['data']['mailer_is_owner']) ? false : true,
+                'required' => false,
             ]
         );
-        $builder->add('email_frequency_number','number',
-            array(
+        $builder->add('email_frequency_number', 'number',
+            [
                 'precision'  => 0,
                 'label'      => 'mautic.lead.list.frequency.number',
-                'label_attr' => array('class' => 'control-label'),
+                'label_attr' => ['class' => 'control-label'],
                 'required'   => false,
-                'attr'       => array(
-                    'class' => 'form-control frequency'
-                )
-            ));
-        $builder->add('email_frequency_time','choice',
-            array(
-                'choices'    => array(
-                    'DAY' => 'day',
-                    'WEEK' => 'week',
-                    'MONTH' => 'month'
-                ),
+                'attr'       => [
+                    'class' => 'form-control frequency',
+                ],
+            ]);
+        $builder->add('email_frequency_time', 'choice',
+            [
+                'choices' => [
+                    'DAY'   => 'day',
+                    'WEEK'  => 'week',
+                    'MONTH' => 'month',
+                ],
                 'label'      => 'mautic.lead.list.frequency.times',
-                'label_attr' => array('class' => 'control-label'),
+                'label_attr' => ['class' => 'control-label'],
                 'required'   => false,
                 'multiple'   => false,
-                'attr'       => array(
-                    'class' => 'form-control frequency'
-                )
-            ));
+                'attr'       => [
+                    'class' => 'form-control frequency',
+                ],
+            ]);
     }
 
     /**
diff --git a/app/bundles/EmailBundle/Form/Type/DashboardEmailsInTimeWidgetType.php b/app/bundles/EmailBundle/Form/Type/DashboardEmailsInTimeWidgetType.php
index 7c6d6d3cd40..e69d4f516e2 100644
--- a/app/bundles/EmailBundle/Form/Type/DashboardEmailsInTimeWidgetType.php
+++ b/app/bundles/EmailBundle/Form/Type/DashboardEmailsInTimeWidgetType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class DashboardEmailsInTimeWidgetType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class DashboardEmailsInTimeWidgetType.
  */
 class DashboardEmailsInTimeWidgetType extends AbstractType
 {
@@ -25,20 +24,20 @@ class DashboardEmailsInTimeWidgetType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('flag', 'choice', array(
+        $builder->add('flag', 'choice', [
                 'label'   => 'mautic.email.flag.filter',
-                'choices' => array(
+                'choices' => [
                     ''                           => 'mautic.email.flag.sent',
                     'opened'                     => 'mautic.email.flag.opened',
                     'failed'                     => 'mautic.email.flag.failed',
                     'sent_and_opened'            => 'mautic.email.flag.sent.and.opened',
                     'sent_and_opened_and_failed' => 'mautic.email.flag.sent.and.opened.and.failed',
-                ),
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
+                ],
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
                 'empty_data' => '',
-                'required'   => false
-            )
+                'required'   => false,
+            ]
         );
     }
 
@@ -47,6 +46,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "email_dashboard_emails_in_time_widget";
+        return 'email_dashboard_emails_in_time_widget';
     }
 }
diff --git a/app/bundles/EmailBundle/Form/Type/EmailListType.php b/app/bundles/EmailBundle/Form/Type/EmailListType.php
index a3ec197f43a..226a45593ff 100644
--- a/app/bundles/EmailBundle/Form/Type/EmailListType.php
+++ b/app/bundles/EmailBundle/Form/Type/EmailListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,9 +17,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class EmailListType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class EmailListType.
  */
 class EmailListType extends AbstractType
 {
@@ -50,7 +49,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
-                'choices'          => function (Options $options) {
+                'choices' => function (Options $options) {
                     $choices = [];
 
                     $emails = $this->repo->getEmailList(
@@ -72,19 +71,19 @@ public function configureOptions(OptionsResolver $resolver)
 
                     return $choices;
                 },
-                'expanded'         => false,
-                'multiple'         => true,
-                'required'         => false,
-                'empty_value'      => function (Options $options) {
+                'expanded'    => false,
+                'multiple'    => true,
+                'required'    => false,
+                'empty_value' => function (Options $options) {
                     return (empty($options['choices'])) ? 'mautic.email.no.emails.note' : 'mautic.core.form.chooseone';
                 },
-                'email_type'       => 'template',
-                'disabled'         => function (Options $options) {
-                    return (empty($options['choices']));
+                'email_type' => 'template',
+                'disabled'   => function (Options $options) {
+                    return empty($options['choices']);
                 },
-                'top_level'        => 'variant',
-                'variant_parent'   => null,
-                'ignore_ids'       => []
+                'top_level'      => 'variant',
+                'variant_parent' => null,
+                'ignore_ids'     => [],
             ]
         );
 
@@ -96,7 +95,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getName()
     {
-        return "email_list";
+        return 'email_list';
     }
 
     /**
diff --git a/app/bundles/EmailBundle/Form/Type/EmailOpenType.php b/app/bundles/EmailBundle/Form/Type/EmailOpenType.php
index 4427a513b10..29a50d1dd5d 100644
--- a/app/bundles/EmailBundle/Form/Type/EmailOpenType.php
+++ b/app/bundles/EmailBundle/Form/Type/EmailOpenType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,28 +15,25 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class EmailOpenType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class EmailOpenType.
  */
 class EmailOpenType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $defaultOptions = array(
+        $defaultOptions = [
             'label'      => 'mautic.email.open.limittoemails',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.email.open.limittoemails_descr'
-            ),
-            'required'   => false
-        );
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.email.open.limittoemails_descr',
+            ],
+            'required' => false,
+        ];
 
         if (isset($options['list_options'])) {
             if (isset($options['list_options']['attr'])) {
@@ -52,15 +50,16 @@ public function buildForm (FormBuilderInterface $builder, array $options)
     /**
      * @param OptionsResolverInterface $resolver
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(array('list_options'));
+        $resolver->setOptional(['list_options']);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "emailopen_list";
+    public function getName()
+    {
+        return 'emailopen_list';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Form/Type/EmailSendType.php b/app/bundles/EmailBundle/Form/Type/EmailSendType.php
index f020d2ce665..7d03603ee11 100644
--- a/app/bundles/EmailBundle/Form/Type/EmailSendType.php
+++ b/app/bundles/EmailBundle/Form/Type/EmailSendType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class EmailSendType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class EmailSendType.
  */
 class EmailSendType extends AbstractType
 {
@@ -43,20 +41,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'email',
             'email_list',
             [
-                'label'       => 'mautic.email.send.selectemails',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.email.send.selectemails',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.email.choose.emails_descr',
-                    'onchange' => 'Mautic.disabledEmailAction()'
+                    'onchange' => 'Mautic.disabledEmailAction()',
                 ],
                 'multiple'    => false,
                 'required'    => true,
                 'constraints' => [
                     new NotBlank(
                         ['message' => 'mautic.email.chooseemail.notblank']
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -65,7 +63,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'email_type',
                 'button_group',
                 [
-                    'choices'    => [
+                    'choices' => [
                         'transactional' => 'mautic.email.send.emailtype.transactional',
                         'marketing'     => 'mautic.email.send.emailtype.marketing',
                     ],
@@ -75,7 +73,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'class'   => 'form-control email-type',
                         'tooltip' => 'mautic.email.send.emailtype.tooltip',
                     ],
-                    'data'       => (!isset($options['data']['email_type'])) ? 'transactional' : $options['data']['email_type']
+                    'data' => (!isset($options['data']['email_type'])) ? 'transactional' : $options['data']['email_type'],
                 ]
             );
         }
@@ -86,7 +84,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'objectAction' => 'new',
                     'contentOnly'  => 1,
-                    'updateSelect' => $options['update_select']
+                    'updateSelect' => $options['update_select'],
                 ]
             );
 
@@ -94,14 +92,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'newEmailButton',
                 'button',
                 [
-                    'attr'  => [
+                    'attr' => [
                         'class'   => 'btn btn-primary btn-nospin',
                         'onclick' => 'Mautic.loadNewEmailWindow({
                         "windowUrl": "'.$windowUrl.'"
                     })',
-                        'icon'    => 'fa fa-plus'
+                        'icon' => 'fa fa-plus',
                     ],
-                    'label' => 'mautic.email.send.new.email'
+                    'label' => 'mautic.email.send.new.email',
                 ]
             );
 
@@ -112,7 +110,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'objectAction' => 'edit',
                     'objectId'     => 'emailId',
                     'contentOnly'  => 1,
-                    'updateSelect' => $options['update_select']
+                    'updateSelect' => $options['update_select'],
                 ]
             );
 
@@ -120,13 +118,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'editEmailButton',
                 'button',
                 [
-                    'attr'  => [
+                    'attr' => [
                         'class'    => 'btn btn-primary btn-nospin',
                         'onclick'  => 'Mautic.loadNewEmailWindow(Mautic.standardEmailUrl({"windowUrl": "'.$windowUrlEdit.'"}))',
                         'disabled' => !isset($options['data']['email']),
-                        'icon'     => 'fa fa-edit'
+                        'icon'     => 'fa fa-edit',
                     ],
-                    'label' => 'mautic.email.send.edit.email'
+                    'label' => 'mautic.email.send.edit.email',
                 ]
             );
 
@@ -137,13 +135,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'previewEmailButton',
                 'button',
                 [
-                    'attr'  => [
+                    'attr' => [
                         'class'    => 'btn btn-primary btn-nospin',
                         'onclick'  => 'Mautic.loadNewEmailWindow(Mautic.standardEmailUrl({"windowUrl": "'.$windowUrlPreview.'"}))',
                         'disabled' => !isset($options['data']['email']),
-                        'icon'     => 'fa fa-external-link'
+                        'icon'     => 'fa fa-external-link',
                     ],
-                    'label' => 'mautic.email.send.preview.email'
+                    'label' => 'mautic.email.send.preview.email',
                 ]
             );
             if (!empty($options['with_email_types'])) {
@@ -152,19 +150,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'priority',
                     'choice',
                     [
-                        'choices'     => [
+                        'choices' => [
                             2 => 'mautic.core.message.send.priority.normal',
-                            1 => 'mautic.core.message.send.priority.high'
+                            1 => 'mautic.core.message.send.priority.high',
                         ],
-                        'label'       => 'mautic.core.message.send.priority',
-                        'required'    => false,
-                        'attr'        => [
+                        'label'    => 'mautic.core.message.send.priority',
+                        'required' => false,
+                        'attr'     => [
                             'class'        => 'form-control',
                             'tooltip'      => 'mautic.core.message.send.priority.tooltip',
-                            'data-show-on' => '{"campaignevent_properties_email_type_1":"checked"}'
+                            'data-show-on' => '{"campaignevent_properties_email_type_1":"checked"}',
                         ],
                         'data'        => $data,
-                        'empty_value' => false
+                        'empty_value' => false,
                     ]
                 );
 
@@ -173,15 +171,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'attempts',
                     'number',
                     [
-                        'label'      => 'mautic.core.message.send.attempts',
-                        'attr'       => [
+                        'label' => 'mautic.core.message.send.attempts',
+                        'attr'  => [
                             'class'        => 'form-control',
                             'tooltip'      => 'mautic.core.message.send.attempts.tooltip',
                             'data-show-on' => '{"campaignevent_properties_email_type_1":"checked"}',
                         ],
                         'data'       => $data,
                         'empty_data' => 0,
-                        'required'   => false
+                        'required'   => false,
                     ]
                 );
             }
@@ -195,7 +193,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
-                'with_email_types' => false
+                'with_email_types' => false,
             ]
         );
 
@@ -207,6 +205,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getName()
     {
-        return "emailsend_list";
+        return 'emailsend_list';
     }
 }
diff --git a/app/bundles/EmailBundle/Form/Type/EmailType.php b/app/bundles/EmailBundle/Form/Type/EmailType.php
index 50f2f8c6fbc..66554d48e87 100644
--- a/app/bundles/EmailBundle/Form/Type/EmailType.php
+++ b/app/bundles/EmailBundle/Form/Type/EmailType.php
@@ -1,49 +1,46 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Form\Type;
 
-use Mautic\CoreBundle\Form\DataTransformer\EmojiToShortTransformer;
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Form\DataTransformer\EmojiToShortTransformer;
 use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Mautic\CoreBundle\Form\Type\DynamicContentFilterType;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
-use Mautic\LeadBundle\Form\DataTransformer\FieldFilterTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class EmailType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class EmailType.
  */
 class EmailType extends AbstractType
 {
-
     private $translator;
     private $defaultTheme;
     private $em;
     private $request;
 
-    private $countryChoices = [];
-    private $regionChoices = [];
+    private $countryChoices  = [];
+    private $regionChoices   = [];
     private $timezoneChoices = [];
-    private $stageChoices = [];
-    private $localeChoices = [];
+    private $stageChoices    = [];
+    private $localeChoices   = [];
 
     /**
      * @param MauticFactory $factory
@@ -82,7 +79,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'      => 'mautic.email.form.internal.name',
                 'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control']
+                'attr'       => ['class' => 'form-control'],
             ]
         );
 
@@ -95,7 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.email.subject',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => ['class' => 'form-control'],
-                    'required'   => false
+                    'required'   => false,
                 ]
             )->addModelTransformer($emojiTransformer)
         );
@@ -109,9 +106,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'    => 'form-control',
                     'preaddon' => 'fa fa-user',
-                    'tooltip'  => 'mautic.email.from_name.tooltip'
+                    'tooltip'  => 'mautic.email.from_name.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -124,9 +121,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'    => 'form-control',
                     'preaddon' => 'fa fa-envelope',
-                    'tooltip'  => 'mautic.email.from_email.tooltip'
+                    'tooltip'  => 'mautic.email.from_email.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -139,9 +136,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'    => 'form-control',
                     'preaddon' => 'fa fa-envelope',
-                    'tooltip'  => 'mautic.email.reply_to_email.tooltip'
+                    'tooltip'  => 'mautic.email.reply_to_email.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -154,9 +151,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'    => 'form-control',
                     'preaddon' => 'fa fa-envelope',
-                    'tooltip'  => 'mautic.email.bcc.tooltip'
+                    'tooltip'  => 'mautic.email.bcc.tooltip',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -169,7 +166,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'   => 'form-control not-chosen hidden',
                     'tooltip' => 'mautic.email.form.template.help',
                 ],
-                'data'    => $options['data']->getTemplate() ? $options['data']->getTemplate() : 'blank'
+                'data' => $options['data']->getTemplate() ? $options['data']->getTemplate() : 'blank',
             ]
         );
 
@@ -184,10 +181,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'       => 'form-control',
-                    'data-toggle' => 'datetime'
+                    'data-toggle' => 'datetime',
                 ],
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
             ]
         );
 
@@ -200,10 +197,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'       => 'form-control',
-                    'data-toggle' => 'datetime'
+                    'data-toggle' => 'datetime',
                 ],
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
             ]
         );
 
@@ -219,9 +216,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'rows'                 => '15',
                     'data-token-callback'  => 'email:getBuilderTokens',
                     'data-token-activator' => '{',
-                    'data-token-visual'    => 'false'
+                    'data-token-visual'    => 'false',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -236,8 +233,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'attr'       => [
                         'class'                => 'form-control editor editor-basic-fullpage editor-builder-tokens builder-html editor-email',
                         'data-token-callback'  => 'email:getBuilderTokens',
-                        'data-token-activator' => '{'
-                    ]
+                        'data-token-activator' => '{',
+                    ],
                 ]
             )->addModelTransformer($emojiTransformer)
         );
@@ -248,12 +245,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'unsubscribeForm',
                 'form_list',
                 [
-                    'label'       => 'mautic.email.form.unsubscribeform',
-                    'label_attr'  => ['class' => 'control-label'],
-                    'attr'        => [
+                    'label'      => 'mautic.email.form.unsubscribeform',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'            => 'form-control',
                         'tootlip'          => 'mautic.email.form.unsubscribeform.tooltip',
-                        'data-placeholder' => $this->translator->trans('mautic.core.form.chooseone')
+                        'data-placeholder' => $this->translator->trans('mautic.core.form.chooseone'),
                     ],
                     'required'    => false,
                     'multiple'    => false,
@@ -263,7 +260,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ->addModelTransformer($transformer)
         );
 
-
         $transformer = new IdToEntityModelTransformer($this->em, 'MauticEmailBundle:Email');
         $builder->add(
             $builder->create(
@@ -279,27 +275,27 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             )->addModelTransformer($transformer)
         );
 
-        $variantParent = $options['data']->getVariantParent();
+        $variantParent     = $options['data']->getVariantParent();
         $translationParent = $options['data']->getTranslationParent();
         $builder->add(
             'segmentTranslationParent',
             'email_list',
             [
-                'label'       => 'mautic.core.form.translation_parent',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.core.form.translation_parent',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.form.translation_parent.help'
+                    'tooltip' => 'mautic.core.form.translation_parent.help',
                 ],
-                'required'    => false,
-                'multiple'    => false,
-                'email_type'  => 'list',
-                'empty_value' => 'mautic.core.form.translation_parent.empty',
-                'top_level'   => 'translation',
+                'required'       => false,
+                'multiple'       => false,
+                'email_type'     => 'list',
+                'empty_value'    => 'mautic.core.form.translation_parent.empty',
+                'top_level'      => 'translation',
                 'variant_parent' => ($variantParent) ? $variantParent->getId() : null,
-                'ignore_ids'  => [(int) $options['data']->getId()],
-                'mapped'      => false,
-                'data'        => ($translationParent) ? $translationParent->getId() : null,
+                'ignore_ids'     => [(int) $options['data']->getId()],
+                'mapped'         => false,
+                'data'           => ($translationParent) ? $translationParent->getId() : null,
             ]
         );
 
@@ -307,36 +303,34 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'templateTranslationParent',
             'email_list',
             [
-                'label'       => 'mautic.core.form.translation_parent',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.core.form.translation_parent',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.core.form.translation_parent.help'
+                    'tooltip' => 'mautic.core.form.translation_parent.help',
                 ],
-                'required'    => false,
-                'multiple'    => false,
-                'empty_value' => 'mautic.core.form.translation_parent.empty',
-                'top_level'   => 'translation',
+                'required'       => false,
+                'multiple'       => false,
+                'empty_value'    => 'mautic.core.form.translation_parent.empty',
+                'top_level'      => 'translation',
                 'variant_parent' => ($variantParent) ? $variantParent->getId() : null,
-                'email_type'  => 'template',
-                'ignore_ids'  => [(int) $options['data']->getId()],
-                'mapped'      => false,
-                'data'        => ($translationParent) ? $translationParent->getId() : null,
+                'email_type'     => 'template',
+                'ignore_ids'     => [(int) $options['data']->getId()],
+                'mapped'         => false,
+                'data'           => ($translationParent) ? $translationParent->getId() : null,
             ]
         );
 
-        $url          = $this->request->getSchemeAndHttpHost().$this->request->getBasePath();
+        $url                     = $this->request->getSchemeAndHttpHost().$this->request->getBasePath();
         $variantSettingsModifier = function (FormEvent $event, $isVariant) use ($url) {
             if ($isVariant) {
                 $event->getForm()->add(
                     'variantSettings',
                     'emailvariant',
                     [
-                        'label' => false
+                        'label' => false,
                     ]
                 );
-
-
             }
         };
 
@@ -376,7 +370,7 @@ function (FormEvent $event) use ($variantSettingsModifier) {
             'category',
             'category',
             [
-                'bundle' => 'email'
+                'bundle' => 'email',
             ]
         );
 
@@ -393,9 +387,9 @@ function (FormEvent $event) use ($variantSettingsModifier) {
                         'class'        => 'form-control',
                         'data-show-on' => '{"emailform_segmentTranslationParent":[""]}',
                     ],
-                    'multiple'   => true,
-                    'expanded'   => false,
-                    'required'   => true
+                    'multiple' => true,
+                    'expanded' => false,
+                    'required' => true,
                 ]
             )
                 ->addModelTransformer($transformer)
@@ -408,9 +402,9 @@ function (FormEvent $event) use ($variantSettingsModifier) {
                 'label'      => 'mautic.core.language',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
-                    'class' => 'form-control'
+                    'class' => 'form-control',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -430,10 +424,10 @@ function (FormEvent $event) use ($variantSettingsModifier) {
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
                         'class'    => 'form-control',
-                        'onchange' => 'Mautic.getTotalAttachmentSize();'
+                        'onchange' => 'Mautic.getTotalAttachmentSize();',
                     ],
-                    'multiple'   => true,
-                    'expanded'   => false
+                    'multiple' => true,
+                    'expanded' => false,
                 ]
             )
                 ->addModelTransformer($transformer)
@@ -449,9 +443,9 @@ function (FormEvent $event) use ($variantSettingsModifier) {
                 'attr'  => [
                     'class'   => 'btn btn-default btn-dnd btn-nospin text-primary btn-builder',
                     'icon'    => 'fa fa-cube',
-                    'onclick' => "Mautic.launchBuilder('emailform', 'email');"
-                ]
-            ]
+                    'onclick' => "Mautic.launchBuilder('emailform', 'email');",
+                ],
+            ],
         ];
 
         if (!empty($options['update_select'])) {
@@ -460,7 +454,7 @@ function (FormEvent $event) use ($variantSettingsModifier) {
                 'form_buttons',
                 [
                     'apply_text'        => false,
-                    'pre_extra_buttons' => $customButtons
+                    'pre_extra_buttons' => $customButtons,
                 ]
             );
             $builder->add(
@@ -468,7 +462,7 @@ function (FormEvent $event) use ($variantSettingsModifier) {
                 'hidden',
                 [
                     'data'   => $options['update_select'],
-                    'mapped' => false
+                    'mapped' => false,
                 ]
             );
         } else {
@@ -476,7 +470,7 @@ function (FormEvent $event) use ($variantSettingsModifier) {
                 'buttons',
                 'form_buttons',
                 [
-                    'pre_extra_buttons' => $customButtons
+                    'pre_extra_buttons' => $customButtons,
                 ]
             );
         }
@@ -485,19 +479,18 @@ function (FormEvent $event) use ($variantSettingsModifier) {
             'dynamicContent',
             CollectionType::class,
             [
-                'entry_type' => DynamicContentFilterType::class,
-                'allow_add'  => true,
+                'entry_type'   => DynamicContentFilterType::class,
+                'allow_add'    => true,
                 'allow_delete' => true,
-                'label' => false,
-                'options' => [
-                    'label' => false
-                ]
+                'label'        => false,
+                'options'      => [
+                    'label' => false,
+                ],
             ]
         );
 
-
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -508,7 +501,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
-                'data_class' => 'Mautic\EmailBundle\Entity\Email'
+                'data_class' => 'Mautic\EmailBundle\Entity\Email',
             ]
         );
 
@@ -532,6 +525,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function getName()
     {
-        return "emailform";
+        return 'emailform';
     }
 }
diff --git a/app/bundles/EmailBundle/Form/Type/FormSubmitActionUserEmailType.php b/app/bundles/EmailBundle/Form/Type/FormSubmitActionUserEmailType.php
index 3b11ae319ff..19bdf22df62 100644
--- a/app/bundles/EmailBundle/Form/Type/FormSubmitActionUserEmailType.php
+++ b/app/bundles/EmailBundle/Form/Type/FormSubmitActionUserEmailType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,50 +15,48 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FormSubmitActionUserEmailType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class FormSubmitActionUserEmailType.
  */
 class FormSubmitActionUserEmailType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('useremail', 'emailsend_list', array(
-            'label'         => 'mautic.email.emails',
-            'attr'       => array(
+        $builder->add('useremail', 'emailsend_list', [
+            'label' => 'mautic.email.emails',
+            'attr'  => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.email.choose.emails_descr'
-            ),
-            'update_select' => 'formaction_properties_useremail_email'
-        ));
+                'tooltip' => 'mautic.email.choose.emails_descr',
+            ],
+            'update_select' => 'formaction_properties_useremail_email',
+        ]);
 
-        $builder->add('user_id', 'user_list', array(
+        $builder->add('user_id', 'user_list', [
             'label'      => 'mautic.email.form.users',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'       => 'form-control',
-                'tooltip'     => 'mautic.core.help.autocomplete'
-            ),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.core.help.autocomplete',
+            ],
+            'required' => false,
+        ]);
     }
 
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'label' => false
-        ));
+        $resolver->setDefaults([
+            'label' => false,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "email_submitaction_useremail";
+    public function getName()
+    {
+        return 'email_submitaction_useremail';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Form/Type/VariantType.php b/app/bundles/EmailBundle/Form/Type/VariantType.php
index f900cc62ccd..e6161cc4dcf 100644
--- a/app/bundles/EmailBundle/Form/Type/VariantType.php
+++ b/app/bundles/EmailBundle/Form/Type/VariantType.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -18,13 +18,10 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class VariantType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class VariantType.
  */
 class VariantType extends AbstractType
 {
-
     private $factory;
 
     public function __construct(MauticFactory $factory)
@@ -36,21 +33,21 @@ public function __construct(MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('weight', 'integer', array(
+        $builder->add('weight', 'integer', [
             'label'      => 'mautic.core.ab_test.form.traffic_weight',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.core.ab_test.form.traffic_weight.help'
-            ),
-            'constraints' => array(
+                'tooltip' => 'mautic.core.ab_test.form.traffic_weight.help',
+            ],
+            'constraints' => [
                 new NotBlank(
-                    array('message' => 'mautic.email.variant.weight.notblank')
-                )
-            )
-        ));
+                    ['message' => 'mautic.email.variant.weight.notblank']
+                ),
+            ],
+        ]);
 
         $abTestWinnerCriteria = $this->factory->getModel('email')->getBuilderComponents(null, 'abTestWinnerCriteria');
 
@@ -58,23 +55,23 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $criteria = $abTestWinnerCriteria['criteria'];
             $choices  = $abTestWinnerCriteria['choices'];
 
-            $builder->add('winnerCriteria', 'choice', array(
+            $builder->add('winnerCriteria', 'choice', [
                 'label'      => 'mautic.core.ab_test.form.winner',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
-                    'onchange' => 'Mautic.getAbTestWinnerForm(\'email\', \'emailform\', this);'
-                ),
-                'expanded'   => false,
-                'multiple'   => false,
-                'choices'    => $choices,
+                    'onchange' => 'Mautic.getAbTestWinnerForm(\'email\', \'emailform\', this);',
+                ],
+                'expanded'    => false,
+                'multiple'    => false,
+                'choices'     => $choices,
                 'empty_value' => 'mautic.core.form.chooseone',
-                'constraints' => array(
+                'constraints' => [
                     new NotBlank(
-                        array('message' => 'mautic.core.ab_test.winner_criteria.not_blank')
-                    )
-                )
-            ));
+                        ['message' => 'mautic.core.ab_test.winner_criteria.not_blank']
+                    ),
+                ],
+            ]);
 
             $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($options, $criteria) {
                 $form = $event->getForm();
@@ -82,10 +79,10 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
                 if (isset($data['winnerCriteria'])) {
                     if (!empty($criteria[$data['winnerCriteria']]['formType'])) {
-                        $formTypeOptions = array(
+                        $formTypeOptions = [
                             'required' => false,
-                            'label'    => false
-                        );
+                            'label'    => false,
+                        ];
                         if (!empty($criteria[$data]['formTypeOptions'])) {
                             $formTypeOptions = array_merge($formTypeOptions, $criteria[$data]['formTypeOptions']);
                         }
@@ -99,7 +96,8 @@ public function buildForm (FormBuilderInterface $builder, array $options)
     /**
      * @return string
      */
-    public function getName() {
-        return "emailvariant";
+    public function getName()
+    {
+        return 'emailvariant';
     }
 }
diff --git a/app/bundles/EmailBundle/Helper/AbTestHelper.php b/app/bundles/EmailBundle/Helper/AbTestHelper.php
index 6ab0592f500..b17bffbf90a 100644
--- a/app/bundles/EmailBundle/Helper/AbTestHelper.php
+++ b/app/bundles/EmailBundle/Helper/AbTestHelper.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Helper;
 
 use Mautic\EmailBundle\Entity\Email;
-use Mautic\EmailBundle\Model\EmailModel;
 
 class AbTestHelper
 {
-
     /**
-     * Determines the winner of A/B test based on open rate
+     * Determines the winner of A/B test based on open rate.
      *
      * @param $factory
      * @param $parent
@@ -38,12 +37,12 @@ public static function determineOpenRateWinner($factory, $parent, $children)
 
             $translator = $factory->getTranslator();
             if ($counts) {
-                $rates      = $support = $data = [];
+                $rates      = $support      = $data      = [];
                 $hasResults = [];
 
                 $parentId = $parent->getId();
                 foreach ($counts as $id => $stats) {
-                    $name                                                           = ($parentId === $id) ? $parent->getName()
+                    $name = ($parentId === $id) ? $parent->getName()
                         : $children[$id]->getName();
                     $support['labels'][]                                            = $name.' ('.$stats['readRate'].'%)';
                     $rates[$id]                                                     = $stats['readRate'];
@@ -93,7 +92,7 @@ public static function determineOpenRateWinner($factory, $parent, $children)
                     'winners'         => $winners,
                     'support'         => $support,
                     'basedOn'         => 'email.openrate',
-                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php'
+                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php',
                 ];
             }
         }
@@ -101,13 +100,12 @@ public static function determineOpenRateWinner($factory, $parent, $children)
         return [
             'winners' => [],
             'support' => [],
-            'basedOn' => 'email.openrate'
+            'basedOn' => 'email.openrate',
         ];
     }
 
-
     /**
-     * Determines the winner of A/B test based on clickthrough rates
+     * Determines the winner of A/B test based on clickthrough rates.
      *
      * @param $factory
      * @param $parent
@@ -132,7 +130,7 @@ public static function determineClickthroughRateWinner($factory, $parent, $child
 
             $translator = $factory->getTranslator();
             if ($clickthroughCounts) {
-                $rates      = $support = $data = [];
+                $rates      = $support      = $data      = [];
                 $hasResults = [];
 
                 $parentId = $parent->getId();
@@ -192,7 +190,7 @@ public static function determineClickthroughRateWinner($factory, $parent, $child
                     'winners'         => $winners,
                     'support'         => $support,
                     'basedOn'         => 'email.clickthrough',
-                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php'
+                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php',
                 ];
             }
         }
@@ -200,7 +198,7 @@ public static function determineClickthroughRateWinner($factory, $parent, $child
         return [
             'winners' => [],
             'support' => [],
-            'basedOn' => 'email.clickthrough'
+            'basedOn' => 'email.clickthrough',
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Helper/FormSubmitHelper.php b/app/bundles/EmailBundle/Helper/FormSubmitHelper.php
index c3320707e57..f8d0fdd4853 100644
--- a/app/bundles/EmailBundle/Helper/FormSubmitHelper.php
+++ b/app/bundles/EmailBundle/Helper/FormSubmitHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -28,46 +29,46 @@ public static function sendEmail($tokens, Action $action, MauticFactory $factory
         $form       = $action->getForm();
 
         /** @var \Mautic\EmailBundle\Model\EmailModel $emailModel */
-        $emailModel  = $factory->getModel('email');
-        $email  	 = $emailModel->getEntity($emailId);
+        $emailModel = $factory->getModel('email');
+        $email      = $emailModel->getEntity($emailId);
 
-		/** @var \Mautic\LeadBundle\Model\LeadModel $leadModel */
-		$leadModel = $factory->getModel('lead');
+        /** @var \Mautic\LeadBundle\Model\LeadModel $leadModel */
+        $leadModel = $factory->getModel('lead');
 
         //make sure the email still exists and is published
         if ($email != null && $email->isPublished()) {
-		    // Deal with Lead email
-		    if (!empty($feedback['lead.create']['lead'])) {
-		    	//the lead was just created via the lead.create action
-		    	$currentLead = $feedback['lead.create']['lead'];
-		    } else {
-		        $currentLead = $leadModel->getCurrentLead();
-		    }
+            // Deal with Lead email
+            if (!empty($feedback['lead.create']['lead'])) {
+                //the lead was just created via the lead.create action
+                $currentLead = $feedback['lead.create']['lead'];
+            } else {
+                $currentLead = $leadModel->getCurrentLead();
+            }
 
-			if ($currentLead instanceof Lead) {
-				//flatten the lead
-				$lead = $currentLead;
-				$currentLead = array(
-					'id' => $lead->getId()
-				);
-				$leadFields = $leadModel->flattenFields($lead->getFields());
+            if ($currentLead instanceof Lead) {
+                //flatten the lead
+                $lead        = $currentLead;
+                $currentLead = [
+                    'id' => $lead->getId(),
+                ];
+                $leadFields = $leadModel->flattenFields($lead->getFields());
 
-				$currentLead = array_merge($currentLead, $leadFields);
-			}
+                $currentLead = array_merge($currentLead, $leadFields);
+            }
 
-			if (isset($properties['user_id']) && $properties['user_id']) {
-				// User email
-				$emailModel->sendEmailToUser($email, $properties['user_id'], $currentLead, $tokens);
-			} elseif (isset($currentLead)) {
-		    	if (isset($leadFields['email'])) {
-					$options = array(
-						'source' 	   => array('form', $form->getId()),
-						'tokens' 	   => $tokens,
-                        'ignoreDNC'    => true
-					);
-		    		$emailModel->sendEmail($email, $currentLead, $options);
-		    	}
-		    }
-		}
+            if (isset($properties['user_id']) && $properties['user_id']) {
+                // User email
+                $emailModel->sendEmailToUser($email, $properties['user_id'], $currentLead, $tokens);
+            } elseif (isset($currentLead)) {
+                if (isset($leadFields['email'])) {
+                    $options = [
+                        'source'    => ['form', $form->getId()],
+                        'tokens'    => $tokens,
+                        'ignoreDNC' => true,
+                    ];
+                    $emailModel->sendEmail($email, $currentLead, $options);
+                }
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Helper/MailHelper.php b/app/bundles/EmailBundle/Helper/MailHelper.php
index 2009f19396d..26ea48e5c10 100644
--- a/app/bundles/EmailBundle/Helper/MailHelper.php
+++ b/app/bundles/EmailBundle/Helper/MailHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,24 +12,22 @@
 
 use Mautic\AssetBundle\Entity\Asset;
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\EmailBundle\Entity\Copy;
-use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxedException;
-use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException;
-use Mautic\EmailBundle\Swiftmailer\Message\MauticMessage;
-use Mautic\EmailBundle\Swiftmailer\Transport\InterfaceTokenTransport;
+use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\EmailBundle\EmailEvents;
+use Mautic\EmailBundle\Entity\Copy;
 use Mautic\EmailBundle\Entity\Email;
 use Mautic\EmailBundle\Entity\Stat;
 use Mautic\EmailBundle\Event\EmailSendEvent;
-use Mautic\CoreBundle\Helper\EmojiHelper;
+use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException;
+use Mautic\EmailBundle\Swiftmailer\Message\MauticMessage;
+use Mautic\EmailBundle\Swiftmailer\Transport\InterfaceTokenTransport;
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class MailHelper
+ * Class MailHelper.
  */
 class MailHelper
 {
-
     /**
      * @var MauticFactory
      */
@@ -77,7 +76,7 @@ class MailHelper
     /**
      * @var array
      */
-    protected $errors = array();
+    protected $errors = [];
 
     /**
      * @var null
@@ -102,7 +101,7 @@ class MailHelper
     /**
      * @var array
      */
-    protected $source = array();
+    protected $source = [];
 
     /**
      * @var Email|null
@@ -112,22 +111,22 @@ class MailHelper
     /**
      * @var array
      */
-    protected $globalTokens = array();
+    protected $globalTokens = [];
 
     /**
      * @var array
      */
-    protected $eventTokens   = array();
+    protected $eventTokens = [];
 
     /**
-     * Tells the helper that the transport supports tokenized emails (likely HTTP API)
+     * Tells the helper that the transport supports tokenized emails (likely HTTP API).
      *
      * @var bool
      */
     protected $tokenizationEnabled = false;
-    
+
     /**
-     * Use queue mode when sending email through this mailer; this requires a transport that supports tokenization and the use of queue/flushQueue
+     * Use queue mode when sending email through this mailer; this requires a transport that supports tokenization and the use of queue/flushQueue.
      *
      * @var bool
      */
@@ -136,7 +135,7 @@ class MailHelper
     /**
      * @var array
      */
-    protected $queuedRecipients = array();
+    protected $queuedRecipients = [];
 
     /**
      * @var string
@@ -156,38 +155,38 @@ class MailHelper
     /**
      * @var array
      */
-    protected $assets = array();
+    protected $assets = [];
 
     /**
      * @var array
      */
-    protected $attachedAssets = array();
+    protected $attachedAssets = [];
 
     /**
      * @var array
      */
-    protected $assetStats = array();
+    protected $assetStats = [];
 
     /**
      * @var array
      */
-    protected $headers = array();
+    protected $headers = [];
 
     /**
      * @var array
      */
-    protected $body = array(
+    protected $body = [
         'content'     => '',
         'contentType' => 'text/html',
-        'charset'     => null
-    );
+        'charset'     => null,
+    ];
 
     /**
-     * Cache for lead owners
+     * Cache for lead owners.
      *
      * @var array
      */
-    protected static $leadOwners = array();
+    protected static $leadOwners = [];
 
     /**
      * @var bool
@@ -209,7 +208,7 @@ class MailHelper
     private $transportStartTime;
 
     /**
-     * Simply a md5 of the content so that event listeners can easily determine if the content has been changed
+     * Simply a md5 of the content so that event listeners can easily determine if the content has been changed.
      *
      * @var string
      */
@@ -233,7 +232,7 @@ public function __construct(MauticFactory $factory, \Swift_Mailer $mailer, $from
             $this->logError($e);
         }
 
-        $this->from       = (!empty($from)) ? $from : array($factory->getParameter('mailer_from_email') => $factory->getParameter('mailer_from_name'));
+        $this->from       = (!empty($from)) ? $from : [$factory->getParameter('mailer_from_email') => $factory->getParameter('mailer_from_name')];
         $this->returnPath = $factory->getParameter('mailer_return_path');
 
         // Check if batching is supported by the transport
@@ -250,9 +249,10 @@ public function __construct(MauticFactory $factory, \Swift_Mailer $mailer, $from
     }
 
     /**
-     * Mirrors previous MauticFactory functionality
+     * Mirrors previous MauticFactory functionality.
      *
      * @param bool $cleanSlate
+     *
      * @return $this
      */
     public function getMailer($cleanSlate = true)
@@ -263,10 +263,10 @@ public function getMailer($cleanSlate = true)
     }
 
     /**
-     * Send the message
+     * Send the message.
      *
      * @param bool $dispatchSendEvent
-     * @param bool $isQueueFlush (a tokenized/batch send via API such as Mandrill)
+     * @param bool $isQueueFlush      (a tokenized/batch send via API such as Mandrill)
      * @param bool $useOwnerAsMailer
      *
      * @return bool
@@ -278,7 +278,6 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
             // properly populate metadata for this transport
 
             if ($result = $this->queue($dispatchSendEvent)) {
-
                 $result = $this->flushQueue();
             }
 
@@ -345,13 +344,13 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
                 if (method_exists($this->message, 'addMetadata')) {
                     foreach ($this->queuedRecipients as $email => $name) {
                         $this->message->addMetadata($email,
-                            array(
-                                'leadId'   => (!empty($this->lead)) ? $this->lead['id'] : null,
-                                'emailId'  => (!empty($this->email)) ? $this->email->getId() : null,
-                                'hashId'   => $this->idHash,
-                                'source'   => $this->source,
-                                'tokens'   => $this->getTokens()
-                            )
+                            [
+                                'leadId'  => (!empty($this->lead)) ? $this->lead['id'] : null,
+                                'emailId' => (!empty($this->email)) ? $this->email->getId() : null,
+                                'hashId'  => $this->idHash,
+                                'source'  => $this->source,
+                                'tokens'  => $this->getTokens(),
+                            ]
                         );
                     }
                 } else {
@@ -396,7 +395,7 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
             }
 
             try {
-                $failures = array();
+                $failures = [];
 
                 if (!$this->transport->isStarted()) {
                     $this->transportStartTime = time();
@@ -423,7 +422,7 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
             }
         }
 
-        $this->messageSentCount++;
+        ++$this->messageSentCount;
         $this->checkIfTransportNeedsRestart();
 
         $error = empty($this->errors);
@@ -435,7 +434,7 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
 
     /**
      * If batching is supported and enabled, the message will be queued and will on be sent upon flushQueue().
-     * Otherwise, the message will be sent to the transport immediately
+     * Otherwise, the message will be sent to the transport immediately.
      *
      * @param bool   $dispatchSendEvent
      * @param string $immediateSendMessageHandling If tokenization is not supported by the mailer, this argument determines
@@ -446,8 +445,6 @@ public function send($dispatchSendEvent = false, $isQueueFlush = false, $useOwne
      *                                             DO_NOTHING         leaves the current errors array and MauticMessage instance intact
      *                                             NOTHING_IF_FAILED  leaves the current errors array MauticMessage instance intact if it fails, otherwise reset_to
      *
-     *
-     *
      * @return bool
      */
     public function queue($dispatchSendEvent = false, $immediateSendMessageHandling = 'RESET_TO')
@@ -462,13 +459,13 @@ public function queue($dispatchSendEvent = false, $immediateSendMessageHandling
             // Metadata has to be set for each recipient
             foreach ($this->queuedRecipients as $email => $name) {
                 $this->message->addMetadata($email,
-                    array(
-                        'leadId'   => (!empty($this->lead)) ? $this->lead['id'] : null,
-                        'emailId'  => (!empty($this->email)) ? $this->email->getId() : null,
-                        'hashId'   => $this->idHash,
-                        'source'   => $this->source,
-                        'tokens'   => $this->getTokens()
-                    )
+                    [
+                        'leadId'  => (!empty($this->lead)) ? $this->lead['id'] : null,
+                        'emailId' => (!empty($this->email)) ? $this->email->getId() : null,
+                        'hashId'  => $this->idHash,
+                        'source'  => $this->source,
+                        'tokens'  => $this->getTokens(),
+                    ]
                 );
             }
 
@@ -476,7 +473,7 @@ public function queue($dispatchSendEvent = false, $immediateSendMessageHandling
             $this->queueAssetDownloadEntry();
 
             // Reset recipients
-            $this->queuedRecipients = array();
+            $this->queuedRecipients = [];
 
             // Assume success
             return true;
@@ -484,24 +481,24 @@ public function queue($dispatchSendEvent = false, $immediateSendMessageHandling
             $success = $this->send($dispatchSendEvent);
 
             // Reset the message for the next
-            $this->queuedRecipients = array();
+            $this->queuedRecipients = [];
 
             // Reset message
             switch (ucwords($immediateSendMessageHandling)) {
                 case 'RESET_TO':
-                    $this->message->setTo(array());
+                    $this->message->setTo([]);
                     $this->clearErrors();
                     break;
                 case 'NOTHING_IF_FAILED':
                     if ($success) {
-                        $this->message->setTo(array());
+                        $this->message->setTo([]);
                         $this->clearErrors();
                     }
 
                     break;
                 case 'FULL_RESET':
                     $this->message        = $this->getMessageInstance();
-                    $this->attachedAssets = array();
+                    $this->attachedAssets = [];
                     $this->clearErrors();
                     break;
                 case 'DO_NOTHING':
@@ -516,13 +513,13 @@ public function queue($dispatchSendEvent = false, $immediateSendMessageHandling
     }
 
     /**
-     * Send batched mail to mailer
+     * Send batched mail to mailer.
      *
      * @param array $resetEmailTypes Array of email types to clear after flusing the queue
      *
      * @return bool
      */
-    public function flushQueue($resetEmailTypes = array('To', 'Cc', 'Bcc'))
+    public function flushQueue($resetEmailTypes = ['To', 'Cc', 'Bcc'])
     {
         if ($this->tokenizationEnabled) {
             $to = $this->message->getTo();
@@ -530,11 +527,11 @@ public function flushQueue($resetEmailTypes = array('To', 'Cc', 'Bcc'))
                 $result = $this->send(false, true);
 
                 // Clear queued to recipients
-                $this->queuedRecipients = array();
+                $this->queuedRecipients = [];
 
                 foreach ($resetEmailTypes as $type) {
-                    $type    = ucfirst($type);
-                    $this->message->{"set".$type}(array());
+                    $type = ucfirst($type);
+                    $this->message->{'set'.$type}([]);
                 }
 
                 // Clear metadata for the previous recipients
@@ -550,9 +547,8 @@ public function flushQueue($resetEmailTypes = array('To', 'Cc', 'Bcc'))
         return true;
     }
 
-
     /**
-     * Resets the mailer
+     * Resets the mailer.
      *
      * @param bool $cleanSlate
      */
@@ -560,8 +556,8 @@ public function reset($cleanSlate = true)
     {
         unset($this->lead, $this->idHash, $this->eventTokens, $this->queuedRecipients, $this->errors);
 
-        $this->eventTokens  = $this->queuedRecipients = $this->errors = array();
-        $this->lead         = $this->idHash = $this->contentHash = null;
+        $this->eventTokens  = $this->queuedRecipients  = $this->errors  = [];
+        $this->lead         = $this->idHash         = $this->contentHash         = null;
         $this->internalSend = $this->fatal = false;
 
         $this->logger->clear();
@@ -571,16 +567,16 @@ public function reset($cleanSlate = true)
 
             unset($this->headers, $this->email, $this->source, $this->assets, $this->globalTokens, $this->message, $this->subject, $this->body, $this->plainText, $this->assets, $this->attachedAssets);
 
-            $this->headers = $this->source = $this->assets = $this->globalTokens = $this->assets = $this->attachedAssets = array();
+            $this->headers = $this->source = $this->assets = $this->globalTokens = $this->assets = $this->attachedAssets = [];
             $this->email   = null;
             $this->subject = $this->plainText = '';
-            $this->body    = array(
+            $this->body    = [
                 'content'     => '',
                 'contentType' => 'text/html',
-                'charset'     => null
-            );
+                'charset'     => null,
+            ];
 
-            $this->plainTextSet        = false;
+            $this->plainTextSet = false;
 
             $this->message = $this->getMessageInstance();
         }
@@ -588,13 +584,13 @@ public function reset($cleanSlate = true)
 
     /**
      * Search and replace tokens
-     * Adapted from \Swift_Plugins_DecoratorPlugin
+     * Adapted from \Swift_Plugins_DecoratorPlugin.
      *
      * @param array          $search
      * @param array          $replace
      * @param \Swift_Message $message
      */
-    static public function searchReplaceTokens($search, $replace, \Swift_Message &$message)
+    public static function searchReplaceTokens($search, $replace, \Swift_Message &$message)
     {
         // Body
         $body         = $message->getBody();
@@ -619,9 +615,9 @@ static public function searchReplaceTokens($search, $replace, \Swift_Message &$m
             $headerBody = $header->getFieldBodyModel();
             $updated    = false;
             if (is_array($headerBody)) {
-                $bodyReplaced = array();
+                $bodyReplaced = [];
                 foreach ($headerBody as $key => $value) {
-                    $count1             = $count2 = 0;
+                    $count1             = $count2             = 0;
                     $key                = is_string($key) ? str_ireplace($search, $replace, $key, $count1) : $key;
                     $value              = is_string($value) ? str_ireplace($search, $replace, $value, $count2) : $value;
                     $bodyReplaced[$key] = $value;
@@ -644,11 +640,11 @@ static public function searchReplaceTokens($search, $replace, \Swift_Message &$m
         $children = (array) $message->getChildren();
         /** @var \Swift_Mime_MimeEntity $child */
         foreach ($children as $child) {
-            $childType    = $child->getContentType();
-            list($type, ) = sscanf($childType, '%[^/]/%s');
+            $childType  = $child->getContentType();
+            list($type) = sscanf($childType, '%[^/]/%s');
 
             if ($type == 'text') {
-                $childBody    = $child->getBody();
+                $childBody = $child->getBody();
 
                 $bodyReplaced = str_ireplace($search, $replace, $childBody);
                 if ($childBody != $bodyReplaced) {
@@ -662,13 +658,13 @@ static public function searchReplaceTokens($search, $replace, \Swift_Message &$m
     }
 
     /**
-     * Extract plain text from message
+     * Extract plain text from message.
      *
      * @param \Swift_Message $message
      *
      * @return string
      */
-    static public function getPlainTextFromMessage(\Swift_Message $message)
+    public static function getPlainTextFromMessage(\Swift_Message $message)
     {
         $children = (array) $message->getChildren();
 
@@ -686,13 +682,13 @@ static public function getPlainTextFromMessage(\Swift_Message $message)
     /**
      * @return string
      */
-    static public function getBlankPixel()
+    public static function getBlankPixel()
     {
         return 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
     }
 
     /**
-     * Get a MauticMessage/Swift_Message instance
+     * Get a MauticMessage/Swift_Message instance.
      *
      * @return bool|MauticMessage
      */
@@ -710,14 +706,12 @@ public function getMessageInstance()
     }
 
     /**
-     * Add an attachment to email
+     * Add an attachment to email.
      *
      * @param string $filePath
      * @param string $fileName
      * @param string $contentType
      * @param bool   $inline
-     *
-     * @return void
      */
     public function attachFile($filePath, $fileName = null, $contentType = null, $inline = false)
     {
@@ -771,7 +765,7 @@ public function attachAsset($asset)
     }
 
     /**
-     * Use a template as the body
+     * Use a template as the body.
      *
      * @param string $template
      * @param array  $vars
@@ -780,7 +774,7 @@ public function attachAsset($asset)
      *
      * @return void|string
      */
-    public function setTemplate($template, $vars = array(), $returnContent = false, $charset = null)
+    public function setTemplate($template, $vars = [], $returnContent = false, $charset = null)
     {
         if ($this->templating == null) {
             $this->templating = $this->factory->getTemplating();
@@ -791,7 +785,6 @@ public function setTemplate($template, $vars = array(), $returnContent = false,
         unset($vars);
 
         if ($returnContent) {
-
             return $content;
         }
 
@@ -800,7 +793,7 @@ public function setTemplate($template, $vars = array(), $returnContent = false,
     }
 
     /**
-     * Set subject
+     * Set subject.
      *
      * @param $subject
      */
@@ -818,7 +811,7 @@ public function getSubject()
     }
 
     /**
-     * Set a plain text part
+     * Set a plain text part.
      *
      * @param $content
      */
@@ -839,7 +832,7 @@ public function getPlainText()
     }
 
     /**
-     * Set plain text for $this->message, replacing if necessary
+     * Set plain text for $this->message, replacing if necessary.
      *
      * @return null|string
      */
@@ -858,7 +851,6 @@ protected function setMessagePlainText()
             foreach ($children as $child) {
                 $childType = $child->getContentType();
                 if ($childType == 'text/plain' && $child instanceof \Swift_MimePart) {
-
                     $child->setBody($this->plainText);
 
                     break;
@@ -880,10 +872,10 @@ protected function setMessagePlainText()
     public function setBody($content, $contentType = 'text/html', $charset = null, $ignoreTrackingPixel = false, $ignoreEmbedImageConversion = false)
     {
         if (!$ignoreEmbedImageConversion && $this->factory->getParameter('mailer_convert_embed_images')) {
-            $matches = array();
+            $matches = [];
             if (preg_match_all('/<img.+?src=[\"\'](.+?)[\"\'].*?>/i', $content, $matches)) {
-                $replaces = array();
-                foreach($matches[1] AS $match) {
+                $replaces = [];
+                foreach ($matches[1] as $match) {
                     if (strpos($match, 'cid:') === false) {
                         $replaces[$match] = $this->message->embed(\Swift_Image::fromPath($match));
                     }
@@ -905,15 +897,15 @@ public function setBody($content, $contentType = 'text/html', $charset = null, $
         // Update the identifier for the content
         $this->contentHash = md5($content.$this->plainText);
 
-        $this->body = array(
+        $this->body = [
             'content'     => $content,
             'contentType' => $contentType,
-            'charset'     => $charset
-        );
+            'charset'     => $charset,
+        ];
     }
 
     /**
-     * Get a copy of the raw body
+     * Get a copy of the raw body.
      *
      * @return mixed
      */
@@ -923,7 +915,7 @@ public function getBody()
     }
 
     /**
-     * Return the content identifier
+     * Return the content identifier.
      *
      * @return string
      */
@@ -933,7 +925,7 @@ public function getContentHash()
     }
 
     /**
-     * Set to address(es)
+     * Set to address(es).
      *
      * @param $addresses
      * @param $name
@@ -962,7 +954,7 @@ public function setTo($addresses, $name = null)
     }
 
     /**
-     * Add to address
+     * Add to address.
      *
      * @param      $address
      * @param null $name
@@ -987,7 +979,7 @@ public function addTo($address, $name = null)
     }
 
     /**
-     * Set CC address(es)
+     * Set CC address(es).
      *
      * @param $addresses
      * @param $name
@@ -1011,7 +1003,7 @@ public function setCc($addresses, $name = null)
     }
 
     /**
-     * Add cc address
+     * Add cc address.
      *
      * @param      $address
      * @param null $name
@@ -1035,7 +1027,7 @@ public function addCc($address, $name = null)
     }
 
     /**
-     * Set BCC address(es)
+     * Set BCC address(es).
      *
      * @param $addresses
      * @param $name
@@ -1059,7 +1051,7 @@ public function setBcc($addresses, $name = null)
     }
 
     /**
-     * Add bcc address
+     * Add bcc address.
      *
      * @param      $address
      * @param null $name
@@ -1105,7 +1097,7 @@ protected function checkBatchMaxRecipients($toBeAdded = 1, $type = 'to')
     }
 
     /**
-     * Set reply to address(es)
+     * Set reply to address(es).
      *
      * @param $addresses
      * @param $name
@@ -1121,7 +1113,7 @@ public function setReplyTo($addresses, $name = null)
     }
 
     /**
-     * Set a custom return path
+     * Set a custom return path.
      *
      * @param $address
      */
@@ -1135,7 +1127,7 @@ public function setReturnPath($address)
     }
 
     /**
-     * Set from address (defaults to system)
+     * Set from address (defaults to system).
      *
      * @param $address
      * @param $name
@@ -1151,13 +1143,13 @@ public function setFrom($address, $name = null)
     }
 
     /**
-     * Validates a given address to ensure RFC 2822, 3.6.2 specs
+     * Validates a given address to ensure RFC 2822, 3.6.2 specs.
      *
      * @param $address
      *
      * @throws \Swift_RfcComplianceException
      */
-    static public function validateEmail($address)
+    public static function validateEmail($address)
     {
         static $grammer;
 
@@ -1174,9 +1166,6 @@ static public function validateEmail($address)
         }
     }
 
-    /**
-     * @return null
-     */
     public function getIdHash()
     {
         return $this->idHash;
@@ -1200,9 +1189,6 @@ public function setIdHash($idHash = null)
         $this->message->leadIdHash = $idHash;
     }
 
-    /**
-     * @return null
-     */
     public function getLead()
     {
         return $this->lead;
@@ -1220,7 +1206,7 @@ public function setLead($lead, $interalSend = false)
     }
 
     /**
-     * Check if this is not being send directly to the lead
+     * Check if this is not being send directly to the lead.
      *
      * @return bool
      */
@@ -1245,9 +1231,6 @@ public function setSource($source)
         $this->source = $source;
     }
 
-    /**
-     * @return null
-     */
     public function getEmail()
     {
         return $this->email;
@@ -1260,7 +1243,7 @@ public function getEmail()
      * @param array $assetAttachments    Assets to send
      * @param bool  $ignoreTrackingPixel Do not append tracking pixel HTML
      */
-    public function setEmail(Email $email, $allowBcc = true, $slots = array(), $assetAttachments = array(), $ignoreTrackingPixel = false)
+    public function setEmail(Email $email, $allowBcc = true, $slots = [], $assetAttachments = [], $ignoreTrackingPixel = false)
     {
         $this->email = $email;
 
@@ -1276,9 +1259,9 @@ public function setEmail(Email $email, $allowBcc = true, $slots = array(), $asse
         $fromName  = $email->getFromName();
         if (!empty($fromEmail) && !empty($fromEmail)) {
             $this->setFrom($fromEmail, $fromName);
-        } else if (!empty($fromEmail)) {
+        } elseif (!empty($fromEmail)) {
             $this->setFrom($fromEmail, $this->from);
-        } else if (!empty($fromName)) {
+        } elseif (!empty($fromName)) {
             $this->setFrom(key($this->from), $fromName);
         }
 
@@ -1298,7 +1281,7 @@ public function setEmail(Email $email, $allowBcc = true, $slots = array(), $asse
             $this->setPlainText($plainText);
         }
 
-        $BCcontent = $email->getContent();
+        $BCcontent  = $email->getContent();
         $customHtml = $email->getCustomHtml();
         // Process emails created by Mautic v1
         if (empty($customHtml) && !empty($BCcontent)) {
@@ -1314,14 +1297,14 @@ public function setEmail(Email $email, $allowBcc = true, $slots = array(), $asse
 
             $this->processSlots($slots, $email);
 
-            $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $template . ':email.html.php');
+            $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$template.':email.html.php');
 
-            $customHtml = $this->setTemplate($logicalName, array(
+            $customHtml = $this->setTemplate($logicalName, [
                 'slots'    => $slots,
                 'content'  => $email->getContent(),
                 'email'    => $email,
-                'template' => $template
-            ), true);
+                'template' => $template,
+            ], true);
         }
 
         // Convert short codes to emoji
@@ -1330,7 +1313,7 @@ public function setEmail(Email $email, $allowBcc = true, $slots = array(), $asse
         $this->setBody($customHtml, 'text/html', null, $ignoreTrackingPixel);
 
         // Reset attachments
-        $this->assets = $this->attachedAssets = array();
+        $this->assets = $this->attachedAssets = [];
         if (empty($assetAttachments)) {
             if ($assets = $email->getAssetAttachments()) {
                 foreach ($assets as $asset) {
@@ -1345,7 +1328,7 @@ public function setEmail(Email $email, $allowBcc = true, $slots = array(), $asse
     }
 
     /**
-     * Set custom headers
+     * Set custom headers.
      *
      * @param array $headers
      */
@@ -1372,18 +1355,18 @@ public function getCustomHeaders()
     }
 
     /**
-     * Generate and insert List-Unsubscribe header
+     * Generate and insert List-Unsubscribe header.
      */
     private function addUnsubscribeHeader()
     {
         if (isset($this->idHash)) {
-            $unsubscribeLink = $this->factory->getRouter()->generate('mautic_email_unsubscribe', array('idHash' => $this->idHash), true);
+            $unsubscribeLink                   = $this->factory->getRouter()->generate('mautic_email_unsubscribe', ['idHash' => $this->idHash], true);
             $this->headers['List-Unsubscribe'] = "<$unsubscribeLink>";
         }
     }
 
     /**
-     * Append tokens
+     * Append tokens.
      *
      * @param array $tokens
      */
@@ -1393,7 +1376,7 @@ public function addTokens(array $tokens)
     }
 
     /**
-     * Set tokens
+     * Set tokens.
      *
      * @param array $tokens
      */
@@ -1403,7 +1386,7 @@ public function setTokens(array $tokens)
     }
 
     /**
-     * Get tokens
+     * Get tokens.
      *
      * @return array
      */
@@ -1415,9 +1398,9 @@ public function getTokens()
         if ($this->appendTrackingPixel) {
             $tokens['{tracking_pixel}'] = $this->factory->getRouter()->generate(
                 'mautic_email_tracker',
-                array(
-                    'idHash' => $this->idHash
-                ),
+                [
+                    'idHash' => $this->idHash,
+                ],
                 true
             );
         } else {
@@ -1428,7 +1411,7 @@ public function getTokens()
     }
 
     /**
-     * Parses html into basic plaintext
+     * Parses html into basic plaintext.
      *
      * @param string $content
      */
@@ -1441,9 +1424,9 @@ public function parsePlainText($content = null)
         }
 
         $request = $this->factory->getRequest();
-        $parser  = new PlainTextHelper(array(
-            'base_url' => $request->getSchemeAndHttpHost() . $request->getBasePath()
-        ));
+        $parser  = new PlainTextHelper([
+            'base_url' => $request->getSchemeAndHttpHost().$request->getBasePath(),
+        ]);
 
         $this->plainText = $parser->setHtml($content)->getText();
     }
@@ -1460,24 +1443,24 @@ public function parsePlainText($content = null)
     public function useMailerTokenization($tokenizationEnabled = true)
     {
         @trigger_error('useMailerTokenization() is now deprecated. Use enableQueue() instead.', E_DEPRECATED);
-        
+
         $this->enableQueue($tokenizationEnabled);
     }
-    
+
     /**
-     * Enables queue mode if the transport supports tokenization
+     * Enables queue mode if the transport supports tokenization.
      *
-     * @param bool $enabled 
+     * @param bool $enabled
      */
     public function enableQueue($enabled = true)
     {
         if ($this->tokenizationEnabled) {
-    	    $this->queueEnabled = $enabled;
-    	}
+            $this->queueEnabled = $enabled;
+        }
     }
 
     /**
-     * Dispatch send event to generate tokens
+     * Dispatch send event to generate tokens.
      *
      * @return array
      */
@@ -1497,7 +1480,7 @@ public function dispatchSendEvent()
     }
 
     /**
-     * Log exception
+     * Log exception.
      *
      * @param \Exception|string $error
      */
@@ -1518,11 +1501,11 @@ protected function logError($error)
 
         $this->logger->clear();
 
-        $this->factory->getLogger()->log('error', '[MAIL ERROR] ' . $error);
+        $this->factory->getLogger()->log('error', '[MAIL ERROR] '.$error);
     }
 
     /**
-     * Get list of errors
+     * Get list of errors.
      *
      * @param bool $reset Resets the error array in preparation for the next mail send or else it'll fail
      *
@@ -1540,15 +1523,15 @@ public function getErrors($reset = true)
     }
 
     /**
-     * Clears the errors from a previous send
+     * Clears the errors from a previous send.
      */
     public function clearErrors()
     {
-        $this->errors = array();
+        $this->errors = [];
     }
 
     /**
-     * Return transport
+     * Return transport.
      *
      * @return \Swift_Transport
      */
@@ -1558,7 +1541,7 @@ public function getTransport()
     }
 
     /**
-     * Creates a download stat for the asset
+     * Creates a download stat for the asset.
      */
     protected function createAssetDownloadEntries()
     {
@@ -1593,26 +1576,26 @@ protected function createAssetDownloadEntries()
         }
 
         // Reset the stat
-        $this->assetStats = array();
+        $this->assetStats = [];
     }
 
     /**
-     * Queues the details to note if a lead received an asset if no errors are generated
+     * Queues the details to note if a lead received an asset if no errors are generated.
      */
     protected function queueAssetDownloadEntry()
     {
         if (!$this->internalSend && !empty($this->lead) && !empty($this->assets)) {
-            $this->assetStats[$this->lead['email']] = array(
+            $this->assetStats[$this->lead['email']] = [
                 'lead'        => $this->lead['id'],
                 'email'       => $this->email->getId(),
-                'source'      => array('email', $this->email->getId()),
-                'tracking_id' => $this->idHash
-            );
+                'source'      => ['email', $this->email->getId()],
+                'tracking_id' => $this->idHash,
+            ];
         }
     }
 
     /**
-     * Returns if the mailer supports and is in tokenization mode
+     * Returns if the mailer supports and is in tokenization mode.
      *
      * @return bool
      */
@@ -1649,18 +1632,19 @@ public function getTrackableLink($url)
     }
 
     /**
-     * Create an email stat
+     * Create an email stat.
      *
      * @param bool|true   $persist
      * @param string|null $emailAddress
      * @param null        $listId
      *
      * @return Stat|void
+     *
      * @throws \Doctrine\ORM\ORMException
      */
     public function createEmailStat($persist = true, $emailAddress = null, $listId = null)
     {
-        static $copies = array();
+        static $copies = [];
 
         //create a stat
         $stat = new Stat();
@@ -1734,7 +1718,7 @@ public function createEmailStat($persist = true, $emailAddress = null, $listId =
     }
 
     /**
-     * Check to see if a monitored email box is enabled and configured
+     * Check to see if a monitored email box is enabled and configured.
      *
      * @param $bundleKey
      * @param $folderKey
@@ -1747,7 +1731,6 @@ public function isMontoringEnabled($bundleKey, $folderKey)
         $mailboxHelper = $this->factory->getHelper('mailbox');
 
         if ($mailboxHelper->isConfigured($bundleKey, $folderKey)) {
-
             return $mailboxHelper->getMailboxSettings();
         }
 
@@ -1755,7 +1738,7 @@ public function isMontoringEnabled($bundleKey, $folderKey)
     }
 
     /**
-     * Generate bounce email for the lead
+     * Generate bounce email for the lead.
      *
      * @param null $idHash
      *
@@ -1767,7 +1750,7 @@ public function generateBounceEmail($idHash = null)
 
         if ($settings = $this->isMontoringEnabled('EmailBundle', 'bounces')) {
             // Append the bounce notation
-            list ($email, $domain) = explode('@', $settings['address']);
+            list($email, $domain) = explode('@', $settings['address']);
             $email .= '+bounce';
             if ($idHash) {
                 $email .= '_'.$this->idHash;
@@ -1779,7 +1762,7 @@ public function generateBounceEmail($idHash = null)
     }
 
     /**
-     * Generate an unsubscribe email for the lead
+     * Generate an unsubscribe email for the lead.
      *
      * @param null $idHash
      *
@@ -1791,7 +1774,7 @@ public function generateUnsubscribeEmail($idHash = null)
 
         if ($settings = $this->isMontoringEnabled('EmailBundle', 'unsubscribes')) {
             // Append the bounce notation
-            list ($email, $domain) = explode('@', $settings['address']);
+            list($email, $domain) = explode('@', $settings['address']);
             $email .= '+unsubscribe';
             if ($idHash) {
                 $email .= '_'.$this->idHash;
@@ -1803,7 +1786,7 @@ public function generateUnsubscribeEmail($idHash = null)
     }
 
     /**
-     * A large number of mail sends may result on timeouts with SMTP servers. This checks for the number of email sends and restarts the transport if necessary
+     * A large number of mail sends may result on timeouts with SMTP servers. This checks for the number of email sends and restarts the transport if necessary.
      *
      * @param bool $force
      */
@@ -1840,11 +1823,11 @@ public function processSlots($slots, $entity)
 
         foreach ($slots as $slot => $slotConfig) {
             if (is_numeric($slot)) {
-                $slot = $slotConfig;
-                $slotConfig = array();
+                $slot       = $slotConfig;
+                $slotConfig = [];
             }
 
-            $value = isset($content[$slot]) ? $content[$slot] : "";
+            $value = isset($content[$slot]) ? $content[$slot] : '';
             $slotsHelper->set($slot, $value);
         }
     }
@@ -1861,36 +1844,31 @@ public function applyFrequencyRules(Lead $lead)
 
         $statRepo = $emailModel->getStatRepository();
 
-        $now = new \DateTime();
+        $now      = new \DateTime();
         $channels = $frequencyRule['channels'];
 
-        if(!empty($frequencyRule) and in_array('email', $channels,true))
-        {
-            $frequencyTime = new \DateInterval('P'.$frequencyRule['frequency_time']);
+        if (!empty($frequencyRule) and in_array('email', $channels, true)) {
+            $frequencyTime   = new \DateInterval('P'.$frequencyRule['frequency_time']);
             $frequencyNumber = $frequencyRule['frequency_number'];
-        }
-        elseif($this->factory->getParameter('frequency_number') > 0)
-        {
-            $frequencyTime = new \DateInterval('P'.$frequencyRule['frequency_time']);
+        } elseif ($this->factory->getParameter('frequency_number') > 0) {
+            $frequencyTime   = new \DateInterval('P'.$frequencyRule['frequency_time']);
             $frequencyNumber = $this->factory->getParameter('frequency_number');
         }
 
         $now->sub($frequencyTime);
-        $sentQuery = $statRepo->getLeadStats($lead->getId(), array('fromDate' => $now));
+        $sentQuery = $statRepo->getLeadStats($lead->getId(), ['fromDate' => $now]);
 
-        if(!empty($sentQuery) and count($sentQuery) < $frequencyNumber)
-        {
+        if (!empty($sentQuery) and count($sentQuery) < $frequencyNumber) {
             return true;
-        }
-        elseif (empty($sentQuery))
-        {
+        } elseif (empty($sentQuery)) {
             return true;
         }
+
         return false;
     }
 
     /**
-     * Clean the name - if empty, set as null to ensure pretty headers
+     * Clean the name - if empty, set as null to ensure pretty headers.
      *
      * @param $name
      *
diff --git a/app/bundles/EmailBundle/Helper/MessageHelper.php b/app/bundles/EmailBundle/Helper/MessageHelper.php
index eee7a5a1550..8a156d15c3c 100644
--- a/app/bundles/EmailBundle/Helper/MessageHelper.php
+++ b/app/bundles/EmailBundle/Helper/MessageHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * Bounce parsing modified from:
@@ -21,7 +22,7 @@
  * | This program is distributed in the hope that it will be useful - WITHOUT  |
  * | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
  * | FITNESS FOR A PARTICULAR PURPOSE.                                         |
- * .---------------------------------------------------------------------------.
+ * .---------------------------------------------------------------------------
  */
 
 namespace Mautic\EmailBundle\Helper;
@@ -32,7 +33,7 @@
 use Mautic\LeadBundle\Entity\DoNotContact;
 
 /**
- * Class MessageHelper
+ * Class MessageHelper.
  */
 class MessageHelper
 {
@@ -59,7 +60,6 @@ public function __construct(MauticFactory $factory)
         $this->factory = $factory;
         $this->db      = $factory->getDatabase();
         $this->logger  = $this->factory->getLogger();
-
     }
 
     /**
@@ -96,7 +96,7 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
             }
         }
         // Detect FBL-report.
-        if (preg_match("/.*feedback-type: abuse.*/is", $message->fblReport, $match)) {
+        if (preg_match('/.*feedback-type: abuse.*/is', $message->fblReport, $match)) {
             $isBounce      = false;
             $isUnsubscribe = false;
             $isFbl         = true;
@@ -104,19 +104,18 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
 
         $this->logger->debug("Analyzing message to {$message->toString}");
         // If message from Amazon SNS collect bounces and complaints
-        if ($message->fromAddress=='no-reply@sns.amazonaws.com') {
+        if ($message->fromAddress == 'no-reply@sns.amazonaws.com') {
             $message = json_decode(strtok($message->textPlain, "\n"), true);
-            if ($message['notificationType']=='Bounce') {
-                $isBounce = true;
+            if ($message['notificationType'] == 'Bounce') {
+                $isBounce      = true;
                 $isUnsubscribe = false;
-                $toEmail = $message['mail']['source'];
-                $amazonEmail = $message['bounce']['bouncedRecipients'][0]['emailAddress'];
-            }
-            elseif ($message['notificationType']=='Complaint') {
+                $toEmail       = $message['mail']['source'];
+                $amazonEmail   = $message['bounce']['bouncedRecipients'][0]['emailAddress'];
+            } elseif ($message['notificationType'] == 'Complaint') {
                 $isBounce      = false;
                 $isUnsubscribe = true;
                 $toEmail       = $message['mail']['source'];
-                $amazonEmail = $message['complaint']['complainedRecipients'][0]['emailAddress'];
+                $amazonEmail   = $message['complaint']['complainedRecipients'][0]['emailAddress'];
             }
         }
         // Parse the to email if applicable
@@ -127,17 +126,16 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
             }
         }
 
-        $messageDetails = array();
-
+        $messageDetails = [];
 
         if ($allowBounce) {
             // If message from Amazon SNS fill details and don't process further
-            if (isset($amazonEmail)){
-            $messageDetails['email']=$amazonEmail;
-            $messageDetails['rule_cat'] = 'unknown';
-            $messageDetails['rule_no'] = '0013';
-            $messageDetails['bounce_type'] = 'hard';
-            $messageDetails['remove'] = 1;
+            if (isset($amazonEmail)) {
+                $messageDetails['email']       = $amazonEmail;
+                $messageDetails['rule_cat']    = 'unknown';
+                $messageDetails['rule_no']     = '0013';
+                $messageDetails['bounce_type'] = 'hard';
+                $messageDetails['remove']      = 1;
             } else {
                 if (!empty($message->dsnReport)) {
                     // Parse the bounce
@@ -175,6 +173,7 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
 
         if (!$isBounce && !$isUnsubscribe && !$isFbl) {
             $this->logger->debug('No reason found to process.');
+
             return false;
         }
 
@@ -210,28 +209,29 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
                     $leadEmail = $messageDetails['email'];
                 } else {
                     // Email not found for the bounce so abort
-                    $this->logger->error('BOUNCE ERROR: A lead could be found from the bounce email. From: ' . $message->fromAddress . '; To: ' . $message->toString . '; Subject: ' . $message->subject);
+                    $this->logger->error('BOUNCE ERROR: A lead could be found from the bounce email. From: '.$message->fromAddress.'; To: '.$message->toString.'; Subject: '.$message->subject);
+
                     return false;
                 }
             } elseif ($isFbl) {
-                if (preg_match("/Received:.*for (.*);.*?/isU", $message->textPlain, $match)) {
+                if (preg_match('/Received:.*for (.*);.*?/isU', $message->textPlain, $match)) {
                     if ($parsedAddressList = self::parseAddressList($match[1])) {
                         $leadEmail = key($parsedAddressList);
                     }
-                }
-                else {
+                } else {
                     $this->logger->error("Parsing of FBL-report failed for message #{$message->id}");
+
                     return false;
                 }
             } else {
                 $leadEmail = $message->fromAddress;
-                $this->logger->debug('From address used: ' . $leadEmail);
+                $this->logger->debug('From address used: '.$leadEmail);
             }
 
             // Search by first part and domain of email to find cases like me+mautic@domain.com
             list($email, $domain) = explode('@', strtolower($leadEmail));
-            $email                = $email . '%';
-            $domain               = '%@' . $domain;
+            $email                = $email.'%';
+            $domain               = '%@'.$domain;
 
             $q = $this->db->createQueryBuilder();
             $q->select('l.id, l.email')
@@ -249,7 +249,6 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
                 ->setParameter('email', strtolower($email))
                 ->setParameter('domain', strtolower($domain));
             $foundLeads = $q->execute()->fetchAll();
-;
             foreach ($foundLeads as $lead) {
                 if (strtolower($lead['email']) == strtolower($leadEmail)) {
                     // Exact match
@@ -263,10 +262,10 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
                 }
 
                 if (preg_match('#^(.*?)\+(.*?)@(.*?)$#', $lead['email'], $parts)) {
-                    $email = $parts[1] . '@' . $parts[3];
+                    $email = $parts[1].'@'.$parts[3];
 
                     if (strtolower($email) == strtolower($leadEmail)) {
-                        $this->logger->debug('Lead found through + alias: '. $lead['email']);
+                        $this->logger->debug('Lead found through + alias: '.$lead['email']);
 
                         $leadId    = $lead['id'];
                         $leadEmail = $lead['email'];
@@ -274,7 +273,7 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
                 }
             }
 
-            $this->logger->debug('Lead ID: ' . ($leadId ? $leadId : 'not found'));
+            $this->logger->debug('Lead ID: '.($leadId ? $leadId : 'not found'));
         }
 
         if (!$leadId) {
@@ -284,36 +283,36 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
 
         // Set message details for unsubscribe requests
         if ($isUnsubscribe || $isFbl) {
-            $messageDetails = array(
+            $messageDetails = [
                 'remove'   => true,
                 'email'    => $leadEmail,
                 'rule_cat' => 'unsubscribed',
-                'rule_no'  => '0000'
-            );
+                'rule_no'  => '0000',
+            ];
         }
 
         if ($isBounce && $stat) {
             // Update the stat with some details
             $openDetails = unserialize($stat['open_details']);
             if (!is_array($openDetails)) {
-                $openDetails = array();
+                $openDetails = [];
             }
 
-            $openDetails['bounces'][] = array(
+            $openDetails['bounces'][] = [
                 'datetime' => $dtHelper->toUtcString(),
                 'reason'   => $messageDetails['rule_cat'],
                 'code'     => $messageDetails['rule_no'],
-                'type'     => ($messageDetails['bounce_type'] === false) ? 'unknown' : $messageDetails['bounce_type']
-            );
+                'type'     => ($messageDetails['bounce_type'] === false) ? 'unknown' : $messageDetails['bounce_type'],
+            ];
 
             $this->db->update(
                 MAUTIC_TABLE_PREFIX.'email_stats',
-                array(
+                [
                     'open_details' => serialize($openDetails),
                     'retry_count'  => ++$stat['retry_count'],
-                    'is_failed'    => ($messageDetails['remove'] || $stat['retry_count'] == 5) ? 1 : 0
-                ),
-                array('id' => $stat['id'])
+                    'is_failed'    => ($messageDetails['remove'] || $stat['retry_count'] == 5) ? 1 : 0,
+                ],
+                ['id' => $stat['id']]
             );
 
             $this->logger->debug('Stat updated');
@@ -321,12 +320,12 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
 
         // Is this a hard bounce or AN unsubscribe?
         if ($messageDetails['remove'] || ($stat && $stat['retry_count'] >= 5)) {
-            $this->logger->debug('Adding DNC entry for ' . $leadEmail);
+            $this->logger->debug('Adding DNC entry for '.$leadEmail);
 
             // Check for an existing DNC entry
             $q = $this->db->createQueryBuilder();
             $q->select('dnc.id')
-                ->from(MAUTIC_TABLE_PREFIX . 'lead_donotcontact', 'dnc')
+                ->from(MAUTIC_TABLE_PREFIX.'lead_donotcontact', 'dnc')
                 ->where('dnc.channel = "email"')
                 ->where(
                     $q->expr()->eq('dnc.lead_id', ':leadId')
@@ -340,21 +339,21 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
             }
 
             if (!empty($exists)) {
-                $this->logger->debug('A DNC entry already exists for ' . $leadEmail);
+                $this->logger->debug('A DNC entry already exists for '.$leadEmail);
             } else {
                 $this->logger->debug('Existing not found so creating a new one.');
                 // Create a DNC entry
                 try {
                     $this->db->insert(
-                        MAUTIC_TABLE_PREFIX . 'lead_donotcontact',
-                        array(
-                            'lead_id'      => $leadId,
-                            'channel'      => 'email',
-                            'channel_id'   => $emailId,
-                            'date_added'   => $dtHelper->toUtcString(),
-                            'reason'       => ($isUnsubscribe || $isFbl) ? DoNotContact::UNSUBSCRIBED : DoNotContact::BOUNCED,
-                            'comments'     => $this->factory->getTranslator()->trans('mautic.email.bounce.reason.'.$messageDetails['rule_cat'])
-                        )
+                        MAUTIC_TABLE_PREFIX.'lead_donotcontact',
+                        [
+                            'lead_id'    => $leadId,
+                            'channel'    => 'email',
+                            'channel_id' => $emailId,
+                            'date_added' => $dtHelper->toUtcString(),
+                            'reason'     => ($isUnsubscribe || $isFbl) ? DoNotContact::UNSUBSCRIBED : DoNotContact::BOUNCED,
+                            'comments'   => $this->factory->getTranslator()->trans('mautic.email.bounce.reason.'.$messageDetails['rule_cat']),
+                        ]
                     );
                 } catch (\Exception $e) {
                     $this->logger->error($e->getMessage());
@@ -368,61 +367,60 @@ public function analyzeMessage(Message $message, $allowBounce = false, $allowUns
     /**
      * next rule number (BODY): 0238 <br />
      * default category:        unrecognized: <br />
-     * default rule no.:        0000 <br />
+     * default rule no.:        0000 <br />.
      */
-
-    static $rule_categories = array(
-        'antispam'       => array('remove' => 0, 'bounce_type' => 'blocked'),
-        'autoreply'      => array('remove' => 0, 'bounce_type' => 'autoreply'),
-        'concurrent'     => array('remove' => 0, 'bounce_type' => 'soft'),
-        'content_reject' => array('remove' => 0, 'bounce_type' => 'soft'),
-        'command_reject' => array('remove' => 1, 'bounce_type' => 'hard'),
-        'internal_error' => array('remove' => 0, 'bounce_type' => 'temporary'),
-        'defer'          => array('remove' => 0, 'bounce_type' => 'soft'),
-        'delayed'        => array('remove' => 0, 'bounce_type' => 'temporary'),
-        'dns_loop'       => array('remove' => 1, 'bounce_type' => 'hard'),
-        'dns_unknown'    => array('remove' => 1, 'bounce_type' => 'hard'),
-        'full'           => array('remove' => 0, 'bounce_type' => 'soft'),
-        'inactive'       => array('remove' => 1, 'bounce_type' => 'hard'),
-        'latin_only'     => array('remove' => 0, 'bounce_type' => 'soft'),
-        'other'          => array('remove' => 1, 'bounce_type' => 'generic'),
-        'oversize'       => array('remove' => 0, 'bounce_type' => 'soft'),
-        'outofoffice'    => array('remove' => 0, 'bounce_type' => 'soft'),
-        'unknown'        => array('remove' => 1, 'bounce_type' => 'hard'),
-        'unrecognized'   => array('remove' => 0, 'bounce_type' => false,),
-        'user_reject'    => array('remove' => 1, 'bounce_type' => 'hard'),
-        'warning'        => array('remove' => 0, 'bounce_type' => 'soft')
-    );
+    public static $rule_categories = [
+        'antispam'       => ['remove' => 0, 'bounce_type' => 'blocked'],
+        'autoreply'      => ['remove' => 0, 'bounce_type' => 'autoreply'],
+        'concurrent'     => ['remove' => 0, 'bounce_type' => 'soft'],
+        'content_reject' => ['remove' => 0, 'bounce_type' => 'soft'],
+        'command_reject' => ['remove' => 1, 'bounce_type' => 'hard'],
+        'internal_error' => ['remove' => 0, 'bounce_type' => 'temporary'],
+        'defer'          => ['remove' => 0, 'bounce_type' => 'soft'],
+        'delayed'        => ['remove' => 0, 'bounce_type' => 'temporary'],
+        'dns_loop'       => ['remove' => 1, 'bounce_type' => 'hard'],
+        'dns_unknown'    => ['remove' => 1, 'bounce_type' => 'hard'],
+        'full'           => ['remove' => 0, 'bounce_type' => 'soft'],
+        'inactive'       => ['remove' => 1, 'bounce_type' => 'hard'],
+        'latin_only'     => ['remove' => 0, 'bounce_type' => 'soft'],
+        'other'          => ['remove' => 1, 'bounce_type' => 'generic'],
+        'oversize'       => ['remove' => 0, 'bounce_type' => 'soft'],
+        'outofoffice'    => ['remove' => 0, 'bounce_type' => 'soft'],
+        'unknown'        => ['remove' => 1, 'bounce_type' => 'hard'],
+        'unrecognized'   => ['remove' => 0, 'bounce_type' => false],
+        'user_reject'    => ['remove' => 1, 'bounce_type' => 'hard'],
+        'warning'        => ['remove' => 0, 'bounce_type' => 'soft'],
+    ];
 
     /*
      * var for new line ending
      */
-    static $bmh_newline = "<br />\n";
+    public static $bmh_newline = "<br />\n";
 
     /**
-     * Defined bounce parsing rules for non-standard DSN
+     * Defined bounce parsing rules for non-standard DSN.
      *
      * @param string      $body       body of the email
      * @param string|null $knownEmail Bounced email if known through a x-failed-recipient header or the like and need to parse the body for a reason
-     * @param boolean     $debug_mode show debug info. or not
+     * @param bool        $debug_mode show debug info. or not
      *
-     * @return array    $result an array include the following fields: 'email', 'bounce_type','remove','rule_no','rule_cat'
-     *                      if we could NOT detect the type of bounce, return rule_no = '0000'
+     * @return array $result an array include the following fields: 'email', 'bounce_type','remove','rule_no','rule_cat'
+     *               if we could NOT detect the type of bounce, return rule_no = '0000'
      */
-    static public function parseBody($body, $knownEmail = '', $debug_mode = false)
+    public static function parseBody($body, $knownEmail = '', $debug_mode = false)
     {
         // initialize the result array
-        $result = array(
+        $result = [
             'email'       => $knownEmail,
             'bounce_type' => false,
             'remove'      => 0,
             'rule_cat'    => 'unrecognized',
-            'rule_no'     => '0000'
-        );
+            'rule_no'     => '0000',
+        ];
 
         // ======== rule =========
 
-        /**
+        /*
          * Email is already known likely for a x-failed-recipients header; most likely Gmail bounce
          */
         if ('' !== $knownEmail) {
@@ -432,9 +430,9 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
              * The error that the other server returned was:
              * 550-5.1.1 The email account that you tried to reach does not exist.
              */
-            if (preg_match("/email.*?does not exist/i", $body, $match)) {
+            if (preg_match('/email.*?does not exist/i', $body, $match)) {
                 $result['rule_cat'] = 'unknown';
-                $result['rule_no'] = '0237';
+                $result['rule_no']  = '0237';
             }
 
             /*
@@ -443,9 +441,9 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
              * The error that the other server returned was:
              * 553-5.1.2 We weren't able to find the recipient domain.
              */
-            elseif (preg_match("/find the recipient domain/i", $body, $match)) {
+            elseif (preg_match('/find the recipient domain/i', $body, $match)) {
                 $result['rule_cat'] = 'unknown';
-                $result['rule_no'] = '0237';
+                $result['rule_no']  = '0237';
             }
 
             /*
@@ -454,9 +452,9 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
              * The error that the other server returned was:
              * 550-5.2.1 The email account that you tried to reach is disabled.
              */
-            elseif (preg_match("/email.*?disabled/i", $body, $match)) {
+            elseif (preg_match('/email.*?disabled/i', $body, $match)) {
                 $result['rule_cat'] = 'inactive';
-                $result['rule_no'] = '0171';
+                $result['rule_no']  = '0171';
             }
 
             /*
@@ -465,9 +463,9 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
              * The error that the other server returned was:
              * 550-5.2.1 The user you are trying to contact is receiving mail at a rate that prevents additional messages from being delivered.
              */
-            elseif (preg_match("/user.*?rate that prevents/i", $body, $match)) {
+            elseif (preg_match('/user.*?rate that prevents/i', $body, $match)) {
                 $result['rule_cat'] = 'warning';
-                $result['rule_no'] = '0000';
+                $result['rule_no']  = '0000';
             }
 
             /*
@@ -476,7 +474,7 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
             * The error that the other server returned was:
             * 550-5.7.1 Email quota exceeded.
             */
-            elseif (preg_match("/email quota exceeded/i", $body, $match)) {
+            elseif (preg_match('/email quota exceeded/i', $body, $match)) {
                 $result['rule_cat'] = 'full';
                 $result['rule_no']  = '0219';
             }
@@ -487,7 +485,7 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
             * The error that the other server returned was:
             * 552-5.2.2 The email account that you tried to reach is over quota.
             */
-            if (preg_match("/email.*?over quota/i", $body, $match)) {
+            if (preg_match('/email.*?over quota/i', $body, $match)) {
                 $result['rule_cat'] = 'full';
                 $result['rule_no']  = '0219';
             }
@@ -499,7 +497,7 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
             * 550-5.7.1 Our system has detected an unusual rate of unsolicited mail originating from your IP address. To protect our users from spam,
             * mail sent from your IP address has been blocked.
             */
-            elseif (preg_match("/unsolicited mail/i", $body, $match)) {
+            elseif (preg_match('/unsolicited mail/i', $body, $match)) {
                 $result['rule_cat'] = 'antispam';
                 $result['rule_no']  = '0230';
             }
@@ -510,7 +508,7 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
             * The error that the other server returned was:
             * 550-5.7.1 The user or domain that you are sending to (or from) has a policy that prohibited the mail that you sent.
             */
-            elseif (preg_match("/policy that prohibited/i", $body, $match)) {
+            elseif (preg_match('/policy that prohibited/i', $body, $match)) {
                 $result['rule_cat'] = 'antispam';
                 $result['rule_no']  = '0230';
             }
@@ -521,7 +519,7 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
             * The error that the other server returned was:
             * 552-5.2.3 Your message exceeded Google's message size limits.
             */
-            elseif (preg_match("/message size limits/i", $body, $match)) {
+            elseif (preg_match('/message size limits/i', $body, $match)) {
                 $result['rule_cat'] = 'oversize';
                 $result['rule_no']  = '0146';
             }
@@ -557,7 +555,6 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
          * Sorry, no mailbox here by that name. vpopmail (#5.1.1)
          */
         elseif (preg_match("/<(\S+@\S+\w)>.*\n?.*no mailbox/i", $body, $match)) {
-
             $result['rule_cat'] = 'unknown';
             $result['rule_no']  = '0157';
             $result['email']    = $match[1];
@@ -570,7 +567,6 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
         * local: Sorry, can't find user's mailbox. (#5.1.1)<br>
         */
         elseif (preg_match("/(\S+@\S+\w)<br>.*\n?.*\n?.*can't find.*mailbox/i", $body, $match)) {
-
             $result['rule_cat'] = 'unknown';
             $result['rule_no']  = '0164';
             $result['email']    = $match[1];
@@ -638,12 +634,12 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
         * xxxxx@yourdomain.com
         */
         elseif (preg_match("/an\s+error\s+occurred\s+while\s+trying\s+to\s+deliver\s+the\s+mail\s+to\s+the\s+following\s+recipients:\r\n\s*(\S+@\S+\w)/is", $body, $match)) {
-            $result['rule_cat'] = 'unknown';
-            $result['rule_no']  = '0013';
+            $result['rule_cat']    = 'unknown';
+            $result['rule_no']     = '0013';
             $result['bounce_type'] = 'hard';
             $result['remove']      = 1;
-            $result['email']    = $match[1];
-            $result['email'] = preg_replace("/Reporting\-MTA/","",$result['email']);
+            $result['email']       = $match[1];
+            $result['email']       = preg_replace("/Reporting\-MTA/", '', $result['email']);
         }
 
         /*
@@ -870,25 +866,25 @@ static public function parseBody($body, $knownEmail = '', $debug_mode = false)
     }
 
     /**
-     * Defined bounce parsing rules for standard DSN (Delivery Status Notification)
+     * Defined bounce parsing rules for standard DSN (Delivery Status Notification).
      *
-     * @param string  $dsn_msg    human-readable explanation
-     * @param string  $dsn_report delivery-status report
-     * @param boolean $debug_mode show debug info. or not
+     * @param string $dsn_msg    human-readable explanation
+     * @param string $dsn_report delivery-status report
+     * @param bool   $debug_mode show debug info. or not
      *
-     * @return array    $result an array include the following fields: 'email', 'bounce_type','remove','rule_no','rule_cat'
-     *                      if we could NOT detect the type of bounce, return rule_no = '0000'
+     * @return array $result an array include the following fields: 'email', 'bounce_type','remove','rule_no','rule_cat'
+     *               if we could NOT detect the type of bounce, return rule_no = '0000'
      */
-    static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
+    public static function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
     {
         // initialize the result array
-        $result      = array(
+        $result = [
             'email'       => '',
             'bounce_type' => false,
             'remove'      => 0,
             'rule_cat'    => 'unrecognized',
-            'rule_no'     => '0000'
-        );
+            'rule_no'     => '0000',
+        ];
         $action      = false;
         $status_code = false;
         $diag_code   = false;
@@ -896,16 +892,16 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
         // ======= parse $dsn_report ======
         // get the recipient email
         if (
-            preg_match("/Original-Recipient: rfc822;(.*)/i", $dsn_report, $match)
+            preg_match('/Original-Recipient: rfc822;(.*)/i', $dsn_report, $match)
             ||
-            preg_match("/Final-Recipient: rfc822;(.*)/i", $dsn_report, $match)
+            preg_match('/Final-Recipient: rfc822;(.*)/i', $dsn_report, $match)
         ) {
             if ($parsedAddressList = self::parseAddressList($match[1])) {
                 $result['email'] = key($parsedAddressList);
             }
         }
 
-        if (preg_match("/Action: (.+)/i", $dsn_report, $match)) {
+        if (preg_match('/Action: (.+)/i', $dsn_report, $match)) {
             $action = strtolower(trim($match[1]));
         }
 
@@ -940,7 +936,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * Diagnostic-Code: X-Postfix; me.domain.com platform: said: 552 5.2.2 Over
                      *   quota (in reply to RCPT TO command)
                      */
-                    if (preg_match("/over.*quota/is", $diag_code)) {
+                    if (preg_match('/over.*quota/is', $diag_code)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0105';
                     }
@@ -949,7 +945,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 552 Requested mailbox exceeds quota.
                      */
-                    elseif (preg_match("/exceed.*quota/is", $diag_code)) {
+                    elseif (preg_match('/exceed.*quota/is', $diag_code)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0129';
                     }
@@ -966,7 +962,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      *   100.1.ZmxEL.720k.1140313037.xxxxx@yourdomain.com (in reply to end of
                      *   DATA command)
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*full/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*full/is', $diag_code)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0145';
                     }
@@ -975,7 +971,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 452 Insufficient system storage
                      */
-                    elseif (preg_match("/Insufficient system storage/is", $diag_code)) {
+                    elseif (preg_match('/Insufficient system storage/is', $diag_code)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0134';
                     }
@@ -988,7 +984,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * Diagnostic-Code: X-Postfix; cannot access mailbox /var/spool/mail/b8843022 for^M
                      *   user xxxxx. error writing message: File too large
                      */
-                    elseif (preg_match("/File too large/is", $diag_code)) {
+                    elseif (preg_match('/File too large/is', $diag_code)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0192';
                     }
@@ -997,7 +993,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: smtp;552 5.2.2 This message is larger than the current system limit or the recipient's mailbox is full. Create a shorter message body or remove attachments and try sending it again.
                      */
-                    elseif (preg_match("/larger than.*limit/is", $diag_code)) {
+                    elseif (preg_match('/larger than.*limit/is', $diag_code)) {
                         $result['rule_cat'] = 'oversize';
                         $result['rule_no']  = '0146';
                     }
@@ -1006,7 +1002,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: X-Notes; User xxxxx (xxxxx@yourdomain.com) not listed in public Name & Address Book
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user)(.*)not(.*)list/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user)(.*)not(.*)list/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0103';
                     }
@@ -1015,7 +1011,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: smtp; 450 user path no exist
                      */
-                    elseif (preg_match("/user path no exist/is", $diag_code)) {
+                    elseif (preg_match('/user path no exist/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0106';
                     }
@@ -1028,7 +1024,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 3:
                      * Diagnostic-Code: SMTP; 550 relaying to <xxxxx@yourdomain.com> prohibited by administrator
                      */
-                    elseif (preg_match("/Relay.*(?:denied|prohibited)/is", $diag_code)) {
+                    elseif (preg_match('/Relay.*(?:denied|prohibited)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0108';
                     }
@@ -1037,7 +1033,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                     * sample:
                     * Diagnostic-Code: SMTP; 554 qq Sorry, no valid recipients (#5.1.3)
                     */
-                    elseif (preg_match("/no.*valid.*(?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/no.*valid.*(?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0185';
                     }
@@ -1050,7 +1046,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 3:
                      * Diagnostic-Code: SMTP; 550 <xxxxx@yourdomain.com>: Invalid User
                      */
-                    elseif (preg_match("/Invalid.*(?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/Invalid.*(?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0111';
                     }
@@ -1059,7 +1055,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 delivery error: dd Sorry your message to xxxxx@yourdomain.com cannot be delivered. This account has been disabled or discontinued [#102]. - mta173.mail.tpe.domain.com
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*(?:disabled|discontinued)/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*(?:disabled|discontinued)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0114';
                     }
@@ -1077,7 +1073,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 5.1.1 unknown or illegal alias: xxxxx@yourdomain.com
                      */
-                    elseif (preg_match("/(?:unknown|illegal).*(?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/(?:unknown|illegal).*(?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0128';
                     }
@@ -1097,7 +1093,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 sorry, no mailbox here by that name (#5.7.1)
                      */
-                    elseif (preg_match("/no (?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/no (?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0123';
                     }
@@ -1108,7 +1104,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 2:
                      * Diagnostic-Code: SMTP; 553 5.3.0 <xxxxx@yourdomain.com>... Addressee unknown, relay=[111.111.111.000]
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*unknown/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*unknown/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0125';
                     }
@@ -1119,7 +1115,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 2:
                      * Diagnostic-Code: SMTP; 452 4.2.1 mailbox temporarily disabled: xxxxx@yourdomain.com
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*disabled/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*disabled/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0133';
                     }
@@ -1128,7 +1124,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 <xxxxx@yourdomain.com>: Recipient address rejected: No such user (xxxxx@yourdomain.com)
                      */
-                    elseif (preg_match("/No such (?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/No such (?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0143';
                     }
@@ -1139,7 +1135,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 2:
                      * Diagnostic-Code: SMTP; 550 Mailbox ( xxxxx@yourdomain.com ) not found or inactivated
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*NOT FOUND/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*NOT FOUND/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0136';
                     }
@@ -1150,7 +1146,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * <xxxxx@yourdomain.com> is a deactivated mailbox (in reply to RCPT TO
                      * command)
                      */
-                    elseif (preg_match("/deactivated (?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/deactivated (?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0138';
                     }
@@ -1162,7 +1158,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * <<< 550 <xxxxx@yourdomain.com> recipient rejected
                      * 550 5.1.1 xxxxx@yourdomain.com... User unknown
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*reject/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*reject/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0148';
                     }
@@ -1171,7 +1167,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: smtp; 5.x.0 - Message bounced by administrator  (delivery attempts: 0)
                      */
-                    elseif (preg_match("/bounce.*administrator/is", $diag_code)) {
+                    elseif (preg_match('/bounce.*administrator/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0151';
                     }
@@ -1180,7 +1176,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 <maxqin> is now disabled with MTA service.
                      */
-                    elseif (preg_match("/<.*>.*disabled/is", $diag_code)) {
+                    elseif (preg_match('/<.*>.*disabled/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0152';
                     }
@@ -1189,7 +1185,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 551 not our customer
                      */
-                    elseif (preg_match("/not our customer/is", $diag_code)) {
+                    elseif (preg_match('/not our customer/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0154';
                     }
@@ -1198,7 +1194,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: smtp; 5.1.0 - Unknown address error 540-'Error: Wrong recipients' (delivery attempts: 0)
                      */
-                    elseif (preg_match("/Wrong (?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/Wrong (?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0159';
                     }
@@ -1209,7 +1205,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 2:
                      * Diagnostic-Code: SMTP; 501 #5.1.1 bad address xxxxx@yourdomain.com
                      */
-                    elseif (preg_match("/(?:unknown|bad).*(?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/(?:unknown|bad).*(?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0160';
                     }
@@ -1218,7 +1214,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Command RCPT User <xxxxx@yourdomain.com> not OK
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*not OK/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*not OK/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0186';
                     }
@@ -1227,7 +1223,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 5.7.1 Access-Denied-XM.SSR-001
                      */
-                    elseif (preg_match("/Access.*Denied/is", $diag_code)) {
+                    elseif (preg_match('/Access.*Denied/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0189';
                     }
@@ -1236,7 +1232,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 5.1.1 <xxxxx@yourdomain.com>... email address lookup in domain map failed^M
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*lookup.*fail/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*lookup.*fail/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0195';
                     }
@@ -1245,7 +1241,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 User not a member of domain: <xxxxx@yourdomain.com>^M
                      */
-                    elseif (preg_match("/(?:recipient|address|email|mailbox|user).*not.*member of domain/is", $diag_code)) {
+                    elseif (preg_match('/(?:recipient|address|email|mailbox|user).*not.*member of domain/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0198';
                     }
@@ -1254,7 +1250,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550-"The recipient cannot be verified.  Please check all recipients of this^M
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*cannot be verified/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*cannot be verified/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0202';
                     }
@@ -1263,7 +1259,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Unable to relay for xxxxx@yourdomain.com
                      */
-                    elseif (preg_match("/Unable to relay/is", $diag_code)) {
+                    elseif (preg_match('/Unable to relay/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0203';
                     }
@@ -1283,7 +1279,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550-I'm sorry but xxxxx@yourdomain.com does not have an account here. I will not
                      */
-                    elseif (preg_match("/not have an account/is", $diag_code)) {
+                    elseif (preg_match('/not have an account/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0207';
                     }
@@ -1292,7 +1288,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 This account is not allowed...xxxxx@yourdomain.com
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*is not allowed/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*is not allowed/is', $diag_code)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0220';
                     }
@@ -1301,7 +1297,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 <xxxxx@yourdomain.com>: inactive user
                      */
-                    elseif (preg_match("/inactive.*(?:alias|account|recipient|address|email|mailbox|user)/is", $diag_code)) {
+                    elseif (preg_match('/inactive.*(?:alias|account|recipient|address|email|mailbox|user)/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0135';
                     }
@@ -1310,7 +1306,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 xxxxx@yourdomain.com Account Inactive
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*Inactive/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*Inactive/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0155';
                     }
@@ -1319,7 +1315,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 <xxxxx@yourdomain.com>: Recipient address rejected: Account closed due to inactivity. No forwarding information is available.
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user) closed due to inactivity/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user) closed due to inactivity/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0170';
                     }
@@ -1328,7 +1324,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 <xxxxx@yourdomain.com>... User account not activated
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user) not activated/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user) not activated/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0177';
                     }
@@ -1339,7 +1335,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 2:
                      * Diagnostic-Code: SMTP; 550 account expired
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*(?:suspend|expire)/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*(?:suspend|expire)/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0183';
                     }
@@ -1348,7 +1344,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 5.3.0 <xxxxx@yourdomain.com>... Recipient address no longer exists
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*no longer exist/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*no longer exist/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0184';
                     }
@@ -1357,7 +1353,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 VS10-RT Possible forgery or deactivated due to abuse (#5.1.1) 111.111.111.211^M
                      */
-                    elseif (preg_match("/(?:forgery|abuse)/is", $diag_code)) {
+                    elseif (preg_match('/(?:forgery|abuse)/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0196';
                     }
@@ -1366,7 +1362,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 mailbox xxxxx@yourdomain.com is restricted
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*restrict/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*restrict/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0209';
                     }
@@ -1375,7 +1371,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 <xxxxx@yourdomain.com>: User status is locked.
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*locked/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*locked/is', $diag_code)) {
                         $result['rule_cat'] = 'inactive';
                         $result['rule_no']  = '0228';
                     }
@@ -1384,7 +1380,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 User refused to receive this mail.
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user) refused/is", $diag_code)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user) refused/is', $diag_code)) {
                         $result['rule_cat'] = 'user_reject';
                         $result['rule_no']  = '0156';
                     }
@@ -1393,7 +1389,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 501 xxxxx@yourdomain.com Sender email is not in my domain
                      */
-                    elseif (preg_match("/sender.*not/is", $diag_code)) {
+                    elseif (preg_match('/sender.*not/is', $diag_code)) {
                         $result['rule_cat'] = 'user_reject';
                         $result['rule_no']  = '0206';
                     }
@@ -1402,7 +1398,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 Message refused
                      */
-                    elseif (preg_match("/Message refused/is", $diag_code)) {
+                    elseif (preg_match('/Message refused/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0175';
                     }
@@ -1411,7 +1407,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 5.0.0 <xxxxx@yourdomain.com>... No permit
                      */
-                    elseif (preg_match("/No permit/is", $diag_code)) {
+                    elseif (preg_match('/No permit/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0190';
                     }
@@ -1429,7 +1425,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 AUTH FAILED - xxxxx@yourdomain.com^M
                      */
-                    elseif (preg_match("/AUTH FAILED/is", $diag_code)) {
+                    elseif (preg_match('/AUTH FAILED/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0197';
                     }
@@ -1440,7 +1436,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 2:
                      * Diagnostic-Code: SMTP; 530 5.7.1 Relaying not allowed: xxxxx@yourdomain.com
                      */
-                    elseif (preg_match("/relay.*not.*(?:permit|allow)/is", $diag_code)) {
+                    elseif (preg_match('/relay.*not.*(?:permit|allow)/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0201';
                     }
@@ -1450,7 +1446,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      *
                      * Diagnostic-Code: SMTP; 550 not local host domain.com, not a gateway
                      */
-                    elseif (preg_match("/not local host/is", $diag_code)) {
+                    elseif (preg_match('/not local host/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0204';
                     }
@@ -1459,7 +1455,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 500 Unauthorized relay msg rejected
                      */
-                    elseif (preg_match("/Unauthorized relay/is", $diag_code)) {
+                    elseif (preg_match('/Unauthorized relay/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0215';
                     }
@@ -1468,7 +1464,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 Transaction failed
                      */
-                    elseif (preg_match("/Transaction.*fail/is", $diag_code)) {
+                    elseif (preg_match('/Transaction.*fail/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0221';
                     }
@@ -1477,7 +1473,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: smtp;554 5.5.2 Invalid data in message
                      */
-                    elseif (preg_match("/Invalid data/is", $diag_code)) {
+                    elseif (preg_match('/Invalid data/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0223';
                     }
@@ -1486,7 +1482,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Local user only or Authentication mechanism
                      */
-                    elseif (preg_match("/Local user only/is", $diag_code)) {
+                    elseif (preg_match('/Local user only/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0224';
                     }
@@ -1498,7 +1494,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * server in the last 30 minutes or do not have SMTP Authentication turned on
                      * in your email client.
                      */
-                    elseif (preg_match("/not.*permit.*to/is", $diag_code)) {
+                    elseif (preg_match('/not.*permit.*to/is', $diag_code)) {
                         $result['rule_cat'] = 'command_reject';
                         $result['rule_no']  = '0225';
                     }
@@ -1507,7 +1503,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Content reject. FAAAANsG60M9BmDT.1
                      */
-                    elseif (preg_match("/Content reject/is", $diag_code)) {
+                    elseif (preg_match('/Content reject/is', $diag_code)) {
                         $result['rule_cat'] = 'content_reject';
                         $result['rule_no']  = '0165';
                     }
@@ -1525,7 +1521,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: smtp; 554 5.6.0 Message with invalid header rejected, id=13462-01 - MIME error: error: UnexpectedBound: part didn't end with expected boundary [in multipart message]; EOSToken: EOF; EOSType: EOF
                      */
-                    elseif (preg_match("/MIME error/is", $diag_code)) {
+                    elseif (preg_match('/MIME error/is', $diag_code)) {
                         $result['rule_cat'] = 'content_reject';
                         $result['rule_no']  = '0217';
                     }
@@ -1534,7 +1530,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 Mail data refused by AISP, rule [169648].
                      */
-                    elseif (preg_match("/Mail data refused.*AISP/is", $diag_code)) {
+                    elseif (preg_match('/Mail data refused.*AISP/is', $diag_code)) {
                         $result['rule_cat'] = 'content_reject';
                         $result['rule_no']  = '0218';
                     }
@@ -1543,7 +1539,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Host unknown
                      */
-                    elseif (preg_match("/Host unknown/is", $diag_code)) {
+                    elseif (preg_match('/Host unknown/is', $diag_code)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0130';
                     }
@@ -1552,7 +1548,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 Specified domain is not allowed.
                      */
-                    elseif (preg_match("/Specified domain.*not.*allow/is", $diag_code)) {
+                    elseif (preg_match('/Specified domain.*not.*allow/is', $diag_code)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0180';
                     }
@@ -1562,7 +1558,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * Diagnostic-Code: X-Postfix; delivery temporarily suspended: connect to
                      * 111.111.11.112[111.111.11.112]: No route to host
                      */
-                    elseif (preg_match("/No route to host/is", $diag_code)) {
+                    elseif (preg_match('/No route to host/is', $diag_code)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0188';
                     }
@@ -1571,7 +1567,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 unrouteable address
                      */
-                    elseif (preg_match("/unrouteable address/is", $diag_code)) {
+                    elseif (preg_match('/unrouteable address/is', $diag_code)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0208';
                     }
@@ -1580,7 +1576,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 451 System(u) busy, try again later.
                      */
-                    elseif (preg_match("/System.*busy/is", $diag_code)) {
+                    elseif (preg_match('/System.*busy/is', $diag_code)) {
                         $result['rule_cat'] = 'defer';
                         $result['rule_no']  = '0112';
                     }
@@ -1589,7 +1585,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 451 mta172.mail.tpe.domain.com Resources temporarily unavailable. Please try again later.  [#4.16.4:70].
                      */
-                    elseif (preg_match("/Resources temporarily unavailable/is", $diag_code)) {
+                    elseif (preg_match('/Resources temporarily unavailable/is', $diag_code)) {
                         $result['rule_cat'] = 'defer';
                         $result['rule_no']  = '0116';
                     }
@@ -1598,7 +1594,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 sender is rejected: 0,mx20,wKjR5bDrnoM2yNtEZVAkBg==.32467S2
                      */
-                    elseif (preg_match("/sender is rejected/is", $diag_code)) {
+                    elseif (preg_match('/sender is rejected/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0101';
                     }
@@ -1607,7 +1603,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 <unknown[111.111.111.000]>: Client host rejected: Access denied
                      */
-                    elseif (preg_match("/Client host rejected/is", $diag_code)) {
+                    elseif (preg_match('/Client host rejected/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0102';
                     }
@@ -1616,7 +1612,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 Connection refused(mx). MAIL FROM [xxxxx@yourdomain.com] mismatches client IP [111.111.111.000].
                      */
-                    elseif (preg_match("/MAIL FROM(.*)mismatches client IP/is", $diag_code)) {
+                    elseif (preg_match('/MAIL FROM(.*)mismatches client IP/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0104';
                     }
@@ -1625,7 +1621,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 Please visit http:// antispam.domain.com/denyip.php?IP=111.111.111.000 (#5.7.1)
                      */
-                    elseif (preg_match("/denyip/is", $diag_code)) {
+                    elseif (preg_match('/denyip/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0144';
                     }
@@ -1634,7 +1630,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 Service unavailable; Client host [111.111.111.211] blocked using dynablock.domain.com; Your message could not be delivered due to complaints we received regarding the IP address you're using or your ISP. See http:// blackholes.domain.com/ Error: WS-02^M
                      */
-                    elseif (preg_match("/client host.*blocked/is", $diag_code)) {
+                    elseif (preg_match('/client host.*blocked/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0201';
                     }
@@ -1643,7 +1639,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Requested action not taken: mail IsCNAPF76kMDARUY.56621S2 is rejected,mx3,BM
                      */
-                    elseif (preg_match("/mail.*reject/is", $diag_code)) {
+                    elseif (preg_match('/mail.*reject/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0147';
                     }
@@ -1652,7 +1648,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 552 sorry, the spam message is detected (#5.6.0)
                      */
-                    elseif (preg_match("/spam.*detect/is", $diag_code)) {
+                    elseif (preg_match('/spam.*detect/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0162';
                     }
@@ -1661,7 +1657,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 5.7.1 Rejected as Spam see: http:// rejected.domain.com/help/spam/rejected.html
                      */
-                    elseif (preg_match("/reject.*spam/is", $diag_code)) {
+                    elseif (preg_match('/reject.*spam/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0216';
                     }
@@ -1670,7 +1666,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 5.7.1 <xxxxx@yourdomain.com>... SpamTrap=reject mode, dsn=5.7.1, Message blocked by BOX Solutions (www.domain.com) SpamTrap Technology, please contact the domain.com site manager for help: (ctlusr8012).^M
                      */
-                    elseif (preg_match("/SpamTrap/is", $diag_code)) {
+                    elseif (preg_match('/SpamTrap/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0200';
                     }
@@ -1679,7 +1675,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Verify mailfrom failed,blocked
                      */
-                    elseif (preg_match("/Verify mailfrom failed/is", $diag_code)) {
+                    elseif (preg_match('/Verify mailfrom failed/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0210';
                     }
@@ -1688,7 +1684,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 Error: MAIL FROM is mismatched with message header from address!
                      */
-                    elseif (preg_match("/MAIL.*FROM.*mismatch/is", $diag_code)) {
+                    elseif (preg_match('/MAIL.*FROM.*mismatch/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0226';
                     }
@@ -1697,7 +1693,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 5.7.1 Message scored too high on spam scale.  For help, please quote incident ID 22492290.
                      */
-                    elseif (preg_match("/spam scale/is", $diag_code)) {
+                    elseif (preg_match('/spam scale/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0211';
                     }
@@ -1714,7 +1710,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 550 sorry, it seems as a junk mail
                      */
-                    elseif (preg_match("/junk mail/is", $diag_code)) {
+                    elseif (preg_match('/junk mail/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0230';
                     }
@@ -1723,7 +1719,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553-Message filtered. Please see the FAQs section on spam
                      */
-                    elseif (preg_match("/message filtered/is", $diag_code)) {
+                    elseif (preg_match('/message filtered/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0227';
                     }
@@ -1732,7 +1728,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 554 5.7.1 The message from (<xxxxx@yourdomain.com>) with the subject of ( *(ca2639) 7|-{%2E* : {2"(%EJ;y} (SBI$#$@<K*:7s1!=l~) matches a profile the Internet community may consider spam. Please revise your message before resending.
                      */
-                    elseif (preg_match("/subject.*consider.*spam/is", $diag_code)) {
+                    elseif (preg_match('/subject.*consider.*spam/is', $diag_code)) {
                         $result['rule_cat'] = 'antispam';
                         $result['rule_no']  = '0222';
                     }
@@ -1741,7 +1737,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 451 Temporary local problem - please try later
                      */
-                    elseif (preg_match("/Temporary local problem/is", $diag_code)) {
+                    elseif (preg_match('/Temporary local problem/is', $diag_code)) {
                         $result['rule_cat'] = 'internal_error';
                         $result['rule_no']  = '0142';
                     }
@@ -1750,7 +1746,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * Diagnostic-Code: SMTP; 553 5.3.5 system config error
                      */
-                    elseif (preg_match("/system config error/is", $diag_code)) {
+                    elseif (preg_match('/system config error/is', $diag_code)) {
                         $result['rule_cat'] = 'internal_error';
                         $result['rule_no']  = '0153';
                     }
@@ -1761,7 +1757,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * 111.111.111.11[111.111.111.11] timed out while sending end of data -- message may be^M
                      * sent more than once
                      */
-                    elseif (preg_match("/delivery.*suspend/is", $diag_code)) {
+                    elseif (preg_match('/delivery.*suspend/is', $diag_code)) {
                         $result['rule_cat'] = 'delayed';
                         $result['rule_no']  = '0213';
                     }
@@ -1777,7 +1773,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * <<< 503 All recipients are invalid
                      * 554 5.0.0 Service unavailable
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user)(.*)invalid/i", $dsn_msg)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user)(.*)invalid/i', $dsn_msg)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0107';
                     }
@@ -1787,7 +1783,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * ----- Transcript of session follows -----
                      * xxxxx@yourdomain.com... Deferred: No such file or directory
                      */
-                    elseif (preg_match("/Deferred.*No such.*(?:file|directory)/i", $dsn_msg)) {
+                    elseif (preg_match('/Deferred.*No such.*(?:file|directory)/i', $dsn_msg)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0141';
                     }
@@ -1798,7 +1794,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * LOCAL module(account xxxx) reports:^M
                      * mail receiving disabled^M
                      */
-                    elseif (preg_match("/mail receiving disabled/i", $dsn_msg)) {
+                    elseif (preg_match('/mail receiving disabled/i', $dsn_msg)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0194';
                     }
@@ -1808,7 +1804,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * - These recipients of your message have been processed by the mail server:^M
                      * xxxxx@yourdomain.com; Failed; 5.1.1 (bad destination mailbox address)
                      */
-                    elseif (preg_match("/bad.*(?:alias|account|recipient|address|email|mailbox|user)/i", $dsn_msg)) {
+                    elseif (preg_match('/bad.*(?:alias|account|recipient|address|email|mailbox|user)/i', $dsn_msg)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '227';
                     }
@@ -1822,7 +1818,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      *  Recipient address: xxxxx@yourdomain.com
                      *  Reason: Over quota
                      */
-                    elseif (preg_match("/over.*quota/i", $dsn_msg)) {
+                    elseif (preg_match('/over.*quota/i', $dsn_msg)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0131';
                     }
@@ -1832,7 +1828,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * Sorry the recipient quota limit is exceeded.
                      * This message is returned as an error.
                      */
-                    elseif (preg_match("/quota.*exceeded/i", $dsn_msg)) {
+                    elseif (preg_match('/quota.*exceeded/i', $dsn_msg)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0150';
                     }
@@ -1858,7 +1854,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * that member's mailbox is full
                      * 550 5.0.0 <xxxxx@yourdomain.com>... Can't create output
                      */
-                    elseif (preg_match("/(?:alias|account|recipient|address|email|mailbox|user).*full/i", $dsn_msg)) {
+                    elseif (preg_match('/(?:alias|account|recipient|address|email|mailbox|user).*full/i', $dsn_msg)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0132';
                     }
@@ -1867,7 +1863,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * gaosong "(0), ErrMsg=Mailbox space not enough (space limit is 10240KB)
                      */
-                    elseif (preg_match("/space.*not.*enough/i", $dsn_msg)) {
+                    elseif (preg_match('/space.*not.*enough/i', $dsn_msg)) {
                         $result['rule_cat'] = 'full';
                         $result['rule_no']  = '0219';
                     }
@@ -1882,7 +1878,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * 451 4.4.1 reply: read error from www.domain.com.
                      * xxxxx@yourdomain.com... Deferred: Connection reset by www.domain.com.
                      */
-                    elseif (preg_match("/Deferred.*Connection (?:refused|reset)/i", $dsn_msg)) {
+                    elseif (preg_match('/Deferred.*Connection (?:refused|reset)/i', $dsn_msg)) {
                         $result['rule_cat'] = 'defer';
                         $result['rule_no']  = '0115';
                     }
@@ -1894,7 +1890,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * ----- Transcript of session follows -----
                      * 553 5.1.2 XXXX SSSS <xxxxx@yourdomain..com>... Invalid host name
                      */
-                    elseif (preg_match("/Invalid host name/i", $dsn_msg)) {
+                    elseif (preg_match('/Invalid host name/i', $dsn_msg)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0109';
                     }
@@ -1904,7 +1900,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * ----- Transcript of session follows -----
                      * xxxxx@yourdomain.com... Deferred: mail.domain.com.: No route to host
                      */
-                    elseif (preg_match("/Deferred.*No route to host/i", $dsn_msg)) {
+                    elseif (preg_match('/Deferred.*No route to host/i', $dsn_msg)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0109';
                     }
@@ -1914,7 +1910,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * ----- Transcript of session follows -----
                      * 550 5.1.2 xxxxx@yourdomain.com... Host unknown (Name server: .: no data known)
                      */
-                    elseif (preg_match("/Host unknown/i", $dsn_msg)) {
+                    elseif (preg_match('/Host unknown/i', $dsn_msg)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0140';
                     }
@@ -1926,7 +1922,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * Message could not be delivered for 5 days
                      * Message will be deleted from queue
                      */
-                    elseif (preg_match("/Name server timeout/i", $dsn_msg)) {
+                    elseif (preg_match('/Name server timeout/i', $dsn_msg)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0118';
                     }
@@ -1938,7 +1934,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * Message could not be delivered for 5 days
                      * Message will be deleted from queue
                      */
-                    elseif (preg_match("/Deferred.*Connection.*tim(?:e|ed).*out/i", $dsn_msg)) {
+                    elseif (preg_match('/Deferred.*Connection.*tim(?:e|ed).*out/i', $dsn_msg)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0119';
                     }
@@ -1948,7 +1944,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * ----- Transcript of session follows -----
                      * xxxxx@yourdomain.com... Deferred: Name server: domain.com.: host name lookup failure
                      */
-                    elseif (preg_match("/Deferred.*host name lookup failure/i", $dsn_msg)) {
+                    elseif (preg_match('/Deferred.*host name lookup failure/i', $dsn_msg)) {
                         $result['rule_cat'] = 'dns_unknown';
                         $result['rule_no']  = '0121';
                     }
@@ -1959,7 +1955,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * 554 5.0.0 MX list for znet.ws. points back to mail01.domain.com^M
                      * 554 5.3.5 Local configuration error^M
                      */
-                    elseif (preg_match("/MX list.*point.*back/i", $dsn_msg)) {
+                    elseif (preg_match('/MX list.*point.*back/i', $dsn_msg)) {
                         $result['rule_cat'] = 'dns_loop';
                         $result['rule_no']  = '0199';
                     }
@@ -1980,7 +1976,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * SMTP module(domain domain.com) reports:^M
                      * connection with mx1.mail.domain.com is broken^M
                      */
-                    elseif (preg_match("/connection.*broken/i", $dsn_msg)) {
+                    elseif (preg_match('/connection.*broken/i', $dsn_msg)) {
                         $result['rule_cat'] = 'internal_error';
                         $result['rule_no']  = '0231';
                     }
@@ -1990,7 +1986,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * Delivery to the following recipients failed.
                      * xxxxx@yourdomain.com
                      */
-                    elseif (preg_match("/Delivery to the following recipients failed.*\n.*\n.*".$result['email']."/i", $dsn_msg)) {
+                    elseif (preg_match("/Delivery to the following recipients failed.*\n.*\n.*".$result['email'].'/i', $dsn_msg)) {
                         $result['rule_cat'] = 'other';
                         $result['rule_no']  = '0176';
                     }
@@ -2007,7 +2003,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample 2:
                      * 550 5.1.1 xxxxx@yourdomain.com... User unknown^M
                      */
-                    elseif (preg_match("/User unknown/i", $dsn_msg)) {
+                    elseif (preg_match('/User unknown/i', $dsn_msg)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0193';
                     }
@@ -2016,7 +2012,7 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                      * sample:
                      * 554 5.0.0 Service unavailable
                      */
-                    elseif (preg_match("/Service unavailable/i", $dsn_msg)) {
+                    elseif (preg_match('/Service unavailable/i', $dsn_msg)) {
                         $result['rule_cat'] = 'unknown';
                         $result['rule_no']  = '0214';
                     }
@@ -2029,20 +2025,20 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
                 case 'relayed':
                 case 'expanded': // unhandled cases
                     break;
-                default :
+                default:
                     break;
             }
         }
 
         if ($result['rule_no'] == '0000') {
             if ($debug_mode) {
-                $result['debug'] = array(
+                $result['debug'] = [
                     'email '          => $result['email'].self::$bmh_newline,
                     'Action '         => $action.self::$bmh_newline,
                     'Status '         => $status_code.self::$bmh_newline,
                     'Diagnostic-Code' => $diag_code.self::$bmh_newline,
-                    'DSN Message'     => $dsn_msg.self::$bmh_newline
-                );
+                    'DSN Message'     => $dsn_msg.self::$bmh_newline,
+                ];
             }
         } else {
             if ($result['bounce_type'] === false) {
@@ -2054,9 +2050,9 @@ static public function parseDsn($dsn_msg, $dsn_report, $debug_mode = false)
         return $result;
     }
 
-    static public function parseAddressList($addresses)
+    public static function parseAddressList($addresses)
     {
-        $results = [];
+        $results         = [];
         $parsedAddresses = imap_rfc822_parse_adrlist($addresses, 'default.domain.name');
         foreach ($parsedAddresses as $parsedAddress) {
             if (
@@ -2066,11 +2062,12 @@ static public function parseAddressList($addresses)
                 &&
                 $parsedAddress->host != 'default.domain.name'
             ) {
-                $email = $parsedAddress->mailbox.'@'.$parsedAddress->host;
-                $name = isset($parsedAddress->personal) ? $parsedAddress->personal : null;
+                $email           = $parsedAddress->mailbox.'@'.$parsedAddress->host;
+                $name            = isset($parsedAddress->personal) ? $parsedAddress->personal : null;
                 $results[$email] = $name;
             }
         }
+
         return $results;
     }
 }
diff --git a/app/bundles/EmailBundle/Helper/PlainTextHelper.php b/app/bundles/EmailBundle/Helper/PlainTextHelper.php
index 24a7305099f..8d0459e62cd 100644
--- a/app/bundles/EmailBundle/Helper/PlainTextHelper.php
+++ b/app/bundles/EmailBundle/Helper/PlainTextHelper.php
@@ -1,32 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @copyright   2005-2007 Jon Abernathy <jon@chuggnutt.com>
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Helper;
 
-
 class PlainTextHelper
 {
-
     const ENCODING = 'UTF-8';
 
     /**
      * Contains the HTML content to convert.
      *
-     * @type string
+     * @var string
      */
     protected $html;
 
     /**
      * Contains the converted, formatted text.
      *
-     * @type string
+     * @var string
      */
     protected $text;
 
@@ -36,7 +35,7 @@ class PlainTextHelper
      * Set this value to 0 (or less) to ignore word wrapping
      * and not constrain text to a fixed-width column.
      *
-     * @type integer
+     * @var int
      */
     protected $width = 70;
 
@@ -44,10 +43,11 @@ class PlainTextHelper
      * List of preg* regular expression patterns to search for,
      * used in conjunction with $replace.
      *
-     * @type array
+     * @var array
+     *
      * @see $replace
      */
-    protected $search = array(
+    protected $search = [
         "/\r/",                                           // Non-legal carriage return
         "/[\n\t]+/",                                      // Newlines and tabs
         '/<head[^>]*>.*?<\/head>/i',                      // <head>
@@ -70,15 +70,16 @@ class PlainTextHelper
         '/(<tr[^>]*>|<\/tr>)/i',                          // <tr> and </tr>
         '/<td[^>]*>(.*?)<\/td>/i',                        // <td> and </td>
         '/<span class="_html2text_ignore">.+?<\/span>/i', // <span class="_html2text_ignore">...</span>
-    );
+    ];
 
     /**
      * List of pattern replacements corresponding to patterns searched.
      *
-     * @type array
+     * @var array
+     *
      * @see $search
      */
-    protected $replace = array(
+    protected $replace = [
         '',                              // Non-legal carriage return
         ' ',                             // Newlines and tabs
         '',                              // <head>
@@ -100,90 +101,95 @@ class PlainTextHelper
         "\n\n",                          // <table> and </table>
         "\n",                            // <tr> and </tr>
         "\t\t\\1\n",                     // <td> and </td>
-        ""                               // <span class="_html2text_ignore">...</span>
-    );
+        '',                               // <span class="_html2text_ignore">...</span>
+    ];
 
     /**
      * List of preg* regular expression patterns to search for,
      * used in conjunction with $entReplace.
      *
-     * @type array
+     * @var array
+     *
      * @see $entReplace
      */
-    protected $entSearch = array(
+    protected $entSearch = [
         '/&#153;/i',                                     // TM symbol in win-1252
         '/&#151;/i',                                     // m-dash in win-1252
         '/&(amp|#38);/i',                                // Ampersand: see converter()
         '/[ ]{2,}/',                                     // Runs of spaces, post-handling
-    );
+    ];
 
     /**
      * List of pattern replacements corresponding to patterns searched.
      *
-     * @type array
+     * @var array
+     *
      * @see $entSearch
      */
-    protected $entReplace = array(
+    protected $entReplace = [
         '™',         // TM symbol
         '—',         // m-dash
         '|+|amp|+|', // Ampersand: see converter()
         ' ',         // Runs of spaces, post-handling
-    );
+    ];
 
     /**
      * List of preg* regular expression patterns to search for
      * and replace using callback function.
      *
-     * @type array
+     * @var array
      */
-    protected $callbackSearch = array(
+    protected $callbackSearch = [
         '/<(h)[123456]( [^>]*)?>(.*?)<\/h[123456]>/i',           // h1 - h6
         '/<(b)( [^>]*)?>(.*?)<\/b>/i',                           // <b>
         '/<(strong)( [^>]*)?>(.*?)<\/strong>/i',                 // <strong>
         '/<(th)( [^>]*)?>(.*?)<\/th>/i',                         // <th> and </th>
-        '/<(a) [^>]*href=("|\')([^"\']+)\2([^>]*)>(.*?)<\/a>/i'  // <a href="">
-    );
+        '/<(a) [^>]*href=("|\')([^"\']+)\2([^>]*)>(.*?)<\/a>/i',  // <a href="">
+    ];
 
     /**
      * List of preg* regular expression patterns to search for in PRE body,
      * used in conjunction with $preReplace.
      *
-     * @type array
+     * @var array
+     *
      * @see $preReplace
      */
-    protected $preSearch = array(
+    protected $preSearch = [
         "/\n/",
         "/\t/",
         '/ /',
         '/<pre[^>]*>/',
-        '/<\/pre>/'
-    );
+        '/<\/pre>/',
+    ];
 
     /**
      * List of pattern replacements corresponding to patterns searched for PRE body.
      *
-     * @type array
+     * @var array
+     *
      * @see $preSearch
      */
-    protected $preReplace = array(
+    protected $preReplace = [
         '<br>',
         '&nbsp;&nbsp;&nbsp;&nbsp;',
         '&nbsp;',
         '',
         '',
-    );
+    ];
 
     /**
      * Temporary workspace used during PRE processing.
      *
-     * @type string
+     * @var string
      */
     protected $preContent = '';
 
     /**
      * Indicates whether content in the $html variable has been converted yet.
      *
-     * @type boolean
+     * @var bool
+     *
      * @see $html, $text
      */
     protected $converted = false;
@@ -191,17 +197,18 @@ class PlainTextHelper
     /**
      * Contains URL addresses from links to be rendered in plain text.
      *
-     * @type array
+     * @var array
+     *
      * @see buildlinkList()
      */
-    protected $linkList = array();
+    protected $linkList = [];
 
     /**
-     * Various configuration options (able to be set in the constructor)
+     * Various configuration options (able to be set in the constructor).
      *
-     * @type array
+     * @var array
      */
-    protected $options = array(
+    protected $options = [
         'do_links' => 'inline', // 'none'
         // 'inline' (show links inline)
         // 'nextline' (show links on the next line)
@@ -211,14 +218,14 @@ class PlainTextHelper
         //  Set this value to 0 (or less) to ignore word wrapping
         //  and not constrain text to a fixed-width column.
 
-        'base_url' => ''
-    );
+        'base_url' => '',
+    ];
 
     /**
      * @param string $html    Source HTML
      * @param array  $options Set configuration options
      */
-    public function __construct($html = '', $options = array())
+    public function __construct($html = '', $options = [])
     {
         if (is_array($html)) {
             // Options were passed in without html
@@ -226,12 +233,12 @@ public function __construct($html = '', $options = array())
             $html    = '';
         }
 
-        $this->html = $html;
+        $this->html    = $html;
         $this->options = array_merge($this->options, $options);
     }
 
     /**
-     * Set the source HTML
+     * Set the source HTML.
      *
      * @param string $html HTML source content
      *
@@ -239,7 +246,7 @@ public function __construct($html = '', $options = array())
      */
     public function setHtml($html)
     {
-        $this->html = $html;
+        $this->html      = $html;
         $this->converted = false;
 
         return $this;
@@ -261,7 +268,7 @@ public function getText()
 
     protected function convert()
     {
-        $this->linkList = array();
+        $this->linkList = [];
 
         $text = trim(stripslashes($this->html));
 
@@ -270,7 +277,7 @@ protected function convert()
         if ($this->linkList) {
             $text .= "\n\nLinks:\n------\n";
             foreach ($this->linkList as $i => $url) {
-                $text .= '[' . ($i + 1) . '] ' . $url . "\n";
+                $text .= '['.($i + 1).'] '.$url."\n";
             }
         }
 
@@ -284,7 +291,7 @@ protected function converter(&$text)
         $this->convertBlockquotes($text);
         $this->convertPre($text);
         $text = preg_replace($this->search, $this->replace, $text);
-        $text = preg_replace_callback($this->callbackSearch, array($this, 'pregCallback'), $text);
+        $text = preg_replace_callback($this->callbackSearch, [$this, 'pregCallback'], $text);
         $text = strip_tags($text);
         $text = preg_replace($this->entSearch, $this->entReplace, $text);
         $text = html_entity_decode($text, ENT_QUOTES, self::ENCODING);
@@ -316,9 +323,10 @@ protected function converter(&$text)
      * appeared. Also makes an effort at identifying and handling absolute
      * and relative links.
      *
-     * @param  string $link          URL of the link
-     * @param  string $display       Part of the text to associate number with
-     * @param  null   $linkOverride
+     * @param string $link         URL of the link
+     * @param string $display      Part of the text to associate number with
+     * @param null   $linkOverride
+     *
      * @return string
      */
     protected function buildlinkList($link, $display, $linkOverride = null)
@@ -345,15 +353,15 @@ protected function buildlinkList($link, $display, $linkOverride = null)
 
         if ($linkMethod == 'table') {
             if (($index = array_search($url, $this->linkList)) === false) {
-                $index = count($this->linkList);
+                $index            = count($this->linkList);
                 $this->linkList[] = $url;
             }
 
-            return $display . ' [' . ($index + 1) . ']';
+            return $display.' ['.($index + 1).']';
         } elseif ($linkMethod == 'nextline') {
-            return $display . "\n[" . $url . ']';
+            return $display."\n[".$url.']';
         } else { // link_method defaults to inline
-            return $display . ' [' . $url . ']';
+            return $display.' ['.$url.']';
         }
     }
 
@@ -366,7 +374,7 @@ protected function convertPre(&$text)
             // Run our defined tags search-and-replace with callback
             $this->preContent = preg_replace_callback(
                 $this->callbackSearch,
-                array($this, 'pregCallback'),
+                [$this, 'pregCallback'],
                 $this->preContent
             );
 
@@ -379,7 +387,7 @@ protected function convertPre(&$text)
             // replace the content (use callback because content can contain $0 variable)
             $text = preg_replace_callback(
                 '/<pre[^>]*>.*<\/pre>/ismU',
-                array($this, 'pregPreCallback'),
+                [$this, 'pregPreCallback'],
                 $text,
                 1
             );
@@ -397,13 +405,13 @@ protected function convertPre(&$text)
     protected function convertBlockquotes(&$text)
     {
         if (preg_match_all('/<\/*blockquote[^>]*>/i', $text, $matches, PREG_OFFSET_CAPTURE)) {
-            $start = 0;
+            $start  = 0;
             $taglen = 0;
-            $level = 0;
-            $diff = 0;
+            $level  = 0;
+            $diff   = 0;
             foreach ($matches[0] as $m) {
                 if ($m[0][0] == '<' && $m[0][1] == '/') {
-                    $level--;
+                    --$level;
                     if ($level < 0) {
                         $level = 0; // malformed HTML: go to next blockquote
                     } elseif ($level > 0) {
@@ -416,28 +424,30 @@ protected function convertBlockquotes(&$text)
 
                         // Set text width
                         $pWidth = $this->options['width'];
-                        if ($this->options['width'] > 0) $this->options['width'] -= 2;
+                        if ($this->options['width'] > 0) {
+                            $this->options['width'] -= 2;
+                        }
                         // Convert blockquote content
                         $body = trim($body);
                         $this->converter($body);
                         // Add citation markers and create PRE block
                         $body = preg_replace('/((^|\n)>*)/', '\\1> ', trim($body));
-                        $body = '<pre>' . htmlspecialchars($body) . '</pre>';
+                        $body = '<pre>'.htmlspecialchars($body).'</pre>';
                         // Re-set text width
                         $this->options['width'] = $pWidth;
                         // Replace content
                         $text = substr($text, 0, $start - $diff)
-                            . $body . substr($text, $end + strlen($m[0]) - $diff);
+                            .$body.substr($text, $end + strlen($m[0]) - $diff);
 
                         $diff = $len + $taglen + strlen($m[0]) - strlen($body);
                         unset($body);
                     }
                 } else {
                     if ($level == 0) {
-                        $start = $m[1];
+                        $start  = $m[1];
                         $taglen = strlen($m[0]);
                     }
-                    $level++;
+                    ++$level;
                 }
             }
         }
@@ -446,7 +456,8 @@ protected function convertBlockquotes(&$text)
     /**
      * Callback function for preg_replace_callback use.
      *
-     * @param  array  $matches PREG matches
+     * @param array $matches PREG matches
+     *
      * @return string
      */
     protected function pregCallback($matches)
@@ -456,9 +467,9 @@ protected function pregCallback($matches)
             case 'strong':
                 return $matches[3];
             case 'th':
-                return $this->toupper("\t\t" . $matches[3] . "\n");
+                return $this->toupper("\t\t".$matches[3]."\n");
             case 'h':
-                return $this->toupper("\n\n" . $matches[3] . "\n\n");
+                return $this->toupper("\n\n".$matches[3]."\n\n");
             case 'a':
                 // override the link method
                 $linkOverride = null;
@@ -477,10 +488,11 @@ protected function pregCallback($matches)
     /**
      * Callback function for preg_replace_callback use in PRE content handler.
      *
-     * @param  array  $matches PREG matches
+     * @param array $matches PREG matches
+     *
      * @return string
      */
-    protected function pregPreCallback(/** @noinspection PhpUnusedParameterInspection */ $matches)
+    protected function pregPreCallback(/* @noinspection PhpUnusedParameterInspection */ $matches)
     {
         return $this->preContent;
     }
@@ -488,7 +500,8 @@ protected function pregPreCallback(/** @noinspection PhpUnusedParameterInspectio
     /**
      * Strtoupper function with HTML tags and entities handling.
      *
-     * @param  string $str Text to convert
+     * @param string $str Text to convert
+     *
      * @return string Converted text
      */
     private function toupper($str)
@@ -509,7 +522,8 @@ private function toupper($str)
     /**
      * Strtoupper multibyte wrapper function with HTML entities handling.
      *
-     * @param  string $str Text to convert
+     * @param string $str Text to convert
+     *
      * @return string Converted text
      */
     private function strtoupper($str)
diff --git a/app/bundles/EmailBundle/Helper/PointEventHelper.php b/app/bundles/EmailBundle/Helper/PointEventHelper.php
index f8a0d9957fa..9f9130e2573 100644
--- a/app/bundles/EmailBundle/Helper/PointEventHelper.php
+++ b/app/bundles/EmailBundle/Helper/PointEventHelper.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Helper;
+
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\PointBundle\Entity\TriggerEvent;
 
 /**
- * Class PointEventHelper
+ * Class PointEventHelper.
  */
 class PointEventHelper
 {
-
     /**
      * @param $eventDetails
      * @param $action
@@ -60,9 +60,9 @@ public static function sendEmail($event, Lead $lead, MauticFactory $factory)
                 $leadCredentials       = $leadModel->flattenFields($leadFields);
                 $leadCredentials['id'] = $lead->getId();
 
-                $options = array('source' => array('trigger', $event['id']));
+                $options = ['source' => ['trigger', $event['id']]];
                 $model->sendEmail($email, $leadCredentials, $options);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/MauticEmailBundle.php b/app/bundles/EmailBundle/MauticEmailBundle.php
index 992d687b075..1fd20db09cb 100644
--- a/app/bundles/EmailBundle/MauticEmailBundle.php
+++ b/app/bundles/EmailBundle/MauticEmailBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticEmailBundle
- *
- * @package Mautic\EmailBundle
+ * Class MauticEmailBundle.
  */
 class MauticEmailBundle extends Bundle
 {
-
 }
diff --git a/app/bundles/EmailBundle/Model/EmailModel.php b/app/bundles/EmailBundle/Model/EmailModel.php
index 61ed2f60477..4102de87b04 100644
--- a/app/bundles/EmailBundle/Model/EmailModel.php
+++ b/app/bundles/EmailBundle/Model/EmailModel.php
@@ -1,55 +1,55 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Model;
 
+use DeviceDetector\DeviceDetector;
+use Doctrine\DBAL\Query\QueryBuilder;
+use Mautic\CoreBundle\Entity\MessageQueue;
+use Mautic\CoreBundle\Helper\Chart\BarChart;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
+use Mautic\CoreBundle\Helper\Chart\PieChart;
+use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Helper\ThemeHelper;
 use Mautic\CoreBundle\Model\FormModel;
+use Mautic\CoreBundle\Model\MessageQueueModel;
 use Mautic\CoreBundle\Model\TranslationModelTrait;
 use Mautic\CoreBundle\Model\VariantModelTrait;
-use Mautic\CoreBundle\Entity\MessageQueue;
-use Mautic\LeadBundle\Entity\LeadDevice;
-use Mautic\EmailBundle\Entity\StatDevice;
-use Mautic\EmailBundle\Helper\MailHelper;
-use Mautic\EmailBundle\MonitoredEmail\Mailbox;
-use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException;
+use Mautic\EmailBundle\EmailEvents;
 use Mautic\EmailBundle\Entity\Email;
 use Mautic\EmailBundle\Entity\Stat;
+use Mautic\EmailBundle\Entity\StatDevice;
 use Mautic\EmailBundle\Event\EmailBuilderEvent;
 use Mautic\EmailBundle\Event\EmailEvent;
 use Mautic\EmailBundle\Event\EmailOpenEvent;
-use Mautic\EmailBundle\EmailEvents;
+use Mautic\EmailBundle\Helper\MailHelper;
+use Mautic\EmailBundle\MonitoredEmail\Mailbox;
+use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\BarChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
-use Mautic\CoreBundle\Helper\CoreParametersHelper;
-use Doctrine\DBAL\Query\QueryBuilder;
+use Mautic\LeadBundle\Entity\LeadDevice;
 use Mautic\LeadBundle\Model\CompanyModel;
 use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\PageBundle\Model\TrackableModel;
 use Mautic\UserBundle\Model\UserModel;
-use Mautic\CoreBundle\Model\MessageQueueModel;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use DeviceDetector\DeviceDetector;
 
 /**
  * Class EmailModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class EmailModel extends FormModel
 {
@@ -102,7 +102,7 @@ class EmailModel extends FormModel
     protected $messageQueueModel;
 
     /**
-     * @var Mixed
+     * @var mixed
      */
     protected $coreParameters;
 
@@ -151,7 +151,6 @@ public function __construct(
         $this->userModel          = $userModel;
         $this->coreParameters     = $coreParametersHelper;
         $this->messageQueueModel  = $messageQueueModel;
-
     }
 
     /**
@@ -181,14 +180,13 @@ public function getCopyRepository()
     }
 
     /**
-    * @return \Mautic\EmailBundle\Entity\StatDeviceRepository
-    */
+     * @return \Mautic\EmailBundle\Entity\StatDeviceRepository
+     */
     public function getStatDeviceRepository()
     {
         return $this->em->getRepository('MauticEmailBundle:StatDevice');
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -218,7 +216,7 @@ public function saveEntity($entity, $unlock = true)
             // Ensure that this email has the same lists assigned as the translated parent if applicable
             /** @var Email $translationParent */
             if ($translationParent = $entity->getTranslationParent()) {
-                $parentLists  = $translationParent->getLists()->toArray();
+                $parentLists = $translationParent->getLists()->toArray();
                 $entity->setLists($parentLists);
             }
         }
@@ -227,7 +225,7 @@ public function saveEntity($entity, $unlock = true)
             if (!$entity->isNew()) {
                 //increase the revision
                 $revision = $entity->getRevision();
-                $revision++;
+                ++$revision;
                 $entity->setRevision($revision);
             }
 
@@ -248,7 +246,7 @@ public function saveEntity($entity, $unlock = true)
 
             // Force translations for this entity to use the same segments
             if ($entity->getEmailType() == 'list' && $entity->hasTranslations()) {
-                $translations = $entity->getTranslationChildren()->toArray();
+                $translations                      = $entity->getTranslationChildren()->toArray();
                 $this->updatingTranslationChildren = true;
                 foreach ($translations as $translation) {
                     $this->saveEntity($translation);
@@ -261,7 +259,7 @@ public function saveEntity($entity, $unlock = true)
     }
 
     /**
-     * Save an array of entities
+     * Save an array of entities.
      *
      * @param  $entities
      * @param  $unlock
@@ -279,13 +277,13 @@ public function saveEntities($entities, $unlock = true)
             $this->setTimestamps($entity, $isNew, $unlock);
 
             if ($dispatchEvent = $entity instanceof Email) {
-                $event = $this->dispatchEvent("pre_save", $entity, $isNew);
+                $event = $this->dispatchEvent('pre_save', $entity, $isNew);
             }
 
             $this->getRepository()->saveEntity($entity, false);
 
             if ($dispatchEvent) {
-                $this->dispatchEvent("post_save", $entity, $isNew, $event);
+                $this->dispatchEvent('post_save', $entity, $isNew, $event);
             }
 
             if ((($k + 1) % $batchSize) === 0) {
@@ -316,6 +314,7 @@ public function deleteEntity($entity)
      * @param array $options
      *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
     public function createForm($entity, $formFactory, $action = null, $options = [])
@@ -331,7 +330,7 @@ public function createForm($entity, $formFactory, $action = null, $options = [])
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
      *
@@ -369,16 +368,16 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = EmailEvents::EMAIL_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = EmailEvents::EMAIL_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = EmailEvents::EMAIL_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = EmailEvents::EMAIL_POST_DELETE;
                 break;
             default:
@@ -423,7 +422,7 @@ public function hitEmail($stat, $request, $viaBrowser = false)
             }
         }
 
-        $readDateTime = new DateTimeHelper;
+        $readDateTime = new DateTimeHelper();
         $stat->setLastOpened($readDateTime->getDateTime());
 
         $lead = $stat->getLead();
@@ -490,7 +489,6 @@ public function hitEmail($stat, $request, $viaBrowser = false)
                 $this->em->flush($emailOpenDevice);
             } catch (\Exception $exception) {
                 if (MAUTIC_ENV === 'dev') {
-
                     throw $exception;
                 } else {
                     $this->logger->addError(
@@ -524,7 +522,7 @@ public function hitEmail($stat, $request, $viaBrowser = false)
     }
 
     /**
-     * Get array of page builder tokens from bundles subscribed PageEvents::PAGE_ON_BUILD
+     * Get array of page builder tokens from bundles subscribed PageEvents::PAGE_ON_BUILD.
      *
      * @param null|Email   $email
      * @param array|string $requestedComponents all | tokens | tokenSections | abTestWinnerCriteria
@@ -532,7 +530,7 @@ public function hitEmail($stat, $request, $viaBrowser = false)
      *
      * @return array
      */
-    public function getBuilderComponents (Email $email = null, $requestedComponents = 'all', $tokenFilter = null, $withBC = true)
+    public function getBuilderComponents(Email $email = null, $requestedComponents = 'all', $tokenFilter = null, $withBC = true)
     {
         $singleComponent = (!is_array($requestedComponents) && $requestedComponents != 'all');
         $components      = [];
@@ -583,7 +581,7 @@ public function getEmailStatus($idHash)
     }
 
     /**
-     * Search for an email stat by email and lead IDs
+     * Search for an email stat by email and lead IDs.
      *
      * @param $emailId
      * @param $leadId
@@ -602,7 +600,7 @@ public function getEmailStati($emailId, $leadId)
     }
 
     /**
-     * Get a stats for email by list
+     * Get a stats for email by list.
      *
      * @param                $email
      * @param bool           $includeVariants
@@ -686,7 +684,7 @@ public function getEmailListStats($email, $includeVariants = false, \DateTime $d
                     $key
                 );
 
-                $key++;
+                ++$key;
             }
         }
 
@@ -701,7 +699,7 @@ public function getEmailListStats($email, $includeVariants = false, \DateTime $d
         return $chart->render();
     }
     /**
-     * Get a stats for email by list
+     * Get a stats for email by list.
      *
      * @param Email|int $email
      * @param bool      $includeVariants
@@ -714,9 +712,9 @@ public function getEmailDeviceStats($email, $includeVariants = false, $dateFrom
             $email = $this->getEntity($email);
         }
 
-        $emailIds  = ($includeVariants) ? $email->getRelatedEntityIds() : [$email->getId()];
+        $emailIds      = ($includeVariants) ? $email->getRelatedEntityIds() : [$email->getId()];
         $templateEmail = 'template' === $email->getEmailType();
-        $results = $this->getStatDeviceRepository()->getDeviceStats($emailIds, $dateFrom, $dateTo);
+        $results       = $this->getStatDeviceRepository()->getDeviceStats($emailIds, $dateFrom, $dateTo);
 
         // Organize by list_id (if a segment email) and/or device
         $stats   = [];
@@ -767,7 +765,7 @@ public function getEmailDeviceStats($email, $includeVariants = false, $dateFrom
             );
         } else {
             $combined = [];
-            $key   = ($listCount > 1) ? 1 : 0;
+            $key      = ($listCount > 1) ? 1 : 0;
             foreach ($listNames as $id => $name) {
                 // Fill in missing devices
                 $listStats = [];
@@ -789,7 +787,7 @@ public function getEmailDeviceStats($email, $includeVariants = false, $dateFrom
                     $key
                 );
 
-                $key++;
+                ++$key;
             }
 
             if ($listCount > 1) {
@@ -813,7 +811,7 @@ public function getEmailDeviceStats($email, $includeVariants = false, $dateFrom
      *
      * @return array
      */
-    public function getEmailGeneralStats($email, $includeVariants = false, $unit, \DateTime $dateFrom, \DateTime $dateTo)
+    public function getEmailGeneralStats($email, $includeVariants, $unit, \DateTime $dateFrom, \DateTime $dateTo)
     {
         if (!$email instanceof Email) {
             $email = $this->getEntity($email);
@@ -828,7 +826,7 @@ public function getEmailGeneralStats($email, $includeVariants = false, $unit, \D
     }
 
     /**
-     * Get an array of tracked links
+     * Get an array of tracked links.
      *
      * @param $emailId
      *
@@ -840,7 +838,7 @@ public function getEmailClickStats($emailId)
     }
 
     /**
-     * Get the number of leads this email will be sent to
+     * Get the number of leads this email will be sent to.
      *
      * @param Email $email
      * @param mixed $listId          Leads for a specific lead list
@@ -859,12 +857,12 @@ public function getPendingLeads(Email $email, $listId = null, $countOnly = false
     }
 
     /**
-     * Send an email to lead lists
+     * Send an email to lead lists.
      *
      * @param Email $email
      * @param array $lists
      * @param int   $limit
-     * @param bool  $batch   True to process and batch all pending leads
+     * @param bool  $batch True to process and batch all pending leads
      *
      * @return array array(int $sentCount, int $failedCount, array $failedRecipientsByList)
      */
@@ -875,7 +873,7 @@ public function sendEmailToLists(Email $email, $lists = null, $limit = null, $ba
             $lists = $email->getLists();
         }
 
-        $options       = [
+        $options = [
             'source'        => ['email', $email->getId()],
             'allowResends'  => false,
             'customHeaders' => [
@@ -890,14 +888,14 @@ public function sendEmailToLists(Email $email, $lists = null, $limit = null, $ba
         $progress = false;
         if ($batch && $output) {
             $progressCounter = 0;
-            $totalLeadCount = $this->getPendingLeads($email, null, true);
-            if (! $totalLeadCount) {
+            $totalLeadCount  = $this->getPendingLeads($email, null, true);
+            if (!$totalLeadCount) {
                 return;
             }
 
             // Broadcast send through CLI
             $output->writeln("\n<info>".$email->getName().'</info>');
-            $progress       = new ProgressBar($output, $totalLeadCount);
+            $progress = new ProgressBar($output, $totalLeadCount);
         }
 
         foreach ($lists as $list) {
@@ -952,7 +950,7 @@ public function sendEmailToLists(Email $email, $lists = null, $limit = null, $ba
     }
 
     /**
-     * Gets template, stats, weights, etc for an email in preparation to be sent
+     * Gets template, stats, weights, etc for an email in preparation to be sent.
      *
      * @param Email $email
      * @param bool  $includeVariants
@@ -980,7 +978,7 @@ public function &getEmailSettings(Email $email, $includeVariants = true)
                     'isVariant'    => null !== $email->getVariantStartDate(),
                     'entity'       => $email,
                     'translations' => $email->getTranslations(true),
-                    'languages'    => ['default' => $email->getId()]
+                    'languages'    => ['default' => $email->getId()],
                 ],
             ];
 
@@ -1034,7 +1032,7 @@ public function &getEmailSettings(Email $email, $includeVariants = true)
                                 'weight'       => ($variantSettings['weight'] / 100),
                                 'entity'       => $child,
                                 'translations' => $child->getTranslations(true),
-                                'languages'    => ['default' => $child->getId()]
+                                'languages'    => ['default' => $child->getId()],
                             ];
 
                             $variantWeight += $variantSettings['weight'];
@@ -1087,7 +1085,7 @@ public function &getEmailSettings(Email $email, $includeVariants = true)
                 // Determine the deficit for email ordering
                 if ($totalSent) {
                     $details['weight_deficit'] = $details['weight'] - ($details['variantCount'] / $totalSent);
-                    $details['send_weight'] = ($details['weight'] - ($details['variantCount'] / $totalSent)) + $details['weight'];
+                    $details['send_weight']    = ($details['weight'] - ($details['variantCount'] / $totalSent)) + $details['weight'];
                 } else {
                     $details['weight_deficit'] = $details['weight'];
                     $details['send_weight']    = $details['weight'];
@@ -1095,7 +1093,7 @@ public function &getEmailSettings(Email $email, $includeVariants = true)
             }
 
             // Reorder according to send_weight so that campaigns which currently send one at a time alternate
-            uasort($this->emailSettings[$email->getId()], function($a, $b) {
+            uasort($this->emailSettings[$email->getId()], function ($a, $b) {
                 if ($a['weight_deficit'] === $b['weight_deficit']) {
                     if ($a['variantCount'] === $b['variantCount']) {
                         return 0;
@@ -1114,20 +1112,22 @@ public function &getEmailSettings(Email $email, $includeVariants = true)
     }
 
     /**
-     * Send an email to lead(s)
+     * Send an email to lead(s).
      *
-     * @param       $email
-     * @param       $leads
-     * @param       $options = array()
-     *                       array source array('model', 'id')
-     *                       array emailSettings
-     *                       int   listId
-     *                       bool  allowResends     If false, exact emails (by id) already sent to the lead will not be resent
-     *                       bool  ignoreDNC        If true, emails listed in the do not contact table will still get the email
-     *                       bool  sendBatchMail    If false, the function will not send batched mail but will defer to calling function to handle it
-     *                       array assetAttachments Array of optional Asset IDs to attach
+     * @param              $email
+     * @param              $leads
+     * @param              $options = array()
+     *                              array source array('model', 'id')
+     *                              array emailSettings
+     *                              int   listId
+     *                              bool  allowResends     If false, exact emails (by id) already sent to the lead will not be resent
+     *                              bool  ignoreDNC        If true, emails listed in the do not contact table will still get the email
+     *                              bool  sendBatchMail    If false, the function will not send batched mail but will defer to calling function to handle it
+     *                              array assetAttachments Array of optional Asset IDs to attach
      * @param MessageQueue $queue
+     *
      * @return mixed
+     *
      * @throws \Doctrine\ORM\ORMException
      */
     public function sendEmail($email, $leads, $options = [])
@@ -1163,14 +1163,14 @@ public function sendEmail($email, $leads, $options = [])
         $emailSettings = &$this->getEmailSettings($email);
 
         $defaultFrequencyNumber = $this->coreParameters->getParameter('email_frequency_number');
-        $defaultFrequencyTime = $this->coreParameters->getParameter('email_frequency_time');
+        $defaultFrequencyTime   = $this->coreParameters->getParameter('email_frequency_time');
 
         /** @var \Mautic\LeadBundle\Entity\FrequencyRuleRepository $frequencyRulesRepo */
         $frequencyRulesRepo = $this->em->getRepository('MauticLeadBundle:FrequencyRule');
 
-        $sendTo = $leads;
+        $sendTo  = $leads;
         $leadIds = array_keys($leads);
-        $leadIds = implode(",", $leadIds);
+        $leadIds = implode(',', $leadIds);
 
         $dontSendTo = $frequencyRulesRepo->getAppliedFrequencyRules('email', $leadIds, $listId, $defaultFrequencyNumber, $defaultFrequencyTime);
 
@@ -1191,7 +1191,7 @@ public function sendEmail($email, $leads, $options = [])
         }
 
         $leadIds         = array_keys($sendTo);
-        $leadIds         = implode(",", $leadIds);
+        $leadIds         = implode(',', $leadIds);
         $campaignEventId = ($isMarketing && is_array($source) && 'campaign.event' === $source[0] && !empty($source[1])) ? $source[1] : null;
         $dontSendTo      = $frequencyRulesRepo->getAppliedFrequencyRules('email', $leadIds, $listId, $defaultFrequencyNumber, $defaultFrequencyTime);
 
@@ -1232,7 +1232,7 @@ public function sendEmail($email, $leads, $options = [])
         }
 
         // Store stat entities
-        $errors   = [];
+        $errors          = [];
         $saveEntities    = [];
         $emailSentCounts = [];
 
@@ -1242,7 +1242,6 @@ public function sendEmail($email, $leads, $options = [])
 
         // Flushes the batch in case of using API mailers
         $flushQueue = function ($reset = true) use (&$mailer, &$saveEntities, &$errors, &$emailSentCounts, $sendBatchMail) {
-
             if ($sendBatchMail) {
                 $flushResult = $mailer->flushQueue();
                 if (!$flushResult) {
@@ -1259,7 +1258,7 @@ public function sendEmail($email, $leads, $options = [])
 
                             // Down sent counts
                             $emailId = $stat->getEmail()->getId();
-                            $emailSentCounts[$emailId]++;
+                            ++$emailSentCounts[$emailId];
 
                             // Delete the stat
                             unset($saveEntities[$failedEmail]);
@@ -1282,10 +1281,9 @@ public function sendEmail($email, $leads, $options = [])
 
         // Organize the contacts according to the variant and translation they are to receive
         $groupedContactsByEmail = [];
-        $offset = 0;
+        $offset                 = 0;
         foreach ($emailSettings as $eid => $details) {
             if (empty($details['limit'])) {
-
                 continue;
             }
             $groupedContactsByEmail[$eid] = [];
@@ -1359,7 +1357,7 @@ public function sendEmail($email, $leads, $options = [])
                             $mailer->clearErrors();
 
                             // Bad email so note and continue
-                            $errors[$contact['id']] = $contact['email'];
+                            $errors[$contact['id']]    = $contact['email'];
                             $badEmails[$contact['id']] = $contact['email'];
                             continue;
                         }
@@ -1372,7 +1370,7 @@ public function sendEmail($email, $leads, $options = [])
                             $mailer->clearErrors();
 
                             // Bad email so note and continue
-                            $errors[$contact['id']] = $contact['email'];
+                            $errors[$contact['id']]    = $contact['email'];
                             $badEmails[$contact['id']] = $contact['email'];
                             continue;
                         }
@@ -1392,13 +1390,13 @@ public function sendEmail($email, $leads, $options = [])
                     if (!isset($emailSentCounts[$translatedId])) {
                         $emailSentCounts[$translatedId] = 0;
                     }
-                    $emailSentCounts[$translatedId]++;
+                    ++$emailSentCounts[$translatedId];
 
                     // Update $emailSetting so campaign a/b tests are handled correctly
-                    $emailSettings[$parentId]['sentCount']++;
+                    ++$emailSettings[$parentId]['sentCount'];
 
                     if (!empty($emailSettings[$parentId]['isVariant'])) {
-                        $emailSettings[$parentId]['variantCount']++;
+                        ++$emailSettings[$parentId]['variantCount'];
                     }
                 }
             }
@@ -1435,7 +1433,7 @@ public function sendEmail($email, $leads, $options = [])
                 } catch (\Exception $exception) {
                     error_log($exception);
                 }
-                $strikes--;
+                --$strikes;
             }
         }
 
@@ -1449,7 +1447,7 @@ public function sendEmail($email, $leads, $options = [])
     }
 
     /**
-     * Send an email to lead(s)
+     * Send an email to lead(s).
      *
      * @param       $email
      * @param       $users
@@ -1459,6 +1457,7 @@ public function sendEmail($email, $leads, $options = [])
      * @param bool  $saveStat
      *
      * @return mixed
+     *
      * @throws \Doctrine\ORM\ORMException
      */
     public function sendEmailToUser($email, $users, $lead = null, $tokens = [], $assetAttachments = [], $saveStat = true)
@@ -1616,7 +1615,7 @@ public function setEmailDoNotContact($email, $reason = DoNotContact::BOUNCED, $c
     }
 
     /**
-     * Processes the callback response from a mailer for bounces and unsubscribes
+     * Processes the callback response from a mailer for bounces and unsubscribes.
      *
      * @param array $response
      *
@@ -1625,7 +1624,6 @@ public function setEmailDoNotContact($email, $reason = DoNotContact::BOUNCED, $c
     public function processMailerCallback(array $response)
     {
         if (empty($response)) {
-
             return;
         }
 
@@ -1672,7 +1670,6 @@ public function processMailerCallback(array $response)
             if (!empty($entries['emails'])) {
                 foreach ($entries['emails'] as $email => $reason) {
                     if (in_array($email, $emails)) {
-
                         continue;
                     }
                     $emails[] = $email;
@@ -1697,7 +1694,7 @@ public function processMailerCallback(array $response)
     }
 
     /**
-     * Get the settings for a monitored mailbox or false if not enabled
+     * Get the settings for a monitored mailbox or false if not enabled.
      *
      * @param $bundleKey
      * @param $folderKey
@@ -1707,7 +1704,6 @@ public function processMailerCallback(array $response)
     public function getMonitoredMailbox($bundleKey, $folderKey)
     {
         if ($this->mailboxHelper->isConfigured($bundleKey, $folderKey)) {
-
             return $this->mailboxHelper->getMailboxSettings();
         }
 
@@ -1715,7 +1711,7 @@ public function getMonitoredMailbox($bundleKey, $folderKey)
     }
 
     /**
-     * Joins the email table and limits created_by to currently logged in user
+     * Joins the email table and limits created_by to currently logged in user.
      *
      * @param QueryBuilder $q
      */
@@ -1727,14 +1723,14 @@ public function limitQueryToCreator(QueryBuilder &$q)
     }
 
     /**
-     * Get line chart data of emails sent and read
+     * Get line chart data of emails sent and read.
      *
-     * @param char      $unit {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
@@ -1795,7 +1791,6 @@ public function getEmailsLineChartData($unit, \DateTime $dateFrom, \DateTime $da
                 }
             }
 
-
             if (!$canViewOthers) {
                 $this->limitQueryToCreator($q);
             }
@@ -1818,12 +1813,12 @@ public function getEmailsLineChartData($unit, \DateTime $dateFrom, \DateTime $da
     }
 
     /**
-     * Modifies the line chart query for the DNC
+     * Modifies the line chart query for the DNC.
      *
      * @param ChartQuery $q
      * @param array      $filter
-     * @param boolean    $reason
-     * @param boolean    $canViewOthers
+     * @param bool       $reason
+     * @param bool       $canViewOthers
      */
     public function getDncLineChartDataset(ChartQuery &$query, array $filter, $reason, $canViewOthers)
     {
@@ -1842,12 +1837,12 @@ public function getDncLineChartDataset(ChartQuery &$query, array $filter, $reaso
     }
 
     /**
-     * Get pie chart data of ignored vs opened emails
+     * Get pie chart data of ignored vs opened emails.
      *
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
@@ -1875,7 +1870,6 @@ public function getIgnoredVsReadPieChartData($dateFrom, $dateTo, $filters = [],
         $read   = $query->fetchCount($readQ);
         $failed = $query->fetchCount($failedQ);
 
-
         $chart->setDataset($this->translator->trans('mautic.email.graph.pie.ignored.read.failed.ignored'), ($sent - $read));
         $chart->setDataset($this->translator->trans('mautic.email.graph.pie.ignored.read.failed.read'), $read);
         $chart->setDataset($this->translator->trans('mautic.email.graph.pie.ignored.read.failed.failed'), $failed);
@@ -1884,12 +1878,12 @@ public function getIgnoredVsReadPieChartData($dateFrom, $dateTo, $filters = [],
     }
 
     /**
-     * Get pie chart data of ignored vs opened emails
+     * Get pie chart data of ignored vs opened emails.
      *
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
@@ -1903,7 +1897,7 @@ public function getDeviceGranularityPieChartData($dateFrom, $dateTo, $canViewOth
             $dateTo
         );
 
-        foreach ($deviceStats as $device){
+        foreach ($deviceStats as $device) {
             $chart->setDataset($device['device'], $device['count']);
         }
 
@@ -1911,9 +1905,9 @@ public function getDeviceGranularityPieChartData($dateFrom, $dateTo, $canViewOth
     }
 
     /**
-     * Get a list of emails in a date range, grouped by a stat date count
+     * Get a list of emails in a date range, grouped by a stat date count.
      *
-     * @param integer   $limit
+     * @param int       $limit
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
@@ -1953,9 +1947,9 @@ public function getEmailStatList($limit = 10, \DateTime $dateFrom = null, \DateT
     }
 
     /**
-     * Get a list of emails in a date range
+     * Get a list of emails in a date range.
      *
-     * @param integer   $limit
+     * @param int       $limit
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
@@ -1985,10 +1979,10 @@ public function getEmailList($limit = 10, \DateTime $dateFrom = null, \DateTime
     }
 
     /**
-     * Get a list of upcoming emails
+     * Get a list of upcoming emails.
      *
-     * @param integer $limit
-     * @param boolean $canViewOthers
+     * @param int  $limit
+     * @param bool $canViewOthers
      *
      * @return array
      */
@@ -2039,7 +2033,7 @@ private function getContactCompanies(array &$sendTo)
             $companies = $this->companyModel->getRepository()->getCompaniesForContacts($fetchCompanies); // Simple dbal query that fetches lead_id IN $fetchCompanies and returns as array
 
             foreach ($companies as $contactId => $contactCompanies) {
-                $key = $fetchCompanies[$contactId];
+                $key                       = $fetchCompanies[$contactId];
                 $sendTo[$key]['companies'] = $contactCompanies;
             }
         }
diff --git a/app/bundles/EmailBundle/MonitoredEmail/Attachment.php b/app/bundles/EmailBundle/MonitoredEmail/Attachment.php
index 11c3552ff23..9a9a6b302da 100644
--- a/app/bundles/EmailBundle/MonitoredEmail/Attachment.php
+++ b/app/bundles/EmailBundle/MonitoredEmail/Attachment.php
@@ -1,16 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * Modified from
+ *
  * @see    https://github.com/barbushin/php-imap
+ *
  * @author Barbushin Sergey http://linkedin.com/in/barbushin
  * @copyright BSD (three-clause)
  */
+
 namespace Mautic\EmailBundle\MonitoredEmail;
 
 class Attachment
@@ -18,4 +22,4 @@ class Attachment
     public $id;
     public $name;
     public $filePath;
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/MonitoredEmail/Mailbox.php b/app/bundles/EmailBundle/MonitoredEmail/Mailbox.php
index fc91720cbb9..f54a406e608 100644
--- a/app/bundles/EmailBundle/MonitoredEmail/Mailbox.php
+++ b/app/bundles/EmailBundle/MonitoredEmail/Mailbox.php
@@ -1,13 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * Modified from
+ *
  * @see         https://github.com/barbushin/php-imap
+ *
  * @author      Barbushin Sergey http://linkedin.com/in/barbushin
  * @copyright   BSD (three-clause)
  */
@@ -22,137 +25,137 @@
 class Mailbox
 {
     /**
-     * Return all mails matching the rest of the criteria
+     * Return all mails matching the rest of the criteria.
      */
     const CRITERIA_ALL = 'ALL';
 
     /**
-     * Match mails with the \\ANSWERED flag set
+     * Match mails with the \\ANSWERED flag set.
      */
     const CRITERIA_ANSWERED = 'ANSWERED';
 
     /**
-     * CRITERIA_BCC "string" - match mails with "string" in the Bcc: field
+     * CRITERIA_BCC "string" - match mails with "string" in the Bcc: field.
      */
-    const CRITERIA_BCC = "BCC";
+    const CRITERIA_BCC = 'BCC';
 
     /**
-     * CRITERIA_BEFORE "date" - match mails with Date: before "date"
+     * CRITERIA_BEFORE "date" - match mails with Date: before "date".
      */
-    const CRITERIA_BEFORE = "BEFORE";
+    const CRITERIA_BEFORE = 'BEFORE';
 
     /**
-     * CRITERIA_BODY "string" - match mails with "string" in the body of the mail
+     * CRITERIA_BODY "string" - match mails with "string" in the body of the mail.
      */
-    const CRITERIA_BODY = "BODY";
+    const CRITERIA_BODY = 'BODY';
 
     /**
-     * CRITERIA_CC "string" - match mails with "string" in the Cc: field
+     * CRITERIA_CC "string" - match mails with "string" in the Cc: field.
      */
-    const CRITERIA_CC = "CC";
+    const CRITERIA_CC = 'CC';
 
     /**
-     * Match deleted mails
+     * Match deleted mails.
      */
-    const CRITERIA_DELETED = "DELETED";
+    const CRITERIA_DELETED = 'DELETED';
 
     /**
-     * Match mails with the \\FLAGGED (sometimes referred to as Important or Urgent) flag set
+     * Match mails with the \\FLAGGED (sometimes referred to as Important or Urgent) flag set.
      */
-    const CRITERIA_FLAGGED = "FLAGGED";
+    const CRITERIA_FLAGGED = 'FLAGGED';
 
     /**
-     * CRITERIA_FROM "string" - match mails with "string" in the From: field
+     * CRITERIA_FROM "string" - match mails with "string" in the From: field.
      */
-    const CRITERIA_FROM = "FROM";
+    const CRITERIA_FROM = 'FROM';
 
     /**
-     *  CRITERIA_KEYWORD "string" - match mails with "string" as a keyword
+     *  CRITERIA_KEYWORD "string" - match mails with "string" as a keyword.
      */
-    const CRITERIA_KEYWORD = "KEYWORD";
+    const CRITERIA_KEYWORD = 'KEYWORD';
 
     /**
-     * Match new mails
+     * Match new mails.
      */
-    const CRITERIA_NEW = "NEW";
+    const CRITERIA_NEW = 'NEW';
 
     /**
-     * Match old mails
+     * Match old mails.
      */
-    const CRITERIA_OLD = "OLD";
+    const CRITERIA_OLD = 'OLD';
 
     /**
-     * CRITERIA_ON "date" - match mails with Date: matching "date"
+     * CRITERIA_ON "date" - match mails with Date: matching "date".
      */
-    const CRITERIA_ON = "ON";
+    const CRITERIA_ON = 'ON';
 
     /**
-     * Match mails with the \\RECENT flag set
+     * Match mails with the \\RECENT flag set.
      */
-    const CRITERIA_RECENT = "RECENT";
+    const CRITERIA_RECENT = 'RECENT';
 
     /**
-     * Match mails that have been read (the \\SEEN flag is set)
+     * Match mails that have been read (the \\SEEN flag is set).
      */
-    const CRITERIA_SEEN = "SEEN";
+    const CRITERIA_SEEN = 'SEEN';
 
     /**
-     * CRITERIA_SINCE "date" - match mails with Date: after "date"
+     * CRITERIA_SINCE "date" - match mails with Date: after "date".
      */
-    const CRITERIA_SINCE = "SINCE";
+    const CRITERIA_SINCE = 'SINCE';
 
     /**
-     *  CRITERIA_SUBJECT "string" - match mails with "string" in the Subject:
+     *  CRITERIA_SUBJECT "string" - match mails with "string" in the Subject:.
      */
-    const CRITERIA_SUBJECT = "SUBJECT";
+    const CRITERIA_SUBJECT = 'SUBJECT';
 
     /**
-     * CRITERIA_TEXT "string" - match mails with text "string"
+     * CRITERIA_TEXT "string" - match mails with text "string".
      */
-    const CRITERIA_TEXT = "TEXT";
+    const CRITERIA_TEXT = 'TEXT';
 
     /**
-     * CRITERIA_TO "string" - match mails with "string" in the To:
+     * CRITERIA_TO "string" - match mails with "string" in the To:.
      */
-    const CRITERIA_TO = "TO";
+    const CRITERIA_TO = 'TO';
 
     /**
-     *  Match mails that have not been answered
+     *  Match mails that have not been answered.
      */
-    const CRITERIA_UNANSWERED = "UNANSWERED";
+    const CRITERIA_UNANSWERED = 'UNANSWERED';
 
     /**
-     * Match mails that are not deleted
+     * Match mails that are not deleted.
      */
-    const CRITERIA_UNDELETED = "UNDELETED";
+    const CRITERIA_UNDELETED = 'UNDELETED';
 
     /**
-     * Match mails that are not flagged
+     * Match mails that are not flagged.
      */
-    const CRITERIA_UNFLAGGED = "UNFLAGGED";
+    const CRITERIA_UNFLAGGED = 'UNFLAGGED';
 
     /**
-     * CRITERIA_UNKEYWORD "string" - match mails that do not have the keyword "string"
+     * CRITERIA_UNKEYWORD "string" - match mails that do not have the keyword "string".
      */
-    const CRITERIA_UNKEYWORD = "UNKEYWORD";
+    const CRITERIA_UNKEYWORD = 'UNKEYWORD';
 
     /**
-     * Match mails which have not been read yet
+     * Match mails which have not been read yet.
      */
-    const CRITERIA_UNSEEN = "UNSEEN";
+    const CRITERIA_UNSEEN = 'UNSEEN';
 
     /**
-     * Match mails which have not been read yet - alias of CRITERIA_UNSEEN
+     * Match mails which have not been read yet - alias of CRITERIA_UNSEEN.
      */
     const CRITERIA_UNREAD = 'UNSEEN';
 
     protected $imapPath;
     protected $imapFullPath;
     protected $imapStream;
-    protected $imapFolder = 'INBOX';
-    protected $imapOptions = 0;
+    protected $imapFolder     = 'INBOX';
+    protected $imapOptions    = 0;
     protected $imapRetriesNum = 0;
-    protected $imapParams = [];
+    protected $imapParams     = [];
     protected $serverEncoding = 'UTF-8';
     protected $attachmentsDir;
     protected $settings;
@@ -177,7 +180,7 @@ public function __construct(CoreParametersHelper $parametersHelper, PathsHelper
                 'port'       => '',
                 'password'   => '',
                 'user'       => '',
-                'encryption' => ''
+                'encryption' => '',
             ];
         }
 
@@ -195,12 +198,13 @@ public function __construct(CoreParametersHelper $parametersHelper, PathsHelper
     }
 
     /**
-     * Returns if a mailbox is configured
+     * Returns if a mailbox is configured.
      *
      * @param null $bundleKey
      * @param null $folderKey
      *
      * @return bool
+     *
      * @throws MailboxException
      */
     public function isConfigured($bundleKey = null, $folderKey = null)
@@ -209,19 +213,18 @@ public function isConfigured($bundleKey = null, $folderKey = null)
             try {
                 $this->switchMailbox($bundleKey, $folderKey);
             } catch (MailboxException $e) {
-
                 return false;
             }
         }
 
-        return (
+        return
             !empty($this->settings['host']) && !empty($this->settings['port']) && !empty($this->settings['user'])
             && !empty($this->settings['password'])
-        );
+        ;
     }
 
     /**
-     * Switch to another configured monitored mailbox
+     * Switch to another configured monitored mailbox.
      *
      * @param        $bundle
      * @param string $mailbox
@@ -243,7 +246,7 @@ public function switchMailbox($bundle, $mailbox = '')
     }
 
     /**
-     * Returns if this is a Gmail connection
+     * Returns if this is a Gmail connection.
      *
      * @return mixed
      */
@@ -253,7 +256,7 @@ public function isGmail()
     }
 
     /**
-     * Set imap path based on mailbox settings
+     * Set imap path based on mailbox settings.
      *
      * @param null $settings
      */
@@ -274,7 +277,7 @@ public function setImapPath($settings = null)
      */
     public function getImapPath($settings)
     {
-        /**
+        /*
          * @var $host
          * @var $port
          * @var $encryption
@@ -297,7 +300,7 @@ public function getImapPath($settings)
     }
 
     /**
-     * Override mailbox settings
+     * Override mailbox settings.
      *
      * @param array $settings
      */
@@ -311,18 +314,18 @@ public function setMailboxSettings(array $settings)
     }
 
     /**
-     * Get settings
+     * Get settings.
      *
      * @param        $bundle
      * @param string $mailbox
      *
      * @return mixed
+     *
      * @throws MailboxException
      */
     public function getMailboxSettings($bundle = null, $mailbox = '')
     {
         if ($bundle == null) {
-
             return $this->settings;
         }
 
@@ -344,7 +347,7 @@ public function getMailboxSettings($bundle = null, $mailbox = '')
     }
 
     /**
-     * Set custom connection arguments of imap_open method. See http://php.net/imap_open
+     * Set custom connection arguments of imap_open method. See http://php.net/imap_open.
      *
      * @param int   $options
      * @param int   $retriesNum
@@ -358,7 +361,7 @@ public function setConnectionArgs($options = 0, $retriesNum = 0, array $params =
     }
 
     /**
-     * Switch to another box
+     * Switch to another box.
      *
      * @param $folder
      */
@@ -373,7 +376,7 @@ public function switchFolder($folder)
     }
 
     /**
-     * Get IMAP mailbox connection stream
+     * Get IMAP mailbox connection stream.
      *
      * @return null|resource
      */
@@ -390,6 +393,7 @@ public function getImapStream()
 
     /**
      * @return resource
+     *
      * @throws MailboxException
      */
     protected function initImapStream()
@@ -411,13 +415,13 @@ protected function initImapStream()
     }
 
     /**
-     * Check if the stream is connected
+     * Check if the stream is connected.
      *
      * @return bool
      */
     protected function isConnected()
     {
-        return ($this->isConfigured() && $this->imapStream && is_resource($this->imapStream) && @imap_ping($this->imapStream));
+        return $this->isConfigured() && $this->imapStream && is_resource($this->imapStream) && @imap_ping($this->imapStream);
     }
 
     /**
@@ -461,7 +465,7 @@ public function statusMailbox()
     }
 
     /**
-     * Gets listing the folders
+     * Gets listing the folders.
      *
      * This function returns an object containing listing the folders.
      * The object has the following properties: messages, recent, unseen, uidnext, and uidvalidity.
@@ -473,11 +477,11 @@ public function getListingFolders()
         static $folders = [];
 
         if (!isset($folders[$this->imapFullPath]) && $this->isConfigured()) {
-            $tempFolders = @imap_list($this->getImapStream(), $this->imapPath, "*");
+            $tempFolders = @imap_list($this->getImapStream(), $this->imapPath, '*');
 
             if (!empty($tempFolders)) {
                 foreach ($tempFolders as $key => $folder) {
-                    $folder            = str_replace($this->imapPath, "", imap_utf8($folder));
+                    $folder            = str_replace($this->imapPath, '', imap_utf8($folder));
                     $tempFolders[$key] = $folder;
                 }
             } else {
@@ -491,7 +495,7 @@ public function getListingFolders()
     }
 
     /**
-     * Fetch unread messages
+     * Fetch unread messages.
      *
      * @param null $folder
      *
@@ -558,7 +562,7 @@ public function searchMailbox($criteria = self::CRITERIA_ALL)
      */
     public function saveMail($mailId, $filename = 'email.eml')
     {
-        return imap_savebody($this->getImapStream(), $filename, $mailId, "", FT_UID);
+        return imap_savebody($this->getImapStream(), $filename, $mailId, '', FT_UID);
     }
 
     /**
@@ -574,7 +578,7 @@ public function deleteMail($mailId)
     }
 
     /**
-     * Move mail to another box
+     * Move mail to another box.
      *
      * @param $mailId
      * @param $mailBox
@@ -672,7 +676,7 @@ public function markMailsAsImportant(array $mailIds)
      * Causes a store to add the specified flag to the flags set for the mails in the specified sequence.
      *
      * @param array  $mailsIds
-     * @param string $flag which you can set are \Seen, \Answered, \Flagged, \Deleted, and \Draft as defined by RFC2060.
+     * @param string $flag     which you can set are \Seen, \Answered, \Flagged, \Deleted, and \Draft as defined by RFC2060
      *
      * @return bool
      */
@@ -685,7 +689,7 @@ public function setFlag(array $mailsIds, $flag)
      * Cause a store to delete the specified flag to the flags set for the mails in the specified sequence.
      *
      * @param array  $mailsIds
-     * @param string $flag which you can set are \Seen, \Answered, \Flagged, \Deleted, and \Draft as defined by RFC2060.
+     * @param string $flag     which you can set are \Seen, \Answered, \Flagged, \Deleted, and \Draft as defined by RFC2060
      *
      * @return bool
      */
@@ -695,7 +699,7 @@ public function clearFlag(array $mailsIds, $flag)
     }
 
     /**
-     * Fetch mail headers for listed mails ids
+     * Fetch mail headers for listed mails ids.
      *
      * Returns an array of objects describing one mail header each. The object will only define a property if it exists. The possible properties are:
      *  subject - the mails subject
@@ -754,14 +758,13 @@ public function getMailsInfo(array $mailsIds)
      *
      * @return object Object with info | FALSE on failure
      */
-
     public function getMailboxInfo()
     {
         return imap_mailboxmsginfo($this->getImapStream());
     }
 
     /**
-     * Gets mails ids sorted by some criteria
+     * Gets mails ids sorted by some criteria.
      *
      * Criteria can be one (and only one) of the following constants:
      *  SORTDATE - mail Date
@@ -783,7 +786,7 @@ public function sortMails($criteria = SORTARRIVAL, $reverse = true)
     }
 
     /**
-     * Get mails count in mail box
+     * Get mails count in mail box.
      *
      * @return int
      */
@@ -793,7 +796,7 @@ public function countMails()
     }
 
     /**
-     * Retrieve the quota settings per user
+     * Retrieve the quota settings per user.
      *
      * @return array - FALSE in the case of call failure
      */
@@ -803,7 +806,7 @@ protected function getQuota()
     }
 
     /**
-     * Return quota limit in KB
+     * Return quota limit in KB.
      *
      * @return int - FALSE in the case of call failure
      */
@@ -818,7 +821,7 @@ public function getQuotaLimit()
     }
 
     /**
-     * Return quota usage in KB
+     * Return quota usage in KB.
      *
      * @return int - FALSE in the case of call failure
      */
@@ -833,7 +836,7 @@ public function getQuotaUsage()
     }
 
     /**
-     * Get mail data
+     * Get mail data.
      *
      * @param      $mailId
      * @param bool $markAsSeen
@@ -845,11 +848,11 @@ public function getMail($mailId, $markAsSeen = true)
         $header     = imap_fetchheader($this->getImapStream(), $mailId, FT_UID);
         $headObject = imap_rfc822_parse_headers($header);
 
-        $mail              = new Message();
-        $mail->id          = $mailId;
-        $mail->date        = date('Y-m-d H:i:s', isset($headObject->date) ? strtotime(preg_replace('/\(.*?\)/', '', $headObject->date)) : time());
-        $mail->subject     = isset($headObject->subject) ? $this->decodeMimeStr($headObject->subject, $this->serverEncoding) : null;
-        $mail->fromName    = isset($headObject->from[0]->personal) ? $this->decodeMimeStr($headObject->from[0]->personal, $this->serverEncoding)
+        $mail           = new Message();
+        $mail->id       = $mailId;
+        $mail->date     = date('Y-m-d H:i:s', isset($headObject->date) ? strtotime(preg_replace('/\(.*?\)/', '', $headObject->date)) : time());
+        $mail->subject  = isset($headObject->subject) ? $this->decodeMimeStr($headObject->subject, $this->serverEncoding) : null;
+        $mail->fromName = isset($headObject->from[0]->personal) ? $this->decodeMimeStr($headObject->from[0]->personal, $this->serverEncoding)
             : null;
         $mail->fromAddress = strtolower($headObject->from[0]->mailbox.'@'.$headObject->from[0]->host);
 
@@ -897,7 +900,7 @@ public function getMail($mailId, $markAsSeen = true)
         if (is_array($tempArray) && count($tempArray)) {
             $headers = [];
             foreach ($tempArray as $line) {
-                if (preg_match("/^X-(.*?): (.*?)$/is", trim($line), $matches)) {
+                if (preg_match('/^X-(.*?): (.*?)$/is', trim($line), $matches)) {
                     $headers['x-'.strtolower($matches[1])] = $matches[2];
                 }
             }
@@ -908,12 +911,12 @@ public function getMail($mailId, $markAsSeen = true)
     }
 
     /**
-     * @param Message      $mail
-     * @param              $partStructure
-     * @param              $partNum
-     * @param bool|true    $markAsSeen
-     * @param bool|false   $isDsn
-     * @param bool|false   $isFbl
+     * @param Message    $mail
+     * @param            $partStructure
+     * @param            $partNum
+     * @param bool|true  $markAsSeen
+     * @param bool|false $isDsn
+     * @param bool|false $isFbl
      */
     protected function initMailPart(Message $mail, $partStructure, $partNum, $markAsSeen = true, $isDsn = false, $isFbl = false)
     {
@@ -943,7 +946,7 @@ protected function initMailPart(Message $mail, $partStructure, $partNum, $markAs
 
         // attachments
         $attachmentId = $partStructure->ifid
-            ? trim($partStructure->id, " <>")
+            ? trim($partStructure->id, ' <>')
             : (isset($params['filename']) || isset($params['name']) ? mt_rand().mt_rand() : null);
 
         if ($attachmentId) {
@@ -958,13 +961,13 @@ protected function initMailPart(Message $mail, $partStructure, $partNum, $markAs
             $attachment->id   = $attachmentId;
             $attachment->name = $fileName;
             if ($this->attachmentsDir) {
-                $replace              = [
+                $replace = [
                     '/\s/'                   => '_',
                     '/[^0-9a-zа-яіїє_\.]/iu' => '',
                     '/_+/'                   => '_',
                     '/(^_)|(_$)/'            => '',
                 ];
-                $fileSysName          = preg_replace(
+                $fileSysName = preg_replace(
                     '~[\\\\/]~',
                     '',
                     $mail->id.'_'.$attachmentId.'_'.preg_replace(array_keys($replace), $replace, $fileName)
@@ -1005,11 +1008,11 @@ protected function initMailPart(Message $mail, $partStructure, $partNum, $markAs
                         switch ($reportType) {
                             case 'delivery-status':
                                 $mail->dsnMessage = trim($data);
-                                $isDsn = true;
+                                $isDsn            = true;
                                 break;
                             case 'feedback-report':
                                 $mail->fblMessage = trim($data);
-                                $isFbl = true;
+                                $isFbl            = true;
                                 break;
                             default:
                                 // Just pass through.
@@ -1018,11 +1021,9 @@ protected function initMailPart(Message $mail, $partStructure, $partNum, $markAs
                     case TYPEMESSAGE:
                         if ($isDsn || ($subtype == 'delivery-status')) {
                             $mail->dsnReport = $data;
-                        }
-                        elseif ($isFbl || ($subtype == 'feedback-report')) {
+                        } elseif ($isFbl || ($subtype == 'feedback-report')) {
                             $mail->fblReport = $data;
-                        }
-                        else {
+                        } else {
                             $mail->textPlain .= trim($data);
                         }
                         break;
@@ -1079,7 +1080,7 @@ protected function decodeMimeStr($string, $charset = 'utf-8')
     {
         $newString = '';
         $elements  = imap_mime_header_decode($string);
-        for ($i = 0; $i < count($elements); $i++) {
+        for ($i = 0; $i < count($elements); ++$i) {
             if ($elements[$i]->charset == 'default') {
                 $elements[$i]->charset = 'iso-8859-1';
             }
@@ -1144,7 +1145,7 @@ protected function convertStringEncoding($string, $fromEncoding, $toEncoding)
     }
 
     /**
-     * Close IMAP connection
+     * Close IMAP connection.
      */
     protected function disconnect()
     {
@@ -1158,7 +1159,7 @@ protected function disconnect()
     }
 
     /**
-     * Disconnect on destruct
+     * Disconnect on destruct.
      */
     public function __destruct()
     {
diff --git a/app/bundles/EmailBundle/MonitoredEmail/Message.php b/app/bundles/EmailBundle/MonitoredEmail/Message.php
index f32fb527600..0821a2bf91d 100644
--- a/app/bundles/EmailBundle/MonitoredEmail/Message.php
+++ b/app/bundles/EmailBundle/MonitoredEmail/Message.php
@@ -1,13 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  *
  * Modified from
+ *
  * @see    https://github.com/barbushin/php-imap
+ *
  * @author Barbushin Sergey http://linkedin.com/in/barbushin
  * @copyright BSD (three-clause)
  */
@@ -16,7 +19,6 @@
 
 class Message
 {
-
     public $id;
     public $date;
     public $subject;
@@ -24,10 +26,10 @@ class Message
     public $fromName;
     public $fromAddress;
 
-    public $to = array();
+    public $to = [];
     public $toString;
-    public $cc = array();
-    public $replyTo = array();
+    public $cc      = [];
+    public $replyTo = [];
 
     public $textPlain;
     public $textHtml;
@@ -35,10 +37,10 @@ class Message
     public $dsnMessage;
     public $fblReport;
     public $fblMessage;
-    public $xHeaders = array();
+    public $xHeaders = [];
 
     /** @var Attachment[] */
-    protected $attachments = array();
+    protected $attachments = [];
 
     /**
      * @param Attachment $attachment
@@ -57,14 +59,13 @@ public function getAttachments()
     }
 
     /**
-     * Get array of internal HTML links placeholders
+     * Get array of internal HTML links placeholders.
      *
      * @return array attachmentId => link placeholder
      */
     public function getInternalLinksPlaceholders()
     {
-        return preg_match_all('/=["\'](ci?d:([\w\.%*@-]+))["\']/i', $this->textHtml, $matches) ? array_combine($matches[2], $matches[1]) : array();
-
+        return preg_match_all('/=["\'](ci?d:([\w\.%*@-]+))["\']/i', $this->textHtml, $matches) ? array_combine($matches[2], $matches[1]) : [];
     }
 
     /**
diff --git a/app/bundles/EmailBundle/Security/Permissions/EmailPermissions.php b/app/bundles/EmailBundle/Security/Permissions/EmailPermissions.php
index 6af27c581e2..cdbd256ece0 100644
--- a/app/bundles/EmailBundle/Security/Permissions/EmailPermissions.php
+++ b/app/bundles/EmailBundle/Security/Permissions/EmailPermissions.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class EmailPermissions
- *
- * @package Mautic\EmailBundle\Security\Permissions
+ * Class EmailPermissions.
  */
 class EmailPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
@@ -35,7 +33,8 @@ public function __construct($params)
      *
      * @return string|void
      */
-    public function getName() {
+    public function getName()
+    {
         return 'email';
     }
 
@@ -50,4 +49,4 @@ public function buildForm(FormBuilderInterface &$builder, array $options, array
         $this->addStandardFormFields('email', 'categories', $builder, $data);
         $this->addExtendedFormFields('email', 'emails', $builder, $data);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Exception/BatchQueueMaxException.php b/app/bundles/EmailBundle/Swiftmailer/Exception/BatchQueueMaxException.php
index 5ab00eac7f2..3d1b62da9ff 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Exception/BatchQueueMaxException.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Exception/BatchQueueMaxException.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Exception;
 
-
 class BatchQueueMaxException extends \Exception
 {
     public function __construct($message = 'Max number of emails have been queued. Run flushQueue() first then queue() again', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Message/MauticMessage.php b/app/bundles/EmailBundle/Swiftmailer/Message/MauticMessage.php
index ee0d0239669..ba9bb74f450 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Message/MauticMessage.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Message/MauticMessage.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,16 +12,15 @@
 
 class MauticMessage extends \Swift_Message
 {
-
     /**
      * @var array
      */
-    protected $metadata   = array();
+    protected $metadata = [];
 
     /**
      * @var array
      */
-    protected $attachments = array();
+    protected $attachments = [];
 
     /**
      * Create a new Message.
@@ -47,7 +47,7 @@ public function addMetadata($email, array $metadata)
     }
 
     /**
-     * Get the metadata
+     * Get the metadata.
      *
      * @return array
      */
@@ -57,10 +57,11 @@ public function getMetadata()
     }
 
     /**
-     * Clears the metadata
+     * Clears the metadata.
      */
-    public function clearMetadata() {
-        $this->metadata = array();
+    public function clearMetadata()
+    {
+        $this->metadata = [];
     }
 
     /**
@@ -71,18 +72,18 @@ public function clearMetadata() {
      */
     public function addAttachment($filePath, $fileName = null, $contentType = null, $inline = false)
     {
-        $attachment = array(
+        $attachment = [
             'filePath'    => $filePath,
             'fileName'    => $fileName,
             'contentType' => $contentType,
-            'inline'      => $inline
-        );
+            'inline'      => $inline,
+        ];
 
         $this->attachments[] = $attachment;
     }
 
     /**
-     * Get attachments
+     * Get attachments.
      *
      * @return array
      */
@@ -92,10 +93,10 @@ public function getAttachments()
     }
 
     /**
-     * Clear attachments
+     * Clear attachments.
      */
     public function clearAttachments()
     {
-        $this->attachments = array();
+        $this->attachments = [];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenArrayTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenArrayTransport.php
index 549b7c5ac43..e5797c47694 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenArrayTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenArrayTransport.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\EmailBundle\Swiftmailer\Message\MauticMessage;
 
 /**
- * Class AbstractTokenArrayTransport
+ * Class AbstractTokenArrayTransport.
  */
 abstract class AbstractTokenArrayTransport implements InterfaceTokenTransport
 {
@@ -53,7 +54,6 @@ public function isStarted()
      */
     public function stop()
     {
-
     }
 
     /**
@@ -61,7 +61,6 @@ public function stop()
      */
     public function start()
     {
-
     }
 
     /**
@@ -91,39 +90,41 @@ protected function getDispatcher()
      * @param null                $failedRecipients
      *
      * @return int
+     *
      * @throws \Exception
      */
     abstract public function send(\Swift_Mime_Message $message, &$failedRecipients = null);
 
     /**
-     * Get the metadata from a MauticMessage
+     * Get the metadata from a MauticMessage.
      *
      * @return array
      */
     public function getMetadata()
     {
-        return ($this->message instanceof MauticMessage) ? $this->message->getMetadata() : array();
+        return ($this->message instanceof MauticMessage) ? $this->message->getMetadata() : [];
     }
 
     /**
-     * Get attachments from a MauticMessage
+     * Get attachments from a MauticMessage.
      *
      * @return array
      */
     public function getAttachments()
     {
-        return ($this->message instanceof MauticMessage) ? $this->message->getAttachments() : array();
+        return ($this->message instanceof MauticMessage) ? $this->message->getAttachments() : [];
     }
 
     /**
-     * Converts \Swift_Message into associative array
+     * Converts \Swift_Message into associative array.
+     *
+     * @param array      $search            If the mailer requires tokens in another format than Mautic's, pass array of Mautic tokens to replace
+     * @param array      $replace           If the mailer requires tokens in another format than Mautic's, pass array of replacement tokens
+     * @param bool|false $binaryAttachments True to convert file attachments to binary
      *
-     * @param array          $search   If the mailer requires tokens in another format than Mautic's, pass array of Mautic tokens to replace
-     * @param array          $replace  If the mailer requires tokens in another format than Mautic's, pass array of replacement tokens
-     * @param bool|false     $binaryAttachments True to convert file attachments to binary
      * @return array|\Swift_Message
      */
-    protected function messageToArray($search = array(), $replace = array(), $binaryAttachments = false)
+    protected function messageToArray($search = [], $replace = [], $binaryAttachments = false)
     {
         if (!empty($search)) {
             MailHelper::searchReplaceTokens($search, $replace, $this->message);
@@ -133,58 +134,58 @@ protected function messageToArray($search = array(), $replace = array(), $binary
         $fromEmail = current(array_keys($from));
         $fromName  = $from[$fromEmail];
 
-        $message = array(
-            'html'       => $this->message->getBody(),
-            'text'       => MailHelper::getPlainTextFromMessage($this->message),
-            'subject'    => $this->message->getSubject(),
-            'from'       => array(
+        $message = [
+            'html'    => $this->message->getBody(),
+            'text'    => MailHelper::getPlainTextFromMessage($this->message),
+            'subject' => $this->message->getSubject(),
+            'from'    => [
                 'name'  => $fromName,
-                'email' => $fromEmail
-            )
-        );
+                'email' => $fromEmail,
+            ],
+        ];
 
         // Generate the recipients
-        $message['recipients'] = array(
-            'to' => array(),
-            'cc' => array(),
-            'bcc' => array()
-        );
+        $message['recipients'] = [
+            'to'  => [],
+            'cc'  => [],
+            'bcc' => [],
+        ];
 
         $to = $this->message->getTo();
         foreach ($to as $email => $name) {
-            $message['recipients']['to'][$email] = array(
+            $message['recipients']['to'][$email] = [
                 'email' => $email,
-                'name'  => $name
-            );
+                'name'  => $name,
+            ];
         }
 
         $cc = $this->message->getCc();
         if (!empty($cc)) {
             foreach ($cc as $email => $name) {
-                $message['recipients']['cc'][$email] = array(
+                $message['recipients']['cc'][$email] = [
                     'email' => $email,
-                    'name'  => $name
-                );
+                    'name'  => $name,
+                ];
             }
         }
 
         $bcc = $this->message->getBcc();
         if (!empty($bcc)) {
             foreach ($bcc as $email => $name) {
-                $message['recipients']['bcc'][$email] = array(
+                $message['recipients']['bcc'][$email] = [
                     'email' => $email,
-                    'name'  => $name
-                );
+                    'name'  => $name,
+                ];
             }
         }
 
         $replyTo = $this->message->getReplyTo();
         if (!empty($replyTo)) {
             foreach ($replyTo as $email => $name) {
-                $message['replyTo'] = array(
+                $message['replyTo'] = [
                     'email' => $email,
-                    'name'  => $name
-                );
+                    'name'  => $name,
+                ];
             }
         }
 
@@ -195,14 +196,14 @@ protected function messageToArray($search = array(), $replace = array(), $binary
 
         // Attachments
         $children    = $this->message->getChildren();
-        $attachments = array();
+        $attachments = [];
         foreach ($children as $child) {
             if ($child instanceof \Swift_Attachment) {
-                $attachments[] = array(
+                $attachments[] = [
                     'type'    => $child->getContentType(),
                     'name'    => $child->getFilename(),
-                    'content' => $child->getEncoder()->encodeString($child->getBody())
-                );
+                    'content' => $child->getEncoder()->encodeString($child->getBody()),
+                ];
             }
         }
 
@@ -229,11 +230,11 @@ protected function messageToArray($search = array(), $replace = array(), $binary
                                 $swiftAttachment->setDisposition('inline');
                             }
 
-                            $message['attachments'][] = array(
+                            $message['attachments'][] = [
                                 'type'    => $swiftAttachment->getContentType(),
                                 'name'    => $swiftAttachment->getFilename(),
-                                'content' => $swiftAttachment->getEncoder()->encodeString($swiftAttachment->getBody())
-                            );
+                                'content' => $swiftAttachment->getEncoder()->encodeString($swiftAttachment->getBody()),
+                            ];
                         } catch (\Exception $e) {
                             error_log($e);
                         }
@@ -245,8 +246,8 @@ protected function messageToArray($search = array(), $replace = array(), $binary
             $message['file_attachments']   = $this->getAttachments();
         }
 
-        $message['headers'] = array();
-        $headers = $this->message->getHeaders()->getAll();
+        $message['headers'] = [];
+        $headers            = $this->message->getHeaders()->getAll();
         /** @var \Swift_Mime_Header $header */
         foreach ($headers as $header) {
             if ($header->getFieldType() == \Swift_Mime_Header::TYPE_TEXT) {
@@ -285,4 +286,4 @@ protected function throwException($exception)
             throw $exception;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenHttpTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenHttpTransport.php
index 9fd2ae56edd..0a76aafacab 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenHttpTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenHttpTransport.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Transport;
 
 /**
- * Class AbstractTokenHttpTransport
+ * Class AbstractTokenHttpTransport.
  */
 abstract class AbstractTokenHttpTransport extends AbstractTokenArrayTransport implements \Swift_Transport, InterfaceTokenTransport
 {
@@ -30,33 +31,34 @@ abstract class AbstractTokenHttpTransport extends AbstractTokenArrayTransport im
     private $apiKey;
 
     /**
-     * Return an array of headers for the POST
+     * Return an array of headers for the POST.
      *
      * @return array
      */
     abstract protected function getHeaders();
 
     /**
-     * Return the payload for the POST
+     * Return the payload for the POST.
      *
      * @return mixed
      */
     abstract protected function getPayload();
 
     /**
-     * Return the URL for the API endpoint
+     * Return the URL for the API endpoint.
      *
      * @return string
      */
     abstract protected function getApiEndpoint();
 
     /**
-     * Analyze the output of the API response and return any addresses that FAILED to send
+     * Analyze the output of the API response and return any addresses that FAILED to send.
      *
      * @param $response
      * @param $curlInfo
      *
      * @throws \Swift_TransportException
+     *
      * @return array
      */
     abstract protected function handlePostResponse($response, $curlInfo);
@@ -118,6 +120,7 @@ public function setApiKey($apiKey)
      * @param null                $failedRecipients
      *
      * @return int
+     *
      * @throws \Swift_TransportException
      */
     public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
@@ -152,7 +155,7 @@ public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
 
                     $message->generateId();
 
-                    return ($count - count($failed));
+                    return $count - count($failed);
                 } else {
                     $evt->setResult(\Swift_Events_SendEvent::RESULT_SUCCESS);
                     $evt->setFailedRecipients($failedRecipients);
@@ -182,14 +185,15 @@ public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
     }
 
     /**
-     * POST payload to API endpoint
+     * POST payload to API endpoint.
      *
      * @param array $settings
      *
      * @return array of failed addresses
+     *
      * @throws \Swift_TransportException
      */
-    protected function post($settings = array())
+    protected function post($settings = [])
     {
         $payload  = empty($settings['payload']) ? $this->getPayload() : $settings['payload'];
         $headers  = empty($settings['headers']) ? $this->getHeaders() : $settings['headers'];
@@ -214,13 +218,12 @@ protected function post($settings = array())
         $response = curl_exec($ch);
         $info     = curl_getinfo($ch);
 
-        if(curl_error($ch)) {
-            $this->throwException("API call to $endpoint failed: " . curl_error($ch));
+        if (curl_error($ch)) {
+            $this->throwException("API call to $endpoint failed: ".curl_error($ch));
         }
 
         curl_close($ch);
 
         return $this->handlePostResponse($response, $info);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenSmtpTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenSmtpTransport.php
index 02e1a1353f0..0827974db5c 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenSmtpTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/AbstractTokenSmtpTransport.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\EmailBundle\Swiftmailer\Message\MauticMessage;
 
 /**
- * Class AbstractBatchTransport
+ * Class AbstractBatchTransport.
  */
 abstract class AbstractTokenSmtpTransport extends \Swift_SmtpTransport implements InterfaceTokenTransport
 {
@@ -27,9 +28,7 @@ abstract class AbstractTokenSmtpTransport extends \Swift_SmtpTransport implement
     protected $factory;
 
     /**
-     * Do whatever is necessary to $this->message in order to deliver a batched payload. i.e. add custom headers, etc
-     *
-     * @return void
+     * Do whatever is necessary to $this->message in order to deliver a batched payload. i.e. add custom headers, etc.
      */
     abstract protected function prepareMessage();
 
@@ -38,6 +37,7 @@ abstract protected function prepareMessage();
      * @param null                $failedRecipients
      *
      * @return int
+     *
      * @throws \Exception
      */
     public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
@@ -50,23 +50,23 @@ public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
     }
 
     /**
-     * Get the metadata from a MauticMessage
+     * Get the metadata from a MauticMessage.
      *
      * @return array
      */
     public function getMetadata()
     {
-        return ($this->message instanceof MauticMessage) ? $this->message->getMetadata() : array();
+        return ($this->message instanceof MauticMessage) ? $this->message->getMetadata() : [];
     }
 
     /**
-     * Get attachments from a MauticMessage
+     * Get attachments from a MauticMessage.
      *
      * @return array
      */
     public function getAttachments()
     {
-        return ($this->message instanceof MauticMessage) ? $this->message->getAttachments() : array();
+        return ($this->message instanceof MauticMessage) ? $this->message->getAttachments() : [];
     }
 
     /**
@@ -76,4 +76,4 @@ public function setMauticFactory(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/AmazonTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/AmazonTransport.php
index ac293c96a00..9f1ea771925 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/AmazonTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/AmazonTransport.php
@@ -1,33 +1,33 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Transport;
 
 use Joomla\Http\Exception\UnexpectedResponseException;
+use Joomla\Http\Http;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Symfony\Component\HttpFoundation\Request;
-use Joomla\Http\Http;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
- * Class AmazonTransport
+ * Class AmazonTransport.
  */
 class AmazonTransport extends \Swift_SmtpTransport implements InterfaceCallbackTransport
 {
-
     private $httpClient;
 
     /**
      * {@inheritdoc}
      */
-    public function __construct($host = 'localhost', Http $httpClient)
+    public function __construct($host, Http $httpClient)
     {
         parent::__construct($host, 587, 'tls');
         $this->setAuthMode('login');
@@ -35,7 +35,7 @@ public function __construct($host = 'localhost', Http $httpClient)
     }
 
     /**
-     * Returns a "transport" string to match the URL path /mailer/{transport}/callback
+     * Returns a "transport" string to match the URL path /mailer/{transport}/callback.
      *
      * @return mixed
      */
@@ -45,7 +45,7 @@ public function getCallbackPath()
     }
 
     /**
-     * Handle bounces & complaints from Amazon
+     * Handle bounces & complaints from Amazon.
      *
      * @param Request       $request
      * @param MauticFactory $factory
@@ -55,36 +55,39 @@ public function getCallbackPath()
     public function handleCallbackResponse(Request $request, MauticFactory $factory)
     {
         $translator = $factory->getTranslator();
-        $logger = $factory->getLogger();
-        $logger->debug("Receiving webhook from Amazon");
+        $logger     = $factory->getLogger();
+        $logger->debug('Receiving webhook from Amazon');
+
+        $payload = json_decode($request->getContent(), true);
 
-        $payload = json_decode($request->getContent(), TRUE);
         return $this->processJsonPayload($payload, $logger, $translator);
     }
 
     /**
-     * Process json request from Amazon SES
+     * Process json request from Amazon SES.
      *
      * http://docs.aws.amazon.com/ses/latest/DeveloperGuide/best-practices-bounces-complaints.html
      *
      * @param array $payload from Amazon SES
      * @param $logger
      * @param $translator
+     *
      * @return array with bounced and unsubscribed email addresses
      */
-    public function processJsonPayload(array $payload, $logger, $translator) {
+    public function processJsonPayload(array $payload, $logger, $translator)
+    {
 
         // Data structure that Mautic expects to be returned from this callback
-        $rows = array(
-            DoNotContact::BOUNCED => array(
-                'hashIds' => array(),
-                'emails' => array()
-            ),
-            DoNotContact::UNSUBSCRIBED => array(
-                'hashIds' => array(),
-                'emails' => array()
-            )
-        );
+        $rows = [
+            DoNotContact::BOUNCED => [
+                'hashIds' => [],
+                'emails'  => [],
+            ],
+            DoNotContact::UNSUBSCRIBED => [
+                'hashIds' => [],
+                'emails'  => [],
+            ],
+        ];
 
         if (!isset($payload['Type'])) {
             throw new HttpException(400, "Key 'Type' not found in payload ");
@@ -94,69 +97,62 @@ public function processJsonPayload(array $payload, $logger, $translator) {
             // Confirm Amazon SNS subscription by calling back the SubscribeURL from the playload
             $requestFailed = false;
             try {
-                $response =  $this->httpClient->get($payload['SubscribeURL']);
+                $response = $this->httpClient->get($payload['SubscribeURL']);
                 if ($response->code == 200) {
                     $logger->info('Callback to SubscribeURL from Amazon SNS successfully');
-                }
-                else {
+                } else {
                     $requestFailed = true;
-                    $reason = "HTTP Code ".$response->code.", ".$response->body;
+                    $reason        = 'HTTP Code '.$response->code.', '.$response->body;
                 }
-            }
-            catch (UnexpectedResponseException $e) {
+            } catch (UnexpectedResponseException $e) {
                 $requestFailed = true;
-                    $reason = $e->getMessage();
+                $reason        = $e->getMessage();
             }
 
             if ($requestFailed) {
-                $logger->error("Callback to SubscribeURL from Amazon SNS failed, reason: " . $reason);
+                $logger->error('Callback to SubscribeURL from Amazon SNS failed, reason: '.$reason);
             }
-
-        }
-        elseif ($payload['Type'] == 'Notification') {
-
+        } elseif ($payload['Type'] == 'Notification') {
             $message = json_decode($payload['Message'], true);
 
-            # only deal with hard bounces
-            if ($message['notificationType'] == "Bounce" && $message['bounce']['bounceType'] == "Permanent") {
+            // only deal with hard bounces
+            if ($message['notificationType'] == 'Bounce' && $message['bounce']['bounceType'] == 'Permanent') {
                 // Get bounced recipients in an array
                 $bouncedRecipients = $message['bounce']['bouncedRecipients'];
                 foreach ($bouncedRecipients as $bouncedRecipient) {
                     $rows[DoNotContact::BOUNCED]['emails'][$bouncedRecipient['emailAddress']] = $bouncedRecipient['diagnosticCode'];
-                    $logger->debug("Mark email '" . $bouncedRecipient['emailAddress'] . "' as bounced, reason: " . $bouncedRecipient['diagnosticCode']);
+                    $logger->debug("Mark email '".$bouncedRecipient['emailAddress']."' as bounced, reason: ".$bouncedRecipient['diagnosticCode']);
                 }
             }
-            # unsubscribe customer that complain about spam at their mail provider
+            // unsubscribe customer that complain about spam at their mail provider
             elseif ($message['notificationType'] == 'Complaint') {
                 foreach ($message['complaint']['complainedRecipients'] as $complainedRecipient) {
                     $reason = null;
                     if (isset($message['complaint']['complaintFeedbackType'])) {
-                        # http://docs.aws.amazon.com/ses/latest/DeveloperGuide/notification-contents.html#complaint-object
+                        // http://docs.aws.amazon.com/ses/latest/DeveloperGuide/notification-contents.html#complaint-object
                         switch ($message['complaint']['complaintFeedbackType']) {
-                            case "abuse":
-                                $reason = $translator->trans("mautic.email.complaint.reason.abuse");
+                            case 'abuse':
+                                $reason = $translator->trans('mautic.email.complaint.reason.abuse');
                                 break;
-                            case "fraud":
-                                $reason = $translator->trans("mautic.email.complaint.reason.fraud");
+                            case 'fraud':
+                                $reason = $translator->trans('mautic.email.complaint.reason.fraud');
                                 break;
-                            case "virus":
-                                $reason = $translator->trans("mautic.email.complaint.reason.virus");
+                            case 'virus':
+                                $reason = $translator->trans('mautic.email.complaint.reason.virus');
                                 break;
                         }
                     }
 
                     if ($reason == null) {
-                        $reason = $translator->trans("mautic.email.complaint.reason.unkown");
+                        $reason = $translator->trans('mautic.email.complaint.reason.unkown');
                     }
 
                     $rows[DoNotContact::UNSUBSCRIBED]['emails'][$complainedRecipient['emailAddress']] = $reason;
-                    $logger->debug("Unsubscribe email '" . $complainedRecipient['emailAddress'] . "'");
+                    $logger->debug("Unsubscribe email '".$complainedRecipient['emailAddress']."'");
                 }
             }
-
         }
 
         return $rows;
     }
-
 }
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceCallbackTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceCallbackTransport.php
index 9f6d573e828..fbc373a9a10 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceCallbackTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceCallbackTransport.php
@@ -1,35 +1,34 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Transport;
 
-
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\HttpFoundation\Request;
 
 interface InterfaceCallbackTransport
 {
-
     /**
-     * Returns a "transport" string to match the URL path /mailer/{transport}/callback
+     * Returns a "transport" string to match the URL path /mailer/{transport}/callback.
      *
      * @return mixed
      */
     public function getCallbackPath();
 
     /**
-     * Handle response
+     * Handle response.
      *
-     * @param Request $request
+     * @param Request       $request
      * @param MauticFactory $factory
      *
      * @return array array('bounces' => array('hashID' => 'reason', ...));
      */
     public function handleCallbackResponse(Request $request, MauticFactory $factory);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceTokenTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceTokenTransport.php
index 3dffd2fff45..72ccad95a11 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceTokenTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/InterfaceTokenTransport.php
@@ -1,38 +1,38 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Transport;
 
 /**
- * Tokenized Transport Support
+ * Tokenized Transport Support.
  *
  * Interface InterfaceTokenTransport
  */
 interface InterfaceTokenTransport
 {
-
     /**
-     * Function required to check that $this->message is instanceof MauticMessage, return $this->message->getMetadata() if it is and array() if not
+     * Function required to check that $this->message is instanceof MauticMessage, return $this->message->getMetadata() if it is and array() if not.
      *
      * @return mixed
      */
-    function getMetadata();
+    public function getMetadata();
 
     /**
-     * Return the max number of to addresses allowed per batch.  If there is no limit, return 0
+     * Return the max number of to addresses allowed per batch.  If there is no limit, return 0.
      *
      * @return int
      */
-    function getMaxBatchLimit();
+    public function getMaxBatchLimit();
 
     /**
-     * Get the count for the max number of recipients per batch
+     * Get the count for the max number of recipients per batch.
      *
      * @param \Swift_Message $message
      * @param int            $toBeAdded Number of emails about to be added
@@ -40,5 +40,5 @@ function getMaxBatchLimit();
      *
      * @return mixed
      */
-    function getBatchRecipientCount(\Swift_Message $message, $toBeAdded = 1, $type = 'to');
-}
\ No newline at end of file
+    public function getBatchRecipientCount(\Swift_Message $message, $toBeAdded = 1, $type = 'to');
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/MandrillTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/MandrillTransport.php
index 72b9a4c197d..b3948d0fbcb 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/MandrillTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/MandrillTransport.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class MandrillTransport
+ * Class MandrillTransport.
  */
 class MandrillTransport extends AbstractTokenHttpTransport implements InterfaceCallbackTransport
 {
@@ -35,7 +36,7 @@ protected function getPayload()
 
             $mandrillMergeVars = $mandrillMergePlaceholders = [];
             foreach ($mauticTokens as $token) {
-                $mandrillMergeVars[$token]         = strtoupper(preg_replace("/[^a-z0-9]+/i", "", $token));
+                $mandrillMergeVars[$token]         = strtoupper(preg_replace('/[^a-z0-9]+/i', '', $token));
                 $mandrillMergePlaceholders[$token] = '*|'.$mandrillMergeVars[$token].'|*';
             }
         }
@@ -85,7 +86,7 @@ protected function getPayload()
                     if (!empty($metadata[$rcpt['email']]['tokens'])) {
                         $mergeVars = [
                             'rcpt' => $rcpt['email'],
-                            'vars' => []
+                            'vars' => [],
                         ];
 
                         // This must not be included for CC and BCCs
@@ -96,8 +97,8 @@ protected function getPayload()
                                 $trackingPixelToken = [
                                     [
                                         'name'    => $mandrillMergeVars[$token],
-                                        'content' => $value
-                                    ]
+                                        'content' => $value,
+                                    ],
                                 ];
 
                                 continue;
@@ -105,7 +106,7 @@ protected function getPayload()
 
                             $mergeVars['vars'][] = [
                                 'name'    => $mandrillMergeVars[$token],
-                                'content' => $value
+                                'content' => $value,
                             ];
                         }
 
@@ -118,12 +119,12 @@ protected function getPayload()
                                 [
                                     [
                                         'name'    => 'HTMLCCEMAILHEADER',
-                                        'content' => ''
+                                        'content' => '',
                                     ],
                                     [
                                         'name'    => 'TEXTCCEMAILHEADER',
-                                        'content' => ''
-                                    ]
+                                        'content' => '',
+                                    ],
                                 ]
                             );
                         } else {
@@ -144,23 +145,23 @@ protected function getPayload()
                                         'content' => $translator->trans(
                                                 'mautic.core.email.cc.copy',
                                                 [
-                                                    '%email%' => $rcpt['email']
+                                                    '%email%' => $rcpt['email'],
                                                 ]
-                                            )."<br /><br />"
+                                            ).'<br /><br />',
                                     ],
                                     [
                                         'name'    => 'TEXTCCEMAILHEADER',
                                         'content' => $translator->trans(
                                                 'mautic.core.email.cc.copy',
                                                 [
-                                                    '%email%' => $rcpt['email']
+                                                    '%email%' => $rcpt['email'],
                                                 ]
-                                            )."\n\n"
+                                            )."\n\n",
                                     ],
                                     [
                                         'name'    => 'TRACKINGPIXEL',
-                                        'content' => MailHelper::getBlankPixel()
-                                    ]
+                                        'content' => MailHelper::getBlankPixel(),
+                                    ],
                                 ]
                             );
 
@@ -197,7 +198,7 @@ protected function getPayload()
                     if (!empty($metadata[$rcpt['email']])) {
                         $rcptMetadata[] = [
                             'rcpt'   => $rcpt['email'],
-                            'values' => $metadata[$rcpt['email']]
+                            'values' => $metadata[$rcpt['email']],
                         ];
                         unset($metadata[$rcpt['email']]);
                     }
@@ -225,7 +226,7 @@ protected function getPayload()
         $payload = json_encode(
             [
                 'key'     => $this->getPassword(),
-                'message' => $message
+                'message' => $message,
             ]
         );
 
@@ -237,7 +238,6 @@ protected function getPayload()
      */
     protected function getHeaders()
     {
-
     }
 
     /**
@@ -265,9 +265,9 @@ public function start()
                 'url'     => 'https://mandrillapp.com/api/1.0/users/ping.json',
                 'payload' => json_encode(
                     [
-                        'key' => $key
+                        'key' => $key,
                     ]
-                )
+                ),
             ]
         );
 
@@ -281,6 +281,7 @@ public function start()
      * @param $info
      *
      * @return array
+     *
      * @throws \Swift_TransportException
      */
     protected function handlePostResponse($response, $info)
@@ -310,14 +311,14 @@ protected function handlePostResponse($response, $info)
         $return     = [];
         $hasBounces = false;
         $bounces    = [
-            DoNotContact::BOUNCED      => [
-                'emails' => []
+            DoNotContact::BOUNCED => [
+                'emails' => [],
             ],
             DoNotContact::UNSUBSCRIBED => [
-                'emails' => []
-            ]
+                'emails' => [],
+            ],
         ];
-        $metadata   = $this->getMetadata();
+        $metadata = $this->getMetadata();
 
         if (is_array($response)) {
             if (isset($response['status']) && $response['status'] == 'error') {
@@ -342,7 +343,7 @@ protected function handlePostResponse($response, $info)
 
                             $bounces[$type]['emails'][$stat['email']] = [
                                 'leadId' => $leadId,
-                                'reason' => ('unsubscribed' == $type) ? $type : str_replace('-', '_', $stat['reject_reason'])
+                                'reason' => ('unsubscribed' == $type) ? $type : str_replace('-', '_', $stat['reject_reason']),
                             ];
                         }
                     }
@@ -370,9 +371,8 @@ protected function handlePostResponse($response, $info)
         return $return;
     }
 
-
     /**
-     * Returns a "transport" string to match the URL path /mailer/{transport}/callback
+     * Returns a "transport" string to match the URL path /mailer/{transport}/callback.
      *
      * @return mixed
      */
@@ -404,7 +404,7 @@ public function getBatchRecipientCount(\Swift_Message $message, $toBeAdded = 1,
     }
 
     /**
-     * Handle response
+     * Handle response.
      *
      * @param Request       $request
      * @param MauticFactory $factory
@@ -416,14 +416,14 @@ public function handleCallbackResponse(Request $request, MauticFactory $factory)
         $mandrillEvents = $request->request->get('mandrill_events');
         $mandrillEvents = json_decode($mandrillEvents, true);
         $rows           = [
-            DoNotContact::BOUNCED      => [
+            DoNotContact::BOUNCED => [
                 'hashIds' => [],
-                'emails'  => []
+                'emails'  => [],
             ],
             DoNotContact::UNSUBSCRIBED => [
                 'hashIds' => [],
-                'emails'  => []
-            ]
+                'emails'  => [],
+            ],
         ];
 
         if (is_array($mandrillEvents)) {
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/PostmarkTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/PostmarkTransport.php
index 359ece1858f..5fa5fa41e62 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/PostmarkTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/PostmarkTransport.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Transport;
 
 /**
- * Class PostmarkTransport
+ * Class PostmarkTransport.
  */
 class PostmarkTransport extends \Swift_SmtpTransport
 {
@@ -23,4 +24,4 @@ public function __construct($host = 'localhost', $port = 25, $security = null)
 
         $this->setAuthMode('login');
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/SendgridTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/SendgridTransport.php
index ddfdabdc586..33b9ec0870d 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/SendgridTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/SendgridTransport.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Transport;
 
 /**
- * Class SendgridTransport
+ * Class SendgridTransport.
  */
 class SendgridTransport extends \Swift_SmtpTransport
 {
diff --git a/app/bundles/EmailBundle/Swiftmailer/Transport/SparkpostTransport.php b/app/bundles/EmailBundle/Swiftmailer/Transport/SparkpostTransport.php
index a0cfda02c46..e2091fc7fe6 100644
--- a/app/bundles/EmailBundle/Swiftmailer/Transport/SparkpostTransport.php
+++ b/app/bundles/EmailBundle/Swiftmailer/Transport/SparkpostTransport.php
@@ -1,29 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ *
  * @see         https://github.com/SlowProg/SparkPostSwiftMailer/blob/master/SwiftMailer/SparkPostTransport.php for additional source reference
  */
 
 namespace Mautic\EmailBundle\Swiftmailer\Transport;
 
+use GuzzleHttp\Client;
+use Http\Adapter\Guzzle6\Client as GuzzleAdapter;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Entity\DoNotContact;
-use SparkPost\APIResponseException;
 use SparkPost\SparkPost;
-use GuzzleHttp\Client;
-use Http\Adapter\Guzzle6\Client as GuzzleAdapter;
 use SparkPost\SparkPostException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Class SparkpostTransport
- * The referrence class for this was provided by
- *
+ * The referrence class for this was provided by.
  */
 class SparkpostTransport extends AbstractTokenArrayTransport implements \Swift_Transport, InterfaceTokenTransport, InterfaceCallbackTransport
 {
@@ -95,6 +95,7 @@ public function start()
 
     /**
      * @return SparkPost
+     *
      * @throws \Swift_TransportException
      */
     protected function createSparkPost()
@@ -111,7 +112,7 @@ protected function createSparkPost()
 
     /**
      * @param \Swift_Mime_Message $message
-     * @param null               $failedRecipients
+     * @param null                $failedRecipients
      *
      * @return int Number of messages sent
      */
@@ -121,7 +122,6 @@ public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
         if ($event = $this->getDispatcher()->createSendEvent($this, $message)) {
             $this->getDispatcher()->dispatchEvent($event, 'beforeSendPerformed');
             if ($event->bubbleCancelled()) {
-
                 return 0;
             }
         }
@@ -153,11 +153,12 @@ public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
     }
 
     /**
-     * https://jsapi.apiary.io/apis/sparkpostapi/introduction/subaccounts-coming-to-an-api-near-you-in-april!.html
+     * https://jsapi.apiary.io/apis/sparkpostapi/introduction/subaccounts-coming-to-an-api-near-you-in-april!.html.
      *
      * @param \Swift_Mime_Message $message
      *
      * @return array SparkPost Send Message
+     *
      * @throws \Swift_SwiftException
      */
     public function getSparkPostMessage(\Swift_Mime_Message $message)
@@ -167,7 +168,7 @@ public function getSparkPostMessage(\Swift_Mime_Message $message)
 
         $this->message = $message;
         $metadata      = $this->getMetadata();
-        $mauticTokens  = $mergeVars = $mergeVarPlaceholders = [];
+        $mauticTokens  = $mergeVars  = $mergeVarPlaceholders  = [];
 
         // Sparkpost uses {{ name }} for tokens so Mautic's need to be converted; although using their {{{ }}} syntax to prevent HTML escaping
         if (!empty($metadata)) {
@@ -177,7 +178,7 @@ public function getSparkPostMessage(\Swift_Mime_Message $message)
 
             $mergeVars = $mergeVarPlaceholders = [];
             foreach ($mauticTokens as $token) {
-                $mergeVars[$token]            = strtoupper(preg_replace("/[^a-z0-9]+/i", "", $token));
+                $mergeVars[$token]            = strtoupper(preg_replace('/[^a-z0-9]+/i', '', $token));
                 $mergeVarPlaceholders[$token] = '{{{ '.$mergeVars[$token].' }}}';
             }
         }
@@ -186,7 +187,6 @@ public function getSparkPostMessage(\Swift_Mime_Message $message)
 
         // Sparkpost requires a subject
         if (empty($message['subject'])) {
-
             throw new \Exception($this->translator->trans('mautic.email.subject.notblank', [], 'validators'));
         }
 
@@ -202,7 +202,7 @@ public function getSparkPostMessage(\Swift_Mime_Message $message)
             $recipient = [
                 'address'           => $to,
                 'substitution_data' => [],
-                'metadata'          => []
+                'metadata'          => [],
             ];
 
             if (isset($metadata[$to['email']])) {
@@ -234,9 +234,9 @@ public function getSparkPostMessage(\Swift_Mime_Message $message)
         }
 
         $content = [
-            'from'           => (!empty($message['from']['name'])) ? $message['from']['name'].' <'.$message['from']['email'].'>'
+            'from' => (!empty($message['from']['name'])) ? $message['from']['name'].' <'.$message['from']['email'].'>'
                 : $message['from']['email'],
-            'subject'        => $message['subject'],
+            'subject' => $message['subject'],
         ];
 
         // Sparkpost will set parts regardless if they are empty or not
@@ -249,11 +249,11 @@ public function getSparkPostMessage(\Swift_Mime_Message $message)
         }
 
         $sparkPostMessage = [
-            'content'        => $content,
-            'recipients'     => $recipients,
-            'headers'        => $message['headers'],
-            'inline_css'     => $inlineCss,
-            'tags'           => $tags
+            'content'    => $content,
+            'recipients' => $recipients,
+            'headers'    => $message['headers'],
+            'inline_css' => $inlineCss,
+            'tags'       => $tags,
         ];
 
         if (!empty($message['recipients']['cc'])) {
@@ -265,7 +265,6 @@ public function getSparkPostMessage(\Swift_Mime_Message $message)
         }
 
         if (!empty($message['attachments'])) {
-
             $sparkPostMessage['attachments'] = $message['attachments'];
         }
 
@@ -289,11 +288,11 @@ public function getMaxBatchLimit()
      */
     public function getBatchRecipientCount(\Swift_Message $message, $toBeAdded = 1, $type = 'to')
     {
-        return (count($message->getTo()) + count($message->getCc()) + count($message->getBcc()) + $toBeAdded);
+        return count($message->getTo()) + count($message->getCc()) + count($message->getBcc()) + $toBeAdded;
     }
 
     /**
-     * Returns a "transport" string to match the URL path /mailer/{transport}/callback
+     * Returns a "transport" string to match the URL path /mailer/{transport}/callback.
      *
      * @return mixed
      */
@@ -303,9 +302,9 @@ public function getCallbackPath()
     }
 
     /**
-     * Handle response
+     * Handle response.
      *
-     * @param Request $request
+     * @param Request       $request
      * @param MauticFactory $factory
      *
      * @return array array('bounces' => array('hashID' => 'reason', ...));
@@ -317,12 +316,12 @@ public function handleCallbackResponse(Request $request, MauticFactory $factory)
         $rows = [
             DoNotContact::BOUNCED => [
                 'hashIds' => [],
-                'emails'  => []
+                'emails'  => [],
             ],
             DoNotContact::UNSUBSCRIBED => [
                 'hashIds' => [],
-                'emails'  => []
-            ]
+                'emails'  => [],
+            ],
         ];
 
         foreach ($payload as $msys) {
@@ -332,13 +331,11 @@ public function handleCallbackResponse(Request $request, MauticFactory $factory)
             } elseif (isset($msys['unsubscribe_event'])) {
                 $event = $msys['unsubscribe_event'];
             } else {
-
                 continue;
             }
 
             // Process events sent from Mautic
             if (!isset($event['rcpt_meta']['hashId'])) {
-
                 continue;
             }
 
diff --git a/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php b/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php
index da6396d389d..7d3cb3c0379 100644
--- a/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php
+++ b/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Tests\Helper;
 
-
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\EmailBundle\Swiftmailer\Exception\BatchQueueMaxException;
 use Mautic\EmailBundle\Tests\Helper\Transport\BatchTransport;
@@ -29,7 +29,7 @@ public function testQueueModeThrowsExceptionWhenBatchLimitHit()
                 $this->returnValueMap(
                     [
                         ['mailer_return_path', false, null],
-                        ['mailer_spool_type', false, 'memory']
+                        ['mailer_spool_type', false, 'memory'],
                     ]
                 )
             );
@@ -54,7 +54,7 @@ public function testQueueModeDisabledDoesNotThrowsExceptionWhenBatchLimitHit()
                 $this->returnValueMap(
                     [
                         ['mailer_return_path', false, null],
-                        ['mailer_spool_type', false, 'memory']
+                        ['mailer_spool_type', false, 'memory'],
                     ]
                 )
             );
@@ -74,4 +74,4 @@ public function testQueueModeDisabledDoesNotThrowsExceptionWhenBatchLimitHit()
         // Otherwise success
         $this->assertTrue(true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php b/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php
index bf811317325..4fc32797b21 100644
--- a/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php
+++ b/app/bundles/EmailBundle/Tests/Helper/Transport/BatchTransport.php
@@ -3,7 +3,7 @@
  * Created by PhpStorm.
  * User: alan
  * Date: 9/14/16
- * Time: 5:42 PM
+ * Time: 5:42 PM.
  */
 
 namespace Mautic\EmailBundle\Tests\Helper\Transport;
@@ -14,7 +14,6 @@ class BatchTransport extends AbstractTokenArrayTransport implements \Swift_Trans
 {
     public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
     {
-
     }
 
     public function getMaxBatchLimit()
@@ -26,4 +25,4 @@ public function getBatchRecipientCount(\Swift_Message $message, $toBeAdded = 1,
     {
         return count($message->getTo()) + $toBeAdded;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php b/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php
index 18149993e10..9140c67d676 100644
--- a/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php
+++ b/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,23 +16,22 @@
 use Mautic\CoreBundle\Helper\ThemeHelper;
 use Mautic\CoreBundle\Translation\Translator;
 use Mautic\EmailBundle\Entity\Email;
+use Mautic\EmailBundle\Entity\EmailRepository;
 use Mautic\EmailBundle\Entity\Stat;
 use Mautic\EmailBundle\Entity\StatRepository;
 use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\EmailBundle\MonitoredEmail\Mailbox;
+use Mautic\LeadBundle\Entity\FrequencyRuleRepository;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Entity\LeadRepository;
-use Mautic\EmailBundle\Entity\EmailRepository;
-use Mautic\LeadBundle\Entity\FrequencyRuleRepository;
 use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\PageBundle\Model\TrackableModel;
 use Mautic\UserBundle\Model\UserModel;
 
 class EmailModelTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
-     * Test that an array of contacts are sent emails according to A/B test weights
+     * Test that an array of contacts are sent emails according to A/B test weights.
      */
     public function testVariantEmailWeightsAreAppropriateForMultipleContacts()
     {
@@ -183,7 +183,7 @@ public function testVariantEmailWeightsAreAppropriateForMultipleContacts()
                     [
                         ['MauticLeadBundle:FrequencyRule', $frequencyRepository],
                         ['MauticEmailBundle:Email', $emailRepository],
-                        ['MauticEmailBundle:Stat', $statRepository]
+                        ['MauticEmailBundle:Stat', $statRepository],
                     ]
                 )
             );
@@ -202,16 +202,16 @@ public function testVariantEmailWeightsAreAppropriateForMultipleContacts()
         $emailModel->setTranslator($translator);
         $emailModel->setEntityManager($entityManager);
 
-        $count = 12;
+        $count    = 12;
         $contacts = [];
         while ($count > 0) {
             $contacts[] = [
-                'id' => $count,
-                'email' => "email{$count}@domain.com",
+                'id'        => $count,
+                'email'     => "email{$count}@domain.com",
                 'firstname' => "firstname{$count}",
-                'lastname' => "lastname{$count}"
+                'lastname'  => "lastname{$count}",
             ];
-            $count--;
+            --$count;
         }
 
         $emailModel->sendEmail($emailEntity, $contacts);
@@ -237,7 +237,7 @@ public function testVariantEmailWeightsAreAppropriateForMultipleContacts()
     }
 
     /**
-     * Test that sending emails to contacts one at a time are according to A/B test weights
+     * Test that sending emails to contacts one at a time are according to A/B test weights.
      */
     public function testVariantEmailWeightsAreAppropriateForMultipleContactsSentOneAtATime()
     {
@@ -389,7 +389,7 @@ public function testVariantEmailWeightsAreAppropriateForMultipleContactsSentOneA
                     [
                         ['MauticLeadBundle:FrequencyRule', $frequencyRepository],
                         ['MauticEmailBundle:Email', $emailRepository],
-                        ['MauticEmailBundle:Stat', $statRepository]
+                        ['MauticEmailBundle:Stat', $statRepository],
                     ]
                 )
             );
@@ -411,16 +411,14 @@ public function testVariantEmailWeightsAreAppropriateForMultipleContactsSentOneA
         $count = 12;
         while ($count > 0) {
             $contact = [
-                'id' => $count,
-                'email' => "email{$count}@domain.com",
+                'id'        => $count,
+                'email'     => "email{$count}@domain.com",
                 'firstname' => "firstname{$count}",
-                'lastname' => "lastname{$count}"
+                'lastname'  => "lastname{$count}",
             ];
-            $count--;
-
+            --$count;
 
             $emailModel->sendEmail($emailEntity, [$contact]);
-
         }
 
         $emailSettings = $emailModel->getEmailSettings($emailEntity);
@@ -444,7 +442,7 @@ public function testVariantEmailWeightsAreAppropriateForMultipleContactsSentOneA
     }
 
     /**
-     * Test that processMailerCallback handles an array of emails correctly
+     * Test that processMailerCallback handles an array of emails correctly.
      */
     public function testProcessMailerCallbackWithEmails()
     {
@@ -514,7 +512,7 @@ public function testProcessMailerCallbackWithEmails()
                 $this->returnValueMap(
                     [
                         ['foo@bar.com', true, 1],
-                        ['notfound@nowhere.com', true, null]
+                        ['notfound@nowhere.com', true, null],
                     ]
                 )
             );
@@ -531,7 +529,7 @@ public function testProcessMailerCallbackWithEmails()
                 $this->returnValueMap(
                     [
                         ['MauticLeadBundle:Lead', $leadRepository],
-                        ['MauticEmailBundle:Stat', $statRepository]
+                        ['MauticEmailBundle:Stat', $statRepository],
                     ]
                 )
             );
@@ -557,9 +555,9 @@ public function testProcessMailerCallbackWithEmails()
             2 => [
                 'emails' => [
                     'foo@bar.com'          => 'some reason',
-                    'notfound@nowhere.com' => 'some reason'
-                ]
-            ]
+                    'notfound@nowhere.com' => 'some reason',
+                ],
+            ],
         ];
 
         $dnc = $emailModel->processMailerCallback($response);
@@ -568,7 +566,7 @@ public function testProcessMailerCallbackWithEmails()
     }
 
     /**
-     * Test that processMailerCallback handles an array of hashIds correctly
+     * Test that processMailerCallback handles an array of hashIds correctly.
      */
     public function testProcessMailerCallbackWithHashIds()
     {
@@ -655,7 +653,7 @@ public function testProcessMailerCallbackWithHashIds()
             ->will(
                 $this->returnValueMap(
                     [
-                        ['MauticEmailBundle:Stat', $statRepository]
+                        ['MauticEmailBundle:Stat', $statRepository],
                     ]
                 )
             );
@@ -681,13 +679,13 @@ public function testProcessMailerCallbackWithHashIds()
             2 => [
                 'hashIds' => [
                     'xyz123' => 'some reason',
-                    '123xyz' => 'some reason' // not found
-                ]
-            ]
+                    '123xyz' => 'some reason', // not found
+                ],
+            ],
         ];
 
         $dnc = $emailModel->processMailerCallback($response);
 
         $this->assertCount(1, $dnc);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Tests/MonitoredEmail/MailboxTest.php b/app/bundles/EmailBundle/Tests/MonitoredEmail/MailboxTest.php
index 49d425907a9..fc1226b8455 100644
--- a/app/bundles/EmailBundle/Tests/MonitoredEmail/MailboxTest.php
+++ b/app/bundles/EmailBundle/Tests/MonitoredEmail/MailboxTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,32 +14,31 @@
 use Mautic\CoreBundle\Helper\PathsHelper;
 
 /**
- * Class Mailbox
+ * Class Mailbox.
  */
 class MailboxTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testSettingsForMonitoredEmailWithoutOverride()
     {
         $config = [
-            "general"             => [
-                "address"    => "foo@bar.com",
-                "host"       => "imap.bar.com",
-                "port"       => "993",
-                "encryption" => "/ssl",
-                "user"       => "foo@bar.com",
-                "password"   => "topsecret"
+            'general' => [
+                'address'    => 'foo@bar.com',
+                'host'       => 'imap.bar.com',
+                'port'       => '993',
+                'encryption' => '/ssl',
+                'user'       => 'foo@bar.com',
+                'password'   => 'topsecret',
             ],
-            "EmailBundle_bounces" => [
-                "address"           => "",
-                "host"              => "",
-                "port"              => "993",
-                "encryption"        => "/ssl",
-                "user"              => "",
-                "password"          => "",
-                "override_settings" => "",
-                "folder"            => "Bounces",
-                "ssl"               => "1"
+            'EmailBundle_bounces' => [
+                'address'           => '',
+                'host'              => '',
+                'port'              => '993',
+                'encryption'        => '/ssl',
+                'user'              => '',
+                'password'          => '',
+                'override_settings' => '',
+                'folder'            => 'Bounces',
+                'ssl'               => '1',
             ],
         ];
 
@@ -68,24 +68,24 @@ public function testSettingsForMonitoredEmailWithoutOverride()
     public function testSettingsForMonitoredEmailWithOverride()
     {
         $config = [
-            "general"             => [
-                "address"    => "foo@bar.com",
-                "host"       => "imap.bar.com",
-                "port"       => "993",
-                "encryption" => "/ssl",
-                "user"       => "foo@bar.com",
-                "password"   => "topsecret"
+            'general' => [
+                'address'    => 'foo@bar.com',
+                'host'       => 'imap.bar.com',
+                'port'       => '993',
+                'encryption' => '/ssl',
+                'user'       => 'foo@bar.com',
+                'password'   => 'topsecret',
             ],
-            "EmailBundle_bounces" => [
-                "address"           => "bar@foo.com",
-                "host"              => "imap.foo.com",
-                "port"              => "993",
-                "encryption"        => "/ssl",
-                "user"              => "bar@foo.com",
-                "password"          => "topsecret",
-                "override_settings" => true,
-                "folder"            => "INBOX",
-                "ssl"               => "1"
+            'EmailBundle_bounces' => [
+                'address'           => 'bar@foo.com',
+                'host'              => 'imap.foo.com',
+                'port'              => '993',
+                'encryption'        => '/ssl',
+                'user'              => 'bar@foo.com',
+                'password'          => 'topsecret',
+                'override_settings' => true,
+                'folder'            => 'INBOX',
+                'ssl'               => '1',
             ],
         ];
 
@@ -111,4 +111,4 @@ public function testSettingsForMonitoredEmailWithOverride()
         $this->assertEquals('INBOX', $settings['folder']);
         $this->assertEquals('bar@foo.com', $settings['address']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Tests/Transport/AmazonTransportTest.php b/app/bundles/EmailBundle/Tests/Transport/AmazonTransportTest.php
index 72709bd69fe..95dd12d4204 100644
--- a/app/bundles/EmailBundle/Tests/Transport/AmazonTransportTest.php
+++ b/app/bundles/EmailBundle/Tests/Transport/AmazonTransportTest.php
@@ -1,25 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\EmailBundle\Tests\Transport;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Mautic\EmailBundle\Swiftmailer\Transport\AmazonTransport;
 use Joomla\Http\Http;
+use Mautic\EmailBundle\Swiftmailer\Transport\AmazonTransport;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
- * Class AmazonTransportTest
- *
+ * Class AmazonTransportTest.
  */
 class AmazonTransportTest extends KernelTestCase
 {
-
     private $container;
 
     public function setUp()
@@ -30,8 +29,7 @@ public function setUp()
     }
 
     /**
-     * Test that the confirmation URL from the payload is called
-     *
+     * Test that the confirmation URL from the payload is called.
      */
     public function testConfirmationCallbackSuccessfull()
     {
@@ -52,8 +50,8 @@ public function testConfirmationCallbackSuccessfull()
             ->method('get')
             ->willReturn($mockResponse);
 
-        # payload which is sent by Amazon SES
-        $payload = <<<PAYLOAD
+        // payload which is sent by Amazon SES
+        $payload = <<<'PAYLOAD'
 {
   "Type" : "SubscriptionConfirmation",
   "MessageId" : "a3466e9f-872a-4438-9cf8-91d282af0f53",
@@ -68,22 +66,21 @@ public function testConfirmationCallbackSuccessfull()
 }
 PAYLOAD;
 
-        $jsonPayload = json_decode($payload, TRUE);
+        $jsonPayload = json_decode($payload, true);
 
         $transport = new AmazonTransport('localhost', $mockHttp);
         $transport->processJsonPayload($jsonPayload, $logger, $translator);
     }
 
     /**
-     * Test that a bounce message is properly processed by the mailer callback
-     *
+     * Test that a bounce message is properly processed by the mailer callback.
      */
     public function testSingleBounceCallbackSuccessfull()
     {
         $logger     = $this->container->get('logger');
         $translator = $this->container->get('translator');
 
-        # payload which is sent by Amazon SES
+        // payload which is sent by Amazon SES
         $payload = <<<PAYLOAD
 {
   "Type" : "Notification",
@@ -98,25 +95,24 @@ public function testSingleBounceCallbackSuccessfull()
 }
 PAYLOAD;
 
-        $jsonPayload = json_decode($payload, TRUE);
+        $jsonPayload = json_decode($payload, true);
 
         $transport = new AmazonTransport('localhost', new Http());
-        $rows = $transport->processJsonPayload($jsonPayload, $logger, $translator);
+        $rows      = $transport->processJsonPayload($jsonPayload, $logger, $translator);
 
         $this->assertArrayHasKey('nope@nope.com', $rows[2]['emails']);
         $this->assertContains('Recipient address rejected', $rows[2]['emails']['nope@nope.com']);
     }
 
     /**
-     * Test that a complaint message without a feedback report is processed with the reason "unkown"
-     *
+     * Test that a complaint message without a feedback report is processed with the reason "unkown".
      */
     public function testSingleComplaintWithoutFeedbackCallbackSuccessfull()
     {
         $logger     = $this->container->get('logger');
         $translator = $this->container->get('translator');
 
-        # payload which is sent by Amazon SES
+        // payload which is sent by Amazon SES
         $payload = <<<PAYLOAD
 {
   "Type" : "Notification",
@@ -131,25 +127,24 @@ public function testSingleComplaintWithoutFeedbackCallbackSuccessfull()
 }
 PAYLOAD;
 
-        $jsonPayload = json_decode($payload, TRUE);
+        $jsonPayload = json_decode($payload, true);
 
         $transport = new AmazonTransport('localhost', new Http());
-        $rows = $transport->processJsonPayload($jsonPayload, $logger, $translator);
+        $rows      = $transport->processJsonPayload($jsonPayload, $logger, $translator);
 
         $this->assertArrayHasKey('richard@example.com', $rows[1]['emails']);
         $this->assertEquals('mautic.email.complaint.reason.unkown', $rows[1]['emails']['richard@example.com']);
     }
 
     /**
-     * Test that a complaint message with a feedback is processed and the reason is set accordingly
-     *
+     * Test that a complaint message with a feedback is processed and the reason is set accordingly.
      */
     public function testSingleComplaintWithFeedbackCallbackSuccessfull()
     {
         $logger     = $this->container->get('logger');
         $translator = $this->container->get('translator');
 
-        # payload which is sent by Amazon SES
+        // payload which is sent by Amazon SES
         $payload = <<<PAYLOAD
 {
   "Type" : "Notification",
@@ -164,13 +159,12 @@ public function testSingleComplaintWithFeedbackCallbackSuccessfull()
 }
 PAYLOAD;
 
-        $jsonPayload = json_decode($payload, TRUE);
+        $jsonPayload = json_decode($payload, true);
 
         $transport = new AmazonTransport('localhost', new Http());
-        $rows = $transport->processJsonPayload($jsonPayload, $logger, $translator);
+        $rows      = $transport->processJsonPayload($jsonPayload, $logger, $translator);
 
         $this->assertArrayHasKey('richard@example.com', $rows[1]['emails']);
         $this->assertEquals('mautic.email.complaint.reason.abuse', $rows[1]['emails']['richard@example.com']);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Views/AbTest/form.html.php b/app/bundles/EmailBundle/Views/AbTest/form.html.php
index 26369c45f8e..2d647ddea39 100644
--- a/app/bundles/EmailBundle/Views/AbTest/form.html.php
+++ b/app/bundles/EmailBundle/Views/AbTest/form.html.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 //do not include the surrounding form since this will be embedded into the current form
 foreach ($form as $f) {
     echo $view['form']->row($f);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/EmailBundle/Views/Email/details.html.php b/app/bundles/EmailBundle/Views/Email/details.html.php
index 4958733d9c7..9cc20c20248 100644
--- a/app/bundles/EmailBundle/Views/Email/details.html.php
+++ b/app/bundles/EmailBundle/Views/Email/details.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'email');
-$view['slots']->set("headerTitle", $email->getName());
+$view['slots']->set('headerTitle', $email->getName());
 
 $variantContent = $view->render(
     'MauticCoreBundle:Variant:index.html.php',
@@ -21,7 +21,7 @@
         'actionRoute'   => 'mautic_email_action',
     ]
 );
-$showVariants    = !empty(trim($variantContent));
+$showVariants = !empty(trim($variantContent));
 
 $translationContent = $view->render(
     'MauticCoreBundle:Translation:index.html.php',
@@ -32,7 +32,7 @@
         'actionRoute'  => 'mautic_email_action',
     ]
 );
-$showTranslations   = !empty(trim($translationContent));
+$showTranslations = !empty(trim($translationContent));
 
 $emailType = $email->getEmailType();
 if (empty($emailType)) {
@@ -43,7 +43,7 @@
 
 if ($emailType == 'list') {
     $customButtons[] = [
-        'attr'      => [
+        'attr' => [
             'data-toggle' => 'ajax',
             'href'        => $view['router']->path(
                 'mautic_email_action',
@@ -56,7 +56,7 @@
 }
 
 $customButtons[] = [
-    'attr'      => [
+    'attr' => [
         'data-toggle' => 'ajax',
         'href'        => $view['router']->path(
             'mautic_email_action',
@@ -75,9 +75,9 @@
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
         [
-            'item'             => $email,
-            'templateButtons'  => [
-                'edit'   => $view['security']->hasEntityAccess(
+            'item'            => $email,
+            'templateButtons' => [
+                'edit' => $view['security']->hasEntityAccess(
                     $permissions['email:emails:editown'],
                     $permissions['email:emails:editother'],
                     $email->getCreatedBy()
@@ -89,7 +89,7 @@
                     $permissions['email:emails:deleteother'],
                     $email->getCreatedBy()
                 ),
-                'close'  => $view['security']->hasEntityAccess(
+                'close' => $view['security']->hasEntityAccess(
                     $permissions['email:emails:viewown'],
                     $permissions['email:emails:viewother'],
                     $email->getCreatedBy()
@@ -214,7 +214,7 @@
                     'email'         => $email,
                     'isVariant'     => ($showTranslations || $showVariants),
                     'showAllStats'  => $showAllStats,
-                    'dateRangeForm' => $dateRangeForm
+                    'dateRangeForm' => $dateRangeForm,
                 ]
             ); ?>
 
diff --git a/app/bundles/EmailBundle/Views/Email/form.html.php b/app/bundles/EmailBundle/Views/Email/form.html.php
index 5c0b0017ead..7ac734bf96a 100644
--- a/app/bundles/EmailBundle/Views/Email/form.html.php
+++ b/app/bundles/EmailBundle/Views/Email/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'email');
 
@@ -15,21 +15,21 @@
 $filterSelectPrototype   = $form['dynamicContent']->children[0]['filters']->children[0]['filters']->vars['prototype'];
 
 $variantParent = $email->getVariantParent();
-$isExisting = $email->getId();
+$isExisting    = $email->getId();
 
 $isExisting = $email->getId();
 
-$subheader = ($variantParent) ? '<div><span class="small">' . $view['translator']->trans('mautic.core.variant_of', [
-    '%name%' => $email->getName(),
-    '%parent%' => $variantParent->getName()
-]) . '</span></div>' : '';
+$subheader = ($variantParent) ? '<div><span class="small">'.$view['translator']->trans('mautic.core.variant_of', [
+    '%name%'   => $email->getName(),
+    '%parent%' => $variantParent->getName(),
+]).'</span></div>' : '';
 
 $header = $isExisting ?
     $view['translator']->trans('mautic.email.header.edit',
         ['%name%' => $email->getName()]) :
     $view['translator']->trans('mautic.email.header.new');
 
-$view['slots']->set("headerTitle", $header.$subheader);
+$view['slots']->set('headerTitle', $header.$subheader);
 
 $emailType = $form['emailType']->vars['data'];
 
@@ -46,8 +46,8 @@
     'locales'   => 'locale-template',
 ];
 
-$attr = $form->vars['attr'];
-$attr['data-submit-callback-async'] = "clearThemeHtmlBeforeSave";
+$attr                               = $form->vars['attr'];
+$attr['data-submit-callback-async'] = 'clearThemeHtmlBeforeSave';
 
 ?>
 
@@ -58,14 +58,14 @@
             <div class="col-xs-12">
                 <!-- tabs controls -->
                 <ul class="bg-auto nav nav-tabs pr-md pl-md">
-                    <li <?php echo !$isExisting ? "class='active'" : ""; ?>><a href="#email-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.form.theme'); ?></a></li>
-                    <li <?php echo $isExisting ? "class='active'" : ""; ?>><a href="#source-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.content'); ?></a></li>
+                    <li <?php echo !$isExisting ? "class='active'" : ''; ?>><a href="#email-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.form.theme'); ?></a></li>
+                    <li <?php echo $isExisting ? "class='active'" : ''; ?>><a href="#source-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.content'); ?></a></li>
                     <li><a href="#advanced-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.advanced'); ?></a></li>
                     <li><a href="#dynamic-content-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.dynamicContent'); ?></a></li>
                 </ul>
                 <!--/ tabs controls -->
                 <div class="tab-content pa-md">
-                    <div class="tab-pane fade <?php echo !$isExisting ? "in active" : ""; ?> bdr-w-0" id="email-container">
+                    <div class="tab-pane fade <?php echo !$isExisting ? 'in active' : ''; ?> bdr-w-0" id="email-container">
                         <div class="row">
                             <div class="col-md-12">
                                 <?php echo $view['form']->row($form['template']); ?>
@@ -74,11 +74,11 @@
                         <?php echo $view->render('MauticCoreBundle:Helper:theme_select.html.php', [
                             'type'   => 'email',
                             'themes' => $themes,
-                            'active' => $form['template']->vars['value']
+                            'active' => $form['template']->vars['value'],
                         ]); ?>
                     </div>
 
-                    <div class="tab-pane fade <?php echo $isExisting ? "in active" : ""; ?> bdr-w-0" id="source-container">
+                    <div class="tab-pane fade <?php echo $isExisting ? 'in active' : ''; ?> bdr-w-0" id="source-container">
                         <div class="row">
                           <div class="col-md-12">
                               <?php echo $view['form']->row($form['subject']); ?>
@@ -144,13 +144,13 @@
                             <div class="col-md-12">
                                 <div class="row">
                                 <?php
-                                $tabHtml  = '<div class="col-xs-3 dynamicContentFilterContainer">';
+                                $tabHtml = '<div class="col-xs-3 dynamicContentFilterContainer">';
                                 $tabHtml .= '<ul class="nav nav-tabs pr-md pl-md tabs-left" id="dynamicContentTabs">';
                                 $tabHtml .= '<li><a href="javascript:void(0);" role="tab" class="btn btn-primary" id="addNewDynamicContent"><i class="fa fa-plus text-success"></i> '.$view['translator']->trans('mautic.core.form.new').'</a></li>';
                                 $tabContentHtml = '<div class="tab-content pa-md col-xs-9" id="dynamicContentContainer">';
 
                                 foreach ($form['dynamicContent'] as $i => $dynamicContent) {
-                                    $linkText = $dynamicContent['tokenName']->vars['value'] ?: $view['translator']->trans('mautic.core.dynamicContent').' '.($i+1);
+                                    $linkText = $dynamicContent['tokenName']->vars['value'] ?: $view['translator']->trans('mautic.core.dynamicContent').' '.($i + 1);
 
                                     $tabHtml .= '<li class="'.($i === 0 ? ' active' : '').'"><a role="tab" data-toggle="tab" href="#'.$dynamicContent->vars['id'].'">'.$linkText.'</a></li>';
 
@@ -215,7 +215,7 @@
 
 <div class="hide" id="templates">
     <?php foreach ($templates as $dataKey => $template): ?>
-        <?php $attr = ($dataKey == 'tags') ? ' data-placeholder="' . $view['translator']->trans('mautic.lead.tags.select_or_create') . '" data-no-results-text="' . $view['translator']->trans('mautic.lead.tags.enter_to_create') . '" data-allow-add="true" onchange="Mautic.createLeadTag(this)"' : ''; ?>
+        <?php $attr = ($dataKey == 'tags') ? ' data-placeholder="'.$view['translator']->trans('mautic.lead.tags.select_or_create').'" data-no-results-text="'.$view['translator']->trans('mautic.lead.tags.enter_to_create').'" data-allow-add="true" onchange="Mautic.createLeadTag(this)"' : ''; ?>
         <select class="form-control not-chosen <?php echo $template; ?>" name="emailform[dynamicContent][__dynamicContentIndex__][filters][__dynamicContentFilterIndex__][filters][__name__][filter]" id="emailform_dynamicContent___dynamicContentIndex___filters___dynamicContentFilterIndex___filters___name___filter"<?php echo $attr; ?>>
             <?php
             if (isset($form->vars[$dataKey])):
@@ -227,8 +227,9 @@
                         endforeach;
                         echo "</optgroup>\n";
                     else:
-                        if ($dataKey == 'lists' && (isset($currentListId) && (int) $value === (int) $currentListId))
+                        if ($dataKey == 'lists' && (isset($currentListId) && (int) $value === (int) $currentListId)) {
                             continue;
+                        }
                         echo "<option value=\"$value\">$label</option>\n";
                     endif;
                 endforeach;
@@ -243,7 +244,7 @@
     'sectionForm'   => $sectionForm,
     'builderAssets' => $builderAssets,
     'slots'         => $slots,
-    'objectId'      => $email->getSessionId()
+    'objectId'      => $email->getSessionId(),
 ]); ?>
 
 <?php
@@ -251,10 +252,10 @@
 if (empty($type) || !empty($forceTypeSelection)):
     echo $view->render('MauticCoreBundle:Helper:form_selecttype.html.php',
         [
-            'item'               => $email,
-            'mauticLang'         => [
-                'newListEmail' => 'mautic.email.type.list.header',
-                'newTemplateEmail'   => 'mautic.email.type.template.header'
+            'item'       => $email,
+            'mauticLang' => [
+                'newListEmail'     => 'mautic.email.type.list.header',
+                'newTemplateEmail' => 'mautic.email.type.template.header',
             ],
             'typePrefix'         => 'email',
             'cancelUrl'          => 'mautic_email_index',
diff --git a/app/bundles/EmailBundle/Views/Email/graph.html.php b/app/bundles/EmailBundle/Views/Email/graph.html.php
index 3d9d6d7cc55..08443b892a2 100644
--- a/app/bundles/EmailBundle/Views/Email/graph.html.php
+++ b/app/bundles/EmailBundle/Views/Email/graph.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($emailType == 'list') {
     $label = 'mautic.email.lead.list.comparison';
     $type  = 'bar';
@@ -19,11 +19,11 @@
 $actionRoute = $view['router']->path('mautic_email_action',
     [
         'objectAction' => 'view',
-        'objectId' => $email->getId(),
-        'daterange' => [
-            'date_to' => $dateTo,
-            'date_from' => $dateFrom
-        ]
+        'objectId'     => $email->getId(),
+        'daterange'    => [
+            'date_to'   => $dateTo,
+            'date_from' => $dateFrom,
+        ],
     ]
 );
 
@@ -34,13 +34,17 @@
             <?php if ($isVariant): ?>
             <div class="text-right small" id="variant-chart-switcher">
                 <span>
-                    <a data-toggle="ajax" class="btn btn-xs<?php if (!$showAllStats) echo " disabled"; ?>" href="<?php echo $actionRoute."&stats=variant"; ?>">
+                    <a data-toggle="ajax" class="btn btn-xs<?php if (!$showAllStats) {
+    echo ' disabled';
+} ?>" href="<?php echo $actionRoute.'&stats=variant'; ?>">
                         <?php echo $view['translator']->trans('mautic.email.variant.graph.variant'); ?>
                     </a>
                 </span>
                 </span> | </span>
                 <span>
-                    <a data-toggle="ajax" class="btn btn-xs<?php  if ($showAllStats) echo " disabled"; ?>" href="<?php echo $actionRoute."&stats=all"; ?>">
+                    <a data-toggle="ajax" class="btn btn-xs<?php  if ($showAllStats) {
+    echo ' disabled';
+} ?>" href="<?php echo $actionRoute.'&stats=all'; ?>">
                         <?php echo $view['translator']->trans('mautic.email.variant.graph.all'); ?>
                     </a>
                 </span>
@@ -55,15 +59,15 @@
                         </h5>
                     </div>
                     <div class="col-xs-8 va-m">
-                        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', array('dateRangeForm' => $dateRangeForm, 'class' => 'pull-right')); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['dateRangeForm' => $dateRangeForm, 'class' => 'pull-right']); ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="pt-0 pl-15 pb-10 pr-15 col-xs-6">
-                        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', array('chartData' => $stats, 'chartType' => $type, 'chartHeight' => 300)); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $stats, 'chartType' => $type, 'chartHeight' => 300]); ?>
                     </div>
                     <div class="pt-0 pl-15 pb-10 pr-15 col-xs-6">
-                        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', array('chartData' => $statsDevices, 'chartType' => 'horizontal-bar', 'chartHeight' => 300)); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $statsDevices, 'chartType' => 'horizontal-bar', 'chartHeight' => 300]); ?>
                     </div>
                 </div>
             </div>
diff --git a/app/bundles/EmailBundle/Views/Email/index.html.php b/app/bundles/EmailBundle/Views/Email/index.html.php
index c9a79a77a42..b1ad6267856 100644
--- a/app/bundles/EmailBundle/Views/Email/index.html.php
+++ b/app/bundles/EmailBundle/Views/Email/index.html.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'email');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.email.emails'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.email.emails'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['email:emails:create']
-            ),
-            'routeBase'       => 'email'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['email:emails:create'],
+            ],
+            'routeBase' => 'email',
+        ]
     )
 );
 
@@ -29,16 +29,16 @@
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render(
         'MauticCoreBundle:Helper:list_toolbar.html.php',
-        array(
-            'searchValue' => $searchValue,
-            'searchHelp'  => 'mautic.email.help.searchcommands',
+        [
+            'searchValue'     => $searchValue,
+            'searchHelp'      => 'mautic.email.help.searchcommands',
             'action'          => $currentRoute,
             'routeBase'       => 'email',
-            'templateButtons' => array(
-                'delete' => $permissions['email:emails:deleteown'] || $permissions['email:emails:deleteother']
-            ),
-            'filters'         => $filters
-        )
+            'templateButtons' => [
+                'delete' => $permissions['email:emails:deleteown'] || $permissions['email:emails:deleteother'],
+            ],
+            'filters' => $filters,
+        ]
     ); ?>
 
     <div class="page-list">
diff --git a/app/bundles/EmailBundle/Views/Email/list.html.php b/app/bundles/EmailBundle/Views/Email/list.html.php
index 21b9fb090ef..ee0b303a08f 100644
--- a/app/bundles/EmailBundle/Views/Email/list.html.php
+++ b/app/bundles/EmailBundle/Views/Email/list.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticEmailBundle:Email:index.html.php');
+}
 
 if (count($items)):
 
@@ -18,35 +19,35 @@
         <thead>
         <tr>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
-                'checkall' => 'true'
-            ));
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
+                'checkall' => 'true',
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'email',
                 'orderBy'    => 'e.name',
                 'text'       => 'mautic.core.name',
                 'class'      => 'col-email-name',
-                'default'    => true
-            ));
+                'default'    => true,
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'email',
                 'orderBy'    => 'c.title',
                 'text'       => 'mautic.core.category',
-                'class'      => 'visible-md visible-lg col-email-category'
-            ));
+                'class'      => 'visible-md visible-lg col-email-category',
+            ]);
             ?>
 
             <th class="visible-sm visible-md visible-lg col-email-stats"><?php echo $view['translator']->trans('mautic.core.stats'); ?></th>
 
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'email',
                 'orderBy'    => 'e.id',
                 'text'       => 'mautic.core.id',
-                'class'      => 'visible-md visible-lg col-email-id'
-            ));
+                'class'      => 'visible-md visible-lg col-email-id',
+            ]);
             ?>
         </tr>
         </thead>
@@ -61,33 +62,33 @@
                 <td>
                     <?php
                     $edit          = $view['security']->hasEntityAccess($permissions['email:emails:editown'], $permissions['email:emails:editother'], $item->getCreatedBy());
-                    $customButtons = ($type == 'list') ? array(
-                        array(
-                            'attr' => array(
+                    $customButtons = ($type == 'list') ? [
+                        [
+                            'attr' => [
                                 'data-toggle' => 'ajax',
-                                'href'        => $view['router']->path('mautic_email_action', array('objectAction' => 'send', 'objectId' => $item->getId())),
-                            ),
+                                'href'        => $view['router']->path('mautic_email_action', ['objectAction' => 'send', 'objectId' => $item->getId()]),
+                            ],
                             'iconClass' => 'fa fa-send-o',
-                            'btnText'   => 'mautic.email.send'
-                        )
-                    ) : array();
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
+                            'btnText'   => 'mautic.email.send',
+                        ],
+                    ] : [];
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
                         'item'            => $item,
-                        'templateButtons' => array(
-                            'edit'       => $edit,
-                            'clone'      => $permissions['email:emails:create'],
-                            'delete'     => $view['security']->hasEntityAccess($permissions['email:emails:deleteown'], $permissions['email:emails:deleteother'], $item->getCreatedBy()),
-                            'abtest'     => (!$hasVariants && $edit && $permissions['email:emails:create']),
-                        ),
-                        'routeBase'       => 'email',
-                        'customButtons'   => $customButtons
-                    ));
+                        'templateButtons' => [
+                            'edit'   => $edit,
+                            'clone'  => $permissions['email:emails:create'],
+                            'delete' => $view['security']->hasEntityAccess($permissions['email:emails:deleteown'], $permissions['email:emails:deleteother'], $item->getCreatedBy()),
+                            'abtest' => (!$hasVariants && $edit && $permissions['email:emails:create']),
+                        ],
+                        'routeBase'     => 'email',
+                        'customButtons' => $customButtons,
+                    ]);
                     ?>
                 </td>
                 <td>
                     <div>
-                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array('item' => $item, 'model' => 'email')); ?>
-                        <a href="<?php echo $view['router']->path('mautic_email_action', array("objectAction" => "view", "objectId" => $item->getId())); ?>" data-toggle="ajax">
+                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'email']); ?>
+                        <a href="<?php echo $view['router']->path('mautic_email_action', ['objectAction' => 'view', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                             <?php echo $item->getName(); ?>
                             <?php if ($hasVariants): ?>
                             <span data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.core.icon_tooltip.ab_test'); ?>">
@@ -113,15 +114,15 @@
                 <td class="visible-md visible-lg">
                     <?php $category = $item->getCategory(); ?>
                     <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                    <?php $color    = ($category) ? '#' . $category->getColor() : 'inherit'; ?>
+                    <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                     <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                 </td>
                 <td class="visible-sm visible-md visible-lg col-stats">
                     <?php if ($type == 'list'): ?>
-                    <span class="mt-xs label label-info"><?php echo $view['translator']->trans('mautic.email.stat.leadcount', array('%count%' => $model->getPendingLeads($item, null, true))); ?></span>
+                    <span class="mt-xs label label-info"><?php echo $view['translator']->trans('mautic.email.stat.leadcount', ['%count%' => $model->getPendingLeads($item, null, true)]); ?></span>
                     <?php endif; ?>
-                    <span class="mt-xs label label-warning"><?php echo $view['translator']->trans('mautic.email.stat.sentcount', array('%count%' => $item->getSentCount(true))); ?></span>
-                    <span class="mt-xs label label-success"><?php echo $view['translator']->trans('mautic.email.stat.readcount', array('%count%' => $item->getReadCount(true))); ?></span>
+                    <span class="mt-xs label label-warning"><?php echo $view['translator']->trans('mautic.email.stat.sentcount', ['%count%' => $item->getSentCount(true)]); ?></span>
+                    <span class="mt-xs label label-success"><?php echo $view['translator']->trans('mautic.email.stat.readcount', ['%count%' => $item->getReadCount(true)]); ?></span>
                 </td>
                 <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
             </tr>
@@ -130,13 +131,13 @@
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        'totalItems'      => $totalItems,
-        'page'            => $page,
-        'limit'           => $limit,
-        'baseUrl'         => $view['router']->path('mautic_email_index'),
-        'sessionVar'      => 'email'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => $totalItems,
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_email_index'),
+        'sessionVar' => 'email',
+    ]); ?>
 </div>
 <?php else: ?>
     <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php'); ?>
diff --git a/app/bundles/EmailBundle/Views/Email/template_graph.html.php b/app/bundles/EmailBundle/Views/Email/template_graph.html.php
index fe60768fe16..184dda66e92 100644
--- a/app/bundles/EmailBundle/Views/Email/template_graph.html.php
+++ b/app/bundles/EmailBundle/Views/Email/template_graph.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -42,12 +43,12 @@
                         </h5>
                     </div>
                     <div class="col-xs-8 va-m">
-                        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', array('dateRangeForm' => $dateRangeForm, 'class' => 'pull-right')); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['dateRangeForm' => $dateRangeForm, 'class' => 'pull-right']); ?>
 
                     </div>
                 </div>
                 <div class="pt-0 pl-15 pb-10 pr-15">
-                    <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', array('chartData' => $stats, 'chartType' => 'line', 'chartHeight' => 300)); ?>
+                    <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $stats, 'chartType' => 'line', 'chartHeight' => 300]); ?>
                 </div>
             </div>
         </div>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php
index 75b7badd8d5..3c5e3c883a9 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Config/_config_emailconfig_widget.html.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $fields    = $form->children;
 $fieldKeys = array_keys($fields);
-$template = '<div class="col-md-6">{content}</div>';
+$template  = '<div class="col-md-6">{content}</div>';
 ?>
 
-<?php if (count(array_intersect($fieldKeys, array('mailer_from_name', 'mailer_from_email', 'mailer_transport', 'mailer_spool_type')))): ?>
+<?php if (count(array_intersect($fieldKeys, ['mailer_from_name', 'mailer_from_email', 'mailer_transport', 'mailer_spool_type']))): ?>
     <div class="panel panel-primary">
         <div class="panel-heading">
             <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.email.config.header.mail'); ?></h3>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_email_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_email_widget.html.php
index 88d6c055057..3f39c7a9556 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_email_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_email_widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 foreach ($form->children as $child): ?>
 <div class="panel panel-default">
     <div class="panel-heading">
@@ -15,7 +15,7 @@
         </h3>
     </div>
     <div class="panel-body">
-        <?php $tooltip = $view['translator']->hasId($child->vars['label'] . '.tooltip') ? $view['translator']->trans($child->vars['label'] . '.tooltip') : ''; ?>
+        <?php $tooltip = $view['translator']->hasId($child->vars['label'].'.tooltip') ? $view['translator']->trans($child->vars['label'].'.tooltip') : ''; ?>
         <?php if ($tooltip): ?>
             <p><?php echo $tooltip; ?></p>
         <?php endif; ?>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_mailboxes_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_mailboxes_widget.html.php
index a15459c0ac0..1fa2d6e02b1 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_mailboxes_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Config/monitored_mailboxes_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Email/_email_abtest_settings_properties_row.html.php b/app/bundles/EmailBundle/Views/FormTheme/Email/_email_abtest_settings_properties_row.html.php
index 137fa2e79f5..da6e22852ae 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Email/_email_abtest_settings_properties_row.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Email/_email_abtest_settings_properties_row.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-echo $view['form']->widget($form);
\ No newline at end of file
+echo $view['form']->widget($form);
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Email/_email_variantSettings_properties_row.html.php b/app/bundles/EmailBundle/Views/FormTheme/Email/_email_variantSettings_properties_row.html.php
index 137fa2e79f5..da6e22852ae 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Email/_email_variantSettings_properties_row.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Email/_email_variantSettings_properties_row.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-echo $view['form']->widget($form);
\ No newline at end of file
+echo $view['form']->widget($form);
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Email/_emailform_dynamicContent_entry_filters_entry_filters_entry_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Email/_emailform_dynamicContent_entry_filters_entry_filters_entry_widget.html.php
index 93d27e196a0..aa9c23eabb3 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Email/_emailform_dynamicContent_entry_filters_entry_filters_entry_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Email/_emailform_dynamicContent_entry_filters_entry_filters_entry_widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $isPrototype = ($form->vars['name'] == '__name__');
 $filterType  = $form['field']->vars['value'];
 $filterGroup = $form['object']->vars['value'];
@@ -15,7 +15,9 @@
 ?>
 
 <div class="panel<?php echo ($isPrototype || ($inGroup && !$first)) ? ' in-group' : ''; ?>">
-    <div class="panel-footer<?php if (!$isPrototype && $form->vars['name'] === '0') echo " hide"; ?>">
+    <div class="panel-footer<?php if (!$isPrototype && $form->vars['name'] === '0') {
+    echo ' hide';
+} ?>">
         <div class="col-sm-2 pl-0">
             <?php echo $view['form']->widget($form['glue']); ?>
         </div>
@@ -30,7 +32,9 @@
         </div>
 
         <?php $hasErrors = count($form['filter']->vars['errors']) || count($form['display']->vars['errors']); ?>
-        <div class="col-xs-10 col-sm-5 padding-none<?php if ($hasErrors) echo " has-error"; ?>">
+        <div class="col-xs-10 col-sm-5 padding-none<?php if ($hasErrors) {
+    echo ' has-error';
+} ?>">
             <?php echo $view['form']->widget($form['filter']); ?>
             <?php echo $view['form']->errors($form['filter']); ?>
             <?php echo $view['form']->widget($form['display']); ?>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php
index 13522d24f8f..6c50e7827fa 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_entry_widget.html.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
-<div class="tab-pane dynamic-content-filter bdr-w-0<?php echo ($form->vars['name'] === '0' ? ' active' : ' fade') ?>" id="<?php echo $form->vars['id'] ?>">
+<div class="tab-pane dynamic-content-filter bdr-w-0<?php echo $form->vars['name'] === '0' ? ' active' : ' fade' ?>" id="<?php echo $form->vars['id'] ?>">
     <div class="row form-group">
         <div class="col-xs-10">
             <?php echo $view['form']->label($form['content']); ?>
@@ -30,18 +31,18 @@
                         <option value=""></option>
                         <?php
                         foreach ($fields as $object => $field):
-                            $header    = $object;
-                            $icon      = ($object == 'company') ? 'fa-building' : 'fa-user';
+                            $header = $object;
+                            $icon   = ($object == 'company') ? 'fa-building' : 'fa-user';
                             ?>
                             <optgroup label="<?php echo $view['translator']->trans('mautic.lead.'.$header); ?>">
                                 <?php foreach ($field as $value => $params):
-                                    $list      = (!empty($params['properties']['list'])) ? $params['properties']['list'] : array();
+                                    $list      = (!empty($params['properties']['list'])) ? $params['properties']['list'] : [];
                                     $choices   = \Mautic\LeadBundle\Helper\FormFieldHelper::parseListStringIntoArray($list);
                                     $list      = json_encode($choices);
                                     $callback  = (!empty($params['properties']['callback'])) ? $params['properties']['callback'] : '';
                                     $operators = (!empty($params['operators'])) ? $view->escape(json_encode($params['operators'])) : '{}';
                                     ?>
-                                    <option value="<?php echo $value; ?>" data-mautic="available_<?php echo $value; ?>" data-field-object="<?php echo $object; ?>" data-field-type="<?php echo $params['properties']['type']; ?>" data-field-list="<?php echo $view->escape($list); ?>" data-field-callback="<?php echo $callback; ?>" data-field-operators="<?php echo $operators; ?>" class="segment-filter fa <?php echo $icon;?>"><?php echo $view['translator']->trans($params['label']); ?></option>
+                                    <option value="<?php echo $value; ?>" data-mautic="available_<?php echo $value; ?>" data-field-object="<?php echo $object; ?>" data-field-type="<?php echo $params['properties']['type']; ?>" data-field-list="<?php echo $view->escape($list); ?>" data-field-callback="<?php echo $callback; ?>" data-field-operators="<?php echo $operators; ?>" class="segment-filter fa <?php echo $icon; ?>"><?php echo $view['translator']->trans($params['label']); ?></option>
                                 <?php endforeach; ?>
                             </optgroup>
                         <?php endforeach; ?>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php
index 0a8392d5600..5ebfec044a5 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/Email/dynamic_content_filter_widget.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
-<div class="tab-pane dynamic-content bdr-w-0<?php echo ($form->vars['name'] === '0' ? ' active' : ' fade'); ?>" id="<?php echo $form->vars['id'] ?>">
+<div class="tab-pane dynamic-content bdr-w-0<?php echo $form->vars['name'] === '0' ? ' active' : ' fade'; ?>" id="<?php echo $form->vars['id'] ?>">
     <div class="row">
         <div class="col-xs-10">
             <?php echo $view['form']->row($form['tokenName']); ?>
diff --git a/app/bundles/EmailBundle/Views/FormTheme/EmailSendList/emailsend_list_row.html.php b/app/bundles/EmailBundle/Views/FormTheme/EmailSendList/emailsend_list_row.html.php
index 54b16f2ff93..acbcfff6962 100644
--- a/app/bundles/EmailBundle/Views/FormTheme/EmailSendList/emailsend_list_row.html.php
+++ b/app/bundles/EmailBundle/Views/FormTheme/EmailSendList/emailsend_list_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/EmailBundle/Views/Send/form.html.php b/app/bundles/EmailBundle/Views/Send/form.html.php
index bb9091edd3d..12768a964d1 100644
--- a/app/bundles/EmailBundle/Views/Send/form.html.php
+++ b/app/bundles/EmailBundle/Views/Send/form.html.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 
 $view['slots']->set('mauticContent', 'emailSend');
-$view['slots']->set('headerTitle', $view['translator']->trans('mautic.email.send.list', array('%name%' => $email->getName())));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.email.send.list', ['%name%' => $email->getName()]));
 
 ?>
 <div class="row">
@@ -29,22 +29,22 @@
                             <div class="input-group">
                                 <?php echo $view['form']->widget($form['batchlimit']); ?>
                                 <span class="input-group-btn">
-                                    <?php echo $view->render('MauticCoreBundle:Helper:confirm.html.php', array(
-                                        'message'         => $view['translator']->trans('mautic.email.form.confirmsend', array('%name%' => $email->getName())),
+                                    <?php echo $view->render('MauticCoreBundle:Helper:confirm.html.php', [
+                                        'message'         => $view['translator']->trans('mautic.email.form.confirmsend', ['%name%' => $email->getName()]),
                                         'confirmText'     => $view['translator']->trans('mautic.email.send'),
                                         'confirmCallback' => 'submitSendForm',
                                         'iconClass'       => 'fa fa-send-o',
                                         'btnText'         => $view['translator']->trans('mautic.email.send'),
-                                        'btnClass'        => 'btn btn-primary btn-send' . ((!$pending) ? ' disabled' : '')
-                                    ));
+                                        'btnClass'        => 'btn btn-primary btn-send'.((!$pending) ? ' disabled' : ''),
+                                    ]);
                                     ?>
                                 </span>
                             </div>
                             <?php echo $view['form']->errors($form['batchlimit']); ?>
                             <div class="text-center">
-                                <span class="label label-primary mt-lg"><?php echo $view['translator']->transChoice('mautic.email.send.pending', $pending, array('%pending%' => $pending)); ?></span>
+                                <span class="label label-primary mt-lg"><?php echo $view['translator']->transChoice('mautic.email.send.pending', $pending, ['%pending%' => $pending]); ?></span>
                                 <div class="mt-sm">
-                                    <a class="text-danger mt-md" href="<?php echo $view['router']->path('mautic_email_action', array('objectAction' => 'view', 'objectId' => $email->getId())); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.cancel'); ?></a>
+                                    <a class="text-danger mt-md" href="<?php echo $view['router']->path('mautic_email_action', ['objectAction' => 'view', 'objectId' => $email->getId()]); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.cancel'); ?></a>
                                 </div>
                             </div>
                         </div>
diff --git a/app/bundles/EmailBundle/Views/Send/progress.html.php b/app/bundles/EmailBundle/Views/Send/progress.html.php
index 3353c833562..ab005103f90 100644
--- a/app/bundles/EmailBundle/Views/Send/progress.html.php
+++ b/app/bundles/EmailBundle/Views/Send/progress.html.php
@@ -1,32 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
 
 $view['slots']->set('mauticContent', 'emailSend');
-$view['slots']->set('headerTitle', $view['translator']->trans('mautic.email.send.list', array('%name%' => $email->getName())));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.email.send.list', ['%name%' => $email->getName()]));
 
-$percent  = ($progress[1]) ? ceil(($progress[0] / $progress[1]) * 100) : 100;
-$id       = ($status != 'inprogress') ? 'emailSendProgressComplete' : 'emailSendProgress';
+$percent = ($progress[1]) ? ceil(($progress[0] / $progress[1]) * 100) : 100;
+$id      = ($status != 'inprogress') ? 'emailSendProgressComplete' : 'emailSendProgress';
 ?>
 
 <div class="row ma-lg email-send-progress" id="<?php echo $id; ?>">
     <div class="col-sm-offset-3 col-sm-6 text-center">
         <div class="panel panel-<?php echo ($status != 'inprogress') ? 'success' : 'danger'; ?>">
             <div class="panel-heading">
-                <h4 class="panel-title"><?php echo $view['translator']->trans('mautic.email.send.'.$status, array('%subject%' => \Mautic\CoreBundle\Helper\EmojiHelper::toHtml($email->getSubject(), 'short'))); ?></h4>
+                <h4 class="panel-title"><?php echo $view['translator']->trans('mautic.email.send.'.$status, ['%subject%' => \Mautic\CoreBundle\Helper\EmojiHelper::toHtml($email->getSubject(), 'short')]); ?></h4>
             </div>
             <div class="panel-body">
                 <?php if ($status != 'inprogress'): ?>
-                <h4><?php echo $view['translator']->trans('mautic.email.send.stats', array('%sent%' => $stats['sent'], '%failed%' => $stats['failed'])); ?></h4>
+                <h4><?php echo $view['translator']->trans('mautic.email.send.stats', ['%sent%' => $stats['sent'], '%failed%' => $stats['failed']]); ?></h4>
                 <?php endif; ?>
                 <div class="progress mt-md" style="height:50px;">
-                    <div class="progress-bar-send progress-bar progress-bar-striped<?php if ($status == 'inprogress') echo ' active'; ?>" role="progressbar" aria-valuenow="<?php echo $progress[0]; ?>" aria-valuemin="0" aria-valuemax="<?php echo $progress[1]; ?>" style="width: <?php echo $percent; ?>%; height: 50px;" data-batchlimit="<?php echo $batchlimit; ?>" data-email="<?php echo $email->getId(); ?>">
+                    <div class="progress-bar-send progress-bar progress-bar-striped<?php if ($status == 'inprogress') {
+    echo ' active';
+} ?>" role="progressbar" aria-valuenow="<?php echo $progress[0]; ?>" aria-valuemin="0" aria-valuemax="<?php echo $progress[1]; ?>" style="width: <?php echo $percent; ?>%; height: 50px;" data-batchlimit="<?php echo $batchlimit; ?>" data-email="<?php echo $email->getId(); ?>">
                         <span class="sr-only"><?php echo $percent; ?>%</span>
                     </div>
                 </div>
@@ -35,7 +38,7 @@
             <ul class="list-group">
                 <?php foreach ($stats['failedRecipients'] as $leadId => $failedEmail): ?>
                 <li class="list-group-item">
-                    <a target="_new" class="text-danger" href="<?php echo $view['router']->path('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $leadId)); ?>">
+                    <a target="_new" class="text-danger" href="<?php echo $view['router']->path('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $leadId]); ?>">
                         <?php echo $failedEmail; ?>
                     </a>
                 </li>
@@ -47,11 +50,11 @@
 
                 <?php if ($status == 'inprogress'): ?>
                 <div>
-                    <a class="text-danger mt-md" href="<?php echo $view['router']->path('mautic_email_action', array('objectAction' => 'send', 'objectId' => $email->getId())); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.cancel'); ?></a>
+                    <a class="text-danger mt-md" href="<?php echo $view['router']->path('mautic_email_action', ['objectAction' => 'send', 'objectId' => $email->getId()]); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.cancel'); ?></a>
                 </div>
                 <?php else: ?>
                 <div>
-                    <a class="text-success mt-md" href="<?php echo $view['router']->path('mautic_email_action', array('objectAction' => 'view', 'objectId' => $email->getId())); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.done'); ?></a>
+                    <a class="text-success mt-md" href="<?php echo $view['router']->path('mautic_email_action', ['objectAction' => 'view', 'objectId' => $email->getId()]); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.done'); ?></a>
                 </div>
                 <?php endif; ?>
             </div>
diff --git a/app/bundles/EmailBundle/Views/SubscribedEvents/EmailToken/token.html.php b/app/bundles/EmailBundle/Views/SubscribedEvents/EmailToken/token.html.php
index 269bb37605d..e21c843b56c 100644
--- a/app/bundles/EmailBundle/Views/SubscribedEvents/EmailToken/token.html.php
+++ b/app/bundles/EmailBundle/Views/SubscribedEvents/EmailToken/token.html.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
+
 ?>
 <div id="emailEmailTokens">
     <div class="row ml-2 mr-2 mb-2">
diff --git a/app/bundles/EmailBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/EmailBundle/Views/SubscribedEvents/Search/global.html.php
index 9363971f405..637777b9a06 100644
--- a/app/bundles/EmailBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/EmailBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_email_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_email_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
 </a>
 <?php else: ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_email_action', array('objectAction' => 'view', 'objectId' => $email->getId())); ?>" data-toggle="ajax">
+<a href="<?php echo $this->container->get('router')->generate('mautic_email_action', ['objectAction' => 'view', 'objectId' => $email->getId()]); ?>" data-toggle="ajax">
     <?php echo $email->getName(); ?>
     <span class="label label-default pull-right" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.email.readcount'); ?>" data-placement="left">
         <?php echo $email->getReadCount(); ?>
diff --git a/app/bundles/EmailBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/EmailBundle/Views/SubscribedEvents/Timeline/index.html.php
index 831207ad6c7..cdc566e9ba7 100755
--- a/app/bundles/EmailBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/EmailBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,14 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-
-
 if ($item = ((isset($event['extra'])) ? $event['extra']['stat'] : false)): ?>
     <p>
         <?php if (!empty($item['isFailed'])) : ?>
@@ -66,7 +64,7 @@
             ?>
             <?php if ($counter > 1): ?><hr/><?php endif; ?>
             <strong><?php echo $view['date']->toText($detail['datetime'], 'UTC'); ?></strong><br/><?php echo $detail['useragent']; ?>
-            <?php $counter++; ?>
+            <?php ++$counter; ?>
         <?php endforeach; ?>
         <?php
 
diff --git a/app/bundles/FormBundle/Config/config.php b/app/bundles/FormBundle/Config/config.php
index 14f70ca280f..183d822c2e7 100644
--- a/app/bundles/FormBundle/Config/config.php
+++ b/app/bundles/FormBundle/Config/config.php
@@ -1,267 +1,268 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
-    'routes'   => [
-        'main'   => [
+    'routes' => [
+        'main' => [
             'mautic_form_pagetoken_index' => [
                 'path'       => '/forms/pagetokens/{page}',
-                'controller' => 'MauticFormBundle:SubscribedEvents\BuilderToken:index'
+                'controller' => 'MauticFormBundle:SubscribedEvents\BuilderToken:index',
             ],
-            'mautic_formaction_action'    => [
+            'mautic_formaction_action' => [
                 'path'       => '/forms/action/{objectAction}/{objectId}',
-                'controller' => 'MauticFormBundle:Action:execute'
+                'controller' => 'MauticFormBundle:Action:execute',
             ],
-            'mautic_formfield_action'     => [
+            'mautic_formfield_action' => [
                 'path'       => '/forms/field/{objectAction}/{objectId}',
-                'controller' => 'MauticFormBundle:Field:execute'
+                'controller' => 'MauticFormBundle:Field:execute',
             ],
-            'mautic_form_index'           => [
+            'mautic_form_index' => [
                 'path'       => '/forms/{page}',
-                'controller' => 'MauticFormBundle:Form:index'
+                'controller' => 'MauticFormBundle:Form:index',
             ],
-            'mautic_form_results'         => [
+            'mautic_form_results' => [
                 'path'       => '/forms/results/{objectId}/{page}',
                 'controller' => 'MauticFormBundle:Result:index',
             ],
-            'mautic_form_export'          => [
+            'mautic_form_export' => [
                 'path'       => '/forms/results/{objectId}/export/{format}',
                 'controller' => 'MauticFormBundle:Result:export',
                 'defaults'   => [
-                    'format' => 'csv'
-                ]
+                    'format' => 'csv',
+                ],
             ],
-            'mautic_form_results_delete'   => [
+            'mautic_form_results_delete' => [
                 'path'       => '/forms/results/{formId}/delete/{objectId}',
                 'controller' => 'MauticFormBundle:Result:delete',
                 'defaults'   => [
-                    'objectId' => 0
-                ]
+                    'objectId' => 0,
+                ],
             ],
-            'mautic_form_action'          => [
+            'mautic_form_action' => [
                 'path'       => '/forms/{objectAction}/{objectId}',
-                'controller' => 'MauticFormBundle:Form:execute'
-            ]
+                'controller' => 'MauticFormBundle:Form:execute',
+            ],
         ],
-        'api'    => [
+        'api' => [
             'mautic_api_getforms' => [
                 'path'       => '/forms',
-                'controller' => 'MauticFormBundle:Api\FormApi:getEntities'
+                'controller' => 'MauticFormBundle:Api\FormApi:getEntities',
             ],
-            'mautic_api_getform'  => [
+            'mautic_api_getform' => [
                 'path'       => '/forms/{id}',
-                'controller' => 'MauticFormBundle:Api\FormApi:getEntity'
-            ]
+                'controller' => 'MauticFormBundle:Api\FormApi:getEntity',
+            ],
         ],
         'public' => [
-            'mautic_form_postresults'  => [
+            'mautic_form_postresults' => [
                 'path'       => '/form/submit',
-                'controller' => 'MauticFormBundle:Public:submit'
+                'controller' => 'MauticFormBundle:Public:submit',
             ],
             'mautic_form_generateform' => [
                 'path'       => '/form/generate.js',
-                'controller' => 'MauticFormBundle:Public:generate'
+                'controller' => 'MauticFormBundle:Public:generate',
             ],
-            'mautic_form_postmessage'  => [
+            'mautic_form_postmessage' => [
                 'path'       => '/form/message',
-                'controller' => 'MauticFormBundle:Public:message'
+                'controller' => 'MauticFormBundle:Public:message',
             ],
-            'mautic_form_preview'      => [
+            'mautic_form_preview' => [
                 'path'       => '/form/{id}',
                 'controller' => 'MauticFormBundle:Public:preview',
                 'defaults'   => [
-                    'id' => '0'
-                ]
+                    'id' => '0',
+                ],
             ],
             'mautic_form_embed' => [
-                'path' => '/form/embed/{id}',
-                'controller' => 'MauticFormBundle:Public:embed'
+                'path'       => '/form/embed/{id}',
+                'controller' => 'MauticFormBundle:Public:embed',
             ],
             'mautic_form_postresults_ajax' => [
-                'path' => '/form/submit/ajax',
-                'controller' => 'MauticFormBundle:Ajax:submit'
-            ]
-        ]
+                'path'       => '/form/submit/ajax',
+                'controller' => 'MauticFormBundle:Ajax:submit',
+            ],
+        ],
     ],
 
-    'menu'     => [
+    'menu' => [
         'main' => [
-            'items'    => [
+            'items' => [
                 'mautic.form.forms' => [
-                    'route'     => 'mautic_form_index',
-                    'access'    => ['form:forms:viewown', 'form:forms:viewother'],
-                    'parent'    => 'mautic.core.components',
-                    'priority'  => 200
-                ]
-            ]
-        ]
+                    'route'    => 'mautic_form_index',
+                    'access'   => ['form:forms:viewown', 'form:forms:viewother'],
+                    'parent'   => 'mautic.core.components',
+                    'priority' => 200,
+                ],
+            ],
+        ],
     ],
 
     'categories' => [
-        'form' => null
+        'form' => null,
     ],
 
     'services' => [
         'events' => [
-            'mautic.form.subscriber'                => [
-                'class' => 'Mautic\FormBundle\EventListener\FormSubscriber',
+            'mautic.form.subscriber' => [
+                'class'     => 'Mautic\FormBundle\EventListener\FormSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.core.model.auditlog',
                     'mautic.helper.mailer',
-                ]
+                ],
             ],
-            'mautic.form.pagebundle.subscriber'     => [
-                'class' => 'Mautic\FormBundle\EventListener\PageSubscriber',
+            'mautic.form.pagebundle.subscriber' => [
+                'class'     => 'Mautic\FormBundle\EventListener\PageSubscriber',
                 'arguments' => [
-                    'mautic.form.model.form'
-                ]
+                    'mautic.form.model.form',
+                ],
             ],
-            'mautic.form.pointbundle.subscriber'    => [
-                'class' => 'Mautic\FormBundle\EventListener\PointSubscriber',
+            'mautic.form.pointbundle.subscriber' => [
+                'class'     => 'Mautic\FormBundle\EventListener\PointSubscriber',
                 'arguments' => [
-                    'mautic.point.model.point'
-                ]
+                    'mautic.point.model.point',
+                ],
             ],
-            'mautic.form.reportbundle.subscriber'   => [
-                'class' => 'Mautic\FormBundle\EventListener\ReportSubscriber'
+            'mautic.form.reportbundle.subscriber' => [
+                'class' => 'Mautic\FormBundle\EventListener\ReportSubscriber',
             ],
             'mautic.form.campaignbundle.subscriber' => [
-                'class' => 'Mautic\FormBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\FormBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.form.model.form',
                     'mautic.form.model.submission',
-                    'mautic.campaign.model.event'
-                ]
+                    'mautic.campaign.model.event',
+                ],
             ],
             'mautic.form.calendarbundle.subscriber' => [
-                'class' => 'Mautic\FormBundle\EventListener\CalendarSubscriber'
+                'class' => 'Mautic\FormBundle\EventListener\CalendarSubscriber',
             ],
-            'mautic.form.leadbundle.subscriber'     => [
-                'class' => 'Mautic\FormBundle\EventListener\LeadSubscriber',
+            'mautic.form.leadbundle.subscriber' => [
+                'class'     => 'Mautic\FormBundle\EventListener\LeadSubscriber',
                 'arguments' => [
                     'mautic.form.model.form',
-                    'mautic.page.model.page'
-                ]
+                    'mautic.page.model.page',
+                ],
             ],
-            'mautic.form.emailbundle.subscriber'    => [
-                'class' => 'Mautic\FormBundle\EventListener\EmailSubscriber'
+            'mautic.form.emailbundle.subscriber' => [
+                'class' => 'Mautic\FormBundle\EventListener\EmailSubscriber',
             ],
-            'mautic.form.search.subscriber'         => [
-                'class' => 'Mautic\FormBundle\EventListener\SearchSubscriber',
+            'mautic.form.search.subscriber' => [
+                'class'     => 'Mautic\FormBundle\EventListener\SearchSubscriber',
                 'arguments' => [
                     'mautic.helper.user',
-                    'mautic.form.model.form'
-                ]
+                    'mautic.form.model.form',
+                ],
             ],
-            'mautic.form.webhook.subscriber'        => [
-                'class' => 'Mautic\FormBundle\EventListener\WebhookSubscriber'
+            'mautic.form.webhook.subscriber' => [
+                'class' => 'Mautic\FormBundle\EventListener\WebhookSubscriber',
             ],
-            'mautic.form.dashboard.subscriber'      => [
-                'class' => 'Mautic\FormBundle\EventListener\DashboardSubscriber',
+            'mautic.form.dashboard.subscriber' => [
+                'class'     => 'Mautic\FormBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
                     'mautic.form.model.submission',
-                    'mautic.form.model.form'
-                ]
-            ]
+                    'mautic.form.model.form',
+                ],
+            ],
         ],
-        'forms'  => [
-            'mautic.form.type.form'                      => [
+        'forms' => [
+            'mautic.form.type.form' => [
                 'class'     => 'Mautic\FormBundle\Form\Type\FormType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'mauticform'
+                'alias'     => 'mauticform',
             ],
-            'mautic.form.type.field'                     => [
-                'class' => 'Mautic\FormBundle\Form\Type\FieldType',
-                'alias' => 'formfield',
-                'methodCalls'  => [
+            'mautic.form.type.field' => [
+                'class'       => 'Mautic\FormBundle\Form\Type\FieldType',
+                'alias'       => 'formfield',
+                'methodCalls' => [
                     'setFieldModel' => ['mautic.form.model.field'],
                     'setFormModel'  => ['mautic.form.model.form'],
                 ],
             ],
-            'mautic.form.type.action'                    => [
+            'mautic.form.type.action' => [
                 'class' => 'Mautic\FormBundle\Form\Type\ActionType',
-                'alias' => 'formaction'
+                'alias' => 'formaction',
             ],
-            'mautic.form.type.field_propertytext'        => [
+            'mautic.form.type.field_propertytext' => [
                 'class' => 'Mautic\FormBundle\Form\Type\FormFieldTextType',
-                'alias' => 'formfield_text'
+                'alias' => 'formfield_text',
             ],
             'mautic.form.type.field_propertyplaceholder' => [
                 'class' => 'Mautic\FormBundle\Form\Type\FormFieldPlaceholderType',
-                'alias' => 'formfield_placeholder'
+                'alias' => 'formfield_placeholder',
             ],
-            'mautic.form.type.field_propertyselect'      => [
+            'mautic.form.type.field_propertyselect' => [
                 'class' => 'Mautic\FormBundle\Form\Type\FormFieldSelectType',
-                'alias' => 'formfield_select'
+                'alias' => 'formfield_select',
             ],
-            'mautic.form.type.field_propertycaptcha'     => [
+            'mautic.form.type.field_propertycaptcha' => [
                 'class' => 'Mautic\FormBundle\Form\Type\FormFieldCaptchaType',
-                'alias' => 'formfield_captcha'
+                'alias' => 'formfield_captcha',
             ],
-            'muatic.form.type.field_propertypagebreak'   => [
-                'class' => \Mautic\FormBundle\Form\Type\FormFieldPageBreakType::class,
+            'muatic.form.type.field_propertypagebreak' => [
+                'class'     => \Mautic\FormBundle\Form\Type\FormFieldPageBreakType::class,
                 'arguments' => [
                     'translator',
                 ],
             ],
-            'mautic.form.type.field_propertygroup'      => [
+            'mautic.form.type.field_propertygroup' => [
                 'class' => 'Mautic\FormBundle\Form\Type\FormFieldGroupType',
-                'alias' => 'formfield_group'
+                'alias' => 'formfield_group',
             ],
-            'mautic.form.type.pointaction_formsubmit'    => [
+            'mautic.form.type.pointaction_formsubmit' => [
                 'class' => 'Mautic\FormBundle\Form\Type\PointActionFormSubmitType',
-                'alias' => 'pointaction_formsubmit'
+                'alias' => 'pointaction_formsubmit',
             ],
-            'mautic.form.type.form_list'                 => [
+            'mautic.form.type.form_list' => [
                 'class'     => 'Mautic\FormBundle\Form\Type\FormListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'form_list'
+                'alias'     => 'form_list',
             ],
-            'mautic.form.type.campaignevent_formsubmit'  => [
+            'mautic.form.type.campaignevent_formsubmit' => [
                 'class' => 'Mautic\FormBundle\Form\Type\CampaignEventFormSubmitType',
-                'alias' => 'campaignevent_formsubmit'
+                'alias' => 'campaignevent_formsubmit',
             ],
-            'mautic.form.type.campaignevent_form_field_value'  => [
-                'class' => 'Mautic\FormBundle\Form\Type\CampaignEventFormFieldValueType',
+            'mautic.form.type.campaignevent_form_field_value' => [
+                'class'     => 'Mautic\FormBundle\Form\Type\CampaignEventFormFieldValueType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'campaignevent_form_field_value'
+                'alias'     => 'campaignevent_form_field_value',
             ],
-            'mautic.form.type.form_submitaction_sendemail'  => [
-                'class'     => 'Mautic\FormBundle\Form\Type\SubmitActionEmailType',
-                'arguments' => 'translator',
-                'alias'     => 'form_submitaction_sendemail',
-                'methodCalls'  => [
+            'mautic.form.type.form_submitaction_sendemail' => [
+                'class'       => 'Mautic\FormBundle\Form\Type\SubmitActionEmailType',
+                'arguments'   => 'translator',
+                'alias'       => 'form_submitaction_sendemail',
+                'methodCalls' => [
                     'setFieldModel' => ['mautic.form.model.field'],
                     'setFormModel'  => ['mautic.form.model.form'],
                 ],
             ],
             'mautic.form.type.form_submitaction_repost' => [
-                'class'     => \Mautic\FormBundle\Form\Type\SubmitActionRepostType::class,
-                'methodCalls'  => [
+                'class'       => \Mautic\FormBundle\Form\Type\SubmitActionRepostType::class,
+                'methodCalls' => [
                     'setFieldModel' => ['mautic.form.model.field'],
                     'setFormModel'  => ['mautic.form.model.form'],
                 ],
             ],
         ],
-        'models' =>  [
+        'models' => [
             'mautic.form.model.action' => [
-                'class' => 'Mautic\FormBundle\Model\ActionModel'
+                'class' => 'Mautic\FormBundle\Model\ActionModel',
             ],
             'mautic.form.model.field' => [
-                'class' => 'Mautic\FormBundle\Model\FieldModel',
+                'class'     => 'Mautic\FormBundle\Model\FieldModel',
                 'arguments' => [
                     'mautic.lead.model.field',
-                ]
+                ],
             ],
             'mautic.form.model.form' => [
-                'class' => 'Mautic\FormBundle\Model\FormModel',
+                'class'     => 'Mautic\FormBundle\Model\FormModel',
                 'arguments' => [
                     'request_stack',
                     'mautic.helper.templating',
@@ -272,10 +273,10 @@
                     'mautic.lead.model.lead',
                     'mautic.helper.form.field_helper',
                     'mautic.lead.model.field',
-                ]
+                ],
             ],
             'mautic.form.model.submission' => [
-                'class' => 'Mautic\FormBundle\Model\SubmissionModel',
+                'class'     => 'Mautic\FormBundle\Model\SubmissionModel',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.helper.templating',
@@ -286,17 +287,17 @@
                     'mautic.lead.model.field',
                     'mautic.lead.model.company',
                     'mautic.helper.form.field_helper',
-                ]
-            ]
+                ],
+            ],
         ],
         'other' => [
             'mautic.helper.form.field_helper' => [
-                'class' => \Mautic\FormBundle\Helper\FormFieldHelper::class,
+                'class'     => \Mautic\FormBundle\Helper\FormFieldHelper::class,
                 'arguments' => [
                     'translator',
-                    'validator'
-                ]
-            ]
-        ]
-    ]
+                    'validator',
+                ],
+            ],
+        ],
+    ],
 ];
diff --git a/app/bundles/FormBundle/Controller/ActionController.php b/app/bundles/FormBundle/Controller/ActionController.php
index f9a41f663f4..fa9d61dfbed 100644
--- a/app/bundles/FormBundle/Controller/ActionController.php
+++ b/app/bundles/FormBundle/Controller/ActionController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,20 +15,19 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class ActionController
+ * Class ActionController.
  */
 class ActionController extends CommonFormController
 {
-
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return JsonResponse
      */
-    public function newAction ()
+    public function newAction()
     {
         $success = 0;
-        $valid   = $cancelled = false;
+        $valid   = $cancelled   = false;
         $method  = $this->request->getMethod();
         $session = $this->get('session');
 
@@ -38,27 +38,27 @@ public function newAction ()
         } else {
             $actionType = $this->request->query->get('type');
             $formId     = $this->request->query->get('formId');
-            $formAction = array(
+            $formAction = [
                 'type'   => $actionType,
-                'formId' => $formId
-            );
+                'formId' => $formId,
+            ];
         }
 
         //ajax only for form fields
         if (!$actionType ||
             !$this->request->isXmlHttpRequest() ||
-            !$this->get('mautic.security')->isGranted(array('form:forms:editown', 'form:forms:editother', 'form:forms:create'), 'MATCH_ONE')
+            !$this->get('mautic.security')->isGranted(['form:forms:editown', 'form:forms:editother', 'form:forms:create'], 'MATCH_ONE')
         ) {
             return $this->modalAccessDenied();
         }
 
         //fire the form builder event
         $customComponents = $this->getModel('form.form')->getCustomComponents();
-        $form             = $this->get('form.factory')->create('formaction', $formAction, array(
-            'action'   => $this->generateUrl('mautic_formaction_action', array('objectAction' => 'new')),
+        $form             = $this->get('form.factory')->create('formaction', $formAction, [
+            'action'   => $this->generateUrl('mautic_formaction_action', ['objectAction' => 'new']),
             'settings' => $customComponents['actions'][$actionType],
-            'formId'   => $formId
-        ));
+            'formId'   => $formId,
+        ]);
         $form->get('formId')->setData($formId);
         $formAction['settings'] = $customComponents['actions'][$actionType];
 
@@ -69,10 +69,10 @@ public function newAction ()
                     $success = 1;
 
                     //form is valid so process the data
-                    $keyId = 'new' . hash('sha1', uniqid(mt_rand()));
+                    $keyId = 'new'.hash('sha1', uniqid(mt_rand()));
 
                     //save the properties to session
-                    $actions          = $session->get('mautic.form.'.$formId.'.actions.modified', array());
+                    $actions          = $session->get('mautic.form.'.$formId.'.actions.modified', []);
                     $formData         = $form->getData();
                     $formAction       = array_merge($formAction, $formData);
                     $formAction['id'] = $keyId;
@@ -88,7 +88,7 @@ public function newAction ()
             }
         }
 
-        $viewParams = array('type' => $actionType);
+        $viewParams = ['type' => $actionType];
 
         if ($cancelled || $valid) {
             $closeModal = true;
@@ -100,11 +100,11 @@ public function newAction ()
             $viewParams['actionHeader'] = $this->get('translator')->trans($header);
         }
 
-        $passthroughVars = array(
+        $passthroughVars = [
             'mauticContent' => 'formAction',
             'success'       => $success,
-            'route'         => false
-        );
+            'route'         => false,
+        ];
 
         if (!empty($keyId)) {
             //prevent undefined errors
@@ -112,15 +112,15 @@ public function newAction ()
             $blank      = $entity->convertToArray();
             $formAction = array_merge($blank, $formAction);
 
-            $template                      = (!empty($formAction['settings']['template'])) ? $formAction['settings']['template'] :
+            $template = (!empty($formAction['settings']['template'])) ? $formAction['settings']['template'] :
                 'MauticFormBundle:Action:generic.html.php';
             $passthroughVars['actionId']   = $keyId;
-            $passthroughVars['actionHtml'] = $this->renderView($template, array(
+            $passthroughVars['actionHtml'] = $this->renderView($template, [
                 'inForm' => true,
                 'action' => $formAction,
                 'id'     => $keyId,
-                'formId'  => $formId
-            ));
+                'formId' => $formId,
+            ]);
         }
 
         if ($closeModal) {
@@ -131,28 +131,28 @@ public function newAction ()
             return $response;
         }
 
-        return $this->ajaxAction(array(
-            'contentTemplate' => 'MauticFormBundle:Builder:' . $viewParams['tmpl'] . '.html.php',
+        return $this->ajaxAction([
+            'contentTemplate' => 'MauticFormBundle:Builder:'.$viewParams['tmpl'].'.html.php',
             'viewParameters'  => $viewParams,
-            'passthroughVars' => $passthroughVars
-        ));
+            'passthroughVars' => $passthroughVars,
+        ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int $objectId
      *
      * @return JsonResponse
      */
-    public function editAction ($objectId)
+    public function editAction($objectId)
     {
         $session    = $this->get('session');
         $method     = $this->request->getMethod();
-        $formId     = ($method == "POST") ? $this->request->request->get('formaction[formId]', '', true) : $this->request->query->get('formId');
-        $actions    = $session->get('mautic.form.'.$formId.'.actions.modified', array());
+        $formId     = ($method == 'POST') ? $this->request->request->get('formaction[formId]', '', true) : $this->request->query->get('formId');
+        $actions    = $session->get('mautic.form.'.$formId.'.actions.modified', []);
         $success    = 0;
-        $valid      = $cancelled = false;
+        $valid      = $cancelled      = false;
         $formAction = (array_key_exists($objectId, $actions)) ? $actions[$objectId] : null;
 
         if ($formAction !== null) {
@@ -163,16 +163,16 @@ public function editAction ($objectId)
             //ajax only for form fields
             if (!$actionType ||
                 !$this->request->isXmlHttpRequest() ||
-                !$this->get('mautic.security')->isGranted(array('form:forms:editown', 'form:forms:editother', 'form:forms:create'), 'MATCH_ONE')
+                !$this->get('mautic.security')->isGranted(['form:forms:editown', 'form:forms:editother', 'form:forms:create'], 'MATCH_ONE')
             ) {
                 return $this->modalAccessDenied();
             }
 
-            $form = $this->get('form.factory')->create('formaction', $formAction, array(
-                'action'   => $this->generateUrl('mautic_formaction_action', array('objectAction' => 'edit', 'objectId' => $objectId)),
+            $form = $this->get('form.factory')->create('formaction', $formAction, [
+                'action'   => $this->generateUrl('mautic_formaction_action', ['objectAction' => 'edit', 'objectId' => $objectId]),
                 'settings' => $formAction['settings'],
-                'formId'   => $formId
-            ));
+                'formId'   => $formId,
+            ]);
             $form->get('formId')->setData($formId);
 
             //Check for a submitted form and process it
@@ -201,7 +201,7 @@ public function editAction ($objectId)
 
                         //take note if this is a submit button or not
                         if ($actionType == 'button') {
-                            $submits = $session->get('mautic.formactions.submits', array());
+                            $submits = $session->get('mautic.formactions.submits', []);
                             if ($formAction['properties']['type'] == 'submit' && !in_array($keyId, $submits)) {
                                 //button type updated to submit
                                 $submits[] = $keyId;
@@ -217,7 +217,7 @@ public function editAction ($objectId)
                 }
             }
 
-            $viewParams = array('type' => $actionType);
+            $viewParams = ['type' => $actionType];
             if ($cancelled || $valid) {
                 $closeModal = true;
             } else {
@@ -227,27 +227,27 @@ public function editAction ($objectId)
                 $viewParams['actionHeader'] = $this->get('translator')->trans($formAction['settings']['label']);
             }
 
-            $passthroughVars = array(
+            $passthroughVars = [
                 'mauticContent' => 'formAction',
                 'success'       => $success,
-                'route'         => false
-            );
+                'route'         => false,
+            ];
 
             if (!empty($keyId)) {
                 $passthroughVars['actionId'] = $keyId;
 
                 //prevent undefined errors
-                $entity                        = new Action();
-                $blank                         = $entity->convertToArray();
-                $formAction                    = array_merge($blank, $formAction);
-                $template                      = (!empty($formAction['settings']['template'])) ? $formAction['settings']['template'] :
+                $entity     = new Action();
+                $blank      = $entity->convertToArray();
+                $formAction = array_merge($blank, $formAction);
+                $template   = (!empty($formAction['settings']['template'])) ? $formAction['settings']['template'] :
                     'MauticFormBundle:Action:generic.html.php';
-                $passthroughVars['actionHtml'] = $this->renderView($template, array(
+                $passthroughVars['actionHtml'] = $this->renderView($template, [
                     'inForm' => true,
                     'action' => $formAction,
                     'id'     => $keyId,
-                    'formId'  => $formId
-                ));
+                    'formId' => $formId,
+                ]);
             }
 
             if ($closeModal) {
@@ -258,26 +258,26 @@ public function editAction ($objectId)
                 return $response;
             }
 
-            return $this->ajaxAction(array(
-                'contentTemplate' => 'MauticFormBundle:Builder:' . $viewParams['tmpl'] . '.html.php',
+            return $this->ajaxAction([
+                'contentTemplate' => 'MauticFormBundle:Builder:'.$viewParams['tmpl'].'.html.php',
                 'viewParameters'  => $viewParams,
-                'passthroughVars' => $passthroughVars
-            ));
+                'passthroughVars' => $passthroughVars,
+            ]);
         }
 
-        $response = new JsonResponse(array('success' => 0));
+        $response = new JsonResponse(['success' => 0]);
 
         return $response;
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param $objectId
      *
      * @return JsonResponse
      */
-    public function deleteAction ($objectId)
+    public function deleteAction($objectId)
     {
         $session = $this->get('session');
         $formId  = $this->request->query->get('formId');
@@ -313,7 +313,7 @@ public function deleteAction ($objectId)
             $dataArray = [
                 'mauticContent' => 'formAction',
                 'success'       => 1,
-                'route'         => false
+                'route'         => false,
             ];
         } else {
             $dataArray = ['success' => 0];
diff --git a/app/bundles/FormBundle/Controller/AjaxController.php b/app/bundles/FormBundle/Controller/AjaxController.php
index 1139d55c760..3de70542963 100644
--- a/app/bundles/FormBundle/Controller/AjaxController.php
+++ b/app/bundles/FormBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,14 +13,12 @@
 use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
-
     /**
      * @param Request $request
      * @param string  $name
@@ -28,9 +27,9 @@ class AjaxController extends CommonAjaxController
      */
     protected function reorderFieldsAction(Request $request, $name = 'fields')
     {
-        $dataArray   = array('success' => 0);
+        $dataArray   = ['success' => 0];
         $sessionId   = InputHelper::clean($request->request->get('formId'));
-        $sessionName = 'mautic.form.'.$sessionId.'.' . $name . '.modified';
+        $sessionName = 'mautic.form.'.$sessionId.'.'.$name.'.modified';
         $session     = $this->get('session');
         $orderName   = ($name == 'fields') ? 'mauticform' : 'mauticform_action';
         $order       = InputHelper::clean($request->request->get($orderName));
@@ -50,58 +49,60 @@ protected function reorderFieldsAction(Request $request, $name = 'fields')
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    protected function reorderActionsAction(Request $request) {
+    protected function reorderActionsAction(Request $request)
+    {
         return $this->reorderFieldsAction($request, 'actions');
     }
 
     /**
      * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     protected function updateFormFieldsAction(Request $request)
     {
-        $formId    = InputHelper::int($request->request->get('formId'));
-        $dataArray = array('success' => 0);
-        $model = $this->getModel('form');
-        $entity = $model->getEntity($formId);
+        $formId     = InputHelper::int($request->request->get('formId'));
+        $dataArray  = ['success' => 0];
+        $model      = $this->getModel('form');
+        $entity     = $model->getEntity($formId);
         $formFields = $entity->getFields();
-        $fields = array();
+        $fields     = [];
 
         foreach ($formFields as $field) {
             if ($field->getType() != 'button') {
                 $properties = $field->getProperties();
-                $options = array();
+                $options    = [];
 
                 if (!empty($properties['list']['list'])) {
                     $options = $properties['list']['list'];
                 }
 
-                $fields[] = array(
+                $fields[] = [
                     'id'      => $field->getId(),
                     'label'   => $field->getLabel(),
                     'alias'   => $field->getAlias(),
                     'type'    => $field->getType(),
-                    'options' => $options
-                );
+                    'options' => $options,
+                ];
             }
         }
 
-        $dataArray['fields'] = $fields;
-        $dataArray['success']  = 1;
+        $dataArray['fields']  = $fields;
+        $dataArray['success'] = 1;
 
         return $this->sendJsonResponse($dataArray);
     }
 
     /**
-     * Ajax submit for forms
+     * Ajax submit for forms.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
     public function submitAction()
     {
-        $response = $this->forwardWithPost('MauticFormBundle:Public:submit', $this->request->request->all(), [], ['ajax' => true]);
+        $response     = $this->forwardWithPost('MauticFormBundle:Public:submit', $this->request->request->all(), [], ['ajax' => true]);
         $responseData = json_decode($response->getContent(), true);
-        $success = (!in_array($response->getStatusCode(), [404, 500]) && empty($responseData['errorMessage'])
+        $success      = (!in_array($response->getStatusCode(), [404, 500]) && empty($responseData['errorMessage'])
             && empty($responseData['validationErrors']));
 
         $message = '';
diff --git a/app/bundles/FormBundle/Controller/Api/FormApiController.php b/app/bundles/FormBundle/Controller/Api/FormApiController.php
index fdde507ac48..e12e67ff742 100644
--- a/app/bundles/FormBundle/Controller/Api/FormApiController.php
+++ b/app/bundles/FormBundle/Controller/Api/FormApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,14 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class FormApiController
+ * Class FormApiController.
  */
 class FormApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('form');
@@ -29,22 +29,22 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'form';
         $this->entityNameMulti  = 'forms';
         $this->permissionBase   = 'form:forms';
-        $this->serializerGroups = array('formDetails', 'categoryList', 'publishDetails');
+        $this->serializerGroups = ['formDetails', 'categoryList', 'publishDetails'];
     }
 
     /**
-     * Obtains a list of forms
+     * Obtains a list of forms.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function getEntitiesAction ()
+    public function getEntitiesAction()
     {
         if (!$this->security->isGranted('form:forms:viewother')) {
-            $this->listFilters = array(
+            $this->listFilters = [
                 'column' => 'f.createdBy',
                 'expr'   => 'eq',
-                'value'  => $this->user->getId()
-            );
+                'value'  => $this->user->getId(),
+            ];
         }
 
         return parent::getEntitiesAction();
@@ -53,8 +53,8 @@ public function getEntitiesAction ()
     /**
      * {@inheritdoc}
      */
-    protected function preSerializeEntity (&$entity, $action = 'view')
+    protected function preSerializeEntity(&$entity, $action = 'view')
     {
-        $entity->automaticJs = '<script type="text/javascript" src="' . $this->generateUrl('mautic_form_generateform', array('id' => $entity->getId()), true) . '"></script>';
+        $entity->automaticJs = '<script type="text/javascript" src="'.$this->generateUrl('mautic_form_generateform', ['id' => $entity->getId()], true).'"></script>';
     }
 }
diff --git a/app/bundles/FormBundle/Controller/FieldController.php b/app/bundles/FormBundle/Controller/FieldController.php
index dcc9c0a250c..8b489f22b5d 100644
--- a/app/bundles/FormBundle/Controller/FieldController.php
+++ b/app/bundles/FormBundle/Controller/FieldController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,44 +12,42 @@
 
 use Mautic\CoreBundle\Controller\FormController as CommonFormController;
 use Mautic\FormBundle\Entity\Field;
-use Mautic\LeadBundle\Model\FieldModel;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class FieldController
+ * Class FieldController.
  */
 class FieldController extends CommonFormController
 {
-
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return JsonResponse
      */
-    public function newAction ()
+    public function newAction()
     {
         $success = 0;
-        $valid   = $cancelled = false;
+        $valid   = $cancelled   = false;
         $method  = $this->request->getMethod();
         $session = $this->get('session');
 
         if ($method == 'POST') {
-            $formField          = $this->request->request->get('formfield');
-            $fieldType          = $formField['type'];
-            $formId             = $formField['formId'];
+            $formField = $this->request->request->get('formfield');
+            $fieldType = $formField['type'];
+            $formId    = $formField['formId'];
         } else {
             $fieldType = $this->request->query->get('type');
             $formId    = $this->request->query->get('formId');
-            $formField = array(
+            $formField = [
                 'type'   => $fieldType,
-                'formId' => $formId
-            );
+                'formId' => $formId,
+            ];
         }
 
         //ajax only for form fields
         if (!$fieldType ||
             !$this->request->isXmlHttpRequest() ||
-            !$this->get('mautic.security')->isGranted(array('form:forms:editown', 'form:forms:editother', 'form:forms:create'), 'MATCH_ONE')
+            !$this->get('mautic.security')->isGranted(['form:forms:editown', 'form:forms:editother', 'form:forms:create'], 'MATCH_ONE')
         ) {
             return $this->modalAccessDenied();
         }
@@ -68,16 +67,16 @@ public function newAction ()
                     $success = 1;
 
                     //form is valid so process the data
-                    $keyId = 'new' . hash('sha1', uniqid(mt_rand()));
+                    $keyId = 'new'.hash('sha1', uniqid(mt_rand()));
 
                     //save the properties to session
-                    $fields          = $session->get('mautic.form.'.$formId.'.fields.modified', array());
+                    $fields          = $session->get('mautic.form.'.$formId.'.fields.modified', []);
                     $formData        = $form->getData();
                     $formField       = array_merge($formField, $formData);
                     $formField['id'] = $keyId;
 
                     // Get aliases in order to generate a new one for the new field
-                    $aliases = array();
+                    $aliases = [];
                     foreach ($fields as $f) {
                         $aliases[] = $f['alias'];
                     }
@@ -106,7 +105,7 @@ public function newAction ()
                     $session->set('mautic.form.'.$formId.'.fields.modified', $fields);
 
                     // Keep track of used lead fields
-                    $usedLeadFields   = $this->get('session')->get('mautic.form.'.$formId.'.fields.leadfields', []);
+                    $usedLeadFields = $this->get('session')->get('mautic.form.'.$formId.'.fields.leadfields', []);
                     if (!empty($formData['leadField'])) {
                         $usedLeadFields[$keyId] = $formData['leadField'];
                     } else {
@@ -119,21 +118,21 @@ public function newAction ()
             }
         }
 
-        $viewParams = array('type' => $fieldType);
+        $viewParams = ['type' => $fieldType];
         if ($cancelled || $valid) {
             $closeModal = true;
         } else {
             $closeModal                = false;
             $viewParams['tmpl']        = 'field';
             $viewParams['form']        = (isset($customParams['formTheme'])) ? $this->setFormTheme($form, 'MauticFormBundle:Builder:field.html.php', $customParams['formTheme']) : $form->createView();
-            $viewParams['fieldHeader'] = (!empty($customParams)) ? $this->get('translator')->trans($customParams['label']) : $this->get('translator')->transConditional('mautic.core.type.' . $fieldType, 'mautic.form.field.type.' . $fieldType);
+            $viewParams['fieldHeader'] = (!empty($customParams)) ? $this->get('translator')->trans($customParams['label']) : $this->get('translator')->transConditional('mautic.core.type.'.$fieldType, 'mautic.form.field.type.'.$fieldType);
         }
 
-        $passthroughVars = array(
+        $passthroughVars = [
             'mauticContent' => 'formField',
             'success'       => $success,
-            'route'         => false
-        );
+            'route'         => false,
+        ];
 
         if (!empty($keyId)) {
             //prevent undefined errors
@@ -151,7 +150,7 @@ public function newAction ()
                     'field'         => $formField,
                     'id'            => $keyId,
                     'formId'        => $formId,
-                    'contactFields' => $this->getModel('lead.field')->getFieldListWithProperties()
+                    'contactFields' => $this->getModel('lead.field')->getFieldListWithProperties(),
                 ]
             );
         }
@@ -164,28 +163,28 @@ public function newAction ()
             return $response;
         }
 
-        return $this->ajaxAction(array(
-            'contentTemplate' => 'MauticFormBundle:Builder:' . $viewParams['tmpl'] . '.html.php',
+        return $this->ajaxAction([
+            'contentTemplate' => 'MauticFormBundle:Builder:'.$viewParams['tmpl'].'.html.php',
             'viewParameters'  => $viewParams,
-            'passthroughVars' => $passthroughVars
-        ));
+            'passthroughVars' => $passthroughVars,
+        ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int $objectId
      *
      * @return JsonResponse
      */
-    public function editAction ($objectId)
+    public function editAction($objectId)
     {
         $session   = $this->get('session');
         $method    = $this->request->getMethod();
-        $formId    = ($method == "POST") ? $this->request->request->get('formfield[formId]', '', true) : $this->request->query->get('formId');
+        $formId    = ($method == 'POST') ? $this->request->request->get('formfield[formId]', '', true) : $this->request->query->get('formId');
         $fields    = $session->get('mautic.form.'.$formId.'.fields.modified', []);
         $success   = 0;
-        $valid     = $cancelled = false;
+        $valid     = $cancelled     = false;
         $formField = (array_key_exists($objectId, $fields)) ? $fields[$objectId] : [];
 
         if ($formField !== null) {
@@ -194,7 +193,7 @@ public function editAction ($objectId)
             //ajax only for form fields
             if (!$fieldType ||
                 !$this->request->isXmlHttpRequest() ||
-                !$this->get('mautic.security')->isGranted(array('form:forms:editown', 'form:forms:editother', 'form:forms:create'), 'MATCH_ONE')
+                !$this->get('mautic.security')->isGranted(['form:forms:editown', 'form:forms:editother', 'form:forms:create'], 'MATCH_ONE')
             ) {
                 return $this->modalAccessDenied();
             }
@@ -238,7 +237,7 @@ public function editAction ($objectId)
                         $session->set('mautic.form.'.$formId.'.fields.modified', $fields);
 
                         // Keep track of used lead fields
-                        $usedLeadFields   = $this->get('session')->get('mautic.form.'.$formId.'.fields.leadfields', []);
+                        $usedLeadFields = $this->get('session')->get('mautic.form.'.$formId.'.fields.leadfields', []);
                         if (!empty($formData['leadField'])) {
                             $usedLeadFields[$objectId] = $formData['leadField'];
                         } else {
@@ -253,9 +252,9 @@ public function editAction ($objectId)
             if ($cancelled || $valid) {
                 $closeModal = true;
             } else {
-                $closeModal                = false;
-                $viewParams['tmpl']        = 'field';
-                $viewParams['form']        = (isset($customParams['formTheme'])) ? $this->setFormTheme(
+                $closeModal         = false;
+                $viewParams['tmpl'] = 'field';
+                $viewParams['form'] = (isset($customParams['formTheme'])) ? $this->setFormTheme(
                     $form,
                     'MauticFormBundle:Builder:field.html.php',
                     $customParams['formTheme']
@@ -270,7 +269,7 @@ public function editAction ($objectId)
             $passthroughVars = [
                 'mauticContent' => 'formField',
                 'success'       => $success,
-                'route'         => false
+                'route'         => false,
             ];
 
             $passthroughVars['fieldId'] = $objectId;
@@ -293,7 +292,7 @@ public function editAction ($objectId)
                     'field'         => $formField,
                     'id'            => $objectId,
                     'formId'        => $formId,
-                    'contactFields' => $this->getModel('lead.field')->getFieldListWithProperties()
+                    'contactFields' => $this->getModel('lead.field')->getFieldListWithProperties(),
                 ]
             );
 
@@ -309,7 +308,7 @@ public function editAction ($objectId)
                 [
                     'contentTemplate' => 'MauticFormBundle:Builder:'.$viewParams['tmpl'].'.html.php',
                     'viewParameters'  => $viewParams,
-                    'passthroughVars' => $passthroughVars
+                    'passthroughVars' => $passthroughVars,
                 ]
             );
         }
@@ -320,13 +319,13 @@ public function editAction ($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
      * @return JsonResponse
      */
-    public function deleteAction ($objectId)
+    public function deleteAction($objectId)
     {
         $session = $this->get('session');
         $formId  = $this->request->query->get('formId');
@@ -343,7 +342,6 @@ public function deleteAction ($objectId)
         $formField = (array_key_exists($objectId, $fields)) ? $fields[$objectId] : null;
 
         if ($this->request->getMethod() == 'POST' && $formField !== null) {
-
             $usedLeadFields = $session->get('mautic.form.'.$formId.'.fields.leadfields');
 
             // Allow to select the lead field from the delete field again
diff --git a/app/bundles/FormBundle/Controller/FormController.php b/app/bundles/FormBundle/Controller/FormController.php
index 3f44577d29a..06a572434a4 100644
--- a/app/bundles/FormBundle/Controller/FormController.php
+++ b/app/bundles/FormBundle/Controller/FormController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,11 +18,10 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class FormController
+ * Class FormController.
  */
 class FormController extends CommonFormController
 {
-
     /**
      * @param int $page
      *
@@ -40,10 +40,10 @@ public function indexAction($page = 1)
                 'form:forms:deleteown',
                 'form:forms:deleteother',
                 'form:forms:publishown',
-                'form:forms:publishother'
+                'form:forms:publishother',
 
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if (!$permissions['form:forms:viewown'] && !$permissions['form:forms:viewother']) {
@@ -69,7 +69,7 @@ public function indexAction($page = 1)
         $filter = ['string' => $search, 'force' => []];
 
         if (!$permissions['form:forms:viewother']) {
-            $filter['force'][] = array('column' => 'f.createdBy', 'expr' => 'eq', 'value' => $this->user->getId());
+            $filter['force'][] = ['column' => 'f.createdBy', 'expr' => 'eq', 'value' => $this->user->getId()];
         }
 
         $orderBy    = $session->get('mautic.form.orderby', 'f.name');
@@ -81,7 +81,7 @@ public function indexAction($page = 1)
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
+                'orderByDir' => $orderByDir,
             ]
         );
 
@@ -101,8 +101,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticFormBundle:Form:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_form_index',
-                        'mauticContent' => 'form'
-                    ]
+                        'mauticContent' => 'form',
+                    ],
                 ]
             );
         }
@@ -118,7 +118,7 @@ public function indexAction($page = 1)
             'limit'       => $limit,
             'permissions' => $permissions,
             'security'    => $this->get('mautic.security'),
-            'tmpl'        => $this->request->get('tmpl', 'index')
+            'tmpl'        => $this->request->get('tmpl', 'index'),
         ];
 
         return $this->delegateView(
@@ -128,14 +128,14 @@ public function indexAction($page = 1)
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_form_index',
                     'mauticContent' => 'form',
-                    'route'         => $this->generateUrl('mautic_form_index', ['page' => $page])
-                ]
+                    'route'         => $this->generateUrl('mautic_form_index', ['page' => $page]),
+                ],
             ]
         );
     }
 
     /**
-     * Loads a specific form into the detailed panel
+     * Loads a specific form into the detailed panel.
      *
      * @param int $objectId
      *
@@ -161,15 +161,15 @@ public function viewAction($objectId)
                     'contentTemplate' => 'MauticFormBundle:Form:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_form_index',
-                        'mauticContent' => 'form'
+                        'mauticContent' => 'form',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.form.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -191,10 +191,10 @@ public function viewAction($objectId)
                 'form:forms:deleteown',
                 'form:forms:deleteother',
                 'form:forms:publishown',
-                'form:forms:publishother'
+                'form:forms:publishother',
 
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         // Audit Log
@@ -238,34 +238,35 @@ public function viewAction($objectId)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
-                    'activeForm'        => $activeForm,
-                    'page'              => $page,
-                    'logs'              => $logs,
-                    'permissions'       => $permissions,
-                    'stats'             => [
+                'viewParameters' => [
+                    'activeForm'  => $activeForm,
+                    'page'        => $page,
+                    'logs'        => $logs,
+                    'permissions' => $permissions,
+                    'stats'       => [
                         'submissionsInTime' => $timeStats,
                     ],
                     'dateRangeForm'     => $dateRangeForm->createView(),
                     'activeFormActions' => $activeFormActions,
                     'activeFormFields'  => $activeFormFields,
-                    'formScript'        => htmlspecialchars($model->getFormScript($activeForm), ENT_QUOTES, "UTF-8"),
-                    'formContent'       => htmlspecialchars($model->getContent($activeForm, false), ENT_QUOTES, "UTF-8")
+                    'formScript'        => htmlspecialchars($model->getFormScript($activeForm), ENT_QUOTES, 'UTF-8'),
+                    'formContent'       => htmlspecialchars($model->getContent($activeForm, false), ENT_QUOTES, 'UTF-8'),
                 ],
                 'contentTemplate' => 'MauticFormBundle:Form:details.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_form_index',
                     'mauticContent' => 'form',
-                    'route'         => $action
-                ]
+                    'route'         => $action,
+                ],
             ]
         );
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return array|\Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
+     *
      * @throws \Exception
      */
     public function newAction()
@@ -346,19 +347,19 @@ public function newAction()
                                         'mautic_form_action',
                                         [
                                             'objectAction' => 'edit',
-                                            'objectId'     => $entity->getId()
+                                            'objectId'     => $entity->getId(),
                                         ]
-                                    )
+                                    ),
                                 ]
                             );
 
                             if ($form->get('buttons')->get('save')->isClicked()) {
                                 $viewParameters = [
                                     'objectAction' => 'view',
-                                    'objectId'     => $entity->getId()
+                                    'objectId'     => $entity->getId(),
                                 ];
-                                $returnUrl      = $this->generateUrl('mautic_form_action', $viewParameters);
-                                $template       = 'MauticFormBundle:Form:view';
+                                $returnUrl = $this->generateUrl('mautic_form_action', $viewParameters);
+                                $template  = 'MauticFormBundle:Form:view';
                             } else {
                                 //return edit view so that all the session stuff is loaded
                                 return $this->editAction($entity->getId(), true);
@@ -392,8 +393,8 @@ public function newAction()
                         'contentTemplate' => $template,
                         'passthroughVars' => [
                             'activeLink'    => '#mautic_form_index',
-                            'mauticContent' => 'form'
-                        ]
+                            'mauticContent' => 'form',
+                        ],
                     ]
                 );
             }
@@ -427,7 +428,7 @@ public function newAction()
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'fields'         => $fieldHelper->getChoiceList($customComponents['fields']),
                     'actions'        => $customComponents['choices'],
                     'actionSettings' => $customComponents['actions'],
@@ -448,16 +449,16 @@ public function newAction()
                         'mautic_form_action',
                         [
                             'objectAction' => (!empty($valid) ? 'edit' : 'new'), //valid means a new form was applied
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -500,8 +501,8 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             'contentTemplate' => 'MauticFormBundle:Form:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_form_index',
-                'mauticContent' => 'form'
-            ]
+                'mauticContent' => 'form',
+            ],
         ];
 
         //form not found
@@ -514,9 +515,9 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.form.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -612,19 +613,19 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                                     'mautic_form_action',
                                     [
                                         'objectAction' => 'edit',
-                                        'objectId'     => $entity->getId()
+                                        'objectId'     => $entity->getId(),
                                     ]
-                                )
+                                ),
                             ]
                         );
 
                         if ($form->get('buttons')->get('save')->isClicked()) {
                             $viewParameters = [
                                 'objectAction' => 'view',
-                                'objectId'     => $entity->getId()
+                                'objectId'     => $entity->getId(),
                             ];
-                            $returnUrl      = $this->generateUrl('mautic_form_action', $viewParameters);
-                            $template       = 'MauticFormBundle:Form:view';
+                            $returnUrl = $this->generateUrl('mautic_form_action', $viewParameters);
+                            $template  = 'MauticFormBundle:Form:view';
                         }
                     }
                 }
@@ -652,7 +653,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                         [
                             'returnUrl'       => $returnUrl,
                             'viewParameters'  => $viewParameters,
-                            'contentTemplate' => $template
+                            'contentTemplate' => $template,
                         ]
                     )
                 );
@@ -771,7 +772,7 @@ function ($a, $b) {
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'fields'             => $availableFields,
                     'actions'            => $customComponents['choices'],
                     'actionSettings'     => $customComponents['actions'],
@@ -794,16 +795,16 @@ function ($a, $b) {
                         'mautic_form_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -854,7 +855,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Gives a preview of the form
+     * Gives a preview of the form.
      *
      * @param int $objectId
      *
@@ -887,7 +888,7 @@ public function previewAction($objectId)
         $viewParams = [
             'content'     => $html,
             'stylesheets' => [],
-            'name'        => $form->getName()
+            'name'        => $form->getName(),
         ];
 
         $template = $form->getTemplate();
@@ -932,7 +933,7 @@ public function previewAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -941,8 +942,8 @@ public function previewAction($objectId)
     public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.form.page', 1);
-        $returnUrl = $this->generateUrl('mautic_form_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_form_index', ['page' => $page]);
+        $flashes   = [];
 
         $postActionVars = [
             'returnUrl'       => $returnUrl,
@@ -950,8 +951,8 @@ public function deleteAction($objectId)
             'contentTemplate' => 'MauticFormBundle:Form:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_form_index',
-                'mauticContent' => 'form'
-            ]
+                'mauticContent' => 'form',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -962,7 +963,7 @@ public function deleteAction($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.form.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'form:forms:deleteown',
@@ -983,8 +984,8 @@ public function deleteAction($objectId)
                 'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $identifier,
-                    '%id%'   => $objectId
-                ]
+                    '%id%'   => $objectId,
+                ],
             ];
         } //else don't do anything
 
@@ -992,22 +993,22 @@ public function deleteAction($objectId)
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function batchDeleteAction()
     {
         $page      = $this->get('session')->get('mautic.form.page', 1);
-        $returnUrl = $this->generateUrl('mautic_form_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_form_index', ['page' => $page]);
+        $flashes   = [];
 
         $postActionVars = [
             'returnUrl'       => $returnUrl,
@@ -1015,8 +1016,8 @@ public function batchDeleteAction()
             'contentTemplate' => 'MauticFormBundle:Form:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_form_index',
-                'mauticContent' => 'form'
-            ]
+                'mauticContent' => 'form',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -1032,7 +1033,7 @@ public function batchDeleteAction()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.form.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     'form:forms:deleteown',
@@ -1056,8 +1057,8 @@ public function batchDeleteAction()
                     'type'    => 'notice',
                     'msg'     => 'mautic.form.notice.batch_deleted',
                     'msgVars' => [
-                        '%count%' => count($entities)
-                    ]
+                        '%count%' => count($entities),
+                    ],
                 ];
             }
         } //else don't do anything
@@ -1066,14 +1067,14 @@ public function batchDeleteAction()
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Clear field and actions from the session
+     * Clear field and actions from the session.
      */
     public function clearSessionComponents($sessionId)
     {
@@ -1086,14 +1087,11 @@ public function clearSessionComponents($sessionId)
         $session->remove('mautic.form.'.$sessionId.'.actions.deleted');
     }
 
-    /**
-     *
-     */
     public function batchRebuildHtmlAction()
     {
         $page      = $this->get('session')->get('mautic.form.page', 1);
-        $returnUrl = $this->generateUrl('mautic_form_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_form_index', ['page' => $page]);
+        $flashes   = [];
 
         $postActionVars = [
             'returnUrl'       => $returnUrl,
@@ -1101,8 +1099,8 @@ public function batchRebuildHtmlAction()
             'contentTemplate' => 'MauticFormBundle:Form:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_form_index',
-                'mauticContent' => 'form'
-            ]
+                'mauticContent' => 'form',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -1118,7 +1116,7 @@ public function batchRebuildHtmlAction()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.form.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     'form:forms:editown',
@@ -1131,7 +1129,7 @@ public function batchRebuildHtmlAction()
                     $flashes[] = $this->isLocked($postActionVars, $entity, 'form.form', true);
                 } else {
                     $model->generateHtml($entity);
-                    $count++;
+                    ++$count;
                 }
             }
 
@@ -1140,8 +1138,8 @@ public function batchRebuildHtmlAction()
                 'msg'     => 'mautic.form.notice.batch_html_generated',
                 'msgVars' => [
                     'pluralCount' => $count,
-                    '%count%'     => $count
-                ]
+                    '%count%'     => $count,
+                ],
             ];
         } //else don't do anything
 
@@ -1149,7 +1147,7 @@ public function batchRebuildHtmlAction()
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
diff --git a/app/bundles/FormBundle/Controller/PublicController.php b/app/bundles/FormBundle/Controller/PublicController.php
index 1fb4d656e45..f0aff85d7ba 100644
--- a/app/bundles/FormBundle/Controller/PublicController.php
+++ b/app/bundles/FormBundle/Controller/PublicController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,7 +20,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class PublicController
+ * Class PublicController.
  */
 class PublicController extends CommonFormController
 {
@@ -47,7 +48,6 @@ public function submitAction()
             //remove mauticError and mauticMessage from the referer so it doesn't get sent back
             $return = InputHelper::url($return, null, null, null, ['mauticError', 'mauticMessage'], true);
             $query  = (strpos($return, '?') === false) ? '?' : '&';
-
         }
 
         $translator = $this->get('translator');
@@ -80,7 +80,7 @@ public function submitAction()
                     $error = $translator->trans(
                         'mautic.form.submit.error.pending',
                         [
-                            '%date%' => $dateTemplateHelper->toFull($form->getPublishUp())
+                            '%date%' => $dateTemplateHelper->toFull($form->getPublishUp()),
                         ],
                         'flashes'
                     );
@@ -88,7 +88,7 @@ public function submitAction()
                     $error = $translator->trans(
                         'mautic.form.submit.error.expired',
                         [
-                            '%date%' => $dateTemplateHelper->toFull($form->getPublishDown())
+                            '%date%' => $dateTemplateHelper->toFull($form->getPublishDown()),
                         ],
                         'flashes'
                     );
@@ -102,7 +102,7 @@ public function submitAction()
                         } else {
                             $error = ($result['errors']) ?
                                 $this->get('translator')->trans('mautic.form.submission.errors').'<br /><ol><li>'.
-                                implode("</li><li>", $result['errors']).'</li></ol>' : false;
+                                implode('</li><li>', $result['errors']).'</li></ol>' : false;
                         }
                     } elseif (!empty($result['callback'])) {
                         /** @var SubmissionEvent $submissionEvent */
@@ -255,7 +255,6 @@ public function submitAction()
                     $msgType = 'error';
                 }
             } elseif ($postAction == 'redirect') {
-
                 return $this->redirect($postActionProperty);
             } elseif ($postAction == 'return') {
                 if (!empty($return)) {
@@ -276,7 +275,7 @@ public function submitAction()
                 'mautic.emailbundle.message',
                 [
                     'message' => $msg,
-                    'type'    => (empty($msgType)) ? 'notice' : $msgType
+                    'type'    => (empty($msgType)) ? 'notice' : $msgType,
                 ]
             );
 
@@ -285,39 +284,40 @@ public function submitAction()
     }
 
     /**
-     * Displays a message
+     * Displays a message.
      *
      * @return Response
      */
     public function messageAction()
     {
         $session = $this->get('session');
-        $message = $session->get('mautic.emailbundle.message', array());
+        $message = $session->get('mautic.emailbundle.message', []);
 
         $msg     = (!empty($message['message'])) ? $message['message'] : '';
         $msgType = (!empty($message['type'])) ? $message['type'] : 'notice';
 
         $analytics = $this->factory->getHelper('template.analytics')->getCode();
 
-        if (! empty($analytics)) {
+        if (!empty($analytics)) {
             $this->factory->getHelper('template.assets')->addCustomDeclaration($analytics);
         }
 
-        $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $this->coreParametersHelper->getParameter('theme') . ':message.html.php');
+        $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$this->coreParametersHelper->getParameter('theme').':message.html.php');
 
-        return $this->render($logicalName, array(
+        return $this->render($logicalName, [
             'message'  => $msg,
             'type'     => $msgType,
-            'template' => $this->coreParametersHelper->getParameter('theme')
-        ));
+            'template' => $this->coreParametersHelper->getParameter('theme'),
+        ]);
     }
 
     /**
-     * Gives a preview of the form
+     * Gives a preview of the form.
      *
      * @param int $id
      *
      * @return Response
+     *
      * @throws \Exception
      * @throws \Mautic\CoreBundle\Exception\FileNotFoundException
      */
@@ -331,20 +331,17 @@ public function previewAction($id = 0)
         $template          = null;
 
         if ($form === null || !$form->isPublished()) {
-
             $this->notFound();
-
         } else {
-
             $html = $model->getContent($form);
 
             $model->populateValuesWithGetParameters($form, $html);
 
-            $viewParams = array(
+            $viewParams = [
                 'content'     => $html,
                 'stylesheets' => $customStylesheets,
-                'name'        => $form->getName()
-            );
+                'name'        => $form->getName(),
+            ];
 
             $template = $form->getTemplate();
             if (!empty($template)) {
@@ -362,12 +359,12 @@ public function previewAction($id = 0)
 
         $viewParams['template'] = $template;
 
-        if (! empty($template)) {
-            $logicalName  = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $template . ':form.html.php');
+        if (!empty($template)) {
+            $logicalName  = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$template.':form.html.php');
             $assetsHelper = $this->factory->getHelper('template.assets');
             $analytics    = $this->factory->getHelper('template.analytics')->getCode();
 
-            if (! empty($customStylesheets)) {
+            if (!empty($customStylesheets)) {
                 foreach ($customStylesheets as $css) {
                     $assetsHelper->addStylesheet($css);
                 }
@@ -375,8 +372,7 @@ public function previewAction($id = 0)
 
             $this->factory->getHelper('template.slots')->set('pageTitle', $form->getName());
 
-
-            if (! empty($analytics)) {
+            if (!empty($analytics)) {
                 $assetsHelper->addCustomDeclaration($analytics);
             }
 
@@ -387,7 +383,7 @@ public function previewAction($id = 0)
     }
 
     /**
-     * Generates JS file for automatic form generation
+     * Generates JS file for automatic form generation.
      *
      * @return Response
      */
@@ -395,9 +391,9 @@ public function generateAction()
     {
         $formId = InputHelper::int($this->request->get('id'));
 
-        $model  = $this->getModel('form.form');
-        $form   = $model->getEntity($formId);
-        $js     = '';
+        $model = $this->getModel('form.form');
+        $form  = $model->getEntity($formId);
+        $js    = '';
 
         if ($form !== null) {
             $status = $form->getPublishStatus();
@@ -410,6 +406,7 @@ public function generateAction()
         $response->setContent($js);
         $response->setStatusCode(Response::HTTP_OK);
         $response->headers->set('Content-Type', 'text/javascript');
+
         return $response;
     }
 
@@ -421,7 +418,7 @@ public function embedAction()
         $formId = InputHelper::int($this->request->get('id'));
         /** @var FormModel $model */
         $model = $this->getModel('form');
-        $form = $model->getEntity($formId);
+        $form  = $model->getEntity($formId);
 
         if ($form !== null) {
             $status = $form->getPublishStatus();
diff --git a/app/bundles/FormBundle/Controller/ResultController.php b/app/bundles/FormBundle/Controller/ResultController.php
index d10297c70be..9aba325b4bd 100644
--- a/app/bundles/FormBundle/Controller/ResultController.php
+++ b/app/bundles/FormBundle/Controller/ResultController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\FormBundle\Model\FormModel;
 
 /**
- * Class ResultController
+ * Class ResultController.
  */
 class ResultController extends CommonFormController
 {
-
     /**
      * @param int $objectId
      * @param int $page
@@ -43,15 +43,15 @@ public function indexAction($objectId, $page)
                     'contentTemplate' => 'MauticFormBundle:Form:index',
                     'passthroughVars' => [
                         'activeLink'    => 'mautic_form_index',
-                        'mauticContent' => 'form'
+                        'mauticContent' => 'form',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.form.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -88,7 +88,7 @@ public function indexAction($objectId, $page)
 
         if ($this->request->query->has('result')) {
             // Force ID
-            $filters['s.id'] = ['column' => 's.id', 'expr' => 'like', 'value' => (int) $this->request->query->get('result'), 'strict' => false,];
+            $filters['s.id'] = ['column' => 's.id', 'expr' => 'like', 'value' => (int) $this->request->query->get('result'), 'strict' => false];
             $session->set("mautic.formresult.$objectId.filters", $filters);
         }
 
@@ -123,8 +123,8 @@ public function indexAction($objectId, $page)
                     'contentTemplate' => 'MauticFormBundle:Result:index',
                     'passthroughVars' => [
                         'activeLink'    => 'mautic_form_index',
-                        'mauticContent' => 'formresult'
-                    ]
+                        'mauticContent' => 'formresult',
+                    ],
                 ]
             );
         }
@@ -136,7 +136,7 @@ public function indexAction($objectId, $page)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'items'          => $results,
                     'filters'        => $filters,
                     'form'           => $form,
@@ -149,7 +149,7 @@ public function indexAction($objectId, $page)
                         'form:forms:editown',
                         'form:forms:editother',
                         $form->getCreatedBy()
-                    )
+                    ),
                 ],
                 'contentTemplate' => 'MauticFormBundle:Result:list.html.php',
                 'passthroughVars' => [
@@ -159,10 +159,10 @@ public function indexAction($objectId, $page)
                         'mautic_form_results',
                         [
                             'objectId' => $objectId,
-                            'page'     => $page
+                            'page'     => $page,
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
@@ -172,6 +172,7 @@ public function indexAction($objectId, $page)
      * @param string $format
      *
      * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     *
      * @throws \Exception
      */
     public function exportAction($objectId, $format = 'csv')
@@ -191,15 +192,15 @@ public function exportAction($objectId, $format = 'csv')
                     'contentTemplate' => 'MauticFormBundle:Form:index',
                     'passthroughVars' => [
                         'activeLink'    => 'mautic_form_index',
-                        'mauticContent' => 'form'
+                        'mauticContent' => 'form',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.form.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -216,11 +217,11 @@ public function exportAction($objectId, $format = 'csv')
         $filters    = $session->get('mautic.formresult.'.$objectId.'.filters', []);
 
         $args = [
-            'limit'          => false,
-            'filter'         => ['force' => $filters],
-            'orderBy'        => $orderBy,
-            'orderByDir'     => $orderByDir,
-            'form'           => $form
+            'limit'      => false,
+            'filter'     => ['force' => $filters],
+            'orderBy'    => $orderBy,
+            'orderByDir' => $orderByDir,
+            'form'       => $form,
         ];
 
         /** @var \Mautic\FormBundle\Model\SubmissionModel $model */
@@ -230,7 +231,7 @@ public function exportAction($objectId, $format = 'csv')
     }
 
     /**
-     * Delete a form result
+     * Delete a form result.
      *
      * @param     $formId
      * @param int $objectId
@@ -255,7 +256,7 @@ public function deleteAction($formId, $objectId = 0)
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.form.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess('form:forms:editown', 'form:forms:editother', $form->getCreatedBy())) {
                     return $this->accessDenied();
@@ -272,12 +273,11 @@ public function deleteAction($formId, $objectId = 0)
                             'msg'     => 'mautic.form.notice.batch_results_deleted',
                             'msgVars' => [
                                 '%count%'     => count($entities),
-                                'pluralCount' => count($entities)
-                            ]
+                                'pluralCount' => count($entities),
+                            ],
                         ];
                     }
                 }
-
             } else {
                 // Find the result
                 $entity = $model->getEntity($objectId);
@@ -286,7 +286,7 @@ public function deleteAction($formId, $objectId = 0)
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.form.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } else {
                     // Check to see if the user has form edit access
@@ -304,14 +304,14 @@ public function deleteAction($formId, $objectId = 0)
                     'msg'     => 'mautic.core.notice.deleted',
                     'msgVars' => [
                         '%name%' => '#'.$entity->getId(),
-                    ]
+                    ],
                 ];
             }
         } //else don't do anything
 
         $viewParameters = [
             'objectId' => $form->getId(),
-            'page'     => $page
+            'page'     => $page,
         ];
 
         return $this->postActionRedirect(
@@ -320,9 +320,9 @@ public function deleteAction($formId, $objectId = 0)
                 'viewParameters'  => $viewParameters,
                 'contentTemplate' => 'MauticFormBundle:Result:index',
                 'passthroughVars' => [
-                    'mauticContent' => 'formresult'
+                    'mauticContent' => 'formresult',
                 ],
-                'flashes'         => $flashes
+                'flashes' => $flashes,
             ]
         );
     }
diff --git a/app/bundles/FormBundle/Controller/SubscribedEvents/BuilderTokenController.php b/app/bundles/FormBundle/Controller/SubscribedEvents/BuilderTokenController.php
index f24651cb24f..ad1411b5c04 100644
--- a/app/bundles/FormBundle/Controller/SubscribedEvents/BuilderTokenController.php
+++ b/app/bundles/FormBundle/Controller/SubscribedEvents/BuilderTokenController.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Controller\SubscribedEvents;
 
-
 /**
- * Class BuilderTokenController
+ * Class BuilderTokenController.
  */
 class BuilderTokenController extends \Mautic\CoreBundle\Controller\SubscribedEvents\BuilderTokenController
 {
diff --git a/app/bundles/FormBundle/DataFixtures/ORM/LoadFormData.php b/app/bundles/FormBundle/DataFixtures/ORM/LoadFormData.php
index 27c61b8f445..a17e4c0a5a3 100644
--- a/app/bundles/FormBundle/DataFixtures/ORM/LoadFormData.php
+++ b/app/bundles/FormBundle/DataFixtures/ORM/LoadFormData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,11 +21,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadFormData
+ * Class LoadFormData.
  */
 class LoadFormData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -43,21 +43,21 @@ public function setContainer(ContainerInterface $container = null)
      */
     public function load(ObjectManager $manager)
     {
-        $factory = $this->container->get('mautic.factory');
-        $model   = $factory->getModel('form.form');
-        $repo    = $model->getRepository();
-        $forms = CsvHelper::csv_to_array(__DIR__ . '/fakeformdata.csv');
-        $formEntities = array();
+        $factory      = $this->container->get('mautic.factory');
+        $model        = $factory->getModel('form.form');
+        $repo         = $model->getRepository();
+        $forms        = CsvHelper::csv_to_array(__DIR__.'/fakeformdata.csv');
+        $formEntities = [];
         foreach ($forms as $count => $rows) {
             $form = new Form();
-            $key = $count+1;
+            $key  = $count + 1;
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set" . ucfirst($col);
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
 
-                    if (in_array($col, array('dateAdded'))) {
+                    if (in_array($col, ['dateAdded'])) {
                         $form->$setter(new \DateTime($val));
-                    } elseif (in_array($col, array('cachedHtml'))) {
+                    } elseif (in_array($col, ['cachedHtml'])) {
                         $val = stripslashes($val);
                         $form->$setter($val);
                     } else {
@@ -71,19 +71,19 @@ public function load(ObjectManager $manager)
         }
 
         //import fields
-        $fields = CsvHelper::csv_to_array(__DIR__ . '/fakefielddata.csv');
+        $fields = CsvHelper::csv_to_array(__DIR__.'/fakefielddata.csv');
         $repo   = $factory->getModel('form.field')->getRepository();
         foreach ($fields as $count => $rows) {
             $field = new Field();
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set" . ucfirst($col);
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
 
-                    if (in_array($col, array('form'))) {
+                    if (in_array($col, ['form'])) {
                         $form = $this->getReference('form-'.$val);
                         $field->$setter($form);
                         $form->addField($count, $field);
-                    } elseif (in_array($col, array('customParameters','properties'))) {
+                    } elseif (in_array($col, ['customParameters', 'properties'])) {
                         $val = unserialize(stripslashes($val));
                         $field->$setter($val);
                     } else {
@@ -95,17 +95,17 @@ public function load(ObjectManager $manager)
         }
 
         //import actions
-        $actions = CsvHelper::csv_to_array(__DIR__ . '/fakeactiondata.csv');
+        $actions = CsvHelper::csv_to_array(__DIR__.'/fakeactiondata.csv');
         $repo    = $factory->getModel('form.action')->getRepository();
         foreach ($actions as $count => $rows) {
             $action = new Action();
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set" . ucfirst($col);
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
 
-                    if (in_array($col, array('form'))) {
+                    if (in_array($col, ['form'])) {
                         $action->$setter($this->getReference('form-'.$val));
-                    }  elseif (in_array($col, array('properties'))) {
+                    } elseif (in_array($col, ['properties'])) {
                         $val = unserialize(stripslashes($val));
                         if ($col == 'settings') {
                             $val['callback'] = stripslashes($val['callback']);
diff --git a/app/bundles/FormBundle/DataFixtures/ORM/LoadFormResultData.php b/app/bundles/FormBundle/DataFixtures/ORM/LoadFormResultData.php
index 2ff1202a14e..4fa62b8a3e0 100644
--- a/app/bundles/FormBundle/DataFixtures/ORM/LoadFormResultData.php
+++ b/app/bundles/FormBundle/DataFixtures/ORM/LoadFormResultData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,6 @@
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Mautic\CoreBundle\Helper\CsvHelper;
-use Mautic\FormBundle\Entity\Action;
 use Mautic\FormBundle\Entity\Field;
 use Mautic\FormBundle\Entity\Form;
 use Mautic\FormBundle\Entity\Submission;
@@ -22,11 +22,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadFormResultData
+ * Class LoadFormResultData.
  */
 class LoadFormResultData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -49,17 +48,17 @@ public function load(ObjectManager $manager)
         $pageModel = $factory->getModel('page.page');
         $repo      = $factory->getModel('form.submission')->getRepository();
 
-        $fixture =& $this;
-        $importResults = function($results) use ($factory, $pageModel, $repo, &$fixture) {
+        $fixture       = &$this;
+        $importResults = function ($results) use ($factory, $pageModel, $repo, &$fixture) {
             foreach ($results as $count => $rows) {
                 $submission = new Submission();
                 $submission->setDateSubmitted(new \DateTime());
 
                 foreach ($rows as $col => $val) {
-                    if ($val != "NULL") {
-                        $setter = "set" . ucfirst($col);
-                        if (in_array($col, array('form', 'page', 'ipAddress'))) {
-                            $entity = $fixture->getReference($col . '-' . $val);
+                    if ($val != 'NULL') {
+                        $setter = 'set'.ucfirst($col);
+                        if (in_array($col, ['form', 'page', 'ipAddress'])) {
+                            $entity = $fixture->getReference($col.'-'.$val);
                             if ($col == 'page') {
                                 $submission->setReferer($pageModel->generateUrl($entity));
                             }
@@ -77,12 +76,12 @@ public function load(ObjectManager $manager)
             }
         };
 
-        $results = CsvHelper::csv_to_array(__DIR__ . '/fakeresultdata.csv');
+        $results = CsvHelper::csv_to_array(__DIR__.'/fakeresultdata.csv');
         $importResults($results);
 
         sleep(2);
 
-        $results2 = CsvHelper::csv_to_array(__DIR__ . '/fakeresult2data.csv');
+        $results2 = CsvHelper::csv_to_array(__DIR__.'/fakeresult2data.csv');
         $importResults($results2);
     }
 
diff --git a/app/bundles/FormBundle/Entity/Action.php b/app/bundles/FormBundle/Entity/Action.php
index 084e857c27d..60742aa7948 100644
--- a/app/bundles/FormBundle/Entity/Action.php
+++ b/app/bundles/FormBundle/Entity/Action.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,16 +13,12 @@
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class Action
- *
- * @package Mautic\FormBundle\Entity
+ * Class Action.
  */
 class Action
 {
-
     /**
      * @var int
      */
@@ -50,7 +47,7 @@ class Action
     /**
      * @var array
      */
-    private $properties = array();
+    private $properties = [];
 
     /**
      * @var Form
@@ -63,24 +60,24 @@ class Action
     private $changes;
 
     /**
-     * Reset properties on clone
+     * Reset properties on clone.
      */
     public function __clone()
     {
         $this->id   = null;
         $this->form = null;
     }
-    
+
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('form_actions')
             ->setCustomRepositoryClass('Mautic\FormBundle\Entity\ActionRepository')
-            ->addIndex(array('type'), 'form_action_type_search');
+            ->addIndex(['type'], 'form_action_type_search');
 
         $builder->addIdColumns();
 
@@ -101,7 +98,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -109,14 +106,14 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('form')
             ->addProperties(
-                array(
+                [
                     'id',
                     'name',
                     'description',
                     'type',
                     'order',
-                    'properties'
-                )
+                    'properties',
+                ]
             )
             ->build();
     }
@@ -124,42 +121,40 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @param $prop
      * @param $val
-     *
-     * @return void
      */
-    private function isChanged ($prop, $val)
+    private function isChanged($prop, $val)
     {
         if ($this->$prop != $val) {
-            $this->changes[$prop] = array($this->$prop, $val);
+            $this->changes[$prop] = [$this->$prop, $val];
         }
     }
 
     /**
      * @return array
      */
-    public function getChanges ()
+    public function getChanges()
     {
         return $this->changes;
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set order
+     * Set order.
      *
-     * @param integer $order
+     * @param int $order
      *
      * @return Action
      */
-    public function setOrder ($order)
+    public function setOrder($order)
     {
         $this->isChanged('order', $order);
 
@@ -169,23 +164,23 @@ public function setOrder ($order)
     }
 
     /**
-     * Get order
+     * Get order.
      *
-     * @return integer
+     * @return int
      */
-    public function getOrder ()
+    public function getOrder()
     {
         return $this->order;
     }
 
     /**
-     * Set properties
+     * Set properties.
      *
      * @param array $properties
      *
      * @return Action
      */
-    public function setProperties ($properties)
+    public function setProperties($properties)
     {
         $this->isChanged('properties', $properties);
 
@@ -195,23 +190,23 @@ public function setProperties ($properties)
     }
 
     /**
-     * Get properties
+     * Get properties.
      *
      * @return array
      */
-    public function getProperties ()
+    public function getProperties()
     {
         return $this->properties;
     }
 
     /**
-     * Set form
+     * Set form.
      *
      * @param Form $form
      *
      * @return Action
      */
-    public function setForm (Form $form)
+    public function setForm(Form $form)
     {
         $this->form = $form;
 
@@ -219,23 +214,23 @@ public function setForm (Form $form)
     }
 
     /**
-     * Get form
+     * Get form.
      *
      * @return Form
      */
-    public function getForm ()
+    public function getForm()
     {
         return $this->form;
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
      * @return Action
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->isChanged('type', $type);
         $this->type = $type;
@@ -244,11 +239,11 @@ public function setType ($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
@@ -256,19 +251,19 @@ public function getType ()
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Action
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -277,23 +272,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Action
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -302,12 +297,12 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/Entity/ActionRepository.php b/app/bundles/FormBundle/Entity/ActionRepository.php
index 565795d9871..c4c04402ae2 100644
--- a/app/bundles/FormBundle/Entity/ActionRepository.php
+++ b/app/bundles/FormBundle/Entity/ActionRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * ActionRepository
+ * ActionRepository.
  */
 class ActionRepository extends CommonRepository
 {
diff --git a/app/bundles/FormBundle/Entity/Field.php b/app/bundles/FormBundle/Entity/Field.php
index c147216d3e8..9faad6c9d13 100644
--- a/app/bundles/FormBundle/Entity/Field.php
+++ b/app/bundles/FormBundle/Entity/Field.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,16 +14,12 @@
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\FormBundle\Entity\Form;
 
 /**
- * Class Field
- *
- * @package Mautic\FormBundle\Entity
+ * Class Field.
  */
 class Field
 {
-
     /**
      * @var int
      */
@@ -56,7 +53,7 @@ class Field
     /**
      * @var array
      */
-    private $customParameters = array();
+    private $customParameters = [];
 
     /**
      * @var string
@@ -86,7 +83,7 @@ class Field
     /**
      * @var array
      */
-    private $properties = array();
+    private $properties = [];
 
     /**
      * @var Form
@@ -134,17 +131,17 @@ class Field
     private $sessionId;
 
     /**
-     * @var boolean
+     * @var bool
      */
     private $showWhenValueExists;
 
     /**
-     * @var integer
+     * @var int
      */
     private $showAfterXSubmissions;
 
     /**
-     * Reset properties on clone
+     * Reset properties on clone.
      */
     public function __clone()
     {
@@ -155,13 +152,13 @@ public function __clone()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('form_fields')
             ->setCustomRepositoryClass('Mautic\FormBundle\Entity\FieldRepository')
-            ->addIndex(array('type'), 'form_field_type_search');
+            ->addIndex(['type'], 'form_field_type_search');
 
         $builder->addId();
 
@@ -236,7 +233,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -244,7 +241,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('form')
             ->addProperties(
-                array(
+                [
                     'id',
                     'label',
                     'showLabel',
@@ -261,8 +258,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'containerAttributes',
                     'leadField',
                     'saveResult',
-                    'isAutoFill'
-                )
+                    'isAutoFill',
+                ]
             )
             ->build();
     }
@@ -270,42 +267,40 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @param $prop
      * @param $val
-     *
-     * @return void
      */
-    private function isChanged ($prop, $val)
+    private function isChanged($prop, $val)
     {
         if ($this->$prop != $val) {
-            $this->changes[$prop] = array($this->$prop, $val);
+            $this->changes[$prop] = [$this->$prop, $val];
         }
     }
 
     /**
      * @return array
      */
-    public function getChanges ()
+    public function getChanges()
     {
         return $this->changes;
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set label
+     * Set label.
      *
      * @param string $label
      *
      * @return Field
      */
-    public function setLabel ($label)
+    public function setLabel($label)
     {
         $this->isChanged('label', $label);
         $this->label = $label;
@@ -314,23 +309,23 @@ public function setLabel ($label)
     }
 
     /**
-     * Get label
+     * Get label.
      *
      * @return string
      */
-    public function getLabel ()
+    public function getLabel()
     {
         return $this->label;
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
      *
      * @return Field
      */
-    public function setAlias ($alias)
+    public function setAlias($alias)
     {
         $this->isChanged('alias', $alias);
         $this->alias = $alias;
@@ -339,23 +334,23 @@ public function setAlias ($alias)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
-    public function getAlias ()
+    public function getAlias()
     {
         return $this->alias;
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
      * @return Field
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->isChanged('type', $type);
         $this->type = $type;
@@ -364,23 +359,23 @@ public function setType ($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
 
     /**
-     * Set defaultValue
+     * Set defaultValue.
      *
      * @param string $defaultValue
      *
      * @return Field
      */
-    public function setDefaultValue ($defaultValue)
+    public function setDefaultValue($defaultValue)
     {
         $this->isChanged('defaultValue', $defaultValue);
         $this->defaultValue = $defaultValue;
@@ -389,23 +384,23 @@ public function setDefaultValue ($defaultValue)
     }
 
     /**
-     * Get defaultValue
+     * Get defaultValue.
      *
      * @return string
      */
-    public function getDefaultValue ()
+    public function getDefaultValue()
     {
         return $this->defaultValue;
     }
 
     /**
-     * Set isRequired
+     * Set isRequired.
      *
-     * @param boolean $isRequired
+     * @param bool $isRequired
      *
      * @return Field
      */
-    public function setIsRequired ($isRequired)
+    public function setIsRequired($isRequired)
     {
         $this->isChanged('isRequired', $isRequired);
         $this->isRequired = $isRequired;
@@ -414,33 +409,33 @@ public function setIsRequired ($isRequired)
     }
 
     /**
-     * Get isRequired
+     * Get isRequired.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsRequired ()
+    public function getIsRequired()
     {
         return $this->isRequired;
     }
 
     /**
-     * Proxy function to getIsRequired
+     * Proxy function to getIsRequired.
      *
      * @return bool
      */
-    public function isRequired ()
+    public function isRequired()
     {
         return $this->getIsRequired();
     }
 
     /**
-     * Set order
+     * Set order.
      *
-     * @param integer $order
+     * @param int $order
      *
      * @return Field
      */
-    public function setOrder ($order)
+    public function setOrder($order)
     {
         $this->isChanged('order', $order);
         $this->order = $order;
@@ -449,23 +444,23 @@ public function setOrder ($order)
     }
 
     /**
-     * Get order
+     * Get order.
      *
-     * @return integer
+     * @return int
      */
-    public function getOrder ()
+    public function getOrder()
     {
         return $this->order;
     }
 
     /**
-     * Set properties
+     * Set properties.
      *
      * @param array $properties
      *
      * @return Field
      */
-    public function setProperties ($properties)
+    public function setProperties($properties)
     {
         $this->isChanged('properties', $properties);
         $this->properties = $properties;
@@ -474,23 +469,23 @@ public function setProperties ($properties)
     }
 
     /**
-     * Get properties
+     * Get properties.
      *
      * @return array
      */
-    public function getProperties ()
+    public function getProperties()
     {
         return $this->properties;
     }
 
     /**
-     * Set validationMessage
+     * Set validationMessage.
      *
      * @param string $validationMessage
      *
      * @return Field
      */
-    public function setValidationMessage ($validationMessage)
+    public function setValidationMessage($validationMessage)
     {
         $this->isChanged('validationMessage', $validationMessage);
         $this->validationMessage = $validationMessage;
@@ -499,23 +494,23 @@ public function setValidationMessage ($validationMessage)
     }
 
     /**
-     * Get validationMessage
+     * Get validationMessage.
      *
      * @return string
      */
-    public function getValidationMessage ()
+    public function getValidationMessage()
     {
         return $this->validationMessage;
     }
 
     /**
-     * Set form
+     * Set form.
      *
      * @param Form $form
      *
      * @return Field
      */
-    public function setForm (Form $form)
+    public function setForm(Form $form)
     {
         $this->form = $form;
 
@@ -523,23 +518,23 @@ public function setForm (Form $form)
     }
 
     /**
-     * Get form
+     * Get form.
      *
      * @return Form
      */
-    public function getForm ()
+    public function getForm()
     {
         return $this->form;
     }
 
     /**
-     * Set labelAttributes
+     * Set labelAttributes.
      *
      * @param string $labelAttributes
      *
      * @return Field
      */
-    public function setLabelAttributes ($labelAttributes)
+    public function setLabelAttributes($labelAttributes)
     {
         $this->isChanged('labelAttributes', $labelAttributes);
         $this->labelAttributes = $labelAttributes;
@@ -548,23 +543,23 @@ public function setLabelAttributes ($labelAttributes)
     }
 
     /**
-     * Get labelAttributes
+     * Get labelAttributes.
      *
      * @return string
      */
-    public function getLabelAttributes ()
+    public function getLabelAttributes()
     {
         return $this->labelAttributes;
     }
 
     /**
-     * Set inputAttributes
+     * Set inputAttributes.
      *
      * @param string $inputAttributes
      *
      * @return Field
      */
-    public function setInputAttributes ($inputAttributes)
+    public function setInputAttributes($inputAttributes)
     {
         $this->isChanged('inputAttributes', $inputAttributes);
         $this->inputAttributes = $inputAttributes;
@@ -573,11 +568,11 @@ public function setInputAttributes ($inputAttributes)
     }
 
     /**
-     * Get inputAttributes
+     * Get inputAttributes.
      *
      * @return string
      */
-    public function getInputAttributes ()
+    public function getInputAttributes()
     {
         return $this->inputAttributes;
     }
@@ -605,19 +600,19 @@ public function setContainerAttributes($containerAttributes)
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
 
     /**
-     * Set showLabel
+     * Set showLabel.
      *
-     * @param boolean $showLabel
+     * @param bool $showLabel
      *
      * @return Field
      */
-    public function setShowLabel ($showLabel)
+    public function setShowLabel($showLabel)
     {
         $this->isChanged('showLabel', $showLabel);
         $this->showLabel = $showLabel;
@@ -626,33 +621,33 @@ public function setShowLabel ($showLabel)
     }
 
     /**
-     * Get showLabel
+     * Get showLabel.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getShowLabel ()
+    public function getShowLabel()
     {
         return $this->showLabel;
     }
 
     /**
-     * Proxy function to getShowLabel()
+     * Proxy function to getShowLabel().
      *
      * @return bool
      */
-    public function showLabel ()
+    public function showLabel()
     {
         return $this->getShowLabel();
     }
 
     /**
-     * Set helpMessage
+     * Set helpMessage.
      *
      * @param string $helpMessage
      *
      * @return Field
      */
-    public function setHelpMessage ($helpMessage)
+    public function setHelpMessage($helpMessage)
     {
         $this->isChanged('helpMessage', $helpMessage);
         $this->helpMessage = $helpMessage;
@@ -661,23 +656,23 @@ public function setHelpMessage ($helpMessage)
     }
 
     /**
-     * Get helpMessage
+     * Get helpMessage.
      *
      * @return string
      */
-    public function getHelpMessage ()
+    public function getHelpMessage()
     {
         return $this->helpMessage;
     }
 
     /**
-     * Set isCustom
+     * Set isCustom.
      *
-     * @param boolean $isCustom
+     * @param bool $isCustom
      *
      * @return Field
      */
-    public function setIsCustom ($isCustom)
+    public function setIsCustom($isCustom)
     {
         $this->isCustom = $isCustom;
 
@@ -685,33 +680,33 @@ public function setIsCustom ($isCustom)
     }
 
     /**
-     * Get isCustom
+     * Get isCustom.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsCustom ()
+    public function getIsCustom()
     {
         return $this->isCustom;
     }
 
     /**
-     * Proxy function to getIsCustom()
+     * Proxy function to getIsCustom().
      *
      * @return bool
      */
-    public function isCustom ()
+    public function isCustom()
     {
         return $this->getIsCustom();
     }
 
     /**
-     * Set customParameters
+     * Set customParameters.
      *
      * @param array $customParameters
      *
      * @return Field
      */
-    public function setCustomParameters ($customParameters)
+    public function setCustomParameters($customParameters)
     {
         $this->customParameters = $customParameters;
 
@@ -719,11 +714,11 @@ public function setCustomParameters ($customParameters)
     }
 
     /**
-     * Get customParameters
+     * Get customParameters.
      *
      * @return array
      */
-    public function getCustomParameters ()
+    public function getCustomParameters()
     {
         return $this->customParameters;
     }
@@ -731,7 +726,7 @@ public function getCustomParameters ()
     /**
      * @return mixed
      */
-    public function getSessionId ()
+    public function getSessionId()
     {
         return $this->sessionId;
     }
@@ -739,7 +734,7 @@ public function getSessionId ()
     /**
      * @param mixed $sessionId
      */
-    public function setSessionId ($sessionId)
+    public function setSessionId($sessionId)
     {
         $this->sessionId = $sessionId;
     }
@@ -793,7 +788,7 @@ public function setIsAutoFill($isAutoFill)
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getShowWhenValueExists()
     {
@@ -801,7 +796,7 @@ public function getShowWhenValueExists()
     }
 
     /**
-     * @param boolean $showWhenValueExists
+     * @param bool $showWhenValueExists
      */
     public function setShowWhenValueExists($showWhenValueExists)
     {
@@ -809,7 +804,7 @@ public function setShowWhenValueExists($showWhenValueExists)
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getShowAfterXSubmissions()
     {
@@ -817,7 +812,7 @@ public function getShowAfterXSubmissions()
     }
 
     /**
-     * @param integer $showAfterXSubmissions
+     * @param int $showAfterXSubmissions
      */
     public function setShowAfterXSubmissions($showAfterXSubmissions)
     {
@@ -825,13 +820,13 @@ public function setShowAfterXSubmissions($showAfterXSubmissions)
     }
 
     /**
-     * Decide if the field should be displayed based on thr progressive profiling conditions
+     * Decide if the field should be displayed based on thr progressive profiling conditions.
      *
-     * @param  array|null $submissions
-     * @param  Lead       $lead
-     * @param  Form       $form
+     * @param array|null $submissions
+     * @param Lead       $lead
+     * @param Form       $form
      *
-     * @return boolean
+     * @return bool
      */
     public function showForContact($submissions = null, Lead $lead = null, Form $form = null)
     {
@@ -862,7 +857,6 @@ public function showForContact($submissions = null, Lead $lead = null, Form $for
             }
         }
 
-
         return true;
     }
 }
diff --git a/app/bundles/FormBundle/Entity/FieldRepository.php b/app/bundles/FormBundle/Entity/FieldRepository.php
index 16cb245f8c5..8a142c98d26 100644
--- a/app/bundles/FormBundle/Entity/FieldRepository.php
+++ b/app/bundles/FormBundle/Entity/FieldRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * FieldRepository
+ * FieldRepository.
  */
 class FieldRepository extends CommonRepository
 {
diff --git a/app/bundles/FormBundle/Entity/Form.php b/app/bundles/FormBundle/Entity/Form.php
index c4259657b6b..3cc158b162a 100644
--- a/app/bundles/FormBundle/Entity/Form.php
+++ b/app/bundles/FormBundle/Entity/Form.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,14 +20,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Form
- *
- * @package Mautic\FormBundle\Entity
- *
+ * Class Form.
  */
 class Form extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -105,6 +102,7 @@ class Form extends FormEntity
     /**
      * @ORM\OneToMany(targetEntity="Submission", mappedBy="form", fetch="EXTRA_LAZY")
      * @ORM\OrderBy({"dateSubmitted" = "DESC"})
+     *
      * @var ArrayCollection
      */
     private $submissions;
@@ -120,16 +118,13 @@ class Form extends FormEntity
     private $formType;
 
     /**
-     * This var is used to cache the result once gained from the loop
+     * This var is used to cache the result once gained from the loop.
      *
-     * @var boolean
+     * @var bool
      */
     private $usesProgressiveProfiling = null;
 
-    /**
-     * @return void
-     */
-    public function __clone ()
+    public function __clone()
     {
         $this->id = null;
 
@@ -137,9 +132,9 @@ public function __clone ()
     }
 
     /**
-     * Construct
+     * Construct.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->fields      = new ArrayCollection();
         $this->actions     = new ArrayCollection();
@@ -149,7 +144,7 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -180,7 +175,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
 
         $builder->createOneToMany('fields', 'Field')
             ->setIndexBy('id')
-            ->setOrderBy(array('order' => 'ASC'))
+            ->setOrderBy(['order' => 'ASC'])
             ->mappedBy('form')
             ->cascadeAll()
             ->fetchExtraLazy()
@@ -188,7 +183,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
 
         $builder->createOneToMany('actions', 'Action')
             ->setIndexBy('id')
-            ->setOrderBy(array('order' => 'ASC'))
+            ->setOrderBy(['order' => 'ASC'])
             ->mappedBy('form')
             ->cascadeAll()
             ->fetchExtraLazy()
@@ -209,7 +204,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->build();
 
         $builder->createOneToMany('submissions', 'Submission')
-            ->setOrderBy(array('dateSubmitted' => 'DESC'))
+            ->setOrderBy(['dateSubmitted' => 'DESC'])
             ->mappedBy('form')
             ->fetchExtraLazy()
             ->build();
@@ -220,22 +215,22 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('name', new Assert\NotBlank(array(
+        $metadata->addPropertyConstraint('name', new Assert\NotBlank([
             'message' => 'mautic.core.name.required',
-            'groups'  => array('form')
-        )));
+            'groups'  => ['form'],
+        ]));
 
-        $metadata->addPropertyConstraint('postActionProperty', new Assert\NotBlank(array(
+        $metadata->addPropertyConstraint('postActionProperty', new Assert\NotBlank([
             'message' => 'mautic.form.form.postactionproperty_message.notblank',
-            'groups'  => array('messageRequired')
-        )));
+            'groups'  => ['messageRequired'],
+        ]));
 
-        $metadata->addPropertyConstraint('postActionProperty', new Assert\NotBlank(array(
+        $metadata->addPropertyConstraint('postActionProperty', new Assert\NotBlank([
             'message' => 'mautic.form.form.postactionproperty_redirect.notblank',
-            'groups'  => array('urlRequired')
-        )));
+            'groups'  => ['urlRequired'],
+        ]));
     }
 
     /**
@@ -243,10 +238,10 @@ public static function loadValidatorMetadata (ClassMetadata $metadata)
      *
      * @return array
      */
-    public static function determineValidationGroups (\Symfony\Component\Form\Form $form)
+    public static function determineValidationGroups(\Symfony\Component\Form\Form $form)
     {
         $data   = $form->getData();
-        $groups = array('form');
+        $groups = ['form'];
 
         $postAction = $data->getPostAction();
 
@@ -260,7 +255,7 @@ public static function determineValidationGroups (\Symfony\Component\Form\Form $
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -268,15 +263,15 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('form')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'alias',
-                    'category'
-                )
+                    'category',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'description',
                     'cachedHtml',
                     'publishUp',
@@ -287,8 +282,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'submissionCount',
                     'inKioskMode',
                     'renderStyle',
-                    'formType'
-                )
+                    'formType',
+                ]
             )
             ->build();
     }
@@ -296,39 +291,37 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @param $prop
      * @param $val
-     *
-     * @return void
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'actions' || $prop == 'fields') {
             //changes are already computed so just add them
             $this->changes[$prop][$val[0]] = $val[1];
         } elseif ($current != $val) {
-            $this->changes[$prop] = array($current, $val);
+            $this->changes[$prop] = [$current, $val];
         }
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Form
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -337,23 +330,23 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Form
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -362,15 +355,15 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ($truncate = false, $length = 45)
+    public function getDescription($truncate = false, $length = 45)
     {
         if ($truncate) {
             if (strlen($this->description) > $length) {
-                return substr($this->description, 0, $length) . "...";
+                return substr($this->description, 0, $length).'...';
             }
         }
 
@@ -378,13 +371,13 @@ public function getDescription ($truncate = false, $length = 45)
     }
 
     /**
-     * Set cachedHtml
+     * Set cachedHtml.
      *
      * @param string $cachedHtml
      *
      * @return Form
      */
-    public function setCachedHtml ($cachedHtml)
+    public function setCachedHtml($cachedHtml)
     {
         $this->cachedHtml = $cachedHtml;
 
@@ -392,17 +385,17 @@ public function setCachedHtml ($cachedHtml)
     }
 
     /**
-     * Get cachedHtml
+     * Get cachedHtml.
      *
      * @return string
      */
-    public function getCachedHtml ()
+    public function getCachedHtml()
     {
         return $this->cachedHtml;
     }
 
     /**
-     * Get render style
+     * Get render style.
      *
      * @return string
      */
@@ -412,13 +405,13 @@ public function getRenderStyle()
     }
 
     /**
-     * Set postAction
+     * Set postAction.
      *
      * @param string $postAction
      *
      * @return Form
      */
-    public function setPostAction ($postAction)
+    public function setPostAction($postAction)
     {
         $this->isChanged('postAction', $postAction);
         $this->postAction = $postAction;
@@ -427,23 +420,23 @@ public function setPostAction ($postAction)
     }
 
     /**
-     * Get postAction
+     * Get postAction.
      *
      * @return string
      */
-    public function getPostAction ()
+    public function getPostAction()
     {
         return $this->postAction;
     }
 
     /**
-     * Set postActionProperty
+     * Set postActionProperty.
      *
      * @param string $postActionProperty
      *
      * @return Form
      */
-    public function setPostActionProperty ($postActionProperty)
+    public function setPostActionProperty($postActionProperty)
     {
         $this->isChanged('postActionProperty', $postActionProperty);
         $this->postActionProperty = $postActionProperty;
@@ -452,31 +445,31 @@ public function setPostActionProperty ($postActionProperty)
     }
 
     /**
-     * Get postActionProperty
+     * Get postActionProperty.
      *
      * @return string
      */
-    public function getPostActionProperty ()
+    public function getPostActionProperty()
     {
         return $this->postActionProperty;
     }
 
     /**
-     * Get result count
+     * Get result count.
      */
-    public function getResultCount ()
+    public function getResultCount()
     {
         return count($this->submissions);
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
      *
      * @return Form
      */
-    public function setPublishUp ($publishUp)
+    public function setPublishUp($publishUp)
     {
         $this->isChanged('publishUp', $publishUp);
         $this->publishUp = $publishUp;
@@ -485,23 +478,23 @@ public function setPublishUp ($publishUp)
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
-    public function getPublishUp ()
+    public function getPublishUp()
     {
         return $this->publishUp;
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
      *
      * @return Form
      */
-    public function setPublishDown ($publishDown)
+    public function setPublishDown($publishDown)
     {
         $this->isChanged('publishDown', $publishDown);
         $this->publishDown = $publishDown;
@@ -510,27 +503,27 @@ public function setPublishDown ($publishDown)
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
-    public function getPublishDown ()
+    public function getPublishDown()
     {
         return $this->publishDown;
     }
 
     /**
-     * Add a field
+     * Add a field.
      *
      * @param       $key
      * @param Field $field
      *
      * @return Form
      */
-    public function addField ($key, Field $field)
+    public function addField($key, Field $field)
     {
         if ($changes = $field->getChanges()) {
-            $this->isChanged('fields', array($key, $changes));
+            $this->isChanged('fields', [$key, $changes]);
         }
         $this->fields[$key] = $field;
 
@@ -538,7 +531,7 @@ public function addField ($key, Field $field)
     }
 
     /**
-     * Remove a field
+     * Remove a field.
      *
      * @param       $key
      * @param Field $field
@@ -546,29 +539,29 @@ public function addField ($key, Field $field)
     public function removeField($key, Field $field)
     {
         if ($changes = $field->getChanges()) {
-            $this->isChanged('fields', array($key, $changes));
+            $this->isChanged('fields', [$key, $changes]);
         }
         $this->fields->removeElement($field);
     }
 
     /**
-     * Get fields
+     * Get fields.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getFields ()
+    public function getFields()
     {
         return $this->fields;
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
      *
      * @return Form
      */
-    public function setAlias ($alias)
+    public function setAlias($alias)
     {
         $this->isChanged('alias', $alias);
         $this->alias = $alias;
@@ -577,23 +570,23 @@ public function setAlias ($alias)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
-    public function getAlias ()
+    public function getAlias()
     {
         return $this->alias;
     }
 
     /**
-     * Add submissions
+     * Add submissions.
      *
      * @param Submission $submissions
      *
      * @return Form
      */
-    public function addSubmission (Submission $submissions)
+    public function addSubmission(Submission $submissions)
     {
         $this->submissions[] = $submissions;
 
@@ -601,37 +594,37 @@ public function addSubmission (Submission $submissions)
     }
 
     /**
-     * Remove submissions
+     * Remove submissions.
      *
      * @param Submission $submissions
      */
-    public function removeSubmission (Submission $submissions)
+    public function removeSubmission(Submission $submissions)
     {
         $this->submissions->removeElement($submissions);
     }
 
     /**
-     * Get submissions
+     * Get submissions.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getSubmissions ()
+    public function getSubmissions()
     {
         return $this->submissions;
     }
 
     /**
-     * Add actions
+     * Add actions.
      *
      * @param        $key
      * @param Action $action
      *
      * @return Form
      */
-    public function addAction ($key, Action $action)
+    public function addAction($key, Action $action)
     {
         if ($changes = $action->getChanges()) {
-            $this->isChanged('actions', array($key, $changes));
+            $this->isChanged('actions', [$key, $changes]);
         }
         $this->actions[$key] = $action;
 
@@ -639,17 +632,17 @@ public function addAction ($key, Action $action)
     }
 
     /**
-     * Remove actions
+     * Remove actions.
      *
      * @param Action $actions
      */
-    public function removeAction (Action $actions)
+    public function removeAction(Action $actions)
     {
         $this->actions->removeElement($actions);
     }
 
     /**
-     * Removes all actions
+     * Removes all actions.
      */
     public function clearActions()
     {
@@ -657,11 +650,11 @@ public function clearActions()
     }
 
     /**
-     * Get actions
+     * Get actions.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getActions ()
+    public function getActions()
     {
         return $this->actions;
     }
@@ -669,7 +662,7 @@ public function getActions ()
     /**
      * @return mixed
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
@@ -677,7 +670,7 @@ public function getCategory ()
     /**
      * @param mixed $category
      */
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->category = $category;
     }
@@ -685,7 +678,7 @@ public function setCategory ($category)
     /**
      * @return mixed
      */
-    public function getTemplate ()
+    public function getTemplate()
     {
         return $this->template;
     }
@@ -693,7 +686,7 @@ public function getTemplate ()
     /**
      * @param mixed $template
      */
-    public function setTemplate ($template)
+    public function setTemplate($template)
     {
         $this->template = $template;
     }
@@ -755,11 +748,11 @@ public function setFormType($formType)
      */
     public function isStandalone()
     {
-        return ($this->formType != 'campaign');
+        return $this->formType != 'campaign';
     }
 
     /**
-     * Generate a form name for HTML attributes
+     * Generate a form name for HTML attributes.
      */
     public function generateFormName()
     {
@@ -770,13 +763,14 @@ public function generateFormName()
                 )
             )
         );
-        return (empty($name)) ? 'form-' . $this->id : $name;
+
+        return (empty($name)) ? 'form-'.$this->id : $name;
     }
 
     /**
-     * Check if some Progressive Profiling setting is turned on on any of the form fields
+     * Check if some Progressive Profiling setting is turned on on any of the form fields.
      *
-     * @return boolean
+     * @return bool
      */
     public function usesProgressiveProfiling()
     {
@@ -790,12 +784,14 @@ public function usesProgressiveProfiling()
             foreach ($this->fields->toArray() as $field) {
                 if ($field->getShowWhenValueExists() === false || $field->getShowAfterXSubmissions() > 0) {
                     $this->usesProgressiveProfiling = true;
+
                     return $this->usesProgressiveProfiling;
                 }
             }
         }
 
         $this->usesProgressiveProfiling = false;
+
         return $this->usesProgressiveProfiling;
     }
 }
diff --git a/app/bundles/FormBundle/Entity/FormRepository.php b/app/bundles/FormBundle/Entity/FormRepository.php
index a6d5c5147cd..748ea204500 100644
--- a/app/bundles/FormBundle/Entity/FormRepository.php
+++ b/app/bundles/FormBundle/Entity/FormRepository.php
@@ -1,28 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Entity;
 
 use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\FormBundle\Entity\Form;
 
 /**
- * FormRepository
+ * FormRepository.
  */
 class FormRepository extends CommonRepository
 {
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         //use a subquery to get a count of submissions otherwise doctrine will not pull all of the results
         $sq = $this->_em->createQueryBuilder()
@@ -84,8 +83,8 @@ public function getFormList($search = '', $limit = 10, $start = 0, $viewOther =
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('f.name',  ':'.$unique),
@@ -96,10 +95,10 @@ protected function addCatchAllWhereClause(&$q, $filter)
             $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -113,12 +112,12 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq("f.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('f.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq("f.isPublished", ":$unique");
-                $forceParameters = array($unique => false);
+                $expr            = $q->expr()->eq('f.isPublished', ":$unique");
+                $forceParameters = [$unique => false];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
                 $expr = $q->expr()->orX(
@@ -128,7 +127,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->eq("f.createdBy", $this->currentUser->getId());
+                $expr            = $q->expr()->eq('f.createdBy', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.form.form.searchcommand.isexpired'):
@@ -138,7 +137,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                     $q->expr()->neq('f.publishDown', $q->expr()->literal('')),
                     $q->expr()->lt('f.publishDown', 'CURRENT_TIMESTAMP()')
                 );
-                $forceParameters = array($unique => true);
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.form.form.searchcommand.ispending'):
                 $expr = $q->expr()->andX(
@@ -147,25 +146,25 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                     $q->expr()->neq('f.publishUp', $q->expr()->literal('')),
                     $q->expr()->gt('f.publishUp', 'CURRENT_TIMESTAMP()')
                 );
-                $forceParameters = array($unique => true);
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.form.form.searchcommand.hasresults'):
-                $sq = $this->getEntityManager()->createQueryBuilder();
-                $subquery = $sq->select("count(s.id)")
+                $sq       = $this->getEntityManager()->createQueryBuilder();
+                $subquery = $sq->select('count(s.id)')
                     ->from('MauticFormBundle:Submission', 's')
                     ->leftJoin('MauticFormBundle:Form', 'f2',
                         Join::WITH,
-                        $sq->expr()->eq('s.form', "f2")
+                        $sq->expr()->eq('s.form', 'f2')
                     )
                     ->where(
                         $q->expr()->eq('s.form', 'f')
                     )
                     ->getDql();
-                $expr = $q->expr()->gt(sprintf("(%s)",$subquery), 1);
+                $expr            = $q->expr()->gt(sprintf('(%s)', $subquery), 1);
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.category'):
-                $expr = $q->expr()->like('c.alias', ":$unique");
+                $expr           = $q->expr()->like('c.alias', ":$unique");
                 $filter->strict = true;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.name'):
@@ -177,43 +176,43 @@ protected function addSearchCommandWhereClause(&$q, $filter)
             $expr = $q->expr()->not($expr);
         }
 
-        $parameters = array();
+        $parameters = [];
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif ($returnParameter) {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array(
+        return [
             $expr,
-            $parameters
-        );
+            $parameters,
+        ];
     }
 
     /**
-     * Fetch the form results
+     * Fetch the form results.
      *
-     * @param Form $form
+     * @param Form  $form
      * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getFormResults(Form $form, array $options = array())
+    public function getFormResults(Form $form, array $options = [])
     {
         $query = $this->_em->getConnection()->createQueryBuilder();
 
-        $query->from(MAUTIC_TABLE_PREFIX . 'form_submissions', 'fs')
+        $query->from(MAUTIC_TABLE_PREFIX.'form_submissions', 'fs')
             ->select('fr.*')
             ->leftJoin('fs', $this->getResultsTableName($form->getId(), $form->getAlias()), 'fr', 'fr.submission_id = fs.id')
             ->where('fs.form_id = :formId')
             ->setParameter('formId', $form->getId());
 
-
         if (!empty($options['leadId'])) {
-            $query->andWhere('fs.lead_id = ' . (int) $options['leadId']);
+            $query->andWhere('fs.lead_id = '.(int) $options['leadId']);
         }
 
         if (!empty($options['formId'])) {
@@ -229,16 +228,16 @@ public function getFormResults(Form $form, array $options = array())
     }
 
     /**
-     * Compile and return the form result table name
+     * Compile and return the form result table name.
      *
-     * @param  integer $formId
-     * @param  string  $formAlias
+     * @param int    $formId
+     * @param string $formAlias
      *
      * @return string
      */
     public function getResultsTableName($formId, $formAlias)
     {
-        return MAUTIC_TABLE_PREFIX . 'form_results_' . $formId . '_' . $formAlias;
+        return MAUTIC_TABLE_PREFIX.'form_results_'.$formId.'_'.$formAlias;
     }
 
     /**
@@ -246,7 +245,7 @@ public function getResultsTableName($formId, $formAlias)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isunpublished',
             'mautic.core.searchcommand.isuncategorized',
@@ -256,8 +255,7 @@ public function getSearchCommands()
             'mautic.form.form.searchcommand.hasresults',
             'mautic.core.searchcommand.category',
             'mautic.core.searchcommand.name',
-        );
-
+        ];
     }
 
     /**
@@ -265,9 +263,9 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('f.name', 'ASC')
-        );
+        return [
+            ['f.name', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/FormBundle/Entity/Submission.php b/app/bundles/FormBundle/Entity/Submission.php
index c75eb898da1..d0e2f9774d6 100644
--- a/app/bundles/FormBundle/Entity/Submission.php
+++ b/app/bundles/FormBundle/Entity/Submission.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,10 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class Submission
- *
- * @package Mautic\FormBundle\Entity
+ * Class Submission.
  */
 class Submission
 {
-
     /**
      * @var int
      */
@@ -65,12 +63,12 @@ class Submission
     /**
      * @var array
      */
-    private $results = array();
+    private $results = [];
 
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -108,7 +106,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -116,7 +114,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('submission')
             ->addProperties(
-                array(
+                [
                     'id',
                     'ipAddress',
                     'form',
@@ -125,30 +123,30 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'dateSubmitted',
                     'referer',
                     'page',
-                    'results'
-                )
+                    'results',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set dateSubmitted
+     * Set dateSubmitted.
      *
      * @param \DateTime $dateSubmitted
      *
      * @return Submission
      */
-    public function setDateSubmitted ($dateSubmitted)
+    public function setDateSubmitted($dateSubmitted)
     {
         $this->dateSubmitted = $dateSubmitted;
 
@@ -156,23 +154,23 @@ public function setDateSubmitted ($dateSubmitted)
     }
 
     /**
-     * Get dateSubmitted
+     * Get dateSubmitted.
      *
      * @return \DateTime
      */
-    public function getDateSubmitted ()
+    public function getDateSubmitted()
     {
         return $this->dateSubmitted;
     }
 
     /**
-     * Set referer
+     * Set referer.
      *
      * @param string $referer
      *
      * @return Submission
      */
-    public function setReferer ($referer)
+    public function setReferer($referer)
     {
         $this->referer = $referer;
 
@@ -180,23 +178,23 @@ public function setReferer ($referer)
     }
 
     /**
-     * Get referer
+     * Get referer.
      *
      * @return string
      */
-    public function getReferer ()
+    public function getReferer()
     {
         return $this->referer;
     }
 
     /**
-     * Set form
+     * Set form.
      *
      * @param Form $form
      *
      * @return Submission
      */
-    public function setForm (Form $form)
+    public function setForm(Form $form)
     {
         $this->form = $form;
 
@@ -204,23 +202,23 @@ public function setForm (Form $form)
     }
 
     /**
-     * Get form
+     * Get form.
      *
      * @return Form
      */
-    public function getForm ()
+    public function getForm()
     {
         return $this->form;
     }
 
     /**
-     * Set ipAddress
+     * Set ipAddress.
      *
      * @param \Mautic\CoreBundle\Entity\IpAddress $ipAddress
      *
      * @return Submission
      */
-    public function setIpAddress (\Mautic\CoreBundle\Entity\IpAddress $ipAddress = null)
+    public function setIpAddress(\Mautic\CoreBundle\Entity\IpAddress $ipAddress = null)
     {
         $this->ipAddress = $ipAddress;
 
@@ -228,45 +226,45 @@ public function setIpAddress (\Mautic\CoreBundle\Entity\IpAddress $ipAddress = n
     }
 
     /**
-     * Get ipAddress
+     * Get ipAddress.
      *
      * @return \Mautic\CoreBundle\Entity\IpAddress
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
 
     /**
-     * Get results
+     * Get results.
      *
      * @return array
      */
-    public function getResults ()
+    public function getResults()
     {
         return $this->results;
     }
 
     /**
-     * Get results
+     * Get results.
      *
      * @param $results
      *
      * @return Submission
      */
-    public function setResults ($results)
+    public function setResults($results)
     {
         $this->results = $results;
     }
 
     /**
-     * Set page
+     * Set page.
      *
      * @param \Mautic\PageBundle\Entity\Page $page
      *
      * @return Submission
      */
-    public function setPage (\Mautic\PageBundle\Entity\Page $page = null)
+    public function setPage(\Mautic\PageBundle\Entity\Page $page = null)
     {
         $this->page = $page;
 
@@ -274,11 +272,11 @@ public function setPage (\Mautic\PageBundle\Entity\Page $page = null)
     }
 
     /**
-     * Get page
+     * Get page.
      *
      * @return \Mautic\PageBundle\Entity\Page
      */
-    public function getPage ()
+    public function getPage()
     {
         return $this->page;
     }
@@ -286,7 +284,7 @@ public function getPage ()
     /**
      * @return Lead
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -294,7 +292,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead (Lead $lead)
+    public function setLead(Lead $lead)
     {
         $this->lead = $lead;
     }
@@ -302,7 +300,7 @@ public function setLead (Lead $lead)
     /**
      * @return mixed
      */
-    public function getTrackingId ()
+    public function getTrackingId()
     {
         return $this->trackingId;
     }
@@ -310,7 +308,7 @@ public function getTrackingId ()
     /**
      * @param mixed $trackingId
      */
-    public function setTrackingId ($trackingId)
+    public function setTrackingId($trackingId)
     {
         $this->trackingId = $trackingId;
     }
diff --git a/app/bundles/FormBundle/Entity/SubmissionRepository.php b/app/bundles/FormBundle/Entity/SubmissionRepository.php
index 22f71552f09..67bde72e19d 100644
--- a/app/bundles/FormBundle/Entity/SubmissionRepository.php
+++ b/app/bundles/FormBundle/Entity/SubmissionRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Mautic\LeadBundle\Entity\TimelineTrait;
 
 /**
- * IpAddressRepository
+ * IpAddressRepository.
  */
 class SubmissionRepository extends CommonRepository
 {
@@ -42,21 +43,23 @@ public function saveEntity($entity, $flush = true)
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
-        $form  = $args['form'];
+        $form = $args['form'];
 
         //DBAL
         if (!isset($args['viewOnlyFields'])) {
             $args['viewOnlyFields'] = ['button', 'freetext', 'pagebreak', 'captcha'];
         }
-        $viewOnlyFields = array_map(function ($value) { return '"'.$value.'"'; }, $args['viewOnlyFields']);
+        $viewOnlyFields = array_map(function ($value) {
+            return '"'.$value.'"';
+        }, $args['viewOnlyFields']);
 
         //Get the list of custom fields
         $fq = $this->_em->getConnection()->createQueryBuilder();
         $fq->select('f.id, f.label, f.alias, f.type')
-            ->from(MAUTIC_TABLE_PREFIX . 'form_fields', 'f')
-            ->where('f.form_id = ' . $form->getId())
+            ->from(MAUTIC_TABLE_PREFIX.'form_fields', 'f')
+            ->where('f.form_id = '.$form->getId())
             ->andWhere(
                 $fq->expr()->notIn('f.type', $viewOnlyFields),
                 $fq->expr()->eq('f.save_result', ':saveResult')
@@ -65,7 +68,7 @@ public function getEntities($args = array())
             ->setParameter('saveResult', true);
         $results = $fq->execute()->fetchAll();
 
-        $fields = array();
+        $fields = [];
         foreach ($results as $r) {
             $fields[$r['alias']] = $r;
         }
@@ -75,9 +78,9 @@ public function getEntities($args = array())
         $dq = $this->_em->getConnection()->createQueryBuilder();
         $dq->select('count(r.submission_id) as count')
             ->from($this->getResultsTableName($form->getId(), $form->getAlias()), 'r')
-            ->innerJoin('r', MAUTIC_TABLE_PREFIX . 'form_submissions', 's', 'r.submission_id = s.id')
-            ->leftJoin('s', MAUTIC_TABLE_PREFIX . 'ip_addresses', 'i', 's.ip_id = i.id')
-        ->where('r.form_id = ' . $form->getId());
+            ->innerJoin('r', MAUTIC_TABLE_PREFIX.'form_submissions', 's', 'r.submission_id = s.id')
+            ->leftJoin('s', MAUTIC_TABLE_PREFIX.'ip_addresses', 'i', 's.ip_id = i.id')
+        ->where('r.form_id = '.$form->getId());
 
         $this->buildWhereClause($dq, $args);
 
@@ -90,21 +93,21 @@ public function getEntities($args = array())
         $this->buildLimiterClauses($dq, $args);
 
         $dq->resetQueryPart('select');
-        $fieldAliasSql = (!empty($fieldAliases)) ? ', ' . implode(',r.', $fieldAliases) : '';
-        $dq->select('r.submission_id' . $fieldAliasSql);
+        $fieldAliasSql = (!empty($fieldAliases)) ? ', '.implode(',r.', $fieldAliases) : '';
+        $dq->select('r.submission_id'.$fieldAliasSql);
         $results = $dq->execute()->fetchAll();
 
         //loop over results to put form submission results in something that can be assigned to the entities
-        $values = array();
+        $values = [];
 
         foreach ($results as $result) {
             $submissionId = $result['submission_id'];
             unset($result['submission_id']);
 
-            $values[$submissionId] = array();
+            $values[$submissionId] = [];
             foreach ($result as $k => $r) {
                 if (isset($fields[$k])) {
-                    $values[$submissionId][$k] = $fields[$k];
+                    $values[$submissionId][$k]          = $fields[$k];
                     $values[$submissionId][$k]['value'] = $r;
                 }
             }
@@ -120,15 +123,15 @@ public function getEntities($args = array())
             //unfortunately, can't use MySQL's FIELD function since we have to be cross-platform
             $order = '(CASE';
             foreach ($ids as $count => $id) {
-                $order .= ' WHEN s.id = ' . $id . ' THEN ' . $count;
-                $count++;
+                $order .= ' WHEN s.id = '.$id.' THEN '.$count;
+                ++$count;
             }
-            $order .= ' ELSE ' . $count . ' END) AS HIDDEN ORD';
+            $order .= ' ELSE '.$count.' END) AS HIDDEN ORD';
 
             //ORM - generates lead entities
             $q = $this
                 ->createQueryBuilder('s');
-            $q->select('s, partial l.{id}, p, i,' . $order)
+            $q->select('s, partial l.{id}, p, i,'.$order)
                 ->leftJoin('s.ipAddress', 'i')
                 ->leftJoin('s.page', 'p')
                 ->leftJoin('s.lead', 'l');
@@ -147,10 +150,10 @@ public function getEntities($args = array())
         }
 
         return (!empty($args['withTotalCount'])) ?
-            array(
+            [
                 'count'   => $total,
-                'results' => $results
-            ) : $results;
+                'results' => $results,
+            ] : $results;
     }
 
     /**
@@ -161,7 +164,7 @@ public function getEntity($id = 0)
         $entity = parent::getEntity($id);
 
         if ($entity != null) {
-            $form      = $entity->getForm();
+            $form = $entity->getForm();
 
             //use DBAL to get entity fields
             $q = $this->_em->getConnection()->createQueryBuilder();
@@ -185,15 +188,16 @@ public function getEntity($id = 0)
     public function getFilterExpr(&$q, $filter, $parameterName = null)
     {
         if ($filter['column'] == 's.date_submitted') {
-            $date  = (new DateTimeHelper($filter['value'], 'Y-m-d'))->toUtcString();
-            $date1 = $this->generateRandomParameterName();
-            $date2 = $this->generateRandomParameterName();
-            $parameters = array($date1 => $date . ' 00:00:00', $date2 => $date . ' 23:59:59');
-            $expr = $q->expr()->andX(
+            $date       = (new DateTimeHelper($filter['value'], 'Y-m-d'))->toUtcString();
+            $date1      = $this->generateRandomParameterName();
+            $date2      = $this->generateRandomParameterName();
+            $parameters = [$date1 => $date.' 00:00:00', $date2 => $date.' 23:59:59'];
+            $expr       = $q->expr()->andX(
                 $q->expr()->gte('s.date_submitted', ":$date1"),
                 $q->expr()->lte('s.date_submitted', ":$date2")
             );
-            return array($expr, $parameters);
+
+            return [$expr, $parameters];
         } else {
             return parent::getFilterExpr($q, $filter);
         }
@@ -204,29 +208,30 @@ public function getFilterExpr(&$q, $filter, $parameterName = null)
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('s.date_submitted', 'ASC')
-        );
+        return [
+            ['s.date_submitted', 'ASC'],
+        ];
     }
 
     /**
-     * Fetch the base submission data from the database
+     * Fetch the base submission data from the database.
      *
      * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getSubmissions(array $options = array())
+    public function getSubmissions(array $options = [])
     {
         $query = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $query->select('fs.id, f.name, fs.form_id, fs.page_id, fs.date_submitted AS "dateSubmitted"')
-            ->from(MAUTIC_TABLE_PREFIX . 'form_submissions', 'fs')
-            ->leftJoin('fs', MAUTIC_TABLE_PREFIX . 'forms', 'f', 'f.id = fs.form_id');
+            ->from(MAUTIC_TABLE_PREFIX.'form_submissions', 'fs')
+            ->leftJoin('fs', MAUTIC_TABLE_PREFIX.'forms', 'f', 'f.id = fs.form_id');
 
         if (!empty($options['leadId'])) {
-            $query->andWhere('fs.lead_id = ' . (int) $options['leadId']);
+            $query->andWhere('fs.lead_id = '.(int) $options['leadId']);
         }
 
         if (!empty($options['id'])) {
@@ -236,7 +241,7 @@ public function getSubmissions(array $options = array())
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere(
-                $query->expr()->like('f.name', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('f.name', $query->expr()->literal('%'.$options['search'].'%'))
             );
         }
 
@@ -244,13 +249,14 @@ public function getSubmissions(array $options = array())
     }
 
     /**
-     * Get list of forms ordered by it's count
+     * Get list of forms ordered by it's count.
      *
      * @param QueryBuilder $query
-     * @param integer $limit
-     * @param integer $offset
+     * @param int          $limit
+     * @param int          $offset
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -268,21 +274,22 @@ public function getTopReferrers($query, $limit = 10, $offset = 0)
     }
 
     /**
-     * Get list of forms ordered by it's count
+     * Get list of forms ordered by it's count.
      *
      * @param QueryBuilder $query
-     * @param integer $limit
-     * @param integer $offset
+     * @param int          $limit
+     * @param int          $offset
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getMostSubmitted($query, $limit = 10, $offset = 0, $column = 'fs.id', $as = 'submissions')
     {
-        $asSelect = ($as) ? ' as ' . $as : '';
+        $asSelect = ($as) ? ' as '.$as : '';
 
-        $query->select('f.name as title, f.id, count(distinct ' . $column . ')' . $asSelect)
+        $query->select('f.name as title, f.id, count(distinct '.$column.')'.$asSelect)
             ->groupBy('f.id, f.name')
             ->orderBy($as, 'DESC')
             ->setMaxResults($limit)
@@ -303,7 +310,6 @@ public function getSubmissionCountsByPage($pageId, \DateTime $fromDate = null)
         if (is_array($pageId)) {
             $q->where($q->expr()->in('s.page_id', $pageId))
                 ->groupBy('s.page_id, p.title, p.variant_hits');
-
         } else {
             $q->where($q->expr()->eq('s.page_id', ':page'))
                 ->setParameter('page', (int) $pageId);
@@ -322,7 +328,7 @@ public function getSubmissionCountsByPage($pageId, \DateTime $fromDate = null)
 
     /**
      * Get submission count by email by linking emails that have been associated with a page hit that has the
-     * same tracking ID as a form submission tracking ID and thus assumed happened in the same session
+     * same tracking ID as a form submission tracking ID and thus assumed happened in the same session.
      *
      * @param           $emailId
      * @param \DateTime $fromDate
@@ -341,7 +347,6 @@ public function getSubmissionCountsByEmail($emailId, \DateTime $fromDate = null)
         if (is_array($emailId)) {
             $q->where($q->expr()->in('e.id', $emailId))
                 ->groupBy('e.id, e.subject, e.variant_sent_count');
-
         } else {
             $q->where($q->expr()->eq('e.id', ':id'))
                 ->setParameter('id', (int) $emailId);
@@ -359,7 +364,7 @@ public function getSubmissionCountsByEmail($emailId, \DateTime $fromDate = null)
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -367,14 +372,14 @@ public function getSubmissionCountsByEmail($emailId, \DateTime $fromDate = null)
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'form_submissions')
+        $q->update(MAUTIC_TABLE_PREFIX.'form_submissions')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 
     /**
-     * Validates that an array of submission IDs belong to a specific form
+     * Validates that an array of submission IDs belong to a specific form.
      *
      * @param $ids
      * @param $formId
@@ -393,7 +398,7 @@ public function validateSubmissions($ids, $formId)
                 )
             );
 
-        $validIds = array();
+        $validIds = [];
         $results  = $q->execute()->fetchAll();
 
         foreach ($results as $r) {
@@ -406,14 +411,14 @@ public function validateSubmissions($ids, $formId)
     /**
      * Compare a form result value with defined value for defined lead.
      *
-     * @param  integer $lead ID
-     * @param  integer $form ID
-     * @param  string  $formAlias
-     * @param  integer $field alias
-     * @param  string  $value to compare with
-     * @param  string  $operatorExpr for WHERE clause
+     * @param int    $lead         ID
+     * @param int    $form         ID
+     * @param string $formAlias
+     * @param int    $field        alias
+     * @param string $value        to compare with
+     * @param string $operatorExpr for WHERE clause
      *
-     * @return boolean
+     * @return bool
      */
     public function compareValue($lead, $form, $formAlias, $field, $value, $operatorExpr)
     {
@@ -421,12 +426,12 @@ public function compareValue($lead, $form, $formAlias, $field, $value, $operator
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('s.id')
             ->from($this->getResultsTableName($form, $formAlias), 'r')
-            ->leftJoin('r', MAUTIC_TABLE_PREFIX . 'form_submissions', 's', 's.id = r.submission_id')
+            ->leftJoin('r', MAUTIC_TABLE_PREFIX.'form_submissions', 's', 's.id = r.submission_id')
             ->where(
                 $q->expr()->andX(
                     $q->expr()->eq('s.lead_id', ':lead'),
                     $q->expr()->eq('s.form_id', ':form'),
-                    $q->expr()->$operatorExpr('r.' . $field, ':value')
+                    $q->expr()->$operatorExpr('r.'.$field, ':value')
                 )
             )
             ->setParameter('lead', (int) $lead)
@@ -439,16 +444,16 @@ public function compareValue($lead, $form, $formAlias, $field, $value, $operator
     }
 
     /**
-     * Compile and return the form result table name
+     * Compile and return the form result table name.
      *
-     * @param  integer $formId
-     * @param  string  $formAlias
+     * @param int    $formId
+     * @param string $formAlias
      *
      * @return string
      */
     public function getResultsTableName($formId, $formAlias)
     {
-        return MAUTIC_TABLE_PREFIX . 'form_results_' . $formId . '_' . $formAlias;
+        return MAUTIC_TABLE_PREFIX.'form_results_'.$formId.'_'.$formAlias;
     }
 
     /**
@@ -456,6 +461,6 @@ public function getResultsTableName($formId, $formAlias)
      */
     public function getTableAlias()
     {
-        return "fs";
+        return 'fs';
     }
 }
diff --git a/app/bundles/FormBundle/Event/FormBuilderEvent.php b/app/bundles/FormBundle/Event/FormBuilderEvent.php
index f35dd6f6c64..b462294451f 100644
--- a/app/bundles/FormBundle/Event/FormBuilderEvent.php
+++ b/app/bundles/FormBundle/Event/FormBuilderEvent.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Event;
 
 use Mautic\CoreBundle\Event\ComponentValidationTrait;
-use Symfony\Component\Process\Exception\InvalidArgumentException;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\Process\Exception\InvalidArgumentException;
 
 /**
- * Class FormBuilderEvent
+ * Class FormBuilderEvent.
  */
 class FormBuilderEvent extends Event
 {
@@ -53,22 +54,21 @@ public function __construct($translator)
      *
      * @param string $key    a unique identifier; it is recommended that it be namespaced i.e. lead.action
      * @param array  $action can contain the following keys:
-     *               $action = [
-     *                   'group'              => (required) Label of the group to add this action to
-     *                   'label'              => (required) what to display in the list
-     *                   'eventName'          => (required) Event dispatched to execute action; it will receive a SubmissionEvent object
-     *                   'formType'           => (required) name of the form type SERVICE for the action
-     *                   'allowCampaignForm'  => (optional) true to allow this action for campaign forms; defaults to false
-     *                   'description'        => (optional) short description of event
-     *                   'template'           => (optional) template to use for the action's HTML in the form builder;
-     *                                              eg AcmeMyBundle:FormAction:theaction.html.php
-     *                   'formTypeOptions'    => (optional) array of options to pass to formType
-     *                   'formTheme'          => (optional  theme for custom form views
-     *                   'validator'          => (deprecated) callback function to validate form results - use addValidator() instead
-     *                   'callback'           => (deprecated) callback function that will be passed the results upon a form submit; use eventName instead
-     *               ]
+     *                       $action = [
+     *                       'group'              => (required) Label of the group to add this action to
+     *                       'label'              => (required) what to display in the list
+     *                       'eventName'          => (required) Event dispatched to execute action; it will receive a SubmissionEvent object
+     *                       'formType'           => (required) name of the form type SERVICE for the action
+     *                       'allowCampaignForm'  => (optional) true to allow this action for campaign forms; defaults to false
+     *                       'description'        => (optional) short description of event
+     *                       'template'           => (optional) template to use for the action's HTML in the form builder;
+     *                       eg AcmeMyBundle:FormAction:theaction.html.php
+     *                       'formTypeOptions'    => (optional) array of options to pass to formType
+     *                       'formTheme'          => (optional  theme for custom form views
+     *                       'validator'          => (deprecated) callback function to validate form results - use addValidator() instead
+     *                       'callback'           => (deprecated) callback function that will be passed the results upon a form submit; use eventName instead
+     *                       ]
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     public function addSubmitAction($key, array $action)
@@ -93,7 +93,7 @@ public function addSubmitAction($key, array $action)
     }
 
     /**
-     * Get submit actions
+     * Get submit actions.
      *
      * @return array
      */
@@ -113,7 +113,7 @@ function ($a, $b) {
     }
 
     /**
-     * Get submit actions by groups
+     * Get submit actions by groups.
      *
      * @return array
      */
@@ -131,29 +131,28 @@ public function getSubmitActionGroups()
     /**
      * Adds a form field to the list of available fields in the form builder.
      *
-     * @param string $key    unique identifier; it is recommended that it be namespaced i.e. leadbundle.myfield
-     * @param array  $field  can contain the following key/values
-     *               $field = [
-     *                   'label'            => (required) what to display in the list
-     *                   'formType'         => (required) name of the form type SERVICE for the field's property column
-     *                   'template'         => (required) template to use for the field's HTML eg AcmeMyBundle:FormField:thefield.html.php
-     *                   'formTypeOptions'  => (optional) array of options to pass to formType
-     *                   'formTheme'        => (optional) theme for custom form view
-     *                   'valueFilter'      => (optional) the filter to use to clean the input as supported by InputHelper or a callback;
-     *                                           should accept arguments FormField $field and $filteredValue
-     *                   'valueConstraints' => (deprecated) callback to use to validate the value; use addValidator() instead
-     *                   'builderOptions'   => (optional) array of options
-     *                   [
-     *                       'addHelpMessage'     => (bool) show help message inputs
-     *                       'addShowLabel'       => (bool) show label input
-     *                       'addDefaultValue'    => (bool) show default value input
-     *                       'addLabelAttributes' => (bool) show label attribute input
-     *                       'addInputAttributes' => (bool) show input attribute input
-     *                       'addIsRequired'      => (bool) show is required toggle
-     *                   ]
-     *               ]
+     * @param string $key   unique identifier; it is recommended that it be namespaced i.e. leadbundle.myfield
+     * @param array  $field can contain the following key/values
+     *                      $field = [
+     *                      'label'            => (required) what to display in the list
+     *                      'formType'         => (required) name of the form type SERVICE for the field's property column
+     *                      'template'         => (required) template to use for the field's HTML eg AcmeMyBundle:FormField:thefield.html.php
+     *                      'formTypeOptions'  => (optional) array of options to pass to formType
+     *                      'formTheme'        => (optional) theme for custom form view
+     *                      'valueFilter'      => (optional) the filter to use to clean the input as supported by InputHelper or a callback;
+     *                      should accept arguments FormField $field and $filteredValue
+     *                      'valueConstraints' => (deprecated) callback to use to validate the value; use addValidator() instead
+     *                      'builderOptions'   => (optional) array of options
+     *                      [
+     *                      'addHelpMessage'     => (bool) show help message inputs
+     *                      'addShowLabel'       => (bool) show label input
+     *                      'addDefaultValue'    => (bool) show default value input
+     *                      'addLabelAttributes' => (bool) show label attribute input
+     *                      'addInputAttributes' => (bool) show input attribute input
+     *                      'addIsRequired'      => (bool) show is required toggle
+     *                      ]
+     *                      ]
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     public function addFormField($key, array $field)
@@ -180,7 +179,7 @@ public function addFormField($key, array $field)
     }
 
     /**
-     * Get form fields
+     * Get form fields.
      *
      * @return mixed
      */
@@ -190,15 +189,15 @@ public function getFormFields()
     }
 
     /**
-     * Add a field validator
+     * Add a field validator.
      *
      * @param       $key
      * @param array $validator
-     *              $validator = [
-     *                  'eventName' => (required) Event name to dispatch to validate the form; it will recieve a ValidationEvent object
-     *                  'fieldType' => (optional) Optional filter to validate only a specific type of field; otherwise every field
-     *                                  will be sent through the validation event
-     *              ]
+     *                         $validator = [
+     *                         'eventName' => (required) Event name to dispatch to validate the form; it will recieve a ValidationEvent object
+     *                         'fieldType' => (optional) Optional filter to validate only a specific type of field; otherwise every field
+     *                         will be sent through the validation event
+     *                         ]
      */
     public function addValidator($key, array $validator)
     {
@@ -209,7 +208,7 @@ public function addValidator($key, array $validator)
         //check for required keys and that given functions are callable
         $this->verifyComponent(['eventName'], $validator);
 
-        $this->validators[$key] =$validator;
+        $this->validators[$key] = $validator;
     }
 
     /**
@@ -221,7 +220,7 @@ public function getValidators()
     {
         // Organize by field
         $fieldValidators = [
-            'form' => []
+            'form' => [],
         ];
 
         foreach ($this->validators as $validator) {
diff --git a/app/bundles/FormBundle/Event/FormEvent.php b/app/bundles/FormBundle/Event/FormEvent.php
index 60f096684ed..4f6ae0e2856 100644
--- a/app/bundles/FormBundle/Event/FormEvent.php
+++ b/app/bundles/FormBundle/Event/FormEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,22 @@
 use Mautic\FormBundle\Entity\Form;
 
 /**
- * Class FormEvent
+ * Class FormEvent.
  */
 class FormEvent extends CommonEvent
 {
-
     /**
      * @param Form $form
      * @param bool $isNew
      */
     public function __construct(Form &$form, $isNew = false)
     {
-        $this->entity =& $form;
+        $this->entity = &$form;
         $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Form entity
+     * Returns the Form entity.
      *
      * @return Form
      */
@@ -39,7 +39,7 @@ public function getForm()
     }
 
     /**
-     * Sets the Form entity
+     * Sets the Form entity.
      *
      * @param Form $form
      */
diff --git a/app/bundles/FormBundle/Event/SubmissionEvent.php b/app/bundles/FormBundle/Event/SubmissionEvent.php
index fb27874acdc..ecb3f681f3d 100644
--- a/app/bundles/FormBundle/Event/SubmissionEvent.php
+++ b/app/bundles/FormBundle/Event/SubmissionEvent.php
@@ -1,27 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Event;
 
-use Joomla\Http\Response;
 use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\FormBundle\Entity\Submission;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class SubmissionEvent
+ * Class SubmissionEvent.
  */
 class SubmissionEvent extends CommonEvent
 {
-
     /**
-     * Raw POST results
+     * Raw POST results.
      *
      * @var array
      */
@@ -33,28 +32,28 @@ class SubmissionEvent extends CommonEvent
     private $server = [];
 
     /**
-     * Cleaned post results
+     * Cleaned post results.
      *
      * @var array
      */
     private $results = [];
 
     /**
-     * Form fields
+     * Form fields.
      *
      * @var array
      */
     private $fields = [];
 
     /**
-     * Results converted to tokens
+     * Results converted to tokens.
      *
      * @var array
      */
     private $tokens = [];
 
     /**
-     * Callback for post form submit
+     * Callback for post form submit.
      *
      * @var mixed
      */
@@ -71,21 +70,21 @@ class SubmissionEvent extends CommonEvent
     private $contactFieldMatches = [];
 
     /**
-     * Array to hold information set by other actions that may be useful to subsequent actions
+     * Array to hold information set by other actions that may be useful to subsequent actions.
      *
      * @var array
      */
     private $feedback = [];
 
     /**
-     * Configuration for the action
+     * Configuration for the action.
      *
      * @var array
      */
     private $actionConfig = [];
 
     /**
-     * Active action
+     * Active action.
      *
      * @var
      */
@@ -113,7 +112,7 @@ public function __construct(Submission $submission, $post, $server, Request $req
     }
 
     /**
-     * Returns the Submission entity
+     * Returns the Submission entity.
      *
      * @return Submission
      */
@@ -244,7 +243,7 @@ public function setActionFeedback($key, $feedback)
     }
 
     /**
-     * Get feedback injected by another action
+     * Get feedback injected by another action.
      *
      * @param null $key
      *
@@ -268,7 +267,7 @@ public function getActionFeedback($key = null)
      */
     public function checkContext($action)
     {
-        return ($this->action === $action);
+        return $this->action === $action;
     }
 
     /**
@@ -289,7 +288,7 @@ public function getActionConfig()
     }
 
     /**
-     * Set an post submit callback - include $callback['eventName' => '', 'anythingElse' ...]
+     * Set an post submit callback - include $callback['eventName' => '', 'anythingElse' ...].
      *
      * @param string $key
      * @param array  $callback
diff --git a/app/bundles/FormBundle/Event/ValidationEvent.php b/app/bundles/FormBundle/Event/ValidationEvent.php
index 312c34ac600..f8dc5944855 100644
--- a/app/bundles/FormBundle/Event/ValidationEvent.php
+++ b/app/bundles/FormBundle/Event/ValidationEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\FormBundle\Entity\Form;
 
 /**
- * Class ValidationEvent
+ * Class ValidationEvent.
  */
 class ValidationEvent extends CommonEvent
 {
@@ -76,7 +77,7 @@ public function failedValidation($reason)
     }
 
     /**
-     * Is the field valid
+     * Is the field valid.
      *
      * @return bool
      */
@@ -86,7 +87,7 @@ public function isValid()
     }
 
     /**
-     * Get the reason this field was invalidated
+     * Get the reason this field was invalidated.
      *
      * @return string
      */
diff --git a/app/bundles/FormBundle/EventListener/CalendarSubscriber.php b/app/bundles/FormBundle/EventListener/CalendarSubscriber.php
index 9290d85ba73..7bf37ecfdfc 100644
--- a/app/bundles/FormBundle/EventListener/CalendarSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/CalendarSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\FormBundle\EventListener;
 
 use Mautic\CalendarBundle\CalendarEvents;
@@ -14,29 +16,24 @@
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class CalendarSubscriber
- *
- * @package Mautic\FormBundle\EventListener
+ * Class CalendarSubscriber.
  */
 class CalendarSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
+        return [
             //CalendarEvents::CALENDAR_ON_GENERATE => array('onCalendarGenerate', 0)
-        );
+        ];
     }
 
     /**
-     * Adds events to the calendar
+     * Adds events to the calendar.
      *
      * @param CalendarGeneratorEvent $event
-     *
-     * @return void
      */
     public function onCalendarGenerate(CalendarGeneratorEvent $event)
     {
@@ -44,8 +41,8 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
 
         $query = $this->em->getConnection()->createQueryBuilder();
         $query->select('fs.referer AS url, f.name AS title, fs.date_submitted AS start')
-            ->from(MAUTIC_TABLE_PREFIX . 'form_submissions', 'fs')
-            ->leftJoin('fs', MAUTIC_TABLE_PREFIX . 'forms', 'f', 'fs.form_id = f.id')
+            ->from(MAUTIC_TABLE_PREFIX.'form_submissions', 'fs')
+            ->leftJoin('fs', MAUTIC_TABLE_PREFIX.'forms', 'f', 'fs.form_id = f.id')
             ->where($query->expr()->andX(
                 $query->expr()->gte('fs.date_submitted', ':start'),
                 $query->expr()->lte('fs.date_submitted', ':end')
@@ -59,11 +56,11 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
 
         // We need to convert the date to a ISO8601 compliant string
         foreach ($results as &$object) {
-            $date = new DateTimeHelper($object['start']);
+            $date            = new DateTimeHelper($object['start']);
             $object['start'] = $date->toLocalString(\DateTime::ISO8601);
-            $object['title'] = $this->translator->trans('mautic.form.event.submission', array('%form%' => $object['title']));
+            $object['title'] = $this->translator->trans('mautic.form.event.submission', ['%form%' => $object['title']]);
         }
 
         $event->addEvents($results);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/EventListener/CampaignSubscriber.php b/app/bundles/FormBundle/EventListener/CampaignSubscriber.php
index be25ea5bf26..59a448bf3a6 100644
--- a/app/bundles/FormBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/CampaignSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\FormBundle\EventListener;
 
 use Mautic\CampaignBundle\CampaignEvents;
@@ -13,16 +15,13 @@
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CampaignBundle\Model\EventModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\FormBundle\Event\SubmissionEvent;
 use Mautic\FormBundle\FormEvents;
 use Mautic\FormBundle\Model\FormModel;
 use Mautic\FormBundle\Model\SubmissionModel;
 
 /**
- * Class CampaignSubscriber
- *
- * @package Mautic\EmailBundle\EventListener
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -50,51 +49,51 @@ class CampaignSubscriber extends CommonSubscriber
      */
     public function __construct(FormModel $formModel, SubmissionModel $formSubmissionModel, EventModel $campaignEventModel)
     {
-        $this->formModel = $formModel;
+        $this->formModel           = $formModel;
         $this->formSubmissionModel = $formSubmissionModel;
-        $this->campaignEventModel = $campaignEventModel;
+        $this->campaignEventModel  = $campaignEventModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CampaignEvents::CAMPAIGN_ON_BUILD => array('onCampaignBuild', 0),
-            FormEvents::FORM_ON_SUBMIT        => array('onFormSubmit', 0),
-            FormEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0],
-            FormEvents::ON_CAMPAIGN_TRIGGER_CONDITION   => ['onCampaignTriggerCondition', 0]
-        );
+        return [
+            CampaignEvents::CAMPAIGN_ON_BUILD         => ['onCampaignBuild', 0],
+            FormEvents::FORM_ON_SUBMIT                => ['onFormSubmit', 0],
+            FormEvents::ON_CAMPAIGN_TRIGGER_DECISION  => ['onCampaignTriggerDecision', 0],
+            FormEvents::ON_CAMPAIGN_TRIGGER_CONDITION => ['onCampaignTriggerCondition', 0],
+        ];
     }
 
     /**
-     * Add the option to the list
+     * Add the option to the list.
      *
      * @param CampaignBuilderEvent $event
      */
     public function onCampaignBuild(CampaignBuilderEvent $event)
     {
-        $trigger = array(
+        $trigger = [
             'label'       => 'mautic.form.campaign.event.submit',
             'description' => 'mautic.form.campaign.event.submit_descr',
             'formType'    => 'campaignevent_formsubmit',
             'eventName'   => FormEvents::ON_CAMPAIGN_TRIGGER_DECISION,
-        );
+        ];
         $event->addDecision('form.submit', $trigger);
 
-        $trigger = array(
+        $trigger = [
             'label'       => 'mautic.form.campaign.event.field_value',
             'description' => 'mautic.form.campaign.event.field_value_descr',
             'formType'    => 'campaignevent_form_field_value',
             'formTheme'   => 'MauticFormBundle:FormTheme\FieldValueCondition',
-            'eventName'   => FormEvents::ON_CAMPAIGN_TRIGGER_CONDITION
-        );
+            'eventName'   => FormEvents::ON_CAMPAIGN_TRIGGER_CONDITION,
+        ];
         $event->addCondition('form.field_value', $trigger);
     }
 
     /**
-     * Trigger campaign event for when a form is submitted
+     * Trigger campaign event for when a form is submitted.
      *
      * @param SubmissionEvent $event
      */
diff --git a/app/bundles/FormBundle/EventListener/DashboardSubscriber.php b/app/bundles/FormBundle/EventListener/DashboardSubscriber.php
index 8bb763790ad..7f702ae9a9e 100644
--- a/app/bundles/FormBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/DashboardSubscriber.php
@@ -1,55 +1,53 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\FormBundle\EventListener;
 
-use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\FormBundle\Model\FormModel;
 use Mautic\FormBundle\Model\SubmissionModel;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\FormBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'form';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'submissions.in.time' => array(),
-        'top.submission.referrers' => array(),
-        'top.submitters' => array(),
-        'created.forms' => array()
-    );
-    
+    protected $types = [
+        'submissions.in.time'      => [],
+        'top.submission.referrers' => [],
+        'top.submitters'           => [],
+        'created.forms'            => [],
+    ];
+
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'form:forms:viewown',
-        'form:forms:viewother'
-    );
+        'form:forms:viewother',
+    ];
 
     /**
      * @var SubmissionModel
@@ -69,16 +67,14 @@ class DashboardSubscriber extends MainDashboardSubscriber
      */
     public function __construct(SubmissionModel $formSubmissionModel, FormModel $formModel)
     {
-        $this->formModel = $formModel;
+        $this->formModel           = $formModel;
         $this->formSubmissionModel = $formSubmissionModel;
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
@@ -90,7 +86,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->formSubmissionModel->getSubmissionsLineChartData(
@@ -99,8 +95,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateTo'],
                         $params['dateFormat'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -119,36 +115,36 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 }
 
                 $referrers = $this->formSubmissionModel->getTopSubmissionReferrers($limit, $params['dateFrom'], $params['dateTo'], $canViewOthers);
-                $items = array();
+                $items     = [];
 
                 // Build table rows with links
                 if ($referrers) {
                     foreach ($referrers as &$referrer) {
-                        $row = array(
-                            array(
-                                'value' => $referrer['referer'],
-                                'type' => 'link',
+                        $row = [
+                            [
+                                'value'    => $referrer['referer'],
+                                'type'     => 'link',
                                 'external' => true,
-                                'link' => $referrer['referer']
-                            ),
-                            array(
-                                'value' => $referrer['submissions']
-                            )
-                        );
+                                'link'     => $referrer['referer'],
+                            ],
+                            [
+                                'value' => $referrer['submissions'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.form.result.thead.referrer'),
-                        $event->getTranslator()->trans('mautic.form.graph.line.submissions')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $referrers
-                ));
+                        $event->getTranslator()->trans('mautic.form.graph.line.submissions'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $referrers,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
@@ -165,43 +161,43 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 }
 
                 $submitters = $this->formSubmissionModel->getTopSubmitters($limit, $params['dateFrom'], $params['dateTo'], $canViewOthers);
-                $items = array();
+                $items      = [];
 
                 // Build table rows with links
                 if ($submitters) {
                     foreach ($submitters as &$submitter) {
-                        $name = $submitter['lead_id'];
-                        $leadUrl = $this->router->generate('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $submitter['lead_id']));
+                        $name    = $submitter['lead_id'];
+                        $leadUrl = $this->router->generate('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $submitter['lead_id']]);
                         if ($submitter['firstname'] || $submitter['lastname']) {
-                            $name = trim($submitter['firstname'] . ' ' . $submitter['lastname']);
+                            $name = trim($submitter['firstname'].' '.$submitter['lastname']);
                         } elseif ($submitter['email']) {
                             $name = $submitter['email'];
                         }
 
-                        $row = array(
-                            array(
+                        $row = [
+                            [
                                 'value' => $name,
-                                'type' => 'link',
-                                'link' => $leadUrl
-                            ),
-                            array(
-                                'value' => $submitter['submissions']
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $leadUrl,
+                            ],
+                            [
+                                'value' => $submitter['submissions'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.form.lead'),
-                        $event->getTranslator()->trans('mautic.form.graph.line.submissions')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $submitters
-                ));
+                        $event->getTranslator()->trans('mautic.form.graph.line.submissions'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $submitters,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
@@ -217,33 +213,33 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit = $params['limit'];
                 }
 
-                $forms = $this->formModel->getFormList($limit, $params['dateFrom'], $params['dateTo'], array(), array('canViewOthers' => true));
-                $items = array();
+                $forms = $this->formModel->getFormList($limit, $params['dateFrom'], $params['dateTo'], [], ['canViewOthers' => true]);
+                $items = [];
 
                 // Build table rows with links
                 if ($forms) {
                     foreach ($forms as &$form) {
-                        $formUrl = $this->router->generate('mautic_form_action', array('objectAction' => 'view', 'objectId' => $form['id']));
-                        $row = array(
-                            array(
+                        $formUrl = $this->router->generate('mautic_form_action', ['objectAction' => 'view', 'objectId' => $form['id']]);
+                        $row     = [
+                            [
                                 'value' => $form['name'],
-                                'type' => 'link',
-                                'link' => $formUrl
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $formUrl,
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
-                        $event->getTranslator()->trans('mautic.dashboard.label.title')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $forms
-                ));
+                $event->setTemplateData([
+                    'headItems' => [
+                        $event->getTranslator()->trans('mautic.dashboard.label.title'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $forms,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
diff --git a/app/bundles/FormBundle/EventListener/EmailSubscriber.php b/app/bundles/FormBundle/EventListener/EmailSubscriber.php
index efc8d73e54b..8d89a667eee 100644
--- a/app/bundles/FormBundle/EventListener/EmailSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/EmailSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,35 +15,33 @@
 use Mautic\EmailBundle\Event\EmailBuilderEvent;
 
 /**
- * Class EmailSubscriber
+ * Class EmailSubscriber.
  */
 class EmailSubscriber extends CommonSubscriber
 {
-
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_ON_BUILD => array('onEmailBuild', 0)
-        );
+        return [
+            EmailEvents::EMAIL_ON_BUILD => ['onEmailBuild', 0],
+        ];
     }
 
     /**
-     *
      * @param EmailBuilderEvent $event
      */
-    public function onEmailBuild (EmailBuilderEvent $event)
+    public function onEmailBuild(EmailBuilderEvent $event)
     {
         if ($event->abTestWinnerCriteriaRequested()) {
             //add AB Test Winner Criteria
-            $formSubmissions = array(
+            $formSubmissions = [
                 'group'    => 'mautic.form.abtest.criteria',
                 'label'    => 'mautic.form.abtest.criteria.submissions',
-                'callback' => '\Mautic\FormBundle\Helper\AbTestHelper::determineSubmissionWinner'
-            );
+                'callback' => '\Mautic\FormBundle\Helper\AbTestHelper::determineSubmissionWinner',
+            ];
             $event->addAbTestWinnerCriteria('form.submissions', $formSubmissions);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/EventListener/FormSubscriber.php b/app/bundles/FormBundle/EventListener/FormSubscriber.php
index ba5a83fbc0e..c2cc3a9b39c 100644
--- a/app/bundles/FormBundle/EventListener/FormSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/FormSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,10 +14,9 @@
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Psr7\Response;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
-use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
+use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\FormBundle\Event as Events;
 use Mautic\FormBundle\Exception\ValidationException;
 use Mautic\FormBundle\Form\Type\SubmitActionRepostType;
@@ -25,7 +25,7 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
- * Class FormSubscriber
+ * Class FormSubscriber.
  */
 class FormSubscriber extends CommonSubscriber
 {
@@ -54,14 +54,14 @@ class FormSubscriber extends CommonSubscriber
     public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel, MailHelper $mailer)
     {
         $this->ipLookupHelper = $ipLookupHelper;
-        $this->auditLogModel = $auditLogModel;
-        $this->mailer        = $mailer->getMailer();
+        $this->auditLogModel  = $auditLogModel;
+        $this->mailer         = $mailer->getMailer();
     }
 
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             FormEvents::FORM_POST_SAVE           => ['onFormPostSave', 0],
@@ -75,7 +75,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\FormEvent $event
      */
@@ -84,19 +84,19 @@ public function onFormPostSave(Events\FormEvent $event)
         $form = $event->getForm();
         if ($details = $event->getChanges()) {
             $log = [
-                "bundle"    => "form",
-                "object"    => "form",
-                "objectId"  => $form->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+                'bundle'    => 'form',
+                'object'    => 'form',
+                'objectId'  => $form->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
             ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\FormEvent $event
      */
@@ -104,18 +104,18 @@ public function onFormDelete(Events\FormEvent $event)
     {
         $form = $event->getForm();
         $log  = [
-            "bundle"    => "form",
-            "object"    => "form",
-            "objectId"  => $form->deletedId,
-            "action"    => "delete",
-            "details"   => array('name' => $form->getName()),
-            "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+            'bundle'    => 'form',
+            'object'    => 'form',
+            'objectId'  => $form->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $form->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
         ];
         $this->auditLogModel->writeToLog($log);
     }
 
     /**
-     * Add a simple email form
+     * Add a simple email form.
      *
      * @param Events\FormBuilderEvent $event
      */
@@ -130,8 +130,8 @@ public function onFormBuilder(Events\FormBuilderEvent $event)
             'formTypeCleanMasks' => [
                 'message' => 'html',
             ],
-            'eventName'          => FormEvents::ON_EXECUTE_SUBMIT_ACTION,
-            'allowCampaignForm'  => true,
+            'eventName'         => FormEvents::ON_EXECUTE_SUBMIT_ACTION,
+            'allowCampaignForm' => true,
         ];
 
         $event->addSubmitAction('form.email', $action);
@@ -147,8 +147,8 @@ public function onFormBuilder(Events\FormBuilderEvent $event)
                 'failure_email'        => 'string',
                 'authorization_header' => 'string',
             ],
-            'eventName'          => FormEvents::ON_EXECUTE_SUBMIT_ACTION,
-            'allowCampaignForm'  => true,
+            'eventName'         => FormEvents::ON_EXECUTE_SUBMIT_ACTION,
+            'allowCampaignForm' => true,
         ];
 
         $event->addSubmitAction('form.repost', $action);
@@ -290,7 +290,7 @@ public function onFormSubmitActionRepost(Events\SubmissionEvent $event)
                 $post['array'] = $post;
                 $results       = $this->postToHtml($post);
                 $submission    = $event->getSubmission();
-                $emails        = $emails = $this->getEmailsFromString($email);
+                $emails        = $emails        = $this->getEmailsFromString($email);
                 $this->mailer->setTo($emails);
                 $this->mailer->setSubject(
                     $this->translator->trans('mautic.form.action.repost.failed_subject', ['%form%' => $submission->getForm()->getName()])
@@ -299,7 +299,7 @@ public function onFormSubmitActionRepost(Events\SubmissionEvent $event)
                     $this->translator->trans(
                         'mautic.form.action.repost.failed_message',
                         [
-                            '%link%'    => $this->router->generate(
+                            '%link%' => $this->router->generate(
                                 'mautic_form_results',
                                 ['objectId' => $submission->getForm()->getId(), 'result' => $submission->getId()],
                                 UrlGeneratorInterface::ABSOLUTE_URL
@@ -387,7 +387,7 @@ private function postToHtml($post)
             } else {
                 $output .= $row;
             }
-            $output .= "</td></tr>";
+            $output .= '</td></tr>';
         }
         $output .= '</table>';
 
diff --git a/app/bundles/FormBundle/EventListener/LeadSubscriber.php b/app/bundles/FormBundle/EventListener/LeadSubscriber.php
index ec5c5fccc62..43dcc9845e5 100644
--- a/app/bundles/FormBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/LeadSubscriber.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\FormBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\FormBundle\Model\FormModel;
 use Mautic\LeadBundle\Event\LeadMergeEvent;
 use Mautic\LeadBundle\Event\LeadTimelineEvent;
@@ -18,9 +18,7 @@
 use Mautic\PageBundle\Model\PageModel;
 
 /**
- * Class LeadSubscriber
- *
- * @package Mautic\FormBundle\EventListener
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
@@ -37,8 +35,8 @@ class LeadSubscriber extends CommonSubscriber
     /**
      * LeadSubscriber constructor.
      *
-     * @param FormModel     $formModel
-     * @param PageModel     $pageModel
+     * @param FormModel $formModel
+     * @param PageModel $pageModel
      */
     public function __construct(FormModel $formModel, PageModel $pageModel)
     {
@@ -49,7 +47,7 @@ public function __construct(FormModel $formModel, PageModel $pageModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             LeadEvents::TIMELINE_ON_GENERATE => ['onTimelineGenerate', 0],
@@ -58,7 +56,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -70,7 +68,6 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
         $event->addEventType($eventTypeKey, $eventTypeName);
 
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
@@ -90,20 +87,20 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
 
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => [
+                        'event'      => $eventTypeKey,
+                        'eventLabel' => [
                             'label' => $form->getName(),
-                            'href'  => $this->router->generate('mautic_form_action', ['objectAction' => 'view', 'objectId' => $form->getId()])
+                            'href'  => $this->router->generate('mautic_form_action', ['objectAction' => 'view', 'objectId' => $form->getId()]),
                         ],
-                        'eventType'       => $eventTypeName,
-                        'timestamp'       => $row['dateSubmitted'],
-                        'extra'           => [
+                        'eventType' => $eventTypeName,
+                        'timestamp' => $row['dateSubmitted'],
+                        'extra'     => [
                             'submission' => $submission,
                             'form'       => $form,
-                            'page'       => $this->pageModel->getEntity($row['page_id'])
+                            'page'       => $this->pageModel->getEntity($row['page_id']),
                         ],
                         'contentTemplate' => 'MauticFormBundle:SubscribedEvents\Timeline:index.html.php',
-                        'icon'            => 'fa-pencil-square-o'
+                        'icon'            => 'fa-pencil-square-o',
                     ]
                 );
             }
@@ -117,4 +114,4 @@ public function onLeadMerge(LeadMergeEvent $event)
     {
         $this->em->getRepository('MauticFormBundle:Submission')->updateLead($event->getLoser()->getId(), $event->getVictor()->getId());
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/EventListener/PageSubscriber.php b/app/bundles/FormBundle/EventListener/PageSubscriber.php
index 0ae452e430a..ed5339a7719 100644
--- a/app/bundles/FormBundle/EventListener/PageSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/PageSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,14 +12,13 @@
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
-use Mautic\FormBundle\Helper\PageTokenHelper;
 use Mautic\FormBundle\Model\FormModel;
 use Mautic\PageBundle\Event\PageBuilderEvent;
 use Mautic\PageBundle\Event\PageDisplayEvent;
 use Mautic\PageBundle\PageEvents;
 
 /**
- * Class PageSubscriber
+ * Class PageSubscriber.
  */
 class PageSubscriber extends CommonSubscriber
 {
@@ -42,20 +42,20 @@ public function __construct(FormModel $formModel)
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PageEvents::PAGE_ON_DISPLAY => array('onPageDisplay', 0),
-            PageEvents::PAGE_ON_BUILD   => array('onPageBuild', 0)
-        );
+        return [
+            PageEvents::PAGE_ON_DISPLAY => ['onPageDisplay', 0],
+            PageEvents::PAGE_ON_BUILD   => ['onPageBuild', 0],
+        ];
     }
 
     /**
-     * Add forms to available page tokens
+     * Add forms to available page tokens.
      *
      * @param PageBuilderEvent $event
      */
-    public function onPageBuild (PageBuilderEvent $event)
+    public function onPageBuild(PageBuilderEvent $event)
     {
         $tokenHelper = new BuilderTokenHelper($this->factory, 'form');
 
@@ -65,11 +65,11 @@ public function onPageBuild (PageBuilderEvent $event)
 
         if ($event->abTestWinnerCriteriaRequested()) {
             //add AB Test Winner Criteria
-            $formSubmissions = array(
+            $formSubmissions = [
                 'group'    => 'mautic.form.abtest.criteria',
                 'label'    => 'mautic.form.abtest.criteria.submissions',
-                'callback' => '\Mautic\FormBundle\Helper\AbTestHelper::determineSubmissionWinner'
-            );
+                'callback' => '\Mautic\FormBundle\Helper\AbTestHelper::determineSubmissionWinner',
+            ];
             $event->addAbTestWinnerCriteria('form.submissions', $formSubmissions);
         }
 
@@ -81,11 +81,11 @@ public function onPageBuild (PageBuilderEvent $event)
     /**
      * @param PageDisplayEvent $event
      */
-    public function onPageDisplay (PageDisplayEvent $event)
+    public function onPageDisplay(PageDisplayEvent $event)
     {
         $content = $event->getContent();
         $page    = $event->getPage();
-        $regex   = '/' . $this->formRegex . '/i';
+        $regex   = '/'.$this->formRegex.'/i';
 
         preg_match_all($regex, $content, $matches);
 
@@ -101,13 +101,13 @@ public function onPageDisplay (PageDisplayEvent $event)
                     )
                 ) {
                     $formHtml = ($form->isPublished()) ? $this->formModel->getContent($form) :
-                        '<div class="mauticform-error">' .
-                        $this->translator->trans('mautic.form.form.pagetoken.notpublished') .
+                        '<div class="mauticform-error">'.
+                        $this->translator->trans('mautic.form.form.pagetoken.notpublished').
                         '</div>';
 
                     //add the hidden page input
                     $pageInput = "\n<input type=\"hidden\" name=\"mauticform[mauticpage]\" value=\"{$page->getId()}\" />\n";
-                    $formHtml  = preg_replace("#</form>#", $pageInput . "</form>", $formHtml);
+                    $formHtml  = preg_replace('#</form>#', $pageInput.'</form>', $formHtml);
 
                     //pouplate get parameters
                     //priority populate value order by: query string (parameters) -> with lead
@@ -116,9 +116,9 @@ public function onPageDisplay (PageDisplayEvent $event)
                     }
                     $this->formModel->populateValuesWithGetParameters($form, $formHtml);
 
-                    $content = preg_replace('#{form=' . $id . '}#', $formHtml, $content);
+                    $content = preg_replace('#{form='.$id.'}#', $formHtml, $content);
                 } else {
-                    $content = preg_replace("#{form=" . $id . "}#", "", $content);
+                    $content = preg_replace('#{form='.$id.'}#', '', $content);
                 }
             }
         }
diff --git a/app/bundles/FormBundle/EventListener/PointSubscriber.php b/app/bundles/FormBundle/EventListener/PointSubscriber.php
index ac38b19ea57..746ccf9f093 100644
--- a/app/bundles/FormBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/PointSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
@@ -39,12 +40,12 @@ public function __construct(PointModel $pointModel)
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::POINT_ON_BUILD => array('onPointBuild', 0),
-            FormEvents::FORM_ON_SUBMIT  => array('onFormSubmit', 0)
-        );
+        return [
+            PointEvents::POINT_ON_BUILD => ['onPointBuild', 0],
+            FormEvents::FORM_ON_SUBMIT  => ['onFormSubmit', 0],
+        ];
     }
 
     /**
@@ -52,19 +53,19 @@ static public function getSubscribedEvents()
      */
     public function onPointBuild(PointBuilderEvent $event)
     {
-        $action = array(
+        $action = [
             'group'       => 'mautic.form.point.action',
             'label'       => 'mautic.form.point.action.submit',
             'description' => 'mautic.form.point.action.submit_descr',
-            'callback'    => array('\\Mautic\\FormBundle\\Helper\\PointActionHelper', 'validateFormSubmit'),
-            'formType'    => 'pointaction_formsubmit'
-        );
+            'callback'    => ['\\Mautic\\FormBundle\\Helper\\PointActionHelper', 'validateFormSubmit'],
+            'formType'    => 'pointaction_formsubmit',
+        ];
 
         $event->addAction('form.submit', $action);
     }
 
     /**
-     * Trigger point actions for form submit
+     * Trigger point actions for form submit.
      *
      * @param SubmissionEvent $event
      */
diff --git a/app/bundles/FormBundle/EventListener/ReportSubscriber.php b/app/bundles/FormBundle/EventListener/ReportSubscriber.php
index 13280147953..5b666440870 100644
--- a/app/bundles/FormBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/ReportSubscriber.php
@@ -1,47 +1,43 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\ReportBundle\Event\ReportBuilderEvent;
 use Mautic\ReportBundle\Event\ReportGeneratorEvent;
 use Mautic\ReportBundle\Event\ReportGraphEvent;
 use Mautic\ReportBundle\ReportEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
 
 /**
- * Class ReportSubscriber
- *
- * @package Mautic\ReportBundle\EventListener
+ * Class ReportSubscriber.
  */
 class ReportSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             ReportEvents::REPORT_ON_BUILD          => ['onReportBuilder', 0],
             ReportEvents::REPORT_ON_GENERATE       => ['onReportGenerate', 0],
-            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0]
+            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0],
         ];
     }
 
     /**
-     * Add available tables and columns to the report builder lookup
+     * Add available tables and columns to the report builder lookup.
      *
      * @param ReportBuilderEvent $event
-     *
-     * @return void
      */
     public function onReportBuilder(ReportBuilderEvent $event)
     {
@@ -51,13 +47,13 @@ public function onReportBuilder(ReportBuilderEvent $event)
             $columns = [
                 $prefix.'alias' => [
                     'label' => 'mautic.core.alias',
-                    'type'  => 'string'
-                ]
+                    'type'  => 'string',
+                ],
             ];
             $columns = array_merge($columns, $event->getStandardColumns($prefix, [], 'mautic_form_action'), $event->getCategoryColumns());
             $data    = [
                 'display_name' => 'mautic.form.forms',
-                'columns'      => $columns
+                'columns'      => $columns,
             ];
             $event->addTable('forms', $data);
             if ($event->checkContext('form.submissions')) {
@@ -67,25 +63,25 @@ public function onReportBuilder(ReportBuilderEvent $event)
                 $submissionColumns = [
                     $submissionPrefix.'date_submitted' => [
                         'label' => 'mautic.form.report.submit.date_submitted',
-                        'type'  => 'datetime'
+                        'type'  => 'datetime',
                     ],
-                    $submissionPrefix.'referer'        => [
+                    $submissionPrefix.'referer' => [
                         'label' => 'mautic.core.referer',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $pagePrefix.'id'                   => [
+                    $pagePrefix.'id' => [
                         'label' => 'mautic.form.report.page_id',
                         'type'  => 'int',
-                        'link'  => 'mautic_page_action'
+                        'link'  => 'mautic_page_action',
                     ],
-                    $pagePrefix.'name'                 => [
+                    $pagePrefix.'name' => [
                         'label' => 'mautic.form.report.page_name',
-                        'type'  => 'string'
-                    ]
+                        'type'  => 'string',
+                    ],
                 ];
-                $data              = [
+                $data = [
                     'display_name' => 'mautic.form.report.submission.table',
-                    'columns'      => array_merge($submissionColumns, $columns, $event->getLeadColumns(), $event->getIpColumn())
+                    'columns'      => array_merge($submissionColumns, $columns, $event->getLeadColumns(), $event->getIpColumn()),
                 ];
                 $event->addTable('form.submissions', $data, 'forms');
 
@@ -99,11 +95,9 @@ public function onReportBuilder(ReportBuilderEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGeneratorEvent $event
-     *
-     * @return void
      */
     public function onReportGenerate(ReportGeneratorEvent $event)
     {
@@ -131,7 +125,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGraphEvent $event
      */
diff --git a/app/bundles/FormBundle/EventListener/SearchSubscriber.php b/app/bundles/FormBundle/EventListener/SearchSubscriber.php
index a3780450d99..e4c8fcbf922 100644
--- a/app/bundles/FormBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/SearchSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\UserHelper;
 use Mautic\FormBundle\Model\FormModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\FormBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -47,12 +46,12 @@ public function __construct(UserHelper $userHelper, FormModel $formModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
@@ -65,40 +64,40 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
             return;
         }
 
-        $security   = $this->security;
-        $filter     = array("string" => $str, "force" => '');
+        $security = $this->security;
+        $filter   = ['string' => $str, 'force' => ''];
 
-        $permissions = $security->isGranted(array('form:forms:viewown', 'form:forms:viewother'), 'RETURN_ARRAY');
+        $permissions = $security->isGranted(['form:forms:viewown', 'form:forms:viewother'], 'RETURN_ARRAY');
         if ($permissions['form:forms:viewown'] || $permissions['form:forms:viewother']) {
             //only show own forms if the user does not have permission to view others
             if (!$permissions['form:forms:viewother']) {
-                $filter['force'] = array(
-                    array('column' => 'f.createdBy', 'expr' => 'eq', 'value' => $this->userHelper->getUser()->getId())
-                );
+                $filter['force'] = [
+                    ['column' => 'f.createdBy', 'expr' => 'eq', 'value' => $this->userHelper->getUser()->getId()],
+                ];
             }
 
             $forms = $this->formModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $filter
-                ));
+                    'filter' => $filter,
+                ]);
 
             if (count($forms) > 0) {
-                $formResults = array();
+                $formResults = [];
                 foreach ($forms as $form) {
                     $formResults[] = $this->templating->renderResponse(
                         'MauticFormBundle:SubscribedEvents\Search:global.html.php',
-                        array('form' => $form[0])
+                        ['form' => $form[0]]
                     )->getContent();
                 }
                 if (count($forms) > 5) {
                     $formResults[] = $this->templating->renderResponse(
                         'MauticFormBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($forms) - 5)
-                        )
+                            'remaining'    => (count($forms) - 5),
+                        ]
                     )->getContent();
                 }
                 $formResults['count'] = count($forms);
@@ -112,12 +111,11 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
      */
     public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        if ($this->security->isGranted(array('form:forms:viewown', 'form:forms:viewother'), "MATCH_ONE")) {
+        if ($this->security->isGranted(['form:forms:viewown', 'form:forms:viewother'], 'MATCH_ONE')) {
             $event->addCommands(
                 'mautic.form.forms',
                 $this->formModel->getCommandList()
             );
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/EventListener/WebhookSubscriber.php b/app/bundles/FormBundle/EventListener/WebhookSubscriber.php
index 9f59535f0c6..4d89e01e6b8 100644
--- a/app/bundles/FormBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/FormBundle/EventListener/WebhookSubscriber.php
@@ -1,50 +1,49 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\EventListener;
 
-use Mautic\WebhookBundle\WebhookEvents;
-use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\FormBundle\FormEvents;
+use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\WebhookEvents;
 
 /**
- * Class WebhookSubscriber
- *
- * @package Mautic\FormBundle\EventListener
+ * Class WebhookSubscriber.
  */
 class WebhookSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            WebhookEvents::WEBHOOK_ON_BUILD => array('onWebhookBuild', 0)
-        );
+        return [
+            WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
+        ];
     }
 
     /**
-     * Add event triggers and actions
+     * Add event triggers and actions.
      *
      * @param WebhookBuilderEvent $event
      */
     public function onWebhookBuild(WebhookBuilderEvent $event)
     {
         // add checkbox to the webhook form for new leads
-        $formSubmit = array(
+        $formSubmit = [
             'label'       => 'mautic.form.webhook.event.form.submit',
             'description' => 'mautic.form.webhook.event.form.submit_desc',
-        );
+        ];
 
         // add it to the list
         $event->addEvent(FormEvents::FORM_ON_SUBMIT, $formSubmit);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/Exception/ValidationException.php b/app/bundles/FormBundle/Exception/ValidationException.php
index ead7b22d8dc..4a61252c41a 100644
--- a/app/bundles/FormBundle/Exception/ValidationException.php
+++ b/app/bundles/FormBundle/Exception/ValidationException.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Exception;
 
 /**
- * Class ValidationException
+ * Class ValidationException.
  */
 class ValidationException extends \Exception
 {
@@ -40,4 +41,4 @@ public function setViolations($violations)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/Form/Type/ActionType.php b/app/bundles/FormBundle/Form/Type/ActionType.php
index eb13a8c19eb..d18e60d88b5 100644
--- a/app/bundles/FormBundle/Form/Type/ActionType.php
+++ b/app/bundles/FormBundle/Form/Type/ActionType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,40 +16,39 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ActionType
+ * Class ActionType.
  */
 class ActionType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $masks = array('description' => 'html');
+        $masks = ['description' => 'html'];
 
-        $builder->add('name', 'text', array(
+        $builder->add('name', 'text', [
             'label'      => 'mautic.core.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => false,
+        ]);
 
-        $builder->add('description', 'textarea', array(
+        $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control editor'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
 
         $properties      = (!empty($options['data']['properties'])) ? $options['data']['properties'] : null;
         $formType        = $options['settings']['formType'];
-        $formTypeOptions = array(
-            'label'  => false,
-            'data'   => $properties,
-            'attr'   => array(
-                'data-formid' => $options['formId'] //sneaky way of feeding the formId without requiring the option
-            ));
+        $formTypeOptions = [
+            'label' => false,
+            'data'  => $properties,
+            'attr'  => [
+                'data-formid' => $options['formId'], //sneaky way of feeding the formId without requiring the option
+            ], ];
         if (isset($options['settings']['formTypeCleanMasks'])) {
             $masks['properties'] = $options['settings']['formTypeCleanMasks'];
         }
@@ -72,21 +72,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $btnIcon  = 'fa fa-plus';
         }
 
-        $builder->add('buttons', 'form_buttons', array(
-            'save_text' => $btnValue,
-            'save_icon' => $btnIcon,
-            'apply_text' => false,
-            'container_class' => 'bottom-form-buttons'
-        ));
+        $builder->add('buttons', 'form_buttons', [
+            'save_text'       => $btnValue,
+            'save_icon'       => $btnIcon,
+            'apply_text'      => false,
+            'container_class' => 'bottom-form-buttons',
+        ]);
 
-        $builder->add('formId', 'hidden', array(
-            'mapped' => false
-        ));
+        $builder->add('formId', 'hidden', [
+            'mapped' => false,
+        ]);
 
         $builder->addEventSubscriber(new CleanFormSubscriber($masks));
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -95,11 +95,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'settings' => false
-        ));
+        $resolver->setDefaults([
+            'settings' => false,
+        ]);
 
-        $resolver->setRequired(array('settings', 'formId'));
+        $resolver->setRequired(['settings', 'formId']);
     }
 
     /**
@@ -107,6 +107,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "formaction";
+        return 'formaction';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/CampaignEventFormFieldValueType.php b/app/bundles/FormBundle/Form/Type/CampaignEventFormFieldValueType.php
index d7e04973dff..2e86e638239 100644
--- a/app/bundles/FormBundle/Form/Type/CampaignEventFormFieldValueType.php
+++ b/app/bundles/FormBundle/Form/Type/CampaignEventFormFieldValueType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class CampaignEventFormSubmitType
+ * Class CampaignEventFormSubmitType.
  */
 class CampaignEventFormFieldValueType extends AbstractType
 {
@@ -44,14 +45,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'        => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.form.campaign.event.forms_descr',
-                    'onchange' => 'Mautic.updateFormFields(this)'
+                    'onchange' => 'Mautic.updateFormFields(this)',
                 ],
                 'required'    => true,
                 'constraints' => [
                     new NotBlank(
                         ['message' => 'mautic.core.value.required']
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -113,8 +114,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'choices' => $fields,
                     'attr'    => [
                         'onchange'           => 'Mautic.updateFormFieldValues(this)',
-                        'data-field-options' => json_encode($options)
-                    ]
+                        'data-field-options' => json_encode($options),
+                    ],
                 ]
             );
 
@@ -124,17 +125,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'value',
                     'text',
                     [
-                        'label'       => 'mautic.form.field.form.value',
-                        'label_attr'  => ['class' => 'control-label'],
-                        'attr'        => [
-                            'class' => 'form-control'
+                        'label'      => 'mautic.form.field.form.value',
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
+                            'class' => 'form-control',
                         ],
                         'required'    => true,
                         'constraints' => [
                             new NotBlank(
                                 ['message' => 'mautic.core.value.required']
-                            )
-                        ]
+                            ),
+                        ],
                     ]
                 );
             } else {
@@ -142,18 +143,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'value',
                     'choice',
                     [
-                        'choices'     => $options[$data['field']],
-                        'label'       => 'mautic.form.field.form.value',
-                        'label_attr'  => ['class' => 'control-label'],
-                        'attr'        => [
-                            'class' => 'form-control not-chosen'
+                        'choices'    => $options[$data['field']],
+                        'label'      => 'mautic.form.field.form.value',
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
+                            'class' => 'form-control not-chosen',
                         ],
                         'required'    => true,
                         'constraints' => [
                             new NotBlank(
                                 ['message' => 'mautic.core.value.required']
-                            )
-                        ]
+                            ),
+                        ],
                     ]
                 );
             }
@@ -169,6 +170,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "campaignevent_form_field_value";
+        return 'campaignevent_form_field_value';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/CampaignEventFormSubmitType.php b/app/bundles/FormBundle/Form/Type/CampaignEventFormSubmitType.php
index 8edc31f7f79..02ad30e43c0 100644
--- a/app/bundles/FormBundle/Form/Type/CampaignEventFormSubmitType.php
+++ b/app/bundles/FormBundle/Form/Type/CampaignEventFormSubmitType.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class CampaignEventFormSubmitType
+ * Class CampaignEventFormSubmitType.
  */
 class CampaignEventFormSubmitType extends AbstractType
 {
@@ -23,15 +23,15 @@ class CampaignEventFormSubmitType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('forms', 'form_list', array(
-            'label'         => 'mautic.form.campaign.event.forms',
-            'label_attr'    => array('class' => 'control-label'),
-            'required'      => false,
-            'attr'       => array(
+        $builder->add('forms', 'form_list', [
+            'label'      => 'mautic.form.campaign.event.forms',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.form.campaign.event.forms_descr'
-            )
-        ));
+                'tooltip' => 'mautic.form.campaign.event.forms_descr',
+            ],
+        ]);
     }
 
     /**
@@ -39,6 +39,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "campaignevent_formsubmit";
+        return 'campaignevent_formsubmit';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FieldType.php b/app/bundles/FormBundle/Form/Type/FieldType.php
index 45a27235070..37f44241f18 100644
--- a/app/bundles/FormBundle/Form/Type/FieldType.php
+++ b/app/bundles/FormBundle/Form/Type/FieldType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class FieldType
+ * Class FieldType.
  */
 class FieldType extends AbstractType
 {
@@ -36,17 +37,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'label'               => 'strict_html',
         ];
 
-        $addHelpMessage =
-        $addShowLabel =
-        $allowCustomAlias =
-        $addDefaultValue =
-        $addLabelAttributes =
-        $addInputAttributes =
+        $addHelpMessage         =
+        $addShowLabel           =
+        $allowCustomAlias       =
+        $addDefaultValue        =
+        $addLabelAttributes     =
+        $addInputAttributes     =
         $addContainerAttributes =
-        $addLeadFieldList =
-        $addSaveResult =
-        $addBehaviorFields =
-        $addIsRequired = true;
+        $addLeadFieldList       =
+        $addSaveResult          =
+        $addBehaviorFields      =
+        $addIsRequired          = true;
 
         if (!empty($options['customParameters'])) {
             $type = 'custom';
@@ -54,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $customParams    = $options['customParameters'];
             $formTypeOptions = [
                 'required' => false,
-                'label'    => false
+                'label'    => false,
             ];
             if (!empty($customParams['formTypeOptions'])) {
                 $formTypeOptions = array_merge($formTypeOptions, $customParams['formTypeOptions']);
@@ -76,18 +77,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'addSaveResult',
                 'addBehaviorFields',
                 'addIsRequired',
-                'addHtml'
+                'addHtml',
             ];
             foreach ($addFields as $f) {
                 if (isset($customParams['builderOptions'][$f])) {
-                    $$f = (boolean) $customParams['builderOptions'][$f];
+                    $$f = (bool) $customParams['builderOptions'][$f];
                 }
             }
         } else {
             $type = $options['data']['type'];
             switch ($type) {
                 case 'freetext':
-                    $addHelpMessage      = $addDefaultValue = $addIsRequired = $addLeadFieldList = $addSaveResult = $addBehaviorFields = false;
+                    $addHelpMessage      = $addDefaultValue      = $addIsRequired      = $addLeadFieldList      = $addSaveResult      = $addBehaviorFields      = false;
                     $labelText           = 'mautic.form.field.form.header';
                     $showLabelText       = 'mautic.form.field.form.showheader';
                     $inputAttributesText = 'mautic.form.field.form.freetext_attributes';
@@ -132,8 +133,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'constraints' => [
                     new Assert\NotBlank(
                         ['message' => 'mautic.form.field.label.notblank']
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -146,22 +147,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
                         'class'   => 'form-control',
-                        'tooltip' => 'mautic.form.field.form.alias.tooltip'
+                        'tooltip' => 'mautic.form.field.form.alias.tooltip',
                     ],
-                    'disabled'   => (!empty($options['data']['id']) && strpos($options['data']['id'], 'new') === false) ? true : false,
-                    'required'   => false
+                    'disabled' => (!empty($options['data']['id']) && strpos($options['data']['id'], 'new') === false) ? true : false,
+                    'required' => false,
                 ]
             );
         }
 
         if ($addShowLabel) {
-            $default = (!isset($options['data']['showLabel'])) ? true : (boolean) $options['data']['showLabel'];
+            $default = (!isset($options['data']['showLabel'])) ? true : (bool) $options['data']['showLabel'];
             $builder->add(
                 'showLabel',
                 'yesno_button_group',
                 [
                     'label' => (!empty($showLabelText)) ? $showLabelText : 'mautic.form.field.form.showlabel',
-                    'data'  => $default
+                    'data'  => $default,
                 ]
             );
         }
@@ -174,7 +175,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.core.defaultvalue',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => ['class' => 'form-control'],
-                    'required'   => false
+                    'required'   => false,
                 ]
             );
         }
@@ -188,21 +189,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
                         'class'   => 'form-control',
-                        'tooltip' => 'mautic.form.field.help.helpmessage'
+                        'tooltip' => 'mautic.form.field.help.helpmessage',
                     ],
-                    'required'   => false
+                    'required' => false,
                 ]
             );
         }
 
         if ($addIsRequired) {
-            $default = (!isset($options['data']['isRequired'])) ? false : (boolean) $options['data']['isRequired'];
+            $default = (!isset($options['data']['isRequired'])) ? false : (bool) $options['data']['isRequired'];
             $builder->add(
                 'isRequired',
                 'yesno_button_group',
                 [
                     'label' => 'mautic.core.required',
-                    'data'  => $default
+                    'data'  => $default,
                 ]
             );
 
@@ -213,7 +214,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.form.field.form.validationmsg',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => ['class' => 'form-control'],
-                    'required'   => false
+                    'required'   => false,
                 ]
             );
         }
@@ -228,9 +229,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'attr'       => [
                         'class'     => 'form-control',
                         'tooltip'   => 'mautic.form.field.help.attr',
-                        'maxlength' => '255'
+                        'maxlength' => '255',
                     ],
-                    'required'   => false
+                    'required' => false,
                 ]
             );
         }
@@ -243,11 +244,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => (!empty($inputAttributesText)) ? $inputAttributesText : 'mautic.form.field.form.inputattr',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
-                        'class'   => 'form-control',
-                        'tooltip' => 'mautic.form.field.help.attr',
-                        'maxlength' => '255'
+                        'class'     => 'form-control',
+                        'tooltip'   => 'mautic.form.field.help.attr',
+                        'maxlength' => '255',
                     ],
-                    'required'   => false
+                    'required' => false,
                 ]
             );
         }
@@ -260,18 +261,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => (!empty($containerAttributesText)) ? $containerAttributesText : 'mautic.form.field.form.container_attr',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
-                        'class'   => 'form-control',
-                        'tooltip' => 'mautic.form.field.help.container_attr',
-                        'maxlength' => '255'
+                        'class'     => 'form-control',
+                        'tooltip'   => 'mautic.form.field.help.container_attr',
+                        'maxlength' => '255',
                     ],
-                    'required'   => false
+                    'required' => false,
                 ]
             );
         }
 
         if ($addSaveResult) {
             $default = (!isset($options['data']['saveResult']) || $options['data']['saveResult'] === null) ? true
-                : (boolean) $options['data']['saveResult'];
+                : (bool) $options['data']['saveResult'];
             $builder->add(
                 'saveResult',
                 'yesno_button_group',
@@ -279,15 +280,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label' => 'mautic.form.field.form.saveresult',
                     'data'  => $default,
                     'attr'  => [
-                        'tooltip' => 'mautic.form.field.help.saveresult'
-                    ]
+                        'tooltip' => 'mautic.form.field.help.saveresult',
+                    ],
                 ]
             );
         }
 
         if ($addBehaviorFields) {
             $default = (!isset($options['data']['showWhenValueExists']) || $options['data']['showWhenValueExists'] === null) ? true
-                : (boolean) $options['data']['showWhenValueExists'];
+                : (bool) $options['data']['showWhenValueExists'];
             $builder->add(
                 'showWhenValueExists',
                 'yesno_button_group',
@@ -295,8 +296,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label' => 'mautic.form.field.form.show.when.value.exists',
                     'data'  => $default,
                     'attr'  => [
-                        'tooltip' => 'mautic.form.field.help.show.when.value.exists'
-                    ]
+                        'tooltip' => 'mautic.form.field.help.show.when.value.exists',
+                    ],
                 ]
             );
 
@@ -307,25 +308,25 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.form.field.form.show.after.x.submissions',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
-                        'class'     => 'form-control',
-                        'tooltip'   => 'mautic.form.field.help.show.after.x.submissions',
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.form.field.help.show.after.x.submissions',
                     ],
-                    'required'   => false
+                    'required' => false,
                 ]
             );
 
-            $isAutoFillValue = (!isset($options['data']['isAutoFill'])) ? false : (boolean) $options['data']['isAutoFill'];
+            $isAutoFillValue = (!isset($options['data']['isAutoFill'])) ? false : (bool) $options['data']['isAutoFill'];
             $builder->add(
                 'isAutoFill',
                 'yesno_button_group',
-                array(
-                    'label'     => 'mautic.form.field.form.auto_fill',
-                    'data'      => $isAutoFillValue,
-                    'attr'      => array(
+                [
+                    'label' => 'mautic.form.field.form.auto_fill',
+                    'data'  => $isAutoFillValue,
+                    'attr'  => [
                         'class'   => 'auto-fill-data',
-                        'tooltip' => 'mautic.form.field.help.auto_fill'
-                    )
-                )
+                        'tooltip' => 'mautic.form.field.help.auto_fill',
+                    ],
+                ]
             );
         }
 
@@ -345,7 +346,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         $data = '';
                         break;
                 }
-
             } elseif (isset($options['data']['leadField'])) {
                 $data = $options['data']['leadField'];
             } else {
@@ -356,8 +356,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'leadField',
                 'choice',
                 [
-                    'choices'    => $options['leadFields'],
-                    'choice_attr' => function($val, $key, $index) use ($options) {
+                    'choices'     => $options['leadFields'],
+                    'choice_attr' => function ($val, $key, $index) use ($options) {
                         if (!empty($options['leadFieldProperties'][$val]) && (in_array($options['leadFieldProperties'][$val]['type'], FormFieldHelper::getListTypes()) || !empty($options['leadFieldProperties'][$val]['properties']['list']) || !empty($options['leadFieldProperties'][$val]['properties']['optionlist']))) {
                             return ['data-list-type' => 1];
                         }
@@ -368,10 +368,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
                         'class'   => 'form-control',
-                        'tooltip' => 'mautic.form.field.help.lead_field'
+                        'tooltip' => 'mautic.form.field.help.lead_field',
                     ],
-                    'required'   => false,
-                    'data'       => $data
+                    'required' => false,
+                    'data'     => $data,
                 ]
             );
         }
@@ -394,7 +394,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'save_text'       => $btnValue,
                 'save_icon'       => $btnIcon,
                 'apply_text'      => false,
-                'container_class' => 'bottom-form-buttons'
+                'container_class' => 'bottom-form-buttons',
             ]
         );
 
@@ -402,7 +402,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'formId',
             'hidden',
             [
-                'mapped' => false
+                'mapped' => false,
             ]
         );
 
@@ -488,8 +488,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->addEventSubscriber(new CleanFormSubscriber($cleanMasks));
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -500,7 +500,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(
             [
-                'customParameters' => false
+                'customParameters' => false,
             ]
         );
 
@@ -514,6 +514,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "formfield";
+        return 'formfield';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldCaptchaType.php b/app/bundles/FormBundle/Form/Type/FormFieldCaptchaType.php
index ef9cc00086a..901489f0098 100644
--- a/app/bundles/FormBundle/Form/Type/FormFieldCaptchaType.php
+++ b/app/bundles/FormBundle/Form/Type/FormFieldCaptchaType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,14 +12,12 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class FormFieldCaptchaType
+ * Class FormFieldCaptchaType.
  */
 class FormFieldCaptchaType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -28,14 +27,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'captcha',
             'text',
             [
-                'label'       => 'mautic.form.field.form.property_captcha',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.form.field.form.property_captcha',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
                     'tooltip'     => 'mautic.form.field.help.captcha',
                     'placeholder' => 'mautic.form.field.help.captcha_placeholder',
                 ],
-                'required'    => false
+                'required' => false,
             ]
         );
 
@@ -46,7 +45,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.form.field.form.property_placeholder',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => false
+                'required'   => false,
             ]
         );
 
@@ -57,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.form.field.form.property_captchaerror',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => false
+                'required'   => false,
             ]
         );
     }
@@ -67,6 +66,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "formfield_captcha";
+        return 'formfield_captcha';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldGroupType.php b/app/bundles/FormBundle/Form/Type/FormFieldGroupType.php
index a5674ba77a1..b162a9385b6 100644
--- a/app/bundles/FormBundle/Form/Type/FormFieldGroupType.php
+++ b/app/bundles/FormBundle/Form/Type/FormFieldGroupType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,10 +12,9 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class FormFieldGroupType
+ * Class FormFieldGroupType.
  */
 class FormFieldGroupType extends AbstractType
 {
@@ -34,9 +34,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'     => 'form-control',
                     'tooltip'   => 'mautic.form.field.help.group.labelattr',
-                    'maxlength' => '255'
+                    'maxlength' => '255',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -57,6 +57,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "formfield_group";
+        return 'formfield_group';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldPageBreakType.php b/app/bundles/FormBundle/Form/Type/FormFieldPageBreakType.php
index 322d4483373..96c5296f716 100644
--- a/app/bundles/FormBundle/Form/Type/FormFieldPageBreakType.php
+++ b/app/bundles/FormBundle/Form/Type/FormFieldPageBreakType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class FormFieldPageBreakType
+ * Class FormFieldPageBreakType.
  */
 class FormFieldPageBreakType extends AbstractType
 {
@@ -43,18 +44,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'next_page_label',
             'text',
             [
-                'label'       => 'mautic.form.field.form.property_pagebreak_nextpage_label',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.form.field.form.property_pagebreak_nextpage_label',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class' => 'form-control',
                 ],
                 'required'    => true,
                 'constraints' => [
                     new NotBlank(
                         ['message' => 'mautic.core.value.required']
-                    )
+                    ),
                 ],
-                'empty_data' => $this->translator->trans('mautic.core.continue')
+                'empty_data' => $this->translator->trans('mautic.core.continue'),
             ]
         );
 
@@ -62,13 +63,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'prev_page_label',
             'text',
             [
-                'label'       => 'mautic.form.field.form.property_pagebreak_prevpage_label',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                    'class' => 'form-control',
-                    'placeholder' => 'mautic.form.field.form.property_pagebreak_prevpage_placeholder'
+                'label'      => 'mautic.form.field.form.property_pagebreak_prevpage_label',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'       => 'form-control',
+                    'placeholder' => 'mautic.form.field.form.property_pagebreak_prevpage_placeholder',
                 ],
-                'required'    => false,
+                'required' => false,
             ]
         );
     }
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldPlaceholderType.php b/app/bundles/FormBundle/Form/Type/FormFieldPlaceholderType.php
index 85cbf29d2b4..4765003cdaa 100644
--- a/app/bundles/FormBundle/Form/Type/FormFieldPlaceholderType.php
+++ b/app/bundles/FormBundle/Form/Type/FormFieldPlaceholderType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,22 +14,21 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class FormFieldPlaceholderType
+ * Class FormFieldPlaceholderType.
  */
 class FormFieldPlaceholderType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('placeholder', 'text', array(
+        $builder->add('placeholder', 'text', [
             'label'      => 'mautic.form.field.form.property_placeholder',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => false,
+        ]);
     }
 
     /**
@@ -36,6 +36,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "formfield_placeholder";
+        return 'formfield_placeholder';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldSelectType.php b/app/bundles/FormBundle/Form/Type/FormFieldSelectType.php
index 07df89032a1..8d8a24dc207 100644
--- a/app/bundles/FormBundle/Form/Type/FormFieldSelectType.php
+++ b/app/bundles/FormBundle/Form/Type/FormFieldSelectType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,9 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * Class FormFieldSelectType
+ * Class FormFieldSelectType.
  */
 class FormFieldSelectType extends AbstractType
 {
@@ -38,7 +37,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.form.field.form.emptyvalue',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => false
+                'required'   => false,
             ]
         );
 
@@ -52,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'yesno_button_group',
             [
                 'label' => 'mautic.form.field.form.multiple',
-                'data'  => $default
+                'data'  => $default,
             ]
         );
     }
@@ -65,7 +64,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefaults(
             [
                 'field_type' => 'select',
-                'parentData' => []
+                'parentData' => [],
             ]
         );
     }
@@ -75,6 +74,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getName()
     {
-        return "formfield_select";
+        return 'formfield_select';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldTextType.php b/app/bundles/FormBundle/Form/Type/FormFieldTextType.php
index f7fda1110fa..8d256a25a9b 100644
--- a/app/bundles/FormBundle/Form/Type/FormFieldTextType.php
+++ b/app/bundles/FormBundle/Form/Type/FormFieldTextType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FormFieldTextType
+ * Class FormFieldTextType.
  */
 class FormFieldTextType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -26,22 +26,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $editor = ($options['editor']) ? ' editor editor-advanced' : '';
 
-        $builder->add('text', 'textarea', array(
+        $builder->add('text', 'textarea', [
             'label'      => 'mautic.form.field.type.freetext',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control' . $editor),
-            'required'   => true
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'.$editor],
+            'required'   => true,
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'editor' => false
-        ));
+        $resolver->setDefaults([
+            'editor' => false,
+        ]);
     }
 
     /**
@@ -49,6 +49,6 @@ public function setDefaultOptions (OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "formfield_text";
+        return 'formfield_text';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/FormFieldTrait.php b/app/bundles/FormBundle/Form/Type/FormFieldTrait.php
index 23e23fb0d62..a1585656559 100644
--- a/app/bundles/FormBundle/Form/Type/FormFieldTrait.php
+++ b/app/bundles/FormBundle/Form/Type/FormFieldTrait.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Form\Type;
 
-
 use Mautic\FormBundle\Model\FieldModel;
 use Mautic\FormBundle\Model\FormModel;
 
@@ -64,4 +64,4 @@ protected function getFormFields($formId, $asTokens = true)
 
         return $choices;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/Form/Type/FormListType.php b/app/bundles/FormBundle/Form/Type/FormListType.php
index 969fba1dab4..e56670fe45f 100644
--- a/app/bundles/FormBundle/Form/Type/FormListType.php
+++ b/app/bundles/FormBundle/Form/Type/FormListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,18 +16,18 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PointActionFormSubmitType
+ * Class PointActionFormSubmitType.
  */
 class FormListType extends AbstractType
 {
-
     private $viewOther;
     private $repo;
 
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->viewOther = $factory->getSecurity()->isGranted('form:forms:viewother');
         $this->repo      = $factory->getModel('form')->getRepository();
 
@@ -38,15 +39,15 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $viewOther = $this->viewOther;
         $repo      = $this->repo;
 
-        $resolver->setDefaults(array(
-            'choices'     => function (Options $options) use ($repo, $viewOther) {
+        $resolver->setDefaults([
+            'choices' => function (Options $options) use ($repo, $viewOther) {
                 static $choices;
 
                 if (is_array($choices)) {
                     return $choices;
                 }
 
-                $choices = array();
+                $choices = [];
 
                 $forms = $repo->getFormList('', 0, 0, $viewOther, $options['form_type']);
                 foreach ($forms as $form) {
@@ -58,13 +59,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
                 return $choices;
             },
-            'expanded'      => false,
-            'multiple'      => true,
-            'empty_value'   => false,
-            'form_type'     => null
-        ));
+            'expanded'    => false,
+            'multiple'    => true,
+            'empty_value' => false,
+            'form_type'   => null,
+        ]);
 
-        $resolver->setOptional(array('form_type'));
+        $resolver->setOptional(['form_type']);
     }
 
     /**
@@ -72,7 +73,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "form_list";
+        return 'form_list';
     }
 
     /**
diff --git a/app/bundles/FormBundle/Form/Type/FormType.php b/app/bundles/FormBundle/Form/Type/FormType.php
index e88cfa4e63b..1cb1aacfa10 100644
--- a/app/bundles/FormBundle/Form/Type/FormType.php
+++ b/app/bundles/FormBundle/Form/Type/FormType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,16 +14,14 @@
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FormType
+ * Class FormType.
  */
 class FormType extends AbstractType
 {
-
     /**
      * @var \Symfony\Bundle\FrameworkBundle\Translation\Translator
      */
@@ -36,7 +35,7 @@ class FormType extends AbstractType
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->translator = $factory->getTranslator();
         $this->security   = $factory->getSecurity();
@@ -45,38 +44,38 @@ public function __construct (MauticFactory $factory)
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('description' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['description' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('form.form', $options));
 
         //details
-        $builder->add('name', 'text', array(
+        $builder->add('name', 'text', [
             'label'      => 'mautic.core.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control')
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('description', 'textarea', array(
+        $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control editor'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
 
         //add category
-        $builder->add('category', 'category', array(
-            'bundle' => 'form'
-        ));
+        $builder->add('category', 'category', [
+            'bundle' => 'form',
+        ]);
 
-        $builder->add('template', 'theme_list', array(
+        $builder->add('template', 'theme_list', [
             'feature'     => 'form',
             'empty_value' => ' ',
-            'attr'        => array(
+            'attr'        => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.form.form.template.help'
-            )
-        ));
+                'tooltip' => 'mautic.form.form.template.help',
+            ],
+        ]);
 
         if (!empty($options['data']) && $options['data']->getId()) {
             $readonly = !$this->security->hasEntityAccess(
@@ -94,112 +93,112 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $data     = true;
         }
 
-        $builder->add('isPublished', 'yesno_button_group', array(
+        $builder->add('isPublished', 'yesno_button_group', [
             'read_only' => $readonly,
-            'data'      => $data
-        ));
+            'data'      => $data,
+        ]);
 
-        $builder->add('inKioskMode', 'yesno_button_group', array(
-            'label'       => 'mautic.form.form.kioskmode',
-            'attr'        => array(
-                'tooltip' => 'mautic.form.form.kioskmode.tooltip'
-            )
-        ));
+        $builder->add('inKioskMode', 'yesno_button_group', [
+            'label' => 'mautic.form.form.kioskmode',
+            'attr'  => [
+                'tooltip' => 'mautic.form.form.kioskmode.tooltip',
+            ],
+        ]);
 
         // Render style for new form by default
         if ($options['data']->getId() === null) {
             $options['data']->setRenderStyle(true);
         }
 
-        $builder->add('renderStyle', 'yesno_button_group', array(
-            'label'       => 'mautic.form.form.renderstyle',
-            'data'        => ($options['data']->getRenderStyle() === null) ? true : $options['data']->getRenderStyle(),
-            'empty_data'  => true,
-            'attr'        => array(
-                'tooltip' => 'mautic.form.form.renderstyle.tooltip'
-            )
-        ));
+        $builder->add('renderStyle', 'yesno_button_group', [
+            'label'      => 'mautic.form.form.renderstyle',
+            'data'       => ($options['data']->getRenderStyle() === null) ? true : $options['data']->getRenderStyle(),
+            'empty_data' => true,
+            'attr'       => [
+                'tooltip' => 'mautic.form.form.renderstyle.tooltip',
+            ],
+        ]);
 
-        $builder->add('publishUp', 'datetime', array(
+        $builder->add('publishUp', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishup',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
-        $builder->add('publishDown', 'datetime', array(
+        $builder->add('publishDown', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishdown',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
-
-        $builder->add('postAction', 'choice', array(
-            'choices'     => array(
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
+
+        $builder->add('postAction', 'choice', [
+            'choices' => [
                 'return'   => 'mautic.form.form.postaction.return',
                 'redirect' => 'mautic.form.form.postaction.redirect',
-                'message'  => 'mautic.form.form.postaction.message'
-            ),
-            'label'       => 'mautic.form.form.postaction',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
+                'message'  => 'mautic.form.form.postaction.message',
+            ],
+            'label'      => 'mautic.form.form.postaction',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'    => 'form-control',
-                'onchange' => 'Mautic.onPostSubmitActionChange(this.value);'
-            ),
+                'onchange' => 'Mautic.onPostSubmitActionChange(this.value);',
+            ],
             'required'    => false,
-            'empty_value' => false
-        ));
+            'empty_value' => false,
+        ]);
 
         $postAction = (isset($options['data'])) ? $options['data']->getPostAction() : '';
-        $required   = (in_array($postAction, array('redirect', 'message'))) ? true : false;
-        $builder->add('postActionProperty', 'text', array(
+        $required   = (in_array($postAction, ['redirect', 'message'])) ? true : false;
+        $builder->add('postActionProperty', 'text', [
             'label'      => 'mautic.form.form.postactionproperty',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control'),
-            'required'   => $required
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => $required,
+        ]);
 
-        $builder->add('sessionId', 'hidden', array(
-            'mapped' => false
-        ));
+        $builder->add('sessionId', 'hidden', [
+            'mapped' => false,
+        ]);
 
         $builder->add('buttons', 'form_buttons');
         $builder->add('formType', 'hidden');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class'        => 'Mautic\FormBundle\Entity\Form',
-            'validation_groups' => array(
+            'validation_groups' => [
                 'Mautic\FormBundle\Entity\Form',
                 'determineValidationGroups',
-            )
-        ));
+            ],
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
-        return "mauticform";
+        return 'mauticform';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/PointActionFormSubmitType.php b/app/bundles/FormBundle/Form/Type/PointActionFormSubmitType.php
index 76b680333c0..9add2a142a5 100644
--- a/app/bundles/FormBundle/Form/Type/PointActionFormSubmitType.php
+++ b/app/bundles/FormBundle/Form/Type/PointActionFormSubmitType.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PointActionFormSubmitType
+ * Class PointActionFormSubmitType.
  */
 class PointActionFormSubmitType extends AbstractType
 {
@@ -23,15 +23,15 @@ class PointActionFormSubmitType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('forms', 'form_list', array(
-            'label'         => 'mautic.form.point.action.forms',
-            'label_attr'    => array('class' => 'control-label'),
-            'required'      => false,
-            'attr'       => array(
+        $builder->add('forms', 'form_list', [
+            'label'      => 'mautic.form.point.action.forms',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.form.point.action.forms.descr'
-            )
-        ));
+                'tooltip' => 'mautic.form.point.action.forms.descr',
+            ],
+        ]);
     }
 
     /**
@@ -39,6 +39,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "pointaction_formsubmit";
+        return 'pointaction_formsubmit';
     }
 }
diff --git a/app/bundles/FormBundle/Form/Type/SortableListTrait.php b/app/bundles/FormBundle/Form/Type/SortableListTrait.php
index b386037cda2..98e25bbbbe5 100644
--- a/app/bundles/FormBundle/Form/Type/SortableListTrait.php
+++ b/app/bundles/FormBundle/Form/Type/SortableListTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -25,10 +26,10 @@ public function addSortableList(FormBuilderInterface $builder, $options, $listNa
     {
         $listOptions = [
             'with_labels' => true,
-            'attr'  => [
+            'attr'        => [
                 'data-show-on' => '{"'.$formName.'_properties_syncList_1": "", "'.$formName.'_leadField:data-list-type": "empty"}',
             ],
-            'option_required' => false,
+            'option_required'     => false,
             'constraint_callback' => new Callback(
                 function ($validateMe, ExecutionContextInterface $context) use ($listName) {
                     $data = $context->getRoot()->getData();
@@ -36,7 +37,7 @@ function ($validateMe, ExecutionContextInterface $context) use ($listName) {
                         $context->buildViolation('mautic.form.lists.count')->addViolation();
                     }
                 }
-            )
+            ),
         ];
 
         if (null !== $listData) {
@@ -49,14 +50,14 @@ function ($validateMe, ExecutionContextInterface $context) use ($listName) {
             'yesno_button_group',
             [
                 'attr' => [
-                    'data-show-on' => '{"'.$formName.'_leadField:data-list-type": "1"}'
+                    'data-show-on' => '{"'.$formName.'_leadField:data-list-type": "1"}',
                 ],
                 'label' => 'mautic.form.field.form.property_list_sync_choices',
-                'data'  => !isset($options['data']['syncList']) ? false : (boolean) $options['data']['syncList'],
+                'data'  => !isset($options['data']['syncList']) ? false : (bool) $options['data']['syncList'],
             ]
         );
 
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
             $formData = $event->getForm()->getParent()->getData();
             $form = $event->getForm();
             if (empty($formData['leadField'])) {
@@ -67,4 +68,4 @@ function ($validateMe, ExecutionContextInterface $context) use ($listName) {
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/Form/Type/SubmitActionEmailType.php b/app/bundles/FormBundle/Form/Type/SubmitActionEmailType.php
index d03c623a5e3..554753ecc4c 100644
--- a/app/bundles/FormBundle/Form/Type/SubmitActionEmailType.php
+++ b/app/bundles/FormBundle/Form/Type/SubmitActionEmailType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Symfony\Component\Validator\Constraints\Email;
 
 /**
- * Class SubmitActionEmailType
+ * Class SubmitActionEmailType.
  */
 class SubmitActionEmailType extends AbstractType
 {
@@ -56,12 +57,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
                 'required'   => false,
-                'data'       => $data
+                'data'       => $data,
             ]
         );
 
         if (!isset($options['data']['message'])) {
-            $fields   = $this->getFormFields($options['attr']['data-formid']);
+            $fields  = $this->getFormFields($options['attr']['data-formid']);
             $message = '';
 
             foreach ($fields as $token => $label) {
@@ -79,7 +80,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control editor editor-basic'],
                 'required'   => false,
-                'data'       => $message
+                'data'       => $message,
             ]
         );
 
@@ -89,7 +90,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'yesno_button_group',
             [
                 'label' => 'mautic.form.action.sendemail.copytolead',
-                'data'  => $default
+                'data'  => $default,
             ]
         );
 
@@ -97,19 +98,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'to',
             'text',
             [
-                'label'       => 'mautic.form.action.sendemail.to',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.form.action.sendemail.to',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
                     'placeholder' => 'mautic.core.optional',
-                    'tooltip'     => 'mautic.form.action.sendemail.multiple.emails'
+                    'tooltip'     => 'mautic.form.action.sendemail.multiple.emails',
                 ],
                 'required'    => false,
                 'constraints' => new Email(
                     [
-                        'message' => 'mautic.core.email.required'
+                        'message' => 'mautic.core.email.required',
                     ]
-                )
+                ),
             ]
         );
 
@@ -117,19 +118,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'cc',
             'text',
             [
-                'label'       => 'mautic.form.action.sendemail.cc',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.form.action.sendemail.cc',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
                     'placeholder' => 'mautic.core.optional',
-                    'tooltip'     => 'mautic.form.action.sendemail.multiple.emails'
+                    'tooltip'     => 'mautic.form.action.sendemail.multiple.emails',
                 ],
                 'required'    => false,
                 'constraints' => new Email(
                     [
-                        'message' => 'mautic.core.email.required'
+                        'message' => 'mautic.core.email.required',
                     ]
-                )
+                ),
             ]
         );
 
@@ -137,19 +138,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'bcc',
             'text',
             [
-                'label'       => 'mautic.form.action.sendemail.bcc',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.form.action.sendemail.bcc',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
                     'placeholder' => 'mautic.core.optional',
-                    'tooltip'     => 'mautic.form.action.sendemail.multiple.emails'
+                    'tooltip'     => 'mautic.form.action.sendemail.multiple.emails',
                 ],
                 'required'    => false,
                 'constraints' => new Email(
                     [
-                        'message' => 'mautic.core.email.required'
+                        'message' => 'mautic.core.email.required',
                     ]
-                )
+                ),
             ]
         );
     }
@@ -159,7 +160,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "form_submitaction_sendemail";
+        return 'form_submitaction_sendemail';
     }
 
     /**
diff --git a/app/bundles/FormBundle/Form/Type/SubmitActionRepostType.php b/app/bundles/FormBundle/Form/Type/SubmitActionRepostType.php
index e21050b75f7..68d8875abff 100644
--- a/app/bundles/FormBundle/Form/Type/SubmitActionRepostType.php
+++ b/app/bundles/FormBundle/Form/Type/SubmitActionRepostType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Symfony\Component\Validator\Constraints\Url;
 
 /**
- * Class SubmitActionEmailType
+ * Class SubmitActionEmailType.
  */
 class SubmitActionRepostType extends AbstractType
 {
@@ -34,21 +35,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.form.action.repost.post_url',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
-                    'class' => 'form-control',
-                    'preaddon'    => 'fa fa-globe',
+                    'class'    => 'form-control',
+                    'preaddon' => 'fa fa-globe',
                 ],
                 'constraints' => [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
                     ),
                     new Url(
                         [
-                            'message' => 'mautic.core.valid_url_required'
+                            'message' => 'mautic.core.valid_url_required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -56,14 +57,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'authorization_header',
             'text',
             [
-                'label'       => 'mautic.form.action.repost.authorization_header',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                    'class'       => 'form-control',
-                    'tooltip'     => 'mautic.form.action.repost.authorization_header.tooltip',
-                    'preaddon'    => 'fa fa-lock',
+                'label'      => 'mautic.form.action.repost.authorization_header',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'    => 'form-control',
+                    'tooltip'  => 'mautic.form.action.repost.authorization_header.tooltip',
+                    'preaddon' => 'fa fa-lock',
                 ],
-                'required'    => false
+                'required' => false,
             ]
         );
 
@@ -71,35 +72,35 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'failure_email',
             'email',
             [
-                'label'       => 'mautic.form.action.repost.failure_email',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                    'class'       => 'form-control',
-                    'tooltip'     => 'mautic.form.action.repost.failure_email.tooltip',
-                    'preaddon'    => 'fa fa-envelope'
+                'label'      => 'mautic.form.action.repost.failure_email',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'    => 'form-control',
+                    'tooltip'  => 'mautic.form.action.repost.failure_email.tooltip',
+                    'preaddon' => 'fa fa-envelope',
                 ],
                 'required'    => false,
                 'constraints' => new Email(
                     [
-                        'message' => 'mautic.core.email.required'
+                        'message' => 'mautic.core.email.required',
                     ]
-                )
+                ),
             ]
         );
 
-        $fields  = $this->getFormFields($options['attr']['data-formid'], false);
+        $fields = $this->getFormFields($options['attr']['data-formid'], false);
 
         foreach ($fields as $alias => $label) {
             $builder->add(
                 $alias,
                 'text',
                 [
-                    'label'       => $label." ($alias)",
-                    'label_attr'  => ['class' => 'control-label'],
-                    'attr'        => [
-                        'class'       => 'form-control'
+                    'label'      => $label." ($alias)",
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
+                        'class' => 'form-control',
                     ],
-                    'required'    => false
+                    'required' => false,
                 ]
             );
         }
diff --git a/app/bundles/FormBundle/FormEvents.php b/app/bundles/FormBundle/FormEvents.php
index 99f92ddaefe..ac2a0064d9c 100644
--- a/app/bundles/FormBundle/FormEvents.php
+++ b/app/bundles/FormBundle/FormEvents.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle;
 
 /**
- * Class FormEvents
+ * Class FormEvents.
  *
  * Events available for FormBundle
  */
@@ -54,7 +55,7 @@ final class FormEvents
 
     /**
      * The mautic.form_on_build event is dispatched before displaying the form builder form to allow adding of custom form
-     * fields and submit actions
+     * fields and submit actions.
      *
      * The event listener receives a Mautic\FormBundle\Event\FormBuilderEvent instance.
      *
@@ -63,7 +64,7 @@ final class FormEvents
     const FORM_ON_BUILD = 'mautic.form_on_build';
 
     /**
-     * The mautic.form_on_submit event is dispatched when a new submission is fired
+     * The mautic.form_on_submit event is dispatched when a new submission is fired.
      *
      * The event listener receives a Mautic\FormBundle\Event\SubmissionEvent instance.
      *
@@ -92,7 +93,7 @@ final class FormEvents
     const ON_CAMPAIGN_TRIGGER_DECISION = 'mautic.form.on_campaign_trigger_decision';
 
     /**
-     * The mautic.form.on_execute_submit_action event is dispatched to excecute the form submit actions
+     * The mautic.form.on_execute_submit_action event is dispatched to excecute the form submit actions.
      *
      * The event listener receives a
      * Mautic\FormBundle\Event\SubmissionEvent
diff --git a/app/bundles/FormBundle/Helper/AbTestHelper.php b/app/bundles/FormBundle/Helper/AbTestHelper.php
index e6eac6b595b..fcf9b014ffc 100644
--- a/app/bundles/FormBundle/Helper/AbTestHelper.php
+++ b/app/bundles/FormBundle/Helper/AbTestHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,12 @@
 use Mautic\PageBundle\Entity\Page;
 
 /**
- * Class AbTestHelper
+ * Class AbTestHelper.
  */
 class AbTestHelper
 {
-
     /**
-     * Determines the winner of A/B test based on number of form submissions
+     * Determines the winner of A/B test based on number of form submissions.
      *
      * @param MauticFactory $factory
      * @param Page          $parent
@@ -28,7 +28,7 @@ class AbTestHelper
      *
      * @return array
      */
-    public static function determineSubmissionWinner ($factory, $parent, $children)
+    public static function determineSubmissionWinner($factory, $parent, $children)
     {
         $repo = $factory->getEntityManager()->getRepository('MauticFormBundle:Submission');
 
@@ -36,7 +36,7 @@ public static function determineSubmissionWinner ($factory, $parent, $children)
         //if it is a page A/B test, then link form submission to page
         $type = ($parent instanceof Email) ? 'email' : 'page';
 
-        $ids = array($parent->getId());
+        $ids = [$parent->getId()];
 
         foreach ($children as $c) {
             if ($c->isPublished()) {
@@ -47,12 +47,12 @@ public static function determineSubmissionWinner ($factory, $parent, $children)
 
         $startDate = $parent->getVariantStartDate();
         if ($startDate != null && !empty($ids)) {
-            $counts = ($type == "page") ? $repo->getSubmissionCountsByPage($ids, $startDate) : $repo->getSubmissionCountsByEmail($ids, $startDate);
+            $counts = ($type == 'page') ? $repo->getSubmissionCountsByPage($ids, $startDate) : $repo->getSubmissionCountsByEmail($ids, $startDate);
 
             $translator = $factory->getTranslator();
             if ($counts) {
-                $submissions = $support = $data = array();
-                $hasResults  = array();
+                $submissions = $support = $data = [];
+                $hasResults  = [];
 
                 $submissionLabel = $translator->trans('mautic.form.abtest.label.submissions');
                 $hitLabel        = ($type == 'page') ? $translator->trans('mautic.form.abtest.label.hits') : $translator->trans('mautic.form.abtest.label.sentemils');
@@ -62,7 +62,7 @@ public static function determineSubmissionWinner ($factory, $parent, $children)
                     $submissions[$stats['id']] = $submissionRate;
                     $data[$submissionLabel][]  = $stats['count'];
                     $data[$hitLabel][]         = $stats['total'];
-                    $support['labels'][]       = $stats['id'] . ':' . $stats['name'] . ' (' . $submissionRate . '%)';
+                    $support['labels'][]       = $stats['id'].':'.$stats['name'].' ('.$submissionRate.'%)';
                     $hasResults[]              = $stats['id'];
                 }
 
@@ -70,7 +70,7 @@ public static function determineSubmissionWinner ($factory, $parent, $children)
                 if (!in_array($parent->getId(), $hasResults)) {
                     $data[$submissionLabel][] = 0;
                     $data[$hitLabel][]        = 0;
-                    $support['labels'][]      = (($type == 'page') ? $parent->getTitle() : $parent->getName()) . ' (0%)';
+                    $support['labels'][]      = (($type == 'page') ? $parent->getTitle() : $parent->getName()).' (0%)';
                 }
 
                 foreach ($children as $c) {
@@ -78,14 +78,14 @@ public static function determineSubmissionWinner ($factory, $parent, $children)
                         if (!in_array($c->getId(), $hasResults)) {
                             $data[$submissionLabel][] = 0;
                             $data[$hitLabel][]        = 0;
-                            $support['labels'][]      = (($type == 'page') ? $c->getTitle() : $c->getName()) . ' (0%)';
+                            $support['labels'][]      = (($type == 'page') ? $c->getTitle() : $c->getName()).' (0%)';
                         }
                     }
                 }
                 $support['data'] = $data;
 
                 //set max for scales
-                $maxes = array();
+                $maxes = [];
                 foreach ($support['data'] as $label => $data) {
                     $maxes[] = max($data);
                 }
@@ -101,19 +101,19 @@ public static function determineSubmissionWinner ($factory, $parent, $children)
                 //get the page ids with the most number of submissions
                 $winners = array_keys($submissions, $max);
 
-                return array(
+                return [
                     'winners'         => $winners,
                     'support'         => $support,
                     'basedOn'         => 'form.submissions',
-                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php'
-                );
+                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php',
+                ];
             }
         }
 
-        return array(
-            'winners' => array(),
-            'support' => array(),
-            'basedOn' => 'form.submissions'
-        );
+        return [
+            'winners' => [],
+            'support' => [],
+            'basedOn' => 'form.submissions',
+        ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/Helper/FormFieldHelper.php b/app/bundles/FormBundle/Helper/FormFieldHelper.php
index 47de23a9351..848cf96f917 100644
--- a/app/bundles/FormBundle/Helper/FormFieldHelper.php
+++ b/app/bundles/FormBundle/Helper/FormFieldHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,7 +23,7 @@
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
- * Class FormFieldHelper
+ * Class FormFieldHelper.
  */
 class FormFieldHelper extends AbstractFormFieldHelper
 {
@@ -35,16 +36,13 @@ class FormFieldHelper extends AbstractFormFieldHelper
      * @var array
      */
     private $types = [
-        'captcha'     => [
+        'captcha' => [
             'constraints' => [
-                NotBlank::class =>
-                    ['message' => 'mautic.form.submission.captcha.invalid'],
+                NotBlank::class => ['message' => 'mautic.form.submission.captcha.invalid'],
 
-                EqualTo::class =>
-                    ['message' => 'mautic.form.submission.captcha.invalid'],
+                EqualTo::class => ['message' => 'mautic.form.submission.captcha.invalid'],
 
-                Blank::class =>
-                    ['message' => 'mautic.form.submission.captcha.invalid'],
+                Blank::class => ['message' => 'mautic.form.submission.captcha.invalid'],
             ],
         ],
         'checkboxgrp' => [],
@@ -53,27 +51,25 @@ class FormFieldHelper extends AbstractFormFieldHelper
         'email'       => [
             'filter'      => 'email',
             'constraints' => [
-                Email::class =>
-                    ['message' => 'mautic.form.submission.email.invalid'],
+                Email::class => ['message' => 'mautic.form.submission.email.invalid'],
             ],
         ],
-        'freetext'    => [],
-        'hidden'      => [],
-        'number'      => [
+        'freetext' => [],
+        'hidden'   => [],
+        'number'   => [
             'filter' => 'float',
         ],
-        'pagebreak'   => [],
-        'password'    => [],
-        'radiogrp'    => [],
-        'select'      => [],
-        'tel'         => [],
-        'text'        => [],
-        'textarea'    => [],
-        'url'         => [
+        'pagebreak' => [],
+        'password'  => [],
+        'radiogrp'  => [],
+        'select'    => [],
+        'tel'       => [],
+        'text'      => [],
+        'textarea'  => [],
+        'url'       => [
             'filter'      => 'url',
             'constraints' => [
-                Url::class =>
-                    ['message' => 'mautic.form.submission.url.invalid'],
+                Url::class => ['message' => 'mautic.form.submission.url.invalid'],
             ],
         ],
     ];
@@ -97,7 +93,7 @@ public function __construct(TranslatorInterface $translator, ValidatorInterface
     }
 
     /**
-     * Set the translation key prefix
+     * Set the translation key prefix.
      */
     public function setTranslationKeyPrefix()
     {
@@ -125,7 +121,7 @@ public function getTypes()
     }
 
     /**
-     * Get fields input filter
+     * Get fields input filter.
      *
      * @param $type
      *
@@ -184,7 +180,7 @@ public function validateFieldValue($type, $value, $f = null)
                         $transParameters = $v->getParameters();
 
                         if ($f !== null) {
-                            $transParameters['%label%'] = "&quot;".$f->getLabel()."&quot;";
+                            $transParameters['%label%'] = '&quot;'.$f->getLabel().'&quot;';
                         }
 
                         $errors[] = $this->translator->trans($v->getMessage(), $transParameters, 'validators');
@@ -211,7 +207,7 @@ public function populateField($field, $value, $formName, &$formHtml)
             case 'email':
             case 'hidden':
                 if (preg_match('/<input(.*?)id="mauticform_input_'.$formName.'_'.$alias.'"(.*?)value="(.*?)"(.*?)\/>/i', $formHtml, $match)) {
-                    $replace  = '<input'.$match[1].'id="mauticform_input_'.$formName.'_'.$alias.'"'.$match[2].'value="'.urldecode($value).'"'
+                    $replace = '<input'.$match[1].'id="mauticform_input_'.$formName.'_'.$alias.'"'.$match[2].'value="'.urldecode($value).'"'
                         .$match[4].'/>';
                     $formHtml = str_replace($match[0], $replace, $formHtml);
                 }
@@ -233,7 +229,7 @@ public function populateField($field, $value, $formName, &$formHtml)
                         $formHtml,
                         $match
                     )) {
-                        $replace  = '<input'.$match[1].'id="mauticform_checkboxgrp_checkbox'.$match[2].'"'.$match[3].'value="'.$val.'"'
+                        $replace = '<input'.$match[1].'id="mauticform_checkboxgrp_checkbox'.$match[2].'"'.$match[3].'value="'.$val.'"'
                             .$match[4].' checked />';
                         $formHtml = str_replace($match[0], $replace, $formHtml);
                     }
@@ -242,7 +238,7 @@ public function populateField($field, $value, $formName, &$formHtml)
             case 'radiogrp':
                 $value = urldecode($value);
                 if (preg_match('/<input(.*?)id="mauticform_radiogrp_radio(.*?)"(.*?)value="'.$value.'"(.*?)\/>/i', $formHtml, $match)) {
-                    $replace  = '<input'.$match[1].'id="mauticform_radiogrp_radio'.$match[2].'"'.$match[3].'value="'.$value.'"'.$match[4]
+                    $replace = '<input'.$match[1].'id="mauticform_radiogrp_radio'.$match[2].'"'.$match[3].'value="'.$value.'"'.$match[4]
                         .' checked />';
                     $formHtml = str_replace($match[0], $replace, $formHtml);
                 }
diff --git a/app/bundles/FormBundle/Helper/FormSubmitHelper.php b/app/bundles/FormBundle/Helper/FormSubmitHelper.php
index c6017da01f0..ba076119792 100644
--- a/app/bundles/FormBundle/Helper/FormSubmitHelper.php
+++ b/app/bundles/FormBundle/Helper/FormSubmitHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,7 +23,6 @@ class FormSubmitHelper
      */
     public static function sendEmail($tokens, $config, MauticFactory $factory, Lead $lead)
     {
-
     }
 
     /**
@@ -34,8 +34,7 @@ public static function repostForm($post, $server, $config, Lead $lead)
     {
         if (!empty($config['post_url'])) {
             foreach ($post as $name => $value) {
-
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/Helper/PointActionHelper.php b/app/bundles/FormBundle/Helper/PointActionHelper.php
index 37589ed920e..0c7a566cea7 100644
--- a/app/bundles/FormBundle/Helper/PointActionHelper.php
+++ b/app/bundles/FormBundle/Helper/PointActionHelper.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Helper;
 
 /**
- * Class PointActionHelper
+ * Class PointActionHelper.
  */
 class PointActionHelper
 {
-
     /**
      * @param $eventDetails
      * @param $action
@@ -34,4 +34,4 @@ public static function validateFormSubmit($eventDetails, $action)
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/FormBundle/MauticFormBundle.php b/app/bundles/FormBundle/MauticFormBundle.php
index 9248cb3748e..79958cd67a1 100644
--- a/app/bundles/FormBundle/MauticFormBundle.php
+++ b/app/bundles/FormBundle/MauticFormBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticFormBundle
- *
- * @package Mautic\FormBundle
+ * Class MauticFormBundle.
  */
 class MauticFormBundle extends Bundle
 {
-
 }
diff --git a/app/bundles/FormBundle/Model/ActionModel.php b/app/bundles/FormBundle/Model/ActionModel.php
index 03986b33e98..7da64cb1c11 100644
--- a/app/bundles/FormBundle/Model/ActionModel.php
+++ b/app/bundles/FormBundle/Model/ActionModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\FormBundle\Entity\Action;
 
 /**
- * Class ActionModel
+ * Class ActionModel.
  */
 class ActionModel extends CommonFormModel
 {
-
     /**
      * {@inheritdoc}
      *
diff --git a/app/bundles/FormBundle/Model/FieldModel.php b/app/bundles/FormBundle/Model/FieldModel.php
index 41c30344350..02356b25846 100644
--- a/app/bundles/FormBundle/Model/FieldModel.php
+++ b/app/bundles/FormBundle/Model/FieldModel.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Model;
 
-use Mautic\LeadBundle\Model\FieldModel as LeadFieldModel;
 use Mautic\CoreBundle\Model\FormModel as CommonFormModel;
 use Mautic\FormBundle\Entity\Field;
+use Mautic\LeadBundle\Model\FieldModel as LeadFieldModel;
 use Symfony\Component\HttpFoundation\Session\Session;
 
 /**
- * Class FieldModel
+ * Class FieldModel.
  */
 class FieldModel extends CommonFormModel
 {
@@ -78,7 +79,7 @@ public function createForm($entity, $formFactory, $action = null, $options = [])
             $group = array_diff_key($group, $testLeadFields);
         }
 
-        $options['leadFields']     = $choices;
+        $options['leadFields']          = $choices;
         $options['leadFieldProperties'] = $fields;
 
         if ($action) {
@@ -119,7 +120,7 @@ public function getEntity($id = null)
     }
 
     /**
-     * Get the fields saved in session
+     * Get the fields saved in session.
      *
      * @param $formId
      *
@@ -127,8 +128,9 @@ public function getEntity($id = null)
      */
     public function getSessionFields($formId)
     {
-        $fields = $this->session->get('mautic.form.'.$formId.'.fields.modified', array());
-        $remove = $this->session->get('mautic.form.'.$formId.'.fields.deleted', array());
+        $fields = $this->session->get('mautic.form.'.$formId.'.fields.modified', []);
+        $remove = $this->session->get('mautic.form.'.$formId.'.fields.deleted', []);
+
         return array_diff_key($fields, array_flip($remove));
     }
 
@@ -151,7 +153,7 @@ public function generateAlias($label, &$aliases)
         while ($count) {
             $testAlias = $alias.$aliasTag;
             $count     = (int) in_array($testAlias, $aliases);
-            $aliasTag++;
+            ++$aliasTag;
         }
 
         // Prevent internally used identifiers in the form HTML from colliding with the generated field's ID
diff --git a/app/bundles/FormBundle/Model/FormModel.php b/app/bundles/FormBundle/Model/FormModel.php
index 45b7192b0d7..934bca9b229 100644
--- a/app/bundles/FormBundle/Model/FormModel.php
+++ b/app/bundles/FormBundle/Model/FormModel.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Model;
 
 use Mautic\CoreBundle\Doctrine\Helper\SchemaHelperFactory;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Mautic\CoreBundle\Helper\TemplatingHelper;
 use Mautic\CoreBundle\Helper\ThemeHelper;
 use Mautic\CoreBundle\Model\FormModel as CommonFormModel;
-use Mautic\LeadBundle\Model\LeadModel;
-use Mautic\LeadBundle\Model\FieldModel as LeadFieldModel;
 use Mautic\FormBundle\Entity\Action;
 use Mautic\FormBundle\Entity\Field;
 use Mautic\FormBundle\Entity\Form;
@@ -22,13 +22,14 @@
 use Mautic\FormBundle\Event\FormEvent;
 use Mautic\FormBundle\FormEvents;
 use Mautic\FormBundle\Helper\FormFieldHelper;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\LeadBundle\Model\FieldModel as LeadFieldModel;
+use Mautic\LeadBundle\Model\LeadModel;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class FormModel
+ * Class FormModel.
  */
 class FormModel extends CommonFormModel
 {
@@ -100,11 +101,10 @@ public function __construct(
         LeadModel $leadModel,
         FormFieldHelper $fieldHelper,
         LeadFieldModel $leadFieldModel
-    )
-    {
-        $this->request = $requestStack->getCurrentRequest();
-        $this->templatingHelper = $templatingHelper;
-        $this->themeHelper = $themeHelper;
+    ) {
+        $this->request             = $requestStack->getCurrentRequest();
+        $this->templatingHelper    = $templatingHelper;
+        $this->themeHelper         = $themeHelper;
         $this->schemaHelperFactory = $schemaHelperFactory;
         $this->formActionModel     = $formActionModel;
         $this->formFieldModel      = $formFieldModel;
@@ -136,18 +136,19 @@ public function getPermissionBase()
      */
     public function getNameGetter()
     {
-        return "getName";
+        return 'getName';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Form) {
-            throw new MethodNotAllowedHttpException(array('Form'));
+            throw new MethodNotAllowedHttpException(['Form']);
         }
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
+
         return $formFactory->create('mauticform', $entity, $params);
     }
 
@@ -169,25 +170,26 @@ public function getEntity($id = null)
      * {@inheritdoc}
      *
      * @return bool|FormEvent|void
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Form) {
-            throw new MethodNotAllowedHttpException(array('Form'));
+            throw new MethodNotAllowedHttpException(['Form']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = FormEvents::FORM_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = FormEvents::FORM_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = FormEvents::FORM_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = FormEvents::FORM_POST_DELETE;
                 break;
             default:
@@ -201,6 +203,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
             }
 
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         } else {
             return null;
@@ -235,10 +238,11 @@ public function setFields(Form $entity, $sessionFields)
             }
 
             foreach ($properties as $f => $v) {
-                if (in_array($f, array('id', 'order')))
+                if (in_array($f, ['id', 'order'])) {
                     continue;
+                }
 
-                $func = "set" . ucfirst($f);
+                $func = 'set'.ucfirst($f);
                 if (method_exists($field, $func)) {
                     $field->$func($v);
                 }
@@ -246,7 +250,7 @@ public function setFields(Form $entity, $sessionFields)
             $field->setForm($entity);
             $field->setSessionId($key);
             $field->setOrder($order);
-            $order++;
+            ++$order;
             $entity->addField($properties['id'], $field);
         }
 
@@ -263,12 +267,11 @@ public function setFields(Form $entity, $sessionFields)
     public function deleteFields(Form $entity, $sessionFields)
     {
         if (empty($sessionFields)) {
-
             return;
         }
 
         $existingFields = $entity->getFields()->toArray();
-        $deleteFields   = array();
+        $deleteFields   = [];
         foreach ($sessionFields as $fieldId) {
             if (isset($existingFields[$fieldId])) {
                 $entity->removeField($fieldId, $existingFields[$fieldId]);
@@ -288,25 +291,26 @@ public function deleteFields(Form $entity, $sessionFields)
      */
     public function setActions(Form $entity, $sessionActions)
     {
-        $order   = 1;
+        $order           = 1;
         $existingActions = $entity->getActions()->toArray();
         $savedFields     = $entity->getFields()->toArray();
 
         //match sessionId with field Id to update mapped fields
-        $fieldIds = array();
+        $fieldIds = [];
         foreach ($savedFields as $id => $field) {
             $fieldIds[$field->getSessionId()] = $field->getId();
         }
 
         foreach ($sessionActions as $properties) {
-            $isNew = (!empty($properties['id']) && isset($existingActions[$properties['id']])) ? false : true;
+            $isNew  = (!empty($properties['id']) && isset($existingActions[$properties['id']])) ? false : true;
             $action = !$isNew ? $existingActions[$properties['id']] : new Action();
 
             foreach ($properties as $f => $v) {
-                if (in_array($f, array('id', 'order')))
+                if (in_array($f, ['id', 'order'])) {
                     continue;
+                }
 
-                $func = "set" .  ucfirst($f);
+                $func = 'set'.ucfirst($f);
 
                 if ($f == 'properties') {
                     if (isset($v['mappedFields'])) {
@@ -324,7 +328,7 @@ public function setActions(Form $entity, $sessionActions)
             }
             $action->setForm($entity);
             $action->setOrder($order);
-            $order++;
+            ++$order;
             $entity->addAction($properties['id'], $action);
         }
 
@@ -358,7 +362,7 @@ public function saveEntity($entity, $unlock = true)
     }
 
     /**
-     * Obtains the cached HTML of a form and generates it if missing
+     * Obtains the cached HTML of a form and generates it if missing.
      *
      * @param Form      $form
      * @param bool|true $withScript
@@ -377,14 +381,14 @@ public function getContent(Form $form, $withScript = true, $useCache = true)
         }
 
         if ($withScript) {
-            $cachedHtml = $this->getFormScript($form) . "\n\n" . $cachedHtml;
+            $cachedHtml = $this->getFormScript($form)."\n\n".$cachedHtml;
         }
 
         return $cachedHtml;
     }
 
     /**
-     * Generate the form's html
+     * Generate the form's html.
      *
      * @param Form $entity
      * @param bool $persist
@@ -408,7 +412,7 @@ public function generateHtml(Form $entity, $persist = true)
                 $entity,
                 [
                     'leadId' => $lead->getId(),
-                    'limit'  => 200
+                    'limit'  => 200,
                 ]
             );
         }
@@ -431,13 +435,13 @@ public function generateHtml(Form $entity, $persist = true)
             return ($a->getOrder() < $b->getOrder()) ? -1 : 1;
         });
 
-        $pages  = ['open' => [], 'close' => []];
+        $pages = ['open' => [], 'close' => []];
 
-        $openFieldId =
+        $openFieldId  =
         $closeFieldId =
-        $previousId =
-        $lastPage = false;
-        $pageCount   = 1;
+        $previousId   =
+        $lastPage     = false;
+        $pageCount    = 1;
 
         foreach ($fields as $fieldId => $field) {
             if ('pagebreak' == $field->getType() && $openFieldId) {
@@ -450,7 +454,7 @@ public function generateHtml(Form $entity, $persist = true)
                 if ($previousId) {
                     $pages['close'][$previousId] = $pageCount;
 
-                    $pageCount++;
+                    ++$pageCount;
                 }
             } else {
                 if (!$openFieldId) {
@@ -482,7 +486,7 @@ public function generateHtml(Form $entity, $persist = true)
                 'lead'          => $lead,
                 'formPages'     => $pages,
                 'lastFormPage'  => $lastPage,
-                'style'         => $style
+                'style'         => $style,
             ]
         );
 
@@ -499,7 +503,7 @@ public function generateHtml(Form $entity, $persist = true)
     }
 
     /**
-     * Creates the table structure for form results
+     * Creates the table structure for form results.
      *
      * @param Form $entity
      * @param bool $isNew
@@ -509,17 +513,17 @@ public function createTableSchema(Form $entity, $isNew = false, $dropExisting =
     {
         //create the field as its own column in the leads table
         $schemaHelper = $this->schemaHelperFactory->getSchemaHelper('table');
-        $name         = "form_results_" . $entity->getId() . "_" . $entity->getAlias();
+        $name         = 'form_results_'.$entity->getId().'_'.$entity->getAlias();
         $columns      = $this->generateFieldColumns($entity);
         if ($isNew || (!$isNew && !$schemaHelper->checkTableExists($name))) {
-            $schemaHelper->addTable(array(
+            $schemaHelper->addTable([
                 'name'    => $name,
                 'columns' => $columns,
-                'options' => array(
-                    'primaryKey'  => array('submission_id'),
-                    'uniqueIndex' => array('submission_id', 'form_id')
-                )
-            ), true, $dropExisting);
+                'options' => [
+                    'primaryKey'  => ['submission_id'],
+                    'uniqueIndex' => ['submission_id', 'form_id'],
+                ],
+            ], true, $dropExisting);
             $schemaHelper->executeChanges();
         } else {
             //check to make sure columns exist
@@ -543,7 +547,7 @@ public function deleteEntity($entity)
         if (!$entity->getId()) {
             //delete the associated results table
             $schemaHelper = $this->schemaHelperFactory->getSchemaHelper('table');
-            $schemaHelper->deleteTable("form_results_" . $entity->deletedId . "_" . $entity->getAlias());
+            $schemaHelper->deleteTable('form_results_'.$entity->deletedId.'_'.$entity->getAlias());
             $schemaHelper->executeChanges();
         }
     }
@@ -553,18 +557,19 @@ public function deleteEntity($entity)
      */
     public function deleteEntities($ids)
     {
-        $entities = parent::deleteEntities($ids);
+        $entities     = parent::deleteEntities($ids);
         $schemaHelper = $this->schemaHelperFactory->getSchemaHelper('table');
         foreach ($entities as $id => $entity) {
             //delete the associated results table
-            $schemaHelper->deleteTable("form_results_" . $id . "_" . $entity->getAlias());
+            $schemaHelper->deleteTable('form_results_'.$id.'_'.$entity->getAlias());
         }
         $schemaHelper->executeChanges();
+
         return $entities;
     }
 
     /**
-     * Generate an array of columns from fields
+     * Generate an array of columns from fields.
      *
      * @param Form $form
      *
@@ -574,15 +579,15 @@ public function generateFieldColumns(Form $form)
     {
         $fields = $form->getFields()->toArray();
 
-        $columns     = [
+        $columns = [
             [
                 'name' => 'submission_id',
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             [
                 'name' => 'form_id',
-                'type' => 'integer'
-            ]
+                'type' => 'integer',
+            ],
         ];
         $ignoreTypes = $this->getCustomComponents()['viewOnlyFields'];
         foreach ($fields as $f) {
@@ -591,8 +596,8 @@ public function generateFieldColumns(Form $form)
                     'name'    => $f->getAlias(),
                     'type'    => 'text',
                     'options' => [
-                        'notnull' => false
-                    ]
+                        'notnull' => false,
+                    ],
                 ];
             }
         }
@@ -601,7 +606,8 @@ public function generateFieldColumns(Form $form)
     }
 
     /**
-     * Gets array of custom fields and submit actions from bundles subscribed FormEvents::FORM_ON_BUILD
+     * Gets array of custom fields and submit actions from bundles subscribed FormEvents::FORM_ON_BUILD.
+     *
      * @return mixed
      */
     public function getCustomComponents()
@@ -631,9 +637,10 @@ public function getCustomComponents()
     }
 
     /**
-     * Get the document write javascript for the form
+     * Get the document write javascript for the form.
      *
      * @param Form $form
+     *
      * @return string
      */
     public function getAutomaticJavascript(Form $form)
@@ -641,10 +648,11 @@ public function getAutomaticJavascript(Form $form)
         $html = $this->getContent($form);
 
         //replace line breaks with literal symbol and escape quotations
-        $search  = array("\n", '"');
-        $replace = array('\n', '\"');
-        $html = str_replace($search, $replace, $html);
-        return "document.write(\"".$html."\");";
+        $search  = ["\n", '"'];
+        $replace = ['\n', '\"'];
+        $html    = str_replace($search, $replace, $html);
+
+        return 'document.write("'.$html.'");';
     }
 
     /**
@@ -662,24 +670,24 @@ public function getFormScript(Form $form)
 
         $script = $this->templatingHelper->getTemplating()->render(
             $theme.'MauticFormBundle:Builder:script.html.php',
-            array(
+            [
                 'form'  => $form,
                 'theme' => $theme,
-            )
+            ]
         );
 
         return $script;
     }
 
     /**
-     * Writes in form values from get parameters
+     * Writes in form values from get parameters.
      *
      * @param $form
      * @param $formHtml
      */
     public function populateValuesWithGetParameters(Form $form, &$formHtml)
     {
-        $formName    = $form->generateFormName();
+        $formName = $form->generateFormName();
 
         $fields = $form->getFields()->toArray();
         /** @var \Mautic\FormBundle\Entity\Field $f */
@@ -725,64 +733,56 @@ public function populateValuesWithLead(Form $form, &$formHtml)
      */
     public function getFilterExpressionFunctions($operator = null)
     {
-        $operatorOptions = array(
-            '='          =>
-                array(
+        $operatorOptions = [
+            '=' => [
                     'label'       => 'mautic.lead.list.form.operator.equals',
                     'expr'        => 'eq',
-                    'negate_expr' => 'neq'
-                ),
-            '!='         =>
-                array(
+                    'negate_expr' => 'neq',
+                ],
+            '!=' => [
                     'label'       => 'mautic.lead.list.form.operator.notequals',
                     'expr'        => 'neq',
-                    'negate_expr' => 'eq'
-                ),
-            'gt'         =>
-                array(
+                    'negate_expr' => 'eq',
+                ],
+            'gt' => [
                     'label'       => 'mautic.lead.list.form.operator.greaterthan',
                     'expr'        => 'gt',
-                    'negate_expr' => 'lt'
-                ),
-            'gte'        =>
-                array(
+                    'negate_expr' => 'lt',
+                ],
+            'gte' => [
                     'label'       => 'mautic.lead.list.form.operator.greaterthanequals',
                     'expr'        => 'gte',
-                    'negate_expr' => 'lt'
-                ),
-            'lt'         =>
-                array(
+                    'negate_expr' => 'lt',
+                ],
+            'lt' => [
                     'label'       => 'mautic.lead.list.form.operator.lessthan',
                     'expr'        => 'lt',
-                    'negate_expr' => 'gt'
-                ),
-            'lte'        =>
-                array(
+                    'negate_expr' => 'gt',
+                ],
+            'lte' => [
                     'label'       => 'mautic.lead.list.form.operator.lessthanequals',
                     'expr'        => 'lte',
-                    'negate_expr' => 'gt'
-                ),
-            'like'       =>
-                array(
+                    'negate_expr' => 'gt',
+                ],
+            'like' => [
                     'label'       => 'mautic.lead.list.form.operator.islike',
                     'expr'        => 'like',
-                    'negate_expr' => 'notLike'
-                ),
-            '!like'      =>
-                array(
+                    'negate_expr' => 'notLike',
+                ],
+            '!like' => [
                     'label'       => 'mautic.lead.list.form.operator.isnotlike',
                     'expr'        => 'notLike',
-                    'negate_expr' => 'like'
-                ),
-        );
+                    'negate_expr' => 'like',
+                ],
+        ];
 
         return ($operator === null) ? $operatorOptions : $operatorOptions[$operator];
     }
 
     /**
-     * Get a list of assets in a date range
+     * Get a list of assets in a date range.
      *
-     * @param integer   $limit
+     * @param int       $limit
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
@@ -790,7 +790,7 @@ public function getFilterExpressionFunctions($operator = null)
      *
      * @return array
      */
-    public function getFormList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = array(), $options = array())
+    public function getFormList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = [], $options = [])
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('t.id, t.name, t.date_added, t.date_modified')
diff --git a/app/bundles/FormBundle/Model/SubmissionModel.php b/app/bundles/FormBundle/Model/SubmissionModel.php
index b41328bdbb2..49b56f91278 100644
--- a/app/bundles/FormBundle/Model/SubmissionModel.php
+++ b/app/bundles/FormBundle/Model/SubmissionModel.php
@@ -1,15 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Model;
 
 use Mautic\CampaignBundle\Model\CampaignModel;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
@@ -21,15 +24,11 @@
 use Mautic\FormBundle\Entity\Result;
 use Mautic\FormBundle\Entity\Submission;
 use Mautic\FormBundle\Event\SubmissionEvent;
-use Mautic\FormBundle\Event\ValidateEvent;
 use Mautic\FormBundle\Event\ValidationEvent;
 use Mautic\FormBundle\Exception\ValidationException;
 use Mautic\FormBundle\FormEvents;
 use Mautic\FormBundle\Helper\FormFieldHelper;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
-use Mautic\LeadBundle\Helper\IdentifyCompanyHelper;
 use Mautic\LeadBundle\Model\CompanyModel;
 use Mautic\LeadBundle\Model\FieldModel as LeadFieldModel;
 use Mautic\LeadBundle\Model\LeadModel;
@@ -39,7 +38,7 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
- * Class SubmissionModel
+ * Class SubmissionModel.
  */
 class SubmissionModel extends CommonFormModel
 {
@@ -81,8 +80,8 @@ class SubmissionModel extends CommonFormModel
     protected $campaignModel;
 
     /**
-    * @var LeadFieldModel
-    */
+     * @var LeadFieldModel
+     */
     protected $leadFieldModel;
 
     /**
@@ -90,7 +89,6 @@ class SubmissionModel extends CommonFormModel
      */
     protected $companyModel;
 
-
     /**
      * @var FormFieldHelper
      */
@@ -118,16 +116,15 @@ public function __construct(
         LeadFieldModel $leadFieldModel,
         CompanyModel $companyModel,
         FormFieldHelper $fieldHelper
-    )
-    {
-        $this->ipLookupHelper = $ipLookupHelper;
+    ) {
+        $this->ipLookupHelper   = $ipLookupHelper;
         $this->templatingHelper = $templatingHelper;
-        $this->formModel = $formModel;
-        $this->pageModel = $pageModel;
-        $this->leadModel = $leadModel;
-        $this->campaignModel = $campaignModel;
-        $this->leadFieldModel = $leadFieldModel;
-        $this->companyModel = $companyModel;
+        $this->formModel        = $formModel;
+        $this->pageModel        = $pageModel;
+        $this->leadModel        = $leadModel;
+        $this->campaignModel    = $campaignModel;
+        $this->leadFieldModel   = $leadFieldModel;
+        $this->companyModel     = $companyModel;
         $this->fieldHelper      = $fieldHelper;
     }
 
@@ -288,7 +285,7 @@ public function saveSubmission($post, $server, Form $form, Request $request = nu
                 $leadValue = $value;
                 if (is_array($leadValue)) {
                     // Multiselect lead fields store the values with bars
-                    $delimeter =  ('multiselect' === $leadFields[$leadField]['type']) ? '|' : ', ';
+                    $delimeter = ('multiselect' === $leadFields[$leadField]['type']) ? '|' : ', ';
                     $leadValue = implode($delimeter, $leadValue);
                 }
 
@@ -297,7 +294,7 @@ public function saveSubmission($post, $server, Form $form, Request $request = nu
 
             //convert array from checkbox groups and multiple selects
             if (is_array($value)) {
-                $value = implode(", ", $value);
+                $value = implode(', ', $value);
             }
 
             $tokens["{formfield={$alias}}"] = $value;
@@ -401,6 +398,7 @@ public function getEntities(array $args = [])
      * @param $queryArgs
      *
      * @return StreamedResponse|Response
+     *
      * @throws \Exception
      */
     public function exportResults($format, $form, $queryArgs)
@@ -410,7 +408,7 @@ public function exportResults($format, $form, $queryArgs)
         $results                     = $this->getEntities($queryArgs);
         $translator                  = $this->translator;
 
-        $date = (new DateTimeHelper)->toLocalString();
+        $date = (new DateTimeHelper())->toLocalString();
         $name = str_replace(' ', '_', $date).'_'.$form->getAlias();
 
         switch ($format) {
@@ -459,7 +457,7 @@ function () use ($results, $form, $translator, $viewOnlyFields) {
                             fputcsv($handle, $row);
 
                             //free memory
-                            unset($row, $results[$k]);;
+                            unset($row, $results[$k]);
                         }
 
                         fclose($handle);
@@ -481,7 +479,7 @@ function () use ($results, $form, $translator, $viewOnlyFields) {
                         'form'           => $form,
                         'results'        => $results,
                         'pageTitle'      => $name,
-                        'viewOnlyFields' => $viewOnlyFields
+                        'viewOnlyFields' => $viewOnlyFields,
                     ]
                 )->getContent();
 
@@ -539,7 +537,7 @@ function () use ($results, $form, $translator, $name, $viewOnlyFields) {
                                 unset($row, $results[$k]);
 
                                 //increment letter
-                                $count++;
+                                ++$count;
                             }
 
                             $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
@@ -564,14 +562,14 @@ function () use ($results, $form, $translator, $name, $viewOnlyFields) {
     }
 
     /**
-     * Get line chart data of submissions
+     * Get line chart data of submissions.
      *
-     * @param char      $unit {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
@@ -600,13 +598,13 @@ public function getSubmissionsLineChartData(
     }
 
     /**
-     * Get a list of top submission referrers
+     * Get a list of top submission referrers.
      *
-     * @param integer $limit
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param int    $limit
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
@@ -635,13 +633,13 @@ public function getTopSubmissionReferrers($limit = 10, $dateFrom = null, $dateTo
     }
 
     /**
-     * Get a list of the most submisions per lead
+     * Get a list of the most submisions per lead.
      *
-     * @param integer $limit
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param int    $limit
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
@@ -671,7 +669,7 @@ public function getTopSubmitters($limit = 10, $dateFrom = null, $dateTo = null,
     }
 
     /**
-     * Execute a form submit action
+     * Execute a form submit action.
      *
      * @param SubmissionEvent $event
      */
@@ -690,7 +688,7 @@ protected function executeFormActions(SubmissionEvent $event)
             'form'       => $event->getSubmission()->getForm(),
             'tokens'     => $event->getTokens(),
             'feedback'   => [],
-            'lead'       => $event->getSubmission()->getLead()
+            'lead'       => $event->getSubmission()->getLead(),
         ];
 
         foreach ($actions as $action) {
@@ -750,7 +748,7 @@ protected function executeFormActions(SubmissionEvent $event)
     }
 
     /**
-     * Create/update lead from form submit
+     * Create/update lead from form submit.
      *
      * @param       $form
      * @param array $leadFieldMatches
@@ -826,7 +824,7 @@ protected function createLeadFromSubmit($form, array $leadFieldMatches, $leadFie
         };
 
         // Get data for the form submission
-        list ($data, $uniqueFieldsWithData) = $getData($leadFieldMatches);
+        list($data, $uniqueFieldsWithData) = $getData($leadFieldMatches);
         $this->logger->debug('FORM: Unique fields submitted include '.implode(', ', $uniqueFieldsWithData));
 
         // Check for duplicate lead
@@ -849,7 +847,7 @@ protected function createLeadFromSubmit($form, array $leadFieldMatches, $leadFie
             $foundLeadFields = $this->leadModel->flattenFields($foundLead->getFields());
 
             // Get unique identifier fields for the found lead then compare with the lead currently tracked
-            $uniqueFieldsFound = $getData($foundLeadFields, true);
+            $uniqueFieldsFound             = $getData($foundLeadFields, true);
             list($hasConflict, $conflicts) = $checkForIdentifierConflict($uniqueFieldsFound, $uniqueFieldsCurrent);
 
             if ($inKioskMode || $hasConflict) {
@@ -861,7 +859,6 @@ protected function createLeadFromSubmit($form, array $leadFieldMatches, $leadFie
                 } else {
                     $this->logger->debug('FORM: In kiosk mode so not merging');
                 }
-
             } else {
                 $this->logger->debug('FORM: Merging contacts '.$lead->getId().' and '.$foundLead->getId());
 
@@ -906,7 +903,6 @@ protected function createLeadFromSubmit($form, array $leadFieldMatches, $leadFie
                 $lead->addIpAddress($ipAddress);
                 $this->logger->debug('FORM: Associating '.$ipAddress->getIpAddress().' to contact');
             }
-
         } elseif (!$inKioskMode) {
             $leadIpAddresses = $lead->getIpAddresses();
             if (!$leadIpAddresses->contains($ipAddress)) {
@@ -942,7 +938,7 @@ protected function createLeadFromSubmit($form, array $leadFieldMatches, $leadFie
     }
 
     /**
-     * Validates a field value
+     * Validates a field value.
      *
      * @param Field $field
      * @param       $value
@@ -977,7 +973,7 @@ protected function validateFieldValue(Field $field, $value)
      * @param Action[]        $actions
      * @param SubmissionEvent $event
      * @param                 $validationErrors
-     * @param                 $lastAlias            Because prior to now the last alias was used regardless
+     * @param                 $lastAlias        Because prior to now the last alias was used regardless
      */
     protected function validateActionCallbacks(SubmissionEvent $event, &$validationErrors, $lastAlias)
     {
@@ -1034,4 +1030,3 @@ protected function validateActionCallbacks(SubmissionEvent $event, &$validationE
         unset($args, $actions, $availableActions);
     }
 }
-
diff --git a/app/bundles/FormBundle/Security/Permissions/FormPermissions.php b/app/bundles/FormBundle/Security/Permissions/FormPermissions.php
index 7fc9bd93a08..0764f1faee8 100644
--- a/app/bundles/FormBundle/Security/Permissions/FormPermissions.php
+++ b/app/bundles/FormBundle/Security/Permissions/FormPermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\FormBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class FormPermissions
+ * Class FormPermissions.
  */
 class FormPermissions extends AbstractPermissions
 {
-
     /**
      * @param array $params
      */
diff --git a/app/bundles/FormBundle/Views/Action/generic.html.php b/app/bundles/FormBundle/Views/Action/generic.html.php
index 558e99ca007..a04e3044481 100644
--- a/app/bundles/FormBundle/Views/Action/generic.html.php
+++ b/app/bundles/FormBundle/Views/Action/generic.html.php
@@ -1,25 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 
-<div class="mauticform-row panel<?php if (empty($action['settings']['allowCampaignForm'])) echo ' action-standalone-only'; ?>" id="mauticform_action_<?php echo $id; ?>">
+<div class="mauticform-row panel<?php if (empty($action['settings']['allowCampaignForm'])) {
+    echo ' action-standalone-only';
+} ?>" id="mauticform_action_<?php echo $id; ?>">
     <?php
-    if (!empty($inForm))
-        echo $view->render('MauticFormBundle:Builder:actions.html.php', array(
+    if (!empty($inForm)) {
+        echo $view->render('MauticFormBundle:Builder:actions.html.php', [
             'id'         => $id,
             'route'      => 'mautic_formaction_action',
             'actionType' => 'action',
-            'formId'     => $formId
-        ));
+            'formId'     => $formId,
+        ]);
+    }
     ?>
-    <a data-toggle="ajaxmodal" data-target="#formComponentModal" href="<?php echo $view['router']->path('mautic_formaction_action', array('objectAction' => 'edit', 'objectId' => $id, 'formId' => $formId)); ?>"><span class="action-label"><?php echo $action['name']; ?></span></a>
+    <a data-toggle="ajaxmodal" data-target="#formComponentModal" href="<?php echo $view['router']->path('mautic_formaction_action', ['objectAction' => 'edit', 'objectId' => $id, 'formId' => $formId]); ?>"><span class="action-label"><?php echo $action['name']; ?></span></a>
     <?php if (!empty($action['description'])): ?>
     <span class="action-descr"><?php echo $action['description']; ?></span>
     <?php endif; ?>
diff --git a/app/bundles/FormBundle/Views/Action/option.html.php b/app/bundles/FormBundle/Views/Action/option.html.php
index c8311b0eb35..655d6dbc161 100644
--- a/app/bundles/FormBundle/Views/Action/option.html.php
+++ b/app/bundles/FormBundle/Views/Action/option.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $class = (empty($action['allowCampaignForm'])) ? 'action-standalone-only' : '';
 if (empty($action['allowCampaignForm']) && !$isStandalone):
     $class .= ' hide';
diff --git a/app/bundles/FormBundle/Views/Builder/action.html.php b/app/bundles/FormBundle/Views/Builder/action.html.php
index 7afd011bd73..c8de27369d0 100644
--- a/app/bundles/FormBundle/Views/Builder/action.html.php
+++ b/app/bundles/FormBundle/Views/Builder/action.html.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $template   = '<div class="col-md-6">{content}</div>';
-$properties = (isset($form['properties'])) ? $form['properties'] : array();
+$properties = (isset($form['properties'])) ? $form['properties'] : [];
 ?>
 
 <div class="bundle-form">
diff --git a/app/bundles/FormBundle/Views/Builder/actions.html.php b/app/bundles/FormBundle/Views/Builder/actions.html.php
index decf6e8ad5c..c6052c7f13a 100644
--- a/app/bundles/FormBundle/Views/Builder/actions.html.php
+++ b/app/bundles/FormBundle/Views/Builder/actions.html.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (empty($route)) {
     $route = 'mautic_formfield_action';
 }
 ?>
 
 <div class="form-buttons btn-group" role="group" aria-label="Field options">
-    <button type="button" data-toggle="ajaxmodal" data-target="#formComponentModal" href="<?php echo $view['router']->path($route, array('objectAction' => 'edit', 'objectId' => $id, 'formId' => $formId)); ?>" class="btn btn-default btn-edit">
+    <button type="button" data-toggle="ajaxmodal" data-target="#formComponentModal" href="<?php echo $view['router']->path($route, ['objectAction' => 'edit', 'objectId' => $id, 'formId' => $formId]); ?>" class="btn btn-default btn-edit">
         <i class="fa fa-pencil-square-o text-primary"></i>
     </button>
     <?php if (empty($disallowDelete)): ?>
-    <a type="button" data-hide-panel="true" data-toggle="ajax" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path($route, array('objectAction' => 'delete', 'objectId' => $id, 'formId' => $formId)); ?>" class="btn btn-default">
+    <a type="button" data-hide-panel="true" data-toggle="ajax" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path($route, ['objectAction' => 'delete', 'objectId' => $id, 'formId' => $formId]); ?>" class="btn btn-default">
         <i class="fa fa-trash-o text-danger"></i>
     </a>
     <?php endif; ?>
diff --git a/app/bundles/FormBundle/Views/Builder/field.html.php b/app/bundles/FormBundle/Views/Builder/field.html.php
index 794ba946061..5588faedc28 100644
--- a/app/bundles/FormBundle/Views/Builder/field.html.php
+++ b/app/bundles/FormBundle/Views/Builder/field.html.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $template       = '<div class="col-md-6">{content}</div>';
 $toggleTemplate = '<div class="col-md-3">{content}</div>';
-$properties     = (isset($form['properties'])) ? $form['properties'] : array();
+$properties     = (isset($form['properties'])) ? $form['properties'] : [];
 
 $showAttributes = isset($form['labelAttributes']) || isset($form['inputAttributes']) || isset($form['containerAttributes']) || isset($properties['labelAttributes']) || isset($form['alias']);
 $showBehavior   = isset($form['showWhenValueExists']) || isset($properties['showWhenValueExists']);
 
-$placeholder    = '';
+$placeholder = '';
 if (isset($properties['placeholder'])):
     $placeholder = $view['form']->rowIfExists($properties, 'placeholder', $template);
     unset($properties['placeholder']);
@@ -54,7 +55,9 @@
     <div role="tabpanel">
         <ul class="nav nav-tabs" role="tablist">
             <li role="presentation" class="active">
-                <a<?php if ($generalTabError) echo ' class="text-danger" '; ?> href="#general" aria-controls="general" role="tab" data-toggle="tab">
+                <a<?php if ($generalTabError) {
+    echo ' class="text-danger" ';
+} ?> href="#general" aria-controls="general" role="tab" data-toggle="tab">
                     <?php echo $view['translator']->trans('mautic.form.field.section.general'); ?>
                     <?php if ($generalTabError): ?>
                         <i class="fa fa-warning"></i>
@@ -80,7 +83,9 @@
 
             <?php if ($showProperties): ?>
             <li role="presentation">
-                <a<?php if ($propertiesTabError) echo ' class="text-danger" '; ?> href="#properties" aria-controls="properties" role="tab" data-toggle="tab">
+                <a<?php if ($propertiesTabError) {
+    echo ' class="text-danger" ';
+} ?> href="#properties" aria-controls="properties" role="tab" data-toggle="tab">
                     <?php echo $view['translator']->trans('mautic.form.field.section.properties'); ?>
                     <?php if ($propertiesTabError): ?>
                         <i class="fa fa-warning"></i>
@@ -165,7 +170,9 @@
                 <div class="row">
                     <?php
                     foreach ($properties as $name => $property):
-                    if ($form['properties'][$name]->isRendered() || $name == 'labelAttributes') continue;
+                    if ($form['properties'][$name]->isRendered() || $name == 'labelAttributes') {
+                        continue;
+                    }
 
                     if ($form['properties'][$name]->vars['block_prefixes'][1] == 'hidden') :
                         echo $view['form']->row($form['properties'][$name]);
diff --git a/app/bundles/FormBundle/Views/Builder/fieldwrapper.html.php b/app/bundles/FormBundle/Views/Builder/fieldwrapper.html.php
index 6e0cecdc082..bdae6b16db6 100644
--- a/app/bundles/FormBundle/Views/Builder/fieldwrapper.html.php
+++ b/app/bundles/FormBundle/Views/Builder/fieldwrapper.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <div class="panel form-field-wrapper" data-sortable-id="mauticform_<?php echo $field['id']; ?>">
     <?php
@@ -15,10 +15,10 @@
             'id'             => $field['id'],
             'formId'         => $formId,
             'formName'       => '',
-            'disallowDelete' => ('button' == $field['type'])
+            'disallowDelete' => ('button' == $field['type']),
         ]);
     ?>
-    <div class="row ml-0 mr-0"><?php // wrap in a row to keep bootstrap container classes from affecting builder layout ?>
+    <div class="row ml-0 mr-0"><?php // wrap in a row to keep bootstrap container classes from affecting builder layout?>
     <?php echo $view->render(
         $template,
         [
diff --git a/app/bundles/FormBundle/Views/Builder/form.html.php b/app/bundles/FormBundle/Views/Builder/form.html.php
index df013331e16..ab7727bc41d 100644
--- a/app/bundles/FormBundle/Views/Builder/form.html.php
+++ b/app/bundles/FormBundle/Views/Builder/form.html.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$formName  = '_'.$form->generateFormName();
+$formName = '_'.$form->generateFormName();
 if (!isset($fields)) {
     $fields = $form->getFields();
 }
@@ -54,7 +54,7 @@
                             'id'            => $f->getAlias(),
                             'formName'      => $formName,
                             'fieldPage'     => ($pageCount - 1), // current page,
-                            'contactFields' => $contactFields
+                            'contactFields' => $contactFields,
                         ]
                     );
                 endif;
@@ -62,7 +62,7 @@
                 if (isset($formPages) && isset($formPages['close'][$fieldId])):
                     // Close the page
                     echo "\n            </div>\n";
-                    $pageCount++;
+                    ++$pageCount;
                 endif;
 
             endforeach;
diff --git a/app/bundles/FormBundle/Views/Builder/index.html.php b/app/bundles/FormBundle/Views/Builder/index.html.php
index 4ffcb331ca5..4ffddfa1749 100644
--- a/app/bundles/FormBundle/Views/Builder/index.html.php
+++ b/app/bundles/FormBundle/Views/Builder/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'form');
 
@@ -18,7 +18,7 @@
     )
     :
     $view['translator']->trans('mautic.form.form.header.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 
 $formId = $form['sessionId']->vars['data'];
 ?>
@@ -94,12 +94,12 @@
                                     <?php echo $view->render(
                                         'MauticFormBundle:Builder:fieldwrapper.html.php',
                                         [
-                                            'template' => $template,
-                                            'field'    => $field,
-                                            'inForm'   => true,
-                                            'id'       => $field['id'],
-                                            'formId'   => $formId,
-                                            'contactFields' => $contactFields
+                                            'template'      => $template,
+                                            'field'         => $field,
+                                            'inForm'        => true,
+                                            'id'            => $field['id'],
+                                            'formId'        => $formId,
+                                            'contactFields' => $contactFields,
                                         ]
                                     ); ?>
                                 <?php endif; ?>
@@ -132,15 +132,17 @@
                                                         'action'       => $e,
                                                         'type'         => $k,
                                                         'isStandalone' => $activeForm->isStandalone(),
-                                                        'formId'       => $form['sessionId']->vars['data']
+                                                        'formId'       => $form['sessionId']->vars['data'],
                                                     ]
                                                 )."\n\n";
-                                                if (!empty($e['allowCampaignForm']))
+                                                if (!empty($e['allowCampaignForm'])) {
                                                     $campaignActionFound = true;
+                                                }
                                             endforeach;
                                             $class = (empty($campaignActionFound)) ? ' action-standalone-only' : '';
-                                            if (!$campaignActionFound && !$activeForm->isStandalone())
+                                            if (!$campaignActionFound && !$activeForm->isStandalone()) {
                                                 $class .= ' hide';
+                                            }
                                             ?>
                                             <li role="presentation" class="dropdown-header<?php echo $class; ?>">
                                                 <?php echo $view['translator']->trans($group); ?>
@@ -152,7 +154,7 @@
                             </div>
                             <?php foreach ($formActions as $action): ?>
                                 <?php if (!in_array($action['id'], $deletedActions)) : ?>
-                                    <?php $template     = (isset($actionSettings[$action['type']]['template']))
+                                    <?php $template = (isset($actionSettings[$action['type']]['template']))
                                         ? $actionSettings[$action['type']]['template']
                                         :
                                         'MauticFormBundle:Action:generic.html.php';
@@ -201,8 +203,8 @@
     echo $view->render(
         'MauticCoreBundle:Helper:form_selecttype.html.php',
         [
-            'item'               => $activeForm,
-            'mauticLang'         => [
+            'item'       => $activeForm,
+            'mauticLang' => [
                 'newStandaloneForm' => 'mautic.form.type.standalone.header',
                 'newCampaignForm'   => 'mautic.form.type.campaign.header',
             ],
diff --git a/app/bundles/FormBundle/Views/Builder/script.html.php b/app/bundles/FormBundle/Views/Builder/script.html.php
index 5bab940e79c..ae1f373f899 100644
--- a/app/bundles/FormBundle/Views/Builder/script.html.php
+++ b/app/bundles/FormBundle/Views/Builder/script.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -16,7 +17,7 @@
         var head            = document.getElementsByTagName('head')[0];
         var script          = document.createElement('script');
         script.type         = 'text/javascript';
-        script.src          = '<?php echo $view['assets']->getUrl('media/js/' . ($app->getEnvironment()  == 'dev' ? 'mautic-form-src.js' : 'mautic-form.js'), null, null, true); ?>';
+        script.src          = '<?php echo $view['assets']->getUrl('media/js/'.($app->getEnvironment() == 'dev' ? 'mautic-form-src.js' : 'mautic-form.js'), null, null, true); ?>';
         script.onload       = function() {
             MauticSDK.onLoad();
         };
diff --git a/app/bundles/FormBundle/Views/Builder/style.html.php b/app/bundles/FormBundle/Views/Builder/style.html.php
index 6ab1dd5527e..c0c11e4beab 100644
--- a/app/bundles/FormBundle/Views/Builder/style.html.php
+++ b/app/bundles/FormBundle/Views/Builder/style.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/FormBundle/Views/Field/button.html.php b/app/bundles/FormBundle/Views/Field/button.html.php
index a5bef9e1df2..33ad50bd215 100644
--- a/app/bundles/FormBundle/Views/Field/button.html.php
+++ b/app/bundles/FormBundle/Views/Field/button.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $defaultInputClass = 'button';
-$containerType = 'button-wrapper';
-include __DIR__ . '/field_helper.php';
+$containerType     = 'button-wrapper';
+include __DIR__.'/field_helper.php';
 
 $buttonType = (isset($properties['type'])) ? $properties['type'] : 'submit';
 
diff --git a/app/bundles/FormBundle/Views/Field/captcha.html.php b/app/bundles/FormBundle/Views/Field/captcha.html.php
index b44e72c086c..da02fbc3864 100644
--- a/app/bundles/FormBundle/Views/Field/captcha.html.php
+++ b/app/bundles/FormBundle/Views/Field/captcha.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $required = true;
 $type     = 'text';
 if (empty($field['properties']['captcha'])) {
@@ -29,6 +29,6 @@
         'id'       => $id,
         'required' => $required,
         'formId'   => (isset($formId)) ? $formId : 0,
-        'formName'  => (isset($formName)) ? $formName : ''
+        'formName' => (isset($formName)) ? $formName : '',
     ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/checkboxgrp.html.php b/app/bundles/FormBundle/Views/Field/checkboxgrp.html.php
index 2b7e157caca..3d8606595cc 100644
--- a/app/bundles/FormBundle/Views/Field/checkboxgrp.html.php
+++ b/app/bundles/FormBundle/Views/Field/checkboxgrp.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:group.html.php',
     [
diff --git a/app/bundles/FormBundle/Views/Field/country.html.php b/app/bundles/FormBundle/Views/Field/country.html.php
index 9230c3d9e0b..804621290ac 100644
--- a/app/bundles/FormBundle/Views/Field/country.html.php
+++ b/app/bundles/FormBundle/Views/Field/country.html.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:select.html.php',
     [
-        'field'   => $field,
-        'inForm'  => (isset($inForm)) ? $inForm : false,
-        'list'    => \Mautic\LeadBundle\Helper\FormFieldHelper::getCountryChoices(),
-        'id'      => $id,
-        'formId'  => (isset($formId)) ? $formId : 0,
-        'formName'  => (isset($formName)) ? $formName : ''
+        'field'    => $field,
+        'inForm'   => (isset($inForm)) ? $inForm : false,
+        'list'     => \Mautic\LeadBundle\Helper\FormFieldHelper::getCountryChoices(),
+        'id'       => $id,
+        'formId'   => (isset($formId)) ? $formId : 0,
+        'formName' => (isset($formName)) ? $formName : '',
     ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/date.html.php b/app/bundles/FormBundle/Views/Field/date.html.php
index 91bf39a0c54..fe071dd7b1a 100644
--- a/app/bundles/FormBundle/Views/Field/date.html.php
+++ b/app/bundles/FormBundle/Views/Field/date.html.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:text.html.php',
     [
-        'field'   => $field,
-        'inForm'  => (isset($inForm)) ? $inForm : false,
-        'type'    => 'date',
-        'id'      => $id,
-        'formId'  => (isset($formId)) ? $formId : 0,
-        'formName'  => (isset($formName)) ? $formName : ''
+        'field'    => $field,
+        'inForm'   => (isset($inForm)) ? $inForm : false,
+        'type'     => 'date',
+        'id'       => $id,
+        'formId'   => (isset($formId)) ? $formId : 0,
+        'formName' => (isset($formName)) ? $formName : '',
     ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/email.html.php b/app/bundles/FormBundle/Views/Field/email.html.php
index 9921f25fc7c..4ffb3285b7d 100644
--- a/app/bundles/FormBundle/Views/Field/email.html.php
+++ b/app/bundles/FormBundle/Views/Field/email.html.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:text.html.php',
-    array(
-        'field'   => $field,
-        'inForm'  => (isset($inForm)) ? $inForm : false,
-        'type'    => 'email',
-        'id'      => $id,
-        'deleted' => (!empty($deleted)) ? true : false,
-        'formId'  => (isset($formId)) ? $formId : 0,
-        'formName'  => (isset($formName)) ? $formName : ''
-    )
+    [
+        'field'    => $field,
+        'inForm'   => (isset($inForm)) ? $inForm : false,
+        'type'     => 'email',
+        'id'       => $id,
+        'deleted'  => (!empty($deleted)) ? true : false,
+        'formId'   => (isset($formId)) ? $formId : 0,
+        'formName' => (isset($formName)) ? $formName : '',
+    ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/field_helper.php b/app/bundles/FormBundle/Views/Field/field_helper.php
index a0dc7111911..54c0d18341d 100644
--- a/app/bundles/FormBundle/Views/Field/field_helper.php
+++ b/app/bundles/FormBundle/Views/Field/field_helper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
         $attributes .= ' '.$attributeName.'="'.$append.'"';
     } else {
         $attributes = str_ireplace($attributeName.'="', $attributeName.'="'.$append.' ', $attributes);
-    };
+    }
 };
 
 if (!isset($defaultInputFormClass)) {
@@ -39,10 +40,10 @@
     if (!empty($properties['multiple'])) {
         $inputName .= '[]';
     }
-    $name = ' name="'. $inputName . '"';
+    $name = ' name="'.$inputName.'"';
 }
 
-if (in_array($field['type'], array('checkboxgrp', 'radiogrp', 'textarea'))) {
+if (in_array($field['type'], ['checkboxgrp', 'radiogrp', 'textarea'])) {
     $value = '';
 } else {
     $value = (isset($field['defaultValue'])) ? ' value="'.$field['defaultValue'].'"' : ' value=""';
@@ -69,40 +70,42 @@
     }
     $labelAttr .= ' class="'.$defaultLabelClass.'"';
     $inputAttr .= ' disabled="disabled" class="'.$defaultInputClass.$defaultInputFormClass.'"';
-
 } else {
-    if ($field['labelAttributes'])
+    if ($field['labelAttributes']) {
         $labelAttr .= ' '.htmlspecialchars_decode($field['labelAttributes']);
+    }
 
     $appendAttribute($labelAttr, 'class', $defaultLabelClass);
 
-    if ($field['inputAttributes'])
+    if ($field['inputAttributes']) {
         $inputAttr .= ' '.htmlspecialchars_decode($field['inputAttributes']);
+    }
 
     $appendAttribute($inputAttr, 'class', $defaultInputClass);
 }
 
 // Container
-$containerAttr         = 'id="mauticform'.$formName.'_'.$id.'" '.htmlspecialchars_decode($field['containerAttributes']);
-if (!isset($containerClass))
+$containerAttr = 'id="mauticform'.$formName.'_'.$id.'" '.htmlspecialchars_decode($field['containerAttributes']);
+if (!isset($containerClass)) {
     $containerClass = $containerType;
-$order = (isset($field['order'])) ? $field['order'] : 0;
+}
+$order                 = (isset($field['order'])) ? $field['order'] : 0;
 $defaultContainerClass = 'mauticform-row mauticform-'.$containerClass.' mauticform-field-'.$order;
 
 // Field is required
-$validationMessage     = '';
+$validationMessage = '';
 if (isset($field['isRequired']) && $field['isRequired']) {
     $required = true;
     $defaultContainerClass .= ' mauticform-required';
     $validationMessage = $field['validationMessage'];
     if (empty($validationMessage)) {
-        $validationMessage = $view['translator']->trans('mautic.form.field.generic.required', array(), 'validators');
+        $validationMessage = $view['translator']->trans('mautic.form.field.generic.required', [], 'validators');
     }
 
     $containerAttr .= " data-validate=\"{$field['alias']}\" data-validation-type=\"{$field['type']}\"";
 
     if (!empty($properties['multiple'])) {
-        $containerAttr .= " data-validate-multiple=\"true\"";
+        $containerAttr .= ' data-validate-multiple="true"';
     }
 } elseif (!empty($required)) {
     // Forced to be required
@@ -113,31 +116,31 @@
 
 // Setup list parsing
 if (isset($list) || isset($properties['syncList']) || isset($properties['list']) || isset($properties['optionlist'])) {
-    $parseList = [];
+    $parseList           = [];
     $ignoreNumericalKeys = false;
     if (!empty($properties['syncList']) && !empty($field['leadField']) && isset($contactFields[$field['leadField']])) {
         $leadFieldType = $contactFields[$field['leadField']]['type'];
         switch (true) {
-            case (!empty($contactFields[$field['leadField']]['properties']['list'])):
+            case !empty($contactFields[$field['leadField']]['properties']['list']):
                 $parseList = $contactFields[$field['leadField']]['properties']['list'];
                 break;
-            case ('boolean' == $leadFieldType):
+            case 'boolean' == $leadFieldType:
                 $parseList = [
                     0 => $contactFields[$field['leadField']]['properties']['no'],
                     1 => $contactFields[$field['leadField']]['properties']['yes'],
                 ];
                 $ignoreNumericalKeys = true;
                 break;
-            case ('country' == $leadFieldType):
+            case 'country' == $leadFieldType:
                 $list = \Mautic\LeadBundle\Helper\FormFieldHelper::getCountryChoices();
                 break;
-            case ('region' == $leadFieldType):
+            case 'region' == $leadFieldType:
                 $list = \Mautic\LeadBundle\Helper\FormFieldHelper::getRegionChoices();
                 break;
-            case ('timezone' == $leadFieldType):
+            case 'timezone' == $leadFieldType:
                 $list = \Mautic\LeadBundle\Helper\FormFieldHelper::getTimezonesChoices();
                 break;
-            case ('locale'):
+            case 'locale':
                 $list = \Mautic\LeadBundle\Helper\FormFieldHelper::getLocaleChoices();
                 break;
         }
diff --git a/app/bundles/FormBundle/Views/Field/freetext.html.php b/app/bundles/FormBundle/Views/Field/freetext.html.php
index d99e4f42146..c599759a303 100644
--- a/app/bundles/FormBundle/Views/Field/freetext.html.php
+++ b/app/bundles/FormBundle/Views/Field/freetext.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $defaultInputClass = $containerType = 'freetext';
 include __DIR__.'/field_helper.php';
 
@@ -18,7 +18,6 @@
                 </h3>
 HTML;
 
-
 $html = <<<HTML
 
             <div $containerAttr>{$label}
diff --git a/app/bundles/FormBundle/Views/Field/group.html.php b/app/bundles/FormBundle/Views/Field/group.html.php
index b786b7fa013..c4847fd4eae 100644
--- a/app/bundles/FormBundle/Views/Field/group.html.php
+++ b/app/bundles/FormBundle/Views/Field/group.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 use \Mautic\CoreBundle\Helper\InputHelper;
 
 $containerType     = "{$type}grp";
@@ -19,7 +19,7 @@
 $optionLabelAttr = (isset($properties['labelAttributes'])) ? $properties['labelAttributes'] : '';
 $wrapDiv         = true;
 
-$defaultOptionLabelClass = 'mauticform-' . $containerType . '-label';
+$defaultOptionLabelClass = 'mauticform-'.$containerType.'-label';
 if (stripos($optionLabelAttr, 'class') === false) {
     $optionLabelAttr .= ' class="'.$defaultOptionLabelClass.'"';
 } else {
@@ -28,7 +28,7 @@
 }
 
 $count   = 0;
-$firstId = 'mauticform_' . $containerType . '_' . $type . '_'.$field['alias'].'_'.InputHelper::alphanum(InputHelper::transliterate($firstListValue)).'1';
+$firstId = 'mauticform_'.$containerType.'_'.$type.'_'.$field['alias'].'_'.InputHelper::alphanum(InputHelper::transliterate($firstListValue)).'1';
 
 $label = (!$field['showLabel']) ? '' : <<<HTML
 
@@ -48,7 +48,7 @@
 $checked          = ($field['defaultValue'] === $listValue) ? 'checked="checked"' : '';
 $checkboxBrackets = ($type == 'checkbox') ? '[]' : '';
 
-$option  = <<<HTML
+$option = <<<HTML
 
                     <label id="mauticform_{$containerType}_label_{$id}" for="mauticform_{$containerType}_{$type}_{$id}" {$optionLabelAttr}>
                         <input {$inputAttr}{$checked} name="mauticform[{$field['alias']}]{$checkboxBrackets}" id="mauticform_{$containerType}_{$type}_{$id}" type="{$type}" value="{$view->escape($listValue)}" />
@@ -65,12 +65,11 @@
 endif;
 
 $options[] = $option;
-$counter++;
+++$counter;
 endforeach;
 
 $optionHtml = implode('', $options);
 
-
 $html = <<<HTML
 
             <div $containerAttr>{$label}{$help}{$optionHtml}
diff --git a/app/bundles/FormBundle/Views/Field/hidden.html.php b/app/bundles/FormBundle/Views/Field/hidden.html.php
index f34c706c4ad..f4a0c8ef732 100644
--- a/app/bundles/FormBundle/Views/Field/hidden.html.php
+++ b/app/bundles/FormBundle/Views/Field/hidden.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $defaultInputClass = $containerType = 'hidden';
 
 include __DIR__.'/field_helper.php';
diff --git a/app/bundles/FormBundle/Views/Field/number.html.php b/app/bundles/FormBundle/Views/Field/number.html.php
index 7b2cba18d42..de59ae3775e 100644
--- a/app/bundles/FormBundle/Views/Field/number.html.php
+++ b/app/bundles/FormBundle/Views/Field/number.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:text.html.php',
     [
@@ -15,6 +15,6 @@
         'type'     => 'number',
         'id'       => $id,
         'formId'   => (isset($formId)) ? $formId : 0,
-        'formName' => (isset($formName)) ? $formName : ''
+        'formName' => (isset($formName)) ? $formName : '',
     ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/pagebreak.html.php b/app/bundles/FormBundle/Views/Field/pagebreak.html.php
index 709b5081058..5a8b4204493 100644
--- a/app/bundles/FormBundle/Views/Field/pagebreak.html.php
+++ b/app/bundles/FormBundle/Views/Field/pagebreak.html.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $containerType     = 'pagebreak-wrapper';
 $defaultInputClass = 'pagebreak';
 
 include __DIR__.'/field_helper.php';
 
 $backButtonAttr = $nextButtonAttr = $inputAttr;
-$classPrefix = 'btn btn-default mautic-pagebreak-';
+$classPrefix    = 'btn btn-default mautic-pagebreak-';
 
 $appendAttribute($backButtonAttr, 'class', $classPrefix.'back');
 $appendAttribute($nextButtonAttr, 'class', $classPrefix.'next'.((!empty($inForm)) ? ' mr-lg ' : ''));
diff --git a/app/bundles/FormBundle/Views/Field/password.html.php b/app/bundles/FormBundle/Views/Field/password.html.php
index c10d359abdd..15d567f24d9 100644
--- a/app/bundles/FormBundle/Views/Field/password.html.php
+++ b/app/bundles/FormBundle/Views/Field/password.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:text.html.php',
     [
@@ -15,6 +15,6 @@
         'type'     => 'password',
         'id'       => $id,
         'formId'   => (isset($formId)) ? $formId : 0,
-        'formName' => (isset($formName)) ? $formName : ''
+        'formName' => (isset($formName)) ? $formName : '',
     ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/radiogrp.html.php b/app/bundles/FormBundle/Views/Field/radiogrp.html.php
index 035039d197f..186f4970993 100644
--- a/app/bundles/FormBundle/Views/Field/radiogrp.html.php
+++ b/app/bundles/FormBundle/Views/Field/radiogrp.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:group.html.php',
     [
diff --git a/app/bundles/FormBundle/Views/Field/select.html.php b/app/bundles/FormBundle/Views/Field/select.html.php
index e0bfd042cd5..2d5209acf61 100644
--- a/app/bundles/FormBundle/Views/Field/select.html.php
+++ b/app/bundles/FormBundle/Views/Field/select.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $defaultInputFormClass = ' not-chosen';
 $defaultInputClass     = 'selectbox';
 $containerType         = 'select';
@@ -22,7 +22,6 @@
                 <label $labelAttr>{$field['label']}</label>
 HTML;
 
-
 $help = (empty($field['helpMessage'])) ? '' : <<<HTML
 
                 <span class="mauticform-helpmessage">{$field['helpMessage']}</span>
@@ -36,10 +35,10 @@
 HTML;
 endif;
 
-$options = (!empty($emptyOption)) ? array($emptyOption) :  array();
+$options = (!empty($emptyOption)) ? [$emptyOption] : [];
 
 foreach ($list as $listValue => $listLabel):
-$selected = ($listValue === $field['defaultValue']) ? ' selected="selected"' : '';
+$selected  = ($listValue === $field['defaultValue']) ? ' selected="selected"' : '';
 $options[] = <<<HTML
 
                     <option value="{$view->escape($listValue)}"{$selected}>{$view->escape($listLabel)}</option>
@@ -47,7 +46,7 @@
 endforeach;
 
 $optionsHtml = implode('', $options);
-$html = <<<HTML
+$html        = <<<HTML
 
             <div $containerAttr>{$label}{$help}
                 <select $inputAttr>$optionsHtml
diff --git a/app/bundles/FormBundle/Views/Field/tel.html.php b/app/bundles/FormBundle/Views/Field/tel.html.php
index 075366d61ac..8144bfad80f 100644
--- a/app/bundles/FormBundle/Views/Field/tel.html.php
+++ b/app/bundles/FormBundle/Views/Field/tel.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:text.html.php',
     [
@@ -15,6 +15,6 @@
         'type'     => 'tel',
         'id'       => $id,
         'formId'   => (isset($formId)) ? $formId : 0,
-        'formName' => (isset($formName)) ? $formName : ''
+        'formName' => (isset($formName)) ? $formName : '',
     ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/text.html.php b/app/bundles/FormBundle/Views/Field/text.html.php
index da2f374e014..b2ffcb70bd2 100644
--- a/app/bundles/FormBundle/Views/Field/text.html.php
+++ b/app/bundles/FormBundle/Views/Field/text.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $containerType     = (isset($type)) ? $type : 'text';
diff --git a/app/bundles/FormBundle/Views/Field/textarea.html.php b/app/bundles/FormBundle/Views/Field/textarea.html.php
index 18e4600a94c..b13ff495747 100644
--- a/app/bundles/FormBundle/Views/Field/textarea.html.php
+++ b/app/bundles/FormBundle/Views/Field/textarea.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:text.html.php',
     [
@@ -17,6 +17,6 @@
         'containerClass' => 'text',
         'id'             => $id,
         'formId'         => (isset($formId)) ? $formId : 0,
-        'formName'       => (isset($formName)) ? $formName : ''
+        'formName'       => (isset($formName)) ? $formName : '',
     ]
 );
diff --git a/app/bundles/FormBundle/Views/Field/url.html.php b/app/bundles/FormBundle/Views/Field/url.html.php
index 242169de295..e8f12bbe648 100644
--- a/app/bundles/FormBundle/Views/Field/url.html.php
+++ b/app/bundles/FormBundle/Views/Field/url.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 echo $view->render(
     'MauticFormBundle:Field:text.html.php',
     [
diff --git a/app/bundles/FormBundle/Views/Form/details.html.php b/app/bundles/FormBundle/Views/Form/details.html.php
index b87585c59d6..8ddddca67db 100644
--- a/app/bundles/FormBundle/Views/Form/details.html.php
+++ b/app/bundles/FormBundle/Views/Form/details.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'form');
-$view['slots']->set("headerTitle", $activeForm->getName());
+$view['slots']->set('headerTitle', $activeForm->getName());
 
 $view['slots']->set(
     'actions',
@@ -18,7 +18,7 @@
         [
             'item'            => $activeForm,
             'templateButtons' => [
-                'edit'   => $view['security']->hasEntityAccess(
+                'edit' => $view['security']->hasEntityAccess(
                     $permissions['form:forms:editown'],
                     $permissions['form:forms:editother'],
                     $activeForm->getCreatedBy()
@@ -29,17 +29,17 @@
                     $permissions['form:forms:deleteother'],
                     $activeForm->getCreatedBy()
                 ),
-                'close'  => $view['security']->hasEntityAccess(
+                'close' => $view['security']->hasEntityAccess(
                     $permissions['form:forms:viewown'],
                     $permissions['form:forms:viewother'],
                     $activeForm->getCreatedBy()
                 ),
             ],
-            'routeBase'       => 'form',
-            'langVar'         => 'form',
-            'customButtons'   => [
+            'routeBase'     => 'form',
+            'langVar'       => 'form',
+            'customButtons' => [
                 [
-                    'attr'      => [
+                    'attr' => [
                         'data-toggle' => '',
                         'target'      => '_blank',
                         'href'        => $view['router']->path(
@@ -52,7 +52,7 @@
                     'btnClass'  => 'btn btn-default btn-nospin',
                 ],
                 [
-                    'attr'      => [
+                    'attr' => [
                         'data-toggle' => 'ajax',
                         'href'        => $view['router']->path(
                             'mautic_form_action',
@@ -160,7 +160,9 @@
                         </a>
                     </li>
                 <?php endif; ?>
-                <li class="<?php if (!$showActions) echo 'active'; ?>">
+                <li class="<?php if (!$showActions) {
+                                    echo 'active';
+                                } ?>">
                     <a href="#fields-container" role="tab" data-toggle="tab">
                         <?php echo $view['translator']->trans('mautic.form.tab.fields'); ?>
                     </a>
@@ -215,7 +217,9 @@
             <?php endif; ?>
 
             <!-- #fields-container -->
-            <div class="tab-pane fade<?php if (!$showActions) echo ' active in'; ?> bdr-w-0" id="fields-container">
+            <div class="tab-pane fade<?php if (!$showActions) {
+                                            echo ' active in';
+                                        } ?> bdr-w-0" id="fields-container">
                 <h5 class="fw-sb mb-xs">Form Field</h5>
                 <ul class="list-group mb-xs">
                     <?php /** @var \Mautic\FormBundle\Entity\Field $field */
diff --git a/app/bundles/FormBundle/Views/Form/index.html.php b/app/bundles/FormBundle/Views/Form/index.html.php
index d168097c2b5..dc22b3ad622 100644
--- a/app/bundles/FormBundle/Views/Form/index.html.php
+++ b/app/bundles/FormBundle/Views/Form/index.html.php
@@ -1,26 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'form');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.form.forms'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.form.forms'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['form:forms:create']
-            ),
-            'routeBase'       => 'form',
-            'langVar'         => 'form.form'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['form:forms:create'],
+            ],
+            'routeBase' => 'form',
+            'langVar'   => 'form.form',
+        ]
     )
 );
 
@@ -29,34 +30,34 @@
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render(
         'MauticCoreBundle:Helper:list_toolbar.html.php',
-        array(
-            'searchValue' => $searchValue,
-            'searchHelp'  => 'mautic.form.form.help.searchcommands',
-            'searchId'    => 'form-search',
-            'action'           => $currentRoute,
-            'routeBase'        => 'form',
-            'templateButtons'  => array(
-                'delete' => $permissions['form:forms:deleteown'] || $permissions['form:forms:deleteother']
-            ),
-            'preCustomButtons' => array(
-                array(
-                    'confirm' => array(
-                        'message'         => $view['translator']->trans('mautic.form.confirm_batch_rebuild'),
-                        'confirmText'     => $view['translator']->trans("mautic.form.rebuild"),
-                        'confirmAction'   => $view['router']->path(
+        [
+            'searchValue'     => $searchValue,
+            'searchHelp'      => 'mautic.form.form.help.searchcommands',
+            'searchId'        => 'form-search',
+            'action'          => $currentRoute,
+            'routeBase'       => 'form',
+            'templateButtons' => [
+                'delete' => $permissions['form:forms:deleteown'] || $permissions['form:forms:deleteother'],
+            ],
+            'preCustomButtons' => [
+                [
+                    'confirm' => [
+                        'message'       => $view['translator']->trans('mautic.form.confirm_batch_rebuild'),
+                        'confirmText'   => $view['translator']->trans('mautic.form.rebuild'),
+                        'confirmAction' => $view['router']->path(
                             'mautic_form_action',
-                            array_merge(array('objectAction' => 'batchRebuildHtml'))
+                            array_merge(['objectAction' => 'batchRebuildHtml'])
                         ),
                         'tooltip'         => $view['translator']->trans('mautic.form.rebuild.batch_tooltip'),
                         'iconClass'       => 'fa fa-fw fa-refresh',
                         'btnText'         => false,
                         'btnClass'        => 'btn btn-sm btn-default',
                         'precheck'        => 'batchActionPrecheck',
-                        'confirmCallback' => 'executeBatchAction'
-                    )
-                )
-            ),
-        )
+                        'confirmCallback' => 'executeBatchAction',
+                    ],
+                ],
+            ],
+        ]
     ); ?>
 
     <div class="page-list">
diff --git a/app/bundles/FormBundle/Views/Form/list.html.php b/app/bundles/FormBundle/Views/Form/list.html.php
index ae7c07e3015..e5756a15db1 100644
--- a/app/bundles/FormBundle/Views/Form/list.html.php
+++ b/app/bundles/FormBundle/Views/Form/list.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticFormBundle:Form:index.html.php');
+}
 
 ?>
 <?php if (count($items)): ?>
@@ -17,39 +18,39 @@
         <thead>
             <tr>
                 <?php
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#formTable'
-                ));
+                    'target'   => '#formTable',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'form',
                     'orderBy'    => 'f.name',
                     'text'       => 'mautic.core.name',
                     'class'      => 'col-form-name',
-                    'default'    => true
-                ));
+                    'default'    => true,
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'form',
                     'orderBy'    => 'c.title',
                     'text'       => 'mautic.core.category',
-                    'class'      => 'visible-md visible-lg col-form-category'
-                ));
+                    'class'      => 'visible-md visible-lg col-form-category',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'form',
                     'orderBy'    => 'submission_count',
                     'text'       => 'mautic.form.form.results',
-                    'class'      => 'visible-md visible-lg col-form-submissions'
-                ));
+                    'class'      => 'visible-md visible-lg col-form-submissions',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'form',
                     'orderBy'    => 'f.id',
                     'text'       => 'mautic.core.id',
-                    'class'      => 'visible-md visible-lg col-form-id'
-                ));
+                    'class'      => 'visible-md visible-lg col-form-id',
+                ]);
                 ?>
             </tr>
         </thead>
@@ -59,40 +60,40 @@
             <tr>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => $security->hasEntityAccess($permissions['form:forms:editown'], $permissions['form:forms:editother'], $item->getCreatedBy()),
-                            'clone'     => $permissions['form:forms:create'],
-                            'delete'    => $security->hasEntityAccess($permissions['form:forms:deleteown'], $permissions['form:forms:deleteother'], $item->getCreatedBy()),
-                        ),
-                        'routeBase' => 'form',
-                        'customButtons'    => array(
-                            array(
-                                'attr' => array(
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => $security->hasEntityAccess($permissions['form:forms:editown'], $permissions['form:forms:editother'], $item->getCreatedBy()),
+                            'clone'  => $permissions['form:forms:create'],
+                            'delete' => $security->hasEntityAccess($permissions['form:forms:deleteown'], $permissions['form:forms:deleteother'], $item->getCreatedBy()),
+                        ],
+                        'routeBase'     => 'form',
+                        'customButtons' => [
+                            [
+                                'attr' => [
                                     'data-toggle' => '',
                                     'target'      => '_blank',
-                                    'href'        => $view['router']->path('mautic_form_action', array('objectAction' => 'preview', 'objectId' => $item->getId())),
-                                ),
+                                    'href'        => $view['router']->path('mautic_form_action', ['objectAction' => 'preview', 'objectId' => $item->getId()]),
+                                ],
                                 'iconClass' => 'fa fa-camera',
-                                'btnText'   => 'mautic.form.form.preview'
-                            ),
-                            array(
-                                'attr' => array(
+                                'btnText'   => 'mautic.form.form.preview',
+                            ],
+                            [
+                                'attr' => [
                                     'data-toggle' => 'ajax',
-                                    'href'        => $view['router']->path('mautic_form_action', array('objectAction' => 'results', 'objectId' => $item->getId())),
-                                ),
+                                    'href'        => $view['router']->path('mautic_form_action', ['objectAction' => 'results', 'objectId' => $item->getId()]),
+                                ],
                                 'iconClass' => 'fa fa-database',
-                                'btnText'   => 'mautic.form.form.results'
-                            )
-                        )
-                    ));
+                                'btnText'   => 'mautic.form.form.results',
+                            ],
+                        ],
+                    ]);
                     ?>
                 </td>
                 <td>
                     <div>
-                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array('item' => $item, 'model' => 'form.form')); ?>
-                        <a href="<?php echo $view['router']->path('mautic_form_action', array('objectAction' => 'view', 'objectId' => $item->getId())); ?>" data-toggle="ajax" data-menu-link="mautic_form_index">
+                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'form.form']); ?>
+                        <a href="<?php echo $view['router']->path('mautic_form_action', ['objectAction' => 'view', 'objectId' => $item->getId()]); ?>" data-toggle="ajax" data-menu-link="mautic_form_index">
                             <?php echo $item->getName(); ?>
                             <?php if ($item->getFormType() == 'campaign'): ?>
                                 <span  data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.form.icon_tooltip.campaign_form'); ?>"><i class="fa fa-fw fa-cube"></i></span>
@@ -106,12 +107,12 @@
                 <td class="visible-md visible-lg">
                     <?php $category = $item->getCategory(); ?>
                     <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                    <?php $color    = ($category) ? '#' . $category->getColor() : 'inherit'; ?>
+                    <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                     <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                 </td>
                 <td class="visible-md visible-lg">
-                    <a href="<?php echo $view['router']->path('mautic_form_action', array('objectAction' => 'results', 'objectId' => $item->getId())); ?>" data-toggle="ajax" data-menu-link="mautic_form_index" class="btn btn-primary btn-xs" <?php echo ($i['submission_count'] == 0) ? "disabled=disabled" : ""; ?>>
-                        <?php echo $view['translator']->transChoice('mautic.form.form.viewresults', $i['submission_count'], array('%count%' => $i['submission_count'])); ?>
+                    <a href="<?php echo $view['router']->path('mautic_form_action', ['objectAction' => 'results', 'objectId' => $item->getId()]); ?>" data-toggle="ajax" data-menu-link="mautic_form_index" class="btn btn-primary btn-xs" <?php echo ($i['submission_count'] == 0) ? 'disabled=disabled' : ''; ?>>
+                        <?php echo $view['translator']->transChoice('mautic.form.form.viewresults', $i['submission_count'], ['%count%' => $i['submission_count']]); ?>
                     </a>
                 </td>
                 <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
@@ -120,15 +121,15 @@
         </tbody>
     </table>
     <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        'totalItems'      => $totalItems,
-        'page'            => $page,
-        'limit'           => $limit,
-        'baseUrl'         => $view['router']->path('mautic_form_index'),
-        'sessionVar'      => 'form',
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => $totalItems,
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_form_index'),
+        'sessionVar' => 'form',
+    ]); ?>
     </div>
 </div>
 <?php else: ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', array('tip' => 'mautic.form.noresults.tip')); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', ['tip' => 'mautic.form.noresults.tip']); ?>
 <?php endif; ?>
diff --git a/app/bundles/FormBundle/Views/FormTheme/FieldValueCondition/campaignevent_form_field_value_widget.html.php b/app/bundles/FormBundle/Views/FormTheme/FieldValueCondition/campaignevent_form_field_value_widget.html.php
index 4fb61031600..9c037ff4fa6 100644
--- a/app/bundles/FormBundle/Views/FormTheme/FieldValueCondition/campaignevent_form_field_value_widget.html.php
+++ b/app/bundles/FormBundle/Views/FormTheme/FieldValueCondition/campaignevent_form_field_value_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/FormBundle/Views/FormTheme/SubmitAction/form_submitaction_sendemail_widget.html.php b/app/bundles/FormBundle/Views/FormTheme/SubmitAction/form_submitaction_sendemail_widget.html.php
index 685c73de8f5..6e55f3219da 100644
--- a/app/bundles/FormBundle/Views/FormTheme/SubmitAction/form_submitaction_sendemail_widget.html.php
+++ b/app/bundles/FormBundle/Views/FormTheme/SubmitAction/form_submitaction_sendemail_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/FormBundle/Views/FormTheme/SubmitAction/submit_action_repost_widget.html.php b/app/bundles/FormBundle/Views/FormTheme/SubmitAction/submit_action_repost_widget.html.php
index dc146769275..b0f508bcd0e 100644
--- a/app/bundles/FormBundle/Views/FormTheme/SubmitAction/submit_action_repost_widget.html.php
+++ b/app/bundles/FormBundle/Views/FormTheme/SubmitAction/submit_action_repost_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/FormBundle/Views/Public/videoembed.html.php b/app/bundles/FormBundle/Views/Public/videoembed.html.php
index 63de3bb960e..05e292b47de 100644
--- a/app/bundles/FormBundle/Views/Public/videoembed.html.php
+++ b/app/bundles/FormBundle/Views/Public/videoembed.html.php
@@ -7,12 +7,12 @@
                 if (!isset($fieldSettings[$f->getType()])):
                     continue;
                 endif;
-                $params   = $fieldSettings[$f->getType()];
+                $params = $fieldSettings[$f->getType()];
                 $f->setCustomParameters($params);
 
                 $template = $params['template'];
             else:
-                $template = 'MauticFormBundle:Field:' . $f->getType() . '.html.php';
+                $template = 'MauticFormBundle:Field:'.$f->getType().'.html.php';
             endif;
 
             echo $view->render($template, ['field' => $f->convertToArray(), 'id' => $f->getAlias(), 'formName' => $f->getForm()->generateFormName()]);
diff --git a/app/bundles/FormBundle/Views/Result/export.html.php b/app/bundles/FormBundle/Views/Result/export.html.php
index cbc900619fd..f61c3edb076 100644
--- a/app/bundles/FormBundle/Views/Result/export.html.php
+++ b/app/bundles/FormBundle/Views/Result/export.html.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:slim.html.php');
 $view['slots']->set('pageTitle', $pageTitle);
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.form.result.header.index', array(
-    '%name%' => $form->getName()
-)));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.form.result.header.index', [
+    '%name%' => $form->getName(),
+]));
 ?>
 
 <div class="formresults">
@@ -24,7 +24,9 @@
             <?php
             $fields = $form->getFields();
             foreach ($fields as $f):
-            if (in_array($f->getType(), $viewOnlyFields) || $f->getSaveResult() === false) continue;
+            if (in_array($f->getType(), $viewOnlyFields) || $f->getSaveResult() === false) {
+                continue;
+            }
             ?>
             <th class="col-formresult-field col-formresult-<?php echo $f->getType(); ?> col-formresult-field<?php echo $f->getId(); ?>"><?php echo $f->getLabel(); ?></th>
             <?php endforeach; ?>
@@ -36,7 +38,7 @@
                 <td><?php echo $item['id']; ?></td>
                 <td><?php echo $view['date']->toFull($item['dateSubmitted']); ?></td>
                 <td><?php echo $item['ipAddress']['ipAddress']; ?></td>
-                <?php foreach($item['results'] as $r):?>
+                <?php foreach ($item['results'] as $r):?>
                     <td><?php echo $r['value']; ?></td>
                 <?php endforeach; ?>
             </tr>
diff --git a/app/bundles/FormBundle/Views/Result/index.html.php b/app/bundles/FormBundle/Views/Result/index.html.php
index ff6912bebd7..5939e2bfe59 100644
--- a/app/bundles/FormBundle/Views/Result/index.html.php
+++ b/app/bundles/FormBundle/Views/Result/index.html.php
@@ -1,68 +1,68 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'formresult');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.form.result.header.index', array(
-    '%name%' => $form->getName()
-)));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.form.result.header.index', [
+    '%name%' => $form->getName(),
+]));
 
-$buttons = array();
+$buttons = [];
 
-$buttons[] = array(
-    'attr' => array(
-        'target' => '_new',
+$buttons[] = [
+    'attr' => [
+        'target'      => '_new',
         'data-toggle' => '',
         'class'       => 'btn btn-default btn-nospin',
-        'href'   => $view['router']->path('mautic_form_export', array('objectId' => $form->getId(), 'format' => 'html'))
-    ),
-    'btnText' => $view['translator']->trans('mautic.form.result.export.html'),
-    'iconClass' => 'fa fa-file-code-o'
-);
+        'href'        => $view['router']->path('mautic_form_export', ['objectId' => $form->getId(), 'format' => 'html']),
+    ],
+    'btnText'   => $view['translator']->trans('mautic.form.result.export.html'),
+    'iconClass' => 'fa fa-file-code-o',
+];
 
-$buttons[] = array(
-    'attr' => array(
+$buttons[] = [
+    'attr' => [
         'data-toggle' => 'download',
         'data-toggle' => '',
         'class'       => 'btn btn-default btn-nospin',
-        'href'        => $view['router']->path('mautic_form_export', array('objectId' => $form->getId(), 'format' => 'csv'))
-    ),
-    'btnText' => $view['translator']->trans('mautic.form.result.export.csv'),
-    'iconClass' => 'fa fa-file-text-o'
-);
+        'href'        => $view['router']->path('mautic_form_export', ['objectId' => $form->getId(), 'format' => 'csv']),
+    ],
+    'btnText'   => $view['translator']->trans('mautic.form.result.export.csv'),
+    'iconClass' => 'fa fa-file-text-o',
+];
 
 if (class_exists('PHPExcel')) {
-    $buttons[] = array(
-        'attr' => array(
+    $buttons[] = [
+        'attr' => [
             'data-toggle' => 'download',
             'data-toggle' => '',
             'class'       => 'btn btn-default btn-nospin',
-            'href'        => $view['router']->path('mautic_form_export', array('objectId' => $form->getId(), 'format' => 'xlsx'))
-        ),
-        'btnText' => $view['translator']->trans('mautic.form.result.export.xlsx'),
-        'iconClass' => 'fa fa-file-excel-o'
-    );
+            'href'        => $view['router']->path('mautic_form_export', ['objectId' => $form->getId(), 'format' => 'xlsx']),
+        ],
+        'btnText'   => $view['translator']->trans('mautic.form.result.export.xlsx'),
+        'iconClass' => 'fa fa-file-excel-o',
+    ];
 }
 
-$buttons[] = array(
-    'confirm' => array (
+$buttons[] = [
+    'confirm' => [
         'message'         => $view['translator']->trans('mautic.form.results.form.confirmbatchdelete'),
         'confirmText'     => $view['translator']->trans('mautic.core.form.delete'),
-        'confirmAction'   => $view['router']->path('mautic_form_results_delete', array_merge(array('formId' => $form->getId()))),
+        'confirmAction'   => $view['router']->path('mautic_form_results_delete', array_merge(['formId' => $form->getId()])),
         'confirmCallback' => 'executeBatchAction',
         'iconClass'       => 'fa fa-trash-o text-danger',
         'btnText'         => $view['translator']->trans('mautic.core.form.delete'),
         'tooltip'         => $view['translator']->trans('mautic.core.form.tooltip.bulkdelete'),
-        'precheck'        => 'batchActionPrecheck'
-    )
-);
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array('customButtons' => $buttons)));
+        'precheck'        => 'batchActionPrecheck',
+    ],
+];
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', ['customButtons' => $buttons]));
 ?>
 
 <div class="page-list">
diff --git a/app/bundles/FormBundle/Views/Result/list.html.php b/app/bundles/FormBundle/Views/Result/list.html.php
index 3a60ece0651..e85c6456e2e 100644
--- a/app/bundles/FormBundle/Views/Result/list.html.php
+++ b/app/bundles/FormBundle/Views/Result/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index'):
@@ -18,51 +19,52 @@
             <tr>
                 <?php
                 if ($canDelete):
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#formResultTable'
-                ));
+                    'target'   => '#formResultTable',
+                ]);
                 endif;
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'formresult.'.$formId,
                     'orderBy'    => 's.id',
                     'text'       => 'mautic.core.id',
                     'class'      => 'col-formresult-id',
-                    'filterBy'   => 's.id'
-                ));
+                    'filterBy'   => 's.id',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'formresult.'.$formId,
                     'orderBy'    => 's.date_submitted',
                     'text'       => 'mautic.form.result.thead.date',
                     'class'      => 'col-formresult-date',
                     'default'    => true,
                     'filterBy'   => 's.date_submitted',
-                    'dataToggle' => 'date'
-                ));
+                    'dataToggle' => 'date',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'formresult.'.$formId,
                     'orderBy'    => 'i.ip_address',
                     'text'       => 'mautic.core.ipaddress',
                     'class'      => 'col-formresult-ip',
-                    'filterBy'   => 'i.ip_address'
-                ));
+                    'filterBy'   => 'i.ip_address',
+                ]);
 
-                $fields = $form->getFields();
+                $fields     = $form->getFields();
                 $fieldCount = ($canDelete) ? 4 : 3;
                 foreach ($fields as $f):
-                    if (in_array($f->getType(), $viewOnlyFields) || $f->getSaveResult() === false)
+                    if (in_array($f->getType(), $viewOnlyFields) || $f->getSaveResult() === false) {
                         continue;
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    }
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'formresult.'.$formId,
-                        'orderBy'    => 'r.' . $f->getAlias(),
+                        'orderBy'    => 'r.'.$f->getAlias(),
                         'text'       => $f->getLabel(),
                         'class'      => 'col-formresult-field col-formresult-field'.$f->getId(),
-                        'filterBy'   => 'r.' . $f->getAlias(),
-                    ));
-                    $fieldCount++;
+                        'filterBy'   => 'r.'.$f->getAlias(),
+                    ]);
+                    ++$fieldCount;
                 endforeach;
                 ?>
             </tr>
@@ -70,20 +72,20 @@
         <tbody>
         <?php if (count($items)): ?>
         <?php foreach ($items as $item): ?>
-            <?php $item['name'] = $view['translator']->trans('mautic.form.form.results.name', array('%id%' => $item['id'])); ?>
+            <?php $item['name'] = $view['translator']->trans('mautic.form.form.results.name', ['%id%' => $item['id']]); ?>
             <tr>
                 <?php if ($canDelete): ?>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'delete'    => $canDelete
-                        ),
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'delete' => $canDelete,
+                        ],
                         'route'   => 'mautic_form_results_delete',
                         'langVar' => 'form.results',
-                        'query'   => array('formId' => $formId)
-                    ));
+                        'query'   => ['formId' => $formId],
+                    ]);
                     ?>
                 </td>
                 <?php endif; ?>
@@ -91,7 +93,7 @@
                 <td><?php echo $item['id']; ?></td>
                 <td>
                     <?php if (!empty($item['lead']['id'])): ?>
-                    <a href="<?php echo $view['router']->path('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $item['lead']['id'])); ?>" data-toggle="ajax">
+                    <a href="<?php echo $view['router']->path('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $item['lead']['id']]); ?>" data-toggle="ajax">
                         <?php echo $view['date']->toFull($item['dateSubmitted']); ?>
                     </a>
                     <?php else: ?>
@@ -99,7 +101,7 @@
                     <?php endif; ?>
                 </td>
                 <td><?php echo $item['ipAddress']['ipAddress']; ?></td>
-                <?php foreach($item['results'] as $r): ?>
+                <?php foreach ($item['results'] as $r): ?>
                     <?php $isTextarea = $r['type'] === 'textarea'; ?>
                     <td <?php echo $isTextarea ? 'class="long-text"' : ''; ?>>
                         <?php if ($isTextarea) : ?>
@@ -122,11 +124,11 @@
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems" => $totalCount,
-        "page"       => $page,
-        "limit"      => $limit,
-        "baseUrl"    =>  $view['router']->path('mautic_form_results', array('objectId' => $form->getId())),
-        'sessionVar' => 'formresult.'.$formId
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => $totalCount,
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_form_results', ['objectId' => $form->getId()]),
+        'sessionVar' => 'formresult.'.$formId,
+    ]); ?>
 </div>
diff --git a/app/bundles/FormBundle/Views/SubscribedEvents/AbTest/submissions.html.php b/app/bundles/FormBundle/Views/SubscribedEvents/AbTest/submissions.html.php
index 8f2c795db9c..f6645f28529 100644
--- a/app/bundles/FormBundle/Views/SubscribedEvents/AbTest/submissions.html.php
+++ b/app/bundles/FormBundle/Views/SubscribedEvents/AbTest/submissions.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $support = $results['support'];
-$label = $view['translator']->trans($variants['criteria'][$results['basedOn']]['label']);
-$chart = new \Mautic\CoreBundle\Helper\Chart\BarChart($support['labels']);
+$label   = $view['translator']->trans($variants['criteria'][$results['basedOn']]['label']);
+$chart   = new \Mautic\CoreBundle\Helper\Chart\BarChart($support['labels']);
 
 if ($support['data']) {
     foreach ($support['data'] as $datasetLabel => $values) {
diff --git a/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/index.html.php b/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/index.html.php
index e106a952d1c..ab011d81f00 100644
--- a/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/index.html.php
+++ b/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/index.html.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-$searchBtnClass = (!empty($searchValue)) ? "fa-eraser" : "fa-search";
+$searchBtnClass = (!empty($searchValue)) ? 'fa-eraser' : 'fa-search';
 ?>
 <div class="input-group ma-5">
-    <input type="search" class="form-control" id="formPageTokenSearch" name="search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#formPageTokens" data-action="<?php echo $view['router']->path('mautic_form_pagetoken_index', array('page' => $page)); ?>" />
+    <input type="search" class="form-control" id="formPageTokenSearch" name="search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#formPageTokens" data-action="<?php echo $view['router']->path('mautic_form_pagetoken_index', ['page' => $page]); ?>" />
     <div class="input-group-btn">
         <button type="button" class="btn btn-default btn-search btn-filter" data-livesearch-parent="formPageTokenSearch">
             <i class="fa <?php echo $searchBtnClass; ?> fa-fw"></i>
diff --git a/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/list.html.php b/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/list.html.php
index 93b1b604ca2..f308b0fd437 100644
--- a/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/list.html.php
+++ b/app/bundles/FormBundle/Views/SubscribedEvents/BuilderToken/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') {
     $view->extend('MauticFormBundle:SubscribedEvents\BuilderToken:index.html.php');
 }
@@ -15,7 +15,7 @@
     <?php if (count($items)): ?>
     <div class="list-group ma-5">
         <?php foreach ($items as $i):
-        $token = $view->escape(\Mautic\CoreBundle\Helper\BuilderTokenHelper::getVisualTokenHtml('{form=' . $i[0]->getId() . '}', $i[0]->getName()))
+        $token = $view->escape(\Mautic\CoreBundle\Helper\BuilderTokenHelper::getVisualTokenHtml('{form='.$i[0]->getId().'}', $i[0]->getName()))
         ?>
             <a href="#" class="list-group-item" data-token="<?php echo $token; ?>">
                 <div>
@@ -25,18 +25,18 @@
         <?php endforeach; ?>
     </div>
 
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems"        => count($items),
-        "page"              => $page,
-        "limit"             => $limit,
-        "fixedLimit"        => true,
-        "baseUrl"           => $view['router']->path('mautic_form_pagetoken_index'),
-        "paginationWrapper" => 'text-center',
-        "paginationClass"   => "sm",
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems'        => count($items),
+        'page'              => $page,
+        'limit'             => $limit,
+        'fixedLimit'        => true,
+        'baseUrl'           => $view['router']->path('mautic_form_pagetoken_index'),
+        'paginationWrapper' => 'text-center',
+        'paginationClass'   => 'sm',
         'sessionVar'        => 'form.pagetoken',
         'ignoreFormExit'    => true,
         'queryString'       => 'tmpl=list',
-        'target'            => '#formEmailTokens'
-    )); ?>
+        'target'            => '#formEmailTokens',
+    ]); ?>
     <?php endif; ?>
 </div>
\ No newline at end of file
diff --git a/app/bundles/FormBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/FormBundle/Views/SubscribedEvents/Search/global.html.php
index 85a10564b43..e85e41f718c 100644
--- a/app/bundles/FormBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/FormBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_form_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_form_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
 </a>
 <?php else: ?>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_form_action', array('objectAction' => 'view', 'objectId' => $form->getId())); ?>" data-toggle="ajax">
+    <a href="<?php echo $this->container->get('router')->generate('mautic_form_action', ['objectAction' => 'view', 'objectId' => $form->getId()]); ?>" data-toggle="ajax">
     <?php echo $form->getName(); ?>
     <span class="label label-default pull-right" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.form.form.resultcount'); ?>" data-placement="left">
         <?php echo $form->getResultCount(); ?>
diff --git a/app/bundles/FormBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/FormBundle/Views/SubscribedEvents/Timeline/index.html.php
index c08c2d5e67c..070fc649f9d 100644
--- a/app/bundles/FormBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/FormBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $form       = $event['extra']['form'];
 $page       = $event['extra']['page'];
 $submission = $event['extra']['submission'];
diff --git a/app/bundles/FormBundle/Views/form.html.php b/app/bundles/FormBundle/Views/form.html.php
index 497f9e646fc..e6fc68fb3fc 100644
--- a/app/bundles/FormBundle/Views/form.html.php
+++ b/app/bundles/FormBundle/Views/form.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/FormBundle/Views/messenger.html.php b/app/bundles/FormBundle/Views/messenger.html.php
index ef3680e0446..67565967c44 100644
--- a/app/bundles/FormBundle/Views/messenger.html.php
+++ b/app/bundles/FormBundle/Views/messenger.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/InstallBundle/Config/config.php b/app/bundles/InstallBundle/Config/config.php
index c5cec2ae8dd..7c1ed359624 100644
--- a/app/bundles/InstallBundle/Config/config.php
+++ b/app/bundles/InstallBundle/Config/config.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
     'routes' => [
         'public' => [
-            'mautic_installer_home'         => [
+            'mautic_installer_home' => [
                 'path'       => '/installer',
                 'controller' => 'MauticInstallBundle:Install:step',
             ],
@@ -18,15 +19,15 @@
                 'path'       => '/installer/',
                 'controller' => 'MauticCoreBundle:Common:removeTrailingSlash',
             ],
-            'mautic_installer_step'         => [
+            'mautic_installer_step' => [
                 'path'       => '/installer/step/{index}',
                 'controller' => 'MauticInstallBundle:Install:step',
             ],
-            'mautic_installer_final'        => [
+            'mautic_installer_final' => [
                 'path'       => '/installer/final',
                 'controller' => 'MauticInstallBundle:Install:final',
             ],
-            'mautic_installer_catchcall'    => [
+            'mautic_installer_catchcall' => [
                 'path'         => '/installer/{noerror}',
                 'controller'   => 'MauticInstallBundle:Install:step',
                 'requirements' => [
@@ -38,9 +39,9 @@
 
     'services' => [
         'other' => [
-            'mautic.install.configurator.step.check'    => [
-                'class'        => 'Mautic\InstallBundle\Configurator\Step\CheckStep',
-                'arguments'    => [
+            'mautic.install.configurator.step.check' => [
+                'class'     => 'Mautic\InstallBundle\Configurator\Step\CheckStep',
+                'arguments' => [
                     'mautic.configurator',
                     '%kernel.root_dir%',
                     'request_stack',
@@ -51,8 +52,8 @@
                 ],
             ],
             'mautic.install.configurator.step.doctrine' => [
-                'class'        => 'Mautic\InstallBundle\Configurator\Step\DoctrineStep',
-                'arguments'    => [
+                'class'     => 'Mautic\InstallBundle\Configurator\Step\DoctrineStep',
+                'arguments' => [
                     'mautic.configurator',
                 ],
                 'tag'          => 'mautic.configurator.step',
@@ -60,9 +61,9 @@
                     'priority' => 1,
                 ],
             ],
-            'mautic.install.configurator.step.email'    => [
-                'class'        => 'Mautic\InstallBundle\Configurator\Step\EmailStep',
-                'arguments'    => [
+            'mautic.install.configurator.step.email' => [
+                'class'     => 'Mautic\InstallBundle\Configurator\Step\EmailStep',
+                'arguments' => [
                     'session',
                 ],
                 'tag'          => 'mautic.configurator.step',
@@ -70,9 +71,9 @@
                     'priority' => 3,
                 ],
             ],
-            'mautic.install.configurator.step.user'     => [
-                'class'        => 'Mautic\InstallBundle\Configurator\Step\UserStep',
-                'arguments'    => [
+            'mautic.install.configurator.step.user' => [
+                'class'     => 'Mautic\InstallBundle\Configurator\Step\UserStep',
+                'arguments' => [
                     'session',
                 ],
                 'tag'          => 'mautic.configurator.step',
diff --git a/app/bundles/InstallBundle/Configurator/Form/CheckStepType.php b/app/bundles/InstallBundle/Configurator/Form/CheckStepType.php
index 8aa9a53b09e..6e008a0774c 100644
--- a/app/bundles/InstallBundle/Configurator/Form/CheckStepType.php
+++ b/app/bundles/InstallBundle/Configurator/Form/CheckStepType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -34,13 +35,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'attr'  => [
                             'class'   => 'btn btn-success pull-right btn-next',
                             'icon'    => 'fa fa-arrow-circle-right',
-                            'onclick' => 'MauticInstaller.showWaitMessage(event);'
-                        ]
-                    ]
+                            'onclick' => 'MauticInstaller.showWaitMessage(event);',
+                        ],
+                    ],
                 ],
-                'apply_text'        => '',
-                'save_text'         => '',
-                'cancel_text'       => ''
+                'apply_text'  => '',
+                'save_text'   => '',
+                'cancel_text' => '',
             ]
         );
 
diff --git a/app/bundles/InstallBundle/Configurator/Form/DoctrineStepType.php b/app/bundles/InstallBundle/Configurator/Form/DoctrineStepType.php
index de3bd81e697..ff3dd3ac0c3 100644
--- a/app/bundles/InstallBundle/Configurator/Form/DoctrineStepType.php
+++ b/app/bundles/InstallBundle/Configurator/Form/DoctrineStepType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -39,15 +40,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'empty_value' => false,
                 'required'    => true,
                 'attr'        => [
-                    'class' => 'form-control'
+                    'class' => 'form-control',
                 ],
                 'constraints' => [
                     new Choice(
                         [
-                            'callback' => '\Mautic\InstallBundle\Configurator\Step\DoctrineStep::getDriverKeys'
+                            'callback' => '\Mautic\InstallBundle\Configurator\Step\DoctrineStep::getDriverKeys',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -58,7 +59,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.database.host',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => true
+                'required'   => true,
             ]
         );
 
@@ -69,7 +70,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.database.port',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => false
+                'required'   => false,
             ]
         );
 
@@ -80,7 +81,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.database.name',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => true
+                'required'   => true,
             ]
         );
 
@@ -91,7 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.database.table.prefix',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => false
+                'required'   => false,
             ]
         );
 
@@ -102,7 +103,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.database.user',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => true
+                'required'   => true,
             ]
         );
 
@@ -114,9 +115,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'    => 'form-control',
-                    'preaddon' => 'fa fa-lock'
+                    'preaddon' => 'fa fa-lock',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -127,8 +128,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'mautic.install.form.existing_tables',
                 'attr'  => [
                     'tooltip'  => 'mautic.install.form.existing_tables_descr',
-                    'onchange' => 'MauticInstaller.toggleBackupPrefix();'
-                ]
+                    'onchange' => 'MauticInstaller.toggleBackupPrefix();',
+                ],
             ]
         );
 
@@ -139,9 +140,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.backup_prefix',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
-                    'class' => 'form-control'
+                    'class' => 'form-control',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -157,13 +158,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'attr'  => [
                             'class'   => 'btn btn-success pull-right btn-next',
                             'icon'    => 'fa fa-arrow-circle-right',
-                            'onclick' => 'MauticInstaller.showWaitMessage(event);'
-                        ]
-                    ]
+                            'onclick' => 'MauticInstaller.showWaitMessage(event);',
+                        ],
+                    ],
                 ],
-                'apply_text'        => '',
-                'save_text'         => '',
-                'cancel_text'       => ''
+                'apply_text'  => '',
+                'save_text'   => '',
+                'cancel_text' => '',
             ]
         );
 
diff --git a/app/bundles/InstallBundle/Configurator/Form/EmailStepType.php b/app/bundles/InstallBundle/Configurator/Form/EmailStepType.php
index 33038ae2d23..b502124e50b 100644
--- a/app/bundles/InstallBundle/Configurator/Form/EmailStepType.php
+++ b/app/bundles/InstallBundle/Configurator/Form/EmailStepType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -29,20 +30,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_from_name',
             'text',
             [
-                'label'       => false,
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => false,
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
-                    'placeholder' => 'mautic.install.form.email.from_name'
+                    'placeholder' => 'mautic.install.form.email.from_name',
                 ],
                 'required'    => true,
                 'constraints' => [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -50,9 +51,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_from_email',
             'email',
             [
-                'label'       => false,
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => false,
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
                     'preaddon'    => 'fa fa-envelope',
                     'placeholder' => 'mautic.install.form.email.from_address',
@@ -61,15 +62,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'constraints' => [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
                     ),
                     new Email(
                         [
-                            'message' => 'mautic.core.email.required'
+                            'message' => 'mautic.core.email.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -77,7 +78,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'mailer_transport',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'mail'                      => 'mautic.email.config.mailer_transport.mail',
                     'mautic.transport.mandrill' => 'mautic.email.config.mailer_transport.mandrill',
                     'mautic.transport.sendgrid' => 'mautic.email.config.mailer_transport.sendgrid',
@@ -85,7 +86,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'mautic.transport.postmark' => 'mautic.email.config.mailer_transport.postmark',
                     'gmail'                     => 'mautic.email.config.mailer_transport.gmail',
                     'smtp'                      => 'mautic.email.config.mailer_transport.smtp',
-                    'sendmail'                  => 'mautic.email.config.mailer_transport.sendmail'
+                    'sendmail'                  => 'mautic.email.config.mailer_transport.sendmail',
                 ],
                 'label'       => 'mautic.install.form.email.transport',
                 'label_attr'  => ['class' => 'control-label'],
@@ -93,8 +94,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'        => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.install.form.email.transport_descr',
-                    'onchange' => 'MauticInstaller.toggleTransportDetails(this.value);'
-                ]
+                    'onchange' => 'MauticInstaller.toggleTransportDetails(this.value);',
+                ],
             ]
         );
 
@@ -105,8 +106,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.email.mailer_host',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
-                    'class' => 'form-control'
-                ]
+                    'class' => 'form-control',
+                ],
             ]
         );
 
@@ -117,8 +118,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.install.form.email.mailer_port',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
-                    'class' => 'form-control'
-                ]
+                    'class' => 'form-control',
+                ],
             ]
         );
 
@@ -129,8 +130,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.core.username',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
-                    'class' => 'form-control'
-                ]
+                    'class' => 'form-control',
+                ],
             ]
         );
 
@@ -142,8 +143,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'    => 'form-control',
-                    'preaddon' => 'fa fa-lock'
-                ]
+                    'preaddon' => 'fa fa-lock',
+                ],
             ]
         );
 
@@ -157,7 +158,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ),
                 'label'       => 'mautic.install.form.email.encryption',
                 'expanded'    => true,
-                'empty_value' => 'mautic.install.form.none'
+                'empty_value' => 'mautic.install.form.none',
             ]
         );
 
@@ -169,12 +170,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     [
                         'plain',
                         'login',
-                        'cram-md5'
+                        'cram-md5',
                     ],
                     [
                         'mautic.email.config.mailer_auth_mode.plain',
                         'mautic.email.config.mailer_auth_mode.login',
-                        'mautic.email.config.mailer_auth_mode.cram-md5'
+                        'mautic.email.config.mailer_auth_mode.cram-md5',
                     ]
                 ),
                 'label'       => 'mautic.install.form.email.auth_mode',
@@ -182,8 +183,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'empty_value' => 'mautic.install.form.none',
                 'attr'        => [
                     'class'    => 'form-control',
-                    'onchange' => 'MauticInstaller.toggleAuthDetails(this.value);'
-                ]
+                    'onchange' => 'MauticInstaller.toggleAuthDetails(this.value);',
+                ],
             ]
         );
 
@@ -195,12 +196,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ['memory', 'file'],
                     [
                         'mautic.email.config.mailer_spool_type.memory',
-                        'mautic.email.config.mailer_spool_type.file'
+                        'mautic.email.config.mailer_spool_type.file',
                     ]
                 ),
                 'label'       => 'mautic.install.form.email.spool_type',
                 'expanded'    => true,
-                'empty_value' => false
+                'empty_value' => false,
             ]
         );
 
@@ -218,17 +219,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'attr'  => [
                             'class'   => 'btn btn-success pull-right btn-next',
                             'icon'    => 'fa fa-arrow-circle-right',
-                            'onclick' => 'MauticInstaller.showWaitMessage(event);'
-                        ]
-                    ]
+                            'onclick' => 'MauticInstaller.showWaitMessage(event);',
+                        ],
+                    ],
                 ],
-                'apply_text'        => '',
-                'save_text'         => '',
-                'cancel_text'       => ''
+                'apply_text'  => '',
+                'save_text'   => '',
+                'cancel_text' => '',
             ]
         );
 
-
         if (!empty($options['action'])) {
             $builder->setAction($options['action']);
         }
diff --git a/app/bundles/InstallBundle/Configurator/Form/UserStepType.php b/app/bundles/InstallBundle/Configurator/Form/UserStepType.php
index efaaa7ee7c1..832d2e859bc 100644
--- a/app/bundles/InstallBundle/Configurator/Form/UserStepType.php
+++ b/app/bundles/InstallBundle/Configurator/Form/UserStepType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,7 +20,6 @@
  */
 class UserStepType extends AbstractType
 {
-
     /**
      * @var
      */
@@ -52,10 +52,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'constraints' => [
                     new Assert\NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -71,10 +71,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'constraints' => [
                     new Assert\NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -82,26 +82,26 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'email',
             'email',
             [
-                'label'       => 'mautic.install.form.user.email',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.install.form.user.email',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
-                    'preaddon' => 'fa fa-envelope'
+                    'preaddon' => 'fa fa-envelope',
                 ],
                 'required'    => true,
                 'data'        => (!empty($storedData->email)) ? $storedData->email : '',
                 'constraints' => [
                     new Assert\NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
                     ),
                     new Assert\Email(
                         [
-                            'message' => 'mautic.core.email.required'
+                            'message' => 'mautic.core.email.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -109,20 +109,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'username',
             'text',
             [
-                'label'       => 'mautic.install.form.user.username',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                    'class' => 'form-control'
+                'label'      => 'mautic.install.form.user.username',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class' => 'form-control',
                 ],
                 'required'    => true,
                 'data'        => (!empty($storedData->username)) ? $storedData->username : '',
                 'constraints' => [
                     new Assert\NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -130,27 +130,27 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'password',
             'password',
             [
-                'label'       => 'mautic.install.form.user.password',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.install.form.user.password',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.user.user.form.help.passwordrequirements',
-                    'preaddon' => 'fa fa-lock'
+                    'preaddon' => 'fa fa-lock',
                 ],
                 'required'    => true,
                 'constraints' => [
                     new Assert\NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
                     ),
                     new Assert\Length(
                         [
                             'min'        => 6,
-                            'minMessage' => 'mautic.install.password.minlength'
+                            'minMessage' => 'mautic.install.password.minlength',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -166,13 +166,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'attr'  => [
                             'class'   => 'btn btn-success pull-right btn-next',
                             'icon'    => 'fa fa-arrow-circle-right',
-                            'onclick' => 'MauticInstaller.showWaitMessage(event);'
-                        ]
-                    ]
+                            'onclick' => 'MauticInstaller.showWaitMessage(event);',
+                        ],
+                    ],
                 ],
-                'apply_text'        => '',
-                'save_text'         => '',
-                'cancel_text'       => ''
+                'apply_text'  => '',
+                'save_text'   => '',
+                'cancel_text' => '',
             ]
         );
 
diff --git a/app/bundles/InstallBundle/Configurator/Step/CheckStep.php b/app/bundles/InstallBundle/Configurator/Step/CheckStep.php
index 0430f84264e..cf6a3c27a97 100644
--- a/app/bundles/InstallBundle/Configurator/Step/CheckStep.php
+++ b/app/bundles/InstallBundle/Configurator/Step/CheckStep.php
@@ -1,69 +1,69 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\InstallBundle\Configurator\Step;
 
 use Mautic\CoreBundle\Configurator\Configurator;
+use Mautic\CoreBundle\Configurator\Step\StepInterface;
 use Mautic\InstallBundle\Configurator\Form\CheckStepType;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Mautic\CoreBundle\Configurator\Step\StepInterface;
 
 /**
  * Check Step.
  */
 class CheckStep implements StepInterface
 {
-
     /**
-     * Flag if the configuration file is writable
+     * Flag if the configuration file is writable.
      *
      * @var bool
      */
     private $configIsWritable;
 
     /**
-     * Path to the kernel root
+     * Path to the kernel root.
      *
      * @var string
      */
     private $kernelRoot;
 
     /**
-     * Absolute path to cache directory
+     * Absolute path to cache directory.
      *
      * @var string
      */
     public $cache_path = '%kernel.root_dir%/cache';
 
     /**
-     * Absolute path to log directory
+     * Absolute path to log directory.
      *
      * @var string
      */
-    public $log_path   = '%kernel.root_dir%/logs';
+    public $log_path = '%kernel.root_dir%/logs';
 
     /**
-     * Set the domain URL for use in getting the absolute URL for cli/cronjob generated URLs
+     * Set the domain URL for use in getting the absolute URL for cli/cronjob generated URLs.
      *
      * @var string
      */
     public $site_url;
 
     /**
-     * Set the name of the source that installed Mautic
+     * Set the name of the source that installed Mautic.
      *
      * @var string
      */
     public $install_source = 'Mautic';
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param Configurator $configurator Configurator service
      * @param string       $kernelRoot   Kernel root path
@@ -91,13 +91,13 @@ public function getFormType()
      */
     public function checkRequirements()
     {
-        $messages = array();
+        $messages = [];
 
         if (version_compare(PHP_VERSION, '5.6.19', '<')) {
             $messages[] = 'mautic.install.php.version.not.supported';
         }
 
-        if (!is_dir(dirname($this->kernelRoot) . '/vendor/composer')) {
+        if (!is_dir(dirname($this->kernelRoot).'/vendor/composer')) {
             $messages[] = 'mautic.install.composer.dependencies';
         }
 
@@ -105,15 +105,15 @@ public function checkRequirements()
             $messages[] = 'mautic.install.config.unwritable';
         }
 
-        if (!is_writable($this->kernelRoot . '/cache')) {
+        if (!is_writable($this->kernelRoot.'/cache')) {
             $messages[] = 'mautic.install.cache.unwritable';
         }
 
-        if (!is_writable($this->kernelRoot . '/logs')) {
+        if (!is_writable($this->kernelRoot.'/logs')) {
             $messages[] = 'mautic.install.logs.unwritable';
         }
 
-        $timezones = array();
+        $timezones = [];
 
         foreach (\DateTimeZone::listAbbreviations() as $abbreviations) {
             foreach ($abbreviations as $abbreviation) {
@@ -260,7 +260,7 @@ public function checkOptionalSettings()
             }
         }
 
-        $memoryLimit = $this->toBytes(ini_get('memory_limit'));
+        $memoryLimit    = $this->toBytes(ini_get('memory_limit'));
         $suggestedLimit = 128 * 1024 * 1024;
 
         if ($memoryLimit < $suggestedLimit) {
@@ -323,11 +323,11 @@ public function getTemplate()
      */
     public function update(StepInterface $data)
     {
-        $parameters = array();
+        $parameters = [];
 
         foreach ($data as $key => $value) {
             // Exclude keys from the config
-            if (!in_array($key, array('configIsWritable', 'kernelRoot'))) {
+            if (!in_array($key, ['configIsWritable', 'kernelRoot'])) {
                 $parameters[$key] = $value;
             }
         }
@@ -340,17 +340,18 @@ public function update(StepInterface $data)
      *
      * @param string $val
      *
-     * @return integer
+     * @return int
      */
-    public function toBytes($val) {
+    public function toBytes($val)
+    {
         $val = trim($val);
 
         if ($val == -1) {
             return PHP_INT_MAX;
         }
 
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
+        $last = strtolower($val[strlen($val) - 1]);
+        switch ($last) {
             // The 'G' modifier is available since PHP 5.1.0
             case 'g':
                 $val *= 1024;
diff --git a/app/bundles/InstallBundle/Configurator/Step/DoctrineStep.php b/app/bundles/InstallBundle/Configurator/Step/DoctrineStep.php
index eb34d5c988f..19f4354cb6f 100644
--- a/app/bundles/InstallBundle/Configurator/Step/DoctrineStep.php
+++ b/app/bundles/InstallBundle/Configurator/Step/DoctrineStep.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\InstallBundle\Configurator\Step;
 
 use Mautic\CoreBundle\Configurator\Configurator;
-use Mautic\InstallBundle\Configurator\Form\DoctrineStepType;
 use Mautic\CoreBundle\Configurator\Step\StepInterface;
+use Mautic\InstallBundle\Configurator\Form\DoctrineStepType;
 
 /**
  * Doctrine Step.
@@ -21,55 +22,53 @@
 class DoctrineStep implements StepInterface
 {
     /**
-     * Database driver
-     *
+     * Database driver.
      */
     public $driver = 'pdo_mysql';
 
     /**
-     * Database host
+     * Database host.
      */
     public $host = 'localhost';
 
     /**
-     * Database table prefix
+     * Database table prefix.
      *
      * @var string
      */
     public $table_prefix;
 
     /**
-     * Database connection port
+     * Database connection port.
      */
     public $port = 3306;
 
     /**
-     * Database name
-     *
+     * Database name.
      */
     public $name;
 
     /**
-     * Database user
+     * Database user.
      */
     public $user;
 
     /**
-     * Database user's password
+     * Database user's password.
      *
      * @var string
      */
     public $password;
 
     /**
-     * Backup tables if they exist; otherwise drop them
+     * Backup tables if they exist; otherwise drop them.
      *
      * @var bool
      */
     public $backup_tables = true;
 
     /**
-     * Prefix for backup tables
+     * Prefix for backup tables.
      *
      * @var string
      */
@@ -81,7 +80,7 @@ class DoctrineStep implements StepInterface
     public $server_version = '5.5';
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param Configurator $configurator
      */
@@ -111,7 +110,7 @@ public function getFormType()
      */
     public function checkRequirements()
     {
-        $messages = array();
+        $messages = [];
 
         if (!class_exists('\PDO')) {
             $messages[] = 'mautic.install.pdo.mandatory';
@@ -130,7 +129,7 @@ public function checkRequirements()
      */
     public function checkOptionalSettings()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -138,7 +137,7 @@ public function checkOptionalSettings()
      */
     public function update(StepInterface $data)
     {
-        $parameters = array();
+        $parameters = [];
 
         foreach ($data as $key => $value) {
             // Exclude backup params from the config
@@ -159,7 +158,7 @@ public function getTemplate()
     }
 
     /**
-     * Return the key values of the available driver array
+     * Return the key values of the available driver array.
      *
      * @return array
      */
@@ -169,13 +168,13 @@ public static function getDriverKeys()
     }
 
     /**
-     * Fetches the available database drivers for the environment
+     * Fetches the available database drivers for the environment.
      *
      * @return array
      */
     public static function getDrivers()
     {
-        $mauticSupported = array(
+        $mauticSupported = [
             'pdo_mysql' => 'MySQL PDO (Recommended)',
             'mysqli'    => 'MySQLi',
             //'pdo_pgsql' => 'PostgreSQL',
@@ -185,9 +184,9 @@ public static function getDrivers()
             //'pdo_ibm'    => 'IBM DB2 (PDO)',
             //'oci8'       => 'Oracle (native)',
             //'ibm_db2'    => 'IBM DB2 (native)',
-        );
+        ];
 
-        $supported = array();
+        $supported = [];
 
         // Add PDO drivers if supported
         if (class_exists('\PDO')) {
diff --git a/app/bundles/InstallBundle/Configurator/Step/EmailStep.php b/app/bundles/InstallBundle/Configurator/Step/EmailStep.php
index d1854ab24a1..9ffc1bf29a6 100644
--- a/app/bundles/InstallBundle/Configurator/Step/EmailStep.php
+++ b/app/bundles/InstallBundle/Configurator/Step/EmailStep.php
@@ -1,101 +1,100 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\InstallBundle\Configurator\Step;
 
+use Mautic\CoreBundle\Configurator\Step\StepInterface;
 use Mautic\InstallBundle\Configurator\Form\EmailStepType;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\Validator\Constraints as Assert;
-use Mautic\CoreBundle\Configurator\Step\StepInterface;
 
 /**
  * Email Step.
  */
 class EmailStep implements StepInterface
 {
-
-    /**
+    /*
      * From name for email sent from Mautic
      *
      * @var string
      */
-    var $mailer_from_name;
+    public $mailer_from_name;
 
-    /**
+    /*
      * From email sent from Mautic
      *
      * @var string
      */
-    var $mailer_from_email;
+    public $mailer_from_email;
 
-    /**
+    /*
      * Mail transport
      *
      * @var string
      */
-    var $mailer_transport = 'mail';
+    public $mailer_transport = 'mail';
 
-    /**
+    /*
      * SMTP host
      *
      * @var string
      */
-    var $mailer_host;
+    public $mailer_host;
 
-    /**
+    /*
      * SMTP port
      *
      * @var string
      */
-    var $mailer_port;
+    public $mailer_port;
 
-    /**
+    /*
      * SMTP username
      *
      * @var string
      */
-    var $mailer_user;
+    public $mailer_user;
 
-    /**
+    /*
      * SMTP password
      *
      * @var string
      */
-    var $mailer_password;
+    public $mailer_password;
 
-    /**
+    /*
      * SMTP encryption
      *
      * @var string
      */
-    var $mailer_encryption; // null|tls|ssl
+    public $mailer_encryption; // null|tls|ssl
 
-    /**
+    /*
      * SMTP auth mode
      *
      * @var string
      */
-    var $mailer_auth_mode; //  null|plain|login|cram-md5
+    public $mailer_auth_mode; //  null|plain|login|cram-md5
 
-    /**
+    /*
      * Spool mode
      *
      * @var string
      */
-    var $mailer_spool_type = 'memory'; // file|memory
+    public $mailer_spool_type = 'memory'; // file|memory
 
-    /**
+    /*
      * Spool path
      *
      * @var string
      */
-    var $mailer_spool_path = "%kernel.root_dir%/spool";
+    public $mailer_spool_path = '%kernel.root_dir%/spool';
 
     /**
      * @param Session $session
@@ -122,7 +121,7 @@ public function getFormType()
      */
     public function checkRequirements()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -130,7 +129,7 @@ public function checkRequirements()
      */
     public function checkOptionalSettings()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -146,7 +145,7 @@ public function getTemplate()
      */
     public function update(StepInterface $data)
     {
-        $parameters = array();
+        $parameters = [];
 
         foreach ($data as $key => $value) {
             $parameters[$key] = $value;
diff --git a/app/bundles/InstallBundle/Configurator/Step/UserStep.php b/app/bundles/InstallBundle/Configurator/Step/UserStep.php
index 1a9cada4674..120fef27cf0 100644
--- a/app/bundles/InstallBundle/Configurator/Step/UserStep.php
+++ b/app/bundles/InstallBundle/Configurator/Step/UserStep.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\InstallBundle\Configurator\Step;
 
+use Mautic\CoreBundle\Configurator\Step\StepInterface;
 use Mautic\InstallBundle\Configurator\Form\UserStepType;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\Validator\Constraints as Assert;
-use Mautic\CoreBundle\Configurator\Step\StepInterface;
 
 /**
  * User Step.
@@ -20,27 +20,27 @@
 class UserStep implements StepInterface
 {
     /**
-     * User's first name
+     * User's first name.
      */
     public $firstname;
 
     /**
-     * User's last name
+     * User's last name.
      */
     public $lastname;
 
     /**
-     * User's e-mail address
+     * User's e-mail address.
      */
     public $email;
 
     /**
-     * User's username
+     * User's username.
      */
     public $username;
 
     /**
-     * User's password
+     * User's password.
      */
     public $password;
 
@@ -67,7 +67,7 @@ public function getFormType()
      */
     public function checkRequirements()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -75,7 +75,7 @@ public function checkRequirements()
      */
     public function checkOptionalSettings()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -91,6 +91,6 @@ public function getTemplate()
      */
     public function update(StepInterface $data)
     {
-        return array();
+        return [];
     }
 }
diff --git a/app/bundles/InstallBundle/Controller/InstallController.php b/app/bundles/InstallBundle/Controller/InstallController.php
index 2b4d45f416b..7edde96c57d 100644
--- a/app/bundles/InstallBundle/Controller/InstallController.php
+++ b/app/bundles/InstallBundle/Controller/InstallController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,21 +19,21 @@
 use Mautic\InstallBundle\Helper\SchemaHelper;
 use Mautic\UserBundle\Entity\User;
 use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
 
 /**
  * InstallController.
  */
 class InstallController extends CommonController
 {
-    const CHECK_STEP = 0;
+    const CHECK_STEP    = 0;
     const DOCTRINE_STEP = 1;
-    const USER_STEP = 2;
-    const EMAIL_STEP = 3;
+    const USER_STEP     = 2;
+    const EMAIL_STEP    = 3;
 
     /**
      * @var Configurator
@@ -41,18 +42,16 @@ class InstallController extends CommonController
 
     /**
      * @param FilterControllerEvent $event
-     *
-     * @return void
      */
     public function initialize(FilterControllerEvent $event)
     {
-        $this->configurator = $this->container->get('mautic.configurator');;
+        $this->configurator = $this->container->get('mautic.configurator');
     }
 
     /**
-     * Controller action for install steps
+     * Controller action for install steps.
      *
-     * @param integer $index The step number to process
+     * @param int $index The step number to process
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -61,7 +60,6 @@ public function stepAction($index = 0)
         // We're going to assume a bit here; if the config file exists already and DB info is provided, assume the app
         // is installed and redirect
         if ($this->checkIfInstalled()) {
-
             return $this->redirect($this->generateUrl('mautic_dashboard_index'));
         }
 
@@ -108,7 +106,6 @@ public function stepAction($index = 0)
                             $schemaHelper = new SchemaHelper($dbParams);
 
                             try {
-
                                 $schemaHelper->testConnection();
 
                                 if ($schemaHelper->createDatabase()) {
@@ -167,7 +164,6 @@ public function stepAction($index = 0)
                                 if (!$schemaHelper->installSchema()) {
                                     $this->addFlash('mautic.installer.error.no.metadata', [], 'error');
                                 } else {
-
                                     return $this->redirect($this->generateUrl('mautic_installer_step', ['index' => 1.2]));
                                 }
                             } catch (\Exception $exception) {
@@ -194,7 +190,7 @@ public function stepAction($index = 0)
         if ($complete) {
             $completedSteps[] = $index;
             $session->set('mautic.installer.completedsteps', $completedSteps);
-            $index++;
+            ++$index;
 
             if ($index < $this->configurator->getStepCount()) {
                 // On to the next step
@@ -204,17 +200,16 @@ public function stepAction($index = 0)
                 // Merge final things into the config, wipe the container, and we're done!
                 $finalConfigVars = [
                     'secret_key' => EncryptionHelper::generateKey(),
-                    'site_url'   => $this->request->getSchemeAndHttpHost().$this->request->getBaseUrl()
+                    'site_url'   => $this->request->getSchemeAndHttpHost().$this->request->getBaseUrl(),
                 ];
 
                 if (!$this->saveConfiguration($finalConfigVars, null, true)) {
-
                     $this->addFlash('mautic.installer.error.writing.configuration', [], 'error');
                 }
 
                 return $this->postActionRedirect(
                     [
-                        'viewParameters'    => [
+                        'viewParameters' => [
                             'welcome_url' => $this->generateUrl('mautic_dashboard_index'),
                             'parameters'  => $this->configurator->render(),
                             'version'     => MAUTIC_VERSION,
@@ -222,7 +217,7 @@ public function stepAction($index = 0)
                         ],
                         'returnUrl'         => $this->generateUrl('mautic_installer_final'),
                         'contentTemplate'   => 'MauticInstallBundle:Install:final.html.php',
-                        'forwardController' => false
+                        'forwardController' => false,
                     ]
                 );
             }
@@ -230,14 +225,13 @@ public function stepAction($index = 0)
             // Redirect back to last step if the user advanced ahead via the URL
             $last = (int) end($completedSteps) + 1;
             if ($index && $index > $last) {
-
                 return $this->redirect($this->generateUrl('mautic_installer_step', ['index' => (int) $last]));
             }
         }
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form'           => $form->createView(),
                     'index'          => $index,
                     'count'          => $this->configurator->getStepCount(),
@@ -247,18 +241,18 @@ public function stepAction($index = 0)
                     'minors'         => $this->configurator->getOptionalSettings(),
                     'appRoot'        => $this->container->getParameter('kernel.root_dir'),
                     'configFile'     => $this->get('mautic.helper.paths')->getSystemPath('local_config'),
-                    'completedSteps' => $completedSteps
+                    'completedSteps' => $completedSteps,
                 ],
                 'contentTemplate' => $step->getTemplate(),
                 'passthroughVars' => [
-                    'route' => $this->generateUrl('mautic_installer_step', ['index' => $index])
-                ]
+                    'route' => $this->generateUrl('mautic_installer_step', ['index' => $index]),
+                ],
             ]
         );
     }
 
     /**
-     * Controller action for the final step
+     * Controller action for the final step.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -297,7 +291,7 @@ public function finalAction()
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'welcome_url' => $welcomeUrl,
                     'parameters'  => $this->configurator->render(),
                     'config_path' => $this->get('mautic.helper.paths')->getSystemPath('local_config'),
@@ -309,14 +303,14 @@ public function finalAction()
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_installer_index',
                     'mauticContent' => 'installer',
-                    'route'         => $this->generateUrl('mautic_installer_final')
-                ]
+                    'route'         => $this->generateUrl('mautic_installer_final'),
+                ],
             ]
         );
     }
 
     /**
-     * Checks if the application has been installed and redirects if so
+     * Checks if the application has been installed and redirects if so.
      *
      * @return bool
      */
@@ -325,7 +319,6 @@ private function checkIfInstalled()
         // If the config file doesn't even exist, no point in checking further
         $localConfigFile = $this->get('mautic.helper.paths')->getSystemPath('local_config');
         if (!file_exists($localConfigFile)) {
-
             return false;
         }
 
@@ -336,7 +329,6 @@ private function checkIfInstalled()
         // performed; manually deleting these values or deleting the config file will be required to re-enter
         // installation.
         if (empty($params['db_driver']) || empty($params['mailer_from_name'])) {
-
             return false;
         }
 
@@ -344,7 +336,7 @@ private function checkIfInstalled()
     }
 
     /**
-     * Installs data fixtures for the application
+     * Installs data fixtures for the application.
      *
      * @return array|bool Array containing the flash message data on a failure, boolean true on success
      */
@@ -375,7 +367,7 @@ private function installDatabaseFixtures()
     }
 
     /**
-     * Create the administrator user
+     * Create the administrator user.
      *
      * @param array $data
      *
@@ -423,7 +415,7 @@ protected function validateDatabaseParams($form, $dbParams)
         $required = [
             'host',
             'name',
-            'user'
+            'user',
         ];
 
         foreach ($required as $r) {
@@ -455,7 +447,6 @@ protected function saveConfiguration($params, $step = null, $clearCache = false)
         try {
             $this->configurator->write();
         } catch (\RuntimeException $exception) {
-
             return false;
         }
 
diff --git a/app/bundles/InstallBundle/Helper/SchemaHelper.php b/app/bundles/InstallBundle/Helper/SchemaHelper.php
index 1260b85b9fa..19df7ec0e4a 100644
--- a/app/bundles/InstallBundle/Helper/SchemaHelper.php
+++ b/app/bundles/InstallBundle/Helper/SchemaHelper.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\InstallBundle\Helper;
 
-
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Schema\ForeignKeyConstraint;
+use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\SchemaTool;
-use Doctrine\DBAL\Schema\ForeignKeyConstraint;
-use Doctrine\DBAL\Schema\Index;
 
 class SchemaHelper
 {
@@ -77,7 +77,7 @@ public function setEntityManager(EntityManager $em)
     }
 
     /**
-     * Test db connection
+     * Test db connection.
      */
     public function testConnection()
     {
@@ -129,7 +129,6 @@ public function createDatabase()
                 $this->db                 = DriverManager::getConnection($this->dbParams);
                 $this->db->close();
             } catch (\Exception $e) {
-
                 return false;
             }
         }
@@ -138,11 +137,11 @@ public function createDatabase()
     }
 
     /**
-     * Generates SQL for installation
+     * Generates SQL for installation.
      *
      * @param object $originalData
      *
-     * @return array|boolean Array containing the flash message data on a failure, boolean true on success
+     * @return array|bool Array containing the flash message data on a failure, boolean true on success
      */
     public function installSchema()
     {
@@ -173,7 +172,7 @@ public function installSchema()
 
         foreach ($installSchema->getTables() as $m) {
             $tableName                = $m->getName();
-            $mauticTables[$tableName] = $this->generateBackupName($this->dbParams['table_prefix'], $backupPrefix, $tableName);;
+            $mauticTables[$tableName] = $this->generateBackupName($this->dbParams['table_prefix'], $backupPrefix, $tableName);
         }
 
         $sql = ['SET foreign_key_checks = 0;'];
@@ -208,12 +207,13 @@ public function installSchema()
      * @param $backupPrefix
      *
      * @return array
+     *
      * @throws \Doctrine\DBAL\DBALException
      */
     protected function backupExistingSchema($tables, $mauticTables, $backupPrefix)
     {
         $sql = [];
-        $sm = $this->db->getSchemaManager();
+        $sm  = $this->db->getSchemaManager();
 
         //backup existing tables
         $backupRestraints = $backupSequences = $backupIndexes = $backupTables = $dropSequences = $dropTables = [];
@@ -298,7 +298,7 @@ protected function backupExistingSchema($tables, $mauticTables, $backupPrefix)
                     $backupPrefix.$or->getName(),
                     $or->getOptions()
                 );
-                $sql[]            = $this->platform->getCreateForeignKeySQL($r, $table);
+                $sql[] = $this->platform->getCreateForeignKeySQL($r, $table);
             }
         }
 
@@ -335,11 +335,9 @@ protected function dropExistingSchema($tables, $mauticTables)
     protected function generateBackupName($prefix, $backupPrefix, $name)
     {
         if (empty($prefix) || strpos($name, $prefix) === false) {
-
             return $backupPrefix.$name;
         } else {
-
             return str_replace($prefix, $backupPrefix, $name);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/InstallBundle/InstallFixtures/ORM/LeadFieldData.php b/app/bundles/InstallBundle/InstallFixtures/ORM/LeadFieldData.php
index 77875125f94..5e72ed34509 100644
--- a/app/bundles/InstallBundle/InstallFixtures/ORM/LeadFieldData.php
+++ b/app/bundles/InstallBundle/InstallFixtures/ORM/LeadFieldData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,13 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Mautic\CoreBundle\Doctrine\Helper\ColumnSchemaHelper;
 use Mautic\CoreBundle\Doctrine\Helper\IndexSchemaHelper;
+use Mautic\LeadBundle\Entity\LeadField;
 use Mautic\LeadBundle\Model\FieldModel;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Mautic\LeadBundle\Entity\LeadField;
 
 /**
- * Class LeadFieldData
+ * Class LeadFieldData.
  */
 class LeadFieldData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
@@ -42,7 +43,7 @@ public function setContainer(ContainerInterface $container = null)
      */
     public function load(ObjectManager $manager)
     {
-        $fieldGroups['lead'] = FieldModel::$coreFields;
+        $fieldGroups['lead']    = FieldModel::$coreFields;
         $fieldGroups['company'] = FieldModel::$coreCompanyFields;
 
         $translator   = $this->container->get('translator');
@@ -83,7 +84,7 @@ public function load(ObjectManager $manager)
                 $indexesToAdd[$object][] = $alias;
 
                 $this->addReference('leadfield-'.$alias, $entity);
-                $order++;
+                ++$order;
             }
 
             $schema->executeChanges();
@@ -106,8 +107,7 @@ public function load(ObjectManager $manager)
             }
             if ($object == 'lead') {
                 // Add an attribution index
-                $indexHelper->addIndex(['attribution', 'attribution_date'], MAUTIC_TABLE_PREFIX . 'contact_attribution');
-
+                $indexHelper->addIndex(['attribution', 'attribution_date'], MAUTIC_TABLE_PREFIX.'contact_attribution');
             } else {
                 $indexHelper->addIndex(['companyname', 'companycity', 'companycountry', 'companystate'], MAUTIC_TABLE_PREFIX.'company_match');
             }
diff --git a/app/bundles/InstallBundle/InstallFixtures/ORM/LoadReportData.php b/app/bundles/InstallBundle/InstallFixtures/ORM/LoadReportData.php
index d3c19b53d28..7d5f73aa0f9 100644
--- a/app/bundles/InstallBundle/InstallFixtures/ORM/LoadReportData.php
+++ b/app/bundles/InstallBundle/InstallFixtures/ORM/LoadReportData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,11 +19,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadReportData
+ * Class LoadReportData.
  */
 class LoadReportData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -46,8 +46,8 @@ public function load(ObjectManager $manager)
             $report = new Report();
             $key    = $count + 1;
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set".ucfirst($col);
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
                     if (in_array($col, ['columns', 'filters', 'graphs', 'tableOrder'])) {
                         $val = unserialize(stripslashes($val));
                     }
diff --git a/app/bundles/InstallBundle/InstallFixtures/ORM/RoleData.php b/app/bundles/InstallBundle/InstallFixtures/ORM/RoleData.php
index 2eee38b52d2..0494bb22a0d 100644
--- a/app/bundles/InstallBundle/InstallFixtures/ORM/RoleData.php
+++ b/app/bundles/InstallBundle/InstallFixtures/ORM/RoleData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,16 +13,15 @@
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
+use Mautic\UserBundle\Entity\Role;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Mautic\UserBundle\Entity\Role;
 
 /**
- * Class RoleData
+ * Class RoleData.
  */
 class RoleData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
diff --git a/app/bundles/InstallBundle/MauticInstallBundle.php b/app/bundles/InstallBundle/MauticInstallBundle.php
index c84de00041d..887df18d35a 100644
--- a/app/bundles/InstallBundle/MauticInstallBundle.php
+++ b/app/bundles/InstallBundle/MauticInstallBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,9 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticInstallBundle
- *
- * @package Mautic\InstallBundle
+ * Class MauticInstallBundle.
  */
 class MauticInstallBundle extends Bundle
 {
diff --git a/app/bundles/InstallBundle/Views/Install/base.html.php b/app/bundles/InstallBundle/Views/Install/base.html.php
index d5a958a1d29..d29c00ab301 100644
--- a/app/bundles/InstallBundle/Views/Install/base.html.php
+++ b/app/bundles/InstallBundle/Views/Install/base.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['assets']->addScript('app/bundles/InstallBundle/Assets/install/install.js');
 ?>
 <!DOCTYPE html>
diff --git a/app/bundles/InstallBundle/Views/Install/check.html.php b/app/bundles/InstallBundle/Views/Install/check.html.php
index 11d8f9d6beb..d3bac32eed7 100644
--- a/app/bundles/InstallBundle/Views/Install/check.html.php
+++ b/app/bundles/InstallBundle/Views/Install/check.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -26,23 +27,23 @@
                 </h3>
             </div>
             <div class="panel-body alert-warning">
-                <p><?php echo $view['translator']->trans('mautic.install.sentence.major.problems', array('%majors%' => count($majors))); ?></p>
+                <p><?php echo $view['translator']->trans('mautic.install.sentence.major.problems', ['%majors%' => count($majors)]); ?></p>
             </div>
             <ul class="list-group">
                 <?php foreach ($majors as $message) : ?>
                     <?php switch ($message) :
                         case 'mautic.install.cache.unwritable': ?>
-                            <li class="list-group-item"><?php echo $view['translator']->trans('mautic.install.directory.unwritable', array('%path%' => $appRoot . '/cache')); ?></li>
+                            <li class="list-group-item"><?php echo $view['translator']->trans('mautic.install.directory.unwritable', ['%path%' => $appRoot.'/cache']); ?></li>
                             <?php break;
                         case 'mautic.install.config.unwritable': ?>
-                            <li class="list-group-item"><?php echo $view['translator']->trans($message, array('%path%' => $configFile)); ?></li>
+                            <li class="list-group-item"><?php echo $view['translator']->trans($message, ['%path%' => $configFile]); ?></li>
                             <?php break;
                         case 'mautic.install.logs.unwritable': ?>
-                            <li class="list-group-item"><?php echo $view['translator']->trans('mautic.install.directory.unwritable', array('%path%' => $appRoot . '/logs')); ?></li>
+                            <li class="list-group-item"><?php echo $view['translator']->trans('mautic.install.directory.unwritable', ['%path%' => $appRoot.'/logs']); ?></li>
                             <?php break;
                         case 'mautic.install.apc.version': ?>
                             <?php $minAPCverison = version_compare(PHP_VERSION, '5.4.0', '>=') ? '3.1.13' : '3.0.17'; ?>
-                            <li class="list-group-item"><?php echo $view['translator']->trans($message, array('%minapc%' => $minAPCverison, '%currentapc%' => phpversion('apc'))); ?></li>
+                            <li class="list-group-item"><?php echo $view['translator']->trans($message, ['%minapc%' => $minAPCverison, '%currentapc%' => phpversion('apc')]); ?></li>
                             <?php break;
                         default: ?>
                             <li class="list-group-item"><?php echo $view['translator']->trans($message); ?></li>
@@ -78,13 +79,13 @@
                     <?php foreach ($minors as $message) : ?>
                         <?php switch ($message) :
                             case 'mautic.install.pcre.version': ?>
-                                <li class="list-group-item"><?php echo $view['translator']->trans($message, array('%pcreversion%' => (float) PCRE_VERSION)); ?></li>
+                                <li class="list-group-item"><?php echo $view['translator']->trans($message, ['%pcreversion%' => (float) PCRE_VERSION]); ?></li>
                                 <?php break;
                             case 'mautic.install.php.version.not.supported': ?>
-                                <li class="list-group-item"><?php echo $view['translator']->trans($message, array('%phpversion%' => PHP_VERSION)); ?></li>
+                                <li class="list-group-item"><?php echo $view['translator']->trans($message, ['%phpversion%' => PHP_VERSION]); ?></li>
                                 <?php break;
                             case 'mautic.install.php.version.has.only.security.support': ?>
-                                <li class="list-group-item"><?php echo $view['translator']->trans($message, array('%phpversion%' => PHP_VERSION)); ?></li>
+                                <li class="list-group-item"><?php echo $view['translator']->trans($message, ['%phpversion%' => PHP_VERSION]); ?></li>
                                 <?php break;
                             default: ?>
                                 <li class="list-group-item"><?php echo $view['translator']->trans($message); ?></li>
diff --git a/app/bundles/InstallBundle/Views/Install/content.html.php b/app/bundles/InstallBundle/Views/Install/content.html.php
index 40d1c95af4a..130fc3e666c 100644
--- a/app/bundles/InstallBundle/Views/Install/content.html.php
+++ b/app/bundles/InstallBundle/Views/Install/content.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!$app->getRequest()->isXmlHttpRequest() && $view['slots']->get('contentOnly', false) === false) :
     //load base template
     $view->extend('MauticInstallBundle:Install:base.html.php');
diff --git a/app/bundles/InstallBundle/Views/Install/doctrine.html.php b/app/bundles/InstallBundle/Views/Install/doctrine.html.php
index e492a690793..b435f3bcf99 100644
--- a/app/bundles/InstallBundle/Views/Install/doctrine.html.php
+++ b/app/bundles/InstallBundle/Views/Install/doctrine.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -26,7 +27,9 @@
     <?php echo $view['form']->row($form['driver']); ?>
 
     <?php $driver = $form['driver']->vars['data']; ?>
-    <div id="DatabaseSettings"<?php if ($driver == 'pdo_sqlite') echo ' class="hide"'; ?>>
+    <div id="DatabaseSettings"<?php if ($driver == 'pdo_sqlite') {
+    echo ' class="hide"';
+} ?>>
         <div class="row">
             <div class="col-sm-6">
                 <?php echo $view['form']->row($form['host']); ?>
@@ -72,7 +75,7 @@
                     <strong><?php echo $view['translator']->trans('mautic.install.database.installing'); ?></strong>
                 </div>
             </div>
-            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', array('step' => $index, 'count' => $count, 'completedSteps' => $completedSteps)); ?>
+            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', ['step' => $index, 'count' => $count, 'completedSteps' => $completedSteps]); ?>
         </div>
         <div class="col-sm-3">
             <?php echo $view['form']->row($form['buttons']); ?>
diff --git a/app/bundles/InstallBundle/Views/Install/email.html.php b/app/bundles/InstallBundle/Views/Install/email.html.php
index 3009ba2112e..7639623b498 100644
--- a/app/bundles/InstallBundle/Views/Install/email.html.php
+++ b/app/bundles/InstallBundle/Views/Install/email.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -64,7 +65,7 @@
     <?php
     $authMode = $form['mailer_auth_mode']->vars['data'];
     $mailer   = $form['mailer_transport']->vars['data'];
-    $hide = (!in_array($mailer, array('mail', 'sendmail')) || ($mailer == 'smtp' && !empty($authMode))) ? '' : ' class="hide"';
+    $hide     = (!in_array($mailer, ['mail', 'sendmail']) || ($mailer == 'smtp' && !empty($authMode))) ? '' : ' class="hide"';
     ?>
     <div id="authDetails"<?php echo $hide; ?>>
         <div class="row">
@@ -78,7 +79,7 @@
     </div>
     <div class="row mt-20">
         <div class="col-sm-9">
-            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', array('step' => $index, 'count' => $count, 'completedSteps' => $completedSteps)); ?>
+            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', ['step' => $index, 'count' => $count, 'completedSteps' => $completedSteps]); ?>
         </div>
         <div class="col-sm-3">
             <?php echo $view['form']->row($form['buttons']); ?>
diff --git a/app/bundles/InstallBundle/Views/Install/final.html.php b/app/bundles/InstallBundle/Views/Install/final.html.php
index 22d88b2078a..8c5db471233 100644
--- a/app/bundles/InstallBundle/Views/Install/final.html.php
+++ b/app/bundles/InstallBundle/Views/Install/final.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
diff --git a/app/bundles/InstallBundle/Views/Install/misc.html.php b/app/bundles/InstallBundle/Views/Install/misc.html.php
index 0236aeed4bf..5a3358c0247 100644
--- a/app/bundles/InstallBundle/Views/Install/misc.html.php
+++ b/app/bundles/InstallBundle/Views/Install/misc.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -51,7 +52,7 @@
                     <strong><?php echo $view['translator']->trans('mautic.install.finalizing'); ?></strong>
                 </div>
             </div>
-            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', array('step' => $index, 'count' => $count, 'completedSteps' => $completedSteps)); ?>
+            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', ['step' => $index, 'count' => $count, 'completedSteps' => $completedSteps]); ?>
         </div>
         <div class="col-sm-3">
             <?php echo $view['form']->row($form['buttons']); ?>
diff --git a/app/bundles/InstallBundle/Views/Install/navbar.html.php b/app/bundles/InstallBundle/Views/Install/navbar.html.php
index 320fb3541dc..b38069b55c9 100644
--- a/app/bundles/InstallBundle/Views/Install/navbar.html.php
+++ b/app/bundles/InstallBundle/Views/Install/navbar.html.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $start = 1;
 ?>
 <div id="stepNavigation" class="hidden-xs">
     <ul class="horizontal-step">
         <?php while ($start < $count): ?>
         <li<?php echo ($start == $step) ? ' class="active"' : ''; ?>>
-            <?php $url = ($start == $step || in_array($start, $completedSteps) || in_array($start-1, $completedSteps)) ? $view['router']->path('mautic_installer_step', array('index' => $start)) : '#'; ?>
+            <?php $url = ($start == $step || in_array($start, $completedSteps) || in_array($start - 1, $completedSteps)) ? $view['router']->path('mautic_installer_step', ['index' => $start]) : '#'; ?>
             <a href="<?php echo $url; ?>" class="steps<?php echo ($url == '#') ? ' disabled' : ''; ?>">
                 <span class="steps-figure"><?php echo $view['translator']->trans('mautic.install.step.'.$start); ?></span>
             </a>
         </li>
-        <?php $start++; ?>
+        <?php ++$start; ?>
         <?php endwhile; ?>
     </ul>
     <div class="clearfix"></div>
diff --git a/app/bundles/InstallBundle/Views/Install/user.html.php b/app/bundles/InstallBundle/Views/Install/user.html.php
index d65bc7b3382..737a6abeef6 100644
--- a/app/bundles/InstallBundle/Views/Install/user.html.php
+++ b/app/bundles/InstallBundle/Views/Install/user.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -49,7 +50,7 @@
 
     <div class="row mt-20">
         <div class="col-sm-9">
-            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', array('step' => $index, 'count' => $count, 'completedSteps' => $completedSteps)); ?>
+            <?php echo $view->render('MauticInstallBundle:Install:navbar.html.php', ['step' => $index, 'count' => $count, 'completedSteps' => $completedSteps]); ?>
         </div>
         <div class="col-sm-3">
             <?php echo $view['form']->row($form['buttons']); ?>
diff --git a/app/bundles/LeadBundle/Command/UpdateLeadListsCommand.php b/app/bundles/LeadBundle/Command/UpdateLeadListsCommand.php
index d8fd0f64a7c..2825fba183a 100644
--- a/app/bundles/LeadBundle/Command/UpdateLeadListsCommand.php
+++ b/app/bundles/LeadBundle/Command/UpdateLeadListsCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -49,37 +50,36 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $max   = $input->getOption('max-contacts');
 
         if (!$this->checkRunStatus($input, $output, ($id) ? $id : 'all')) {
-
             return 0;
         }
 
         if ($id) {
             $list = $listModel->getEntity($id);
             if ($list !== null) {
-                $output->writeln('<info>'.$translator->trans('mautic.lead.list.rebuild.rebuilding', array('%id%' => $id)).'</info>');
+                $output->writeln('<info>'.$translator->trans('mautic.lead.list.rebuild.rebuilding', ['%id%' => $id]).'</info>');
                 $processed = $listModel->rebuildListLeads($list, $batch, $max, $output);
                 $output->writeln(
-                    '<comment>'.$translator->trans('mautic.lead.list.rebuild.leads_affected', array('%leads%' => $processed)).'</comment>'
+                    '<comment>'.$translator->trans('mautic.lead.list.rebuild.leads_affected', ['%leads%' => $processed]).'</comment>'
                 );
             } else {
-                $output->writeln('<error>'.$translator->trans('mautic.lead.list.rebuild.not_found', array('%id%' => $id)).'</error>');
+                $output->writeln('<error>'.$translator->trans('mautic.lead.list.rebuild.not_found', ['%id%' => $id]).'</error>');
             }
         } else {
             $lists = $listModel->getEntities(
-                array(
-                    'iterator_mode' => true
-                )
+                [
+                    'iterator_mode' => true,
+                ]
             );
 
             while (($l = $lists->next()) !== false) {
                 // Get first item; using reset as the key will be the ID and not 0
                 $l = reset($l);
 
-                $output->writeln('<info>'.$translator->trans('mautic.lead.list.rebuild.rebuilding', array('%id%' => $l->getId())).'</info>');
+                $output->writeln('<info>'.$translator->trans('mautic.lead.list.rebuild.rebuilding', ['%id%' => $l->getId()]).'</info>');
 
                 $processed = $listModel->rebuildListLeads($l, $batch, $max, $output);
                 $output->writeln(
-                    '<comment>'.$translator->trans('mautic.lead.list.rebuild.leads_affected', array('%leads%' => $processed)).'</comment>'."\n"
+                    '<comment>'.$translator->trans('mautic.lead.list.rebuild.leads_affected', ['%leads%' => $processed]).'</comment>'."\n"
                 );
 
                 unset($l);
@@ -92,4 +92,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Config/config.php b/app/bundles/LeadBundle/Config/config.php
index c6660ffe983..229c9d2fef4 100644
--- a/app/bundles/LeadBundle/Config/config.php
+++ b/app/bundles/LeadBundle/Config/config.php
@@ -1,167 +1,168 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
-    'routes'   => [
+    'routes' => [
         'main' => [
             'mautic_contact_emailtoken_index' => [
                 'path'       => '/contacts/emailtokens/{page}',
-                'controller' => 'MauticLeadBundle:SubscribedEvents\BuilderToken:index'
+                'controller' => 'MauticLeadBundle:SubscribedEvents\BuilderToken:index',
             ],
-            'mautic_segment_index'        => [
+            'mautic_segment_index' => [
                 'path'       => '/segments/{page}',
-                'controller' => 'MauticLeadBundle:List:index'
+                'controller' => 'MauticLeadBundle:List:index',
             ],
-            'mautic_segment_action'       => [
+            'mautic_segment_action' => [
                 'path'       => '/segments/{objectAction}/{objectId}',
-                'controller' => 'MauticLeadBundle:List:execute'
+                'controller' => 'MauticLeadBundle:List:execute',
             ],
-            'mautic_contactfield_index'       => [
+            'mautic_contactfield_index' => [
                 'path'       => '/contacts/fields/{page}',
-                'controller' => 'MauticLeadBundle:Field:index'
+                'controller' => 'MauticLeadBundle:Field:index',
             ],
-            'mautic_contactfield_action'      => [
+            'mautic_contactfield_action' => [
                 'path'       => '/contacts/fields/{objectAction}/{objectId}',
-                'controller' => 'MauticLeadBundle:Field:execute'
+                'controller' => 'MauticLeadBundle:Field:execute',
             ],
-            'mautic_contact_index'            => [
+            'mautic_contact_index' => [
                 'path'       => '/contacts/{page}',
-                'controller' => 'MauticLeadBundle:Lead:index'
+                'controller' => 'MauticLeadBundle:Lead:index',
             ],
-            'mautic_contactnote_index'        => [
-                'path'         => '/contacts/notes/{leadId}/{page}',
-                'controller'   => 'MauticLeadBundle:Note:index',
-                'defaults'     => [
-                    'leadId' => 0
+            'mautic_contactnote_index' => [
+                'path'       => '/contacts/notes/{leadId}/{page}',
+                'controller' => 'MauticLeadBundle:Note:index',
+                'defaults'   => [
+                    'leadId' => 0,
                 ],
                 'requirements' => [
-                    'leadId' => '\d+'
-                ]
+                    'leadId' => '\d+',
+                ],
             ],
-            'mautic_contactnote_action'       => [
+            'mautic_contactnote_action' => [
                 'path'         => '/contacts/notes/{leadId}/{objectAction}/{objectId}',
                 'controller'   => 'MauticLeadBundle:Note:executeNote',
                 'requirements' => [
-                    'leadId' => '\d+'
-                ]
+                    'leadId' => '\d+',
+                ],
             ],
-            'mautic_contacttimeline_action'       => [
+            'mautic_contacttimeline_action' => [
                 'path'         => '/contacts/timeline/{leadId}/{page}',
                 'controller'   => 'MauticLeadBundle:Timeline:index',
                 'requirements' => [
-                    'leadId' => '\d+'
-                ]
+                    'leadId' => '\d+',
+                ],
             ],
-            'mautic_contact_action'           => [
+            'mautic_contact_action' => [
                 'path'       => '/contacts/{objectAction}/{objectId}',
-                'controller' => 'MauticLeadBundle:Lead:execute'
+                'controller' => 'MauticLeadBundle:Lead:execute',
             ],
-            'mautic_company_index'              => [
+            'mautic_company_index' => [
                 'path'       => '/companies/{page}',
-                'controller' => 'MauticLeadBundle:Company:index'
+                'controller' => 'MauticLeadBundle:Company:index',
             ],
-            'mautic_company_action'             => [
+            'mautic_company_action' => [
                 'path'       => '/companies/{objectAction}/{objectId}',
-                'controller' => 'MauticLeadBundle:Company:execute'
-            ]
+                'controller' => 'MauticLeadBundle:Company:execute',
+            ],
         ],
-        'api'  => [
-            'mautic_api_getcontacts'          => [
+        'api' => [
+            'mautic_api_getcontacts' => [
                 'path'       => '/contacts',
-                'controller' => 'MauticLeadBundle:Api\LeadApi:getEntities'
+                'controller' => 'MauticLeadBundle:Api\LeadApi:getEntities',
             ],
-            'mautic_api_newcontact'           => [
+            'mautic_api_newcontact' => [
                 'path'       => '/contacts/new',
                 'controller' => 'MauticLeadBundle:Api\LeadApi:newEntity',
-                'method'     => 'POST'
+                'method'     => 'POST',
             ],
-            'mautic_api_getcontact'           => [
+            'mautic_api_getcontact' => [
                 'path'       => '/contacts/{id}',
-                'controller' => 'MauticLeadBundle:Api\LeadApi:getEntity'
+                'controller' => 'MauticLeadBundle:Api\LeadApi:getEntity',
             ],
-            'mautic_api_editputcontact'       => [
+            'mautic_api_editputcontact' => [
                 'path'       => '/contacts/{id}/edit',
                 'controller' => 'MauticLeadBundle:Api\LeadApi:editEntity',
-                'method'     => 'PUT'
+                'method'     => 'PUT',
             ],
-            'mautic_api_editpatchcontact'     => [
+            'mautic_api_editpatchcontact' => [
                 'path'       => '/contacts/{id}/edit',
                 'controller' => 'MauticLeadBundle:Api\LeadApi:editEntity',
-                'method'     => 'PATCH'
+                'method'     => 'PATCH',
             ],
-            'mautic_api_deletecontact'        => [
+            'mautic_api_deletecontact' => [
                 'path'       => '/contacts/{id}/delete',
                 'controller' => 'MauticLeadBundle:Api\LeadApi:deleteEntity',
-                'method'     => 'DELETE'
+                'method'     => 'DELETE',
             ],
-            'mautic_api_getcontactnotes'     => [
+            'mautic_api_getcontactnotes' => [
                 'path'       => '/contacts/{id}/notes',
-                'controller' => 'MauticLeadBundle:Api\LeadApi:getNotes'
+                'controller' => 'MauticLeadBundle:Api\LeadApi:getNotes',
             ],
             'mautic_api_getcontactcampaigns' => [
                 'path'       => '/contacts/{id}/campaigns',
-                'controller' => 'MauticLeadBundle:Api\LeadApi:getCampaigns'
+                'controller' => 'MauticLeadBundle:Api\LeadApi:getCampaigns',
             ],
-            'mautic_api_getcontactssegments'     => [
+            'mautic_api_getcontactssegments' => [
                 'path'       => '/contacts/{id}/segments',
-                'controller' => 'MauticLeadBundle:Api\LeadApi:getLists'
+                'controller' => 'MauticLeadBundle:Api\LeadApi:getLists',
             ],
-            'mautic_api_getcontactowners'     => [
+            'mautic_api_getcontactowners' => [
                 'path'       => '/contacts/list/owners',
-                'controller' => 'MauticLeadBundle:Api\LeadApi:getOwners'
+                'controller' => 'MauticLeadBundle:Api\LeadApi:getOwners',
             ],
-            'mautic_api_getcontactfields'     => [
+            'mautic_api_getcontactfields' => [
                 'path'       => '/contacts/list/fields',
-                'controller' => 'MauticLeadBundle:Api\LeadApi:getFields'
+                'controller' => 'MauticLeadBundle:Api\LeadApi:getFields',
             ],
-            'mautic_api_getcontactsegments'      => [
+            'mautic_api_getcontactsegments' => [
                 'path'       => '/contacts/list/segments',
-                'controller' => 'MauticLeadBundle:Api\ListApi:getLists'
+                'controller' => 'MauticLeadBundle:Api\ListApi:getLists',
             ],
-            'mautic_api_getsegments'          => [
+            'mautic_api_getsegments' => [
                 'path'       => '/segments',
-                'controller' => 'MauticLeadBundle:Api\ListApi:getLists'
+                'controller' => 'MauticLeadBundle:Api\ListApi:getLists',
             ],
-            'mautic_api_segmentaddcontact'       => [
+            'mautic_api_segmentaddcontact' => [
                 'path'       => '/segments/{id}/contact/add/{leadId}',
                 'controller' => 'MauticLeadBundle:Api\ListApi:addLead',
-                'method'     => 'POST'
+                'method'     => 'POST',
             ],
-            'mautic_api_segmentremovecontact'    => [
+            'mautic_api_segmentremovecontact' => [
                 'path'       => '/segments/{id}/contact/remove/{leadId}',
                 'controller' => 'MauticLeadBundle:Api\ListApi:removeLead',
-                'method'     => 'POST'
-            ]
-        ]
+                'method'     => 'POST',
+            ],
+        ],
     ],
-    'menu'     => [
+    'menu' => [
         'main' => [
-            'items'    => [
+            'items' => [
                 'mautic.lead.leads' => [
                     'iconClass' => 'fa-user',
                     'access'    => ['lead:leads:viewown', 'lead:leads:viewother'],
-                    'route' => 'mautic_contact_index',
-                    'priority' => 80
+                    'route'     => 'mautic_contact_index',
+                    'priority'  => 80,
                 ],
                 'mautic.companies.menu.index' => [
-                    'route'  => 'mautic_company_index',
+                    'route'     => 'mautic_company_index',
                     'iconClass' => 'fa-building-o',
                     'access'    => ['lead:leads:viewother'],
-                    'priority'  => 75
+                    'priority'  => 75,
                 ],
-                'mautic.lead.list.menu.index'  => [
+                'mautic.lead.list.menu.index' => [
                     'iconClass' => 'fa-pie-chart',
                     'access'    => ['lead:leads:viewown', 'lead:leads:viewother'],
-                    'route' => 'mautic_segment_index',
-                    'priority' => 70
-                ]
-            ]
+                    'route'     => 'mautic_segment_index',
+                    'priority'  => 70,
+                ],
+            ],
         ],
         'admin' => [
             'priority' => 50,
@@ -169,39 +170,39 @@
                 'mautic.lead.field.menu.index' => [
                     'id'        => 'mautic_lead_field',
                     'iconClass' => 'fa-list',
-                    'route'  => 'mautic_contactfield_index',
-                    'access' => 'lead:fields:full'
-                ]
-            ]
-        ]
+                    'route'     => 'mautic_contactfield_index',
+                    'access'    => 'lead:fields:full',
+                ],
+            ],
+        ],
     ],
     'services' => [
-        'events'  => [
-            'mautic.lead.subscriber'                => [
+        'events' => [
+            'mautic.lead.subscriber' => [
                 'class'     => 'Mautic\LeadBundle\EventListener\LeadSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
+                    'mautic.core.model.auditlog',
                 ],
                 'methodCalls' => [
-                    'setModelFactory' => ['mautic.model.factory']
-                ]
+                    'setModelFactory' => ['mautic.model.factory'],
+                ],
             ],
-            'mautic.lead.emailbundle.subscriber'    => [
-                'class' => 'Mautic\LeadBundle\EventListener\EmailSubscriber'
+            'mautic.lead.emailbundle.subscriber' => [
+                'class' => 'Mautic\LeadBundle\EventListener\EmailSubscriber',
             ],
-            'mautic.lead.formbundle.subscriber'     => [
-                'class' => 'Mautic\LeadBundle\EventListener\FormSubscriber'
+            'mautic.lead.formbundle.subscriber' => [
+                'class' => 'Mautic\LeadBundle\EventListener\FormSubscriber',
             ],
             'mautic.lead.campaignbundle.subscriber' => [
-                'class' => 'Mautic\LeadBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\LeadBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.lead.model.lead',
-                    'mautic.lead.model.field'
-                ]
+                    'mautic.lead.model.field',
+                ],
             ],
-            'mautic.lead.reportbundle.subscriber'   => [
+            'mautic.lead.reportbundle.subscriber' => [
                 'class'     => 'Mautic\LeadBundle\EventListener\ReportSubscriber',
                 'arguments' => [
                     'mautic.lead.model.list',
@@ -209,218 +210,218 @@
                     'mautic.lead.model.lead',
                     'mautic.stage.model.stage',
                     'mautic.campaign.model.campaign',
-                    'mautic.user.model.user'
-                ]
+                    'mautic.user.model.user',
+                ],
             ],
             'mautic.lead.calendarbundle.subscriber' => [
-                'class' => 'Mautic\LeadBundle\EventListener\CalendarSubscriber'
+                'class' => 'Mautic\LeadBundle\EventListener\CalendarSubscriber',
             ],
-            'mautic.lead.pointbundle.subscriber'    => [
-                'class' => 'Mautic\LeadBundle\EventListener\PointSubscriber'
+            'mautic.lead.pointbundle.subscriber' => [
+                'class' => 'Mautic\LeadBundle\EventListener\PointSubscriber',
             ],
-            'mautic.lead.search.subscriber'         => [
-                'class' => 'Mautic\LeadBundle\EventListener\SearchSubscriber',
+            'mautic.lead.search.subscriber' => [
+                'class'     => 'Mautic\LeadBundle\EventListener\SearchSubscriber',
                 'arguments' => [
-                    'mautic.lead.model.lead'
-                ]
+                    'mautic.lead.model.lead',
+                ],
             ],
-            'mautic.webhook.subscriber'             => [
-                'class' => 'Mautic\LeadBundle\EventListener\WebhookSubscriber'
+            'mautic.webhook.subscriber' => [
+                'class' => 'Mautic\LeadBundle\EventListener\WebhookSubscriber',
             ],
-            'mautic.lead.dashboard.subscriber'      => [
-                'class' => 'Mautic\LeadBundle\EventListener\DashboardSubscriber',
+            'mautic.lead.dashboard.subscriber' => [
+                'class'     => 'Mautic\LeadBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
                     'mautic.lead.model.lead',
-                    'mautic.lead.model.list'
-                ]
+                    'mautic.lead.model.list',
+                ],
             ],
-            'mautic.lead.maintenance.subscriber'    => [
-                'class' => 'Mautic\LeadBundle\EventListener\MaintenanceSubscriber',
+            'mautic.lead.maintenance.subscriber' => [
+                'class'     => 'Mautic\LeadBundle\EventListener\MaintenanceSubscriber',
                 'arguments' => [
-                    'doctrine.dbal.default_connection'
-                ]
+                    'doctrine.dbal.default_connection',
+                ],
             ],
         ],
-        'forms'   => [
-            'mautic.form.type.lead'                           => [
+        'forms' => [
+            'mautic.form.type.lead' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\LeadType',
-                'arguments' => ['mautic.factory','mautic.lead.model.company'],
-                'alias'     => 'lead'
+                'arguments' => ['mautic.factory', 'mautic.lead.model.company'],
+                'alias'     => 'lead',
             ],
-            'mautic.form.type.leadlist'                       => [
+            'mautic.form.type.leadlist' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\ListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'leadlist'
+                'alias'     => 'leadlist',
             ],
-            'mautic.form.type.leadlist_choices'               => [
+            'mautic.form.type.leadlist_choices' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\LeadListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'leadlist_choices'
+                'alias'     => 'leadlist_choices',
             ],
-            'mautic.form.type.leadlist_filter'               => [
+            'mautic.form.type.leadlist_filter' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\FilterType',
                 'alias'     => 'leadlist_filter',
                 'arguments' => 'mautic.factory',
             ],
-            'mautic.form.type.leadfield'                      => [
+            'mautic.form.type.leadfield' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\FieldType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'leadfield'
+                'alias'     => 'leadfield',
             ],
             'mautic.form.type.lead.submitaction.pointschange' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\FormSubmitActionPointsChangeType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'lead_submitaction_pointschange'
+                'alias'     => 'lead_submitaction_pointschange',
             ],
             'mautic.form.type.lead.submitaction.addutmtags' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\ActionAddUtmTagsType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'lead_action_addutmtags'
+                'alias'     => 'lead_action_addutmtags',
             ],
-            'mautic.form.type.lead.submitaction.changelist'   => [
+            'mautic.form.type.lead.submitaction.changelist' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\EventListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'leadlist_action_type'
+                'alias'     => 'leadlist_action_type',
             ],
-            'mautic.form.type.leadpoints_trigger'             => [
+            'mautic.form.type.leadpoints_trigger' => [
                 'class' => 'Mautic\LeadBundle\Form\Type\PointTriggerType',
-                'alias' => 'leadpoints_trigger'
+                'alias' => 'leadpoints_trigger',
             ],
-            'mautic.form.type.leadpoints_action'              => [
+            'mautic.form.type.leadpoints_action' => [
                 'class' => 'Mautic\LeadBundle\Form\Type\PointActionType',
-                'alias' => 'leadpoints_action'
+                'alias' => 'leadpoints_action',
             ],
-            'mautic.form.type.leadlist_trigger'               => [
+            'mautic.form.type.leadlist_trigger' => [
                 'class' => 'Mautic\LeadBundle\Form\Type\ListTriggerType',
-                'alias' => 'leadlist_trigger'
+                'alias' => 'leadlist_trigger',
             ],
-            'mautic.form.type.leadlist_action'                => [
+            'mautic.form.type.leadlist_action' => [
                 'class' => 'Mautic\LeadBundle\Form\Type\ListActionType',
-                'alias' => 'leadlist_action'
+                'alias' => 'leadlist_action',
             ],
-            'mautic.form.type.updatelead_action'              => [
+            'mautic.form.type.updatelead_action' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\UpdateLeadActionType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'updatelead_action'
+                'alias'     => 'updatelead_action',
             ],
-            'mautic.form.type.leadnote'                       => [
+            'mautic.form.type.leadnote' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\NoteType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'leadnote'
+                'alias'     => 'leadnote',
             ],
-            'mautic.form.type.lead_import'                    => [
+            'mautic.form.type.lead_import' => [
                 'class' => 'Mautic\LeadBundle\Form\Type\LeadImportType',
-                'alias' => 'lead_import'
+                'alias' => 'lead_import',
             ],
-            'mautic.form.type.lead_field_import'              => [
+            'mautic.form.type.lead_field_import' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\LeadImportFieldType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'lead_field_import'
+                'alias'     => 'lead_field_import',
             ],
-            'mautic.form.type.lead_quickemail'                => [
+            'mautic.form.type.lead_quickemail' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\EmailType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'lead_quickemail'
+                'alias'     => 'lead_quickemail',
             ],
-            'mautic.form.type.lead_tags'                      => [
+            'mautic.form.type.lead_tags' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\TagListType',
                 'alias'     => 'lead_tags',
-                'arguments' => 'mautic.factory'
+                'arguments' => 'mautic.factory',
             ],
-            'mautic.form.type.lead_tag'                       => [
+            'mautic.form.type.lead_tag' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\TagType',
                 'alias'     => 'lead_tag',
-                'arguments' => 'mautic.factory'
+                'arguments' => 'mautic.factory',
             ],
-            'mautic.form.type.modify_lead_tags'               => [
+            'mautic.form.type.modify_lead_tags' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\ModifyLeadTagsType',
                 'alias'     => 'modify_lead_tags',
-                'arguments' => 'mautic.factory'
+                'arguments' => 'mautic.factory',
             ],
-            'mautic.form.type.lead_batch'               => [
-                'class'     => 'Mautic\LeadBundle\Form\Type\BatchType',
-                'alias'     => 'lead_batch'
+            'mautic.form.type.lead_batch' => [
+                'class' => 'Mautic\LeadBundle\Form\Type\BatchType',
+                'alias' => 'lead_batch',
             ],
-            'mautic.form.type.lead_batch_dnc'               => [
-                'class'     => 'Mautic\LeadBundle\Form\Type\DncType',
-                'alias'     => 'lead_batch_dnc'
+            'mautic.form.type.lead_batch_dnc' => [
+                'class' => 'Mautic\LeadBundle\Form\Type\DncType',
+                'alias' => 'lead_batch_dnc',
             ],
-            'mautic.form.type.lead_batch_stage'               => [
-                'class'     => 'Mautic\LeadBundle\Form\Type\StageType',
-                'alias'     => 'lead_batch_stage'
+            'mautic.form.type.lead_batch_stage' => [
+                'class' => 'Mautic\LeadBundle\Form\Type\StageType',
+                'alias' => 'lead_batch_stage',
             ],
-            'mautic.form.type.lead_merge'               => [
-                'class'     => 'Mautic\LeadBundle\Form\Type\MergeType',
-                'alias'     => 'lead_merge'
+            'mautic.form.type.lead_merge' => [
+                'class' => 'Mautic\LeadBundle\Form\Type\MergeType',
+                'alias' => 'lead_merge',
             ],
-            'mautic.form.type.lead_contact_frequency_rules'               => [
-                'class'     => 'Mautic\LeadBundle\Form\Type\ContactFrequencyType',
-                'alias'     => 'lead_contact_frequency_rules'
+            'mautic.form.type.lead_contact_frequency_rules' => [
+                'class' => 'Mautic\LeadBundle\Form\Type\ContactFrequencyType',
+                'alias' => 'lead_contact_frequency_rules',
             ],
-            'mautic.form.type.campaignevent_lead_field_value'  => [
+            'mautic.form.type.campaignevent_lead_field_value' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\CampaignEventLeadFieldValueType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'campaignevent_lead_field_value'
+                'alias'     => 'campaignevent_lead_field_value',
             ],
-            'mautic.form.type.lead_fields'  => [
+            'mautic.form.type.lead_fields' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\LeadFieldsType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'leadfields_choices'
+                'alias'     => 'leadfields_choices',
             ],
-            'mautic.form.type.lead_dashboard_leads_in_time_widget'  => [
-                'class'     => 'Mautic\LeadBundle\Form\Type\DashboardLeadsInTimeWidgetType',
-                'alias'     => 'lead_dashboard_leads_in_time_widget'
+            'mautic.form.type.lead_dashboard_leads_in_time_widget' => [
+                'class' => 'Mautic\LeadBundle\Form\Type\DashboardLeadsInTimeWidgetType',
+                'alias' => 'lead_dashboard_leads_in_time_widget',
             ],
-            'mautic.form.type.lead_dashboard_leads_lifetime_widget'  => [
+            'mautic.form.type.lead_dashboard_leads_lifetime_widget' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\DashboardLeadsLifetimeWidgetType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'lead_dashboard_leads_lifetime_widget'
+                'alias'     => 'lead_dashboard_leads_lifetime_widget',
             ],
-            'mautic.company.type.form'                  => [
+            'mautic.company.type.form' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\CompanyType',
-                'arguments' => ['doctrine.orm.entity_manager','mautic.security'],
-                'alias'     => 'company'
+                'arguments' => ['doctrine.orm.entity_manager', 'mautic.security'],
+                'alias'     => 'company',
             ],
-            'mautic.company.campaign.action.type.form'                  => [
+            'mautic.company.campaign.action.type.form' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\AddToCompanyActionType',
                 'arguments' => 'router',
-                'alias'     => 'addtocompany_action'
+                'alias'     => 'addtocompany_action',
             ],
-            'mautic.company.list.type.form'                  => [
+            'mautic.company.list.type.form' => [
                 'class'     => 'Mautic\LeadBundle\Form\Type\CompanyListType',
                 'arguments' => ['mautic.lead.model.company',  'mautic.helper.user'],
-                'alias'     => 'company_list'
-            ]
+                'alias'     => 'company_list',
+            ],
         ],
-        'other'   => [
-            'mautic.lead.doctrine.subscriber'       => [
+        'other' => [
+            'mautic.lead.doctrine.subscriber' => [
                 'class'     => 'Mautic\LeadBundle\EventListener\DoctrineSubscriber',
                 'tag'       => 'doctrine.event_subscriber',
-                'arguments' => 'monolog.logger.mautic'
+                'arguments' => 'monolog.logger.mautic',
             ],
             'mautic.validator.leadlistaccess' => [
                 'class'     => 'Mautic\LeadBundle\Form\Validator\Constraints\LeadListAccessValidator',
                 'arguments' => 'mautic.factory',
                 'tag'       => 'validator.constraint_validator',
-                'alias'     => 'leadlist_access'
+                'alias'     => 'leadlist_access',
             ],
-            'mautic.lead.constraint.alias'    => [
+            'mautic.lead.constraint.alias' => [
                 'class'     => 'Mautic\LeadBundle\Form\Validator\Constraints\UniqueUserAliasValidator',
                 'arguments' => 'mautic.factory',
                 'tag'       => 'validator.constraint_validator',
-                'alias'     => 'uniqueleadlist'
-            ]
+                'alias'     => 'uniqueleadlist',
+            ],
         ],
         'helpers' => [
             'mautic.helper.template.avatar' => [
                 'class'     => 'Mautic\LeadBundle\Templating\Helper\AvatarHelper',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'lead_avatar'
-            ]
+                'alias'     => 'lead_avatar',
+            ],
         ],
-        'models' =>  [
+        'models' => [
             'mautic.lead.model.lead' => [
-                'class' => 'Mautic\LeadBundle\Model\LeadModel',
+                'class'     => 'Mautic\LeadBundle\Model\LeadModel',
                 'arguments' => [
                     'request_stack',
                     'mautic.helper.cookie',
@@ -430,31 +431,31 @@
                     'mautic.lead.model.field',
                     'mautic.lead.model.list',
                     'form.factory',
-                    'mautic.lead.model.company'
-                ]
+                    'mautic.lead.model.company',
+                ],
             ],
             'mautic.lead.model.field' => [
-                'class' => 'Mautic\LeadBundle\Model\FieldModel',
+                'class'     => 'Mautic\LeadBundle\Model\FieldModel',
                 'arguments' => [
-                    'mautic.schema.helper.factory'
-                ]
+                    'mautic.schema.helper.factory',
+                ],
             ],
             'mautic.lead.model.list' => [
-                'class' => 'Mautic\LeadBundle\Model\ListModel',
+                'class'     => 'Mautic\LeadBundle\Model\ListModel',
                 'arguments' => [
-                    'mautic.helper.core_parameters'
-                ]
+                    'mautic.helper.core_parameters',
+                ],
             ],
             'mautic.lead.model.note' => [
-                'class' => 'Mautic\LeadBundle\Model\NoteModel'
+                'class' => 'Mautic\LeadBundle\Model\NoteModel',
             ],
             'mautic.lead.model.company' => [
-                'class' => 'Mautic\LeadBundle\Model\CompanyModel',
+                'class'     => 'Mautic\LeadBundle\Model\CompanyModel',
                 'arguments' => [
                     'mautic.lead.model.field',
-                    'session'
-                ]
-            ]
-        ]
-    ]
+                    'session',
+                ],
+            ],
+        ],
+    ],
 ];
diff --git a/app/bundles/LeadBundle/Controller/AjaxController.php b/app/bundles/LeadBundle/Controller/AjaxController.php
index 2e50121ae17..38d3f0993d3 100644
--- a/app/bundles/LeadBundle/Controller/AjaxController.php
+++ b/app/bundles/LeadBundle/Controller/AjaxController.php
@@ -1,32 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Controller;
 
+use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
+use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\LeadBundle\Entity\Tag;
 use Mautic\LeadBundle\Entity\UtmTag;
+use Mautic\LeadBundle\Event\LeadTimelineEvent;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
 use Mautic\LeadBundle\LeadEvents;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
-use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
-use Mautic\CoreBundle\Helper\InputHelper;
 use Symfony\Component\HttpFoundation\Request;
-use Mautic\LeadBundle\Event\LeadTimelineEvent;
 
 /**
- * Class AjaxController
- *
- * @package Mautic\LeadBundle\Controller
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
-
     /**
      * @param Request $request
      *
@@ -40,8 +38,8 @@ protected function userListAction(Request $request)
         foreach ($results as $r) {
             $name        = $r['firstName'].' '.$r['lastName'];
             $dataArray[] = [
-                "label" => $name,
-                "value" => $r['id']
+                'label' => $name,
+                'value' => $r['id'],
             ];
         }
 
@@ -61,8 +59,8 @@ protected function getLeadIdsByFieldValueAction(Request $request)
         $dataArray = ['items' => []];
 
         if ($field && $value) {
-            $repo        = $this->getModel('lead.lead')->getRepository();
-            $leads       = $repo->getLeadsByFieldValue($field, $value, $ignore);
+            $repo                       = $this->getModel('lead.lead')->getRepository();
+            $leads                      = $repo->getLeadsByFieldValue($field, $value, $ignore);
             $dataArray['existsMessage'] = $this->translator->trans('mautic.lead.exists.by.field').': ';
 
             foreach ($leads as $lead) {
@@ -83,12 +81,11 @@ protected function getLeadIdsByFieldValueAction(Request $request)
                 $dataArray['items'][] = [
                     'name' => $name,
                     'id'   => $lead->getId(),
-                    'link' => $leadLink
+                    'link' => $leadLink,
                 ];
             }
         }
 
-
         return $this->sendJsonResponse($dataArray);
     }
 
@@ -135,7 +132,7 @@ protected function fieldListAction(Request $request)
     }
 
     /**
-     * Updates the cache and gets returns updated HTML
+     * Updates the cache and gets returns updated HTML.
      *
      * @param Request $request
      *
@@ -166,10 +163,10 @@ protected function updateSocialProfileAction(Request $request)
                         [
                             'socialProfiles'    => $socialProfiles,
                             'lead'              => $lead,
-                            'socialProfileUrls' => $socialProfileUrls
+                            'socialProfileUrls' => $socialProfileUrls,
                         ]
                     );
-                    $dataArray['socialCount']     = $socialCount;
+                    $dataArray['socialCount'] = $socialCount;
                 } else {
                     foreach ($socialProfiles as $name => $details) {
                         if ($integrationObject = $integrationHelper->getIntegrationObject($name)) {
@@ -180,7 +177,7 @@ protected function updateSocialProfileAction(Request $request)
                                         'lead'              => $lead,
                                         'details'           => $details,
                                         'integrationName'   => $name,
-                                        'socialProfileUrls' => $socialProfileUrls
+                                        'socialProfileUrls' => $socialProfileUrls,
                                     ]
                                 );
                             }
@@ -197,7 +194,7 @@ protected function updateSocialProfileAction(Request $request)
     }
 
     /**
-     * Clears the cache for a network
+     * Clears the cache for a network.
      *
      * @param Request $request
      *
@@ -227,7 +224,7 @@ protected function clearSocialProfileAction(Request $request)
                         [
                             'socialProfiles'    => $socialProfiles,
                             'lead'              => $lead,
-                            'socialProfileUrls' => $helper->getSocialProfileUrlRegex(false)
+                            'socialProfileUrls' => $helper->getSocialProfileUrlRegex(false),
                         ]
                     );
                 }
@@ -240,7 +237,7 @@ protected function clearSocialProfileAction(Request $request)
     }
 
     /**
-     * Updates the timeline events and gets returns updated HTML
+     * Updates the timeline events and gets returns updated HTML.
      *
      * @param Request $request
      *
@@ -260,13 +257,12 @@ protected function updateTimelineAction(Request $request)
             $lead  = $model->getEntity($leadId);
 
             if ($lead !== null) {
-
                 $session = $this->get('session');
 
                 $filter = [
                     'search'        => $search,
                     'includeEvents' => $includeEvents,
-                    'excludeEvents' => $excludeEvents
+                    'excludeEvents' => $excludeEvents,
                 ];
 
                 $session->set('mautic.lead.'.$leadId.'.timeline.filters', $filter);
@@ -285,7 +281,7 @@ protected function updateTimelineAction(Request $request)
                         'events'       => $events,
                         'eventTypes'   => $eventTypes,
                         'eventFilters' => $filter,
-                        'lead'         => $lead
+                        'lead'         => $lead,
                     ]
                 );
 
@@ -365,14 +361,14 @@ protected function toggleCompanyLeadAction(Request $request)
     {
         $dataArray = ['success' => 0];
         $leadId    = InputHelper::int($request->request->get('leadId'));
-        $companyId    = InputHelper::int($request->request->get('companyId'));
+        $companyId = InputHelper::int($request->request->get('companyId'));
         $action    = InputHelper::clean($request->request->get('companyAction'));
 
         if (!empty($leadId) && !empty($companyId) && in_array($action, ['remove', 'add'])) {
-            $leadModel = $this->getModel('lead');
+            $leadModel    = $this->getModel('lead');
             $companyModel = $this->getModel('lead.company');
 
-            $lead = $leadModel->getEntity($leadId);
+            $lead    = $leadModel->getEntity($leadId);
             $company = $companyModel->getEntity($companyId);
 
             if ($lead !== null && $company !== null) {
@@ -385,7 +381,6 @@ protected function toggleCompanyLeadAction(Request $request)
         return $this->sendJsonResponse($dataArray);
     }
 
-
     /**
      * @param Request $request
      *
@@ -420,7 +415,7 @@ protected function removeBounceStatusAction(Request $request)
             /** @var \Mautic\LeadBundle\Entity\DoNotContact $dnc */
             $dnc = $this->getDoctrine()->getManager()->getRepository('MauticLeadBundle:DoNotContact')->findOneBy(
                 [
-                    'id' => $dncId
+                    'id' => $dncId,
                 ]
             );
 
@@ -439,7 +434,7 @@ protected function removeBounceStatusAction(Request $request)
     }
 
     /**
-     * Get the rows for new leads
+     * Get the rows for new leads.
      *
      * @param Request $request
      *
@@ -460,9 +455,9 @@ protected function getNewLeadsAction(Request $request)
                     'lead:leads:editown',
                     'lead:leads:editother',
                     'lead:leads:deleteown',
-                    'lead:leads:deleteother'
+                    'lead:leads:deleteother',
                 ],
-                "RETURN_ARRAY"
+                'RETURN_ARRAY'
             );
 
             if (!$permissions['lead:leads:viewown'] && !$permissions['lead:leads:viewother']) {
@@ -496,16 +491,16 @@ protected function getNewLeadsAction(Request $request)
             $filter['force'][] = [
                 'column' => 'l.id',
                 'expr'   => 'gt',
-                'value'  => $maxId
+                'value'  => $maxId,
             ];
 
             $results = $model->getEntities(
                 [
                     'filter'         => $filter,
-                    'withTotalCount' => true
+                    'withTotalCount' => true,
                 ]
             );
-            $count   = $results['count'];
+            $count = $results['count'];
 
             if (!empty($count)) {
                 // Get the max ID of the latest lead added
@@ -513,17 +508,17 @@ protected function getNewLeadsAction(Request $request)
 
                 // We need the EmailRepository to check if a lead is flagged as do not contact
                 /** @var \Mautic\EmailBundle\Entity\EmailRepository $emailRepo */
-                $emailRepo              = $this->getModel('email')->getRepository();
-                $indexMode              = $this->request->get('view', $session->get('mautic.lead.indexmode', 'list'));
-                $template               = ($indexMode == 'list') ? 'list_rows' : 'grid_cards';
-                $dataArray['leads']     = $this->factory->getTemplating()->render(
+                $emailRepo          = $this->getModel('email')->getRepository();
+                $indexMode          = $this->request->get('view', $session->get('mautic.lead.indexmode', 'list'));
+                $template           = ($indexMode == 'list') ? 'list_rows' : 'grid_cards';
+                $dataArray['leads'] = $this->factory->getTemplating()->render(
                     "MauticLeadBundle:Lead:{$template}.html.php",
                     [
                         'items'         => $results['results'],
                         'noContactList' => $emailRepo->getDoNotEmailList(),
                         'permissions'   => $permissions,
                         'security'      => $this->get('mautic.security'),
-                        'highlight'     => true
+                        'highlight'     => true,
                     ]
                 );
                 $dataArray['indexMode'] = $indexMode;
@@ -583,7 +578,6 @@ protected function updateLeadTagsAction(Request $request)
         $data        = ['success' => 0];
 
         if ($lead !== null && $this->get('mautic.security')->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser())) {
-
             $leadModel->setTags($lead, $updatedTags, true);
 
             /** @var \Doctrine\ORM\PersistentCollection $leadTags */
@@ -644,7 +638,7 @@ protected function addLeadTagsAction(Request $request)
 
             $data = [
                 'success' => 1,
-                'tags'    => $tagOptions
+                'tags'    => $tagOptions,
             ];
         } else {
             $data = ['success' => 0];
@@ -691,7 +685,7 @@ protected function addLeadUtmTagsAction(Request $request)
 
             $data = [
                 'success' => 1,
-                'tags'    => $utmTagOptions
+                'tags'    => $utmTagOptions,
             ];
         } else {
             $data = ['success' => 0];
@@ -746,7 +740,7 @@ protected function updateLeadFieldValuesAction(Request $request)
                 // Boolean options
                 $options = [
                     0 => $properties['no'],
-                    1 => $properties['yes']
+                    1 => $properties['yes'],
                 ];
             } else {
                 switch ($leadFieldType) {
@@ -788,19 +782,17 @@ protected function getLeadFieldsPerObjectAction(Request $request)
         $fields = $this->getModel('lead.field')->getEntities(
             [
                  'filter' => [
-                     'force'          =>
-                    [
+                     'force' => [
                         'column' => 'f.isPublished',
                         'expr'   => 'eq',
-                        'value'  => true
-                    ]
+                        'value'  => true,
+                    ],
                     ],
                 'hydration_mode' => 'HYDRATE_ARRAY',
           ]
         );
 
-        if(is_object($fields))
-        {
+        if (is_object($fields)) {
             $fields = $fields->getIterator()->getArrayCopy();
         }
 
diff --git a/app/bundles/LeadBundle/Controller/Api/LeadApiController.php b/app/bundles/LeadBundle/Controller/Api/LeadApiController.php
index 028d5f4e7e3..e5fe6b5bf74 100644
--- a/app/bundles/LeadBundle/Controller/Api/LeadApiController.php
+++ b/app/bundles/LeadBundle/Controller/Api/LeadApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,13 +18,10 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class LeadApiController
- *
- * @package Mautic\LeadBundle\Controller\Api
+ * Class LeadApiController.
  */
 class LeadApiController extends CommonApiController
 {
-
     public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
@@ -32,7 +30,7 @@ public function initialize(FilterControllerEvent $event)
         $this->entityNameOne    = 'contact';
         $this->entityNameMulti  = 'contacts';
         $this->permissionBase   = 'lead:leads';
-        $this->serializerGroups = array("leadDetails", "userList", "publishDetails", "ipAddress", "tagList");
+        $this->serializerGroups = ['leadDetails', 'userList', 'publishDetails', 'ipAddress', 'tagList'];
     }
 
     /**
@@ -44,7 +42,7 @@ public function newEntityAction()
         $parameters = $this->request->request->all();
 
         $uniqueLeadFields    = $this->getModel('lead.field')->getUniqueIdentiferFields();
-        $uniqueLeadFieldData = array();
+        $uniqueLeadFieldData = [];
 
         foreach ($parameters as $k => $v) {
             if (array_key_exists($k, $uniqueLeadFields) && !empty($v)) {
@@ -77,30 +75,30 @@ public function newEntityAction()
     protected function createEntityForm($entity)
     {
         $fields = $this->getModel('lead.field')->getEntities(
-            array(
-                'force'          => array(
-                    array(
+            [
+                'force' => [
+                    [
                         'column' => 'f.isPublished',
                         'expr'   => 'eq',
-                        'value'  => true
-                    )
-                ),
-                'hydration_mode' => 'HYDRATE_ARRAY'
-            )
+                        'value'  => true,
+                    ],
+                ],
+                'hydration_mode' => 'HYDRATE_ARRAY',
+            ]
         );
 
         return $this->model->createForm($entity, $this->get('form.factory'), null, ['fields' => $fields, 'csrf_protection' => false]);
     }
 
     /**
-     * Obtains a list of users for lead owner edits
+     * Obtains a list of users for lead owner edits.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function getOwnersAction()
     {
         if (!$this->get('mautic.security')->isGranted(
-            array('lead:leads:create', 'lead:leads:editown', 'lead:leads:editother'),
+            ['lead:leads:create', 'lead:leads:editown', 'lead:leads:editother'],
             'MATCH_ONE'
         )
         ) {
@@ -112,47 +110,46 @@ public function getOwnersAction()
         $start   = $this->request->query->get('start', null);
         $users   = $this->model->getLookupResults('user', $filter, $limit, $start);
         $view    = $this->view($users, Codes::HTTP_OK);
-        $context = SerializationContext::create()->setGroups(array('userList'));
+        $context = SerializationContext::create()->setGroups(['userList']);
         $view->setSerializationContext($context);
 
         return $this->handleView($view);
     }
 
     /**
-     * Obtains a list of custom fields
+     * Obtains a list of custom fields.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function getFieldsAction()
     {
-        if (!$this->get('mautic.security')->isGranted(array('lead:leads:editown', 'lead:leads:editother'), 'MATCH_ONE')) {
+        if (!$this->get('mautic.security')->isGranted(['lead:leads:editown', 'lead:leads:editother'], 'MATCH_ONE')) {
             return $this->accessDenied();
         }
 
         $fields = $this->getModel('lead.field')->getEntities(
-            array(
-                'filter' => array(
-                    'force' => array(
-                        array(
+            [
+                'filter' => [
+                    'force' => [
+                        [
                             'column' => 'f.isPublished',
                             'expr'   => 'eq',
-                            'value'  => true
-                        )
-                    )
-                )
-            )
+                            'value'  => true,
+                        ],
+                    ],
+                ],
+            ]
         );
 
         $view    = $this->view($fields, Codes::HTTP_OK);
-        $context = SerializationContext::create()->setGroups(array('leadFieldList'));
+        $context = SerializationContext::create()->setGroups(['leadFieldList']);
         $view->setSerializationContext($context);
 
         return $this->handleView($view);
     }
 
-
     /**
-     * Obtains a list of notes on a specific lead
+     * Obtains a list of notes on a specific lead.
      *
      * @param $id
      *
@@ -167,35 +164,35 @@ public function getNotesAction($id)
             }
 
             $results = $this->getModel('lead.note')->getEntities(
-                array(
-                    'start'      => $this->request->query->get('start', 0),
-                    'limit'      => $this->request->query->get('limit', $this->coreParametersHelper->getParameter('default_pagelimit')),
-                    'filter'     => array(
+                [
+                    'start'  => $this->request->query->get('start', 0),
+                    'limit'  => $this->request->query->get('limit', $this->coreParametersHelper->getParameter('default_pagelimit')),
+                    'filter' => [
                         'string' => $this->request->query->get('search', ''),
-                        'force'  => array(
-                            array(
+                        'force'  => [
+                            [
                                 'column' => 'n.lead',
                                 'expr'   => 'eq',
-                                'value'  => $entity
-                            )
-                        )
-                    ),
+                                'value'  => $entity,
+                            ],
+                        ],
+                    ],
                     'orderBy'    => $this->request->query->get('orderBy', 'n.dateAdded'),
-                    'orderByDir' => $this->request->query->get('orderByDir', 'DESC')
-                )
+                    'orderByDir' => $this->request->query->get('orderByDir', 'DESC'),
+                ]
             );
 
             list($notes, $count) = $this->prepareEntitiesForView($results);
 
             $view = $this->view(
-                array(
+                [
                     'total' => $count,
-                    'notes' => $notes
-                ),
+                    'notes' => $notes,
+                ],
                 Codes::HTTP_OK
             );
 
-            $context = SerializationContext::create()->setGroups(array('leadNoteDetails'));
+            $context = SerializationContext::create()->setGroups(['leadNoteDetails']);
             $view->setSerializationContext($context);
 
             return $this->handleView($view);
@@ -205,7 +202,7 @@ public function getNotesAction($id)
     }
 
     /**
-     * Obtains a list of lead lists the lead is in
+     * Obtains a list of lead lists the lead is in.
      *
      * @param $id
      *
@@ -231,10 +228,10 @@ public function getListsAction($id)
             }
 
             $view = $this->view(
-                array(
+                [
                     'total' => count($lists),
-                    'lists' => $lists
-                ),
+                    'lists' => $lists,
+                ],
                 Codes::HTTP_OK
             );
 
@@ -245,7 +242,7 @@ public function getListsAction($id)
     }
 
     /**
-     * Obtains a list of campaigns the lead is part of
+     * Obtains a list of campaigns the lead is part of.
      *
      * @param $id
      *
@@ -261,7 +258,7 @@ public function getCampaignsAction($id)
 
             /** @var \Mautic\CampaignBundle\Model\CampaignModel $campaignModel */
             $campaignModel = $this->getModel('campaign');
-            $campaigns = $campaignModel->getLeadCampaigns($entity, true);
+            $campaigns     = $campaignModel->getLeadCampaigns($entity, true);
 
             foreach ($campaigns as &$c) {
                 if (!empty($c['lists'])) {
@@ -278,10 +275,10 @@ public function getCampaignsAction($id)
             }
 
             $view = $this->view(
-                array(
+                [
                     'total'     => count($campaigns),
-                    'campaigns' => $campaigns
-                ),
+                    'campaigns' => $campaigns,
+                ],
                 Codes::HTTP_OK
             );
 
@@ -294,10 +291,10 @@ public function getCampaignsAction($id)
     /**
      * {@inheritdoc}
      *
-     * @param \Mautic\LeadBundle\Entity\Lead  &$entity
-     * @param                                 $parameters
-     * @param                                 $form
-     * @param string                          $action
+     * @param \Mautic\LeadBundle\Entity\Lead &$entity
+     * @param                                $parameters
+     * @param                                $form
+     * @param string                         $action
      */
     protected function preSaveEntity(&$entity, $form, $parameters, $action = 'edit')
     {
@@ -341,7 +338,7 @@ protected function preSaveEntity(&$entity, $form, $parameters, $action = 'edit')
     }
 
     /**
-     * Remove IpAddress and lastActive as it'll be handled outside the form
+     * Remove IpAddress and lastActive as it'll be handled outside the form.
      *
      * @param $parameters
      * @param $entity
@@ -357,12 +354,10 @@ protected function prepareParametersForBinding($parameters, $entity, $action)
     }
 
     /**
-     * Flatten fields into an 'all' key for dev convenience
+     * Flatten fields into an 'all' key for dev convenience.
      *
      * @param        $entity
      * @param string $action
-     *
-     * @return void
      */
     protected function preSerializeEntity(&$entity, $action = 'view')
     {
@@ -374,4 +369,3 @@ protected function preSerializeEntity(&$entity, $action = 'view')
         }
     }
 }
-
diff --git a/app/bundles/LeadBundle/Controller/Api/ListApiController.php b/app/bundles/LeadBundle/Controller/Api/ListApiController.php
index c27fa201fea..8543ab8cff7 100644
--- a/app/bundles/LeadBundle/Controller/Api/ListApiController.php
+++ b/app/bundles/LeadBundle/Controller/Api/ListApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,14 +16,11 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class ListApiController
- *
- * @package Mautic\LeadBundle\Controller\Api
+ * Class ListApiController.
  */
 class ListApiController extends CommonApiController
 {
-
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('lead.list');
@@ -30,35 +28,35 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'list';
         $this->entityNameMulti  = 'lists';
         $this->permissionBase   = 'lead:lists';
-        $this->serializerGroups = array("leadListDetails", "userList", "publishDetails", "ipAddress");
+        $this->serializerGroups = ['leadListDetails', 'userList', 'publishDetails', 'ipAddress'];
     }
 
     /**
-     * Obtains a list of smart lists for the user
+     * Obtains a list of smart lists for the user.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function getListsAction ()
+    public function getListsAction()
     {
         $lists   = $this->getModel('lead.list')->getUserLists();
         $view    = $this->view($lists, Codes::HTTP_OK);
-        $context = SerializationContext::create()->setGroups(array('leadListList'));
+        $context = SerializationContext::create()->setGroups(['leadListList']);
         $view->setSerializationContext($context);
 
         return $this->handleView($view);
     }
 
-
     /**
-     * Adds a lead to a list
+     * Adds a lead to a list.
      *
      * @param int $id     List ID
      * @param int $leadId Lead ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function addLeadAction ($id, $leadId)
+    public function addLeadAction($id, $leadId)
     {
         $entity = $this->model->getEntity($id);
         if (null !== $entity) {
@@ -80,7 +78,7 @@ public function addLeadAction ($id, $leadId)
 
             $leadModel->addToLists($leadId, $entity);
 
-            $view = $this->view(array('success' => 1), Codes::HTTP_OK);
+            $view = $this->view(['success' => 1], Codes::HTTP_OK);
 
             return $this->handleView($view);
         }
@@ -89,15 +87,16 @@ public function addLeadAction ($id, $leadId)
     }
 
     /**
-     * Removes given lead from a list
+     * Removes given lead from a list.
      *
      * @param int $id     List ID
      * @param int $leadId Lead ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function removeLeadAction ($id, $leadId)
+    public function removeLeadAction($id, $leadId)
     {
         $entity = $this->model->getEntity($id);
         if (null !== $entity) {
@@ -119,11 +118,11 @@ public function removeLeadAction ($id, $leadId)
 
             $leadModel->removeFromLists($leadId, $entity);
 
-            $view = $this->view(array('success' => 1), Codes::HTTP_OK);
+            $view = $this->view(['success' => 1], Codes::HTTP_OK);
 
             return $this->handleView($view);
         }
 
         return $this->notFound();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Controller/CompanyController.php b/app/bundles/LeadBundle/Controller/CompanyController.php
index 2352203e244..3c0b893c47e 100644
--- a/app/bundles/LeadBundle/Controller/CompanyController.php
+++ b/app/bundles/LeadBundle/Controller/CompanyController.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Controller;
 
 use Mautic\CoreBundle\Controller\FormController;
-use Mautic\LeadBundle\Entity\Company;
 use Mautic\CoreBundle\Helper\InputHelper;
+use Mautic\LeadBundle\Entity\Company;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class CompanyController
+ * Class CompanyController.
  */
 class CompanyController extends FormController
 {
@@ -33,9 +34,9 @@ public function indexAction($page = 1)
                 'lead:leads:viewother',
                 'lead:leads:create',
                 'lead:leads:editother',
-                'lead:leads:deleteother'
+                'lead:leads:deleteother',
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if (!$permissions['lead:leads:viewother']) {
@@ -89,8 +90,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticLeadBundle:Company:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_company_index',
-                        'mauticContent' => 'company'
-                    ]
+                        'mauticContent' => 'company',
+                    ],
                 ]
             );
         }
@@ -105,7 +106,7 @@ public function indexAction($page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'searchValue' => $search,
                     'leadCounts'  => $leadCounts,
                     'items'       => $companies,
@@ -119,16 +120,16 @@ public function indexAction($page = 1)
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_company_index',
                     'mauticContent' => 'company',
-                    'route'         => $this->generateUrl('mautic_company_index', ['page' => $page])
-                ]
+                    'route'         => $this->generateUrl('mautic_company_index', ['page' => $page]),
+                ],
             ]
         );
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
-     * @param  \Mautic\LeadBundle\Entity\Company $entity
+     * @param \Mautic\LeadBundle\Entity\Company $entity
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
@@ -148,8 +149,7 @@ public function newAction($entity = null)
         //set the page we came from
         $page = $this->get('session')->get('mautic.company.page', 1);
 
-        $action         = $this->generateUrl('mautic_company_action', array('objectAction' => 'new'));
-
+        $action = $this->generateUrl('mautic_company_action', ['objectAction' => 'new']);
 
         $updateSelect = ($this->request->getMethod() == 'POST')
             ? $this->request->request->get('company[updateSelect]', false, true)
@@ -161,22 +161,22 @@ public function newAction($entity = null)
         $fields = $this->getModel('lead.field')->getEntities(
             [
                 'filter' => [
-                    'force'          => [
+                    'force' => [
                         [
                             'column' => 'f.object',
                             'expr'   => 'eq',
-                            'value'  => 'company'
-                        ]
-                    ]
+                            'value'  => 'company',
+                        ],
+                    ],
                 ],
-                'hydration_mode' => 'HYDRATE_ARRAY'
+                'hydration_mode' => 'HYDRATE_ARRAY',
             ]
         );
-        $form   = $model->createForm($entity, $this->get('form.factory'), $action, ['fields' => $fields, 'update_select' => $updateSelect]);
+        $form = $model->createForm($entity, $this->get('form.factory'), $action, ['fields' => $fields, 'update_select' => $updateSelect]);
 
-        $viewParameters = array('page' => $page);
-        $returnUrl = $this->generateUrl('mautic_company_index', $viewParameters);
-        $template  = 'MauticLeadBundle:Company:index';
+        $viewParameters = ['page' => $page];
+        $returnUrl      = $this->generateUrl('mautic_company_index', $viewParameters);
+        $template       = 'MauticLeadBundle:Company:index';
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -196,17 +196,17 @@ public function newAction($entity = null)
 
                     $this->addFlash(
                         'mautic.core.notice.created',
-                        array(
+                        [
                             '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_company_index',
                             '%url%'       => $this->generateUrl(
                                 'mautic_company_action',
-                                array(
+                                [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
-                                )
-                            )
-                        )
+                                    'objectId'     => $entity->getId(),
+                                ]
+                            ),
+                        ]
                     );
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
@@ -221,7 +221,7 @@ public function newAction($entity = null)
 
             $passthrough = [
                 'activeLink'    => '#mautic_company_index',
-                'mauticContent' => 'company'
+                'mauticContent' => 'company',
             ];
 
             // Check to see if this is a popup
@@ -230,54 +230,54 @@ public function newAction($entity = null)
                 $passthrough = array_merge(
                     $passthrough,
                     [
-                        'updateSelect'   => $form['updateSelect']->getData(),
-                        'companyId'      => $entity->getId(),
-                        'companyName'    => $entity->getName()
+                        'updateSelect' => $form['updateSelect']->getData(),
+                        'companyId'    => $entity->getId(),
+                        'companyName'  => $entity->getName(),
                     ]
                 );
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 return $this->postActionRedirect(
-                    array(
+                    [
                         'returnUrl'       => $returnUrl,
                         'viewParameters'  => $viewParameters,
                         'contentTemplate' => $template,
-                        'passthroughVars' => $passthrough
-                    )
+                        'passthroughVars' => $passthrough,
+                    ]
                 );
             }
         }
 
-        $themes = array('MauticLeadBundle:FormTheme\Action');
+        $themes = ['MauticLeadBundle:FormTheme\Action'];
 
         return $this->delegateView(
-            array(
-                'viewParameters'  => array(
-                    'tmpl'    => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
-                    'entity'  => $entity,
-                    'form'    => $this->setFormTheme($form, 'MauticLeadBundle:Company:form.html.php', $themes),
-                    'fields'  => $model->organizeFieldsByGroup($fields)
-                ),
+            [
+                'viewParameters' => [
+                    'tmpl'   => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
+                    'entity' => $entity,
+                    'form'   => $this->setFormTheme($form, 'MauticLeadBundle:Company:form.html.php', $themes),
+                    'fields' => $model->organizeFieldsByGroup($fields),
+                ],
                 'contentTemplate' => 'MauticLeadBundle:Company:form.html.php',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_company_index',
                     'mauticContent' => 'company',
                     'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
                     'route'         => $this->generateUrl(
                         'mautic_company_action',
-                        array(
+                        [
                             'objectAction' => (!empty($valid) ? 'edit' : 'new'), //valid means a new form was applied
-                            'objectId'     => $entity->getId()
-                        )
-                    )
-                )
-            )
+                            'objectId'     => $entity->getId(),
+                        ]
+                    ),
+                ],
+            ]
         );
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -292,35 +292,35 @@ public function editAction($objectId, $ignorePost = false)
         //set the page we came from
         $page = $this->get('session')->get('mautic.company.page', 1);
 
-        $viewParameters = array('page' => $page);
+        $viewParameters = ['page' => $page];
 
         //set the return URL
-        $returnUrl = $this->generateUrl('mautic_company_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_company_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'viewParameters'  => $viewParameters,
             'contentTemplate' => 'MauticLeadBundle:Company:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_company_index',
-                'mauticContent' => 'company'
-            )
-        );
+                'mauticContent' => 'company',
+            ],
+        ];
 
         //form not found
         if ($entity === null) {
             return $this->postActionRedirect(
                 array_merge(
                     $postActionVars,
-                    array(
-                        'flashes' => array(
-                            array(
+                    [
+                        'flashes' => [
+                            [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.company.error.notfound',
-                                'msgVars' => array('%id%' => $objectId)
-                            )
-                        )
-                    )
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
+                    ]
                 )
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -333,7 +333,7 @@ public function editAction($objectId, $ignorePost = false)
             return $this->isLocked($postActionVars, $entity, 'company');
         }
 
-        $action  = $this->generateUrl('mautic_company_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action       = $this->generateUrl('mautic_company_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $updateSelect = ($this->request->getMethod() == 'POST')
             ? $this->request->request->get('company[updateSelect]', false, true)
             : $this->request->get(
@@ -344,18 +344,18 @@ public function editAction($objectId, $ignorePost = false)
         $fields = $this->getModel('lead.field')->getEntities(
             [
                 'filter' => [
-                    'force'          => [
+                    'force' => [
                         [
                             'column' => 'f.object',
                             'expr'   => 'eq',
-                            'value'  => 'company'
-                        ]
-                    ]
+                            'value'  => 'company',
+                        ],
+                    ],
                 ],
-                'hydration_mode' => 'HYDRATE_ARRAY'
+                'hydration_mode' => 'HYDRATE_ARRAY',
             ]
         );
-        $form    = $model->createForm(
+        $form = $model->createForm(
             $entity,
             $this->get('form.factory'),
             $action,
@@ -392,17 +392,17 @@ public function editAction($objectId, $ignorePost = false)
 
                     $this->addFlash(
                         'mautic.core.notice.updated',
-                        array(
+                        [
                             '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_company_index',
                             '%url%'       => $this->generateUrl(
                                 'mautic_company_action',
-                                array(
+                                [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
-                                )
-                            )
-                        )
+                                    'objectId'     => $entity->getId(),
+                                ]
+                            ),
+                        ]
                     );
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
@@ -420,7 +420,7 @@ public function editAction($objectId, $ignorePost = false)
 
             $passthrough = [
                 'activeLink'    => '#mautic_company_index',
-                'mauticContent' => 'company'
+                'mauticContent' => 'company',
             ];
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
@@ -432,41 +432,42 @@ public function editAction($objectId, $ignorePost = false)
             } elseif ($valid) {
                 // Refetch and recreate the form in order to populate data manipulated in the entity itself
                 $company = $model->getEntity($objectId);
-                $form = $model->createForm($company, $this->get('form.factory'), $action, ['fields' => $fields]);
+                $form    = $model->createForm($company, $this->get('form.factory'), $action, ['fields' => $fields]);
             }
         } else {
             //lock the entity
             $model->lockEntity($entity);
         }
 
-        $themes = array('MauticLeadBundle:FormTheme\Action');
+        $themes = ['MauticLeadBundle:FormTheme\Action'];
+
         return $this->delegateView(
-            array(
-                'viewParameters'  => array(
-                    'tmpl'    => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
-                    'entity'  => $entity,
-                    'form'    => $this->setFormTheme($form, 'MauticLeadBundle:Company:form.html.php', $themes),
-                    'fields'  => $entity->getFields() //pass in the lead fields as they are already organized by ['group']['alias']
-                ),
+            [
+                'viewParameters' => [
+                    'tmpl'   => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
+                    'entity' => $entity,
+                    'form'   => $this->setFormTheme($form, 'MauticLeadBundle:Company:form.html.php', $themes),
+                    'fields' => $entity->getFields(), //pass in the lead fields as they are already organized by ['group']['alias']
+                ],
                 'contentTemplate' => 'MauticLeadBundle:Company:form.html.php',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_company_index',
                     'mauticContent' => 'company',
                     'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
                     'route'         => $this->generateUrl(
                         'mautic_company_action',
-                        array(
+                        [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        )
-                    )
-                )
-            )
+                            'objectId'     => $entity->getId(),
+                        ]
+                    ),
+                ],
+            ]
         );
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -489,7 +490,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -498,29 +499,29 @@ public function cloneAction($objectId)
     public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.company.page', 1);
-        $returnUrl = $this->generateUrl('mautic_company_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_company_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticLeadBundle:Company:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_company_index',
-                'mauticContent' => 'company'
-            )
-        );
+                'mauticContent' => 'company',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model  = $this->getModel('lead.company');
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.company.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->isGranted('lead:leads:deleteother')) {
                 return $this->accessDenied();
             } elseif ($model->isLocked($entity)) {
@@ -529,62 +530,62 @@ public function deleteAction($objectId)
 
             $model->deleteEntity($entity);
 
-            $flashes[]  = array(
+            $flashes[] = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $entity->getName(),
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => $flashes
-                )
+                [
+                    'flashes' => $flashes,
+                ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function batchDeleteAction()
     {
         $page      = $this->get('session')->get('mautic.company.page', 1);
-        $returnUrl = $this->generateUrl('mautic_company_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_company_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticLeadBundle:Company:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_company_index',
-                'mauticContent' => 'company'
-            )
-        );
+                'mauticContent' => 'company',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model     = $this->getModel('lead.company');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.company.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->isGranted('lead:leads:deleteother')) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
@@ -598,22 +599,22 @@ public function batchDeleteAction()
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'notice',
                     'msg'     => 'mautic.company.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => $flashes
-                )
+                [
+                    'flashes' => $flashes,
+                ]
             )
         );
     }
diff --git a/app/bundles/LeadBundle/Controller/EntityContactsTrait.php b/app/bundles/LeadBundle/Controller/EntityContactsTrait.php
index e7288593f46..6fc19de848b 100644
--- a/app/bundles/LeadBundle/Controller/EntityContactsTrait.php
+++ b/app/bundles/LeadBundle/Controller/EntityContactsTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,27 +13,26 @@
 use Mautic\LeadBundle\Entity\LeadRepository;
 
 /**
- * Class EntityContactsTrait
+ * Class EntityContactsTrait.
  */
 trait EntityContactsTrait
 {
     /**
-     * @param      $objectId
-     * @param      $page
-     * @param      $permission
-     * @param      $sessionVar
-     * @param      $joinTable           Table to join to obtain list of related contacts
-     * @param null $channel             Channel for this entity
-     * @param null $contactColumnName   If the entity ID in $joinTable is not "id", set the column name here
-     * @param array $contactFilter      Array of additional filters for the getEntityContactsWithFields() function
-     * @param null $route               Route for this view's contact list
+     * @param       $objectId
+     * @param       $page
+     * @param       $permission
+     * @param       $sessionVar
+     * @param       $joinTable         Table to join to obtain list of related contacts
+     * @param null  $channel           Channel for this entity
+     * @param null  $contactColumnName If the entity ID in $joinTable is not "id", set the column name here
+     * @param array $contactFilter     Array of additional filters for the getEntityContactsWithFields() function
+     * @param null  $route             Route for this view's contact list
      *
      * @return mixed
      */
     protected function generateContactsGrid($objectId, $page, $permission, $sessionVar, $joinTable, $channel = null, $contactColumnName = null, array $contactFilter = null, $route = null)
     {
         if ($permission && !$this->get('mautic.security')->isGranted($permission)) {
-
             return $this->accessDenied();
         }
 
@@ -43,7 +43,6 @@ protected function generateContactsGrid($objectId, $page, $permission, $sessionV
 
         // Apply filters
         if ($this->request->getMethod() == 'POST') {
-
             $this->setListFilters();
         }
 
@@ -62,7 +61,7 @@ protected function generateContactsGrid($objectId, $page, $permission, $sessionV
         }
 
         /** @var LeadRepository $repo */
-        $repo = $this->getModel('lead')->getRepository();
+        $repo     = $this->getModel('lead')->getRepository();
         $contacts = $repo->getEntityContacts(
             [
                 'withTotalCount' => true,
@@ -70,7 +69,7 @@ protected function generateContactsGrid($objectId, $page, $permission, $sessionV
                 'limit'          => $limit,
                 'filter'         => $filter,
                 'orderBy'        => $orderBy,
-                'orderByDir'     => $orderByDir
+                'orderByDir'     => $orderByDir,
             ],
             $joinTable,
             $objectId,
@@ -91,8 +90,8 @@ protected function generateContactsGrid($objectId, $page, $permission, $sessionV
                     'viewParameters'  => ['page' => $lastPage, 'objectId' => $objectId],
                     'contentTemplate' => 'MauticLeadBundle:Lead:grid.html.php',
                     'passthroughVars' => [
-                        'mauticContent' => $sessionVar.'Contacts'
-                    ]
+                        'mauticContent' => $sessionVar.'Contacts',
+                    ],
                 ]
             );
         }
@@ -105,7 +104,7 @@ protected function generateContactsGrid($objectId, $page, $permission, $sessionV
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'page'          => $page,
                     'items'         => $contacts['results'],
                     'totalItems'    => $contacts['count'],
@@ -115,14 +114,14 @@ protected function generateContactsGrid($objectId, $page, $permission, $sessionV
                     'sessionVar'    => $sessionVar.'.contact',
                     'limit'         => $limit,
                     'objectId'      => $objectId,
-                    'noContactList' => $dnc
+                    'noContactList' => $dnc,
                 ],
                 'contentTemplate' => 'MauticLeadBundle:Lead:grid.html.php',
                 'passthroughVars' => [
                     'mauticContent' => $sessionVar.'Contacts',
-                    'route'         => false
-                ]
+                    'route'         => false,
+                ],
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Controller/FieldController.php b/app/bundles/LeadBundle/Controller/FieldController.php
index aa271eb1af1..2bf2a1b7892 100644
--- a/app/bundles/LeadBundle/Controller/FieldController.php
+++ b/app/bundles/LeadBundle/Controller/FieldController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,14 +14,12 @@
 use Mautic\LeadBundle\Entity\LeadField;
 use Mautic\LeadBundle\Model\FieldModel;
 use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormError;
 
 class FieldController extends FormController
 {
-
     /**
-     * Generate's default list view
+     * Generate's default list view.
      *
      * @param int $page
      *
@@ -29,7 +28,7 @@ class FieldController extends FormController
     public function indexAction($page = 1)
     {
         //set some permissions
-        $permissions = $this->get('mautic.security')->isGranted(array('lead:fields:full'), 'RETURN_ARRAY');
+        $permissions = $this->get('mautic.security')->isGranted(['lead:fields:full'], 'RETURN_ARRAY');
 
         $session = $this->get('session');
 
@@ -41,7 +40,7 @@ public function indexAction($page = 1)
             $this->setListFilters();
         }
 
-        $limit = $session->get('mautic.leadfield.limit', $this->coreParametersHelper->getParameter('default_pagelimit'));
+        $limit  = $session->get('mautic.leadfield.limit', $this->coreParametersHelper->getParameter('default_pagelimit'));
         $search = $this->request->get('search', $session->get('mautic.leadfield.filter', ''));
         $session->set('mautic.leadfilter.filter', $search);
 
@@ -59,14 +58,14 @@ public function indexAction($page = 1)
 
         $session->set('mautic.lead.emailtoken.filter', $search);
 
-        $fields = $this->getModel('lead.field')->getEntities(array(
-            'start'          => $start,
-            'limit'          => $limit,
-            'filter'         => array('string' => $search),
-            'orderBy'        => $orderBy,
-            'orderByDir'     => $orderByDir
-        ));
-        $count  = count($fields);
+        $fields = $this->getModel('lead.field')->getEntities([
+            'start'      => $start,
+            'limit'      => $limit,
+            'filter'     => ['string' => $search],
+            'orderBy'    => $orderBy,
+            'orderByDir' => $orderByDir,
+        ]);
+        $count = count($fields);
 
         if ($count && $count < ($start + 1)) {
             //the number of entities are now less then the current page so redirect to the last page
@@ -76,17 +75,17 @@ public function indexAction($page = 1)
                 $lastPage = (ceil($count / $limit)) ?: 1;
             }
             $session->set('mautic.leadfield.page', $lastPage);
-            $returnUrl = $this->generateUrl('mautic_contactfield_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl('mautic_contactfield_index', ['page' => $lastPage]);
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $returnUrl,
-                'viewParameters'  => array('page' => $lastPage),
+                'viewParameters'  => ['page' => $lastPage],
                 'contentTemplate' => 'MauticLeadBundle:Field:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_contactfield_index',
-                    'mauticContent' => 'leadfield'
-                )
-            ));
+                    'mauticContent' => 'leadfield',
+                ],
+            ]);
         }
 
         //set what page currently on so that we can return here after form submission/cancellation
@@ -94,31 +93,31 @@ public function indexAction($page = 1)
 
         $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'items'       => $fields,
                 'searchValue' => $search,
                 'permissions' => $permissions,
                 'tmpl'        => $tmpl,
                 'totalItems'  => $count,
                 'limit'       => $limit,
-                'page'        => $page
-            ),
+                'page'        => $page,
+            ],
             'contentTemplate' => 'MauticLeadBundle:Field:list.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_contactfield_index',
-                'route'         => $this->generateUrl('mautic_contactfield_index', array('page' => $page)),
-                'mauticContent' => 'leadfield'
-            )
-        ));
+                'route'         => $this->generateUrl('mautic_contactfield_index', ['page' => $page]),
+                'mauticContent' => 'leadfield',
+            ],
+        ]);
     }
 
     /**
-     * Generate's new form and processes post data
+     * Generate's new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function newAction ()
+    public function newAction()
     {
         if (!$this->get('mautic.security')->isGranted('lead:fields:full')) {
             return $this->accessDenied();
@@ -167,9 +166,9 @@ public function newAction ()
                                         'mautic_contactfield_action',
                                         [
                                             'objectAction' => 'edit',
-                                            'objectId'     => $field->getId()
+                                            'objectId'     => $field->getId(),
                                         ]
-                                    )
+                                    ),
                                 ]
                             );
                         } catch (\Exception $e) {
@@ -191,8 +190,8 @@ public function newAction ()
                         'contentTemplate' => 'MauticLeadBundle:Field:index',
                         'passthroughVars' => [
                             'activeLink'    => '#mautic_contactfield_index',
-                            'mauticContent' => 'leadfield'
-                        ]
+                            'mauticContent' => 'leadfield',
+                        ],
                     ]
                 );
             } elseif ($valid && !$cancelled) {
@@ -202,67 +201,67 @@ public function newAction ()
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
-                    'form'            => $form->createView(),
+                'viewParameters' => [
+                    'form' => $form->createView(),
                 ],
                 'contentTemplate' => 'MauticLeadBundle:Field:form.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_contactfield_index',
                     'route'         => $this->generateUrl('mautic_contactfield_action', ['objectAction' => 'new']),
-                    'mauticContent' => 'leadfield'
-                ]
+                    'mauticContent' => 'leadfield',
+                ],
             ]
         );
     }
 
     /**
-     * Generate's edit form and processes post data
+     * Generate's edit form and processes post data.
      *
      * @param            $objectId
      * @param bool|false $ignorePost
      *
      * @return array|\Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function editAction ($objectId, $ignorePost = false)
+    public function editAction($objectId, $ignorePost = false)
     {
         if (!$this->get('mautic.security')->isGranted('lead:fields:full')) {
             return $this->accessDenied();
         }
 
         /** @var FieldModel $model */
-        $model   = $this->getModel('lead.field');
-        $field   = $model->getEntity($objectId);
+        $model = $this->getModel('lead.field');
+        $field = $model->getEntity($objectId);
 
         //set the return URL
-        $returnUrl  = $this->generateUrl('mautic_contactfield_index');
+        $returnUrl = $this->generateUrl('mautic_contactfield_index');
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'contentTemplate' => 'MauticLeadBundle:Field:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_contactfield_index',
-                'mauticContent' => 'leadfield'
-            )
-        );
+                'mauticContent' => 'leadfield',
+            ],
+        ];
         //list not found
         if ($field === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
-                            'type' => 'error',
-                            'msg'  => 'mautic.lead.field.error.notfound',
-                            'msgVars' => array('%id%' => $objectId)
-                        )
-                    )
-                ))
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
+                            'type'    => 'error',
+                            'msg'     => 'mautic.lead.field.error.notfound',
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ])
             );
         } elseif ($model->isLocked($field)) {
             //deny access if the entity is locked
             return $this->isLocked($postActionVars, $field, 'lead.field');
         }
 
-        $action = $this->generateUrl('mautic_contactfield_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action = $this->generateUrl('mautic_contactfield_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $form   = $model->createForm($field, $this->get('form.factory'), $action);
 
         ///Check for a submitted form and process it
@@ -276,7 +275,7 @@ public function editAction ($objectId, $ignorePost = false)
                         if ($result !== true) {
                             //set the error
                             $form->get('properties')->addError(new FormError(
-                                $this->get('translator')->trans($result, array(), 'validators')
+                                $this->get('translator')->trans($result, [], 'validators')
                             ));
                             $valid = false;
                         }
@@ -286,14 +285,14 @@ public function editAction ($objectId, $ignorePost = false)
                         //form is valid so process the data
                         $model->saveEntity($field, $form->get('buttons')->get('save')->isClicked());
 
-                        $this->addFlash('mautic.core.notice.updated',  array(
+                        $this->addFlash('mautic.core.notice.updated',  [
                             '%name%'      => $field->getLabel(),
                             '%menu_link%' => 'mautic_contactfield_index',
-                            '%url%'       => $this->generateUrl('mautic_contactfield_action', array(
+                            '%url%'       => $this->generateUrl('mautic_contactfield_action', [
                                 'objectAction' => 'edit',
-                                'objectId'     => $field->getId()
-                            ))
-                        ));
+                                'objectId'     => $field->getId(),
+                            ]),
+                        ]);
                     }
                 }
             } else {
@@ -303,10 +302,10 @@ public function editAction ($objectId, $ignorePost = false)
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 return $this->postActionRedirect(
-                    array_merge($postActionVars, array(
-                            'viewParameters'  => array('objectId' => $field->getId()),
-                            'contentTemplate' => 'MauticLeadBundle:Field:index'
-                        )
+                    array_merge($postActionVars, [
+                            'viewParameters'  => ['objectId' => $field->getId()],
+                            'contentTemplate' => 'MauticLeadBundle:Field:index',
+                        ]
                     )
                 );
             } elseif ($valid) {
@@ -319,29 +318,30 @@ public function editAction ($objectId, $ignorePost = false)
             $model->lockEntity($field);
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
-                'form'    => $form->createView()
-            ),
+        return $this->delegateView([
+            'viewParameters' => [
+                'form' => $form->createView(),
+            ],
             'contentTemplate' => 'MauticLeadBundle:Field:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_contactfield_index',
                 'route'         => $action,
-                'mauticContent' => 'leadfield'
-            )
-        ));
+                'mauticContent' => 'leadfield',
+            ],
+        ]);
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param $objectId
+     *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
-    public function cloneAction ($objectId)
+    public function cloneAction($objectId)
     {
-        $model   = $this->getModel('lead.field');
-        $entity  = $model->getEntity($objectId);
+        $model  = $this->getModel('lead.field');
+        $entity = $model->getEntity($objectId);
 
         if ($entity != null) {
             if (!$this->get('mautic.security')->isGranted('lead:fields:full')) {
@@ -359,9 +359,10 @@ public function cloneAction ($objectId)
     }
 
     /**
-     * Delete a field
+     * Delete a field.
+     *
+     * @param   $objectId
      *
-     * @param         $objectId
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function deleteAction($objectId)
@@ -371,27 +372,27 @@ public function deleteAction($objectId)
         }
 
         $returnUrl = $this->generateUrl('mautic_contactfield_index');
-        $flashes   = array();
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'contentTemplate' => 'MauticLeadBundle:Field:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_contactfield_index',
-                'mauticContent' => 'lead'
-            )
-        );
+                'mauticContent' => 'lead',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
-            $model  = $this->getModel('lead.field');
+            $model = $this->getModel('lead.field');
             $field = $model->getEntity($objectId);
 
             if ($field === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.lead.field.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif ($model->isLocked($field)) {
                 return $this->isLocked($postActionVars, $field, 'lead.field');
             } elseif ($field->isFixed()) {
@@ -401,60 +402,61 @@ public function deleteAction($objectId)
 
             $model->deleteEntity($field);
 
-            $flashes[]  = array(
+            $flashes[] = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $field->getLabel(),
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function batchDeleteAction() {
+    public function batchDeleteAction()
+    {
         if (!$this->get('mautic.security')->isGranted('lead:fields:full')) {
             return $this->accessDenied();
         }
 
         $returnUrl = $this->generateUrl('mautic_contactfield_index');
-        $flashes     = array();
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'contentTemplate' => 'MauticLeadBundle:Field:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_contactfield_index',
-                'mauticContent' => 'lead'
-            )
-        );
+                'mauticContent' => 'lead',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model     = $this->getModel('lead.field');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.lead.field.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif ($entity->isFixed()) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
@@ -468,20 +470,20 @@ public function batchDeleteAction() {
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
-                    'type' => 'notice',
-                    'msg'  => 'mautic.lead.field.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.lead.field.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 }
diff --git a/app/bundles/LeadBundle/Controller/LeadAccessTrait.php b/app/bundles/LeadBundle/Controller/LeadAccessTrait.php
index 9855896d173..129b07a9320 100644
--- a/app/bundles/LeadBundle/Controller/LeadAccessTrait.php
+++ b/app/bundles/LeadBundle/Controller/LeadAccessTrait.php
@@ -1,29 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Controller;
 
-
 /**
- * Class LeadAccessTrait
+ * Class LeadAccessTrait.
  */
 trait LeadAccessTrait
 {
     /**
-     * Determines if the user has access to the lead the note is for
+     * Determines if the user has access to the lead the note is for.
      *
      * @param $leadId
      * @param $action
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    protected function checkLeadAccess ($leadId, $action)
+    protected function checkLeadAccess($leadId, $action)
     {
         //make sure the user has view access to this lead
         $leadModel = $this->getModel('lead');
@@ -41,15 +41,15 @@ protected function checkLeadAccess ($leadId, $action)
                     'contentTemplate' => 'MauticLeadBundle:Lead:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
-                        'mauticContent' => 'leadNote'
+                        'mauticContent' => 'leadNote',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.lead.lead.error.notfound',
-                            'msgVars' => ['%id%' => $leadId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $leadId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -58,11 +58,9 @@ protected function checkLeadAccess ($leadId, $action)
             $lead->getPermissionUser()
         )
         ) {
-
             return $this->accessDenied();
         } else {
-
             return $lead;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Controller/LeadController.php b/app/bundles/LeadBundle/Controller/LeadController.php
index fe0be4cbca4..fee819d96cd 100644
--- a/app/bundles/LeadBundle/Controller/LeadController.php
+++ b/app/bundles/LeadBundle/Controller/LeadController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,8 +15,6 @@
 use Mautic\CoreBundle\Helper\EmojiHelper;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\StatDevice;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Mautic\LeadBundle\Model\LeadModel;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
@@ -42,9 +41,9 @@ public function indexAction($page = 1)
                 'lead:leads:editown',
                 'lead:leads:editother',
                 'lead:leads:deleteown',
-                'lead:leads:deleteother'
+                'lead:leads:deleteother',
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if (!$permissions['lead:leads:viewown'] && !$permissions['lead:leads:viewother']) {
@@ -100,10 +99,10 @@ public function indexAction($page = 1)
                 'filter'         => $filter,
                 'orderBy'        => $orderBy,
                 'orderByDir'     => $orderByDir,
-                'withTotalCount' => true
+                'withTotalCount' => true,
             ]
         );
-        $count   = $results['count'];
+        $count = $results['count'];
         unset($results['count']);
 
         $leads = $results['results'];
@@ -126,8 +125,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticLeadBundle:Lead:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
-                        'mauticContent' => 'lead'
-                    ]
+                        'mauticContent' => 'lead',
+                    ],
                 ]
             );
         }
@@ -139,7 +138,7 @@ public function indexAction($page = 1)
 
         $listArgs = [];
         if (!$this->get('mautic.security')->isGranted('lead:lists:viewother')) {
-            $listArgs["filter"]["force"] = " $mine";
+            $listArgs['filter']['force'] = " $mine";
         }
 
         $lists = $this->getModel('lead.list')->getUserLists();
@@ -170,7 +169,7 @@ public function indexAction($page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'searchValue'      => $search,
                     'items'            => $leads,
                     'page'             => $page,
@@ -192,8 +191,8 @@ public function indexAction($page = 1)
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_contact_index',
                     'mauticContent' => 'lead',
-                    'route'         => $this->generateUrl('mautic_contact_index', ['page' => $page])
-                ]
+                    'route'         => $this->generateUrl('mautic_contact_index', ['page' => $page]),
+                ],
             ]
         );
     }
@@ -211,26 +210,26 @@ public function quickAddAction()
 
         $fields = $this->getModel('lead.field')->getEntities(
             [
-                'filter'         => [
+                'filter' => [
                     'force' => [
                         [
                             'column' => 'f.isPublished',
                             'expr'   => 'eq',
-                            'value'  => true
+                            'value'  => true,
                         ],
                         [
                             'column' => 'f.isShortVisible',
                             'expr'   => 'eq',
-                            'value'  => true
+                            'value'  => true,
                         ],
                         [
                             'column' => 'f.object',
                             'expr'   => 'like',
-                            'value'  => 'lead'
-                        ]
-                    ]
+                            'value'  => 'lead',
+                        ],
+                    ],
                 ],
-                'hydration_mode' => 'HYDRATE_ARRAY'
+                'hydration_mode' => 'HYDRATE_ARRAY',
             ]
         );
 
@@ -242,21 +241,21 @@ public function quickAddAction()
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
-                    'quickForm' => $quickForm->createView()
+                'viewParameters' => [
+                    'quickForm' => $quickForm->createView(),
                 ],
-                'contentTemplate' => "MauticLeadBundle:Lead:quickadd.html.php",
+                'contentTemplate' => 'MauticLeadBundle:Lead:quickadd.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_contact_index',
                     'mauticContent' => 'lead',
-                    'route'         => false
-                ]
+                    'route'         => false,
+                ],
             ]
         );
     }
 
     /**
-     * Loads a specific lead into the detailed panel
+     * Loads a specific lead into the detailed panel.
      *
      * @param $objectId
      *
@@ -279,9 +278,9 @@ public function viewAction($objectId)
                 'lead:leads:editown',
                 'lead:leads:editother',
                 'lead:leads:deleteown',
-                'lead:leads:deleteother'
+                'lead:leads:deleteother',
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if ($lead === null) {
@@ -298,15 +297,15 @@ public function viewAction($objectId)
                     'contentTemplate' => 'MauticLeadBundle:Lead:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
-                        'mauticContent' => 'contact'
+                        'mauticContent' => 'contact',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.lead.lead.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         }
@@ -325,9 +324,9 @@ public function viewAction($objectId)
         $socialProfiles    = (array) $integrationHelper->getUserProfiles($lead, $fields);
         $socialProfileUrls = $integrationHelper->getSocialProfileUrlRegex(false);
         /** @var \Mautic\LeadBundle\Model\CompanyModel $model */
-        $companyModel      = $this->getModel('lead.company');
-        $companiesRepo     = $companyModel->getRepository();
-        $companies         = $companiesRepo->getCompaniesByLeadId($objectId);
+        $companyModel  = $this->getModel('lead.company');
+        $companiesRepo = $companyModel->getRepository();
+        $companies     = $companiesRepo->getCompaniesByLeadId($objectId);
         // Set the social profile templates
         if ($socialProfiles) {
             foreach ($socialProfiles as $integration => &$details) {
@@ -350,7 +349,7 @@ public function viewAction($objectId)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'lead'              => $lead,
                     'avatarPanelState'  => $this->request->cookies->get('mautic_lead_avatar_panel', 'expanded'),
                     'fields'            => $fields,
@@ -368,7 +367,7 @@ public function viewAction($objectId)
                         'MauticLeadBundle:Note:index',
                         [
                             'leadId'     => $lead->getId(),
-                            'ignoreAjax' => 1
+                            'ignoreAjax' => 1,
                         ]
                     )->getContent(),
                 ],
@@ -380,16 +379,16 @@ public function viewAction($objectId)
                         'mautic_contact_action',
                         [
                             'objectAction' => 'view',
-                            'objectId'     => $lead->getId()
+                            'objectId'     => $lead->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -410,24 +409,24 @@ public function newAction()
         $fields = $this->getModel('lead.field')->getEntities(
             [
                 'filter' => [
-                    'force'          => [
+                    'force' => [
                         [
                             'column' => 'f.isPublished',
                             'expr'   => 'eq',
-                            'value'  => true
+                            'value'  => true,
                         ],
                         [
                             'column' => 'f.object',
                             'expr'   => 'like',
-                            'value'  => 'lead'
-                        ]
-                    ]
+                            'value'  => 'lead',
+                        ],
+                    ],
                 ],
-                'hydration_mode' => 'HYDRATE_ARRAY'
+                'hydration_mode' => 'HYDRATE_ARRAY',
             ]
         );
 
-        $form   = $model->createForm($lead, $this->get('form.factory'), $action, ['fields' => $fields]);
+        $form = $model->createForm($lead, $this->get('form.factory'), $action, ['fields' => $fields]);
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -444,7 +443,7 @@ public function newAction()
                     $companies = [];
                     if (isset($data['companies'])) {
                         $companies = $data['companies'];
-                        unset ($data['companies']);
+                        unset($data['companies']);
                     }
 
                     $model->setFieldValues($lead, $data, true);
@@ -453,7 +452,7 @@ public function newAction()
                     $model->saveEntity($lead);
 
                     if (!empty($companies)) {
-                        $model->modifyCompanies($lead,$companies);
+                        $model->modifyCompanies($lead, $companies);
                     }
 
                     // Upload avatar if applicable
@@ -477,9 +476,9 @@ public function newAction()
                                 'mautic_contact_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $lead->getId()
+                                    'objectId'     => $lead->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
 
@@ -492,10 +491,10 @@ public function newAction()
                     } elseif ($form->get('buttons')->get('save')->isClicked()) {
                         $viewParameters = [
                             'objectAction' => 'view',
-                            'objectId'     => $lead->getId()
+                            'objectId'     => $lead->getId(),
                         ];
-                        $returnUrl      = $this->generateUrl('mautic_contact_action', $viewParameters);
-                        $template       = 'MauticLeadBundle:Lead:view';
+                        $returnUrl = $this->generateUrl('mautic_contact_action', $viewParameters);
+                        $template  = 'MauticLeadBundle:Lead:view';
                     } else {
                         return $this->editAction($lead->getId(), true);
                     }
@@ -516,7 +515,7 @@ public function newAction()
                             'activeLink'    => '#mautic_contact_index',
                             'mauticContent' => 'lead',
                             'closeModal'    => 1, //just in case in quick form
-                        ]
+                        ],
                     ]
                 );
             }
@@ -528,10 +527,10 @@ public function newAction()
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form'   => $form->createView(),
                     'lead'   => $lead,
-                    'fields' => $model->organizeFieldsByGroup($fields)
+                    'fields' => $model->organizeFieldsByGroup($fields),
                 ],
                 'contentTemplate' => 'MauticLeadBundle:Lead:form.html.php',
                 'passthroughVars' => [
@@ -540,16 +539,16 @@ public function newAction()
                     'route'         => $this->generateUrl(
                         'mautic_contact_action',
                         [
-                            'objectAction' => 'new'
+                            'objectAction' => 'new',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Generates edit form
+     * Generates edit form.
      *
      * @param            $objectId
      * @param bool|false $ignorePost
@@ -574,8 +573,8 @@ public function editAction($objectId, $ignorePost = false)
             'contentTemplate' => 'MauticLeadBundle:Lead:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_contact_index',
-                'mauticContent' => 'lead'
-            ]
+                'mauticContent' => 'lead',
+            ],
         ];
         //lead not found
         if ($lead === null) {
@@ -587,9 +586,9 @@ public function editAction($objectId, $ignorePost = false)
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.lead.lead.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -609,23 +608,23 @@ public function editAction($objectId, $ignorePost = false)
         $fields = $this->getModel('lead.field')->getEntities(
             [
                 'filter' => [
-                    'force'          => [
+                    'force' => [
                         [
                             'column' => 'f.isPublished',
                             'expr'   => 'eq',
-                            'value'  => true
+                            'value'  => true,
                         ],
                         [
                             'column' => 'f.object',
                             'expr'   => 'like',
-                            'value'  => 'lead'
-                        ]
-                    ]
+                            'value'  => 'lead',
+                        ],
+                    ],
                 ],
-                'hydration_mode' => 'HYDRATE_ARRAY'
+                'hydration_mode' => 'HYDRATE_ARRAY',
             ]
         );
-        $form   = $model->createForm($lead, $this->get('form.factory'), $action, ['fields' => $fields]);
+        $form = $model->createForm($lead, $this->get('form.factory'), $action, ['fields' => $fields]);
 
         ///Check for a submitted form and process it
         if (!$ignorePost && $this->request->getMethod() == 'POST') {
@@ -645,13 +644,13 @@ public function editAction($objectId, $ignorePost = false)
                     $companies = [];
                     if (isset($data['companies'])) {
                         $companies = $data['companies'];
-                        unset ($data['companies']);
+                        unset($data['companies']);
                     }
                     $model->setFieldValues($lead, $data, true);
 
                     //form is valid so process the data
                     $model->saveEntity($lead, $form->get('buttons')->get('save')->isClicked());
-                    $model->modifyCompanies($lead,$companies);
+                    $model->modifyCompanies($lead, $companies);
 
                     // Upload avatar if applicable
                     $image = $form['preferred_profile_image']->getData();
@@ -677,9 +676,9 @@ public function editAction($objectId, $ignorePost = false)
                                 'mautic_contact_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $lead->getId()
+                                    'objectId'     => $lead->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
                 }
@@ -691,7 +690,7 @@ public function editAction($objectId, $ignorePost = false)
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId'     => $lead->getId()
+                    'objectId'     => $lead->getId(),
                 ];
 
                 return $this->postActionRedirect(
@@ -700,7 +699,7 @@ public function editAction($objectId, $ignorePost = false)
                         [
                             'returnUrl'       => $this->generateUrl('mautic_contact_action', $viewParameters),
                             'viewParameters'  => $viewParameters,
-                            'contentTemplate' => 'MauticLeadBundle:Lead:view'
+                            'contentTemplate' => 'MauticLeadBundle:Lead:view',
                         ]
                     )
                 );
@@ -716,10 +715,10 @@ public function editAction($objectId, $ignorePost = false)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form'   => $form->createView(),
                     'lead'   => $lead,
-                    'fields' => $lead->getFields() //pass in the lead fields as they are already organized by ['group']['alias']
+                    'fields' => $lead->getFields(), //pass in the lead fields as they are already organized by ['group']['alias']
                 ],
                 'contentTemplate' => 'MauticLeadBundle:Lead:form.html.php',
                 'passthroughVars' => [
@@ -729,16 +728,16 @@ public function editAction($objectId, $ignorePost = false)
                         'mautic_contact_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId'     => $lead->getId()
+                            'objectId'     => $lead->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Upload an asset
+     * Upload an asset.
      *
      * @param Lead $lead
      */
@@ -758,9 +757,9 @@ private function uploadAvatar(Lead $lead)
     }
 
     /**
-     * Generates merge form and action
+     * Generates merge form and action.
      *
-     * @param            $objectId
+     * @param   $objectId
      *
      * @return array|JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -780,8 +779,8 @@ public function mergeAction($objectId)
             'contentTemplate' => 'MauticLeadBundle:Lead:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_contact_index',
-                'mauticContent' => 'lead'
-            ]
+                'mauticContent' => 'lead',
+            ],
         ];
 
         if ($mainLead === null) {
@@ -793,15 +792,14 @@ public function mergeAction($objectId)
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.lead.lead.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
         }
 
-
         //do some default filtering
         $session = $this->get('session');
         $search  = $this->request->get('search', $session->get('mautic.lead.merge.filter', ''));
@@ -815,14 +813,14 @@ public function mergeAction($objectId)
                     [
                         'column' => 'l.date_identified',
                         'expr'   => 'isNotNull',
-                        'value'  => $mainLead->getId()
+                        'value'  => $mainLead->getId(),
                     ],
                     [
                         'column' => 'l.id',
                         'expr'   => 'neq',
-                        'value'  => $mainLead->getId()
-                    ]
-                ]
+                        'value'  => $mainLead->getId(),
+                    ],
+                ],
             ];
 
             $leads = $model->getEntities(
@@ -831,7 +829,7 @@ public function mergeAction($objectId)
                     'filter'         => $filter,
                     'orderBy'        => 'l.firstname,l.lastname,l.company,l.email',
                     'orderByDir'     => 'ASC',
-                    'withTotalCount' => false
+                    'withTotalCount' => false,
                 ]
             );
         }
@@ -848,7 +846,7 @@ public function mergeAction($objectId)
             [],
             [
                 'action' => $action,
-                'leads'  => $leadChoices
+                'leads'  => $leadChoices,
             ]
         );
 
@@ -869,9 +867,9 @@ public function mergeAction($objectId)
                                         [
                                             'type'    => 'error',
                                             'msg'     => 'mautic.lead.lead.error.notfound',
-                                            'msgVars' => ['%id%' => $secLead->getId()]
-                                        ]
-                                    ]
+                                            'msgVars' => ['%id%' => $secLead->getId()],
+                                        ],
+                                    ],
                                 ]
                             )
                         );
@@ -893,9 +891,7 @@ public function mergeAction($objectId)
                 }
             }
 
-
             if ($valid) {
-
                 $viewParameters = [
                     'objectId'     => $mainLead->getId(),
                     'objectAction' => 'view',
@@ -907,8 +903,8 @@ public function mergeAction($objectId)
                         'viewParameters'  => $viewParameters,
                         'contentTemplate' => 'MauticLeadBundle:Lead:view',
                         'passthroughVars' => [
-                            'closeModal' => 1
-                        ]
+                            'closeModal' => 1,
+                        ],
                     ]
                 );
             }
@@ -918,7 +914,7 @@ public function mergeAction($objectId)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'tmpl'         => $tmpl,
                     'leads'        => $leads,
                     'searchValue'  => $search,
@@ -928,32 +924,32 @@ public function mergeAction($objectId)
                         'mautic_contact_action',
                         [
                             'objectAction' => 'merge',
-                            'objectId'     => $mainLead->getId()
+                            'objectId'     => $mainLead->getId(),
                         ]
                     ),
                 ],
                 'contentTemplate' => 'MauticLeadBundle:Lead:merge.html.php',
                 'passthroughVars' => [
                     'route'  => false,
-                    'target' => ($tmpl == 'update') ? '.lead-merge-options' : null
-                ]
+                    'target' => ($tmpl == 'update') ? '.lead-merge-options' : null,
+                ],
             ]
         );
     }
 
     /**
-     * Generates contact frequency rules form and action
+     * Generates contact frequency rules form and action.
      *
-     * @param            $objectId
+     * @param   $objectId
      *
      * @return array|JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function contactFrequencyAction ($objectId)
+    public function contactFrequencyAction($objectId)
     {
         /** @var LeadModel $model */
         $model = $this->getModel('lead');
         $lead  = $model->getEntity($objectId);
-        $data = [];
+        $data  = [];
         if ($lead != null && $this->get('mautic.security')->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser())) {
             $frequencyRules = $model->getFrequencyRule($lead);
 
@@ -970,7 +966,7 @@ public function contactFrequencyAction ($objectId)
                 [],
                 [
                     'action' => $action,
-                    'data' => $data
+                    'data'   => $data,
                 ]
             );
             if ($this->request->getMethod() == 'POST') {
@@ -993,16 +989,17 @@ public function contactFrequencyAction ($objectId)
                             'viewParameters'  => $viewParameters,
                             'contentTemplate' => 'MauticLeadBundle:Lead:view',
                             'passthroughVars' => [
-                                'closeModal' => 1
-                            ]
+                                'closeModal' => 1,
+                            ],
                         ]
                     );
                 }
             }
             $tmpl = $this->request->get('tmpl', 'index');
+
             return $this->delegateView(
                 [
-                    'viewParameters'   => [
+                    'viewParameters' => [
                         'tmpl'         => $tmpl,
                         'action'       => $action,
                         'form'         => $form->createView(),
@@ -1010,24 +1007,24 @@ public function contactFrequencyAction ($objectId)
                             'mautic_contact_action',
                             [
                                 'objectAction' => 'contactFrequency',
-                                'objectId'     => $lead->getId()
+                                'objectId'     => $lead->getId(),
                             ]
                         ),
                     ],
                     'contentTemplate' => 'MauticLeadBundle:Lead:frequency.html.php',
                     'passthroughVars' => [
                         'route'  => false,
-                        'target' => ($tmpl == 'update') ? '.lead-frequency-options' : null
-                    ]
+                        'target' => ($tmpl == 'update') ? '.lead-frequency-options' : null,
+                    ],
                 ]
             );
         }
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -1043,8 +1040,8 @@ public function deleteAction($objectId)
             'contentTemplate' => 'MauticLeadBundle:Lead:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_contact_index',
-                'mauticContent' => 'lead'
-            ]
+                'mauticContent' => 'lead',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -1055,7 +1052,7 @@ public function deleteAction($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.lead.lead.error.notfound',
-                    'msgVars' => ['%id%' => $objectId]
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'lead:leads:deleteown',
@@ -1075,8 +1072,8 @@ public function deleteAction($objectId)
                     'msg'     => 'mautic.core.notice.deleted',
                     'msgVars' => [
                         '%name%' => $identifier,
-                        '%id%'   => $objectId
-                    ]
+                        '%id%'   => $objectId,
+                    ],
                 ];
             }
         } //else don't do anything
@@ -1085,14 +1082,14 @@ public function deleteAction($objectId)
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -1108,8 +1105,8 @@ public function batchDeleteAction()
             'contentTemplate' => 'MauticLeadBundle:Lead:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_contact_index',
-                'mauticContent' => 'lead'
-            ]
+                'mauticContent' => 'lead',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -1125,7 +1122,7 @@ public function batchDeleteAction()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.lead.lead.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     'lead:leads:deleteown',
@@ -1149,8 +1146,8 @@ public function batchDeleteAction()
                     'type'    => 'notice',
                     'msg'     => 'mautic.lead.lead.notice.batch_deleted',
                     'msgVars' => [
-                        '%count%' => count($entities)
-                    ]
+                        '%count%' => count($entities),
+                    ],
                 ];
             }
         } //else don't do anything
@@ -1159,14 +1156,14 @@ public function batchDeleteAction()
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Add/remove lead from a list
+     * Add/remove lead from a list.
      *
      * @param $objectId
      *
@@ -1197,17 +1194,17 @@ public function listAction($objectId)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'lists'      => $lists,
                     'leadsLists' => $leadsLists,
-                    'lead'       => $lead
+                    'lead'       => $lead,
                 ],
-                'contentTemplate' => 'MauticLeadBundle:LeadLists:index.html.php'
+                'contentTemplate' => 'MauticLeadBundle:LeadLists:index.html.php',
             ]
         );
     }
     /**
-     * Add/remove lead from a company
+     * Add/remove lead from a company.
      *
      * @param $objectId
      *
@@ -1228,31 +1225,31 @@ public function companyAction($objectId)
         ) {
             /** @var \Mautic\LeadBundle\Model\CompanyModel $companyModel */
             $companyModel = $this->getModel('lead.company');
-            $companies     = $companyModel->getUserCompanies();
+            $companies    = $companyModel->getUserCompanies();
 
             // Get a list of lists for the lead
             $companyLeads = $lead->getCompanies();
             foreach ($companyLeads as $cl) {
                 $companyLead[$cl->getId()] = $cl->getId();
             }
-
         } else {
             $companies = $companyLead = [];
         }
+
         return $this->delegateView(
             [
-                'viewParameters'  => [
-                    'companies'      => $companies,
+                'viewParameters' => [
+                    'companies'   => $companies,
                     'companyLead' => $companyLead,
-                    'lead'       => $lead
+                    'lead'        => $lead,
                 ],
-                'contentTemplate' => 'MauticLeadBundle:Lead:company.html.php'
+                'contentTemplate' => 'MauticLeadBundle:Lead:company.html.php',
             ]
         );
     }
 
     /**
-     * Add/remove lead from a campaign
+     * Add/remove lead from a campaign.
      *
      * @param $objectId
      *
@@ -1284,11 +1281,11 @@ public function campaignAction($objectId)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'campaigns' => $campaigns,
-                    'lead'      => $lead
+                    'lead'      => $lead,
                 ],
-                'contentTemplate' => 'MauticLeadBundle:LeadCampaigns:index.html.php'
+                'contentTemplate' => 'MauticLeadBundle:LeadCampaigns:index.html.php',
             ]
         );
     }
@@ -1356,7 +1353,7 @@ public function importAction($objectId = 0, $ignorePost = false)
                     [
                         'action'        => $action,
                         'lead_fields'   => $leadFields,
-                        'import_fields' => $importFields
+                        'import_fields' => $importFields,
                     ]
                 );
 
@@ -1398,17 +1395,17 @@ public function importAction($objectId = 0, $ignorePost = false)
                             array_walk($data, create_function('&$val', '$val = trim($val);'));
 
                             if ($lineNumber === 0) {
-                                $lineNumber++;
+                                ++$lineNumber;
                                 continue;
                             }
 
-                            $lineNumber++;
+                            ++$lineNumber;
 
                             // Increase progress count
-                            $progress[0]++;
+                            ++$progress[0];
 
                             // Decrease batch count
-                            $batchSize--;
+                            --$batchSize;
 
                             if (is_array($data) && $dataCount = count($data)) {
                                 // Ensure the number of headers are equal with data
@@ -1418,7 +1415,7 @@ public function importAction($objectId = 0, $ignorePost = false)
                                     $diffCount = ($headerCount - $dataCount);
 
                                     if ($diffCount < 0) {
-                                        $stats['ignored']++;
+                                        ++$stats['ignored'];
                                         $stats['failures'][$lineNumber] = $this->get('translator')->trans(
                                             'mautic.lead.import.error.header_mismatch'
                                         );
@@ -1434,7 +1431,7 @@ public function importAction($objectId = 0, $ignorePost = false)
                                 try {
                                     $prevent = false;
                                     foreach ($data as $key => $value) {
-                                        if ($value != "") {
+                                        if ($value != '') {
                                             $prevent = true;
                                             break;
                                         }
@@ -1442,23 +1439,23 @@ public function importAction($objectId = 0, $ignorePost = false)
                                     if ($prevent) {
                                         $merged = $model->importLead($importFields, $data, $defaultOwner, $defaultList, $defaultTags);
                                         if ($merged) {
-                                            $stats['merged']++;
+                                            ++$stats['merged'];
                                         } else {
-                                            $stats['created']++;
+                                            ++$stats['created'];
                                         }
                                     } else {
-                                        $stats['ignored']++;
+                                        ++$stats['ignored'];
                                         $stats['failures'][$lineNumber] = $this->get('translator')->trans(
                                             'mautic.lead.import.error.line_empty'
                                         );
                                     }
                                 } catch (\Exception $e) {
                                     // Email validation likely failed
-                                    $stats['ignored']++;
+                                    ++$stats['ignored'];
                                     $stats['failures'][$lineNumber] = $e->getMessage();
                                 }
                             } else {
-                                $stats['ignored']++;
+                                ++$stats['ignored'];
                                 $stats['failures'][$lineNumber] = $this->get('translator')->trans('mautic.lead.import.error.line_empty');
                             }
                         }
@@ -1474,7 +1471,6 @@ public function importAction($objectId = 0, $ignorePost = false)
                         $progress[0] = $progress[1];
                         $this->resetImport($fullPath);
                         $complete = true;
-
                     } else {
                         $complete = false;
                         $session->set('mautic.lead.import.inprogress', false);
@@ -1483,7 +1479,7 @@ public function importAction($objectId = 0, $ignorePost = false)
 
                     break;
                 } else {
-                    $checks++;
+                    ++$checks;
                     $session->set('mautic.lead.import.progresschecks', $checks);
                 }
         }
@@ -1544,10 +1540,10 @@ public function importAction($objectId = 0, $ignorePost = false)
                                     }
                                 } catch (FileException $e) {
                                     if (strpos($e->getMessage(), 'upload_max_filesize') !== false) {
-                                        $errorMessage = 'mautic.lead.import.filetoolarge';
-                                        $errorParameters = array(
-                                            '%upload_max_filesize%' => ini_get('upload_max_filesize')
-                                        );
+                                        $errorMessage    = 'mautic.lead.import.filetoolarge';
+                                        $errorParameters = [
+                                            '%upload_max_filesize%' => ini_get('upload_max_filesize'),
+                                        ];
                                     } else {
                                         $errorMessage = 'mautic.lead.import.filenotreadable';
                                     }
@@ -1603,7 +1599,6 @@ public function importAction($objectId = 0, $ignorePost = false)
                                 )
                             );
                         } else {
-
                             $defaultOwner = ($owner) ? $owner->getId() : null;
                             $session->set('mautic.lead.import.fields', $matchedFields);
                             $session->set('mautic.lead.import.defaultowner', $defaultOwner);
@@ -1637,7 +1632,7 @@ public function importAction($objectId = 0, $ignorePost = false)
             $viewParameters  = [
                 'progress' => $progress,
                 'stats'    => $stats,
-                'complete' => $complete
+                'complete' => $complete,
             ];
         }
 
@@ -1656,12 +1651,12 @@ public function importAction($objectId = 0, $ignorePost = false)
                         'route'         => $this->generateUrl(
                             'mautic_contact_action',
                             [
-                                'objectAction' => 'import'
+                                'objectAction' => 'import',
                             ]
                         ),
-                        'step'          => $step,
-                        'progress'      => $progress
-                    ]
+                        'step'     => $step,
+                        'progress' => $progress,
+                    ],
                 ]
             );
         }
@@ -1775,7 +1770,7 @@ public function emailAction($objectId = 0)
                                 'mautic.lead.email.notice.sent',
                                 [
                                     '%subject%' => $subject,
-                                    '%email%'   => $leadEmail
+                                    '%email%'   => $leadEmail,
                                 ]
                             );
                         } else {
@@ -1793,7 +1788,7 @@ public function emailAction($objectId = 0)
                                         [
                                             '%subject%' => $subject,
                                             '%email%'   => $leadEmail,
-                                            '%error%'   => (is_array($errors)) ? implode('<br />', $errors) : $errors
+                                            '%error%'   => (is_array($errors)) ? implode('<br />', $errors) : $errors,
                                         ],
                                         'flashes'
                                     )
@@ -1817,16 +1812,16 @@ public function emailAction($objectId = 0)
             if ($inList) {
                 $route          = 'mautic_contact_index';
                 $viewParameters = [
-                    'page' => $this->get('session')->get('mautic.lead.page', 1)
+                    'page' => $this->get('session')->get('mautic.lead.page', 1),
                 ];
-                $func           = 'index';
+                $func = 'index';
             } else {
                 $route          = 'mautic_contact_action';
                 $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId'     => $objectId
+                    'objectId'     => $objectId,
                 ];
-                $func           = 'view';
+                $func = 'view';
             }
 
             return $this->postActionRedirect(
@@ -1836,8 +1831,8 @@ public function emailAction($objectId = 0)
                     'contentTemplate' => 'MauticLeadBundle:Lead:'.$func,
                     'passthroughVars' => [
                         'mauticContent' => 'lead',
-                        'closeModal'    => 1
-                    ]
+                        'closeModal'    => 1,
+                    ],
                 ]
             );
         }
@@ -1847,18 +1842,18 @@ public function emailAction($objectId = 0)
                 'contentTemplate' => 'MauticLeadBundle:Lead:email.html.php',
                 'viewParameters'  => [
                     'form' => $form->createView(),
-                    'dnc'  => $dnc
+                    'dnc'  => $dnc,
                 ],
                 'passthroughVars' => [
                     'mauticContent' => 'leadEmail',
-                    'route'         => false
-                ]
+                    'route'         => false,
+                ],
             ]
         );
     }
 
     /**
-     * Bulk edit lead lists
+     * Bulk edit lead lists.
      *
      * @param int $objectId
      *
@@ -1876,16 +1871,16 @@ public function batchListsAction($objectId = 0)
             if (is_array($ids)) {
                 $entities = $model->getEntities(
                     [
-                        'filter'           => [
+                        'filter' => [
                             'force' => [
                                 [
                                     'column' => 'l.id',
                                     'expr'   => 'in',
-                                    'value'  => $ids
-                                ]
+                                    'value'  => $ids,
+                                ],
                             ],
                         ],
-                        'ignore_paginator' => true
+                        'ignore_paginator' => true,
                     ]
                 );
             }
@@ -1893,7 +1888,7 @@ public function batchListsAction($objectId = 0)
             $count = 0;
             foreach ($entities as $lead) {
                 if ($this->get('mautic.security')->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser())) {
-                    $count++;
+                    ++$count;
 
                     if (!empty($data['add'])) {
                         $model->addToLists($lead, $data['add']);
@@ -1909,14 +1904,14 @@ public function batchListsAction($objectId = 0)
                 'mautic.lead.batch_leads_affected',
                 [
                     'pluralCount' => $count,
-                    '%count%'     => $count
+                    '%count%'     => $count,
                 ]
             );
 
             return new JsonResponse(
                 [
                     'closeModal' => true,
-                    'flashes'    => $this->getFlashContent()
+                    'flashes'    => $this->getFlashContent(),
                 ]
             );
         } else {
@@ -1932,35 +1927,35 @@ public function batchListsAction($objectId = 0)
             $route = $this->generateUrl(
                 'mautic_contact_action',
                 [
-                    'objectAction' => 'batchLists'
+                    'objectAction' => 'batchLists',
                 ]
             );
 
             return $this->delegateView(
                 [
-                    'viewParameters'  => [
+                    'viewParameters' => [
                         'form' => $this->createForm(
                             'lead_batch',
                             [],
                             [
                                 'items'  => $items,
-                                'action' => $route
+                                'action' => $route,
                             ]
-                        )->createView()
+                        )->createView(),
                     ],
                     'contentTemplate' => 'MauticLeadBundle:Batch:form.html.php',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
                         'mauticContent' => 'leadBatch',
-                        'route'         => $route
-                    ]
+                        'route'         => $route,
+                    ],
                 ]
             );
         }
     }
 
     /**
-     * Bulk edit lead campaigns
+     * Bulk edit lead campaigns.
      *
      * @param int $objectId
      *
@@ -1981,23 +1976,22 @@ public function batchCampaignsAction($objectId = 0)
             if (is_array($ids)) {
                 $entities = $model->getEntities(
                     [
-                        'filter'           => [
+                        'filter' => [
                             'force' => [
                                 [
                                     'column' => 'l.id',
                                     'expr'   => 'in',
-                                    'value'  => $ids
-                                ]
-                            ]
+                                    'value'  => $ids,
+                                ],
+                            ],
                         ],
-                        'ignore_paginator' => true
+                        'ignore_paginator' => true,
                     ]
                 );
             }
 
             foreach ($entities as $key => $lead) {
                 if (!$this->get('mautic.security')->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser())) {
-
                     unset($entities[$key]);
                 }
             }
@@ -2008,16 +2002,16 @@ public function batchCampaignsAction($objectId = 0)
             if ($count = count($entities)) {
                 $campaigns = $campaignModel->getEntities(
                     [
-                        'filter'           => [
+                        'filter' => [
                             'force' => [
                                 [
                                     'column' => 'c.id',
                                     'expr'   => 'in',
-                                    'value'  => array_merge($add, $remove)
-                                ]
-                            ]
+                                    'value'  => array_merge($add, $remove),
+                                ],
+                            ],
                         ],
-                        'ignore_paginator' => true
+                        'ignore_paginator' => true,
                     ]
                 );
 
@@ -2038,14 +2032,14 @@ public function batchCampaignsAction($objectId = 0)
                 'mautic.lead.batch_leads_affected',
                 [
                     'pluralCount' => $count,
-                    '%count%'     => $count
+                    '%count%'     => $count,
                 ]
             );
 
             return new JsonResponse(
                 [
                     'closeModal' => true,
-                    'flashes'    => $this->getFlashContent()
+                    'flashes'    => $this->getFlashContent(),
                 ]
             );
         } else {
@@ -2059,35 +2053,35 @@ public function batchCampaignsAction($objectId = 0)
             $route = $this->generateUrl(
                 'mautic_contact_action',
                 [
-                    'objectAction' => 'batchCampaigns'
+                    'objectAction' => 'batchCampaigns',
                 ]
             );
 
             return $this->delegateView(
                 [
-                    'viewParameters'  => [
+                    'viewParameters' => [
                         'form' => $this->createForm(
                             'lead_batch',
                             [],
                             [
                                 'items'  => $items,
-                                'action' => $route
+                                'action' => $route,
                             ]
-                        )->createView()
+                        )->createView(),
                     ],
                     'contentTemplate' => 'MauticLeadBundle:Batch:form.html.php',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
                         'mauticContent' => 'leadBatch',
-                        'route'         => $route
-                    ]
+                        'route'         => $route,
+                    ],
                 ]
             );
         }
     }
 
     /**
-     * Bulk add leads to the DNC list
+     * Bulk add leads to the DNC list.
      *
      * @param int $objectId
      *
@@ -2105,16 +2099,16 @@ public function batchDncAction($objectId = 0)
             if (is_array($ids)) {
                 $entities = $model->getEntities(
                     [
-                        'filter'           => [
+                        'filter' => [
                             'force' => [
                                 [
                                     'column' => 'l.id',
                                     'expr'   => 'in',
-                                    'value'  => $ids
-                                ]
+                                    'value'  => $ids,
+                                ],
                             ],
                         ],
-                        'ignore_paginator' => true
+                        'ignore_paginator' => true,
                     ]
                 );
             }
@@ -2123,7 +2117,6 @@ public function batchDncAction($objectId = 0)
                 $persistEntities = [];
                 foreach ($entities as $lead) {
                     if ($this->get('mautic.security')->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser())) {
-
                         if ($model->addDncForLead($lead, 'email', $data['reason'], DoNotContact::MANUAL)) {
                             $persistEntities[] = $lead;
                         }
@@ -2138,48 +2131,48 @@ public function batchDncAction($objectId = 0)
                 'mautic.lead.batch_leads_affected',
                 [
                     'pluralCount' => $count,
-                    '%count%'     => $count
+                    '%count%'     => $count,
                 ]
             );
 
             return new JsonResponse(
                 [
                     'closeModal' => true,
-                    'flashes'    => $this->getFlashContent()
+                    'flashes'    => $this->getFlashContent(),
                 ]
             );
         } else {
             $route = $this->generateUrl(
                 'mautic_contact_action',
                 [
-                    'objectAction' => 'batchDnc'
+                    'objectAction' => 'batchDnc',
                 ]
             );
 
             return $this->delegateView(
                 [
-                    'viewParameters'  => [
+                    'viewParameters' => [
                         'form' => $this->createForm(
                             'lead_batch_dnc',
                             [],
                             [
-                                'action' => $route
+                                'action' => $route,
                             ]
-                        )->createView()
+                        )->createView(),
                     ],
                     'contentTemplate' => 'MauticLeadBundle:Batch:form.html.php',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
                         'mauticContent' => 'leadBatch',
-                        'route'         => $route
-                    ]
+                        'route'         => $route,
+                    ],
                 ]
             );
         }
     }
 
     /**
-     * Bulk edit lead stages
+     * Bulk edit lead stages.
      *
      * @param int $objectId
      *
@@ -2197,16 +2190,16 @@ public function batchStagesAction($objectId = 0)
             if (is_array($ids)) {
                 $entities = $model->getEntities(
                     [
-                        'filter'           => [
+                        'filter' => [
                             'force' => [
                                 [
                                     'column' => 'l.id',
                                     'expr'   => 'in',
-                                    'value'  => $ids
-                                ]
+                                    'value'  => $ids,
+                                ],
                             ],
                         ],
-                        'ignore_paginator' => true
+                        'ignore_paginator' => true,
                     ]
                 );
             }
@@ -2214,7 +2207,7 @@ public function batchStagesAction($objectId = 0)
             $count = 0;
             foreach ($entities as $lead) {
                 if ($this->get('mautic.security')->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser())) {
-                    $count++;
+                    ++$count;
 
                     if (!empty($data['addstage'])) {
                         $stageModel = $this->getModel('stage');
@@ -2235,14 +2228,14 @@ public function batchStagesAction($objectId = 0)
                 'mautic.lead.batch_leads_affected',
                 [
                     'pluralCount' => $count,
-                    '%count%'     => $count
+                    '%count%'     => $count,
                 ]
             );
 
             return new JsonResponse(
                 [
                     'closeModal' => true,
-                    'flashes'    => $this->getFlashContent()
+                    'flashes'    => $this->getFlashContent(),
                 ]
             );
         } else {
@@ -2258,35 +2251,35 @@ public function batchStagesAction($objectId = 0)
             $route = $this->generateUrl(
                 'mautic_contact_action',
                 [
-                    'objectAction' => 'batchStages'
+                    'objectAction' => 'batchStages',
                 ]
             );
 
             return $this->delegateView(
                 [
-                    'viewParameters'  => [
+                    'viewParameters' => [
                         'form' => $this->createForm(
                             'lead_batch_stage',
                             [],
                             [
                                 'items'  => $items,
-                                'action' => $route
+                                'action' => $route,
                             ]
-                        )->createView()
+                        )->createView(),
                     ],
                     'contentTemplate' => 'MauticLeadBundle:Batch:form.html.php',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
                         'mauticContent' => 'leadBatch',
-                        'route'         => $route
-                    ]
+                        'route'         => $route,
+                    ],
                 ]
             );
         }
     }
 
     /**
-     * Bulk edit lead's companies
+     * Bulk edit lead's companies.
      *
      * @param int $objectId
      *
@@ -2298,23 +2291,23 @@ public function batchCompaniesAction($objectId = 0)
         $companyModel = $this->getModel('lead.company');
         if ($this->request->getMethod() == 'POST') {
             /** @var \Mautic\LeadBundle\Model\LeadModel $model */
-            $model = $this->getModel('lead');
-            $data  = $this->request->request->get('lead_batch', [], true);
-            $ids   = json_decode($data['ids'], true);
+            $model    = $this->getModel('lead');
+            $data     = $this->request->request->get('lead_batch', [], true);
+            $ids      = json_decode($data['ids'], true);
             $entities = [];
             if (is_array($ids)) {
                 $entities = $model->getEntities(
                     [
-                        'filter'           => [
+                        'filter' => [
                             'force' => [
                                 [
                                     'column' => 'l.id',
                                     'expr'   => 'in',
-                                    'value'  => $ids
-                                ]
+                                    'value'  => $ids,
+                                ],
                             ],
                         ],
-                        'ignore_paginator' => true
+                        'ignore_paginator' => true,
                     ]
                 );
             }
@@ -2322,7 +2315,7 @@ public function batchCompaniesAction($objectId = 0)
             $count = 0;
             foreach ($entities as $lead) {
                 if ($this->get('mautic.security')->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getCreatedBy())) {
-                    $count++;
+                    ++$count;
                     if (!empty($data['add'])) {
                         $companyModel->addLeadToCompany($data['add'], $lead);
                     }
@@ -2337,20 +2330,20 @@ public function batchCompaniesAction($objectId = 0)
                 'mautic.lead.batch_leads_affected',
                 [
                     'pluralCount' => $count,
-                    '%count%'     => $count
+                    '%count%'     => $count,
                 ]
             );
 
             return new JsonResponse(
                 [
                     'closeModal' => true,
-                    'flashes'    => $this->getFlashContent()
+                    'flashes'    => $this->getFlashContent(),
                 ]
             );
         } else {
             // Get a list of lists
             $companies = $companyModel->getUserCompanies();
-            $items  = [];
+            $items     = [];
             foreach ($companies as $company) {
                 $items[$company['id']] = $company['companyname'];
             }
@@ -2358,31 +2351,30 @@ public function batchCompaniesAction($objectId = 0)
             $route = $this->generateUrl(
                 'mautic_contact_action',
                 [
-                    'objectAction' => 'batchCompanies'
+                    'objectAction' => 'batchCompanies',
                 ]
             );
 
             return $this->delegateView(
                 [
-                    'viewParameters'  => [
+                    'viewParameters' => [
                         'form' => $this->createForm(
                             'lead_batch',
                             [],
                             [
                                 'items'  => $items,
-                                'action' => $route
+                                'action' => $route,
                             ]
-                        )->createView()
+                        )->createView(),
                     ],
                     'contentTemplate' => 'MauticLeadBundle:Batch:form.html.php',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_contact_index',
                         'mauticContent' => 'leadBatch',
-                        'route'         => $route
-                    ]
+                        'route'         => $route,
+                    ],
                 ]
             );
         }
     }
-
 }
diff --git a/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php b/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php
index f1804e43b7f..8118ce6f379 100644
--- a/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php
+++ b/app/bundles/LeadBundle/Controller/LeadDetailsTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,9 +17,8 @@
 
 trait LeadDetailsTrait
 {
-
     /**
-     * Get a list of places for the lead based on IP location
+     * Get a list of places for the lead based on IP location.
      *
      * @param Lead $lead
      *
@@ -38,7 +38,7 @@ protected function getPlaces(Lead $lead)
                         } elseif (!empty($details['region'])) {
                             $name = $details['region'];
                         }
-                        $place    = [
+                        $place = [
                             'latLng' => [$details['latitude'], $details['longitude']],
                             'name'   => $name,
                         ];
@@ -67,18 +67,18 @@ protected function getEngagementData(Lead $lead, \DateTime $fromDate = null, \Da
             $fromDate->modify('-6 months');
         }
         if (null == $toDate) {
-            $toDate = new \DateTime;
+            $toDate = new \DateTime();
         }
 
         $lineChart  = new LineChart(null, $fromDate, $toDate);
         $chartQuery = new ChartQuery($this->getDoctrine()->getConnection(), $fromDate, $toDate);
 
         /** @var LeadModel $model */
-        $model = $this->getModel('lead');
+        $model       = $this->getModel('lead');
         $engagements = $model->getEngagementCount($lead, $fromDate, $toDate, 'm', $chartQuery);
         $lineChart->setDataset($translator->trans('mautic.lead.graph.line.all_engagements'), $engagements['byUnit']);
 
-        $pointStats  = $chartQuery->fetchTimeData('lead_points_change_log', 'date_added', ['lead_id' => $lead->getId()]);
+        $pointStats = $chartQuery->fetchTimeData('lead_points_change_log', 'date_added', ['lead_id' => $lead->getId()]);
         $lineChart->setDataset($translator->trans('mautic.lead.graph.line.points'), $pointStats);
 
         return $lineChart->render();
@@ -102,7 +102,7 @@ protected function getEngagements(Lead $lead, array $filters = null, array $orde
                 [
                     'search'        => '',
                     'includeEvents' => [],
-                    'excludeEvents' => []
+                    'excludeEvents' => [],
                 ]
             );
         }
@@ -115,11 +115,11 @@ protected function getEngagements(Lead $lead, array $filters = null, array $orde
 
             $orderBy = [
                 $session->get('mautic.lead.'.$lead->getId().'.timeline.orderby'),
-                $session->get('mautic.lead.'.$lead->getId().'.timeline.orderbydir')
+                $session->get('mautic.lead.'.$lead->getId().'.timeline.orderbydir'),
             ];
         }
         /** @var LeadModel $model */
-        $model  = $this->getModel('lead');
+        $model = $this->getModel('lead');
 
         return $model->getEngagements($lead, $filters, $orderBy, $page);
     }
@@ -137,4 +137,4 @@ protected function getScheduledCampaignEvents(Lead $lead)
 
         return $leadEventLogRepository->getUpcomingEvents(['lead' => $lead, 'scheduled' => 1, 'eventType' => 'action']);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Controller/ListController.php b/app/bundles/LeadBundle/Controller/ListController.php
index 831a5ae7dcc..076a691860c 100644
--- a/app/bundles/LeadBundle/Controller/ListController.php
+++ b/app/bundles/LeadBundle/Controller/ListController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,19 +12,19 @@
 
 use Mautic\CoreBundle\Controller\FormController;
 use Mautic\LeadBundle\Entity\LeadList;
-use Mautic\LeadBundle\Model\ListModel;
 use Mautic\LeadBundle\Model\LeadModel;
+use Mautic\LeadBundle\Model\ListModel;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
 
 class ListController extends FormController
 {
-
     /**
-     * Generate's default list view
+     * Generate's default list view.
      *
      * @param int $page
+     *
      * @return JsonResponse | Response
      */
     public function indexAction($page = 1)
@@ -33,13 +34,13 @@ public function indexAction($page = 1)
         $session = $this->get('session');
 
         //set some permissions
-        $permissions = $this->get('mautic.security')->isGranted(array(
+        $permissions = $this->get('mautic.security')->isGranted([
             'lead:leads:viewown',
             'lead:leads:viewother',
             'lead:lists:viewother',
             'lead:lists:editother',
-            'lead:lists:deleteother'
-        ), 'RETURN_ARRAY');
+            'lead:lists:deleteother',
+        ], 'RETURN_ARRAY');
 
         //Lists can be managed by anyone who has access to leads
         if (!$permissions['lead:leads:viewown'] && !$permissions['lead:leads:viewother']) {
@@ -52,7 +53,7 @@ public function indexAction($page = 1)
 
         //set limits
         $limit = $session->get('mautic.segment.limit', $this->coreParametersHelper->getParameter('default_pagelimit'));
-        $start = ($page === 1) ? 0 : (($page-1) * $limit);
+        $start = ($page === 1) ? 0 : (($page - 1) * $limit);
         if ($start < 0) {
             $start = 0;
         }
@@ -64,27 +65,27 @@ public function indexAction($page = 1)
         $orderBy    = $session->get('mautic.segment.orderby', 'l.name');
         $orderByDir = $session->get('mautic.segment.orderbydir', 'ASC');
 
-        $filter     = array(
-            'string' => $search
-        );
+        $filter = [
+            'string' => $search,
+        ];
 
-        $tmpl       = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
+        $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
 
         if (!$permissions['lead:lists:viewother']) {
             $translator      = $this->get('translator');
             $mine            = $translator->trans('mautic.core.searchcommand.ismine');
             $global          = $translator->trans('mautic.lead.list.searchcommand.isglobal');
-            $filter["force"] = " ($mine or $global)";
+            $filter['force'] = " ($mine or $global)";
         }
 
         $items = $model->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
                 'orderByDir' => $orderByDir,
-            ));
+            ]);
 
         $count = count($items);
 
@@ -96,29 +97,29 @@ public function indexAction($page = 1)
                 $lastPage = (ceil($count / $limit)) ?: 1;
             }
             $session->set('mautic.segment.page', $lastPage);
-            $returnUrl = $this->generateUrl('mautic_segment_index', array('page' => $lastPage));
-
-            return $this->postActionRedirect(array(
-                'returnUrl'       => $returnUrl,
-                'viewParameters'  => array(
-                    'page'        => $lastPage,
-                    'tmpl'        => $tmpl
-                ),
+            $returnUrl = $this->generateUrl('mautic_segment_index', ['page' => $lastPage]);
+
+            return $this->postActionRedirect([
+                'returnUrl'      => $returnUrl,
+                'viewParameters' => [
+                    'page' => $lastPage,
+                    'tmpl' => $tmpl,
+                ],
                 'contentTemplate' => 'MauticLeadBundle:List:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_segment_index',
-                    'mauticContent' => 'leadlist'
-                )
-            ));
+                    'mauticContent' => 'leadlist',
+                ],
+            ]);
         }
 
         //set what page currently on so that we can return here after form submission/cancellation
         $session->set('mautic.segment.page', $page);
 
         $listIds    = array_keys($items->getIterator()->getArrayCopy());
-        $leadCounts = (!empty($listIds)) ? $model->getRepository()->getLeadCount($listIds) : array();
+        $leadCounts = (!empty($listIds)) ? $model->getRepository()->getLeadCount($listIds) : [];
 
-        $parameters = array(
+        $parameters = [
             'items'       => $items,
             'leadCounts'  => $leadCounts,
             'page'        => $page,
@@ -127,42 +128,42 @@ public function indexAction($page = 1)
             'security'    => $this->get('mautic.security'),
             'tmpl'        => $tmpl,
             'currentUser' => $this->user,
-            'searchValue' => $search
-        );
+            'searchValue' => $search,
+        ];
 
-        return $this->delegateView(array(
+        return $this->delegateView([
             'viewParameters'  => $parameters,
             'contentTemplate' => 'MauticLeadBundle:List:list.html.php',
-            'passthroughVars' => array(
-                'activeLink'     => '#mautic_segment_index',
-                'route'          => $this->generateUrl('mautic_segment_index', array('page' => $page)),
-                'mauticContent'  => 'leadlist'
-            )
-        ));
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_segment_index',
+                'route'         => $this->generateUrl('mautic_segment_index', ['page' => $page]),
+                'mauticContent' => 'leadlist',
+            ],
+        ]);
     }
 
     /**
-     * Generate's new form and processes post data
+     * Generate's new form and processes post data.
      *
      * @return JsonResponse | RedirectResponse | Response
      */
-    public function newAction ()
+    public function newAction()
     {
         if (!$this->get('mautic.security')->isGranted('lead:leads:viewown')) {
             return $this->accessDenied();
         }
 
         //retrieve the entity
-        $list     = new LeadList();
+        $list = new LeadList();
         /** @var ListModel $model */
-        $model      =$this->getModel('lead.list');
+        $model = $this->getModel('lead.list');
         //set the page we came from
-        $page       = $this->get('session')->get('mautic.segment.page', 1);
+        $page = $this->get('session')->get('mautic.segment.page', 1);
         //set the return URL for post actions
-        $returnUrl  = $this->generateUrl('mautic_segment_index', array('page' => $page));
-        $action     = $this->generateUrl('mautic_segment_action', array('objectAction' => 'new'));
+        $returnUrl = $this->generateUrl('mautic_segment_index', ['page' => $page]);
+        $action    = $this->generateUrl('mautic_segment_action', ['objectAction' => 'new']);
         //get the user form factory
-        $form       = $model->createForm($list, $this->get('form.factory'),  $action);
+        $form = $model->createForm($list, $this->get('form.factory'),  $action);
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -172,86 +173,86 @@ public function newAction ()
                     //form is valid so process the data
                     $model->saveEntity($list);
 
-                    $this->addFlash('mautic.core.notice.created',  array(
-                        '%name%'      => $list->getName() . " (" . $list->getAlias() . ")",
+                    $this->addFlash('mautic.core.notice.created',  [
+                        '%name%'      => $list->getName().' ('.$list->getAlias().')',
                         '%menu_link%' => 'mautic_segment_index',
-                        '%url%'       => $this->generateUrl('mautic_segment_action', array(
+                        '%url%'       => $this->generateUrl('mautic_segment_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $list->getId()
-                        ))
-                    ));
+                            'objectId'     => $list->getId(),
+                        ]),
+                    ]);
                 }
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-                return $this->postActionRedirect(array(
+                return $this->postActionRedirect([
                     'returnUrl'       => $returnUrl,
-                    'viewParameters'  => array('page' => $page),
+                    'viewParameters'  => ['page' => $page],
                     'contentTemplate' => 'MauticLeadBundle:List:index',
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => '#mautic_segment_index',
-                        'mauticContent' => 'leadlist'
-                    )
-                ));
+                        'mauticContent' => 'leadlist',
+                    ],
+                ]);
             } elseif ($valid && !$cancelled) {
                 return $this->editAction($list->getId(), true);
             }
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
-                'form'            => $this->setFormTheme($form, 'MauticLeadBundle:List:form.html.php', 'MauticLeadBundle:FormTheme\Filter')
-            ),
+        return $this->delegateView([
+            'viewParameters' => [
+                'form' => $this->setFormTheme($form, 'MauticLeadBundle:List:form.html.php', 'MauticLeadBundle:FormTheme\Filter'),
+            ],
             'contentTemplate' => 'MauticLeadBundle:List:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_segment_index',
-                'route'         => $this->generateUrl('mautic_segment_action', array('objectAction' => 'new')),
-                'mauticContent' => 'leadlist'
-            )
-        ));
+                'route'         => $this->generateUrl('mautic_segment_action', ['objectAction' => 'new']),
+                'mauticContent' => 'leadlist',
+            ],
+        ]);
     }
 
     /**
-     * Generate's edit form and processes post data
+     * Generate's edit form and processes post data.
      *
      * @param            $objectId
      * @param bool|false $ignorePost
      *
      * @return array | JsonResponse | RedirectResponse | Response
      */
-    public function editAction ($objectId, $ignorePost = false)
+    public function editAction($objectId, $ignorePost = false)
     {
         /** @var ListModel $model */
-        $model   = $this->getModel('lead.list');
-        $list    = $model->getEntity($objectId);
+        $model = $this->getModel('lead.list');
+        $list  = $model->getEntity($objectId);
 
         //set the page we came from
-        $page    = $this->get('session')->get('mautic.segment.page', 1);
+        $page = $this->get('session')->get('mautic.segment.page', 1);
 
         //set the return URL
-        $returnUrl  = $this->generateUrl('mautic_segment_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_segment_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticLeadBundle:List:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_segment_index',
-                'mauticContent' => 'leadlist'
-            )
-        );
+                'mauticContent' => 'leadlist',
+            ],
+        ];
         //list not found
         if ($list === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
-                            'type' => 'error',
-                            'msg'  => 'mautic.lead.list.error.notfound',
-                            'msgVars' => array('%id%' => $objectId)
-                        )
-                    )
-                ))
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
+                            'type'    => 'error',
+                            'msg'     => 'mautic.lead.list.error.notfound',
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ])
             );
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
             true, 'lead:lists:editother', $list->getCreatedBy()
@@ -262,7 +263,7 @@ public function editAction ($objectId, $ignorePost = false)
             return $this->isLocked($postActionVars, $list, 'lead.list');
         }
 
-        $action = $this->generateUrl('mautic_segment_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action = $this->generateUrl('mautic_segment_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $form   = $model->createForm($list, $this->get('form.factory'), $action);
 
         ///Check for a submitted form and process it
@@ -273,14 +274,14 @@ public function editAction ($objectId, $ignorePost = false)
                     //form is valid so process the data
                     $model->saveEntity($list, $form->get('buttons')->get('save')->isClicked());
 
-                    $this->addFlash('mautic.core.notice.updated',  array(
-                        '%name%'      => $list->getName() . " (" . $list->getAlias() . ")",
+                    $this->addFlash('mautic.core.notice.updated',  [
+                        '%name%'      => $list->getName().' ('.$list->getAlias().')',
                         '%menu_link%' => 'mautic_segment_index',
-                        '%url%'       => $this->generateUrl('mautic_segment_action', array(
+                        '%url%'       => $this->generateUrl('mautic_segment_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $list->getId()
-                        ))
-                    ));
+                            'objectId'     => $list->getId(),
+                        ]),
+                    ]);
                 }
             } else {
                 //unlock the entity
@@ -295,53 +296,54 @@ public function editAction ($objectId, $ignorePost = false)
             $model->lockEntity($list);
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
-                'form'            => $this->setFormTheme($form, 'MauticLeadBundle:List:form.html.php', 'MauticLeadBundle:FormTheme\Filter'),
-                'currentListId'   => $objectId,
-            ),
+        return $this->delegateView([
+            'viewParameters' => [
+                'form'          => $this->setFormTheme($form, 'MauticLeadBundle:List:form.html.php', 'MauticLeadBundle:FormTheme\Filter'),
+                'currentListId' => $objectId,
+            ],
             'contentTemplate' => 'MauticLeadBundle:List:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_segment_index',
                 'route'         => $action,
-                'mauticContent' => 'leadlist'
-            )
-        ));
+                'mauticContent' => 'leadlist',
+            ],
+        ]);
     }
 
     /**
-     * Delete a list
+     * Delete a list.
+     *
+     * @param   $objectId
      *
-     * @param         $objectId
      * @return JsonResponse | RedirectResponse
      */
     public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.segment.page', 1);
-        $returnUrl = $this->generateUrl('mautic_segment_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_segment_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticLeadBundle:List:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_segment_index',
-                'mauticContent' => 'lead'
-            )
-        );
+                'mauticContent' => 'lead',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             /** @var ListModel $model */
-            $model  =$this->getModel('lead.list');
-            $list = $model->getEntity($objectId);
+            $model = $this->getModel('lead.list');
+            $list  = $model->getEntity($objectId);
 
             if ($list === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.lead.list.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 true, 'lead:lists:deleteother', $list->getCreatedBy()
             )
@@ -353,59 +355,60 @@ public function deleteAction($objectId)
 
             $model->deleteEntity($list);
 
-            $flashes[]  = array(
+            $flashes[] = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $list->getName(),
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return JsonResponse | RedirectResponse
      */
-    public function batchDeleteAction() {
-        $page        = $this->get('session')->get('mautic.segment.page', 1);
-        $returnUrl   = $this->generateUrl('mautic_segment_index', array('page' => $page));
-        $flashes     = array();
+    public function batchDeleteAction()
+    {
+        $page      = $this->get('session')->get('mautic.segment.page', 1);
+        $returnUrl = $this->generateUrl('mautic_segment_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticLeadBundle:List:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_segment_index',
-                'mauticContent' => 'lead'
-            )
-        );
+                'mauticContent' => 'lead',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             /** @var ListModel $model */
             $model     = $this->getModel('lead.list');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.lead.list.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     true, 'lead:lists:deleteother', $entity->getCreatedBy()
                 )) {
@@ -421,20 +424,20 @@ public function batchDeleteAction() {
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
-                    'type' => 'notice',
-                    'msg'  => 'mautic.lead.list.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.lead.list.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
@@ -464,47 +467,48 @@ public function addLeadAction($objectId)
      *
      * @return array | JsonResponse | RedirectResponse
      */
-    protected function changeList($listId, $action) {
-        $page        = $this->get('session')->get('mautic.lead.page', 1);
-        $returnUrl   = $this->generateUrl('mautic_contact_index', array('page' => $page));
-        $flashes     = array();
+    protected function changeList($listId, $action)
+    {
+        $page      = $this->get('session')->get('mautic.lead.page', 1);
+        $returnUrl = $this->generateUrl('mautic_contact_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticLeadBundle:Lead:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_contact_index',
-                'mauticContent' => 'lead'
-            )
-        );
+                'mauticContent' => 'lead',
+            ],
+        ];
 
         $leadId = $this->request->get('leadId');
         if (!empty($leadId) && $this->request->getMethod() == 'POST') {
             /** @var ListModel $model */
-            $model  = $this->getModel('lead.list');
+            $model = $this->getModel('lead.list');
             /** @var LeadList $list */
-            $list   = $model->getEntity($listId);
+            $list = $model->getEntity($listId);
             /** @var LeadModel $leadModel */
             $leadModel = $this->getModel('lead');
             $lead      = $leadModel->getEntity($leadId);
 
             if ($lead === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.lead.lead.error.notfound',
-                    'msgVars' => array('%id%' => $listId)
-                );
+                    'msgVars' => ['%id%' => $listId],
+                ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser()
             )) {
                 return $this->accessDenied();
             } elseif ($list === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.lead.list.error.notfound',
-                    'msgVars' => array('%id%' => $list->getId())
-                );
+                    'msgVars' => ['%id%' => $list->getId()],
+                ];
             } elseif (!$list->isGlobal() && !$this->get('mautic.security')->hasEntityAccess(
                     true, 'lead:lists:viewother', $list->getCreatedBy()
                 )) {
@@ -516,27 +520,27 @@ protected function changeList($listId, $action) {
                 $model->$function($lead, $list, true);
 
                 $identifier = $this->get('translator')->trans($lead->getPrimaryIdentifier());
-                $flashes[]  = array(
-                    'type'    => 'notice',
-                    'msg'     => ($action == 'remove') ? 'mautic.lead.lead.notice.removedfromlists' :
+                $flashes[]  = [
+                    'type' => 'notice',
+                    'msg'  => ($action == 'remove') ? 'mautic.lead.lead.notice.removedfromlists' :
                         'mautic.lead.lead.notice.addedtolists',
-                    'msgVars' => array(
+                    'msgVars' => [
                         '%name%' => $identifier,
                         '%id%'   => $leadId,
                         '%list%' => $list->getName(),
-                        '%url%'  => $this->generateUrl('mautic_contact_action', array(
+                        '%url%'  => $this->generateUrl('mautic_contact_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $leadId
-                        ))
-                    )
-                );
+                            'objectId'     => $leadId,
+                        ]),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 }
diff --git a/app/bundles/LeadBundle/Controller/NoteController.php b/app/bundles/LeadBundle/Controller/NoteController.php
index d462414296b..638607dfd60 100644
--- a/app/bundles/LeadBundle/Controller/NoteController.php
+++ b/app/bundles/LeadBundle/Controller/NoteController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,7 +21,7 @@ class NoteController extends FormController
     use LeadAccessTrait;
 
     /**
-     * Generate's default list view
+     * Generate's default list view.
      *
      * @param $leadId
      *
@@ -29,7 +30,6 @@ class NoteController extends FormController
     public function indexAction($leadId = 0, $page = 1)
     {
         if (empty($leadId)) {
-
             return $this->accessDenied();
         }
 
@@ -66,8 +66,8 @@ public function indexAction($leadId = 0, $page = 1)
             [
                 'column' => 'n.lead',
                 'expr'   => 'eq',
-                'value'  => $lead
-            ]
+                'value'  => $lead,
+            ],
         ];
 
         $tmpl     = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
@@ -88,21 +88,21 @@ public function indexAction($leadId = 0, $page = 1)
             $force[] = [
                 'column' => 'n.type',
                 'expr'   => 'in',
-                'value'  => $noteType
+                'value'  => $noteType,
             ];
         }
 
         $items = $model->getEntities(
             [
-                'filter'         => [
+                'filter' => [
                     'force'  => $force,
-                    'string' => $search
+                    'string' => $search,
                 ],
                 'start'          => $start,
                 'limit'          => $limit,
                 'orderBy'        => $orderBy,
                 'orderByDir'     => $orderByDir,
-                'hydration_mode' => 'HYDRATE_ARRAY'
+                'hydration_mode' => 'HYDRATE_ARRAY',
             ]
         );
 
@@ -110,7 +110,7 @@ public function indexAction($leadId = 0, $page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'notes'       => $items,
                     'lead'        => $lead,
                     'page'        => $page,
@@ -122,20 +122,20 @@ public function indexAction($leadId = 0, $page = 1)
                     'permissions' => [
                         'edit'   => $security->hasEntityAccess('lead:leads:editown', 'lead:leads:editother', $lead->getPermissionUser()),
                         'delete' => $security->hasEntityAccess('lead:leads:deleteown', 'lead:leads:deleteown', $lead->getPermissionUser()),
-                    ]
+                    ],
                 ],
                 'passthroughVars' => [
                     'route'         => false,
                     'mauticContent' => 'leadNote',
-                    'noteCount'     => count($items)
+                    'noteCount'     => count($items),
                 ],
-                'contentTemplate' => 'MauticLeadBundle:Note:list.html.php'
+                'contentTemplate' => 'MauticLeadBundle:Note:list.html.php',
             ]
         );
     }
 
     /**
-     * Generate's new note and processes post data
+     * Generate's new note and processes post data.
      *
      * @param $leadId
      *
@@ -157,7 +157,7 @@ public function newAction($leadId)
             'mautic_contactnote_action',
             [
                 'objectAction' => 'new',
-                'leadId'       => $leadId
+                'leadId'       => $leadId,
             ]
         );
         //get the user form factory
@@ -188,7 +188,7 @@ public function newAction($leadId)
             //just close the modal
             $passthroughVars = [
                 'closeModal'    => 1,
-                'mauticContent' => 'leadNote'
+                'mauticContent' => 'leadNote',
             ];
 
             if ($valid && !$cancelled) {
@@ -201,30 +201,28 @@ public function newAction($leadId)
                         'permissions' => $permissions,
                     ]
                 );
-                $passthroughVars['noteId']      = $note->getId();
+                $passthroughVars['noteId'] = $note->getId();
             }
 
-
             $response = new JsonResponse($passthroughVars);
 
             return $response;
         } else {
-
             return $this->delegateView(
                 [
-                    'viewParameters'  => [
+                    'viewParameters' => [
                         'form'        => $form->createView(),
                         'lead'        => $lead,
-                        'permissions' => $permissions
+                        'permissions' => $permissions,
                     ],
-                    'contentTemplate' => 'MauticLeadBundle:Note:form.html.php'
+                    'contentTemplate' => 'MauticLeadBundle:Note:form.html.php',
                 ]
             );
         }
     }
 
     /**
-     * Generate's edit form and processes post data
+     * Generate's edit form and processes post data.
      *
      * @param $leadId
      * @param $objectId
@@ -252,10 +250,10 @@ public function editAction($leadId, $objectId)
             [
                 'objectAction' => 'edit',
                 'objectId'     => $objectId,
-                'leadId'       => $leadId
+                'leadId'       => $leadId,
             ]
         );
-        $form   = $model->createForm($note, $this->get('form.factory'), $action);
+        $form = $model->createForm($note, $this->get('form.factory'), $action);
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -286,10 +284,10 @@ public function editAction($leadId, $objectId)
                     [
                         'note'        => $note,
                         'lead'        => $lead,
-                        'permissions' => $permissions
+                        'permissions' => $permissions,
                     ]
                 );
-                $passthroughVars['noteId']   = $note->getId();
+                $passthroughVars['noteId'] = $note->getId();
             }
 
             $passthroughVars['mauticContent'] = 'leadNote';
@@ -298,30 +296,28 @@ public function editAction($leadId, $objectId)
 
             return $response;
         } else {
-
             return $this->delegateView(
                 [
-                    'viewParameters'  => [
+                    'viewParameters' => [
                         'form'        => $form->createView(),
                         'lead'        => $lead,
-                        'permissions' => $permissions
+                        'permissions' => $permissions,
                     ],
-                    'contentTemplate' => 'MauticLeadBundle:Note:form.html.php'
+                    'contentTemplate' => 'MauticLeadBundle:Note:form.html.php',
                 ]
             );
         }
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
-     * @param         $objectId
+     * @param   $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function deleteAction($leadId, $objectId)
     {
-
         $lead = $this->checkLeadAccess($leadId, 'view');
         if ($lead instanceof Response) {
             return $lead;
@@ -344,7 +340,7 @@ public function deleteAction($leadId, $objectId)
             [
                 'deleteId'      => $objectId,
                 'mauticContent' => 'leadNote',
-                'downNoteCount' => 1
+                'downNoteCount' => 1,
             ]
         );
 
@@ -352,7 +348,7 @@ public function deleteAction($leadId, $objectId)
     }
 
     /**
-     * Executes an action defined in route
+     * Executes an action defined in route.
      *
      * @param     $objectAction
      * @param int $objectId
@@ -368,4 +364,4 @@ public function executeNoteAction($objectAction, $objectId = 0, $leadId = 0)
             return $this->accessDenied();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Controller/SubscribedEvents/BuilderTokenController.php b/app/bundles/LeadBundle/Controller/SubscribedEvents/BuilderTokenController.php
index 956e35f47cb..084ce061c72 100644
--- a/app/bundles/LeadBundle/Controller/SubscribedEvents/BuilderTokenController.php
+++ b/app/bundles/LeadBundle/Controller/SubscribedEvents/BuilderTokenController.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Controller\SubscribedEvents;
 
 /**
- * Class BuilderTokenController
+ * Class BuilderTokenController.
  */
 class BuilderTokenController extends \Mautic\CoreBundle\Controller\SubscribedEvents\BuilderTokenController
 {
-
     /**
      * @return string
      */
@@ -23,9 +23,6 @@ public function getModelName()
         return 'lead.field';
     }
 
-    /**
-     *
-     */
     public function getBundleName()
     {
         return 'MauticLeadBundle';
@@ -36,7 +33,7 @@ public function getBundleName()
      */
     public function getPermissionSet()
     {
-        return array('lead:fields:full');
+        return ['lead:fields:full'];
     }
 
     /**
@@ -44,19 +41,19 @@ public function getPermissionSet()
      */
     public function getEntityArguments()
     {
-        return array(
-            'filter' => array(
-                'force' => array(
-                    array(
+        return [
+            'filter' => [
+                'force' => [
+                    [
                         'column' => 'f.isPublished',
                         'expr'   => 'eq',
-                        'value'  => true
-                    )
-                )
-            ),
+                        'value'  => true,
+                    ],
+                ],
+            ],
             'orderBy'        => 'f.label',
             'orderByDir'     => 'ASC',
-            'hydration_mode' => 'HYDRATE_ARRAY'
-        );
+            'hydration_mode' => 'HYDRATE_ARRAY',
+        ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Controller/TimelineController.php b/app/bundles/LeadBundle/Controller/TimelineController.php
index 30fe9bdc145..22a60bb3482 100644
--- a/app/bundles/LeadBundle/Controller/TimelineController.php
+++ b/app/bundles/LeadBundle/Controller/TimelineController.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-namespace Mautic\LeadBundle\Controller;
 
+namespace Mautic\LeadBundle\Controller;
 
 use Mautic\CoreBundle\Controller\CommonController;
 use Mautic\CoreBundle\Helper\InputHelper;
@@ -22,13 +23,11 @@ class TimelineController extends CommonController
     public function indexAction(Request $request, $leadId, $page = 1)
     {
         if (empty($leadId)) {
-
             return $this->accessDenied();
         }
 
         $lead = $this->checkLeadAccess($leadId, 'view');
         if ($lead instanceof Response) {
-
             return $lead;
         }
 
@@ -39,14 +38,14 @@ public function indexAction(Request $request, $leadId, $page = 1)
             $filters = [
                 'search'        => InputHelper::clean($request->request->get('search')),
                 'includeEvents' => InputHelper::clean($request->request->get('includeEvents', [])),
-                'excludeEvents' => InputHelper::clean($request->request->get('excludeEvents', []))
+                'excludeEvents' => InputHelper::clean($request->request->get('excludeEvents', [])),
             ];
             $session->set('mautic.lead.'.$leadId.'.timeline.filters', $filters);
         } else {
             $filters = null;
         }
 
-        $order  = [
+        $order = [
             $session->get('mautic.lead.'.$leadId.'.timeline.orderby'),
             $session->get('mautic.lead.'.$leadId.'.timeline.orderbydir'),
         ];
@@ -55,18 +54,18 @@ public function indexAction(Request $request, $leadId, $page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
-                    'lead'        => $lead,
-                    'page'        => $page,
-                    'events'      => $events
+                'viewParameters' => [
+                    'lead'   => $lead,
+                    'page'   => $page,
+                    'events' => $events,
                 ],
                 'passthroughVars' => [
                     'route'         => false,
                     'mauticContent' => 'leadTimeline',
-                    'timelineCount' => $events['total']
+                    'timelineCount' => $events['total'],
                 ],
-                'contentTemplate' => 'MauticLeadBundle:Timeline:list.html.php'
+                'contentTemplate' => 'MauticLeadBundle:Timeline:list.html.php',
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadData.php b/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadData.php
index fd3cf62af62..96344c0de70 100644
--- a/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadData.php
+++ b/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,18 +15,15 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Mautic\CoreBundle\Entity\IpAddress;
 use Mautic\CoreBundle\Helper\CsvHelper;
+use Mautic\LeadBundle\Entity\Lead;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class LoadLeadData
- *
- * @package Mautic\LeadBundle\DataFixtures\ORM
+ * Class LoadLeadData.
  */
 class LoadLeadData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -34,7 +32,6 @@ class LoadLeadData extends AbstractFixture implements OrderedFixtureInterface, C
     /**
      * {@inheritdoc}
      */
-
     public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
@@ -49,9 +46,9 @@ public function load(ObjectManager $manager)
         $leadRepo = $factory->getModel('lead.lead')->getRepository();
         $today    = new \DateTime();
 
-        $leads = CsvHelper::csv_to_array(__DIR__ . '/fakeleaddata.csv');
+        $leads = CsvHelper::csv_to_array(__DIR__.'/fakeleaddata.csv');
         foreach ($leads as $count => $l) {
-            $key = $count+1;
+            $key  = $count + 1;
             $lead = new Lead();
             $lead->setDateAdded($today);
             $ipAddress = new IpAddress();
@@ -76,4 +73,4 @@ public function getOrder()
     {
         return 5;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadFieldData.php b/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadFieldData.php
index b0f757509e7..69dc19352dc 100644
--- a/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadFieldData.php
+++ b/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadFieldData.php
@@ -1,17 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\DataFixtures\ORM;
 
 use Mautic\InstallBundle\InstallFixtures\ORM\LeadFieldData;
+
 /**
- * Class LoadLeadFieldData
+ * Class LoadLeadFieldData.
  */
 class LoadLeadFieldData extends LeadFieldData
 {
diff --git a/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadListData.php b/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadListData.php
index 0bd0eecb0da..6fa4dceccfb 100644
--- a/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadListData.php
+++ b/app/bundles/LeadBundle/DataFixtures/ORM/LoadLeadListData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,13 +18,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadLeadListData
- *
- * @package Mautic\LeadBundle\DataFixtures\ORM
+ * Class LoadLeadListData.
  */
 class LoadLeadListData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -32,7 +30,6 @@ class LoadLeadListData extends AbstractFixture implements OrderedFixtureInterfac
     /**
      * {@inheritdoc}
      */
-
     public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
@@ -43,29 +40,29 @@ public function setContainer(ContainerInterface $container = null)
      */
     public function load(ObjectManager $manager)
     {
-        $adminUser  = $this->getReference('admin-user');
+        $adminUser = $this->getReference('admin-user');
 
         $list = new LeadList();
         $list->setName('United States');
         $list->setAlias('us');
         $list->setCreatedBy($adminUser);
         $list->setIsGlobal(true);
-        $list->setFilters(array(
-            array(
-                'glue'      => 'and',
-                'type'      => 'lookup',
-                'field'     => 'country',
-                'operator'  => '=',
-                'filter'    => 'United States',
-                'display'   => ''
-            )
-        ));
+        $list->setFilters([
+            [
+                'glue'     => 'and',
+                'type'     => 'lookup',
+                'field'    => 'country',
+                'operator' => '=',
+                'filter'   => 'United States',
+                'display'  => '',
+            ],
+        ]);
 
         $this->setReference('lead-list', $list);
         $manager->persist($list);
         $manager->flush();
 
-       $this->container->get('mautic.factory')->getModel('lead.list')->rebuildListLeads($list);
+        $this->container->get('mautic.factory')->getModel('lead.list')->rebuildListLeads($list);
     }
 
     /**
@@ -75,4 +72,4 @@ public function getOrder()
     {
         return 5;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/Company.php b/app/bundles/LeadBundle/Entity/Company.php
index 94706b42a69..1d050051e8b 100644
--- a/app/bundles/LeadBundle/Entity/Company.php
+++ b/app/bundles/LeadBundle/Entity/Company.php
@@ -1,46 +1,40 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
 use Mautic\UserBundle\Entity\User;
-use Mautic\LeadBundle\Entity\Lead;
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Company
- *
- * @package Mautic\LeadBundle\Entity
+ * Class Company.
  */
 class Company extends FormEntity
 {
-
     /**
      * @var int
      */
     private $id;
 
     /**
-     * Used by Mautic to populate the fields pulled from the DB
+     * Used by Mautic to populate the fields pulled from the DB.
      *
      * @var array
      */
     protected $fields = [];
 
     /**
-     * Just a place to store updated field values so we don't have to loop through them again comparing
+     * Just a place to store updated field values so we don't have to loop through them again comparing.
      *
      * @var array
      */
@@ -71,7 +65,7 @@ public function __get($name)
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
         $builder->setTable('companies')
@@ -88,7 +82,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -96,10 +90,10 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('company')
             ->addListProperties(
-                array(
+                [
                     'id',
-                    'fields'
-                )
+                    'fields',
+                ]
             )
             ->build();
     }
@@ -107,12 +101,10 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @param string $prop
      * @param mixed  $val
-     *
-     * @return void
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'owner') {
             if ($current && !$val) {
@@ -122,20 +114,20 @@ protected function isChanged ($prop, $val)
             } elseif ($current && $val && $current->getId() != $val->getId()) {
                 $this->changes['owner'] = [
                     $current->getName().'('.$current->getId().')',
-                    $val->getName().'('.$val->getId().')'
+                    $val->getName().'('.$val->getId().')',
                 ];
             }
         } else {
-            $this->changes[$prop] = array($current, $val);
+            $this->changes[$prop] = [$current, $val];
         }
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
@@ -148,7 +140,7 @@ public function setFields($fields)
         $this->fields = $fields;
     }
     /**
-     * Get the primary identifier for the lead
+     * Get the primary identifier for the lead.
      *
      * @param bool $lastFirst
      *
@@ -183,18 +175,16 @@ public function getFields($ungroup = false)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
     public function getName()
     {
         if (isset($this->updatedFields['companyname'])) {
-
             return $this->updatedFields['companyname'];
         }
         if (!empty($this->fields['core']['companyname']['value'])) {
-
             return $this->fields['core']['companyname']['value'];
         }
 
@@ -202,7 +192,7 @@ public function getName()
     }
 
     /**
-     * Set owner
+     * Set owner.
      *
      * @param User $owner
      *
@@ -217,7 +207,7 @@ public function setOwner(User $owner = null)
     }
 
     /**
-     * Get owner
+     * Get owner.
      *
      * @return User
      */
@@ -227,7 +217,7 @@ public function getOwner()
     }
 
     /**
-     * Add an updated field to persist to the DB and to note changes
+     * Add an updated field to persist to the DB and to note changes.
      *
      * @param        $alias
      * @param        $value
@@ -246,7 +236,7 @@ public function addUpdatedField($alias, $value, $oldValue = '')
     }
 
     /**
-     * Get the array of updated fields
+     * Get the array of updated fields.
      *
      * @return array
      */
@@ -255,9 +245,8 @@ public function getUpdatedFields()
         return $this->updatedFields;
     }
 
-
     /**
-     * Get company field value
+     * Get company field value.
      *
      * @param      $field
      * @param null $group
@@ -267,19 +256,16 @@ public function getUpdatedFields()
     public function getFieldValue($field, $group = null)
     {
         if (isset($this->updatedFields[$field])) {
-
             return $this->updatedFields[$field];
         }
 
         if (!empty($group) && isset($this->fields[$group][$field])) {
-
             return $this->fields[$group][$field]['value'];
         }
 
         foreach ($this->fields as $group => $groupFields) {
             foreach ($groupFields as $name => $details) {
                 if ($name == $field) {
-
                     return $details['value'];
                 }
             }
@@ -287,6 +273,4 @@ public function getFieldValue($field, $group = null)
 
         return false;
     }
-
-
 }
diff --git a/app/bundles/LeadBundle/Entity/CompanyChangeLog.php b/app/bundles/LeadBundle/Entity/CompanyChangeLog.php
index d02fcbfe54b..53eeeddcc00 100644
--- a/app/bundles/LeadBundle/Entity/CompanyChangeLog.php
+++ b/app/bundles/LeadBundle/Entity/CompanyChangeLog.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class PointsChangeLog
- *
- * @package Mautic\LeadBundle\Entity
+ * Class PointsChangeLog.
  */
 class CompanyChangeLog
 {
@@ -57,7 +56,7 @@ class CompanyChangeLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -89,9 +88,9 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -99,9 +98,10 @@ public function getId()
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
+     *
      * @return CompanyChangeLog
      */
     public function setType($type)
@@ -112,7 +112,7 @@ public function setType($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -122,9 +122,10 @@ public function getType()
     }
 
     /**
-     * Set eventName
+     * Set eventName.
      *
      * @param string $eventName
+     *
      * @return CompanyChangeLog
      */
     public function setEventName($eventName)
@@ -135,7 +136,7 @@ public function setEventName($eventName)
     }
 
     /**
-     * Get eventName
+     * Get eventName.
      *
      * @return string
      */
@@ -145,9 +146,10 @@ public function getEventName()
     }
 
     /**
-     * Set actionName
+     * Set actionName.
      *
      * @param string $actionName
+     *
      * @return CompanyChangeLog
      */
     public function setActionName($actionName)
@@ -158,7 +160,7 @@ public function setActionName($actionName)
     }
 
     /**
-     * Get actionName
+     * Get actionName.
      *
      * @return string
      */
@@ -168,9 +170,10 @@ public function getActionName()
     }
 
     /**
-     * Set delta
+     * Set delta.
      *
      * @param Company $company
+     *
      * @return CompanyChangeLog
      */
     public function setCompany($company)
@@ -181,7 +184,7 @@ public function setCompany($company)
     }
 
     /**
-     * Get company
+     * Get company.
      *
      * @return \Mautic\LeadBundle\Entity\Company
      */
@@ -191,9 +194,10 @@ public function getCompany()
     }
 
     /**
-     * Set dateAdded
+     * Set dateAdded.
      *
      * @param \DateTime $dateAdded
+     *
      * @return CompanyChangeLog
      */
     public function setDateAdded($dateAdded)
@@ -204,7 +208,7 @@ public function setDateAdded($dateAdded)
     }
 
     /**
-     * Get dateAdded
+     * Get dateAdded.
      *
      * @return \DateTime
      */
@@ -214,9 +218,10 @@ public function getDateAdded()
     }
 
     /**
-     * Set lead
+     * Set lead.
      *
      * @param \Mautic\LeadBundle\Entity\Lead $lead
+     *
      * @return CompanyChangeLog
      */
     public function setLead(\Mautic\LeadBundle\Entity\Lead $lead)
@@ -227,7 +232,7 @@ public function setLead(\Mautic\LeadBundle\Entity\Lead $lead)
     }
 
     /**
-     * Get lead
+     * Get lead.
      *
      * @return \Mautic\LeadBundle\Entity\Lead
      */
@@ -235,5 +240,4 @@ public function getLead()
     {
         return $this->lead;
     }
-
 }
diff --git a/app/bundles/LeadBundle/Entity/CompanyLead.php b/app/bundles/LeadBundle/Entity/CompanyLead.php
index ee0471073ad..beb7ea7e055 100644
--- a/app/bundles/LeadBundle/Entity/CompanyLead.php
+++ b/app/bundles/LeadBundle/Entity/CompanyLead.php
@@ -1,26 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Mautic\LeadBundle\Entity\Company;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class CompanyLead
- *
- * @package Mautic\LeadBundle\Entity
+ * Class CompanyLead.
  */
 class CompanyLead
 {
-
     /**
      * @var Company
      **/
@@ -46,11 +43,10 @@ class CompanyLead
      */
     private $manuallyAdded = false;
 
-
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -79,7 +75,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return \DateTime
      */
-    public function getDateAdded ()
+    public function getDateAdded()
     {
         return $this->dateAdded;
     }
@@ -87,7 +83,7 @@ public function getDateAdded ()
     /**
      * @param \DateTime $date
      */
-    public function setDateAdded ($date)
+    public function setDateAdded($date)
     {
         $this->dateAdded = $date;
     }
@@ -95,7 +91,7 @@ public function setDateAdded ($date)
     /**
      * @return mixed
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -103,7 +99,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead ($lead)
+    public function setLead($lead)
     {
         $this->lead = $lead;
     }
@@ -111,7 +107,7 @@ public function setLead ($lead)
     /**
      * @return Company
      */
-    public function getCompany ()
+    public function getCompany()
     {
         return $this->company;
     }
@@ -119,7 +115,7 @@ public function getCompany ()
     /**
      * @return Company
      */
-    public function getCompanies ()
+    public function getCompanies()
     {
         return $this->company;
     }
@@ -127,7 +123,7 @@ public function getCompanies ()
     /**
      * @param Company $company
      */
-    public function setCompany ($company)
+    public function setCompany($company)
     {
         $this->company = $company;
     }
@@ -135,7 +131,7 @@ public function setCompany ($company)
     /**
      * @return bool
      */
-    public function getManuallyRemoved ()
+    public function getManuallyRemoved()
     {
         return $this->manuallyRemoved;
     }
@@ -143,7 +139,7 @@ public function getManuallyRemoved ()
     /**
      * @param bool $manuallyRemoved
      */
-    public function setManuallyRemoved ($manuallyRemoved)
+    public function setManuallyRemoved($manuallyRemoved)
     {
         $this->manuallyRemoved = $manuallyRemoved;
     }
@@ -159,7 +155,7 @@ public function wasManuallyRemoved()
     /**
      * @return bool
      */
-    public function getManuallyAdded ()
+    public function getManuallyAdded()
     {
         return $this->manuallyAdded;
     }
@@ -167,7 +163,7 @@ public function getManuallyAdded ()
     /**
      * @param bool $manuallyAdded
      */
-    public function setManuallyAdded ($manuallyAdded)
+    public function setManuallyAdded($manuallyAdded)
     {
         $this->manuallyAdded = $manuallyAdded;
     }
@@ -179,4 +175,4 @@ public function wasManuallyAdded()
     {
         return $this->manuallyAdded;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/CompanyLeadRepository.php b/app/bundles/LeadBundle/Entity/CompanyLeadRepository.php
index 4d3822d813f..20596014847 100644
--- a/app/bundles/LeadBundle/Entity/CompanyLeadRepository.php
+++ b/app/bundles/LeadBundle/Entity/CompanyLeadRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,18 +13,16 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class CompanyLeadRepository
- *
- * @package Mautic\LeadBundle\Entity
+ * Class CompanyLeadRepository.
  */
 class CompanyLeadRepository extends CommonRepository
 {
-
     /**
-     * Get companies by leadId
+     * Get companies by leadId.
      *
      * @param $leadId
      * @param $companyId
+     *
      * @return array
      */
     public function getCompaniesByLeadId($leadId, $companyId = null)
@@ -32,9 +31,9 @@ public function getCompaniesByLeadId($leadId, $companyId = null)
 
         $q->select('cl.company_id, comp.companyname, comp.companycity, comp.companycountry')
             ->from(MAUTIC_TABLE_PREFIX.'companies_leads', 'cl')
-            ->join('cl',MAUTIC_TABLE_PREFIX.'companies','comp','comp.id = cl.company_id')
+            ->join('cl', MAUTIC_TABLE_PREFIX.'companies', 'comp', 'comp.id = cl.company_id')
         ->where('cl.lead_id = :leadId')
-        ->setParameter('leadId',$leadId);
+        ->setParameter('leadId', $leadId);
 
         $q->andWhere(
             $q->expr()->eq('cl.manually_removed', ':false')
@@ -50,4 +49,4 @@ public function getCompaniesByLeadId($leadId, $companyId = null)
 
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/CompanyRepository.php b/app/bundles/LeadBundle/Entity/CompanyRepository.php
index 3d07ff78014..d61523967e7 100644
--- a/app/bundles/LeadBundle/Entity/CompanyRepository.php
+++ b/app/bundles/LeadBundle/Entity/CompanyRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributorcomp. All rights reserved.
+ * @copyright   2014 Mautic Contributorcomp. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,14 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class CompanyRepository
+ * Class CompanyRepository.
  */
 class CompanyRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      *
-     * @param integer $id
+     * @param int $id
      *
      * @return mixed|null
      */
@@ -48,23 +48,23 @@ public function getEntity($id = 0)
         return $entity;
     }
     /**
-     * Get a list of leads
+     * Get a list of leads.
      *
      * @param array $args
      *
      * @return array
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         //Get the list of custom fields
         $fq = $this->_em->getConnection()->createQueryBuilder();
         $fq->select('f.id, f.label, f.alias, f.type, f.field_group as "group"')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_fields', 'f')
-            ->where($fq->expr()->eq('object',':company'))
+            ->from(MAUTIC_TABLE_PREFIX.'lead_fields', 'f')
+            ->where($fq->expr()->eq('object', ':company'))
             ->setParameter('company', 'company');
         $results = $fq->execute()->fetchAll();
 
-        $fields = array();
+        $fields = [];
         foreach ($results as $r) {
             $fields[$r['alias']] = $r;
         }
@@ -108,8 +108,8 @@ public function getEntities($args = array())
         $results = $dq->execute()->fetchAll();
 
         //loop over results to put fields in something that can be assigned to the entities
-        $fieldValues = array();
-        $groups      = array('core', 'other');
+        $fieldValues = [];
+        $groups      = ['core', 'other'];
 
         foreach ($results as $result) {
             $companyId = $result['id'];
@@ -118,7 +118,7 @@ public function getEntities($args = array())
 
             foreach ($result as $k => $r) {
                 if (isset($fields[$k])) {
-                    $fieldValues[$companyId][$fields[$k]['group']][$fields[$k]['alias']] = $fields[$k];
+                    $fieldValues[$companyId][$fields[$k]['group']][$fields[$k]['alias']]          = $fields[$k];
                     $fieldValues[$companyId][$fields[$k]['group']][$fields[$k]['alias']]['value'] = $r;
                 }
             }
@@ -126,7 +126,7 @@ public function getEntities($args = array())
             //make sure each group key is present
             foreach ($groups as $g) {
                 if (!isset($fieldValues[$companyId][$g])) {
-                    $fieldValues[$companyId][$g] = array();
+                    $fieldValues[$companyId][$g] = [];
                 }
             }
         }
@@ -146,14 +146,14 @@ public function getEntities($args = array())
             //We should probably totally ditch orm for leads
             $order = '(CASE';
             foreach ($ids as $count => $id) {
-                $order .= ' WHEN comp.id = ' . $id . ' THEN ' . $count;
-                $count++;
+                $order .= ' WHEN comp.id = '.$id.' THEN '.$count;
+                ++$count;
             }
-            $order .= ' ELSE ' . $count . ' END) AS HIDDEN ORD';
+            $order .= ' ELSE '.$count.' END) AS HIDDEN ORD';
 
             //ORM - generates lead entities
             $q = $this->_em->createQueryBuilder();
-            $q->select('comp,' . $order)
+            $q->select('comp,'.$order)
                 ->from('MauticLeadBundle:Company', 'comp', 'comp.id');
 
             //only pull the leads as filtered via DBAL
@@ -172,17 +172,16 @@ public function getEntities($args = array())
             foreach ($results as $r) {
                 $companyId = $r->getId();
                 $r->setFields($fieldValues[$companyId]);
-
             }
         } else {
-            $results = array();
+            $results = [];
         }
 
         return (!empty($args['withTotalCount'])) ?
-            array(
-                'count' => $total,
-                'results' => $results
-            ) : $results;
+            [
+                'count'   => $total,
+                'results' => $results,
+            ] : $results;
     }
     /**
      * {@inheritdoc}
@@ -194,18 +193,18 @@ public function saveEntity($entity, $flush = true)
     {
         $this->_em->persist($entity);
 
-        if ($flush)
+        if ($flush) {
             $this->_em->flush($entity);
+        }
 
         $fields = $entity->getUpdatedFields();
         if (!empty($fields)) {
-            $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX . 'companies', $fields, array('id' => $entity->getId()));
+            $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX.'companies', $fields, ['id' => $entity->getId()]);
         }
     }
 
-
     /**
-     * Persist an array of entities
+     * Persist an array of entities.
      *
      * @param array $entities
      */
@@ -217,7 +216,7 @@ public function saveEntities($entities)
         }
     }
     /**
-     * Get a list of fields and values
+     * Get a list of fields and values.
      *
      * @param           $id
      * @param bool|true $byGroup
@@ -229,13 +228,13 @@ public function getFieldValues($id, $byGroup = true)
         //Get the list of custom fields
         $fq = $this->_em->getConnection()->createQueryBuilder();
         $fq->select('f.id, f.label, f.alias, f.type, f.field_group as "group", f.field_order, f.object')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_fields', 'f')
-            ->where($fq->expr()->eq('f.object',':object'))
-            ->setParameter('object','company')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_fields', 'f')
+            ->where($fq->expr()->eq('f.object', ':object'))
+            ->setParameter('object', 'company')
             ->orderBy('f.field_order', 'asc');
         $results = $fq->execute()->fetchAll();
 
-        $fields = array();
+        $fields = [];
         foreach ($results as $r) {
             $fields[$r['alias']] = $r;
         }
@@ -243,7 +242,7 @@ public function getFieldValues($id, $byGroup = true)
         //use DBAL to get entity fields
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('*')
-            ->from(MAUTIC_TABLE_PREFIX . 'companies', 'comp')
+            ->from(MAUTIC_TABLE_PREFIX.'companies', 'comp')
             ->where('comp.id = :companyId')
             ->setParameter('companyId', $id);
         $companyValues = $q->execute()->fetch();
@@ -252,7 +251,7 @@ public function getFieldValues($id, $byGroup = true)
         // Reorder leadValues based on field order
         $companyValues = array_merge(array_flip(array_keys($fields)), $companyValues);
 
-        $fieldValues = array();
+        $fieldValues = [];
 
         //loop over results to put fields in something that can be assigned to the entities
         foreach ($companyValues as $k => $r) {
@@ -269,10 +268,10 @@ public function getFieldValues($id, $byGroup = true)
 
         if ($byGroup) {
             //make sure each group key is present
-            $groups = array('core', 'social', 'personal', 'professional');
+            $groups = ['core', 'social', 'personal', 'professional'];
             foreach ($groups as $g) {
                 if (!isset($fieldValues[$g])) {
-                    $fieldValues[$g] = array();
+                    $fieldValues[$g] = [];
                 }
             }
         }
@@ -280,9 +279,9 @@ public function getFieldValues($id, $byGroup = true)
         return $fieldValues;
     }
     /**
-     * Get companies by lead
+     * Get companies by lead.
      *
-     * @param      $leadId
+     * @param   $leadId
      *
      * @return array
      */
@@ -292,7 +291,7 @@ public function getCompaniesByLeadId($leadId, $companyId = null)
 
         $q->select('comp.id, comp.companyname, comp.companycity, comp.companycountry')
             ->from(MAUTIC_TABLE_PREFIX.'companies', 'comp')
-            ->leftJoin('comp',MAUTIC_TABLE_PREFIX.'companies_leads', 'cl', 'cl.company_id = comp.id')
+            ->leftJoin('comp', MAUTIC_TABLE_PREFIX.'companies_leads', 'cl', 'cl.company_id = comp.id')
             ->where('cl.lead_id = :leadId')
             ->setParameter('leadId', $leadId)
             ->orderBy('cl.date_added', 'DESC');
@@ -305,7 +304,7 @@ public function getCompaniesByLeadId($leadId, $companyId = null)
         return $results;
     }
     /**
-     * Function to remove non custom field columns from an arrayed lead row
+     * Function to remove non custom field columns from an arrayed lead row.
      *
      * @param array $r
      */
@@ -326,16 +325,15 @@ public function getTableAlias()
         return 'comp';
     }
 
-
     /**
      * {@inheritdoc}
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        return $this->addStandardCatchAllWhereClause($q, $filter, array(
+        return $this->addStandardCatchAllWhereClause($q, $filter, [
             'comp.companyname',
-            'comp.companydescription'
-        ));
+            'comp.companydescription',
+        ]);
     }
 
     /**
@@ -355,7 +353,7 @@ public function getSearchCommands()
     }
 
     /**
-     * Get a list of lists
+     * Get a list of lists.
      *
      * @param bool   $user
      * @param string $alias
@@ -365,20 +363,20 @@ public function getSearchCommands()
      */
     public function getCompanies($user = false, $id = '')
     {
-        $q = $this->_em->getConnection()->createQueryBuilder();
-        static $companies = array();
+        $q                = $this->_em->getConnection()->createQueryBuilder();
+        static $companies = [];
 
         if ($user) {
             $user = $this->currentUser;
         }
 
-        $key = (int)$id;
+        $key = (int) $id;
         if (isset($companies[$key])) {
             return $companies[$key];
         }
 
         $q->select('comp.*')
-            ->from(MAUTIC_TABLE_PREFIX .'companies', 'comp');
+            ->from(MAUTIC_TABLE_PREFIX.'companies', 'comp');
 
         if (!empty($id)) {
             $q->where(
@@ -401,12 +399,12 @@ public function getCompanies($user = false, $id = '')
     }
 
     /**
-    * Get a count of leads that belong to the company
-    *
-    * @param $companyIds
-    *
-    * @return array
-    */
+     * Get a count of leads that belong to the company.
+     *
+     * @param $companyIds
+     *
+     * @return array
+     */
     public function getLeadCount($companyIds)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
@@ -417,7 +415,7 @@ public function getLeadCount($companyIds)
         $returnArray = (is_array($companyIds));
 
         if (!$returnArray) {
-            $companyIds = array($companyIds);
+            $companyIds = [$companyIds];
         }
 
         $q->where(
@@ -429,35 +427,36 @@ public function getLeadCount($companyIds)
 
         $result = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
         foreach ($result as $r) {
-                $return[$r['company_id']] = $r['thecount'];
-            }
+            $return[$r['company_id']] = $r['thecount'];
+        }
 
         // Ensure lists without leads have a value
         foreach ($companyIds as $l) {
-                if (!isset($return[$l])) {
-                        $return[$l] = 0;
-                    }
+            if (!isset($return[$l])) {
+                $return[$l] = 0;
+            }
         }
 
         return ($returnArray) ? $return : $return[$companyIds[0]];
     }
 
     /**
-     * Get a list of lists
+     * Get a list of lists.
      *
      * @param $companyName
      * @param $city
      * @param $country
      * @param null $state
+     *
      * @return array
      */
     public function identifyCompany($companyName, $city, $country, $state = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
         if (!$companyName or !$city or !$country) {
-            return array();
+            return [];
         }
         $q->select('id')
             ->from(MAUTIC_TABLE_PREFIX.'companies', 'comp');
@@ -466,7 +465,7 @@ public function identifyCompany($companyName, $city, $country, $state = null)
         )->andWhere(
             $q->expr()->eq('comp.companycity', ':city')
         )->andWhere(
-            $q->expr()->eq('comp.companycountry',':country')
+            $q->expr()->eq('comp.companycountry', ':country')
         )->setParameter('companyName', $companyName)
             ->setParameter('city', $city)
             ->setParameter('country', $country);
@@ -476,6 +475,7 @@ public function identifyCompany($companyName, $city, $country, $state = null)
             )->setParameter('state', $state);
         }
         $results = $q->execute()->fetchAll();
+
         return $results;
     }
 
diff --git a/app/bundles/LeadBundle/Entity/DoNotContact.php b/app/bundles/LeadBundle/Entity/DoNotContact.php
index 0aaa49d51ec..13e01d22fdc 100644
--- a/app/bundles/LeadBundle/Entity/DoNotContact.php
+++ b/app/bundles/LeadBundle/Entity/DoNotContact.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-
 namespace Mautic\LeadBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class DoNotContact
- *
- * @package Mautic\EmailBundle\Entity
+ * Class DoNotContact.
  */
 class DoNotContact
 {
@@ -76,13 +73,13 @@ class DoNotContact
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('lead_donotcontact')
             ->setCustomRepositoryClass('Mautic\LeadBundle\Entity\DoNotContactRepository')
-            ->addIndex(array('reason'), 'dnc_reason_search');
+            ->addIndex(['reason'], 'dnc_reason_search');
 
         $builder->addId();
 
@@ -208,4 +205,4 @@ public function setDateAdded($dateAdded)
     {
         $this->dateAdded = $dateAdded;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/DoNotContactRepository.php b/app/bundles/LeadBundle/Entity/DoNotContactRepository.php
index f2b73ba5f02..f7d3965cc52 100644
--- a/app/bundles/LeadBundle/Entity/DoNotContactRepository.php
+++ b/app/bundles/LeadBundle/Entity/DoNotContactRepository.php
@@ -1,36 +1,36 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 
 /**
- * DoNotContactRepository
+ * DoNotContactRepository.
  */
 class DoNotContactRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Get a list of DNC entries based on channel and lead_id
+     * Get a list of DNC entries based on channel and lead_id.
      *
-     * @param Lead $lead
+     * @param Lead   $lead
      * @param string $channel
      *
      * @return \Mautic\LeadBundle\Entity\DoNotContact[]
      */
     public function getEntriesByLeadAndChannel(Lead $lead, $channel)
     {
-        return $this->findBy(array('channel' => $channel, 'lead' => $lead));
+        return $this->findBy(['channel' => $channel, 'lead' => $lead]);
     }
 
     /**
@@ -51,7 +51,7 @@ public function getCount($channel = null, $ids = null, $reason = null, $listId =
 
         if ($ids) {
             if (!is_array($ids)) {
-                $ids = array((int) $ids);
+                $ids = [(int) $ids];
             }
             $q->where(
                 $q->expr()->in('dnc.channel_id', $ids)
@@ -113,7 +113,7 @@ public function getTimelineStats($leadId, array $options = [])
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere(
-                $query->expr()->like('dnc.channel', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('dnc.channel', $query->expr()->literal('%'.$options['search'].'%'))
             );
         }
 
@@ -130,8 +130,8 @@ public function getChannelList($channel, $contacts = null)
     {
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $q->select('l.id')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_donotcontact', 'dnc')
-            ->leftJoin('dnc', MAUTIC_TABLE_PREFIX . 'leads', 'l', 'l.id = dnc.lead_id')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_donotcontact', 'dnc')
+            ->leftJoin('dnc', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = dnc.lead_id')
             ->where('dnc.channel = :channel')
             ->setParameter('channel', $channel);
 
@@ -143,7 +143,7 @@ public function getChannelList($channel, $contacts = null)
 
         $results = $q->execute()->fetchAll();
 
-        $dnc = array();
+        $dnc = [];
 
         foreach ($results as $r) {
             $dnc[] = $r['id'];
diff --git a/app/bundles/LeadBundle/Entity/FrequencyRule.php b/app/bundles/LeadBundle/Entity/FrequencyRule.php
index 6a4fd32883d..18a724de279 100644
--- a/app/bundles/LeadBundle/Entity/FrequencyRule.php
+++ b/app/bundles/LeadBundle/Entity/FrequencyRule.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-
 namespace Mautic\LeadBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class FrequencyRule
- *
- * @package Mautic\LeadBundle\Entity
+ * Class FrequencyRule.
  */
 class FrequencyRule
 {
@@ -51,11 +48,10 @@ class FrequencyRule
      */
     private $channel;
 
-
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -155,7 +151,7 @@ public function setDateAdded($dateAdded)
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getFrequencyNumber()
     {
@@ -163,7 +159,7 @@ public function getFrequencyNumber()
     }
 
     /**
-     * @param integer $frequencyNumber
+     * @param int $frequencyNumber
      */
     public function setFrequencyNumber($frequencyNumber)
     {
@@ -185,4 +181,4 @@ public function setFrequencyTime($frequencyTime)
     {
         $this->frequencyTime = $frequencyTime;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/FrequencyRuleRepository.php b/app/bundles/LeadBundle/Entity/FrequencyRuleRepository.php
index e04a3901b95..1a8bb833a70 100644
--- a/app/bundles/LeadBundle/Entity/FrequencyRuleRepository.php
+++ b/app/bundles/LeadBundle/Entity/FrequencyRuleRepository.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * FrequecyRuleRepository
+ * FrequecyRuleRepository.
  */
 class FrequencyRuleRepository extends CommonRepository
 {
@@ -24,16 +24,16 @@ class FrequencyRuleRepository extends CommonRepository
      *
      * @return array
      */
-    public function getAppliedFrequencyRules($channel = null, $leadIds = null, $listId, $defaultFrequencyNumber, $defaultFrequencyTime)
+    public function getAppliedFrequencyRules($channel, $leadIds, $listId, $defaultFrequencyNumber, $defaultFrequencyTime)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
 
         $selectFrequency = ($defaultFrequencyNumber) ? 'IFNULL(fr.frequency_number,:defaultNumber) as frequency_number' : 'fr.frequency_number';
-        $selectNumber     = ($defaultFrequencyTime) ? 'IFNULL(fr.frequency_time,:frequencyTime) as frequency_time' : 'fr.frequency_time';
+        $selectNumber    = ($defaultFrequencyTime) ? 'IFNULL(fr.frequency_time,:frequencyTime) as frequency_time' : 'fr.frequency_time';
 
         $q->select("es.lead_id, $selectFrequency, $selectNumber")
             ->from(MAUTIC_TABLE_PREFIX.'email_stats', 'es')
-            ->leftJoin('es', MAUTIC_TABLE_PREFIX.'lead_frequencyrules', 'fr','es.lead_id = fr.lead_id' );
+            ->leftJoin('es', MAUTIC_TABLE_PREFIX.'lead_frequencyrules', 'fr', 'es.lead_id = fr.lead_id');
 
         if ($channel) {
             $q->andWhere('fr.channel = :channel or fr.channel is null')
@@ -95,7 +95,6 @@ public function getFrequencyRules($channel = null, $leadId = null)
         $q->select('fr.id, fr.frequency_time, fr.frequency_number, fr.channel')
             ->from(MAUTIC_TABLE_PREFIX.'lead_frequencyrules', 'fr');
 
-
         if ($channel) {
             $q->andWhere('fr.channel = :channel')
                 ->setParameter('channel', $channel);
diff --git a/app/bundles/LeadBundle/Entity/Lead.php b/app/bundles/LeadBundle/Entity/Lead.php
index f9214f66700..e834b564deb 100644
--- a/app/bundles/LeadBundle/Entity/Lead.php
+++ b/app/bundles/LeadBundle/Entity/Lead.php
@@ -1,34 +1,32 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
-use Mautic\LeadBundle\Entity\Company;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
-use Doctrine\Common\Collections\ArrayCollection;
 use Mautic\CoreBundle\Entity\IpAddress;
-use Mautic\UserBundle\Entity\User;
 use Mautic\NotificationBundle\Entity\PushID;
 use Mautic\StageBundle\Entity\Stage;
+use Mautic\UserBundle\Entity\User;
 
 /**
- * Class Lead
- *
- * @package Mautic\LeadBundle\Entity
+ * Class Lead.
  */
 class Lead extends FormEntity
 {
     /**
-     * Used to determine social identity
+     * Used to determine social identity.
      *
      * @var array
      */
@@ -90,21 +88,21 @@ class Lead extends FormEntity
     private $socialCache = [];
 
     /**
-     * Just a place to store updated field values so we don't have to loop through them again comparing
+     * Just a place to store updated field values so we don't have to loop through them again comparing.
      *
      * @var array
      */
     private $updatedFields = [];
 
     /**
-     * Used to populate trigger color
+     * Used to populate trigger color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Sets if the IP was just created by LeadModel::getCurrentLead()
+     * Sets if the IP was just created by LeadModel::getCurrentLead().
      *
      * @var bool
      */
@@ -121,7 +119,7 @@ class Lead extends FormEntity
     private $notes;
 
     /**
-     * Used by Mautic to populate the fields pulled from the DB
+     * Used by Mautic to populate the fields pulled from the DB.
      *
      * @var array
      */
@@ -133,7 +131,7 @@ class Lead extends FormEntity
     private $preferredProfileImage;
 
     /**
-     * Changed to true if the lead was anonymous before updating fields
+     * Changed to true if the lead was anonymous before updating fields.
      *
      * @var null
      */
@@ -169,18 +167,18 @@ class Lead extends FormEntity
     private $frequencyRules;
 
     /**
-     * Constructor
+     * Constructor.
      */
     public function __construct()
     {
-        $this->ipAddresses     = new ArrayCollection();
-        $this->pushIds         = new ArrayCollection();
-        $this->doNotContact    = new ArrayCollection();
-        $this->pointsChangeLog = new ArrayCollection();
-        $this->tags            = new ArrayCollection();
-        $this->stageChangeLog  = new ArrayCollection();
-        $this->frequencyRules  = new ArrayCollection();
-        $this->companyChangeLog= new ArrayCollection();
+        $this->ipAddresses      = new ArrayCollection();
+        $this->pushIds          = new ArrayCollection();
+        $this->doNotContact     = new ArrayCollection();
+        $this->pointsChangeLog  = new ArrayCollection();
+        $this->tags             = new ArrayCollection();
+        $this->stageChangeLog   = new ArrayCollection();
+        $this->frequencyRules   = new ArrayCollection();
+        $this->companyChangeLog = new ArrayCollection();
     }
 
     /**
@@ -335,7 +333,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -360,7 +358,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'utmtags',
                     'stage',
                     'dateIdentified',
-                    'preferredProfileImage'
+                    'preferredProfileImage',
                 ]
             )
             ->build();
@@ -372,7 +370,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
      */
     protected function isChanged($prop, $val)
     {
-        $getter  = "get".ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'owner') {
             if ($current && !$val) {
@@ -382,7 +380,7 @@ protected function isChanged($prop, $val)
             } elseif ($current && $val && $current->getId() != $val->getId()) {
                 $this->changes['owner'] = [
                     $current->getName().'('.$current->getId().')',
-                    $val->getName().'('.$val->getId().')'
+                    $val->getName().'('.$val->getId().')',
                 ];
             }
         } elseif ($prop == 'ipAddresses') {
@@ -394,7 +392,6 @@ protected function isChanged($prop, $val)
                 $this->changes['tags']['removed'][] = $val;
             }
         } elseif ($prop == 'utmtags') {
-
             if ($val instanceof UtmTag) {
                 if ($val->getUtmContent()) {
                     $this->changes['utmtags'] = ['utm_content', $val->getUtmContent()];
@@ -411,10 +408,8 @@ protected function isChanged($prop, $val)
                 if ($val->getUtmSource()) {
                     $this->changes['utmtags'] = ['utm_source', $val->getUtmSource()];
                 }
-
             }
         } elseif ($prop == 'frequencyRules') {
-
             if ($val instanceof FrequencyRule) {
                 if ($val->getFrequencyTime()) {
                     $this->changes['frequencyRules'] = ['frequency_time', $val->getFrequencyTime()];
@@ -439,9 +434,9 @@ public function convertToArray()
     }
 
     /**
-     * Set id
+     * Set id.
      *
-     * @param integer $id
+     * @param int $id
      *
      * @return Lead
      */
@@ -453,9 +448,9 @@ public function setId($id)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -463,7 +458,7 @@ public function getId()
     }
 
     /**
-     * Set owner
+     * Set owner.
      *
      * @param User $owner
      *
@@ -478,7 +473,7 @@ public function setOwner(User $owner = null)
     }
 
     /**
-     * Get owner
+     * Get owner.
      *
      * @return User
      */
@@ -488,17 +483,17 @@ public function getOwner()
     }
 
     /**
-     * Returns the user to be used for permissions
+     * Returns the user to be used for permissions.
      *
      * @return User|int
      */
     public function getPermissionUser()
     {
-       return (null === $this->getOwner()) ? $this->getCreatedBy() : $this->getOwner();
+        return (null === $this->getOwner()) ? $this->getCreatedBy() : $this->getOwner();
     }
 
     /**
-     * Add ipAddress
+     * Add ipAddress.
      *
      * @param IpAddress $ipAddress
      *
@@ -520,7 +515,7 @@ public function addIpAddress(IpAddress $ipAddress)
     }
 
     /**
-     * Remove ipAddress
+     * Remove ipAddress.
      *
      * @param IpAddress $ipAddress
      */
@@ -530,7 +525,7 @@ public function removeIpAddress(IpAddress $ipAddress)
     }
 
     /**
-     * Get ipAddresses
+     * Get ipAddresses.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
@@ -540,7 +535,7 @@ public function getIpAddresses()
     }
 
     /**
-     * Get full name
+     * Get full name.
      *
      * @param bool $lastFirst
      *
@@ -560,11 +555,11 @@ public function getName($lastFirst = false)
             $lastName = (isset($this->fields['core']['lastname']['value'])) ? $this->fields['core']['lastname']['value'] : '';
         }
 
-        $fullName = "";
+        $fullName = '';
         if ($lastFirst && !empty($firstName) && !empty($lastName)) {
-            $fullName = $lastName.", ".$firstName;
+            $fullName = $lastName.', '.$firstName;
         } elseif (!empty($firstName) && !empty($lastName)) {
-            $fullName = $firstName." ".$lastName;
+            $fullName = $firstName.' '.$lastName;
         } elseif (!empty($firstName)) {
             $fullName = $firstName;
         } elseif (!empty($lastName)) {
@@ -575,19 +570,17 @@ public function getName($lastFirst = false)
     }
 
     /**
-     * Get company
+     * Get company.
      *
      * @return string
      */
     public function getCompany()
     {
         if (isset($this->updatedFields['company'])) {
-
             return $this->updatedFields['company'];
         }
 
         if (!empty($this->fields['core']['company']['value'])) {
-
             return $this->fields['core']['company']['value'];
         }
 
@@ -595,19 +588,17 @@ public function getCompany()
     }
 
     /**
-     * Get email
+     * Get email.
      *
      * @return string
      */
     public function getEmail()
     {
         if (isset($this->updatedFields['email'])) {
-
             return $this->updatedFields['email'];
         }
 
         if (!empty($this->fields['core']['email']['value'])) {
-
             return $this->fields['core']['email']['value'];
         }
 
@@ -615,19 +606,17 @@ public function getEmail()
     }
 
     /**
-     * Get preferred locale
+     * Get preferred locale.
      *
      * @return string
      */
     public function getPreferredLocale()
     {
         if (isset($this->updatedFields['preferred_locale'])) {
-
             return $this->updatedFields['preferred_locale'];
         }
 
         if (!empty($this->fields['core']['preferred_locale']['value'])) {
-
             return $this->fields['core']['preferred_locale']['value'];
         }
 
@@ -635,7 +624,7 @@ public function getPreferredLocale()
     }
 
     /**
-     * Get lead field value
+     * Get lead field value.
      *
      * @param      $field
      * @param null $group
@@ -645,19 +634,16 @@ public function getPreferredLocale()
     public function getFieldValue($field, $group = null)
     {
         if (isset($this->updatedFields[$field])) {
-
             return $this->updatedFields[$field];
         }
 
         if (!empty($group) && isset($this->fields[$group][$field])) {
-
             return $this->fields[$group][$field]['value'];
         }
 
         foreach ($this->fields as $group => $groupFields) {
             foreach ($groupFields as $name => $details) {
                 if ($name == $field) {
-
                     return $details['value'];
                 }
             }
@@ -667,7 +653,7 @@ public function getFieldValue($field, $group = null)
     }
 
     /**
-     * Get the primary identifier for the lead
+     * Get the primary identifier for the lead.
      *
      * @param bool $lastFirst
      *
@@ -691,7 +677,7 @@ public function getPrimaryIdentifier($lastFirst = false)
     }
 
     /**
-     * Get the secondary identifier for the lead; mainly company
+     * Get the secondary identifier for the lead; mainly company.
      *
      * @return string
      */
@@ -705,7 +691,7 @@ public function getSecondaryIdentifier()
     }
 
     /**
-     * Get the location for the lead
+     * Get the location for the lead.
      *
      * @return string
      */
@@ -729,12 +715,12 @@ public function getLocation()
     }
 
     /**
-     * @param integer $points
-     * @param string  $operator
+     * @param int    $points
+     * @param string $operator
      *
      * @return Lead
      */
-    public function adjustPoints($points, $operator='plus')
+    public function adjustPoints($points, $operator = 'plus')
     {
         switch ($operator) {
             case 'plus':
@@ -757,9 +743,9 @@ public function adjustPoints($points, $operator='plus')
     }
 
     /**
-     * Set points
+     * Set points.
      *
-     * @param integer $points
+     * @param int $points
      *
      * @return Lead
      */
@@ -772,9 +758,9 @@ public function setPoints($points)
     }
 
     /**
-     * Get points
+     * Get points.
      *
-     * @return integer
+     * @return int
      */
     public function getPoints()
     {
@@ -782,7 +768,7 @@ public function getPoints()
     }
 
     /**
-     * Creates a points change entry
+     * Creates a points change entry.
      *
      * @param           $type
      * @param           $name
@@ -810,7 +796,7 @@ public function addPointsChangeLogEntry($type, $name, $action, $pointsDelta, IpA
     }
 
     /**
-     * Add pointsChangeLog
+     * Add pointsChangeLog.
      *
      * @param PointsChangeLog $pointsChangeLog
      *
@@ -824,7 +810,7 @@ public function addPointsChangeLog(PointsChangeLog $pointsChangeLog)
     }
 
     /**
-     * Creates a points change entry
+     * Creates a points change entry.
      *
      * @param           $type
      * @param           $name
@@ -844,7 +830,7 @@ public function stageChangeLogEntry($type, $name, $action)
     }
 
     /**
-     * Add pointsChangeLog
+     * Add pointsChangeLog.
      *
      * @param PointsChangeLog $pointsChangeLog
      *
@@ -858,7 +844,7 @@ public function stageChangeLog(StagesChangeLog $stageChangeLog)
     }
 
     /**
-     * Remove pointsChangeLog
+     * Remove pointsChangeLog.
      *
      * @param PointsChangeLog $pointsChangeLog
      */
@@ -868,7 +854,7 @@ public function removePointsChangeLog(PointsChangeLog $pointsChangeLog)
     }
 
     /**
-     * Get pointsChangeLog
+     * Get pointsChangeLog.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
@@ -878,7 +864,7 @@ public function getPointsChangeLog()
     }
 
     /**
-     * Creates a points change entry
+     * Creates a points change entry.
      *
      * @param           $type
      * @param           $name
@@ -905,7 +891,7 @@ public function addCompanyChangeLogEntry($type, $name, $action, $company = null)
     }
 
     /**
-     * Add comapnyChangeLog
+     * Add comapnyChangeLog.
      *
      * @param CompanyChangeLog $companyChangeLog
      *
@@ -918,7 +904,6 @@ public function addCompanyChangeLog(CompanyChangeLog $companyChangeLog)
         return $this;
     }
 
-
     /**
      * @param string $identifier
      *
@@ -979,7 +964,7 @@ public function addDoNotContactEntry(DoNotContact $doNotContact)
     {
         $this->changes['dnc_channel_status'][$doNotContact->getChannel()] = [
             'reason'   => $doNotContact->getReason(),
-            'comments' => $doNotContact->getComments()
+            'comments' => $doNotContact->getComments(),
         ];
 
         // @deprecated - to be removed in 2.0
@@ -1010,7 +995,7 @@ public function removeDoNotContactEntry(DoNotContact $doNotContact)
         $this->changes['dnc_channel_status'][$doNotContact->getChannel()] = [
             'reason'     => DoNotContact::IS_CONTACTABLE,
             'old_reason' => $doNotContact->getReason(),
-            'comments'   => $doNotContact->getComments()
+            'comments'   => $doNotContact->getComments(),
         ];
 
         // @deprecated to be removed in 2.0
@@ -1028,7 +1013,7 @@ public function getDoNotContact()
     }
 
     /**
-     * Set internal storage
+     * Set internal storage.
      *
      * @param $internal
      */
@@ -1038,7 +1023,7 @@ public function setInternal($internal)
     }
 
     /**
-     * Get internal storage
+     * Get internal storage.
      *
      * @return mixed
      */
@@ -1048,7 +1033,7 @@ public function getInternal()
     }
 
     /**
-     * Set social cache
+     * Set social cache.
      *
      * @param $cache
      */
@@ -1058,7 +1043,7 @@ public function setSocialCache($cache)
     }
 
     /**
-     * Get social cache
+     * Get social cache.
      *
      * @return mixed
      */
@@ -1095,7 +1080,7 @@ public function getFields($ungroup = false)
     }
 
     /**
-     * Get profile values
+     * Get profile values.
      *
      * @return array
      */
@@ -1103,7 +1088,7 @@ public function getProfileFields()
     {
         if (isset($this->fields['core'])) {
             $fieldValues = [
-                'id' => $this->id
+                'id' => $this->id,
             ];
             if (isset($this->fields['core'])) {
                 foreach ($this->fields as $group => $fields) {
@@ -1122,7 +1107,7 @@ public function getProfileFields()
     }
 
     /**
-     * Add an updated field to persist to the DB and to note changes
+     * Add an updated field to persist to the DB and to note changes.
      *
      * @param        $alias
      * @param        $value
@@ -1145,7 +1130,7 @@ public function addUpdatedField($alias, $value, $oldValue = '')
     }
 
     /**
-     * Get the array of updated fields
+     * Get the array of updated fields.
      *
      * @return array
      */
@@ -1214,7 +1199,7 @@ protected function getFirstSocialIdentity()
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isNewlyCreated()
     {
@@ -1222,7 +1207,7 @@ public function isNewlyCreated()
     }
 
     /**
-     * @param boolean $newlyCreated
+     * @param bool $newlyCreated
      */
     public function setNewlyCreated($newlyCreated)
     {
@@ -1239,8 +1224,6 @@ public function getNotes()
 
     /**
      * @param string $source
-     *
-     * @return void
      */
     public function setPreferredProfileImage($source)
     {
@@ -1297,7 +1280,7 @@ public function setAvailableSocialFields(array $availableSocialFields)
     }
 
     /**
-     * Add tag
+     * Add tag.
      *
      * @param Tag $tag
      *
@@ -1312,7 +1295,7 @@ public function addTag(Tag $tag)
     }
 
     /**
-     * Remove tag
+     * Remove tag.
      *
      * @param Tag $tag
      */
@@ -1323,7 +1306,7 @@ public function removeTag(Tag $tag)
     }
 
     /**
-     * Get tags
+     * Get tags.
      *
      * @return mixed
      */
@@ -1333,7 +1316,7 @@ public function getTags()
     }
 
     /**
-     * Set tags
+     * Set tags.
      *
      * @param $tags
      *
@@ -1347,7 +1330,7 @@ public function setTags($tags)
     }
 
     /**
-     * Get tags
+     * Get tags.
      *
      * @return mixed
      */
@@ -1357,7 +1340,7 @@ public function getUtmTags()
     }
 
     /**
-     * Set tags
+     * Set tags.
      *
      * @param $tags
      *
@@ -1372,7 +1355,7 @@ public function setUtmTags($utmTags)
     }
 
     /**
-     * Set stage
+     * Set stage.
      *
      * @param \Mautic\StageBundle\Entity\Stage $stage
      *
@@ -1386,7 +1369,7 @@ public function setStage(Stage $stage)
     }
 
     /**
-     * Get stage
+     * Get stage.
      *
      * @return \Mautic\StageBundle\Entity\Stage
      */
@@ -1396,7 +1379,7 @@ public function getStage()
     }
 
     /**
-     * Set stage
+     * Set stage.
      *
      * @param FrequencyRule $frequencyRules
      *
@@ -1411,7 +1394,7 @@ public function setFrequencyRules(FrequencyRule $frequencyRules)
     }
 
     /**
-     * Get stage
+     * Get stage.
      *
      * @return array
      */
@@ -1421,7 +1404,7 @@ public function getFrequencyRules()
     }
 
     /**
-     * Remove frequencyRule
+     * Remove frequencyRule.
      *
      * @param Tag $tag
      */
@@ -1432,7 +1415,7 @@ public function removeFrequencyRule(FrequencyRule $frequencyRule)
     }
 
     /**
-     * Get attribution value
+     * Get attribution value.
      *
      * @return bool
      */
@@ -1442,7 +1425,7 @@ public function getAttribution()
     }
 
     /**
-     * If there is an attribution amount but no date, insert today's date
+     * If there is an attribution amount but no date, insert today's date.
      */
     public function checkAttributionDate()
     {
@@ -1457,7 +1440,7 @@ public function checkAttributionDate()
     }
 
     /**
-     * Set date identified
+     * Set date identified.
      */
     public function checkDateIdentified()
     {
diff --git a/app/bundles/LeadBundle/Entity/LeadDevice.php b/app/bundles/LeadBundle/Entity/LeadDevice.php
index 4eb2509e484..20c6cc07b43 100644
--- a/app/bundles/LeadBundle/Entity/LeadDevice.php
+++ b/app/bundles/LeadBundle/Entity/LeadDevice.php
@@ -1,27 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
-use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Mautic\LeadBundle\Entity\Lead;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
+use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
+
 /**
- * Class LeadDevice
- *
- * @package Mautic\LeadBundle\Entity
+ * Class LeadDevice.
  */
 class LeadDevice
 {
-
     /**
      * @var int
      */
@@ -35,7 +32,7 @@ class LeadDevice
     /**
      * @var array
      */
-    private $clientInfo = array();
+    private $clientInfo = [];
 
     /**
      * @var string
@@ -77,11 +74,10 @@ class LeadDevice
      */
     private $dateAdded;
 
-
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -141,7 +137,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -149,7 +145,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('stat')
             ->addProperties(
-                array(
+                [
                     'id',
                     'clientInfo',
                     'dateOpened',
@@ -159,8 +155,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'deviceOsName',
                     'deviceOsShortName',
                     'deviceOsVersion',
-                    'deviceOsPlatform'
-                )
+                    'deviceOsPlatform',
+                ]
             )
             ->build();
     }
@@ -168,7 +164,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * @return mixed
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
@@ -176,7 +172,7 @@ public function getId ()
     /**
      * @return mixed
      */
-    public function getClientInfo ()
+    public function getClientInfo()
     {
         return $this->clientInfo;
     }
@@ -184,7 +180,7 @@ public function getClientInfo ()
     /**
      * @param mixed $clientInfo
      */
-    public function setClientInfo ($clientInfo)
+    public function setClientInfo($clientInfo)
     {
         $this->clientInfo = $clientInfo;
     }
@@ -192,7 +188,7 @@ public function setClientInfo ($clientInfo)
     /**
      * @return mixed
      */
-    public function getDevice ()
+    public function getDevice()
     {
         return $this->device;
     }
@@ -200,7 +196,7 @@ public function getDevice ()
     /**
      * @param mixed $device
      */
-    public function setDevice ($device)
+    public function setDevice($device)
     {
         $this->device = $device;
     }
@@ -208,7 +204,7 @@ public function setDevice ($device)
     /**
      * @return mixed
      */
-    public function getDeviceBrand ()
+    public function getDeviceBrand()
     {
         return $this->deviceBrand;
     }
@@ -216,7 +212,7 @@ public function getDeviceBrand ()
     /**
      * @param mixed $isFailed
      */
-    public function setDeviceBrand ($brand)
+    public function setDeviceBrand($brand)
     {
         $this->deviceBrand = $brand;
     }
@@ -224,16 +220,15 @@ public function setDeviceBrand ($brand)
     /**
      * @return mixed
      */
-    public function getDeviceModel ()
+    public function getDeviceModel()
     {
         return $this->deviceModel;
     }
 
-
     /**
      * @param mixed $deviceModel
      */
-    public function setDeviceModel ($deviceModel)
+    public function setDeviceModel($deviceModel)
     {
         $this->deviceModel = $deviceModel;
     }
@@ -241,7 +236,7 @@ public function setDeviceModel ($deviceModel)
     /**
      * @return string
      */
-    public function getDeviceOs ()
+    public function getDeviceOs()
     {
         return $this->deviceOsName;
     }
@@ -249,7 +244,7 @@ public function getDeviceOs ()
     /**
      * @param mixed $deviceOs
      */
-    public function setDeviceOs ($deviceOs)
+    public function setDeviceOs($deviceOs)
     {
         if (isset($deviceOs['name'])) {
             $this->deviceOsName = $deviceOs['name'];
@@ -288,7 +283,7 @@ public function setLead(Lead $lead)
     /**
      * @return mixed
      */
-    public function getDateOpen ()
+    public function getDateOpen()
     {
         return $this->dateAdded;
     }
@@ -296,9 +291,8 @@ public function getDateOpen ()
     /**
      * @param mixed $dateOpen
      */
-    public function setDateOpen ($dateOpen)
+    public function setDateOpen($dateOpen)
     {
         $this->dateAdded = $dateOpen;
     }
-
 }
diff --git a/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php b/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php
index 13fef37e6a9..b9fb474edd5 100644
--- a/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadDeviceRepository.php
@@ -1,22 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class LeadDeviceRepository
- *
- * @package Mautic\LeadBundle\Entity
+ * Class LeadDeviceRepository.
  */
 class LeadDeviceRepository extends CommonRepository
 {
@@ -92,4 +90,4 @@ public function getDevice(
 
         return (!empty($device)) ? $device[0] : [];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/LeadField.php b/app/bundles/LeadBundle/Entity/LeadField.php
index e92c207bf1f..3b02fcdb9ee 100644
--- a/app/bundles/LeadBundle/Entity/LeadField.php
+++ b/app/bundles/LeadBundle/Entity/LeadField.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,13 +19,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class LeadField
- *
- * @package Mautic\LeadBundle\Entity
+ * Class LeadField.
  */
 class LeadField extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -91,7 +89,7 @@ class LeadField extends FormEntity
     private $isUniqueIdentifer = false;
 
     /**
-     * Workaround for incorrectly spelled $isUniqueIdentifer
+     * Workaround for incorrectly spelled $isUniqueIdentifer.
      *
      * @var bool
      */
@@ -122,7 +120,7 @@ public function __clone()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
         $builder->addLifecycleEvent('identifierWorkaround', 'postLoad');
@@ -192,20 +190,20 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('label', new Assert\NotBlank(
-            array('message' => 'mautic.lead.field.label.notblank')
+            ['message' => 'mautic.lead.field.label.notblank']
         ));
 
-        $metadata->addConstraint(new UniqueEntity(array(
-            'fields'  => array('alias'),
-            'message' => 'mautic.lead.field.alias.unique'
-        )));
+        $metadata->addConstraint(new UniqueEntity([
+            'fields'  => ['alias'],
+            'message' => 'mautic.lead.field.alias.unique',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -213,46 +211,46 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('leadField')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'label',
                     'alias',
                     'type',
                     'group',
                     'order',
-                    'object'
-                )
+                    'object',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'defaultValue',
                     'isRequired',
                     'isPubliclyUpdatable',
                     'isUniqueIdentifier',
-                    'properties'
-                )
+                    'properties',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set label
+     * Set label.
      *
      * @param string $label
      *
      * @return LeadField
      */
-    public function setLabel ($label)
+    public function setLabel($label)
     {
         $this->isChanged('label', $label);
         $this->label = $label;
@@ -261,24 +259,23 @@ public function setLabel ($label)
     }
 
     /**
-     * Get label
+     * Get label.
      *
      * @return string
      */
-    public function getLabel ()
+    public function getLabel()
     {
         return $this->label;
     }
 
-
     /**
-     * Proxy function to setLabel()
+     * Proxy function to setLabel().
      *
      * @param string $label
      *
      * @return LeadField
      */
-    public function setName ($label)
+    public function setName($label)
     {
         $this->isChanged('label', $label);
 
@@ -286,23 +283,23 @@ public function setName ($label)
     }
 
     /**
-     * Proxy function for getLabel()
+     * Proxy function for getLabel().
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->getLabel();
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
      * @return LeadField
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->isChanged('type', $type);
         $this->type = $type;
@@ -311,23 +308,23 @@ public function setType ($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
 
     /**
-     * Set defaultValue
+     * Set defaultValue.
      *
      * @param string $defaultValue
      *
      * @return LeadField
      */
-    public function setDefaultValue ($defaultValue)
+    public function setDefaultValue($defaultValue)
     {
         $this->isChanged('defaultValue', $defaultValue);
         $this->defaultValue = $defaultValue;
@@ -336,23 +333,23 @@ public function setDefaultValue ($defaultValue)
     }
 
     /**
-     * Get defaultValue
+     * Get defaultValue.
      *
      * @return string
      */
-    public function getDefaultValue ()
+    public function getDefaultValue()
     {
         return $this->defaultValue;
     }
 
     /**
-     * Set isRequired
+     * Set isRequired.
      *
-     * @param boolean $isRequired
+     * @param bool $isRequired
      *
      * @return LeadField
      */
-    public function setIsRequired ($isRequired)
+    public function setIsRequired($isRequired)
     {
         $this->isChanged('isRequired', $isRequired);
         $this->isRequired = $isRequired;
@@ -361,33 +358,33 @@ public function setIsRequired ($isRequired)
     }
 
     /**
-     * Get isRequired
+     * Get isRequired.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsRequired ()
+    public function getIsRequired()
     {
         return $this->isRequired;
     }
 
     /**
-     * Proxy to getIsRequired()
+     * Proxy to getIsRequired().
      *
      * @return bool
      */
-    public function isRequired ()
+    public function isRequired()
     {
         return $this->getIsRequired();
     }
 
     /**
-     * Set isFixed
+     * Set isFixed.
      *
-     * @param boolean $isFixed
+     * @param bool $isFixed
      *
      * @return LeadField
      */
-    public function setIsFixed ($isFixed)
+    public function setIsFixed($isFixed)
     {
         $this->isFixed = $isFixed;
 
@@ -395,33 +392,33 @@ public function setIsFixed ($isFixed)
     }
 
     /**
-     * Get isFixed
+     * Get isFixed.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsFixed ()
+    public function getIsFixed()
     {
         return $this->isFixed;
     }
 
     /**
-     * Proxy to getIsFixed()
+     * Proxy to getIsFixed().
      *
      * @return bool
      */
-    public function isFixed ()
+    public function isFixed()
     {
         return $this->getIsFixed();
     }
 
     /**
-     * Set properties
+     * Set properties.
      *
      * @param string $properties
      *
      * @return LeadField
      */
-    public function setProperties ($properties)
+    public function setProperties($properties)
     {
         $this->isChanged('properties', $properties);
         $this->properties = $properties;
@@ -430,23 +427,23 @@ public function setProperties ($properties)
     }
 
     /**
-     * Get properties
+     * Get properties.
      *
      * @return string
      */
-    public function getProperties ()
+    public function getProperties()
     {
         return $this->properties;
     }
 
     /**
-     * Set order
+     * Set order.
      *
-     * @param integer $order
+     * @param int $order
      *
      * @return LeadField
      */
-    public function setOrder ($order)
+    public function setOrder($order)
     {
         $this->isChanged('order', $order);
         $this->order = $order;
@@ -455,22 +452,22 @@ public function setOrder ($order)
     }
 
     /**
-     * Get object
+     * Get object.
      *
      * @return string
      */
-    public function getObject ()
+    public function getObject()
     {
         return $this->object;
     }
     /**
-     * Set object
+     * Set object.
      *
-     * @param integer $object
+     * @param int $object
      *
      * @return LeadField
      */
-    public function setObject ($object)
+    public function setObject($object)
     {
         $this->isChanged('object', $object);
         $this->object = $object;
@@ -479,22 +476,22 @@ public function setObject ($object)
     }
 
     /**
-     * Get order
+     * Get order.
      *
-     * @return integer
+     * @return int
      */
-    public function getOrder ()
+    public function getOrder()
     {
         return $this->order;
     }
     /**
-     * Set isVisible
+     * Set isVisible.
      *
-     * @param boolean $isVisible
+     * @param bool $isVisible
      *
      * @return LeadField
      */
-    public function setIsVisible ($isVisible)
+    public function setIsVisible($isVisible)
     {
         $this->isChanged('isVisible', $isVisible);
         $this->isVisible = $isVisible;
@@ -503,33 +500,33 @@ public function setIsVisible ($isVisible)
     }
 
     /**
-     * Get isVisible
+     * Get isVisible.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsVisible ()
+    public function getIsVisible()
     {
         return $this->isVisible;
     }
 
     /**
-     * Proxy to getIsVisible()
+     * Proxy to getIsVisible().
      *
      * @return bool
      */
-    public function isVisible ()
+    public function isVisible()
     {
         return $this->getIsVisible();
     }
 
     /**
-     * Set isShortVisible
+     * Set isShortVisible.
      *
-     * @param boolean $isShortVisible
+     * @param bool $isShortVisible
      *
      * @return LeadField
      */
-    public function setIsShortVisible ($isShortVisible)
+    public function setIsShortVisible($isShortVisible)
     {
         $this->isChanged('isShortVisible', $isShortVisible);
         $this->isShortVisible = $isShortVisible;
@@ -538,29 +535,29 @@ public function setIsShortVisible ($isShortVisible)
     }
 
     /**
-     * Get isShortVisible
+     * Get isShortVisible.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsShortVisible ()
+    public function getIsShortVisible()
     {
         return $this->isShortVisible;
     }
 
     /**
-     * Proxy to getIsShortVisible()
+     * Proxy to getIsShortVisible().
      *
-     * @return boolean
+     * @return bool
      */
-    public function isShortVisible ()
+    public function isShortVisible()
     {
         return $this->getIsShortVisible();
     }
 
     /**
-     * Get the unique identifer state of the field
+     * Get the unique identifer state of the field.
      *
-     * @return boolean
+     * @return bool
      */
     public function getIsUniqueIdentifer()
     {
@@ -568,7 +565,7 @@ public function getIsUniqueIdentifer()
     }
 
     /**
-     * Set the unique identifer state of the field
+     * Set the unique identifer state of the field.
      *
      * @param mixed $isUniqueIdentifer
      *
@@ -582,9 +579,9 @@ public function setIsUniqueIdentifer($isUniqueIdentifer)
     }
 
     /**
-     * Wrapper for incorrectly spelled setIsUniqueIdentifer
+     * Wrapper for incorrectly spelled setIsUniqueIdentifer.
      *
-     * @return boolean
+     * @return bool
      */
     public function getIsUniqueIdentifier()
     {
@@ -592,7 +589,7 @@ public function getIsUniqueIdentifier()
     }
 
     /**
-     * Wrapper for incorrectly spelled setIsUniqueIdentifer
+     * Wrapper for incorrectly spelled setIsUniqueIdentifer.
      *
      * @param mixed $isUniqueIdentifier
      *
@@ -604,13 +601,13 @@ public function setIsUniqueIdentifier($isUniqueIdentifier)
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
      *
      * @return LeadField
      */
-    public function setAlias ($alias)
+    public function setAlias($alias)
     {
         $this->isChanged('alias', $alias);
         $this->alias = $alias;
@@ -619,23 +616,23 @@ public function setAlias ($alias)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
-    public function getAlias ()
+    public function getAlias()
     {
         return $this->alias;
     }
 
     /**
-     * Set isListable
+     * Set isListable.
      *
-     * @param boolean $isListable
+     * @param bool $isListable
      *
      * @return LeadField
      */
-    public function setIsListable ($isListable)
+    public function setIsListable($isListable)
     {
         $this->isChanged('isListable', $isListable);
         $this->isListable = $isListable;
@@ -644,21 +641,21 @@ public function setIsListable ($isListable)
     }
 
     /**
-     * Get isListable
+     * Get isListable.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsListable ()
+    public function getIsListable()
     {
         return $this->isListable;
     }
 
     /**
-     * Proxy to getIsListable()
+     * Proxy to getIsListable().
      *
      * @return bool
      */
-    public function isListable ()
+    public function isListable()
     {
         return $this->getIsListable();
     }
@@ -666,7 +663,7 @@ public function isListable ()
     /**
      * @return mixed
      */
-    public function getGroup ()
+    public function getGroup()
     {
         return $this->group;
     }
@@ -674,7 +671,7 @@ public function getGroup ()
     /**
      * @param mixed $group
      */
-    public function setGroup ($group)
+    public function setGroup($group)
     {
         $this->group = $group;
     }
@@ -682,7 +679,7 @@ public function setGroup ($group)
     /**
      * @return mixed
      */
-    public function getIsPubliclyUpdatable ()
+    public function getIsPubliclyUpdatable()
     {
         return $this->isPubliclyUpdatable;
     }
@@ -690,13 +687,13 @@ public function getIsPubliclyUpdatable ()
     /**
      * @param mixed $isPubliclyUpdatable
      */
-    public function setIsPubliclyUpdatable ($isPubliclyUpdatable)
+    public function setIsPubliclyUpdatable($isPubliclyUpdatable)
     {
-        $this->isPubliclyUpdatable = (bool)$isPubliclyUpdatable;
+        $this->isPubliclyUpdatable = (bool) $isPubliclyUpdatable;
     }
 
     /**
-     * Workaround for mispelled isUniqueIdentifer
+     * Workaround for mispelled isUniqueIdentifer.
      */
     public function identifierWorkaround()
     {
diff --git a/app/bundles/LeadBundle/Entity/LeadFieldRepository.php b/app/bundles/LeadBundle/Entity/LeadFieldRepository.php
index 77b5de0cd35..b1339acf6fc 100644
--- a/app/bundles/LeadBundle/Entity/LeadFieldRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadFieldRepository.php
@@ -1,30 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Doctrine\ORM\Query;
 
 /**
- * LeadFieldRepository
+ * LeadFieldRepository.
  */
 class LeadFieldRepository extends CommonRepository
 {
     /**
-     * Retrieves array of aliases used to ensure unique alias for new fields
+     * Retrieves array of aliases used to ensure unique alias for new fields.
      *
      * @param $exludingId
      * @param $publishedOnly
      * @param $includeEntityFields
-     * @param  string  $object name of object using the custom fields
+     * @param string $object name of object using the custom fields
      *
      * @return array
      */
@@ -32,7 +31,7 @@ public function getAliases($exludingId, $publishedOnly = false, $includeEntityFi
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('l.alias')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_fields', 'l');
+            ->from(MAUTIC_TABLE_PREFIX.'lead_fields', 'l');
 
         if (!empty($exludingId)) {
             $q->where('l.id != :id')
@@ -51,8 +50,8 @@ public function getAliases($exludingId, $publishedOnly = false, $includeEntityFi
         )->setParameter('object', $object);
 
         $results = $q->execute()->fetchAll();
-        $aliases = array();
-        foreach($results as $item) {
+        $aliases = [];
+        foreach ($results as $item) {
             $aliases[] = $item['alias'];
         }
 
@@ -76,13 +75,14 @@ public function getTableAlias()
     /**
      * @param QueryBuilder $q
      * @param              $filter
-     * @param  string  $object name of object using the custom fields
+     * @param string       $object name of object using the custom fields
+     *
      * @return array
      */
     protected function addCatchAllWhereClause(&$q, $filter, $object = 'lead')
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('f.label',  ':'.$unique),
@@ -96,10 +96,10 @@ protected function addCatchAllWhereClause(&$q, $filter, $object = 'lead')
             $q->expr()->eq('f.object', ':object')
         )->setParameter('object', $object);
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -107,15 +107,15 @@ protected function addCatchAllWhereClause(&$q, $filter, $object = 'lead')
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('f.order', 'ASC')
-        );
+        return [
+            ['f.order', 'ASC'],
+        ];
     }
 
     /**
-     * Get field aliases for lead table columns
+     * Get field aliases for lead table columns.
      *
-     * @param  string $object name of object using the custom fields
+     * @param string $object name of object using the custom fields
      *
      * @return array
      */
@@ -125,8 +125,8 @@ public function getFieldAliases($object = 'lead')
 
         return $qb->select('f.alias, f.is_unique_identifer as is_unique, f.type, f.object')
                 ->from(MAUTIC_TABLE_PREFIX.'lead_fields', 'f')
-                ->where( $qb->expr()->eq('object', ':object'))
-                ->setParameter('f.object',$object)
+                ->where($qb->expr()->eq('object', ':object'))
+                ->setParameter('f.object', $object)
                 ->orderBy('f.field_order', 'ASC')
                 ->execute()->fetchAll();
     }
@@ -134,23 +134,23 @@ public function getFieldAliases($object = 'lead')
     /**
      * Compare a form result value with defined value for defined lead.
      *
-     * @param  integer $lead ID
-     * @param  integer $field alias
-     * @param  string  $value to compare with
-     * @param  string  $operatorExpr for WHERE clause
+     * @param int    $lead         ID
+     * @param int    $field        alias
+     * @param string $value        to compare with
+     * @param string $operatorExpr for WHERE clause
      *
-     * @return boolean
+     * @return bool
      */
     public function compareValue($lead, $field, $value, $operatorExpr)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('l.id')
-            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l');
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
 
-        if ($field === "tags") {
+        if ($field === 'tags') {
             // Special reserved tags field
             $q->join('l', MAUTIC_TABLE_PREFIX.'lead_tags_xref', 'x', 'l.id = x.lead_id')
-                ->join('x', MAUTIC_TABLE_PREFIX.'lead_tags', 't', 'x.tag_id = t.id') 
+                ->join('x', MAUTIC_TABLE_PREFIX.'lead_tags', 't', 'x.tag_id = t.id')
                 ->where(
                     $q->expr()->andX(
                         $q->expr()->eq('l.id', ':lead'),
@@ -162,19 +162,19 @@ public function compareValue($lead, $field, $value, $operatorExpr)
 
             $result = $q->execute()->fetch();
 
-            if (($operatorExpr === "eq") || ($operatorExpr === "like")) {
+            if (($operatorExpr === 'eq') || ($operatorExpr === 'like')) {
                 return !empty($result['id']);
-            } elseif (($operatorExpr === "neq") || ($operatorExpr === "notLike")) {
+            } elseif (($operatorExpr === 'neq') || ($operatorExpr === 'notLike')) {
                 return empty($result['id']);
             } else {
                 return false;
-            }            
+            }
         } else {
             // Standard field
             $q->where(
                 $q->expr()->andX(
                     $q->expr()->eq('l.id', ':lead'),
-                    $q->expr()->$operatorExpr('l.' . $field, ':value')
+                    $q->expr()->$operatorExpr('l.'.$field, ':value')
                 )
             )
             ->setParameter('lead', (int) $lead)
@@ -185,5 +185,4 @@ public function compareValue($lead, $field, $value, $operatorExpr)
             return !empty($result['id']);
         }
     }
-
 }
diff --git a/app/bundles/LeadBundle/Entity/LeadList.php b/app/bundles/LeadBundle/Entity/LeadList.php
index d15156cd2a9..2feccc720e0 100644
--- a/app/bundles/LeadBundle/Entity/LeadList.php
+++ b/app/bundles/LeadBundle/Entity/LeadList.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,11 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
 use Mautic\LeadBundle\Form\Validator\Constraints\UniqueUserAlias;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class LeadList
- *
- * @package Mautic\LeadBundle\Entity
+ * Class LeadList.
  */
 class LeadList extends FormEntity
 {
@@ -48,7 +47,7 @@ class LeadList extends FormEntity
     /**
      * @var array
      */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * @var bool
@@ -61,7 +60,7 @@ class LeadList extends FormEntity
     private $leads;
 
     /**
-     * Construct
+     * Construct.
      */
     public function __construct()
     {
@@ -71,7 +70,7 @@ public function __construct()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -101,17 +100,17 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('name', new Assert\NotBlank(
-            array('message' => 'mautic.core.name.required')
+            ['message' => 'mautic.core.name.required']
         ));
 
-        $metadata->addConstraint(new UniqueUserAlias(array(
+        $metadata->addConstraint(new UniqueUserAlias([
             'field'   => 'alias',
-            'message' => 'mautic.lead.list.alias.unique'
-        )));
+            'message' => 'mautic.lead.list.alias.unique',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -119,26 +118,26 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('leadList')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'alias',
-                    'description'
-                )
+                    'description',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'filters',
-                    'isGlobal'
-                )
+                    'isGlobal',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -146,9 +145,10 @@ public function getId()
     }
 
     /**
-     * Set name
+     * Set name.
+     *
+     * @param int $name
      *
-     * @param integer $name
      * @return LeadList
      */
     public function setName($name)
@@ -160,9 +160,9 @@ public function setName($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
-     * @return integer
+     * @return int
      */
     public function getName()
     {
@@ -170,9 +170,10 @@ public function getName()
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
+     *
      * @return LeadList
      */
     public function setDescription($description)
@@ -184,7 +185,7 @@ public function setDescription($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
@@ -194,9 +195,10 @@ public function getDescription()
     }
 
     /**
-     * Set filters
+     * Set filters.
      *
      * @param array $filters
+     *
      * @return LeadList
      */
     public function setFilters(array $filters)
@@ -208,7 +210,7 @@ public function setFilters(array $filters)
     }
 
     /**
-     * Get filters
+     * Get filters.
      *
      * @return array
      */
@@ -218,9 +220,10 @@ public function getFilters()
     }
 
     /**
-     * Set isGlobal
+     * Set isGlobal.
+     *
+     * @param bool $isGlobal
      *
-     * @param boolean $isGlobal
      * @return LeadList
      */
     public function setIsGlobal($isGlobal)
@@ -232,9 +235,9 @@ public function setIsGlobal($isGlobal)
     }
 
     /**
-     * Get isGlobal
+     * Get isGlobal.
      *
-     * @return boolean
+     * @return bool
      */
     public function getIsGlobal()
     {
@@ -242,7 +245,7 @@ public function getIsGlobal()
     }
 
     /**
-     * Proxy function to getIsGlobal()
+     * Proxy function to getIsGlobal().
      *
      * @return bool
      */
@@ -252,9 +255,10 @@ public function isGlobal()
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
+     *
      * @return LeadList
      */
     public function setAlias($alias)
@@ -266,7 +270,7 @@ public function setAlias($alias)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
@@ -276,7 +280,7 @@ public function getAlias()
     }
 
     /**
-     * Get leads
+     * Get leads.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
diff --git a/app/bundles/LeadBundle/Entity/LeadListRepository.php b/app/bundles/LeadBundle/Entity/LeadListRepository.php
index 25602182538..3bea46090cc 100644
--- a/app/bundles/LeadBundle/Entity/LeadListRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadListRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,15 +21,12 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Helper\InputHelper;
-use Mautic\LeadBundle\Entity\DoNotContact;
-use Mautic\LeadBundle\EventListener\MaintenanceSubscriber;
 
 /**
- * LeadListRepository
+ * LeadListRepository.
  */
 class LeadListRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      *
@@ -53,7 +51,7 @@ public function getEntity($id = 0)
     }
 
     /**
-     * Get a list of lists
+     * Get a list of lists.
      *
      * @param bool   $user
      * @param string $alias
@@ -63,7 +61,7 @@ public function getEntity($id = 0)
      */
     public function getLists($user = false, $alias = '', $id = '')
     {
-        static $lists = array();
+        static $lists = [];
 
         if (is_object($user)) {
             $user = $user->getId();
@@ -108,11 +106,11 @@ public function getLists($user = false, $alias = '', $id = '')
     }
 
     /**
-     * Get lists for a specific lead
+     * Get lists for a specific lead.
      *
-     * @param       $lead
-     * @param bool  $forList
-     * @param bool  $singleArrayHydration
+     * @param      $lead
+     * @param bool $forList
+     * @param bool $singleArrayHydration
      *
      * @return mixed
      */
@@ -142,7 +140,7 @@ public function getLeadLists($lead, $forList = false, $singleArrayHydration = fa
 
             $result = $q->getQuery()->getArrayResult();
 
-            $return = array();
+            $return = [];
             foreach ($result as $r) {
                 foreach ($r['leads'] as $l) {
                     $return[$l['lead_id']][$r['id']] = $r;
@@ -175,7 +173,7 @@ public function getLeadLists($lead, $forList = false, $singleArrayHydration = fa
     }
 
     /**
-     * Return a list of global lists
+     * Return a list of global lists.
      *
      * @return array
      */
@@ -196,7 +194,7 @@ public function getGlobalLists()
     }
 
     /**
-     * Get a count of leads that belong to the list
+     * Get a count of leads that belong to the list.
      *
      * @param $listIds
      *
@@ -212,7 +210,7 @@ public function getLeadCount($listIds)
         $returnArray = (is_array($listIds));
 
         if (!$returnArray) {
-            $listIds = array($listIds);
+            $listIds = [$listIds];
         }
 
         $q->where(
@@ -224,7 +222,7 @@ public function getLeadCount($listIds)
 
         $result = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
         foreach ($result as $r) {
             $return[$r['leadlist_id']] = $r['thecount'];
         }
@@ -245,7 +243,7 @@ public function getLeadCount($listIds)
      *
      * @return array
      */
-    public function getLeadsByList($lists, $args = array())
+    public function getLeadsByList($lists, $args = [])
     {
         // Return only IDs
         $idOnly = (!array_key_exists('idOnly', $args)) ? false : $args['idOnly'];
@@ -263,29 +261,29 @@ public function getLeadsByList($lists, $args = array())
         $limit         = (!array_key_exists('limit', $args)) ? false : $args['limit'];
 
         if (!$lists instanceof PersistentCollection && !is_array($lists) || isset($lists['id'])) {
-            $lists = array($lists);
+            $lists = [$lists];
         }
 
-        $return = array();
+        $return = [];
         foreach ($lists as $l) {
-            $leads = ($countOnly) ? 0 : array();
+            $leads = ($countOnly) ? 0 : [];
 
             if ($l instanceof LeadList) {
                 $id      = $l->getId();
                 $filters = $l->getFilters();
             } elseif (is_array($l)) {
                 $id      = $l['id'];
-                $filters = (!$dynamic) ? array() : $l['filters'];
+                $filters = (!$dynamic) ? [] : $l['filters'];
             } elseif (!$dynamic) {
                 $id      = $l;
-                $filters = array();
+                $filters = [];
             }
 
             $objectFilters = $this->arrangeFilters($filters);
 
             if ($dynamic && count($filters)) {
                 $q          = $this->getEntityManager()->getConnection()->createQueryBuilder();
-                $parameters = array();
+                $parameters = [];
 
                 if (isset($objectFilters['lead'])) {
                     $expr = $this->getListFilterExpr($objectFilters['lead'], $parameters, $q, false, 'lead');
@@ -314,7 +312,7 @@ public function getLeadsByList($lists, $args = array())
                         $paramType = null;
                         break;
                 }
-                $q->setParameter($k, $v, $paramType);
+                    $q->setParameter($k, $v, $paramType);
                 }
 
                 if ($countOnly) {
@@ -326,7 +324,7 @@ public function getLeadsByList($lists, $args = array())
                 }
 
                 $q->select($select)
-                    ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l');
+                    ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
 
                     // Only leads that existed at the time of count
                     if ($batchLimiters && !empty($batchLimiters['maxId'])) {
@@ -335,11 +333,11 @@ public function getLeadsByList($lists, $args = array())
                         );
                     }
 
-                    if ($newOnly) {
-                        // Leads that do not have any record in the lead_lists_leads table for this lead list
+                if ($newOnly) {
+                    // Leads that do not have any record in the lead_lists_leads table for this lead list
                         $subqb = $this->_em->getConnection()->createQueryBuilder()
                             ->select('null')
-                            ->from(MAUTIC_TABLE_PREFIX . 'lead_lists_leads', 'll')
+                            ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'll')
                             ->where(
                                 $q->expr()->andX(
                                     $q->expr()->eq('ll.leadlist_id', $id),
@@ -347,58 +345,57 @@ public function getLeadsByList($lists, $args = array())
                                 )
                             );
 
-                        $expr->add(
+                    $expr->add(
                                 sprintf('NOT EXISTS (%s)', $subqb->getSQL())
                             );
-                        if(isset($objectFilters['lead']) ) {
-                            $q->andWhere($expr);
-                        } else {
-                            $q->andWhere(sprintf('NOT EXISTS (%s)', $subqb->getSQL()));
-                        }
-
-                    } elseif ($nonMembersOnly) {
-                        // Only leads that are part of the list that no longer match filters and have not been manually removed
-                        $q->join('l', MAUTIC_TABLE_PREFIX . 'lead_lists_leads', 'll', 'l.id = ll.lead_id');
+                    if (isset($objectFilters['lead'])) {
+                        $q->andWhere($expr);
+                    } else {
+                        $q->andWhere(sprintf('NOT EXISTS (%s)', $subqb->getSQL()));
+                    }
+                } elseif ($nonMembersOnly) {
+                    // Only leads that are part of the list that no longer match filters and have not been manually removed
+                        $q->join('l', MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'll', 'l.id = ll.lead_id');
 
-                        $mainExpr = $q->expr()->andX();
-                        if ($batchLimiters && !empty($batchLimiters['dateTime'])) {
-                            // Only leads in the list at the time of count
+                    $mainExpr = $q->expr()->andX();
+                    if ($batchLimiters && !empty($batchLimiters['dateTime'])) {
+                        // Only leads in the list at the time of count
                             $mainExpr->add(
                                 $q->expr()->lte('ll.date_added', $q->expr()->literal($batchLimiters['dateTime']))
                             );
-                        }
+                    }
 
                         // Ignore those that have been manually added
                         $mainExpr->addMultiple(
-                            array(
+                            [
                                 $q->expr()->eq('ll.manually_added', ':false'),
-                                $q->expr()->eq('ll.leadlist_id', (int)$id)
-                            )
+                                $q->expr()->eq('ll.leadlist_id', (int) $id),
+                            ]
                         );
-                        $q->setParameter('false', false, 'boolean');
+                    $q->setParameter('false', false, 'boolean');
 
                         // Use an exists statement for better performance?? - https://dev.mysql.com/doc/refman/5.5/en/-existssubquery-optimization-with.html
                         $sq = $this->getEntityManager()->getConnection()->createQueryBuilder();
-                        $sq->select('null')
-                            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l')
+                    $sq->select('null')
+                            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
                             ->where('l.id = ll.lead_id');
-                        if(isset($objectFilters['lead']) ) {
-                            $sq->andWhere($expr);
-                        }
-                        $q->andWhere(
+                    if (isset($objectFilters['lead'])) {
+                        $sq->andWhere($expr);
+                    }
+                    $q->andWhere(
                             sprintf('NOT EXISTS (%s)', $sq->getSQL())
                         )
                             ->andWhere($mainExpr);
-                    }
+                }
                 if (isset($objectFilters['company'])) {
                     $compq = $this->getEntityManager()->getConnection()->createQueryBuilder();
                     $compq->select('id')
-                        ->from(MAUTIC_TABLE_PREFIX . 'companies', 'comp')
+                        ->from(MAUTIC_TABLE_PREFIX.'companies', 'comp')
                         ->where($exprCompany);
 
                     $clq = $this->getEntityManager()->getConnection()->createQueryBuilder();
                     $clq->select('null')
-                        ->from(MAUTIC_TABLE_PREFIX . 'companies_leads', 'cl')
+                        ->from(MAUTIC_TABLE_PREFIX.'companies_leads', 'cl')
                         ->where('cl.lead_id = l.id')
                         ->andWhere(sprintf('cl.company_id in (%s)', $compq->getSQL()));
                 }
@@ -416,10 +413,10 @@ public function getLeadsByList($lists, $args = array())
                 $results = $q->execute()->fetchAll();
                 foreach ($results as $r) {
                     if ($countOnly) {
-                        $leads = array(
+                        $leads = [
                             'count' => $r['lead_count'],
-                            'maxId' => $r['max_id']
-                        );
+                            'maxId' => $r['max_id'],
+                        ];
                     } elseif ($idOnly) {
                         $leads[$r['id']] = $r['id'];
                     } else {
@@ -461,10 +458,10 @@ public function getLeadsByList($lists, $args = array())
 
                 foreach ($results as $r) {
                     if ($countOnly) {
-                        $leads = array(
+                        $leads = [
                             'count' => $r['lead_count'],
-                            'maxId' => $r['max_id']
-                        );
+                            'maxId' => $r['max_id'],
+                        ];
                     } elseif ($idOnly) {
                         $leads[] = $r['id'];
                     } else {
@@ -481,7 +478,8 @@ public function getLeadsByList($lists, $args = array())
         return $return;
     }
 
-    public function arrangeFilters($filters) {
+    public function arrangeFilters($filters)
+    {
         $objectFilters = [];
         if (empty($filters)) {
             $objectFilters['lead'][] = $filters;
@@ -489,14 +487,15 @@ public function arrangeFilters($filters) {
         foreach ($filters as $filter) {
             $object = (isset($filter['object'])) ? $filter['object'] : 'lead';
             switch ($object) {
-                case 'company' :
+                case 'company':
                     $objectFilters['company'][] = $filter;
                     break;
-                default :
+                default:
                     $objectFilters['lead'][] = $filter;
                     break;
             }
         }
+
         return $objectFilters;
     }
 
@@ -509,7 +508,7 @@ public function arrangeFilters($filters) {
      *
      * @return \Doctrine\DBAL\Query\Expression\CompositeExpression
      */
-    public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not = false, $object = 'lead',$leadId = null)
+    public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not = false, $object = 'lead', $leadId = null)
     {
         static $leadTable;
         static $companyTable;
@@ -522,13 +521,13 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
         // Get table columns
         if (null === $leadTable) {
             /** @var \Doctrine\DBAL\Schema\Column[] $leadTable */
-            $leadTable = $schema->listTableColumns(MAUTIC_TABLE_PREFIX . 'leads');
+            $leadTable = $schema->listTableColumns(MAUTIC_TABLE_PREFIX.'leads');
         }
         if (null === $companyTable) {
-            $companyTable = $schema->listTableColumns(MAUTIC_TABLE_PREFIX . 'companies');
+            $companyTable = $schema->listTableColumns(MAUTIC_TABLE_PREFIX.'companies');
         }
         $options   = $this->getFilterExpressionFunctions();
-        $groups    = array();
+        $groups    = [];
         $groupExpr = $q->expr()->andX();
 
         foreach ($filters as $k => $details) {
@@ -536,20 +535,20 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                 continue;
             }
 
-            if($object == 'lead') {
+            if ($object == 'lead') {
                 $column = isset($leadTable[$details['field']]) ? $leadTable[$details['field']] : false;
-            } elseif($object == 'company') {
+            } elseif ($object == 'company') {
                 $column = isset($companyTable[$details['field']]) ? $companyTable[$details['field']] : false;
             }
 
             //DBAL does not have a not() function so we have to use the opposite
-            $func  = (!$not)
+            $func = (!$not)
                 ? $options[$details['operator']]['expr']
                 :
                 $options[$details['operator']]['negate_expr'];
-            if($object == 'lead') {
+            if ($object == 'lead') {
                 $field = "l.{$details['field']}";
-            } elseif($object == 'company') {
+            } elseif ($object == 'company') {
                 $field = "comp.{$details['field']}";
             }
             // Format the field based on platform specific functions that DBAL doesn't support natively
@@ -602,7 +601,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                 $getDate     = function (&$string) use ($isTimestamp, $relativeDateStrings, &$details, &$func, $not) {
                     $key             = array_search($string, $relativeDateStrings);
                     $dtHelper        = new DateTimeHelper('midnight today', null, 'local');
-                    $requiresBetween = (in_array($func, array('eq', 'neq')) && $isTimestamp);
+                    $requiresBetween = (in_array($func, ['eq', 'neq']) && $isTimestamp);
 
                     $timeframe  = str_replace('mautic.lead.list.', '', $key);
                     $modifier   = false;
@@ -638,7 +637,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                                 //  field <= 2015-08-28 23:59:59
                                 // gte:
                                 //  field >= 2015-08-28 00:00:00
-                                if (in_array($func, array('gt', 'lte'))) {
+                                if (in_array($func, ['gt', 'lte'])) {
                                     $modifier = '+1 day -1 second';
                                 }
                             }
@@ -669,7 +668,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                                 //  field <= Sun 2015-08-30 23:59:59
                                 // gte:
                                 //  field >= Mon 2015-08-24 00:00:00
-                                if (in_array($func, array('gt', 'lte'))) {
+                                if (in_array($func, ['gt', 'lte'])) {
                                     $modifier = '+1 week -1 second';
                                 }
                             }
@@ -701,7 +700,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                                 //  field <= 2015-08-31 23:59:59
                                 // gte:
                                 //  field >= 2015-08-01 00:00:00
-                                if (in_array($func, array('gt', 'lte'))) {
+                                if (in_array($func, ['gt', 'lte'])) {
                                     $modifier = '+1 month -1 second';
                                 }
                             }
@@ -732,7 +731,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                                 //  field <= 2015-12-31 23:59:59
                                 // gte:
                                 //  field >= 2015-01-01 00:00:00
-                                if (in_array($func, array('gt', 'lte'))) {
+                                if (in_array($func, ['gt', 'lte'])) {
                                     $modifier = '+1 year -1 second';
                                 }
                             }
@@ -743,12 +742,12 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                     }
 
                     // check does this match php date params pattern?
-                    if(stristr($string[0], '-') or stristr($string[0], '+')){
+                    if (stristr($string[0], '-') or stristr($string[0], '+')) {
                         $date = new \DateTime('now');
                         $date->modify($string);
                         $dateTime = $date->format('Y-m-d H:i:s');
                         $dtHelper->setDateTime($dateTime, null);
-                        $key = $string;
+                        $key        = $string;
                         $isRelative = true;
                     }
 
@@ -761,7 +760,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
 
                             // Use a between statement
                             $func              = ($func == 'neq') ? 'notBetween' : 'between';
-                            $details['filter'] = array($startWith, $endWith);
+                            $details['filter'] = [$startWith, $endWith];
                         } else {
                             if ($modifier) {
                                 $dtHelper->modify($modifier);
@@ -791,7 +790,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                     $subqb = $this->_em->getConnection()
                         ->createQueryBuilder()
                         ->select('id')
-                        ->from(MAUTIC_TABLE_PREFIX . 'page_hits', $alias);
+                        ->from(MAUTIC_TABLE_PREFIX.'page_hits', $alias);
                     switch ($func) {
                         case 'eq':
                         case 'neq':
@@ -799,22 +798,22 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
 
                             $subqb->where($q->expr()
                                 ->andX($q->expr()
-                                ->eq($alias . '.url', $exprParameter), $q->expr()
-                                ->eq($alias . '.lead_id', 'l.id')));
+                                ->eq($alias.'.url', $exprParameter), $q->expr()
+                                ->eq($alias.'.lead_id', 'l.id')));
                             break;
                         case 'like':
                         case '!like':
-                            $details['filter'] = '%' . $details['filter'] . '%';
+                            $details['filter'] = '%'.$details['filter'].'%';
                             $subqb->where($q->expr()
                                 ->andX($q->expr()
-                                ->like($alias . '.url', $exprParameter), $q->expr()
-                                ->eq($alias . '.lead_id', 'l.id')));
+                                ->like($alias.'.url', $exprParameter), $q->expr()
+                                ->eq($alias.'.lead_id', 'l.id')));
                             break;
                     }
                     // Specific lead
-                    if (! empty($leadId)) {
+                    if (!empty($leadId)) {
                         $subqb->andWhere($subqb->expr()
-                            ->eq($alias . '.lead_id', $leadId));
+                            ->eq($alias.'.lead_id', $leadId));
                     }
                     $groupExpr->add(sprintf('%s (%s)', $operand, $subqb->getSQL()));
                     break;
@@ -834,7 +833,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                     }
 
                     $channelParameter = $this->generateRandomParameterName();
-                    $subqb = $this->_em->getConnection()->createQueryBuilder()
+                    $subqb            = $this->_em->getConnection()->createQueryBuilder()
                         ->select('null')
                         ->from(MAUTIC_TABLE_PREFIX.'lead_donotcontact', $alias)
                         ->where(
@@ -871,7 +870,7 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
                 case 'lead_email_received':
 
                     // Special handling of lead lists and tags
-                    $func = in_array($func, array('eq', 'in')) ? 'EXISTS' : 'NOT EXISTS';
+                    $func = in_array($func, ['eq', 'in']) ? 'EXISTS' : 'NOT EXISTS';
 
                     $ignoreAutoFilter = true;
                     foreach ($details['filter'] as &$value) {
@@ -931,12 +930,12 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
 
                     break;
                 case 'stage':
-                    $operand = in_array($func, array('eq', 'neq')) ? 'EXISTS' : 'NOT EXISTS';
+                    $operand = in_array($func, ['eq', 'neq']) ? 'EXISTS' : 'NOT EXISTS';
 
                     $subQb = $this->_em->getConnection()
                         ->createQueryBuilder()
                         ->select('null')
-                        ->from(MAUTIC_TABLE_PREFIX . 'stages', $alias);
+                        ->from(MAUTIC_TABLE_PREFIX.'stages', $alias);
                     switch ($func) {
                         case 'eq':
                         case 'neq':
@@ -952,7 +951,6 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
 
                     $groupExpr->add(sprintf('%s (%s)', $operand, $subQb->getSQL()));
 
-
                     break;
                 default:
                     switch ($func) {
@@ -1078,96 +1076,82 @@ public function getListFilterExpr($filters, &$parameters, QueryBuilder $q, $not
      */
     public function getFilterExpressionFunctions($operator = null)
     {
-        $operatorOptions = array(
-            '='        =>
-                array(
+        $operatorOptions = [
+            '=' => [
                     'label'       => 'mautic.lead.list.form.operator.equals',
                     'expr'        => 'eq',
-                    'negate_expr' => 'neq'
-                ),
-            '!='       =>
-                array(
+                    'negate_expr' => 'neq',
+                ],
+            '!=' => [
                     'label'       => 'mautic.lead.list.form.operator.notequals',
                     'expr'        => 'neq',
-                    'negate_expr' => 'eq'
-                ),
-            'gt'       =>
-                array(
+                    'negate_expr' => 'eq',
+                ],
+            'gt' => [
                     'label'       => 'mautic.lead.list.form.operator.greaterthan',
                     'expr'        => 'gt',
-                    'negate_expr' => 'lt'
-                ),
-            'gte'      =>
-                array(
+                    'negate_expr' => 'lt',
+                ],
+            'gte' => [
                     'label'       => 'mautic.lead.list.form.operator.greaterthanequals',
                     'expr'        => 'gte',
-                    'negate_expr' => 'lt'
-                ),
-            'lt'       =>
-                array(
+                    'negate_expr' => 'lt',
+                ],
+            'lt' => [
                     'label'       => 'mautic.lead.list.form.operator.lessthan',
                     'expr'        => 'lt',
-                    'negate_expr' => 'gt'
-                ),
-            'lte'      =>
-                array(
+                    'negate_expr' => 'gt',
+                ],
+            'lte' => [
                     'label'       => 'mautic.lead.list.form.operator.lessthanequals',
                     'expr'        => 'lte',
-                    'negate_expr' => 'gt'
-                ),
-            'empty'    =>
-                array(
+                    'negate_expr' => 'gt',
+                ],
+            'empty' => [
                     'label'       => 'mautic.lead.list.form.operator.isempty',
                     'expr'        => 'empty', //special case
-                    'negate_expr' => 'notEmpty'
-                ),
-            '!empty'   =>
-                array(
+                    'negate_expr' => 'notEmpty',
+                ],
+            '!empty' => [
                     'label'       => 'mautic.lead.list.form.operator.isnotempty',
                     'expr'        => 'notEmpty', //special case
-                    'negate_expr' => 'empty'
-                ),
-            'like'     =>
-                array(
+                    'negate_expr' => 'empty',
+                ],
+            'like' => [
                     'label'       => 'mautic.lead.list.form.operator.islike',
                     'expr'        => 'like',
-                    'negate_expr' => 'notLike'
-                ),
-            '!like'    =>
-                array(
+                    'negate_expr' => 'notLike',
+                ],
+            '!like' => [
                     'label'       => 'mautic.lead.list.form.operator.isnotlike',
                     'expr'        => 'notLike',
-                    'negate_expr' => 'like'
-                ),
-            'between'  =>
-                array(
+                    'negate_expr' => 'like',
+                ],
+            'between' => [
                     'label'       => 'mautic.lead.list.form.operator.between',
                     'expr'        => 'between', //special case
                     'negate_expr' => 'notBetween',
                     // @todo implement in list UI
-                    'hide'        => true
-                ),
-            '!between' =>
-                array(
+                    'hide' => true,
+                ],
+            '!between' => [
                     'label'       => 'mautic.lead.list.form.operator.notbetween',
                     'expr'        => 'notBetween', //special case
                     'negate_expr' => 'between',
                     // @todo implement in list UI
-                    'hide'        => true
-                ),
-            'in'       =>
-                array(
+                    'hide' => true,
+                ],
+            'in' => [
                     'label'       => 'mautic.lead.list.form.operator.in',
                     'expr'        => 'in',
-                    'negate_expr' => 'notIn'
-                ),
-            '!in'      =>
-                array(
+                    'negate_expr' => 'notIn',
+                ],
+            '!in' => [
                     'label'       => 'mautic.lead.list.form.operator.notin',
                     'expr'        => 'notIn',
-                    'negate_expr' => 'in'
-                ),
-        );
+                    'negate_expr' => 'in',
+                ],
+        ];
 
         return ($operator === null) ? $operatorOptions : $operatorOptions[$operator];
     }
@@ -1191,10 +1175,10 @@ protected function addCatchAllWhereClause(&$q, $filter)
             $expr = $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -1212,38 +1196,38 @@ protected function addSearchCommandWhereClause(&$q, $filter)
 
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr            = $q->expr()->eq("l.createdBy", $this->currentUser->getId());
+                $expr            = $q->expr()->eq('l.createdBy', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.lead.list.searchcommand.isglobal'):
-                $expr            = $q->expr()->eq("l.isGlobal", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('l.isGlobal', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr            = $q->expr()->eq("l.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('l.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr            = $q->expr()->eq("l.isPublished", ":$unique");
-                $forceParameters = array($unique => false);
+                $expr            = $q->expr()->eq('l.isPublished', ":$unique");
+                $forceParameters = [$unique => false];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.name'):
                 $expr = $q->expr()->like('l.name', ':'.$unique);
                 break;
         }
 
-        $parameters = array();
+        $parameters = [];
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif ($returnParameter) {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array(
+        return [
             $expr,
-            $parameters
-        );
+            $parameters,
+        ];
     }
 
     /**
@@ -1251,13 +1235,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.lead.list.searchcommand.isglobal',
             'mautic.core.searchcommand.ismine',
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isinactive',
-            'mautic.core.searchcommand.name'
-        );
+            'mautic.core.searchcommand.name',
+        ];
     }
 
     /**
@@ -1267,7 +1251,7 @@ public function getRelativeDateStrings()
     {
         $keys = self::getRelativeDateTranslationKeys();
 
-        $strings = array();
+        $strings = [];
         foreach ($keys as $key) {
             $strings[$key] = $this->translator->trans($key);
         }
@@ -1280,7 +1264,7 @@ public function getRelativeDateStrings()
      */
     public static function getRelativeDateTranslationKeys()
     {
-        return array(
+        return [
             'mautic.lead.list.month_last',
             'mautic.lead.list.month_next',
             'mautic.lead.list.month_this',
@@ -1292,8 +1276,8 @@ public static function getRelativeDateTranslationKeys()
             'mautic.lead.list.week_this',
             'mautic.lead.list.year_last',
             'mautic.lead.list.year_next',
-            'mautic.lead.list.year_this'
-        );
+            'mautic.lead.list.year_this',
+        ];
     }
 
     /**
@@ -1301,9 +1285,9 @@ public static function getRelativeDateTranslationKeys()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('l.name', 'ASC')
-        );
+        return [
+            ['l.name', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/LeadBundle/Entity/LeadNote.php b/app/bundles/LeadBundle/Entity/LeadNote.php
index da9a451bb6e..45fb62bcc16 100644
--- a/app/bundles/LeadBundle/Entity/LeadNote.php
+++ b/app/bundles/LeadBundle/Entity/LeadNote.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,18 +14,14 @@
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class LeadNote
- *
- * @package Mautic\LeadBundle\Entity
+ * Class LeadNote.
  */
 class LeadNote extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -53,7 +50,7 @@ class LeadNote extends FormEntity
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -78,7 +75,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -86,34 +83,34 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('leadNote')
             ->addProperties(
-                array(
+                [
                     'id',
                     'text',
                     'type',
-                    'dateTime'
-                )
+                    'dateTime',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set text
+     * Set text.
      *
      * @param string $text
      *
      * @return LeadNote
      */
-    public function setText ($text)
+    public function setText($text)
     {
         $this->isChanged('text', $text);
         $this->text = $text;
@@ -122,23 +119,23 @@ public function setText ($text)
     }
 
     /**
-     * Get text
+     * Get text.
      *
      * @return string
      */
-    public function getText ()
+    public function getText()
     {
         return $this->text;
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
      * @return LeadNote
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->isChanged('type', $type);
         $this->type = $type;
@@ -147,32 +144,31 @@ public function setType ($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
 
-
     /**
-     * Form validation rules
+     * Form validation rules.
      *
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('text', new NotBlank(
-            array('message' => 'mautic.lead.note.text.notblank')
+            ['message' => 'mautic.lead.note.text.notblank']
         ));
     }
 
     /**
      * @return Lead
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -180,7 +176,7 @@ public function getLead ()
     /**
      * @param Lead $lead
      */
-    public function setLead (Lead $lead)
+    public function setLead(Lead $lead)
     {
         $this->lead = $lead;
     }
@@ -188,7 +184,7 @@ public function setLead (Lead $lead)
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
@@ -196,7 +192,7 @@ public function convertToArray ()
     /**
      * @return mixed
      */
-    public function getDateTime ()
+    public function getDateTime()
     {
         return $this->dateTime;
     }
@@ -204,8 +200,8 @@ public function getDateTime ()
     /**
      * @param mixed $dateTime
      */
-    public function setDateTime ($dateTime)
+    public function setDateTime($dateTime)
     {
         $this->dateTime = $dateTime;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/LeadNoteRepository.php b/app/bundles/LeadBundle/Entity/LeadNoteRepository.php
index 48ec3417ada..75091dd33cd 100644
--- a/app/bundles/LeadBundle/Entity/LeadNoteRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadNoteRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,21 +12,20 @@
 
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Doctrine\ORM\Query;
 
 /**
- * LeadNoteRepository
+ * LeadNoteRepository.
  */
 class LeadNoteRepository extends CommonRepository
 {
-
     /**
-     * {@inhertidoc}
+     * {@inhertidoc}.
+     *
+     * @param array $args
      *
-     * @param array      $args
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('n')
@@ -41,6 +41,7 @@ public function getEntities($args = array())
      * @param $noteTypes
      *
      * @return mixed
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -54,17 +55,18 @@ public function getNoteCount($leadId, $filter = null, $noteTypes = null)
 
         if ($filter != null) {
             $q->andWhere(
-                $q->expr()->like('n.text', ":filter")
+                $q->expr()->like('n.text', ':filter')
             )->setParameter('filter', '%'.$filter.'%');
         }
 
         if ($noteTypes != null) {
             $q->andWhere(
-                $q->expr()->in('n.type', ":noteTypes")
+                $q->expr()->in('n.type', ':noteTypes')
             )->setParameter('noteTypes', $noteTypes);
         }
 
         $results = $q->getQuery()->getArrayResult();
+
         return $results[0]['note_count'];
     }
 
@@ -78,16 +80,16 @@ public function getTableAlias()
         return 'n';
     }
 
-
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->like('n.text', ":$unique");
 
@@ -95,15 +97,16 @@ protected function addCatchAllWhereClause(&$q, $filter)
             $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
@@ -116,7 +119,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
 
         switch ($command) {
             case $this->translator->trans('mautic.lead.note.searchcommand.type'):
-                switch($string) {
+                switch ($string) {
                     case $this->translator->trans('mautic.lead.note.searchcommand.general'):
                         $filter->string = 'general';
                         break;
@@ -130,19 +133,20 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                         $filter->string = 'meeting';
                         break;
                 }
-                $expr = $q->expr()->eq('n.type', ":$unique");
+                $expr           = $q->expr()->eq('n.type', ":$unique");
                 $filter->strict = true;
                 break;
         }
 
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
         if ($expr && $filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            ($returnParameter) ? array("$unique" => $string) : array()
-        );
+            ($returnParameter) ? ["$unique" => $string] : [],
+        ];
     }
 
     /**
@@ -150,18 +154,18 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        return array(
-            'mautic.lead.note.searchcommand.type' => array(
+        return [
+            'mautic.lead.note.searchcommand.type' => [
                 'mautic.lead.note.searchcommand.general',
                 'mautic.lead.note.searchcommand.call',
                 'mautic.lead.note.searchcommand.email',
-                'mautic.lead.note.searchcommand.meeting'
-            )
-        );
+                'mautic.lead.note.searchcommand.meeting',
+            ],
+        ];
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -169,9 +173,9 @@ public function getSearchCommands()
     public function updateLead($fromLeadId, $toLeadId)
     {
         $this->_em->getConnection()->createQueryBuilder()
-            ->update(MAUTIC_TABLE_PREFIX . 'lead_notes')
-            ->set('lead_id', (int)$toLeadId)
-            ->where('lead_id = ' . (int)$fromLeadId)
+            ->update(MAUTIC_TABLE_PREFIX.'lead_notes')
+            ->set('lead_id', (int) $toLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 }
diff --git a/app/bundles/LeadBundle/Entity/LeadRepository.php b/app/bundles/LeadBundle/Entity/LeadRepository.php
index ddefebb9f0c..07c38f9c7af 100644
--- a/app/bundles/LeadBundle/Entity/LeadRepository.php
+++ b/app/bundles/LeadBundle/Entity/LeadRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,29 +16,29 @@
 use Mautic\PointBundle\Model\TriggerModel;
 
 /**
- * LeadRepository
+ * LeadRepository.
  */
 class LeadRepository extends CommonRepository
 {
     /**
      * @var array
      */
-    private $availableSocialFields = array();
+    private $availableSocialFields = [];
 
     /**
      * @var array
      */
-    private $availableSearchFields = array();
+    private $availableSearchFields = [];
 
     /**
-     * Required to get the color based on a lead's points
+     * Required to get the color based on a lead's points.
      *
      * @var TriggerModel
      */
     private $triggerModel;
 
     /**
-     * Used by search functions to search social profiles
+     * Used by search functions to search social profiles.
      *
      * @param array $fields
      */
@@ -47,7 +48,7 @@ public function setAvailableSocialFields(array $fields)
     }
 
     /**
-     * Used by search functions to search using aliases as commands
+     * Used by search functions to search using aliases as commands.
      *
      * @param array $fields
      */
@@ -57,7 +58,7 @@ public function setAvailableSearchFields(array $fields)
     }
 
     /**
-     * Sets trigger model
+     * Sets trigger model.
      *
      * @param TriggerModel $triggerModel
      */
@@ -67,7 +68,7 @@ public function setTriggerModel(TriggerModel $triggerModel)
     }
 
     /**
-     * Gets a list of unique values from fields for autocompletes
+     * Gets a list of unique values from fields for autocompletes.
      *
      * @param        $field
      * @param string $search
@@ -79,9 +80,9 @@ public function setTriggerModel(TriggerModel $triggerModel)
     public function getValueList($field, $search = '', $limit = 10, $start = 0)
     {
         $col = 'l.'.$field;
-        $q = $this->_em->getConnection()->createQueryBuilder()
+        $q   = $this->_em->getConnection()->createQueryBuilder()
             ->select("DISTINCT $col")
-            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l');
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
 
         $q->where(
             $q->expr()->andX(
@@ -108,7 +109,7 @@ public function getValueList($field, $search = '', $limit = 10, $start = 0)
     }
 
     /**
-     * Get a list of leads based on field value
+     * Get a list of leads based on field value.
      *
      * @param $field
      * @param $value
@@ -128,9 +129,9 @@ public function getLeadsByFieldValue($field, $value, $ignoreId = null)
 
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('l.id')
-            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l')
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
             ->where("$col = :search")
-            ->setParameter("search", $value);
+            ->setParameter('search', $value);
 
         if ($ignoreId) {
             $q->andWhere('l.id != :ignoreId')
@@ -140,7 +141,7 @@ public function getLeadsByFieldValue($field, $value, $ignoreId = null)
         $results = $q->execute()->fetchAll();
 
         if (count($results)) {
-            $ids = array();
+            $ids = [];
             foreach ($results as $r) {
                 $ids[] = $r['id'];
             }
@@ -165,7 +166,7 @@ public function getLeadsByFieldValue($field, $value, $ignoreId = null)
     }
 
     /**
-     * Get a list of lead entities
+     * Get a list of lead entities.
      *
      * @param      $uniqueFieldsWithData
      * @param null $leadId
@@ -178,14 +179,14 @@ public function getLeadsByUniqueFields($uniqueFieldsWithData, $leadId = null)
         $idList = $this->getLeadIdsByUniqueFields($uniqueFieldsWithData, $leadId);
 
         // init to empty array
-        $results = array();
+        $results = [];
 
         // if we didn't get anything return empty
         if (!count(($idList))) {
             return $results;
         }
 
-        $ids = array();
+        $ids = [];
 
         // we know we have at least one
         foreach ($idList as $r) {
@@ -222,7 +223,7 @@ public function getLeadsByUniqueFields($uniqueFieldsWithData, $leadId = null)
      * Get list of lead Ids by unique field data.
      *
      * @param $uniqueFieldsWithData is an array of columns & values to filter by
-     * @param int $leadId is the current lead id. Added to query to skip and find other leads.
+     * @param int $leadId is the current lead id. Added to query to skip and find other leads
      *
      * @return array
      */
@@ -230,18 +231,18 @@ public function getLeadIdsByUniqueFields($uniqueFieldsWithData, $leadId = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('l.id')
-            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l');
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l');
 
         // loop through the fields and
-        foreach($uniqueFieldsWithData as $col => $val) {
-            $q->orWhere("l.$col = :" . $col)
+        foreach ($uniqueFieldsWithData as $col => $val) {
+            $q->orWhere("l.$col = :".$col)
                 ->setParameter($col, $val);
         }
 
         // if we have a lead ID lets use it
         if (!empty($leadId)) {
             // make sure that its not the id we already have
-            $q->andWhere("l.id != " . $leadId);
+            $q->andWhere('l.id != '.$leadId);
         }
 
         $results = $q->execute()->fetchAll();
@@ -251,7 +252,7 @@ public function getLeadIdsByUniqueFields($uniqueFieldsWithData, $leadId = null)
 
     /**
      * @param string $email
-     * @param boolean $all Set to true to return all matching lead id's
+     * @param bool   $all   Set to true to return all matching lead id's
      *
      * @return array|null
      */
@@ -259,8 +260,8 @@ public function getLeadByEmail($email, $all = false)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('l.id')
-            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l')
-            ->where("LOWER(email) = :search")
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
+            ->where('LOWER(email) = :search')
             ->setParameter('search', strtolower($email));
 
         $result = $q->execute()->fetchAll();
@@ -273,7 +274,7 @@ public function getLeadByEmail($email, $all = false)
     }
 
     /**
-     * Get leads by IP address
+     * Get leads by IP address.
      *
      * @param      $ip
      * @param bool $byId
@@ -285,7 +286,7 @@ public function getLeadsByIp($ip, $byId = false)
         $q = $this->createQueryBuilder('l')
             ->leftJoin('l.ipAddresses', 'i');
         $col = ($byId) ? 'i.id' : 'i.ipAddress';
-        $q->where($col . ' = :ip')
+        $q->where($col.' = :ip')
             ->setParameter('ip', $ip)
             ->orderBy('l.dateAdded', 'DESC');
         $results = $q->getQuery()->getResult();
@@ -308,18 +309,18 @@ public function saveEntity($entity, $flush = true)
     {
         $this->_em->persist($entity);
 
-        if ($flush)
+        if ($flush) {
             $this->_em->flush($entity);
+        }
 
         $fields = $entity->getUpdatedFields();
         if (!empty($fields)) {
-            $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX . 'leads', $fields, array('id' => $entity->getId()));
+            $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX.'leads', $fields, ['id' => $entity->getId()]);
         }
     }
 
-
     /**
-     * Persist an array of entities
+     * Persist an array of entities.
      *
      * @param array $entities
      */
@@ -340,14 +341,15 @@ public function getLead($id)
     {
         $fq = $this->_em->getConnection()->createQueryBuilder();
         $fq->select('l.*')
-            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l')
-            ->where('l.id = ' . $id);
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
+            ->where('l.id = '.$id);
         $results = $fq->execute()->fetchAll();
-        return (isset($results[0])) ? $results[0] : array();
+
+        return (isset($results[0])) ? $results[0] : [];
     }
 
     /**
-     * Get a list of fields and values
+     * Get a list of fields and values.
      *
      * @param           $id
      * @param bool|true $byGroup
@@ -359,15 +361,15 @@ public function getFieldValues($id, $byGroup = true)
         //Get the list of custom fields
         $fq = $this->_em->getConnection()->createQueryBuilder();
         $fq->select('f.id, f.label, f.alias, f.type, f.field_group as "group", f.field_order, f.object')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_fields', 'f')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_fields', 'f')
             ->where('f.is_published = :published')
-            ->andWhere($fq->expr()->eq('f.object',':object'))
-            ->setParameter('object','lead')
+            ->andWhere($fq->expr()->eq('f.object', ':object'))
+            ->setParameter('object', 'lead')
             ->orderBy('f.field_order', 'asc')
             ->setParameter('published', true, 'boolean');
         $results = $fq->execute()->fetchAll();
 
-        $fields = array();
+        $fields = [];
         foreach ($results as $r) {
             $fields[$r['alias']] = $r;
         }
@@ -375,7 +377,7 @@ public function getFieldValues($id, $byGroup = true)
         //use DBAL to get entity fields
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('*')
-            ->from(MAUTIC_TABLE_PREFIX . 'leads', 'l')
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
             ->where('l.id = :leadId')
             ->setParameter('leadId', $id);
         $leadValues = $q->execute()->fetch();
@@ -384,13 +386,13 @@ public function getFieldValues($id, $byGroup = true)
         // Reorder leadValues based on field order
         $leadValues = array_merge(array_flip(array_keys($fields)), $leadValues);
 
-        $fieldValues = array();
+        $fieldValues = [];
         //loop over results to put fields in something that can be assigned to the entities
         foreach ($leadValues as $k => $r) {
             if (isset($fields[$k])) {
                 if ($byGroup) {
                     if ($fields[$k]['type'] === 'multiselect') {
-                        $r = explode("|", $r);
+                        $r = explode('|', $r);
                     }
                     $fieldValues[$fields[$k]['group']][$fields[$k]['alias']]          = $fields[$k];
                     $fieldValues[$fields[$k]['group']][$fields[$k]['alias']]['value'] = $r;
@@ -403,20 +405,21 @@ public function getFieldValues($id, $byGroup = true)
 
         if ($byGroup) {
             //make sure each group key is present
-            $groups = array('core', 'social', 'personal', 'professional');
+            $groups = ['core', 'social', 'personal', 'professional'];
             foreach ($groups as $g) {
                 if (!isset($fieldValues[$g])) {
-                    $fieldValues[$g] = array();
+                    $fieldValues[$g] = [];
                 }
             }
         }
+
         return $fieldValues;
     }
 
     /**
      * {@inheritdoc}
      *
-     * @param integer $id
+     * @param int $id
      *
      * @return mixed|null
      */
@@ -452,25 +455,25 @@ public function getEntity($id = 0)
     }
 
     /**
-     * Get a list of leads
+     * Get a list of leads.
      *
      * @param array $args
      *
      * @return array
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         //Get the list of custom fields
         $fq = $this->_em->getConnection()->createQueryBuilder();
         $fq->select('f.id, f.label, f.alias, f.type, f.field_group as "group", f.object')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_fields', 'f')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_fields', 'f')
             ->where('f.is_published = :published')
-            ->andWhere($fq->expr()->eq('object',':object'))
-            ->setParameter('object','lead')
+            ->andWhere($fq->expr()->eq('object', ':object'))
+            ->setParameter('object', 'lead')
             ->setParameter('published', true, 'boolean');
         $results = $fq->execute()->fetchAll();
 
-        $fields = array();
+        $fields = [];
         foreach ($results as $r) {
             $fields[$r['alias']] = $r;
         }
@@ -515,8 +518,8 @@ public function getEntities($args = array())
         $results = $dq->execute()->fetchAll();
 
         //loop over results to put fields in something that can be assigned to the entities
-        $fieldValues = array();
-        $groups      = array('core', 'social', 'personal', 'professional');
+        $fieldValues = [];
+        $groups      = ['core', 'social', 'personal', 'professional'];
 
         foreach ($results as $result) {
             $leadId = $result['id'];
@@ -525,7 +528,7 @@ public function getEntities($args = array())
 
             foreach ($result as $k => $r) {
                 if (isset($fields[$k])) {
-                    $fieldValues[$leadId][$fields[$k]['group']][$fields[$k]['alias']] = $fields[$k];
+                    $fieldValues[$leadId][$fields[$k]['group']][$fields[$k]['alias']]          = $fields[$k];
                     $fieldValues[$leadId][$fields[$k]['group']][$fields[$k]['alias']]['value'] = $r;
                 }
             }
@@ -533,7 +536,7 @@ public function getEntities($args = array())
             //make sure each group key is present
             foreach ($groups as $g) {
                 if (!isset($fieldValues[$leadId][$g])) {
-                    $fieldValues[$leadId][$g] = array();
+                    $fieldValues[$leadId][$g] = [];
                 }
             }
         }
@@ -553,14 +556,14 @@ public function getEntities($args = array())
             //We should probably totally ditch orm for leads
             $order = '(CASE';
             foreach ($ids as $count => $id) {
-                $order .= ' WHEN l.id = ' . $id . ' THEN ' . $count;
-                $count++;
+                $order .= ' WHEN l.id = '.$id.' THEN '.$count;
+                ++$count;
             }
-            $order .= ' ELSE ' . $count . ' END) AS HIDDEN ORD';
+            $order .= ' ELSE '.$count.' END) AS HIDDEN ORD';
 
             //ORM - generates lead entities
             $q = $this->_em->createQueryBuilder();
-            $q->select('l, u, i,' . $order)
+            $q->select('l, u, i,'.$order)
                 ->from('MauticLeadBundle:Lead', 'l', 'l.id')
                 ->leftJoin('l.ipAddresses', 'i')
                 ->leftJoin('l.owner', 'u');
@@ -588,18 +591,18 @@ public function getEntities($args = array())
                 $r->setAvailableSocialFields($this->availableSocialFields);
             }
         } else {
-            $results = array();
+            $results = [];
         }
 
         return (!empty($args['withTotalCount'])) ?
-            array(
-                'count' => $total,
-                'results' => $results
-            ) : $results;
+            [
+                'count'   => $total,
+                'results' => $results,
+            ] : $results;
     }
 
     /**
-     * Get contats for a specific channel entity
+     * Get contats for a specific channel entity.
      *
      * @param $args - same as getEntity/getEntities
      * @param        $joinTable
@@ -639,7 +642,7 @@ public function getEntityContacts($args, $joinTable, $entityId, $filters = [], $
     }
 
     /**
-     * Function to remove non custom field columns from an arrayed lead row
+     * Function to remove non custom field columns from an arrayed lead row.
      *
      * @param array $r
      */
@@ -653,7 +656,8 @@ protected function removeNonFieldColumns(&$r)
     }
 
     /**
-     * Adds the "catch all" where clause to the QueryBuilder
+     * Adds the "catch all" where clause to the QueryBuilder.
+     *
      * @param QueryBuilder $q
      * @param              $filter
      *
@@ -661,8 +665,8 @@ protected function removeNonFieldColumns(&$r)
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
         if ($filter->not) {
             $xFunc    = 'andX';
             $exprFunc = 'notLike';
@@ -689,14 +693,14 @@ protected function addCatchAllWhereClause(&$q, $filter)
             }
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
-     * Adds the command where clause to the QueryBuilder
+     * Adds the command where clause to the QueryBuilder.
      *
      * @param QueryBuilder $q
      * @param              $filter
@@ -710,21 +714,21 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         $unique          = $this->generateRandomParameterName();
         $returnParameter = true; //returning a parameter that is not used will lead to a Doctrine error
         $expr            = false;
-        $parameters      = array();
+        $parameters      = [];
 
         //DBAL QueryBuilder does not have an expr()->not() function; boo!!
         if ($filter->not) {
-            $xFunc = "orX";
-            $existsFunc = "NOT EXISTS";
-            $eqFunc   = "neq";
-            $nullFunc = "isNotNull";
-            $likeFunc = "notLike";
+            $xFunc      = 'orX';
+            $existsFunc = 'NOT EXISTS';
+            $eqFunc     = 'neq';
+            $nullFunc   = 'isNotNull';
+            $likeFunc   = 'notLike';
         } else {
-            $xFunc = "andX";
-            $existsFunc = "EXISTS";
-            $eqFunc   = "eq";
-            $nullFunc = "isNull";
-            $likeFunc = "like";
+            $xFunc      = 'andX';
+            $existsFunc = 'EXISTS';
+            $eqFunc     = 'eq';
+            $nullFunc   = 'isNull';
+            $likeFunc   = 'like';
         }
         switch ($command) {
             case $this->translator->trans('mautic.lead.lead.searchcommand.isanonymous'):
@@ -734,13 +738,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->$eqFunc("l.owner_id", $this->currentUser->getId());
+                $expr            = $q->expr()->$eqFunc('l.owner_id', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.lead.lead.searchcommand.isunowned'):
                 $expr = $q->expr()->orX(
-                    $q->expr()->$eqFunc("l.owner_id", 0),
-                    $q->expr()->$nullFunc("l.owner_id")
+                    $q->expr()->$eqFunc('l.owner_id', 0),
+                    $q->expr()->$nullFunc('l.owner_id')
                 );
                 $returnParameter = false;
                 break;
@@ -758,7 +762,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 break;
             case $this->translator->trans('mautic.lead.lead.searchcommand.list'):
                 //obtain the list details
-                $list = $this->_em->getRepository("MauticLeadBundle:LeadList")->findOneByAlias($string);
+                $list = $this->_em->getRepository('MauticLeadBundle:LeadList')->findOneByAlias($string);
 
                 if (!empty($list)) {
                     $listId = (int) $list->getId();
@@ -769,7 +773,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
 
                 $sq = $this->_em->getConnection()->createQueryBuilder()
                     ->select('null')
-                    ->from(MAUTIC_TABLE_PREFIX . 'lead_lists_leads', 'll');
+                    ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'll');
 
                 $sq->where(
                     $sq->expr()->andX(
@@ -805,38 +809,40 @@ protected function addSearchCommandWhereClause(&$q, $filter)
 
                 break;
             case $this->translator->trans('mautic.lead.lead.searchcommand.duplicate'):
-                $prateek = explode("+", $string);
+                $prateek = explode('+', $string);
 
-                $imploder = array();
+                $imploder = [];
 
                 foreach ($prateek as $key => $value) {
-                    $list = $this->_em->getRepository("MauticLeadBundle:LeadList")->findOneByAlias($value);
-                    $imploder[] = ( (!empty($list)) ? (int) $list->getId() : 0 );
+                    $list       = $this->_em->getRepository('MauticLeadBundle:LeadList')->findOneByAlias($value);
+                    $imploder[] = ((!empty($list)) ? (int) $list->getId() : 0);
                 }
 
                 //logic. In query, Sum(manuall_removed should be less than the current)
                 $pluck = sizeof($imploder) - 1;
 
-                $imploder = (string)(implode(",", $imploder));
+                $imploder = (string) (implode(',', $imploder));
 
                 $sq = $this->_em->getConnection()->createQueryBuilder();
-                $sq -> select('lll.lead_id')
-                    -> from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'lll')
-                    -> where("lll.leadlist_id in ( ".$imploder." )")
+                $sq->select('lll.lead_id')
+                    ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'lll')
+                    ->where('lll.leadlist_id in ( '.$imploder.' )')
                     //-> where("lll.leadlist_id in ( :imploder )")
-                    -> groupBy('lll.lead_id')
-                    -> having('COUNT(lll.lead_id) > :counting AND SUM(lll.manually_removed) < :counting')
-                    -> setParameter('counting', $pluck)
+                    ->groupBy('lll.lead_id')
+                    ->having('COUNT(lll.lead_id) > :counting AND SUM(lll.manually_removed) < :counting')
+                    ->setParameter('counting', $pluck)
                     //-> setParameter('imploder', $imploder)
                 ;
 
                 $results = $sq->execute()->fetchAll();
 
-                $leadIds = array();
+                $leadIds = [];
                 foreach ($results as $row) {
                     $leadIds[] = $row['lead_id'];
                 }
-                if (!sizeof($leadIds)) $leadIds[0] = 0;
+                if (!sizeof($leadIds)) {
+                    $leadIds[0] = 0;
+                }
                 $expr = $q->expr()->in('l.id', $leadIds);
 
                 break;
@@ -884,14 +890,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 break;
         }
 
-        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $string              = ($filter->strict) ? $filter->string : "%{$filter->string}%";
         $parameters[$unique] = $string;
 
-        return array(
+        return [
             $expr,
-            ($returnParameter) ? $parameters : array()
-        );
-
+            ($returnParameter) ? $parameters : [],
+        ];
     }
 
     /**
@@ -901,7 +906,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        $commands = array(
+        $commands = [
             'mautic.lead.lead.searchcommand.isanonymous',
             'mautic.core.searchcommand.ismine',
             'mautic.lead.lead.searchcommand.isunowned',
@@ -914,8 +919,8 @@ public function getSearchCommands()
             'mautic.lead.lead.searchcommand.tag',
             'mautic.lead.lead.searchcommand.stage',
             'mautic.company.lead.searchcommand.company',
-            'mautic.lead.lead.searchcommand.duplicate'
-        );
+            'mautic.lead.lead.searchcommand.duplicate',
+        ];
 
         if (!empty($this->availableSearchFields)) {
             $commands = array_merge($commands, $this->availableSearchFields);
@@ -925,34 +930,34 @@ public function getSearchCommands()
     }
 
     /**
-     * Returns the array of columns with the default order
+     * Returns the array of columns with the default order.
      *
      * @return array
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('l.last_active', 'DESC')
-        );
+        return [
+            ['l.last_active', 'DESC'],
+        ];
     }
 
     /**
-     * Updates lead's lastActive with now date/time
+     * Updates lead's lastActive with now date/time.
      *
-     * @param integer $leadId
+     * @param int $leadId
      */
     public function updateLastActive($leadId)
     {
         $dt     = new DateTimeHelper();
-        $fields = array('last_active' => $dt->toUtcString());
+        $fields = ['last_active' => $dt->toUtcString()];
 
-        $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX . 'leads', $fields, array('id' => $leadId));
+        $this->_em->getConnection()->update(MAUTIC_TABLE_PREFIX.'leads', $fields, ['id' => $leadId]);
     }
 
     /**
-     * Gets the ID of the latest ID
+     * Gets the ID of the latest ID.
      *
-     * @return integer
+     * @return int
      */
     public function getMaxLeadId()
     {
@@ -965,19 +970,21 @@ public function getMaxLeadId()
     }
 
     /**
-     * Gets names, signature and email of the user(lead owner)
+     * Gets names, signature and email of the user(lead owner).
      *
-     * @param  integer $ownerId
+     * @param int $ownerId
      *
      * @return array|false
      */
     public function getLeadOwner($ownerId)
     {
-        if (!$ownerId) return false;
+        if (!$ownerId) {
+            return false;
+        }
 
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('u.id, u.first_name, u.last_name, u.email, u.signature')
-            ->from(MAUTIC_TABLE_PREFIX . 'users', 'u')
+            ->from(MAUTIC_TABLE_PREFIX.'users', 'u')
             ->where('u.id = :ownerId')
             ->setParameter('ownerId', (int) $ownerId);
 
diff --git a/app/bundles/LeadBundle/Entity/ListLead.php b/app/bundles/LeadBundle/Entity/ListLead.php
index 4555bc24235..7ff24a10c81 100644
--- a/app/bundles/LeadBundle/Entity/ListLead.php
+++ b/app/bundles/LeadBundle/Entity/ListLead.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class ListLead
- *
- * @package Mautic\LeadBundle\Entity
+ * Class ListLead.
  */
 class ListLead
 {
-
     /**
      * @var LeadList
      **/
@@ -48,7 +46,7 @@ class ListLead
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -77,7 +75,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return \DateTime
      */
-    public function getDateAdded ()
+    public function getDateAdded()
     {
         return $this->dateAdded;
     }
@@ -85,7 +83,7 @@ public function getDateAdded ()
     /**
      * @param \DateTime $date
      */
-    public function setDateAdded ($date)
+    public function setDateAdded($date)
     {
         $this->dateAdded = $date;
     }
@@ -93,7 +91,7 @@ public function setDateAdded ($date)
     /**
      * @return mixed
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -101,7 +99,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead ($lead)
+    public function setLead($lead)
     {
         $this->lead = $lead;
     }
@@ -109,7 +107,7 @@ public function setLead ($lead)
     /**
      * @return LeadList
      */
-    public function getList ()
+    public function getList()
     {
         return $this->list;
     }
@@ -117,7 +115,7 @@ public function getList ()
     /**
      * @param LeadList $leadList
      */
-    public function setList ($leadList)
+    public function setList($leadList)
     {
         $this->list = $leadList;
     }
@@ -125,7 +123,7 @@ public function setList ($leadList)
     /**
      * @return bool
      */
-    public function getManuallyRemoved ()
+    public function getManuallyRemoved()
     {
         return $this->manuallyRemoved;
     }
@@ -133,7 +131,7 @@ public function getManuallyRemoved ()
     /**
      * @param bool $manuallyRemoved
      */
-    public function setManuallyRemoved ($manuallyRemoved)
+    public function setManuallyRemoved($manuallyRemoved)
     {
         $this->manuallyRemoved = $manuallyRemoved;
     }
@@ -149,7 +147,7 @@ public function wasManuallyRemoved()
     /**
      * @return bool
      */
-    public function getManuallyAdded ()
+    public function getManuallyAdded()
     {
         return $this->manuallyAdded;
     }
@@ -157,7 +155,7 @@ public function getManuallyAdded ()
     /**
      * @param bool $manuallyAdded
      */
-    public function setManuallyAdded ($manuallyAdded)
+    public function setManuallyAdded($manuallyAdded)
     {
         $this->manuallyAdded = $manuallyAdded;
     }
diff --git a/app/bundles/LeadBundle/Entity/ListLeadRepository.php b/app/bundles/LeadBundle/Entity/ListLeadRepository.php
index 0a3dad57348..b93042baa0f 100644
--- a/app/bundles/LeadBundle/Entity/ListLeadRepository.php
+++ b/app/bundles/LeadBundle/Entity/ListLeadRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,15 +13,12 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class ListLeadRepository
- *
- * @package Mautic\LeadBundle\Entity
+ * Class ListLeadRepository.
  */
 class ListLeadRepository extends CommonRepository
 {
-
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -30,19 +28,19 @@ public function updateLead($fromLeadId, $toLeadId)
         // First check to ensure the $toLead doesn't already exist
         $results = $this->_em->getConnection()->createQueryBuilder()
             ->select('l.leadlist_id')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_lists_leads', 'l')
-            ->where('l.lead_id = ' . $toLeadId)
+            ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'l')
+            ->where('l.lead_id = '.$toLeadId)
             ->execute()
             ->fetchAll();
-        $lists = array();
+        $lists = [];
         foreach ($results as $r) {
             $lists[] = $r['leadlist_id'];
         }
 
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'lead_lists_leads')
-            ->set('lead_id', (int)$toLeadId)
-            ->where('lead_id = ' . (int)$fromLeadId);
+        $q->update(MAUTIC_TABLE_PREFIX.'lead_lists_leads')
+            ->set('lead_id', (int) $toLeadId)
+            ->where('lead_id = '.(int) $fromLeadId);
 
         if (!empty($lists)) {
             $q->andWhere(
@@ -51,8 +49,8 @@ public function updateLead($fromLeadId, $toLeadId)
 
             // Delete remaining leads as the new lead already belongs
             $this->_em->getConnection()->createQueryBuilder()
-                ->delete(MAUTIC_TABLE_PREFIX . 'lead_lists_leads')
-                ->where('lead_id = ' . (int)$fromLeadId)
+                ->delete(MAUTIC_TABLE_PREFIX.'lead_lists_leads')
+                ->where('lead_id = '.(int) $fromLeadId)
                 ->execute();
         } else {
             $q->execute();
diff --git a/app/bundles/LeadBundle/Entity/PointsChangeLog.php b/app/bundles/LeadBundle/Entity/PointsChangeLog.php
index b086c40eedd..90c3eb1f052 100644
--- a/app/bundles/LeadBundle/Entity/PointsChangeLog.php
+++ b/app/bundles/LeadBundle/Entity/PointsChangeLog.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class PointsChangeLog
- *
- * @package Mautic\LeadBundle\Entity
+ * Class PointsChangeLog.
  */
 class PointsChangeLog
 {
@@ -62,7 +61,7 @@ class PointsChangeLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -94,9 +93,9 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -104,9 +103,10 @@ public function getId()
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
+     *
      * @return PointsChangeLog
      */
     public function setType($type)
@@ -117,7 +117,7 @@ public function setType($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -127,9 +127,10 @@ public function getType()
     }
 
     /**
-     * Set eventName
+     * Set eventName.
      *
      * @param string $eventName
+     *
      * @return PointsChangeLog
      */
     public function setEventName($eventName)
@@ -140,7 +141,7 @@ public function setEventName($eventName)
     }
 
     /**
-     * Get eventName
+     * Get eventName.
      *
      * @return string
      */
@@ -150,9 +151,10 @@ public function getEventName()
     }
 
     /**
-     * Set actionName
+     * Set actionName.
      *
      * @param string $actionName
+     *
      * @return PointsChangeLog
      */
     public function setActionName($actionName)
@@ -163,7 +165,7 @@ public function setActionName($actionName)
     }
 
     /**
-     * Get actionName
+     * Get actionName.
      *
      * @return string
      */
@@ -173,9 +175,10 @@ public function getActionName()
     }
 
     /**
-     * Set delta
+     * Set delta.
+     *
+     * @param int $delta
      *
-     * @param integer $delta
      * @return PointsChangeLog
      */
     public function setDelta($delta)
@@ -186,9 +189,9 @@ public function setDelta($delta)
     }
 
     /**
-     * Get delta
+     * Get delta.
      *
-     * @return integer
+     * @return int
      */
     public function getDelta()
     {
@@ -196,9 +199,10 @@ public function getDelta()
     }
 
     /**
-     * Set dateAdded
+     * Set dateAdded.
      *
      * @param \DateTime $dateAdded
+     *
      * @return PointsChangeLog
      */
     public function setDateAdded($dateAdded)
@@ -209,7 +213,7 @@ public function setDateAdded($dateAdded)
     }
 
     /**
-     * Get dateAdded
+     * Get dateAdded.
      *
      * @return \DateTime
      */
@@ -219,9 +223,10 @@ public function getDateAdded()
     }
 
     /**
-     * Set lead
+     * Set lead.
      *
      * @param \Mautic\LeadBundle\Entity\Lead $lead
+     *
      * @return PointsChangeLog
      */
     public function setLead(\Mautic\LeadBundle\Entity\Lead $lead)
@@ -232,7 +237,7 @@ public function setLead(\Mautic\LeadBundle\Entity\Lead $lead)
     }
 
     /**
-     * Get lead
+     * Get lead.
      *
      * @return \Mautic\LeadBundle\Entity\Lead
      */
@@ -242,9 +247,10 @@ public function getLead()
     }
 
     /**
-     * Set ipAddress
+     * Set ipAddress.
      *
      * @param \Mautic\CoreBundle\Entity\IpAddress $ipAddress
+     *
      * @return PointsChangeLog
      */
     public function setIpAddress(\Mautic\CoreBundle\Entity\IpAddress $ipAddress)
@@ -255,7 +261,7 @@ public function setIpAddress(\Mautic\CoreBundle\Entity\IpAddress $ipAddress)
     }
 
     /**
-     * Get ipAddress
+     * Get ipAddress.
      *
      * @return \Mautic\CoreBundle\Entity\IpAddress
      */
diff --git a/app/bundles/LeadBundle/Entity/PointsChangeLogRepository.php b/app/bundles/LeadBundle/Entity/PointsChangeLogRepository.php
index 762d0ced10e..282101808d9 100644
--- a/app/bundles/LeadBundle/Entity/PointsChangeLogRepository.php
+++ b/app/bundles/LeadBundle/Entity/PointsChangeLogRepository.php
@@ -1,46 +1,46 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Doctrine\ORM\Query;
 
 /**
- * PointsChangeLogRepository
+ * PointsChangeLogRepository.
  */
 class PointsChangeLogRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Get a lead's point log
+     * Get a lead's point log.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
      */
-    public function getLeadTimelineEvents($leadId, array $options = array())
+    public function getLeadTimelineEvents($leadId, array $options = [])
     {
         $query = $this->getEntityManager()->getConnection()->createQueryBuilder()
             ->from(MAUTIC_TABLE_PREFIX.'lead_points_change_log', 'lp')
             ->select('lp.event_name as eventName, lp.action_name as actionName, lp.date_added as dateAdded, lp.type, lp.delta, lp.id');
 
         if (null !== $leadId) {
-            $query->where('lp.lead_id = ' . (int) $leadId);
+            $query->where('lp.lead_id = '.(int) $leadId);
         }
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere($query->expr()->orX(
-                $query->expr()->like('lp.event_name', $query->expr()->literal('%' . $options['search'] . '%')),
-                $query->expr()->like('lp.action_name', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('lp.event_name', $query->expr()->literal('%'.$options['search'].'%')),
+                $query->expr()->like('lp.action_name', $query->expr()->literal('%'.$options['search'].'%'))
             ));
         }
 
@@ -48,11 +48,12 @@ public function getLeadTimelineEvents($leadId, array $options = array())
     }
 
     /**
-     * Get table stat data from point log table
+     * Get table stat data from point log table.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -62,15 +63,17 @@ public function getMostPoints($query, $limit = 10, $offset = 0)
                 ->setFirstResult($offset);
 
         $results = $query->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Get table stat data from lead table
+     * Get table stat data from lead table.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -80,21 +83,23 @@ public function getMostLeads($query, $limit = 10, $offset = 0)
                 ->setFirstResult($offset);
 
         $results = $query->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Count a value in a column
+     * Count a value in a column.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countValue($query, $column, $value)
     {
-        $query->select('count(' . $column . ') as quantity')
+        $query->select('count('.$column.') as quantity')
             ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
             ->leftJoin('l', MAUTIC_TABLE_PREFIX.'lead_points_change_log', 'lp', 'lp.lead_id = l.id')
             ->andwhere($query->expr()->eq($column, ':value'))
@@ -106,7 +111,7 @@ public function countValue($query, $column, $value)
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -114,9 +119,9 @@ public function countValue($query, $column, $value)
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'lead_points_change_log')
+        $q->update(MAUTIC_TABLE_PREFIX.'lead_points_change_log')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 
diff --git a/app/bundles/LeadBundle/Entity/StagesChangeLog.php b/app/bundles/LeadBundle/Entity/StagesChangeLog.php
index 46f945f8d01..99005c2c2f1 100644
--- a/app/bundles/LeadBundle/Entity/StagesChangeLog.php
+++ b/app/bundles/LeadBundle/Entity/StagesChangeLog.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class StagesChangeLog
- *
- * @package Mautic\LeadBundle\Entity
+ * Class StagesChangeLog.
  */
 class StagesChangeLog
 {
@@ -29,7 +28,6 @@ class StagesChangeLog
      */
     private $lead;
 
-
     /**
      * @var string
      */
@@ -39,7 +37,6 @@ class StagesChangeLog
      * @var string
      */
     private $actionName;
-    
 
     /**
      * @var \DateTime
@@ -49,7 +46,7 @@ class StagesChangeLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -67,15 +64,14 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
         $builder->createField('actionName', 'string')
             ->columnName('action_name')
             ->build();
-        
 
         $builder->addDateAdded();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -83,9 +79,10 @@ public function getId()
     }
 
     /**
-     * Set eventName
+     * Set eventName.
      *
      * @param string $eventName
+     *
      * @return StagesChangeLog
      */
     public function setEventName($eventName)
@@ -96,7 +93,7 @@ public function setEventName($eventName)
     }
 
     /**
-     * Get eventName
+     * Get eventName.
      *
      * @return string
      */
@@ -106,9 +103,10 @@ public function getEventName()
     }
 
     /**
-     * Set actionName
+     * Set actionName.
      *
      * @param string $actionName
+     *
      * @return StagesChangeLog
      */
     public function setActionName($actionName)
@@ -119,7 +117,7 @@ public function setActionName($actionName)
     }
 
     /**
-     * Get actionName
+     * Get actionName.
      *
      * @return string
      */
@@ -129,9 +127,10 @@ public function getActionName()
     }
 
     /**
-     * Set dateAdded
+     * Set dateAdded.
      *
      * @param \DateTime $dateAdded
+     *
      * @return StagesChangeLog
      */
     public function setDateAdded($dateAdded)
@@ -142,7 +141,7 @@ public function setDateAdded($dateAdded)
     }
 
     /**
-     * Get dateAdded
+     * Get dateAdded.
      *
      * @return \DateTime
      */
@@ -152,9 +151,10 @@ public function getDateAdded()
     }
 
     /**
-     * Set lead
+     * Set lead.
      *
      * @param \Mautic\LeadBundle\Entity\Lead $lead
+     *
      * @return StagesChangeLog
      */
     public function setLead(\Mautic\LeadBundle\Entity\Lead $lead)
@@ -165,7 +165,7 @@ public function setLead(\Mautic\LeadBundle\Entity\Lead $lead)
     }
 
     /**
-     * Get lead
+     * Get lead.
      *
      * @return \Mautic\LeadBundle\Entity\Lead
      */
diff --git a/app/bundles/LeadBundle/Entity/StagesChangeLogRepository.php b/app/bundles/LeadBundle/Entity/StagesChangeLogRepository.php
index 977bef776d8..1aa6fb8d624 100644
--- a/app/bundles/LeadBundle/Entity/StagesChangeLogRepository.php
+++ b/app/bundles/LeadBundle/Entity/StagesChangeLogRepository.php
@@ -1,43 +1,43 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Doctrine\ORM\Query;
 
 /**
- * StagesChangeLogRepository
+ * StagesChangeLogRepository.
  */
 class StagesChangeLogRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Get a lead's stage log
+     * Get a lead's stage log.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
      */
-    public function getLeadTimelineEvents($leadId, array $options = array())
+    public function getLeadTimelineEvents($leadId, array $options = [])
     {
         $query = $this->getEntityManager()->getConnection()->createQueryBuilder()
             ->from(MAUTIC_TABLE_PREFIX.'lead_stages_change_log', 'ls')
             ->select('ls.event_name as eventName, ls.action_name as actionName, ls.date_added as dateAdded')
-            ->where('ls.lead_id = ' . (int) $leadId);
+            ->where('ls.lead_id = '.(int) $leadId);
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere($query->expr()->orX(
-                $query->expr()->like('ls.event_name', $query->expr()->literal('%' . $options['search'] . '%')),
-                $query->expr()->like('ls.action_name', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('ls.event_name', $query->expr()->literal('%'.$options['search'].'%')),
+                $query->expr()->like('ls.action_name', $query->expr()->literal('%'.$options['search'].'%'))
             ));
         }
 
@@ -45,11 +45,12 @@ public function getLeadTimelineEvents($leadId, array $options = array())
     }
 
     /**
-     * Get table stat data from stage log table
+     * Get table stat data from stage log table.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -59,15 +60,17 @@ public function getMostStages($query, $limit = 10, $offset = 0)
             ->setFirstResult($offset);
 
         $results = $query->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Get table stat data from lead table
+     * Get table stat data from lead table.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -77,21 +80,23 @@ public function getMostLeads($query, $limit = 10, $offset = 0)
             ->setFirstResult($offset);
 
         $results = $query->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Count a value in a column
+     * Count a value in a column.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countValue($query, $column, $value)
     {
-        $query->select('count(' . $column . ') as quantity')
+        $query->select('count('.$column.') as quantity')
             ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
             ->leftJoin('l', MAUTIC_TABLE_PREFIX.'lead_stages_change_log', 'lp', 'lp.lead_id = l.id')
             ->andwhere($query->expr()->eq($column, ':value'))
@@ -103,7 +108,7 @@ public function countValue($query, $column, $value)
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -111,9 +116,9 @@ public function countValue($query, $column, $value)
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'lead_stages_change_log')
+        $q->update(MAUTIC_TABLE_PREFIX.'lead_stages_change_log')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 }
diff --git a/app/bundles/LeadBundle/Entity/Tag.php b/app/bundles/LeadBundle/Entity/Tag.php
index 2eeb6aa1247..d03bc864275 100644
--- a/app/bundles/LeadBundle/Entity/Tag.php
+++ b/app/bundles/LeadBundle/Entity/Tag.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -33,7 +34,7 @@ public static function loadMetadata(ClassMetadata $metadata)
         $builder = new ClassMetadataBuilder($metadata);
         $builder->setTable('lead_tags')
             ->setCustomRepositoryClass('Mautic\LeadBundle\Entity\TagRepository')
-            ->addIndex(array('tag'), 'lead_tag_search');
+            ->addIndex(['tag'], 'lead_tag_search');
 
         $builder->addId();
         $builder->addField('tag', 'string');
@@ -46,9 +47,9 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('tag')
             ->addListProperties(
-                array(
-                    'tag'
-                )
+                [
+                    'tag',
+                ]
             )
             ->build();
     }
@@ -80,4 +81,4 @@ public function setTag($tag)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/TagRepository.php b/app/bundles/LeadBundle/Entity/TagRepository.php
index 1e531ea5339..7b82f01686b 100644
--- a/app/bundles/LeadBundle/Entity/TagRepository.php
+++ b/app/bundles/LeadBundle/Entity/TagRepository.php
@@ -1,29 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Entity;
 
-
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class TagRepository
+ * Class TagRepository.
  */
 class TagRepository extends CommonRepository
 {
-
     /**
-     * Delete orphan tags that are not associated with any lead
+     * Delete orphan tags that are not associated with any lead.
      */
     public function deleteOrphans()
     {
-        $qb  = $this->_em->getConnection()->createQueryBuilder();
+        $qb       = $this->_em->getConnection()->createQueryBuilder();
         $havingQb = $this->_em->getConnection()->createQueryBuilder();
 
         $havingQb->select('count(x.lead_id) as the_count')
@@ -32,7 +31,7 @@ public function deleteOrphans()
 
         $qb->select('t.id')
             ->from(MAUTIC_TABLE_PREFIX.'lead_tags', 't')
-            ->having(sprintf('(%s)', $havingQb->getSQL()) . ' = 0');
+            ->having(sprintf('(%s)', $havingQb->getSQL()).' = 0');
         $delete = $qb->execute()->fetch();
 
         if (count($delete)) {
@@ -46,7 +45,7 @@ public function deleteOrphans()
     }
 
     /**
-     * Get tag entities by name
+     * Get tag entities by name.
      *
      * @param $tags
      *
@@ -55,8 +54,7 @@ public function deleteOrphans()
     public function getTagsByName($tags)
     {
         if (empty($tags)) {
-
-            return array();
+            return [];
         }
 
         array_walk($tags, create_function('&$val', 'if (strpos($val, "-") === 0) $val = substr($val, 1);'));
@@ -75,4 +73,4 @@ public function getTagsByName($tags)
 
         return $results;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/TimelineTrait.php b/app/bundles/LeadBundle/Entity/TimelineTrait.php
index 0380ac9ac4a..6878ad5155e 100644
--- a/app/bundles/LeadBundle/Entity/TimelineTrait.php
+++ b/app/bundles/LeadBundle/Entity/TimelineTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,13 +17,13 @@
 trait TimelineTrait
 {
     /**
-     * @param QueryBuilder $query                   DBAL QueryBuilder
-     * @param array        $options                 Query optons from LeadTimelineEvent
-     * @param              $eventNameColumn         Name of column to sort event name by
-     * @param              $timestampColumn         Name of column to sort timestamp by
-     * @param array        $serializedColumns       Array of columns to unserialize
-     * @param array        $dateTimeColumns         Array of columns to be converted to \DateTime
-     * @param null         $resultsParserCallback   Callback to custom parse results
+     * @param QueryBuilder $query                 DBAL QueryBuilder
+     * @param array        $options               Query optons from LeadTimelineEvent
+     * @param              $eventNameColumn       Name of column to sort event name by
+     * @param              $timestampColumn       Name of column to sort timestamp by
+     * @param array        $serializedColumns     Array of columns to unserialize
+     * @param array        $dateTimeColumns       Array of columns to be converted to \DateTime
+     * @param null         $resultsParserCallback Callback to custom parse results
      *
      * @return array
      */
@@ -71,7 +72,7 @@ private function getTimelineResults(
         }
 
         if (isset($options['order'])) {
-            list ($orderBy, $orderByDir) = $options['order'];
+            list($orderBy, $orderByDir) = $options['order'];
 
             switch ($orderBy) {
                 case 'eventLabel':
@@ -129,10 +130,10 @@ private function getTimelineResults(
 
             return [
                 'total'   => $total,
-                'results' => $results
+                'results' => $results,
             ];
         }
 
         return $results;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Entity/UtmTag.php b/app/bundles/LeadBundle/Entity/UtmTag.php
index 0c84962dd27..cce4e6ee07d 100644
--- a/app/bundles/LeadBundle/Entity/UtmTag.php
+++ b/app/bundles/LeadBundle/Entity/UtmTag.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,13 +13,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Mautic\CoreBundle\Entity\FormEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
 
 class UtmTag
 {
-
     /**
      * @var int
      */
@@ -37,7 +34,7 @@ class UtmTag
     /**
      * @var array
      */
-    private $query = array();
+    private $query = [];
 
     /**
      * @var string
@@ -87,7 +84,7 @@ class UtmTag
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -108,9 +105,9 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
 
         $builder->addNullableField('url', 'string');
 
-        $builder->addNullableField('userAgent', 'text','user_agent');
+        $builder->addNullableField('userAgent', 'text', 'user_agent');
 
-        $builder->addNullableField('utmCampaign', 'string','utm_campaign');
+        $builder->addNullableField('utmCampaign', 'string', 'utm_campaign');
 
         $builder->addNullableField('utmContent', 'string', 'utm_content');
 
@@ -122,7 +119,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -130,7 +127,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('tmutmtag')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'lead',
                     'query',
@@ -142,24 +139,24 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'utmContent',
                     'utmMedium',
                     'utmSource',
-                    'utmTerm'
-                )
+                    'utmTerm',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set dateHit
+     * Set dateHit.
      *
      * @param \DateTime $dateHit
      *
@@ -173,7 +170,7 @@ public function setDateAdded($date)
     }
 
     /**
-     * Get dateHit
+     * Get dateHit.
      *
      * @return \DateTime
      */
@@ -223,13 +220,13 @@ public function setQuery($query)
     }
 
     /**
-     * Set referer
+     * Set referer.
      *
      * @param string $referer
      *
      * @return Action
      */
-    public function setReferer ($referer)
+    public function setReferer($referer)
     {
         $this->referer = $referer;
 
@@ -237,17 +234,17 @@ public function setReferer ($referer)
     }
 
     /**
-     * Get referer
+     * Get referer.
      *
      * @return string
      */
-    public function getReferer ()
+    public function getReferer()
     {
         return $this->referer;
     }
 
     /**
-     * Set remoteHost
+     * Set remoteHost.
      *
      * @param string $remoteHost
      *
@@ -261,7 +258,7 @@ public function setRemoteHost($remoteHost)
     }
 
     /**
-     * Get remoteHost
+     * Get remoteHost.
      *
      * @return string
      */
@@ -271,7 +268,7 @@ public function getRemoteHost()
     }
 
     /**
-     * Set url
+     * Set url.
      *
      * @param string $url
      *
@@ -285,7 +282,7 @@ public function setUrl($url)
     }
 
     /**
-     * Get url
+     * Get url.
      *
      * @return string
      */
@@ -295,7 +292,7 @@ public function getUrl()
     }
 
     /**
-     * Set userAgent
+     * Set userAgent.
      *
      * @param string $userAgent
      *
@@ -309,7 +306,7 @@ public function setUserAgent($userAgent)
     }
 
     /**
-     * Get userAgent
+     * Get userAgent.
      *
      * @return string
      */
@@ -318,7 +315,7 @@ public function getUserAgent()
         return $this->userAgent;
     }
 
-     /**
+    /**
      * @return array
      */
     public function getUtmCampaign()
@@ -417,5 +414,4 @@ public function setUtmTerm($utmTerm)
 
         return $this;
     }
-
 }
diff --git a/app/bundles/LeadBundle/Entity/UtmTagRepository.php b/app/bundles/LeadBundle/Entity/UtmTagRepository.php
index db172ce69d5..e43d59c83c5 100644
--- a/app/bundles/LeadBundle/Entity/UtmTagRepository.php
+++ b/app/bundles/LeadBundle/Entity/UtmTagRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,14 +14,14 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class UtmTagRepository
+ * Class UtmTagRepository.
  */
 class UtmTagRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Get tag entities by lead
+     * Get tag entities by lead.
      *
      * @param $utmTags
      *
@@ -29,7 +30,6 @@ class UtmTagRepository extends CommonRepository
     public function getUtmTagsByLead(Lead $lead, $options = [])
     {
         if (empty($lead)) {
-
             return [];
         }
 
@@ -37,16 +37,16 @@ public function getUtmTagsByLead(Lead $lead, $options = [])
             ->select('*')
             ->from(MAUTIC_TABLE_PREFIX.'lead_utmtags', 'ut')
             ->where(
-                'ut.lead_id = ' . $lead->getId()
+                'ut.lead_id = '.$lead->getId()
             );
 
         if (isset($options['search']) && $options['search']) {
             $qb->andWhere($qb->expr()->orX(
-                $qb->expr()->like('ut.utm_campaign', $qb->expr()->literal('%' . $options['search'] . '%')),
-                $qb->expr()->like('ut.utm_content', $qb->expr()->literal('%' . $options['search'] . '%')),
-                $qb->expr()->like('ut.utm_medium', $qb->expr()->literal('%' . $options['search'] . '%')),
-                $qb->expr()->like('ut.utm_source', $qb->expr()->literal('%' . $options['search'] . '%')),
-                $qb->expr()->like('ut.utm_term', $qb->expr()->literal('%' . $options['search'] . '%'))
+                $qb->expr()->like('ut.utm_campaign', $qb->expr()->literal('%'.$options['search'].'%')),
+                $qb->expr()->like('ut.utm_content', $qb->expr()->literal('%'.$options['search'].'%')),
+                $qb->expr()->like('ut.utm_medium', $qb->expr()->literal('%'.$options['search'].'%')),
+                $qb->expr()->like('ut.utm_source', $qb->expr()->literal('%'.$options['search'].'%')),
+                $qb->expr()->like('ut.utm_term', $qb->expr()->literal('%'.$options['search'].'%'))
             ));
         }
 
diff --git a/app/bundles/LeadBundle/Event/CompanyBuilderEvent.php b/app/bundles/LeadBundle/Event/CompanyBuilderEvent.php
index 9bf734255d0..72928006a6f 100644
--- a/app/bundles/LeadBundle/Event/CompanyBuilderEvent.php
+++ b/app/bundles/LeadBundle/Event/CompanyBuilderEvent.php
@@ -1,28 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Event;
 
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class CompanyBuilderEvent
+ * Class CompanyBuilderEvent.
  */
 class CompanyBuilderEvent extends Event
 {
-
     /**
      * @var array
      */
-    private $actions = array();
+    private $actions = [];
 
     /**
      * @var Translator
@@ -51,7 +51,7 @@ public function __construct(TranslatorInterface $translator)
      *                       'eventName'        => (required) The event to fire when this event is triggered.
      *                       'associatedDecisions' => (optional) Array of decision types to limit what this action can be associated with
      *                       'anchorRestrictions' => (optional) Array of event anchors this event should not be allowed to connect to
-     * @return void
+     *
      * @throws InvalidArgumentException
      */
     public function addAction($key, array $action)
@@ -75,7 +75,7 @@ public function addAction($key, array $action)
     }
 
     /**
-     * Get actions
+     * Get actions.
      *
      * @return array
      */
@@ -85,31 +85,34 @@ public function getActions()
             return strnatcasecmp(
                 $a['label'], $b['label']);
         });
+
         return $this->actions;
     }
 
     /**
-     * Gets a list of actions supported by the choice form field
+     * Gets a list of actions supported by the choice form field.
      *
      * @return array
      */
     public function getActionList()
     {
-        $list = array();
+        $list    = [];
         $actions = $this->getActions();
         foreach ($actions as $k => $a) {
             $list[$k] = $a['label'];
         }
+
         return $list;
     }
 
     public function getActionChoices()
     {
-        $choices = array();
+        $choices = [];
         $actions = $this->getActions();
         foreach ($this->actions as $k => $c) {
             $choices[$c['group']][$k] = $c['label'];
         }
+
         return $choices;
     }
 
@@ -118,7 +121,6 @@ public function getActionChoices()
      * @param array $methods
      * @param array $component
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     private function verifyComponent(array $keys, array $methods, array $component)
@@ -131,7 +133,7 @@ private function verifyComponent(array $keys, array $methods, array $component)
 
         foreach ($methods as $m) {
             if (isset($component[$m]) && !is_callable($component[$m], true)) {
-                throw new InvalidArgumentException($component[$m] . ' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
+                throw new InvalidArgumentException($component[$m].' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
             }
         }
     }
diff --git a/app/bundles/LeadBundle/Event/LeadChangeCompanyEvent.php b/app/bundles/LeadBundle/Event/LeadChangeCompanyEvent.php
index 40f130a81cc..eac967c49a2 100644
--- a/app/bundles/LeadBundle/Event/LeadChangeCompanyEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadChangeCompanyEvent.php
@@ -1,34 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Event;
 
 use Mautic\LeadBundle\Entity\Company;
-use Mautic\LeadBundle\Entity\CompanyLead;
 use Mautic\LeadBundle\Entity\Lead;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class LeadCompanyChangeEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class LeadCompanyChangeEvent.
  */
 class LeadChangeCompanyEvent extends Event
 {
-
     private $lead;
     private $leads;
     private $company;
     private $added;
 
     /**
-     * @param Lead $lead
+     * @param Lead    $lead
      * @param Company $company
      */
     public function __construct($leads, Company $company, $added = true)
@@ -38,12 +35,12 @@ public function __construct($leads, Company $company, $added = true)
         } else {
             $this->lead = $leads;
         }
-        $this->company   = $company;
-        $this->added  = $added;
+        $this->company = $company;
+        $this->added   = $added;
     }
 
     /**
-     * Returns the Lead entity
+     * Returns the Lead entity.
      *
      * @return Lead
      */
@@ -53,7 +50,7 @@ public function getLead()
     }
 
     /**
-     * Returns batch array of leads
+     * Returns batch array of leads.
      *
      * @return array
      */
@@ -85,4 +82,4 @@ public function wasRemoved()
     {
         return !$this->added;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/LeadChangeEvent.php b/app/bundles/LeadBundle/Event/LeadChangeEvent.php
index a46da4e963e..df105d0a8c8 100644
--- a/app/bundles/LeadBundle/Event/LeadChangeEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadChangeEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class LeadChangeEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class LeadChangeEvent.
  */
 class LeadChangeEvent extends Event
 {
-
     /**
      * @var Lead
      */
@@ -57,7 +55,7 @@ public function __construct(Lead $oldLead, $oldTrackingId, Lead $newLead, $newTr
     /**
      * @return Lead
      */
-    public function getOldLead ()
+    public function getOldLead()
     {
         return $this->oldLead;
     }
@@ -65,7 +63,7 @@ public function getOldLead ()
     /**
      * @return mixed
      */
-    public function getOldTrackingId ()
+    public function getOldTrackingId()
     {
         return $this->oldTrackingId;
     }
@@ -73,7 +71,7 @@ public function getOldTrackingId ()
     /**
      * @return Lead
      */
-    public function getNewLead ()
+    public function getNewLead()
     {
         return $this->newLead;
     }
@@ -81,8 +79,8 @@ public function getNewLead ()
     /**
      * @return mixed
      */
-    public function getNewTrackingId ()
+    public function getNewTrackingId()
     {
         return $this->newTrackingId;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/LeadEvent.php b/app/bundles/LeadBundle/Event/LeadEvent.php
index d68968cbc8e..a4b187385e9 100644
--- a/app/bundles/LeadBundle/Event/LeadEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class LeadEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class LeadEvent.
  */
 class LeadEvent extends CommonEvent
 {
@@ -25,12 +24,12 @@ class LeadEvent extends CommonEvent
      */
     public function __construct(Lead &$lead, $isNew = false)
     {
-        $this->entity  =& $lead;
-        $this->isNew = $isNew;
+        $this->entity = &$lead;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Lead entity
+     * Returns the Lead entity.
      *
      * @return Lead
      */
@@ -40,7 +39,7 @@ public function getLead()
     }
 
     /**
-     * Sets the Lead entity
+     * Sets the Lead entity.
      *
      * @param Lead $lead
      */
@@ -48,4 +47,4 @@ public function setLead(Lead $lead)
     {
         $this->entity = $lead;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/LeadFieldEvent.php b/app/bundles/LeadBundle/Event/LeadFieldEvent.php
index b9f8e2dc090..46d7ff1db3a 100644
--- a/app/bundles/LeadBundle/Event/LeadFieldEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadFieldEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,24 +14,22 @@
 use Mautic\LeadBundle\Entity\LeadField;
 
 /**
- * Class LeadFieldEvent
- *
- * @package Mautic\FieldBundle\Event
+ * Class LeadFieldEvent.
  */
 class LeadFieldEvent extends CommonEvent
 {
     /**
      * @param LeadField $field
-     * @param bool $isNew
+     * @param bool      $isNew
      */
     public function __construct(LeadField &$field, $isNew = false)
     {
-        $this->entity  =& $field;
-        $this->isNew   = $isNew;
+        $this->entity = &$field;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Field entity
+     * Returns the Field entity.
      *
      * @return Field
      */
@@ -40,7 +39,7 @@ public function getField()
     }
 
     /**
-     * Sets the Field entity
+     * Sets the Field entity.
      *
      * @param Field $field
      */
@@ -48,4 +47,4 @@ public function setField(LeadField $field)
     {
         $this->entity = $field;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/LeadListEvent.php b/app/bundles/LeadBundle/Event/LeadListEvent.php
index 84fe9f5bedf..2020a9f1c58 100644
--- a/app/bundles/LeadBundle/Event/LeadListEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadListEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,24 +14,22 @@
 use Mautic\LeadBundle\Entity\LeadList;
 
 /**
- * Class LeadListEvent
- *
- * @package Mautic\ListBundle\Event
+ * Class LeadListEvent.
  */
 class LeadListEvent extends CommonEvent
 {
     /**
      * @param LeadList $list
-     * @param bool $isNew
+     * @param bool     $isNew
      */
     public function __construct(LeadList &$list, $isNew = false)
     {
-        $this->entity  =& $list;
-        $this->isNew = $isNew;
+        $this->entity = &$list;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the List entity
+     * Returns the List entity.
      *
      * @return List
      */
@@ -40,7 +39,7 @@ public function getList()
     }
 
     /**
-     * Sets the List entity
+     * Sets the List entity.
      *
      * @param List $list
      */
@@ -48,4 +47,4 @@ public function setList(LeadList $list)
     {
         $this->entity = $list;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/LeadMergeEvent.php b/app/bundles/LeadBundle/Event/LeadMergeEvent.php
index 67c2fe08bc6..a7068f73b4d 100644
--- a/app/bundles/LeadBundle/Event/LeadMergeEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadMergeEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class LeadEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class LeadEvent.
  */
 class LeadMergeEvent extends Event
 {
-
     private $victor;
 
     private $loser;
@@ -31,11 +29,11 @@ class LeadMergeEvent extends Event
     public function __construct(Lead $victor, Lead $loser)
     {
         $this->victor = $victor;
-        $this->loser = $loser;
+        $this->loser  = $loser;
     }
 
     /**
-     * Returns the victor (loser merges into the victor)
+     * Returns the victor (loser merges into the victor).
      *
      * @return Lead
      */
@@ -45,7 +43,7 @@ public function getVictor()
     }
 
     /**
-     * Returns the loser (loser merges into the victor)
+     * Returns the loser (loser merges into the victor).
      *
      * @param Lead $lead
      */
@@ -53,4 +51,4 @@ public function getLoser()
     {
         return $this->loser;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/LeadNoteEvent.php b/app/bundles/LeadBundle/Event/LeadNoteEvent.php
index 3a2ca932de9..c1c9eee9aa0 100644
--- a/app/bundles/LeadBundle/Event/LeadNoteEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadNoteEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,25 +14,22 @@
 use Mautic\LeadBundle\Entity\LeadNote;
 
 /**
- * Class LeadNoteEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class LeadNoteEvent.
  */
 class LeadNoteEvent extends CommonEvent
 {
-
     /**
      * @param LeadNote $note
-     * @param bool $isNew
+     * @param bool     $isNew
      */
     public function __construct(LeadNote &$note, $isNew = false)
     {
-        $this->entity  =& $note;
-        $this->isNew   = $isNew;
+        $this->entity = &$note;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the LeadNote entity
+     * Returns the LeadNote entity.
      *
      * @return LeadNote
      */
@@ -41,7 +39,7 @@ public function getNote()
     }
 
     /**
-     * Sets the LeadNote entity
+     * Sets the LeadNote entity.
      *
      * @param LeadNote $note
      */
@@ -51,7 +49,7 @@ public function setLeadNote(getNote $note)
     }
 
     /**
-     * Returns the Lead
+     * Returns the Lead.
      *
      * @return Lead
      */
@@ -59,4 +57,4 @@ public function getLead()
     {
         return $this->entity->getLead();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/LeadTimelineEvent.php b/app/bundles/LeadBundle/Event/LeadTimelineEvent.php
index 595c5e30b07..1e4d8162240 100644
--- a/app/bundles/LeadBundle/Event/LeadTimelineEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadTimelineEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,20 +16,19 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class LeadTimelineEvent
+ * Class LeadTimelineEvent.
  */
 class LeadTimelineEvent extends Event
 {
-
     /**
-     * Container with all filtered events
+     * Container with all filtered events.
      *
      * @var array
      */
     protected $events = [];
 
     /**
-     * Container with all registered events types
+     * Container with all registered events types.
      *
      * @var array
      */
@@ -38,7 +38,7 @@ class LeadTimelineEvent extends Event
      * Array of filters
      *  search => (string) search term
      *  includeEvents => (array) event types to include
-     *  excludeEvents => (array) event types to exclude
+     *  excludeEvents => (array) event types to exclude.
      *
      * @var array
      */
@@ -50,7 +50,7 @@ class LeadTimelineEvent extends Event
     protected $orderBy = null;
 
     /**
-     * Lead entity for the lead the timeline is being generated for
+     * Lead entity for the lead the timeline is being generated for.
      *
      * @var Lead
      */
@@ -92,7 +92,7 @@ class LeadTimelineEvent extends Event
     protected $dateTo;
 
     /**
-     * Time unit to group counts by (M = month, D = day, Y = year, null = no grouping)
+     * Time unit to group counts by (M = month, D = day, Y = year, null = no grouping).
      *
      * @var string
      */
@@ -110,16 +110,16 @@ class LeadTimelineEvent extends Event
      * @param array      $filters
      * @param array|null $orderBy
      * @param int        $page
-     * @param int        $limit     Limit per type
+     * @param int        $limit   Limit per type
      */
     public function __construct(Lead $lead, array $filters = [], array $orderBy = null, $page = 1, $limit = 25)
     {
         $this->lead    = $lead;
-        $this->filters = !empty($filters) ?  $filters :
+        $this->filters = !empty($filters) ? $filters :
             [
                 'search'        => '',
                 'includeEvents' => [],
-                'excludeEvents' => []
+                'excludeEvents' => [],
             ];
         $this->orderBy = $orderBy;
         $this->page    = $page;
@@ -135,8 +135,6 @@ public function __construct(Lead $lead, array $filters = [], array $orderBy = nu
      * 'extra'     => array     An optional array of extra data for the event
      *
      * @param array $data Data array for the table
-     *
-     * @return void
      */
     public function addEvent(array $data)
     {
@@ -146,8 +144,8 @@ public function addEvent(array $data)
                 $countData = [
                     [
                         'date'  => $data['timestamp'],
-                        'count' => 1
-                    ]
+                        'count' => 1,
+                    ],
                 ];
 
                 $count = $this->chartQuery->completeTimeData($countData);
@@ -156,7 +154,7 @@ public function addEvent(array $data)
                 if (!isset($this->totalEvents[$data['event']])) {
                     $this->totalEvents[$data['event']] = 0;
                 }
-                $this->totalEvents[$data['event']]++;
+                ++$this->totalEvents[$data['event']];
             }
         } else {
             if (!isset($this->events[$data['event']])) {
@@ -167,14 +165,13 @@ public function addEvent(array $data)
     }
 
     /**
-     * Fetch the events
+     * Fetch the events.
      *
      * @return array Events sorted by timestamp with most recent event first
      */
     public function getEvents()
     {
         if (empty($this->events)) {
-
             return [];
         }
 
@@ -208,7 +205,6 @@ function ($a, $b) {
 
                         case 'timestamp':
                             if ($a['timestamp'] == $b['timestamp']) {
-
                                 $aPriority = isset($a['eventPriority']) ? (int) $a['eventPriority'] : 0;
                                 $bPriority = isset($b['eventPriority']) ? (int) $b['eventPriority'] : 0;
 
@@ -229,14 +225,13 @@ function ($a, $b) {
     }
 
     /**
-     * Get the max number of pages for pagination
+     * Get the max number of pages for pagination.
      *
      * @return float|int
      */
     public function getMaxPage()
     {
         if (!$this->totalEvents) {
-
             return 1;
         }
 
@@ -244,7 +239,7 @@ public function getMaxPage()
         $largest = max($this->totalEvents);
 
         // Max page is $largest / $limit
-        return ($largest) ? ceil($largest/$this->limit) : 1;
+        return ($largest) ? ceil($largest / $this->limit) : 1;
     }
 
     /**
@@ -252,8 +247,6 @@ public function getMaxPage()
      *
      * @param string $eventTypeKey  Identifier of the event type
      * @param string $eventTypeName Name of the event type for humans
-     *
-     * @return void
      */
     public function addEventType($eventTypeKey, $eventTypeName)
     {
@@ -261,7 +254,7 @@ public function addEventType($eventTypeKey, $eventTypeName)
     }
 
     /**
-     * Fetch the event types
+     * Fetch the event types.
      *
      * @return array of available types
      */
@@ -273,9 +266,9 @@ public function getEventTypes()
     }
 
     /**
-     * Fetch the filter array for queries
+     * Fetch the filter array for queries.
      *
-     * @return array of wanted filteres. Empty == all.
+     * @return array of wanted filteres. Empty == all
      */
     public function getEventFilters()
     {
@@ -283,7 +276,7 @@ public function getEventFilters()
     }
 
     /**
-     * Fetch the order for queries
+     * Fetch the order for queries.
      *
      * @return array|null
      */
@@ -293,16 +286,16 @@ public function getEventOrder()
     }
 
     /**
-     * Fetch start/limit for queries
+     * Fetch start/limit for queries.
      *
      * @return array
      */
     public function getEventLimit()
     {
         return [
-            'leadId'  => $this->lead->getId(),
-            'limit'   => $this->limit,
-            'start'   => (1 === $this->page) ? 0 : ($this->page - 1) * $this->limit
+            'leadId' => $this->lead->getId(),
+            'limit'  => $this->limit,
+            'start'  => (1 === $this->page) ? 0 : ($this->page - 1) * $this->limit,
         ];
     }
 
@@ -320,14 +313,14 @@ public function getQueryOptions()
                 'unit'       => $this->groupUnit,
                 'fromDate'   => $this->dateFrom,
                 'toDate'     => $this->dateTo,
-                'chartQuery' => $this->chartQuery
+                'chartQuery' => $this->chartQuery,
             ],
             $this->getEventLimit()
         );
     }
 
     /**
-     * Fetches the lead being acted on
+     * Fetches the lead being acted on.
      *
      * @return Lead
      */
@@ -337,7 +330,7 @@ public function getLead()
     }
 
     /**
-     * Determine if an event type should be included
+     * Determine if an event type should be included.
      *
      * @param      $eventType
      * @param bool $inclusive
@@ -362,7 +355,7 @@ public function isApplicable($eventType, $inclusive = false)
     }
 
     /**
-     * Check if the event is getting an engagement count only
+     * Check if the event is getting an engagement count only.
      *
      * @return bool
      */
@@ -372,7 +365,7 @@ public function isEngagementCount()
     }
 
     /**
-     * Get the date range to get counts by
+     * Get the date range to get counts by.
      *
      * @return array
      */
@@ -382,7 +375,7 @@ public function getCountDateRange()
     }
 
     /**
-     * Get the unit counts are to be grouped by
+     * Get the unit counts are to be grouped by.
      *
      * @return string
      */
@@ -392,7 +385,7 @@ public function getCountGroupingUnit()
     }
 
     /**
-     * Get total number of events for pagination
+     * Get total number of events for pagination.
      */
     public function getEventCounter()
     {
@@ -404,7 +397,7 @@ public function getEventCounter()
         }
 
         $counter = [
-            'total' => array_sum($this->totalEvents)
+            'total' => array_sum($this->totalEvents),
         ];
 
         if ($this->countOnly && $this->groupUnit) {
@@ -415,7 +408,7 @@ public function getEventCounter()
     }
 
     /**
-     * Add to the event counters
+     * Add to the event counters.
      *
      * @param int|array $count
      */
@@ -446,7 +439,7 @@ public function addToCounter($eventType, $count)
     }
 
     /**
-     * Subtract from the total counter if there is an event that was skipped for whatever reason
+     * Subtract from the total counter if there is an event that was skipped for whatever reason.
      *
      * @param $eventType
      * @param $count
@@ -457,7 +450,7 @@ public function subtractFromCounter($eventType, $count = 1)
     }
 
     /**
-     * Calculate engagement counts only
+     * Calculate engagement counts only.
      *
      * @param \DateTime       $dateFrom
      * @param \DateTime       $dateTo
@@ -474,7 +467,7 @@ public function setCountOnly(\DateTime $dateFrom, \DateTime $dateTo, $groupUnit
     }
 
     /**
-     * Get chart query helper to format dates
+     * Get chart query helper to format dates.
      *
      * @return ChartQuery
      */
diff --git a/app/bundles/LeadBundle/Event/LeadUtmTagsEvent.php b/app/bundles/LeadBundle/Event/LeadUtmTagsEvent.php
index f6d98cb47b3..537992c7181 100644
--- a/app/bundles/LeadBundle/Event/LeadUtmTagsEvent.php
+++ b/app/bundles/LeadBundle/Event/LeadUtmTagsEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class PointsChangeEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class PointsChangeEvent.
  */
 class LeadUtmTagsEvent extends CommonEvent
 {
@@ -25,12 +24,12 @@ class LeadUtmTagsEvent extends CommonEvent
      */
     public function __construct(Lead &$lead, $utmTag)
     {
-        $this->entity =& $lead;
+        $this->entity  = &$lead;
         $this->utmtags = $utmTag;
     }
 
     /**
-     * Returns the Lead entity
+     * Returns the Lead entity.
      *
      * @return Lead
      */
@@ -40,7 +39,7 @@ public function getLead()
     }
 
     /**
-     * Returns the new points
+     * Returns the new points.
      *
      * @return int
      */
@@ -48,4 +47,4 @@ public function getUtmTags()
     {
         return $this->utmtags;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/ListChangeEvent.php b/app/bundles/LeadBundle/Event/ListChangeEvent.php
index 3b5e6cc48f8..38159e760bb 100644
--- a/app/bundles/LeadBundle/Event/ListChangeEvent.php
+++ b/app/bundles/LeadBundle/Event/ListChangeEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class ListChangeEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class ListChangeEvent.
  */
 class ListChangeEvent extends Event
 {
-
     private $lead;
     private $leads;
     private $list;
@@ -37,12 +35,12 @@ public function __construct($leads, LeadList $list, $added = true)
         } else {
             $this->lead = $leads;
         }
-        $this->list   = $list;
-        $this->added  = $added;
+        $this->list  = $list;
+        $this->added = $added;
     }
 
     /**
-     * Returns the Lead entity
+     * Returns the Lead entity.
      *
      * @return Lead
      */
@@ -52,7 +50,7 @@ public function getLead()
     }
 
     /**
-     * Returns batch array of leads
+     * Returns batch array of leads.
      *
      * @return array
      */
@@ -66,7 +64,7 @@ public function getLeads()
      */
     public function getList()
     {
-       return $this->list;
+        return $this->list;
     }
 
     /**
@@ -84,4 +82,4 @@ public function wasRemoved()
     {
         return !$this->added;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Event/PointsChangeEvent.php b/app/bundles/LeadBundle/Event/PointsChangeEvent.php
index e73aee2fe1b..30f55836171 100644
--- a/app/bundles/LeadBundle/Event/PointsChangeEvent.php
+++ b/app/bundles/LeadBundle/Event/PointsChangeEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,10 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class PointsChangeEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class PointsChangeEvent.
  */
 class PointsChangeEvent extends CommonEvent
 {
-
     protected $old;
     protected $new;
 
@@ -29,13 +27,13 @@ class PointsChangeEvent extends CommonEvent
      */
     public function __construct(Lead &$lead, $old, $new)
     {
-        $this->entity =& $lead;
-        $this->old = (int) $old;
-        $this->new = (int) $new;
+        $this->entity = &$lead;
+        $this->old    = (int) $old;
+        $this->new    = (int) $new;
     }
 
     /**
-     * Returns the Lead entity
+     * Returns the Lead entity.
      *
      * @return Lead
      */
@@ -45,7 +43,7 @@ public function getLead()
     }
 
     /**
-     * Returns the new points
+     * Returns the new points.
      *
      * @return int
      */
@@ -55,7 +53,7 @@ public function getNewPoints()
     }
 
     /**
-     * Returns the old points
+     * Returns the old points.
      *
      * @return int
      */
@@ -63,4 +61,4 @@ public function getOldPoints()
     {
         return $this->old;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/EventListener/CalendarSubscriber.php b/app/bundles/LeadBundle/EventListener/CalendarSubscriber.php
index 48f576a9f8d..a2b688757e5 100644
--- a/app/bundles/LeadBundle/EventListener/CalendarSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/CalendarSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\LeadBundle\EventListener;
 
 use Mautic\CalendarBundle\CalendarEvents;
@@ -14,39 +16,34 @@
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class CalendarSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class CalendarSubscriber.
  */
 class CalendarSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CalendarEvents::CALENDAR_ON_GENERATE => array('onCalendarGenerate', 0)
-        );
+        return [
+            CalendarEvents::CALENDAR_ON_GENERATE => ['onCalendarGenerate', 0],
+        ];
     }
 
     /**
-     * Adds events to the calendar
+     * Adds events to the calendar.
      *
      * @param CalendarGeneratorEvent $event
-     *
-     * @return void
      */
     public function onCalendarGenerate(CalendarGeneratorEvent $event)
     {
-        $dates  = $event->getDates();
+        $dates = $event->getDates();
 
         // Lead Notes
         $query = $this->em->getConnection()->createQueryBuilder();
         $query->select('ln.lead_id, l.firstname, l.lastname, ln.date_time AS start, ln.text AS description, ln.type')
-            ->from(MAUTIC_TABLE_PREFIX . 'lead_notes', 'ln')
-            ->leftJoin('ln', MAUTIC_TABLE_PREFIX . 'leads', 'l', 'ln.lead_id = l.id')
+            ->from(MAUTIC_TABLE_PREFIX.'lead_notes', 'ln')
+            ->leftJoin('ln', MAUTIC_TABLE_PREFIX.'leads', 'l', 'ln.lead_id = l.id')
             ->where($query->expr()->andX(
                 $query->expr()->gte('ln.date_time', ':start'),
                 $query->expr()->lte('ln.date_time', ':end')
@@ -61,14 +58,14 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
         // We need to convert the date to a ISO8601 compliant string
         foreach ($results as &$object) {
             if ($object['firstname'] || $object['lastname']) {
-                $leadName = $object['firstname'] . ' ' . $object['lastname'];
+                $leadName = $object['firstname'].' '.$object['lastname'];
             } else {
                 $leadName = $this->translator->trans('mautic.lead.lead.anonymous');
             }
-            $date = new DateTimeHelper($object['start']);
-            $object['start'] = $date->toLocalString(\DateTime::ISO8601);
-            $object['url']   = $this->router->generate('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $object['lead_id']), true);
-            $object['attr']  = 'data-toggle="ajax"';
+            $date                  = new DateTimeHelper($object['start']);
+            $object['start']       = $date->toLocalString(\DateTime::ISO8601);
+            $object['url']         = $this->router->generate('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $object['lead_id']], true);
+            $object['attr']        = 'data-toggle="ajax"';
             $object['description'] = strip_tags(html_entity_decode($object['description']));
 
             switch ($object['type']) {
@@ -87,11 +84,11 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
                     break;
             }
 
-            $object['iconClass'] = 'fa fa-fw ' . $icon;
-            $object['title'] = $leadName;
+            $object['iconClass'] = 'fa fa-fw '.$icon;
+            $object['title']     = $leadName;
             //$object['title'] .= ' (' . $this->translator->trans('mautic.lead.note.type.' . $object['type']) . ')';
         }
 
         $event->addEvents($results);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php b/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php
index fd3101c8eaf..13f449e0610 100644
--- a/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/CampaignSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,9 +21,7 @@
 use Mautic\LeadBundle\Model\LeadModel;
 
 /**
- * Class CampaignSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -58,23 +57,23 @@ public function __construct(IpLookupHelper $ipLookupHelper, LeadModel $leadModel
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
-            CampaignEvents::CAMPAIGN_ON_BUILD         => ['onCampaignBuild', 0],
-            LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION    => [
+            CampaignEvents::CAMPAIGN_ON_BUILD      => ['onCampaignBuild', 0],
+            LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION => [
                 ['onCampaignTriggerActionChangePoints', 0],
                 ['onCampaignTriggerActionChangeLists', 1],
                 ['onCampaignTriggerActionUpdateLead', 2],
                 ['onCampaignTriggerActionUpdateTags', 3],
-                ['onCampaignTriggerActionAddToCompany', 4]
+                ['onCampaignTriggerActionAddToCompany', 4],
             ],
-            LeadEvents::ON_CAMPAIGN_TRIGGER_CONDITION => ['onCampaignTriggerCondition', 0]
+            LeadEvents::ON_CAMPAIGN_TRIGGER_CONDITION => ['onCampaignTriggerCondition', 0],
         ];
     }
 
     /**
-     * Add event triggers and actions
+     * Add event triggers and actions.
      *
      * @param CampaignBuilderEvent $event
      */
@@ -85,7 +84,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'label'       => 'mautic.lead.lead.events.changepoints',
             'description' => 'mautic.lead.lead.events.changepoints_descr',
             'formType'    => 'leadpoints_action',
-            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION
+            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION,
         ];
         $event->addAction('lead.changepoints', $action);
 
@@ -93,7 +92,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'label'       => 'mautic.lead.lead.events.changelist',
             'description' => 'mautic.lead.lead.events.changelist_descr',
             'formType'    => 'leadlist_action',
-            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION
+            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION,
         ];
         $event->addAction('lead.changelist', $action);
 
@@ -102,7 +101,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'description' => 'mautic.lead.lead.events.updatelead_descr',
             'formType'    => 'updatelead_action',
             'formTheme'   => 'MauticLeadBundle:FormTheme\ActionUpdateLead',
-            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION
+            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION,
         ];
         $event->addAction('lead.updatelead', $action);
 
@@ -110,7 +109,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'label'       => 'mautic.lead.lead.events.changetags',
             'description' => 'mautic.lead.lead.events.changetags_descr',
             'formType'    => 'modify_lead_tags',
-            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION
+            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION,
         ];
         $event->addAction('lead.changetags', $action);
 
@@ -118,7 +117,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'label'       => 'mautic.lead.lead.events.addtocompany',
             'description' => 'mautic.lead.lead.events.addtocompany_descr',
             'formType'    => 'addtocompany_action',
-            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION
+            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_ACTION,
         ];
         $event->addAction('lead.addtocompany', $action);
 
@@ -127,7 +126,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'description' => 'mautic.lead.lead.events.field_value_descr',
             'formType'    => 'campaignevent_lead_field_value',
             'formTheme'   => 'MauticLeadBundle:FormTheme\FieldValueCondition',
-            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_CONDITION
+            'eventName'   => LeadEvents::ON_CAMPAIGN_TRIGGER_CONDITION,
         ];
         $event->addCondition('lead.field_value', $trigger);
     }
@@ -138,7 +137,6 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
     public function onCampaignTriggerActionChangePoints(CampaignExecutionEvent $event)
     {
         if (!$event->checkContext('lead.changepoints')) {
-
             return;
         }
 
@@ -174,7 +172,6 @@ public function onCampaignTriggerActionChangePoints(CampaignExecutionEvent $even
     public function onCampaignTriggerActionChangeLists(CampaignExecutionEvent $event)
     {
         if (!$event->checkContext('lead.changelist')) {
-
             return;
         }
 
@@ -203,7 +200,6 @@ public function onCampaignTriggerActionChangeLists(CampaignExecutionEvent $event
     public function onCampaignTriggerActionUpdateLead(CampaignExecutionEvent $event)
     {
         if (!$event->checkContext('lead.updatelead')) {
-
             return;
         }
 
@@ -241,7 +237,6 @@ public function onCampaignTriggerActionUpdateTags(CampaignExecutionEvent $event)
     public function onCampaignTriggerActionAddToCompany(CampaignExecutionEvent $event)
     {
         if (!$event->checkContext('lead.addtocompany')) {
-
             return;
         }
 
@@ -250,13 +245,12 @@ public function onCampaignTriggerActionAddToCompany(CampaignExecutionEvent $even
         $somethingHappened = false;
 
         if (!empty($company)) {
-            $somethingHappened =  $this->leadModel->addToCompany($lead, $company);
+            $somethingHappened = $this->leadModel->addToCompany($lead, $company);
         }
 
         return $event->setResult($somethingHappened);
     }
 
-
     /**
      * @param CampaignExecutionEvent $event
      */
diff --git a/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php b/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php
index ed1f9d52895..611bd4bfe76 100644
--- a/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/DashboardSubscriber.php
@@ -1,63 +1,61 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\LeadBundle\EventListener;
 
-use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\LeadBundle\Model\ListModel;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'lead';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'created.leads.in.time' => array(
-            'formAlias' => 'lead_dashboard_leads_in_time_widget'
-        ),
-        'anonymous.vs.identified.leads' => array(),
-        'lead.lifetime' => array(
-            'formAlias' => 'lead_dashboard_leads_lifetime_widget'
-        ),
-        'map.of.leads' => array(),
-        'top.lists' => array(),
-        'top.creators' => array(),
-        'top.owners' => array(),
-        'created.leads' => array()
-    );
+    protected $types = [
+        'created.leads.in.time' => [
+            'formAlias' => 'lead_dashboard_leads_in_time_widget',
+        ],
+        'anonymous.vs.identified.leads' => [],
+        'lead.lifetime'                 => [
+            'formAlias' => 'lead_dashboard_leads_lifetime_widget',
+        ],
+        'map.of.leads'  => [],
+        'top.lists'     => [],
+        'top.creators'  => [],
+        'top.owners'    => [],
+        'created.leads' => [],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'lead:leads:viewown',
-        'lead:leads:viewother'
-    );
+        'lead:leads:viewother',
+    ];
 
     /**
      * @var LeadModel
@@ -77,16 +75,14 @@ class DashboardSubscriber extends MainDashboardSubscriber
      */
     public function __construct(LeadModel $leadModel, ListModel $leadListModel)
     {
-        $this->leadModel = $leadModel;
+        $this->leadModel     = $leadModel;
         $this->leadListModel = $leadListModel;
     }
 
     /**
-     * Set a widget detail when needed
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
@@ -102,7 +98,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             }
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->leadModel->getLeadsLineChartData(
@@ -112,41 +108,44 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateFormat'],
                         $params['filter'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
             $event->stopPropagation();
+
             return;
         }
 
         if ($event->getType() == 'anonymous.vs.identified.leads') {
             if (!$event->isCached()) {
                 $params = $event->getWidget()->getParams();
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'pie',
                     'chartHeight' => $event->getWidget()->getHeight() - 80,
-                    'chartData'   => $this->leadModel->getAnonymousVsIdentifiedPieChartData($params['dateFrom'], $params['dateTo'], $canViewOthers)
-                ));
+                    'chartData'   => $this->leadModel->getAnonymousVsIdentifiedPieChartData($params['dateFrom'], $params['dateTo'], $canViewOthers),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
             $event->stopPropagation();
+
             return;
         }
 
         if ($event->getType() == 'map.of.leads') {
             if (!$event->isCached()) {
                 $params = $event->getWidget()->getParams();
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'height' => $event->getWidget()->getHeight() - 80,
-                    'data'   => $this->leadModel->getLeadMapData($params['dateFrom'], $params['dateTo'], $canViewOthers)
-                ));
+                    'data'   => $this->leadModel->getLeadMapData($params['dateFrom'], $params['dateTo'], $canViewOthers),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:map.html.php');
             $event->stopPropagation();
+
             return;
         }
 
@@ -162,39 +161,39 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 }
 
                 $lists = $this->leadListModel->getTopLists($limit, $params['dateFrom'], $params['dateTo'], $canViewOthers);
-                $items = array();
+                $items = [];
 
                 // Build table rows with links
                 if ($lists) {
                     foreach ($lists as &$list) {
-                        $listUrl = $this->router->generate('mautic_segment_action', array('objectAction' => 'edit', 'objectId' => $list['id']));
-                        $row = array(
-                            array(
+                        $listUrl = $this->router->generate('mautic_segment_action', ['objectAction' => 'edit', 'objectId' => $list['id']]);
+                        $row     = [
+                            [
                                 'value' => $list['name'],
-                                'type' => 'link',
-                                'link' => $listUrl
-                            ),
-                            array(
-                                'value' => $list['leads']
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $listUrl,
+                            ],
+                            [
+                                'value' => $list['leads'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.dashboard.label.title'),
-                        $event->getTranslator()->trans('mautic.lead.leads')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $lists
-                ));
-
+                        $event->getTranslator()->trans('mautic.lead.leads'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $lists,
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
+
             return;
         }
 
@@ -208,36 +207,34 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 $limit = $params['limit'];
             }
 
-            $maxSegmentsToshow = 4;
-            $params['filter']['flag'] = array();
+            $maxSegmentsToshow        = 4;
+            $params['filter']['flag'] = [];
 
             if (isset($params['flag'])) {
                 $params['filter']['flag'] = $params['flag'];
-                $maxSegmentsToshow = count($params['filter']['flag']);
+                $maxSegmentsToshow        = count($params['filter']['flag']);
             }
 
             $lists = $this->leadListModel->getLifeCycleSegments($maxSegmentsToshow, $params['dateFrom'], $params['dateTo'], $canViewOthers, $params['filter']['flag']);
-            $items = array();
+            $items = [];
 
             // Build table rows with links
             if ($lists) {
-                $stages = [];
+                $stages            = [];
                 $deviceGranularity = [];
 
                 foreach ($lists as &$list) {
-                    if($list['alias'] != ''){
-                        $listUrl = $this->router->generate('mautic_contact_index', array('search' => 'segment:'.$list['alias']));
-                    }
-                    else{
-                        $listUrl = $this->router->generate('mautic_contact_index', array());
+                    if ($list['alias'] != '') {
+                        $listUrl = $this->router->generate('mautic_contact_index', ['search' => 'segment:'.$list['alias']]);
+                    } else {
+                        $listUrl = $this->router->generate('mautic_contact_index', []);
                     }
-                    if($list['id']){
-                        $params['filter']['leadlist_id']=array(
-                            'value' => $list['id'],
-                            'list_column_name' => 't.id'
-                        );
-                    }
-                    else{
+                    if ($list['id']) {
+                        $params['filter']['leadlist_id'] = [
+                            'value'            => $list['id'],
+                            'list_column_name' => 't.id',
+                        ];
+                    } else {
                         unset($params['filter']['leadlist_id']);
                     }
 
@@ -251,8 +248,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $list['name']
                     );
                     $items['columnName'][] = $list['name'];
-                    $items['value'][] = $list['leads'];
-                    $items['link'][] = $listUrl;
+                    $items['value'][]      = $list['leads'];
+                    $items['link'][]       = $listUrl;
                     $items['chartItems'][] = $column;
 
                     $stages[] = $this->leadListModel->getStagesBarChartData($params['timeUnit'],
@@ -269,32 +266,31 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['filter'],
                         $canViewOthers);
                 }
-                $width = 100/count($lists);
+                $width = 100 / count($lists);
 
-                $event->setTemplateData(array(
-                    'columnName' => $items['columnName'],
-                    'value' => $items['value'],
-                    'width' => $width,
-                    'link' => $items['link'],
+                $event->setTemplateData([
+                    'columnName'  => $items['columnName'],
+                    'value'       => $items['value'],
+                    'width'       => $width,
+                    'link'        => $items['link'],
                     'chartType'   => 'pie',
                     'chartHeight' => $event->getWidget()->getHeight() - 180,
-                    'chartItems'   => $items['chartItems'],
-                    'stages' => $stages,
-                    'devices' => $deviceGranularity
-                ));
+                    'chartItems'  => $items['chartItems'],
+                    'stages'      => $stages,
+                    'devices'     => $deviceGranularity,
+                ]);
                 $event->setTemplate('MauticCoreBundle:Helper:lifecycle.html.php');
                 $event->stopPropagation();
             }
 
-
             return;
         }
 
         if ($event->getType() == 'top.owners') {
-
             if (!$canViewOthers) {
-                $event->setErrorMessage($this->translator->trans('mautic.dashboard.missing.permission', array('%section%' => $this->bundle)));
+                $event->setErrorMessage($this->translator->trans('mautic.dashboard.missing.permission', ['%section%' => $this->bundle]));
                 $event->stopPropagation();
+
                 return;
             }
 
@@ -309,46 +305,47 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 }
 
                 $owners = $this->leadModel->getTopOwners($limit, $params['dateFrom'], $params['dateTo']);
-                $items = array();
+                $items  = [];
 
                 // Build table rows with links
                 if ($owners) {
                     foreach ($owners as &$owner) {
-                        $ownerUrl = $this->router->generate('mautic_user_action', array('objectAction' => 'edit', 'objectId' => $owner['owner_id']));
-                        $row = array(
-                            array(
-                                'value' => $owner['first_name'] . ' ' . $owner['last_name'],
-                                'type' => 'link',
-                                'link' => $ownerUrl
-                            ),
-                            array(
-                                'value' => $owner['leads']
-                            )
-                        );
+                        $ownerUrl = $this->router->generate('mautic_user_action', ['objectAction' => 'edit', 'objectId' => $owner['owner_id']]);
+                        $row      = [
+                            [
+                                'value' => $owner['first_name'].' '.$owner['last_name'],
+                                'type'  => 'link',
+                                'link'  => $ownerUrl,
+                            ],
+                            [
+                                'value' => $owner['leads'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.user.account.permissions.editname'),
-                        $event->getTranslator()->trans('mautic.lead.leads')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $owners
-                ));
+                        $event->getTranslator()->trans('mautic.lead.leads'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $owners,
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
+
             return;
         }
 
         if ($event->getType() == 'top.creators') {
-
             if (!$canViewOthers) {
-                $event->setErrorMessage($this->translator->trans('mautic.dashboard.missing.permission', array('%section%' => $this->bundle)));
+                $event->setErrorMessage($this->translator->trans('mautic.dashboard.missing.permission', ['%section%' => $this->bundle]));
                 $event->stopPropagation();
+
                 return;
             }
 
@@ -363,38 +360,39 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                 }
 
                 $creators = $this->leadModel->getTopCreators($limit, $params['dateFrom'], $params['dateTo']);
-                $items = array();
+                $items    = [];
 
                 // Build table rows with links
                 if ($creators) {
                     foreach ($creators as &$creator) {
-                        $creatorUrl = $this->router->generate('mautic_user_action', array('objectAction' => 'edit', 'objectId' => $creator['created_by']));
-                        $row = array(
-                            array(
+                        $creatorUrl = $this->router->generate('mautic_user_action', ['objectAction' => 'edit', 'objectId' => $creator['created_by']]);
+                        $row        = [
+                            [
                                 'value' => $creator['created_by_user'],
-                                'type' => 'link',
-                                'link' => $creatorUrl
-                            ),
-                            array(
-                                'value' => $creator['leads']
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $creatorUrl,
+                            ],
+                            [
+                                'value' => $creator['leads'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.user.account.permissions.editname'),
-                        $event->getTranslator()->trans('mautic.lead.leads')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $creators
-                ));
+                        $event->getTranslator()->trans('mautic.lead.leads'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $creators,
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
+
             return;
         }
 
@@ -409,35 +407,36 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit = $params['limit'];
                 }
 
-                $leads = $this->leadModel->getLeadList($limit, $params['dateFrom'], $params['dateTo'], $canViewOthers, array(), array('canViewOthers' => $canViewOthers));
-                $items = array();
+                $leads = $this->leadModel->getLeadList($limit, $params['dateFrom'], $params['dateTo'], $canViewOthers, [], ['canViewOthers' => $canViewOthers]);
+                $items = [];
 
                 // Build table rows with links
                 if ($leads) {
                     foreach ($leads as &$lead) {
-                        $leadUrl = $this->router->generate('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $lead['id']));
-                        $row = array(
-                            array(
+                        $leadUrl = $this->router->generate('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $lead['id']]);
+                        $row     = [
+                            [
                                 'value' => $lead['name'],
-                                'type' => 'link',
-                                'link' => $leadUrl
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $leadUrl,
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
-                        $event->getTranslator()->trans('mautic.dashboard.label.title')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $leads
-                ));
+                $event->setTemplateData([
+                    'headItems' => [
+                        $event->getTranslator()->trans('mautic.dashboard.label.title'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $leads,
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
+
             return;
         }
     }
diff --git a/app/bundles/LeadBundle/EventListener/DoctrineSubscriber.php b/app/bundles/LeadBundle/EventListener/DoctrineSubscriber.php
index 91ee45f5e1d..d7e383eb876 100644
--- a/app/bundles/LeadBundle/EventListener/DoctrineSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/DoctrineSubscriber.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-
 namespace Mautic\LeadBundle\EventListener;
 
 use Doctrine\DBAL\Types\StringType;
@@ -17,7 +17,7 @@
 use Monolog\Logger;
 
 /**
- * Class DoctrineSubscriber
+ * Class DoctrineSubscriber.
  */
 class DoctrineSubscriber implements \Doctrine\Common\EventSubscriber
 {
@@ -41,9 +41,9 @@ public function __construct(Logger $logger)
      */
     public function getSubscribedEvents()
     {
-        return array(
-            ToolEvents::postGenerateSchema
-        );
+        return [
+            ToolEvents::postGenerateSchema,
+        ];
     }
 
     /**
@@ -60,11 +60,11 @@ public function postGenerateSchema(GenerateSchemaEventArgs $args)
 
             $objects = [
                 'lead'    => 'leads',
-                'company' => 'companies'
+                'company' => 'companies',
             ];
 
             foreach ($objects as $object => $tableName) {
-                $table    = $schema->getTable(MAUTIC_TABLE_PREFIX.$tableName);
+                $table = $schema->getTable(MAUTIC_TABLE_PREFIX.$tableName);
 
                 //get a list of fields
                 $fields = $args->getEntityManager()->getConnection()->createQueryBuilder()
@@ -119,10 +119,9 @@ public function postGenerateSchema(GenerateSchemaEventArgs $args)
                         break;
                 }
             }
-
         } catch (\Exception $e) {
             //table doesn't exist or something bad happened so oh well
             $this->logger->addError('SCHEMA ERROR: '.$e->getMessage());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/EventListener/EmailSubscriber.php b/app/bundles/LeadBundle/EventListener/EmailSubscriber.php
index 8643018cae8..0db54d41395 100644
--- a/app/bundles/LeadBundle/EventListener/EmailSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/EmailSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,9 +18,7 @@
 use Mautic\LeadBundle\Helper\TokenHelper;
 
 /**
- * Class EmailSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class EmailSubscriber.
  */
 class EmailSubscriber extends CommonSubscriber
 {
@@ -38,13 +37,13 @@ class EmailSubscriber extends CommonSubscriber
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_ON_BUILD   => array('onEmailBuild', 0),
-            EmailEvents::EMAIL_ON_SEND    => array('onEmailGenerate', 0),
-            EmailEvents::EMAIL_ON_DISPLAY => array('onEmailDisplay', 0)
-        );
+        return [
+            EmailEvents::EMAIL_ON_BUILD   => ['onEmailBuild', 0],
+            EmailEvents::EMAIL_ON_SEND    => ['onEmailGenerate', 0],
+            EmailEvents::EMAIL_ON_DISPLAY => ['onEmailDisplay', 0],
+        ];
     }
 
     /**
@@ -53,7 +52,7 @@ static public function getSubscribedEvents()
     public function onEmailBuild(EmailBuilderEvent $event)
     {
         $tokenHelper = new BuilderTokenHelper($this->factory, 'lead.field', 'lead:fields', 'MauticLeadBundle');
-        $tokenHelper->setPermissionSet(array('lead:fields:full'));
+        $tokenHelper->setPermissionSet(['lead:fields:full']);
 
         if ($event->tokenSectionsRequested()) {
             //add email tokens
@@ -61,20 +60,20 @@ public function onEmailBuild(EmailBuilderEvent $event)
                 'lead.emailtokens',
                 'mautic.lead.email.header.index',
                 $tokenHelper->getTokenContent(
-                    array(
-                        'filter' => array(
-                            'force' => array(
-                                array(
+                    [
+                        'filter' => [
+                            'force' => [
+                                [
                                     'column' => 'f.isPublished',
                                     'expr'   => 'eq',
-                                    'value'  => true
-                                )
-                            )
-                        ),
+                                    'value'  => true,
+                                ],
+                            ],
+                        ],
                         'orderBy'        => 'f.label',
                         'orderByDir'     => 'ASC',
-                        'hydration_mode' => 'HYDRATE_ARRAY'
-                    )
+                        'hydration_mode' => 'HYDRATE_ARRAY',
+                    ]
                 ),
                 255
             );
@@ -103,10 +102,10 @@ public function onEmailDisplay(EmailSendEvent $event)
     public function onEmailGenerate(EmailSendEvent $event)
     {
         // Combine all possible content to find tokens across them
-        $content  = $event->getSubject();
+        $content = $event->getSubject();
         $content .= $event->getContent();
         $content .= $event->getPlainText();
-        $lead     = $event->getLead();
+        $lead = $event->getLead();
 
         $tokenList = TokenHelper::findLeadTokens($content, $lead);
         if (count($tokenList)) {
@@ -114,4 +113,4 @@ public function onEmailGenerate(EmailSendEvent $event)
             unset($tokenList);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/EventListener/FormSubscriber.php b/app/bundles/LeadBundle/EventListener/FormSubscriber.php
index efdc27c7ad5..ceb031b796a 100644
--- a/app/bundles/LeadBundle/EventListener/FormSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/FormSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,17 +15,14 @@
 use Mautic\FormBundle\FormEvents;
 
 /**
- * Class FormSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class FormSubscriber.
  */
 class FormSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             FormEvents::FORM_ON_BUILD => ['onFormBuilder', 0],
@@ -32,7 +30,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Add a lead generation action to available form submit actions
+     * Add a lead generation action to available form submit actions.
      *
      * @param FormBuilderEvent $event
      */
@@ -45,7 +43,7 @@ public function onFormBuilder(FormBuilderEvent $event)
             'description' => 'mautic.lead.lead.submitaction.changepoints_descr',
             'formType'    => 'lead_submitaction_pointschange',
             'formTheme'   => 'MauticLeadBundle:FormTheme\\FormActionChangePoints',
-            'callback'    => '\Mautic\LeadBundle\Helper\FormEventHelper::changePoints'
+            'callback'    => '\Mautic\LeadBundle\Helper\FormEventHelper::changePoints',
         ];
         $event->addSubmitAction('lead.pointschange', $action);
 
@@ -55,7 +53,7 @@ public function onFormBuilder(FormBuilderEvent $event)
             'label'       => 'mautic.lead.lead.events.changelist',
             'description' => 'mautic.lead.lead.events.changelist_descr',
             'formType'    => 'leadlist_action',
-            'callback'    => '\Mautic\LeadBundle\Helper\FormEventHelper::changeLists'
+            'callback'    => '\Mautic\LeadBundle\Helper\FormEventHelper::changeLists',
         ];
         $event->addSubmitAction('lead.changelist', $action);
 
@@ -66,7 +64,7 @@ public function onFormBuilder(FormBuilderEvent $event)
             'description'       => 'mautic.lead.lead.events.changetags_descr',
             'formType'          => 'modify_lead_tags',
             'callback'          => '\Mautic\LeadBundle\Helper\EventHelper::updateTags',
-            'allowCampaignForm' => true
+            'allowCampaignForm' => true,
         ];
         $event->addSubmitAction('lead.changetags', $action);
 
@@ -77,8 +75,8 @@ public function onFormBuilder(FormBuilderEvent $event)
             'description' => 'mautic.lead.lead.events.addutmtags_descr',
             'formType'    => 'lead_action_addutmtags',
             'formTheme'   => 'MauticLeadBundle:FormTheme\\ActionAddUtmTags',
-            'callback'    => '\Mautic\LeadBundle\Helper\EventHelper::addUtmTags'
+            'callback'    => '\Mautic\LeadBundle\Helper\EventHelper::addUtmTags',
         ];
         $event->addSubmitAction('lead.addutmtags', $action);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/EventListener/LeadSubscriber.php b/app/bundles/LeadBundle/EventListener/LeadSubscriber.php
index 081e677bf4e..15a83f5ca8d 100644
--- a/app/bundles/LeadBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/LeadSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,8 +12,6 @@
 
 use Mautic\CoreBundle\EventListener\ChannelTrait;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\LeadBundle\Entity\DoNotContact;
@@ -21,9 +20,7 @@
 use Mautic\LeadBundle\Model\ChannelTimelineInterface;
 
 /**
- * Class LeadSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
@@ -48,13 +45,13 @@ class LeadSubscriber extends CommonSubscriber
     public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $auditLogModel)
     {
         $this->ipLookupHelper = $ipLookupHelper;
-        $this->auditLogModel = $auditLogModel;
+        $this->auditLogModel  = $auditLogModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             LeadEvents::LEAD_POST_SAVE       => ['onLeadPostSave', 0],
@@ -64,12 +61,12 @@ static public function getSubscribedEvents()
             LeadEvents::FIELD_POST_DELETE    => ['onFieldDelete', 0],
             LeadEvents::NOTE_POST_SAVE       => ['onNotePostSave', 0],
             LeadEvents::NOTE_POST_DELETE     => ['onNoteDelete', 0],
-            LeadEvents::TIMELINE_ON_GENERATE => ['onTimelineGenerate', 0]
+            LeadEvents::TIMELINE_ON_GENERATE => ['onTimelineGenerate', 0],
         ];
     }
 
     /**
-     * Add a lead entry to the audit log
+     * Add a lead entry to the audit log.
      *
      * @param Events\LeadEvent $event
      */
@@ -85,7 +82,6 @@ public function onLeadPostSave(Events\LeadEvent $event)
             // Unset dateLastActive to prevent un-necessary audit log entries
             unset($details['dateLastActive']);
             if (empty($details)) {
-
                 return;
             }
 
@@ -94,24 +90,24 @@ public function onLeadPostSave(Events\LeadEvent $event)
                 $preventLoop[] = $check;
 
                 $log = [
-                    "bundle"    => "lead",
-                    "object"    => "lead",
-                    "objectId"  => $lead->getId(),
-                    "action"    => ($event->isNew()) ? "create" : "update",
-                    "details"   => $details,
-                    "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+                    'bundle'    => 'lead',
+                    'object'    => 'lead',
+                    'objectId'  => $lead->getId(),
+                    'action'    => ($event->isNew()) ? 'create' : 'update',
+                    'details'   => $details,
+                    'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
                 ];
                 $this->auditLogModel->writeToLog($log);
 
                 if (isset($details['dateIdentified'])) {
                     //log the day lead was identified
                     $log = [
-                        "bundle"    => "lead",
-                        "object"    => "lead",
-                        "objectId"  => $lead->getId(),
-                        "action"    => "identified",
-                        "details"   => [],
-                        "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+                        'bundle'    => 'lead',
+                        'object'    => 'lead',
+                        'objectId'  => $lead->getId(),
+                        'action'    => 'identified',
+                        'details'   => [],
+                        'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
                     ];
                     $this->auditLogModel->writeToLog($log);
 
@@ -124,26 +120,25 @@ public function onLeadPostSave(Events\LeadEvent $event)
                 //add if an ip was added
                 if (isset($details['ipAddresses']) && !empty($details['ipAddresses'][1])) {
                     $log = [
-                        "bundle"    => "lead",
-                        "object"    => "lead",
-                        "objectId"  => $lead->getId(),
-                        "action"    => "ipadded",
-                        "details"   => $details['ipAddresses'],
-                        "ipAddress" => $this->request->server->get('REMOTE_ADDR')
+                        'bundle'    => 'lead',
+                        'object'    => 'lead',
+                        'objectId'  => $lead->getId(),
+                        'action'    => 'ipadded',
+                        'details'   => $details['ipAddresses'],
+                        'ipAddress' => $this->request->server->get('REMOTE_ADDR'),
                     ];
                     $this->auditLogModel->writeToLog($log);
                 }
 
                 //trigger the points change event
-                if (!$lead->imported && isset($details["points"]) && (int) $details["points"][1] > 0) {
+                if (!$lead->imported && isset($details['points']) && (int) $details['points'][1] > 0) {
                     if (!$event->isNew() && $this->dispatcher->hasListeners(LeadEvents::LEAD_POINTS_CHANGE)) {
                         $pointsEvent = new Events\PointsChangeEvent($lead, $details['points'][0], $details['points'][1]);
                         $this->dispatcher->dispatch(LeadEvents::LEAD_POINTS_CHANGE, $pointsEvent);
                     }
                 }
 
-                if (!$lead->imported && isset($details["utmtags"])) {
-
+                if (!$lead->imported && isset($details['utmtags'])) {
                     $utmTagsEvent = new Events\LeadUtmTagsEvent($lead, $details['utmtags']);
                     $this->dispatcher->dispatch(LeadEvents::LEAD_UTMTAGS_ADD, $utmTagsEvent);
                 }
@@ -152,7 +147,7 @@ public function onLeadPostSave(Events\LeadEvent $event)
     }
 
     /**
-     * Add a lead delete entry to the audit log
+     * Add a lead delete entry to the audit log.
      *
      * @param Events\LeadEvent $event
      */
@@ -160,18 +155,18 @@ public function onLeadDelete(Events\LeadEvent $event)
     {
         $lead = $event->getLead();
         $log  = [
-            "bundle"    => "lead",
-            "object"    => "lead",
-            "objectId"  => $lead->deletedId,
-            "action"    => "delete",
-            "details"   => ['name' => $lead->getPrimaryIdentifier()],
-            "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+            'bundle'    => 'lead',
+            'object'    => 'lead',
+            'objectId'  => $lead->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $lead->getPrimaryIdentifier()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
         ];
         $this->auditLogModel->writeToLog($log);
     }
 
     /**
-     * Add a field entry to the audit log
+     * Add a field entry to the audit log.
      *
      * @param Events\LeadFieldEvent $event
      */
@@ -180,19 +175,19 @@ public function onFieldPostSave(Events\LeadFieldEvent $event)
         $field = $event->getField();
         if ($details = $event->getChanges()) {
             $log = [
-                "bundle"    => "lead",
-                "object"    => "field",
-                "objectId"  => $field->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+                'bundle'    => 'lead',
+                'object'    => 'field',
+                'objectId'  => $field->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
             ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a field delete entry to the audit log
+     * Add a field delete entry to the audit log.
      *
      * @param Events\LeadFieldEvent $event
      */
@@ -200,18 +195,18 @@ public function onFieldDelete(Events\LeadFieldEvent $event)
     {
         $field = $event->getField();
         $log   = [
-            "bundle"    => "lead",
-            "object"    => "field",
-            "objectId"  => $field->deletedId,
-            "action"    => "delete",
-            "details"   => ['name', $field->getLabel()],
-            "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+            'bundle'    => 'lead',
+            'object'    => 'field',
+            'objectId'  => $field->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name', $field->getLabel()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
         ];
         $this->auditLogModel->writeToLog($log);
     }
 
     /**
-     * Add a note entry to the audit log
+     * Add a note entry to the audit log.
      *
      * @param Events\LeadNoteEvent $event
      */
@@ -220,19 +215,19 @@ public function onNotePostSave(Events\LeadNoteEvent $event)
         $note = $event->getNote();
         if ($details = $event->getChanges()) {
             $log = [
-                "bundle"    => "lead",
-                "object"    => "note",
-                "objectId"  => $note->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+                'bundle'    => 'lead',
+                'object'    => 'note',
+                'objectId'  => $note->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
             ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a note delete entry to the audit log
+     * Add a note delete entry to the audit log.
      *
      * @param Events\LeadNoteEvent $event
      */
@@ -240,12 +235,12 @@ public function onNoteDelete(Events\LeadNoteEvent $event)
     {
         $note = $event->getNote();
         $log  = [
-            "bundle"    => "lead",
-            "object"    => "note",
-            "objectId"  => $note->deletedId,
-            "action"    => "delete",
-            "details"   => ['text', $note->getText()],
-            "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+            'bundle'    => 'lead',
+            'object'    => 'note',
+            'objectId'  => $note->deletedId,
+            'action'    => 'delete',
+            'details'   => ['text', $note->getText()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
         ];
         $this->auditLogModel->writeToLog($log);
     }
@@ -271,19 +266,18 @@ public function onLeadMerge(Events\LeadMergeEvent $event)
         );
 
         $log = [
-            "bundle"    => "lead",
-            "object"    => "lead",
-            "objectId"  => $event->getLoser()->getId(),
-            "action"    => "merge",
-            "details"   => ['merged_into' => $event->getVictor()->getId()],
-            "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
+            'bundle'    => 'lead',
+            'object'    => 'lead',
+            'objectId'  => $event->getLoser()->getId(),
+            'action'    => 'merge',
+            'details'   => ['merged_into' => $event->getVictor()->getId()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
         ];
         $this->auditLogModel->writeToLog($log);
     }
 
-
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param Events\LeadTimelineEvent $event
      */
@@ -294,7 +288,7 @@ public function onTimelineGenerate(Events\LeadTimelineEvent $event)
             'lead.identified'   => 'mautic.lead.event.identified',
             'lead.ipadded'      => 'mautic.lead.event.ipadded',
             'lead.utmtagsadded' => 'mautic.lead.event.utmtagsadded',
-            'lead.donotcontact' => 'mautic.lead.event.donotcontact'
+            'lead.donotcontact' => 'mautic.lead.event.donotcontact',
         ];
 
         $filters = $event->getEventFilters();
@@ -304,7 +298,6 @@ public function onTimelineGenerate(Events\LeadTimelineEvent $event)
             $event->addEventType($type, $name);
 
             if (!$event->isApplicable($type) || ($type != 'lead.utmtagsadded' && !empty($filters['search']))) {
-
                 continue;
             }
 
@@ -352,21 +345,20 @@ protected function addTimelineIpAddressEntries(Events\LeadTimelineEvent $event,
 
             foreach ($rows['results'] as $row) {
                 if (!isset($ipAddresses[$row['ip_address']])) {
-
                     continue;
                 }
 
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => $row['ip_address'],
-                        'eventType'       => $eventTypeName,
-                        'eventPriority'   => -1, // Usually an IP is added after another event
-                        'timestamp'       => $row['date_added'],
-                        'extra'           => [
-                            'ipDetails' => $ipAddresses[$row['ip_address']]
+                        'event'         => $eventTypeKey,
+                        'eventLabel'    => $row['ip_address'],
+                        'eventType'     => $eventTypeName,
+                        'eventPriority' => -1, // Usually an IP is added after another event
+                        'timestamp'     => $row['date_added'],
+                        'extra'         => [
+                            'ipDetails' => $ipAddresses[$row['ip_address']],
                         ],
-                        'contentTemplate' => 'MauticLeadBundle:SubscribedEvents\Timeline:ipadded.html.php'
+                        'contentTemplate' => 'MauticLeadBundle:SubscribedEvents\Timeline:ipadded.html.php',
                     ]
                 );
             }
@@ -394,7 +386,7 @@ protected function addTimelineDateCreatedEntry(Events\LeadTimelineEvent $event,
                         'icon'          => 'fa-user-secret',
                         'eventType'     => $eventTypeName,
                         'eventPriority' => -5, // Usually something happened to create the lead so this should display afterward
-                        'timestamp'     => $dateAdded
+                        'timestamp'     => $dateAdded,
                     ]
                 );
             }
@@ -423,7 +415,7 @@ protected function addTimelineDateIdentifiedEntry(Events\LeadTimelineEvent $even
                             'eventType'     => $eventTypeName,
                             'eventPriority' => -4, // A lead is created prior to being identified
                             'timestamp'     => $dateIdentified,
-                            'featured'      => true
+                            'featured'      => true,
                         ]
                     );
                 }
@@ -479,15 +471,15 @@ protected function addTimelineUtmEntries(Events\LeadTimelineEvent $event, $event
 
                     $event->addEvent(
                         [
-                            'event'           => $eventTypeKey,
-                            'eventType'       => $eventTypeName,
-                            'eventLabel'      => !empty($utmTag['utm_campaign']) ? $utmTag['utm_campaign'] : '',
-                            'timestamp'       => $utmTag['date_added'],
-                            'icon'            => $icon,
-                            'extra'           => [
-                                'utmtags' => $utmTag
+                            'event'      => $eventTypeKey,
+                            'eventType'  => $eventTypeName,
+                            'eventLabel' => !empty($utmTag['utm_campaign']) ? $utmTag['utm_campaign'] : '',
+                            'timestamp'  => $utmTag['date_added'],
+                            'icon'       => $icon,
+                            'extra'      => [
+                                'utmtags' => $utmTag,
                             ],
-                            'contentTemplate' => 'MauticLeadBundle:SubscribedEvents\Timeline:utmadded.html.php'
+                            'contentTemplate' => 'MauticLeadBundle:SubscribedEvents\Timeline:utmadded.html.php',
                         ]
                     );
                 }
@@ -548,7 +540,7 @@ protected function addTimelineDoNotContactEntries(Events\LeadTimelineEvent $even
                             }
                         }
 
-                        /** @deprecated - BC support to be removed in 3.0 */
+                        /* @deprecated - BC support to be removed in 3.0 */
                         // Allow a custom template if applicable
                         if (method_exists($channelModel, 'getDoNotContactLeadTimelineTemplate')) {
                             $template = $channelModel->getDoNotContactLeadTimelineTemplate($row);
@@ -559,7 +551,7 @@ protected function addTimelineDoNotContactEntries(Events\LeadTimelineEvent $even
                         if (method_exists($channelModel, 'getDoNotContactLeadTimelineIcon')) {
                             $icon = $channelModel->getDoNotContactLeadTimelineIcon($row);
                         }
-                        /** end deprecation */
+                        /* end deprecation */
 
                         if (!empty($row['channel_id'])) {
                             if ($item = $this->getChannelEntityName($row['channel'], $row['channel_id'], true)) {
@@ -572,19 +564,19 @@ protected function addTimelineDoNotContactEntries(Events\LeadTimelineEvent $even
 
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => (isset($row['itemName'])) ?
+                        'event'      => $eventTypeKey,
+                        'eventLabel' => (isset($row['itemName'])) ?
                             [
                                 'label' => ucfirst($row['channel']).' / '.$row['itemName'],
-                                'href'  => $row['itemRoute']
+                                'href'  => $row['itemRoute'],
                             ] : ucfirst($row['channel']),
-                        'eventType'       => $eventTypeName,
-                        'timestamp'       => $row['date_added'],
-                        'extra'           => [
-                            'dnc' => $row
+                        'eventType' => $eventTypeName,
+                        'timestamp' => $row['date_added'],
+                        'extra'     => [
+                            'dnc' => $row,
                         ],
                         'contentTemplate' => $template,
-                        'icon'            => $icon
+                        'icon'            => $icon,
                     ]
                 );
             }
diff --git a/app/bundles/LeadBundle/EventListener/MaintenanceSubscriber.php b/app/bundles/LeadBundle/EventListener/MaintenanceSubscriber.php
index d86f41ebeb2..44c9459ea48 100644
--- a/app/bundles/LeadBundle/EventListener/MaintenanceSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/MaintenanceSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,10 +14,9 @@
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\MaintenanceEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class MaintenanceSubscriber
+ * Class MaintenanceSubscriber.
  */
 class MaintenanceSubscriber extends CommonSubscriber
 {
@@ -28,7 +28,7 @@ class MaintenanceSubscriber extends CommonSubscriber
     /**
      * MaintenanceSubscriber constructor.
      *
-     * @param Connection    $db
+     * @param Connection $db
      */
     public function __construct(Connection $db)
     {
@@ -38,17 +38,17 @@ public function __construct(Connection $db)
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
         return [
-            CoreEvents::MAINTENANCE_CLEANUP_DATA => ['onDataCleanup', 0]
+            CoreEvents::MAINTENANCE_CLEANUP_DATA => ['onDataCleanup', 0],
         ];
     }
 
     /**
      * @param MaintenanceEvent $event
      */
-    public function onDataCleanup (MaintenanceEvent $event)
+    public function onDataCleanup(MaintenanceEvent $event)
     {
         $qb = $this->db->createQueryBuilder()
             ->setParameter('date', $event->getDate()->format('Y-m-d H:i:s'));
diff --git a/app/bundles/LeadBundle/EventListener/PointSubscriber.php b/app/bundles/LeadBundle/EventListener/PointSubscriber.php
index ec6b4409748..4fe98f5d329 100644
--- a/app/bundles/LeadBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/PointSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,19 +15,18 @@
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
-
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::TRIGGER_ON_BUILD   => array('onTriggerBuild', 0)
-        );
+        return [
+            PointEvents::TRIGGER_ON_BUILD => ['onTriggerBuild', 0],
+        ];
     }
 
     /**
@@ -34,23 +34,22 @@ static public function getSubscribedEvents()
      */
     public function onTriggerBuild(TriggerBuilderEvent $event)
     {
-        $changeLists = array(
-            'group'       => 'mautic.lead.point.trigger',
-            'label'       => 'mautic.lead.point.trigger.changelists',
-            'callback'    => array('\\Mautic\\LeadBundle\\Helper\\PointEventHelper', 'changeLists'),
-            'formType'    => 'leadlist_action'
-        );
+        $changeLists = [
+            'group'    => 'mautic.lead.point.trigger',
+            'label'    => 'mautic.lead.point.trigger.changelists',
+            'callback' => ['\\Mautic\\LeadBundle\\Helper\\PointEventHelper', 'changeLists'],
+            'formType' => 'leadlist_action',
+        ];
 
         $event->addEvent('lead.changelists', $changeLists);
 
         // modify tags
-        $action = array(
-            'group'       => 'mautic.lead.point.trigger',
-            'label'       => 'mautic.lead.lead.events.changetags',
-            'formType'    => 'modify_lead_tags',
-            'callback'    => '\Mautic\LeadBundle\Helper\EventHelper::updateTags'
-        );
+        $action = [
+            'group'    => 'mautic.lead.point.trigger',
+            'label'    => 'mautic.lead.lead.events.changetags',
+            'formType' => 'modify_lead_tags',
+            'callback' => '\Mautic\LeadBundle\Helper\EventHelper::updateTags',
+        ];
         $event->addEvent('lead.changetags', $action);
     }
-
 }
diff --git a/app/bundles/LeadBundle/EventListener/ReportSubscriber.php b/app/bundles/LeadBundle/EventListener/ReportSubscriber.php
index c9f9c6f6124..edc4dc50002 100644
--- a/app/bundles/LeadBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/ReportSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,6 +13,7 @@
 use Mautic\CampaignBundle\Model\CampaignModel;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Helper\Chart\PieChart;
 use Mautic\LeadBundle\Model\FieldModel;
 use Mautic\LeadBundle\Model\LeadModel;
@@ -21,14 +23,11 @@
 use Mautic\ReportBundle\Event\ReportGeneratorEvent;
 use Mautic\ReportBundle\Event\ReportGraphEvent;
 use Mautic\ReportBundle\ReportEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\StageBundle\Model\StageModel;
 use Mautic\UserBundle\Model\UserModel;
 
 /**
- * Class ReportSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class ReportSubscriber.
  */
 class ReportSubscriber extends CommonSubscriber
 {
@@ -89,8 +88,7 @@ public function __construct(
         StageModel $stageModel,
         CampaignModel $campaignModel,
         UserModel $userModel
-    )
-    {
+    ) {
         $this->listModel     = $listModel;
         $this->fieldModel    = $fieldModel;
         $this->leadModel     = $leadModel;
@@ -102,22 +100,20 @@ public function __construct(
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             ReportEvents::REPORT_ON_BUILD          => ['onReportBuilder', 0],
             ReportEvents::REPORT_ON_GENERATE       => ['onReportGenerate', 0],
             ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0],
-            ReportEvents::REPORT_ON_DISPLAY        => ['onReportDisplay', 0]
+            ReportEvents::REPORT_ON_DISPLAY        => ['onReportDisplay', 0],
         ];
     }
 
     /**
-     * Add available tables and columns to the report builder lookup
+     * Add available tables and columns to the report builder lookup.
      *
      * @param ReportBuilderEvent $event
-     *
-     * @return void
      */
     public function onReportBuilder(ReportBuilderEvent $event)
     {
@@ -125,36 +121,36 @@ public function onReportBuilder(ReportBuilderEvent $event)
 
         if ($event->checkContext($leadContexts)) {
             $columns = [
-                'l.id'              => [
+                'l.id' => [
                     'label' => 'mautic.lead.report.contact_id',
                     'type'  => 'int',
-                    'link'  => 'mautic_contact_action'
+                    'link'  => 'mautic_contact_action',
                 ],
-                'i.ip_address'      => [
+                'i.ip_address' => [
                     'label' => 'mautic.core.ipaddress',
-                    'type'  => 'text'
+                    'type'  => 'text',
                 ],
                 'l.date_identified' => [
                     'label' => 'mautic.lead.report.date_identified',
-                    'type'  => 'datetime'
+                    'type'  => 'datetime',
                 ],
-                'l.points'          => [
+                'l.points' => [
                     'label' => 'mautic.lead.points',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                'l.owner_id'        => [
+                'l.owner_id' => [
                     'label' => 'mautic.lead.report.owner_id',
                     'type'  => 'int',
-                    'link'  => 'mautic_user_action'
+                    'link'  => 'mautic_user_action',
                 ],
-                'u.first_name'      => [
+                'u.first_name' => [
                     'label' => 'mautic.lead.report.owner_firstname',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                'u.last_name'       => [
+                'u.last_name' => [
                     'label' => 'mautic.lead.report.owner_lastname',
-                    'type'  => 'string'
-                ]
+                    'type'  => 'string',
+                ],
             ];
 
             $leadFields   = $this->fieldModel->getEntities();
@@ -188,7 +184,7 @@ public function onReportBuilder(ReportBuilderEvent $event)
                 }
                 $fieldColumns['l.'.$f->getAlias()] = [
                     'label' => $f->getLabel(),
-                    'type'  => $type
+                    'type'  => $type,
                 ];
             }
 
@@ -206,14 +202,14 @@ public function onReportBuilder(ReportBuilderEvent $event)
                 'type'      => 'select',
                 'list'      => $list,
                 'operators' => [
-                    'eq' => 'mautic.core.operator.equals'
-                ]
+                    'eq' => 'mautic.core.operator.equals',
+                ],
             ];
 
             $filters['l.owner_id'] = [
                 'label' => 'mautic.lead.list.filter.owner',
                 'type'  => 'select',
-                'list'  => $this->userModel->getRepository()->getUserList('', 0)
+                'list'  => $this->userModel->getRepository()->getUserList('', 0),
             ];
 
             $data = [
@@ -227,18 +223,17 @@ public function onReportBuilder(ReportBuilderEvent $event)
             $attributionTypes = [
                 'contact.attribution.multi',
                 'contact.attribution.first',
-                'contact.attribution.last'
+                'contact.attribution.last',
             ];
 
             if ($event->checkContext($attributionTypes)) {
                 $context = $event->getContext();
                 foreach ($attributionTypes as $attributionType) {
                     if (empty($context) || $event->checkContext($attributionType)) {
-                        $type = str_replace('contact.attribution.','',$attributionType);
+                        $type = str_replace('contact.attribution.', '', $attributionType);
                         $this->injectAttributionReportData($event, $columns, $type);
                     }
                 }
-
             }
 
             if ($event->checkContext(['leads', 'lead.pointlog'])) {
@@ -253,11 +248,9 @@ public function onReportBuilder(ReportBuilderEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGeneratorEvent $event
-     *
-     * @return void
      */
     public function onReportGenerate(ReportGeneratorEvent $event)
     {
@@ -315,7 +308,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                             $qb->expr()->eq('log.is_scheduled', 0),
                             $qb->expr()->isNotNull('l.attribution'),
                             $qb->expr()->neq('l.attribution', 0),
-                            $qb->expr()->lte("DATE($localDateTriggered)", "DATE(l.attribution_date)")
+                            $qb->expr()->lte("DATE($localDateTriggered)", 'DATE(l.attribution_date)')
                         )
                     );
 
@@ -338,7 +331,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
 
                 $expr = $subQ->expr()->andX(
                     $subQ->expr()->eq("{$alias}e.event_type", $subQ->expr()->literal('decision')),
-                    $subQ->expr()->eq("{$alias}log.lead_id", "log.lead_id")
+                    $subQ->expr()->eq("{$alias}log.lead_id", 'log.lead_id')
                 );
 
                 $subsetFilters = ['log.campaign_id', 'c.name', 'channel', 'channel_action', 'e.name'];
@@ -362,7 +355,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                     }
                 }
 
-                $subQ->from(MAUTIC_TABLE_PREFIX."campaign_lead_event_log", "{$alias}log")
+                $subQ->from(MAUTIC_TABLE_PREFIX.'campaign_lead_event_log', "{$alias}log")
                     ->join("{$alias}log", MAUTIC_TABLE_PREFIX.'campaign_events', "{$alias}e", "{$alias}log.event_id = {$alias}e.id")
                     ->join("{$alias}e", MAUTIC_TABLE_PREFIX.'campaigns', "{$alias}c", "{$alias}e.campaign_id = {$alias}c.id")
                     ->where($expr);
@@ -373,7 +366,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                     $subQ->select("$func({$alias}log.date_triggered)")
                         ->setMaxResults(1);
                     $qb->andWhere(
-                        $qb->expr()->eq('log.date_triggered', sprintf("(%s)", $subQ->getSQL()))
+                        $qb->expr()->eq('log.date_triggered', sprintf('(%s)', $subQ->getSQL()))
                     )->groupBy('l.id');
                 } else {
                     // Get the total count of records for this lead that match the filters to divide the attribution by
@@ -389,17 +382,14 @@ public function onReportGenerate(ReportGeneratorEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGraphEvent $event
-     *
-     * @return void
      */
     public function onReportGraphGenerate(ReportGraphEvent $event)
     {
         // Context check, we only want to fire for Lead reports
         if (!$event->checkContext(['leads', 'lead.pointlog', 'contact.attribution.multi'])) {
-
             return;
         }
 
@@ -477,7 +467,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
                         [
                             'data'      => $chart->render(),
                             'name'      => $g,
-                            'iconClass' => 'fa-dollar'
+                            'iconClass' => 'fa-dollar',
                         ]
                     );
                     break;
@@ -589,30 +579,30 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
     private function injectPointsReportData(ReportBuilderEvent $event, array $columns)
     {
         $pointColumns = [
-            'lp.type'        => [
+            'lp.type' => [
                 'label' => 'mautic.lead.report.points.type',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            'lp.event_name'  => [
+            'lp.event_name' => [
                 'label' => 'mautic.lead.report.points.event_name',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
             'lp.action_name' => [
                 'label' => 'mautic.lead.report.points.action_name',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            'lp.delta'       => [
+            'lp.delta' => [
                 'label' => 'mautic.lead.report.points.delta',
-                'type'  => 'int'
+                'type'  => 'int',
             ],
-            'lp.date_added'  => [
+            'lp.date_added' => [
                 'label' => 'mautic.lead.report.points.date_added',
-                'type'  => 'datetime'
-            ]
+                'type'  => 'datetime',
+            ],
         ];
-        $data         = [
+        $data = [
             'display_name' => 'mautic.lead.report.points.table',
-            'columns'      => array_merge($columns, $pointColumns, $event->getIpColumn())
+            'columns'      => array_merge($columns, $pointColumns, $event->getIpColumn()),
         ];
         $event->addTable('lead.pointlog', $data, 'contacts');
 
@@ -633,46 +623,46 @@ private function injectPointsReportData(ReportBuilderEvent $event, array $column
     private function injectAttributionReportData(ReportBuilderEvent $event, array $columns, $type)
     {
         $attributionColumns = [
-            'log.campaign_id'              => [
+            'log.campaign_id' => [
                 'label' => 'mautic.lead.report.attribution.campaign_id',
                 'type'  => 'int',
-                'link'  => 'mautic_campaign_action'
+                'link'  => 'mautic_campaign_action',
             ],
-            'log.date_triggered'              => [
+            'log.date_triggered' => [
                 'label' => 'mautic.lead.report.attribution.action_date',
-                'type'  => 'datetime'
+                'type'  => 'datetime',
             ],
-            'c.name'              => [
+            'c.name' => [
                 'alias' => 'campaign_name',
                 'label' => 'mautic.lead.report.attribution.campaign_name',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            'l.stage_id'              => [
+            'l.stage_id' => [
                 'label' => 'mautic.lead.report.attribution.stage_id',
                 'type'  => 'int',
-                'link'  => 'mautic_stage_action'
+                'link'  => 'mautic_stage_action',
             ],
-            's.name'              => [
+            's.name' => [
                 'alias' => 'stage_name',
                 'label' => 'mautic.lead.report.attribution.stage_name',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            'channel'              => [
-                'alias' => 'channel',
+            'channel' => [
+                'alias'   => 'channel',
                 'formula' => 'SUBSTRING_INDEX(e.type, \'.\', 1)',
-                'label' => 'mautic.lead.report.attribution.channel',
-                'type'  => 'string'
+                'label'   => 'mautic.lead.report.attribution.channel',
+                'type'    => 'string',
             ],
-            'channel_action'       => [
-                'alias' => 'channel_action',
+            'channel_action' => [
+                'alias'   => 'channel_action',
                 'formula' => 'SUBSTRING_INDEX(e.type, \'.\', -1)',
-                'label' => 'mautic.lead.report.attribution.channel_action',
-                'type'  => 'string'
+                'label'   => 'mautic.lead.report.attribution.channel_action',
+                'type'    => 'string',
             ],
             'e.name' => [
                 'alias' => 'action_name',
                 'label' => 'mautic.lead.report.attribution.action_name',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
         ];
 
@@ -680,8 +670,8 @@ private function injectAttributionReportData(ReportBuilderEvent $event, array $c
 
         // Setup available channels
         $availableChannels = $this->campaignModel->getEvents();
-        $channels       = [];
-        $channelActions = [];
+        $channels          = [];
+        $channelActions    = [];
         foreach ($availableChannels['decision'] as $channel => $decision) {
             $parts                  = explode('.', $channel);
             $channelName            = $parts[0];
@@ -696,7 +686,7 @@ private function injectAttributionReportData(ReportBuilderEvent $event, array $c
             } elseif ($this->translator->hasId('mautic.campaign.'.$channel)) {
                 $actionName = $this->translator->trans('mautic.campaign.'.$channel);
             } else {
-                $actionName = $channelName.": ".$actionValue;
+                $actionName = $channelName.': '.$actionValue;
             }
             $channelActions[$actionValue] = $actionName;
         }
@@ -715,7 +705,7 @@ private function injectAttributionReportData(ReportBuilderEvent $event, array $c
         unset($channelActions, $channels);
 
         // Setup available channels
-        $campaigns = $this->campaignModel->getRepository()->getSimpleList();
+        $campaigns                  = $this->campaignModel->getRepository()->getSimpleList();
         $filters['log.campaign_id'] = [
             'label' => 'mautic.lead.report.attribution.filter.campaign',
             'type'  => 'select',
@@ -725,7 +715,7 @@ private function injectAttributionReportData(ReportBuilderEvent $event, array $c
 
         // Setup stages list
         $userStages = $this->stageModel->getUserStages();
-        $stages = [];
+        $stages     = [];
         foreach ($userStages as $stage) {
             $stages[$stage['id']] = $stage['name'];
         }
diff --git a/app/bundles/LeadBundle/EventListener/SearchSubscriber.php b/app/bundles/LeadBundle/EventListener/SearchSubscriber.php
index ff6ee30b0ec..dbc9a4f2950 100644
--- a/app/bundles/LeadBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/SearchSubscriber.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\LeadBundle\Model\LeadModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -39,18 +38,18 @@ public function __construct(LeadModel $leadModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
      * @param MauticEvents\GlobalSearchEvent $event
      */
-    public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
+    public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
     {
         $str = $event->getSearchString();
         if (empty($str)) {
@@ -59,7 +58,7 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
 
         $anonymous = $this->translator->trans('mautic.lead.lead.searchcommand.isanonymous');
         $mine      = $this->translator->trans('mautic.core.searchcommand.ismine');
-        $filter    = array("string" => $str, "force" => '');
+        $filter    = ['string' => $str, 'force' => ''];
 
         //only show results that are not anonymous so as to not clutter up things
         if (strpos($str, "$anonymous") === false) {
@@ -67,7 +66,7 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
         }
 
         $permissions = $this->security->isGranted(
-            array('lead:leads:viewown', 'lead:leads:viewother'),
+            ['lead:leads:viewown', 'lead:leads:viewother'],
             'RETURN_ARRAY'
         );
 
@@ -78,33 +77,33 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
             }
 
             $results = $this->leadModel->getEntities(
-                array(
+                [
                     'limit'          => 5,
                     'filter'         => $filter,
-                    'withTotalCount' => true
-                ));
+                    'withTotalCount' => true,
+                ]);
 
             $count = $results['count'];
 
             if ($count > 0) {
                 $leads       = $results['results'];
-                $leadResults = array();
+                $leadResults = [];
 
                 foreach ($leads as $lead) {
                     $leadResults[] = $this->templating->renderResponse(
                         'MauticLeadBundle:SubscribedEvents\Search:global.html.php',
-                        array('lead' => $lead)
+                        ['lead' => $lead]
                     )->getContent();
                 }
 
                 if ($results['count'] > 5) {
                     $leadResults[] = $this->templating->renderResponse(
                         'MauticLeadBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => ($results['count'] - 5)
-                        )
+                            'remaining'    => ($results['count'] - 5),
+                        ]
                     )->getContent();
                 }
                 $leadResults['count'] = $results['count'];
@@ -116,13 +115,13 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
     /**
      * @param MauticEvents\CommandListEvent $event
      */
-    public function onBuildCommandList (MauticEvents\CommandListEvent $event)
+    public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        if ($this->security->isGranted(array('lead:leads:viewown', 'lead:leads:viewother'), "MATCH_ONE")) {
+        if ($this->security->isGranted(['lead:leads:viewown', 'lead:leads:viewother'], 'MATCH_ONE')) {
             $event->addCommands(
                 'mautic.lead.leads',
                 $this->leadModel->getCommandList()
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php b/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php
index 295fe9dc849..5b53d5c5763 100644
--- a/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/LeadBundle/EventListener/WebhookSubscriber.php
@@ -1,77 +1,76 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\EventListener;
 
-use Mautic\WebhookBundle\WebhookEvents;
-use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\LeadBundle\LeadEvents;
+use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\WebhookEvents;
 
 /**
- * Class WebhookSubscriber
- *
- * @package Mautic\LeadBundle\EventListener
+ * Class WebhookSubscriber.
  */
 class WebhookSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            WebhookEvents::WEBHOOK_ON_BUILD => array('onWebhookBuild', 0)
-        );
+        return [
+            WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
+        ];
     }
 
     /**
-     * Add event triggers and actions
+     * Add event triggers and actions.
      *
      * @param WebhookBuilderEvent $event
      */
     public function onWebhookBuild(WebhookBuilderEvent $event)
     {
         // add checkbox to the webhook form for new leads
-        $newLead     = array(
+        $newLead = [
             'label'       => 'mautic.lead.webhook.event.lead.new',
             'description' => 'mautic.lead.webhook.event.lead.new_desc',
-        );
+        ];
 
         // add it to the list
-        $event->addEvent(LeadEvents::LEAD_POST_SAVE . '_new', $newLead);
+        $event->addEvent(LeadEvents::LEAD_POST_SAVE.'_new', $newLead);
 
         // checkbox for lead updates
-        $updatedLead = array(
+        $updatedLead = [
             'label'       => 'mautic.lead.webhook.event.lead.update',
             'description' => 'mautic.lead.webhook.event.lead.update_desc',
-        );
+        ];
 
         // add it to the list
-        $event->addEvent(LeadEvents::LEAD_POST_SAVE . '_update', $updatedLead);
+        $event->addEvent(LeadEvents::LEAD_POST_SAVE.'_update', $updatedLead);
 
         // add a checkbox for points
-        $leadPoints = array(
+        $leadPoints = [
             'label'       => 'mautic.lead.webhook.event.lead.points',
             'description' => 'mautic.lead.webhook.event.lead.points_desc',
-        );
+        ];
 
         // add the points
         $event->addEvent(LeadEvents::LEAD_POINTS_CHANGE, $leadPoints);
 
         // lead deleted checkbox label & desc
-        $leadDeleted = array(
+        $leadDeleted = [
             'label'       => 'mautic.lead.webhook.event.lead.deleted',
             'description' => 'mautic.lead.webhook.event.lead.deleted_desc',
-        );
+        ];
 
         // add the deleted checkbox
         $event->addEvent(LeadEvents::LEAD_POST_DELETE, $leadDeleted);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/DataTransformer/FieldFilterTransformer.php b/app/bundles/LeadBundle/Form/DataTransformer/FieldFilterTransformer.php
index a9c7cc4725b..8015d6d9845 100644
--- a/app/bundles/LeadBundle/Form/DataTransformer/FieldFilterTransformer.php
+++ b/app/bundles/LeadBundle/Form/DataTransformer/FieldFilterTransformer.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-
 namespace Mautic\LeadBundle\Form\DataTransformer;
 
 use Mautic\CoreBundle\Helper\DateTimeHelper;
@@ -29,7 +29,7 @@ public function __construct($translator)
         }
     }
     /**
-     * From DB format to form format
+     * From DB format to form format.
      *
      * @param mixed $rawFilters
      *
@@ -38,11 +38,11 @@ public function __construct($translator)
     public function transform($rawFilters)
     {
         if (!is_array($rawFilters)) {
-            return array();
+            return [];
         }
 
         foreach ($rawFilters as $k => $f) {
-           if ($f['type'] == 'datetime') {
+            if ($f['type'] == 'datetime') {
                 if (in_array($f['filter'], $this->relativeDateStrings) or stristr($f['filter'][0], '-') or stristr($f['filter'][0], '+')) {
                     continue;
                 }
@@ -56,7 +56,7 @@ public function transform($rawFilters)
     }
 
     /**
-     * Form format to database format
+     * Form format to database format.
      *
      * @param mixed $rawFilters
      *
@@ -64,9 +64,8 @@ public function transform($rawFilters)
      */
     public function reverseTransform($rawFilters)
     {
-
         if (!is_array($rawFilters)) {
-            return array();
+            return [];
         }
 
         $rawFilters = array_values($rawFilters);
@@ -84,4 +83,4 @@ public function reverseTransform($rawFilters)
 
         return $rawFilters;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/DataTransformer/FieldToOrderTransformer.php b/app/bundles/LeadBundle/Form/DataTransformer/FieldToOrderTransformer.php
index 7a1f1d16911..3b9aa49e511 100644
--- a/app/bundles/LeadBundle/Form/DataTransformer/FieldToOrderTransformer.php
+++ b/app/bundles/LeadBundle/Form/DataTransformer/FieldToOrderTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,6 @@
 
 class FieldToOrderTransformer implements DataTransformerInterface
 {
-
     private $em;
 
     public function __construct(EntityManager $em)
@@ -25,7 +25,8 @@ public function __construct(EntityManager $em)
     /**
      * Transforms an object to an integer (order).
      *
-     * @param  LeadField|null $field
+     * @param LeadField|null $field
+     *
      * @return string
      */
     public function transform($order)
@@ -36,7 +37,7 @@ public function transform($order)
 
         $field = $this->em
             ->getRepository('MauticLeadBundle:LeadField')
-            ->findOneBy(array('order' => $order));
+            ->findOneBy(['order' => $order]);
 
         return $field;
     }
@@ -56,4 +57,4 @@ public function reverseTransform($field)
 
         return $field->getOrder();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/DataTransformer/TagEntityModelTransformer.php b/app/bundles/LeadBundle/Form/DataTransformer/TagEntityModelTransformer.php
index 6e326dc1eaf..d58da101dc6 100644
--- a/app/bundles/LeadBundle/Form/DataTransformer/TagEntityModelTransformer.php
+++ b/app/bundles/LeadBundle/Form/DataTransformer/TagEntityModelTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
 /**
- * Class TagEntityModelTransformer
+ * Class TagEntityModelTransformer.
  */
 class TagEntityModelTransformer implements DataTransformerInterface
 {
@@ -67,10 +68,10 @@ public function reverseTransform($entity)
         }
 
         if (is_null($entity) && !is_array($entity) && !$entity instanceof PersistentCollection) {
-            return array();
+            return [];
         }
 
-        $return = array();
+        $return = [];
         foreach ($entity as $e) {
             $return[] = $e->getTag();
         }
@@ -81,7 +82,7 @@ public function reverseTransform($entity)
     /**
      * {@inheritdoc}
      *
-     * @throws TransformationFailedException if object is not found.
+     * @throws TransformationFailedException if object is not found
      */
     public function transform($id)
     {
@@ -93,7 +94,7 @@ public function transform($id)
             $column = (is_numeric($id)) ? 'id' : 'tag';
             $entity = $this->em
                 ->getRepository($this->repository)
-                ->findOneBy(array($column => $id))
+                ->findOneBy([$column => $id])
             ;
 
             if ($entity === null) {
@@ -107,7 +108,7 @@ public function transform($id)
         }
 
         if (empty($id) || !is_array($id)) {
-            return array();
+            return [];
         }
 
         $column = (is_numeric($id[0])) ? 'id' : 'tag';
@@ -115,18 +116,18 @@ public function transform($id)
         $repo   = $this->em->getRepository($this->repository);
         $prefix = $repo->getTableAlias();
 
-        $entities = $repo->getEntities(array(
-            'filter' => array(
-                'force' => array(
-                    array(
-                        'column' => $prefix . '.' . $column,
+        $entities = $repo->getEntities([
+            'filter' => [
+                'force' => [
+                    [
+                        'column' => $prefix.'.'.$column,
                         'expr'   => 'in',
-                        'value'  => $id
-                    )
-                )
-            ),
-            'ignore_paginator' => true
-        ));
+                        'value'  => $id,
+                    ],
+                ],
+            ],
+            'ignore_paginator' => true,
+        ]);
 
         if (!count($entities)) {
             throw new TransformationFailedException(sprintf(
@@ -139,11 +140,9 @@ public function transform($id)
     }
 
     /**
-     * Set the repository to use
+     * Set the repository to use.
      *
      * @param string $repo
-     *
-     * @return void
      */
     public function setRepository($repo)
     {
@@ -151,11 +150,9 @@ public function setRepository($repo)
     }
 
     /**
-     * Set the identifier to use
+     * Set the identifier to use.
      *
      * @param string $id
-     *
-     * @return void
      */
     public function setIdentifier($id)
     {
diff --git a/app/bundles/LeadBundle/Form/DataTransformer/UtmTagEntityModelTransformer.php b/app/bundles/LeadBundle/Form/DataTransformer/UtmTagEntityModelTransformer.php
index 49b47f4b43b..70e5bcd2cdf 100644
--- a/app/bundles/LeadBundle/Form/DataTransformer/UtmTagEntityModelTransformer.php
+++ b/app/bundles/LeadBundle/Form/DataTransformer/UtmTagEntityModelTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
 /**
- * Class TagEntityModelTransformer
+ * Class TagEntityModelTransformer.
  */
 class UtmTagEntityModelTransformer implements DataTransformerInterface
 {
@@ -67,10 +68,10 @@ public function reverseTransform($entity)
         }
 
         if (is_null($entity) && !is_array($entity) && !$entity instanceof PersistentCollection) {
-            return array();
+            return [];
         }
 
-        $return = array();
+        $return = [];
         foreach ($entity as $e) {
             $return[] = $e->getUtmTag();
         }
@@ -81,7 +82,7 @@ public function reverseTransform($entity)
     /**
      * {@inheritdoc}
      *
-     * @throws TransformationFailedException if object is not found.
+     * @throws TransformationFailedException if object is not found
      */
     public function transform($id)
     {
@@ -93,7 +94,7 @@ public function transform($id)
             $column = (is_numeric($id)) ? 'id' : 'utmtag';
             $entity = $this->em
                 ->getRepository($this->repository)
-                ->findOneBy(array($column => $id))
+                ->findOneBy([$column => $id])
             ;
 
             if ($entity === null) {
@@ -107,7 +108,7 @@ public function transform($id)
         }
 
         if (empty($id) || !is_array($id)) {
-            return array();
+            return [];
         }
 
         $column = (is_numeric($id[0])) ? 'id' : 'utmtag';
@@ -115,18 +116,18 @@ public function transform($id)
         $repo   = $this->em->getRepository($this->repository);
         $prefix = $repo->getTableAlias();
 
-        $entities = $repo->getEntities(array(
-            'filter' => array(
-                'force' => array(
-                    array(
-                        'column' => $prefix . '.' . $column,
+        $entities = $repo->getEntities([
+            'filter' => [
+                'force' => [
+                    [
+                        'column' => $prefix.'.'.$column,
                         'expr'   => 'in',
-                        'value'  => $id
-                    )
-                )
-            ),
-            'ignore_paginator' => true
-        ));
+                        'value'  => $id,
+                    ],
+                ],
+            ],
+            'ignore_paginator' => true,
+        ]);
 
         if (!count($entities)) {
             throw new TransformationFailedException(sprintf(
@@ -139,11 +140,9 @@ public function transform($id)
     }
 
     /**
-     * Set the repository to use
+     * Set the repository to use.
      *
      * @param string $repo
-     *
-     * @return void
      */
     public function setRepository($repo)
     {
@@ -151,11 +150,9 @@ public function setRepository($repo)
     }
 
     /**
-     * Set the identifier to use
+     * Set the identifier to use.
      *
      * @param string $id
-     *
-     * @return void
      */
     public function setIdentifier($id)
     {
diff --git a/app/bundles/LeadBundle/Form/Type/ActionAddUtmTagsType.php b/app/bundles/LeadBundle/Form/Type/ActionAddUtmTagsType.php
index 53890a55062..bc7990f82a7 100644
--- a/app/bundles/LeadBundle/Form/Type/ActionAddUtmTagsType.php
+++ b/app/bundles/LeadBundle/Form/Type/ActionAddUtmTagsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,14 +13,9 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Doctrine\ORM\EntityRepository;
 
 /**
- * Class FormSubmitActionAddUtmTagType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class FormSubmitActionAddUtmTagType.
  */
 class ActionAddUtmTagsType extends AbstractType
 {
@@ -39,8 +35,6 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
-
     }
 
     /**
@@ -48,6 +42,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "lead_action_addutmtags";
+        return 'lead_action_addutmtags';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/AddToCompanyActionType.php b/app/bundles/LeadBundle/Form/Type/AddToCompanyActionType.php
index 599ff2b496e..0fd909f8273 100644
--- a/app/bundles/LeadBundle/Form/Type/AddToCompanyActionType.php
+++ b/app/bundles/LeadBundle/Form/Type/AddToCompanyActionType.php
@@ -1,25 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Doctrine\ORM\EntityRepository;
 
 /**
- * Class FormSubmitActionAddUtmTagType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class FormSubmitActionAddUtmTagType.
  */
 class AddToCompanyActionType extends AbstractType
 {
@@ -29,7 +26,7 @@ class AddToCompanyActionType extends AbstractType
     protected $router;
 
     /**
-     * @param RouterInterface   $router
+     * @param RouterInterface $router
      */
     public function __construct(RouterInterface $router)
     {
@@ -37,29 +34,28 @@ public function __construct(RouterInterface $router)
     }
 
     /**
-    * @param FormBuilderInterface $builder
+     * @param FormBuilderInterface $builder
      * @param array                $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
         $builder->add(
             'company',
             'company_list',
             [
-                'label'       => 'mautic.company.selectcompany',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                    'class'    => 'form-control',
-                    'tooltip'  => 'mautic.company.choose.company_descr'
+                'label'      => 'mautic.company.selectcompany',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class'   => 'form-control',
+                    'tooltip' => 'mautic.company.choose.company_descr',
                 ],
                 'multiple'    => false,
                 'required'    => true,
                 'constraints' => [
                     new NotBlank(
                         ['message' => 'mautic.company.choosecompany.notblank']
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -68,7 +64,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'objectAction' => 'new',
                 'contentOnly'  => 1,
-                'updateSelect' => 'campaignevent_properties_company'
+                'updateSelect' => 'campaignevent_properties_company',
             ]
         );
 
@@ -76,14 +72,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'newCompanyButton',
             'button',
             [
-                'attr'  => [
+                'attr' => [
                     'class'   => 'btn btn-primary btn-nospin',
                     'onclick' => 'Mautic.loadNewCompanyWindow({
                     "windowUrl": "'.$windowUrl.'"
                 })',
-                    'icon'    => 'fa fa-plus'
+                    'icon' => 'fa fa-plus',
                 ],
-                'label' => 'mautic.company.new.company'
+                'label' => 'mautic.company.new.company',
             ]
         );
     }
@@ -93,6 +89,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "addtocompany_action";
+        return 'addtocompany_action';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/BatchType.php b/app/bundles/LeadBundle/Form/Type/BatchType.php
index 748a4906c94..9ceca54cbed 100644
--- a/app/bundles/LeadBundle/Form/Type/BatchType.php
+++ b/app/bundles/LeadBundle/Form/Type/BatchType.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\LeadBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class BatchType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -25,27 +25,27 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'add',
             'choice',
-            array(
+            [
                 'label'      => 'mautic.lead.batch.add_to',
                 'multiple'   => true,
                 'choices'    => $options['items'],
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control')
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
 
         $builder->add(
             'remove',
             'choice',
-            array(
+            [
                 'label'      => 'mautic.lead.batch.remove_from',
                 'multiple'   => true,
                 'choices'    => $options['items'],
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
 
         $builder->add(
@@ -56,18 +56,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'buttons',
             'form_buttons',
-            array(
+            [
                 'apply_text'     => false,
                 'save_text'      => 'mautic.core.form.save',
                 'cancel_onclick' => 'javascript:void(0);',
-                'cancel_attr'    => array(
-                    'data-dismiss' => 'modal'
-                )
-            )
+                'cancel_attr'    => [
+                    'data-dismiss' => 'modal',
+                ],
+            ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -77,9 +77,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setRequired(
-            array(
-                'items'
-            )
+            [
+                'items',
+            ]
         );
     }
 
@@ -88,6 +88,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "lead_batch";
+        return 'lead_batch';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/CampaignEventLeadFieldValueType.php b/app/bundles/LeadBundle/Form/Type/CampaignEventLeadFieldValueType.php
index e398c0dec8f..2016bae83b5 100755
--- a/app/bundles/LeadBundle/Form/Type/CampaignEventLeadFieldValueType.php
+++ b/app/bundles/LeadBundle/Form/Type/CampaignEventLeadFieldValueType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
-use Mautic\LeadBundle\Model\FieldModel;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -19,7 +19,7 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class CampaignEventLeadFieldValueType
+ * Class CampaignEventLeadFieldValueType.
  */
 class CampaignEventLeadFieldValueType extends AbstractType
 {
@@ -47,14 +47,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'        => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.lead.campaign.event.field_descr',
-                    'onchange' => 'Mautic.updateLeadFieldValues(this)'
+                    'onchange' => 'Mautic.updateLeadFieldValues(this)',
                 ],
                 'required'    => true,
                 'constraints' => [
                     new NotBlank(
                         ['message' => 'mautic.core.value.required']
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -63,7 +63,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $operators  = $leadModel->getFilterExpressionFunctions();
         $choices    = [];
 
-
         foreach ($operators as $key => $operator) {
             $choices[$key] = $operator['label'];
         }
@@ -100,7 +99,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         // Boolean options
                         $fieldValues = [
                             0 => $properties['no'],
-                            1 => $properties['yes']
+                            1 => $properties['yes'],
                         ];
                     } else {
                         switch ($fieldType) {
@@ -135,14 +134,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'label'      => 'mautic.form.field.form.value',
                         'label_attr' => ['class' => 'control-label'],
                         'attr'       => [
-                            'class' => 'form-control'
+                            'class' => 'form-control',
                         ],
                         'required'    => true,
                         'constraints' => [
                             new NotBlank(
                                 ['message' => 'mautic.core.value.required']
-                            )
-                        ]
+                            ),
+                        ],
                     ]
                 );
             } else {
@@ -153,14 +152,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'label'      => 'mautic.form.field.form.value',
                         'label_attr' => ['class' => 'control-label'],
                         'attr'       => [
-                            'class' => 'form-control'
+                            'class' => 'form-control',
                         ],
                         'required'    => true,
                         'constraints' => [
                             new NotBlank(
                                 ['message' => 'mautic.core.value.required']
-                            )
-                        ]
+                            ),
+                        ],
                     ]
                 );
             }
@@ -176,6 +175,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "campaignevent_lead_field_value";
+        return 'campaignevent_lead_field_value';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/CompanyListType.php b/app/bundles/LeadBundle/Form/Type/CompanyListType.php
index 4ed58707deb..c2e71cc9960 100644
--- a/app/bundles/LeadBundle/Form/Type/CompanyListType.php
+++ b/app/bundles/LeadBundle/Form/Type/CompanyListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,9 +18,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class CompanyListType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class CompanyListType.
  */
 class CompanyListType extends AbstractType
 {
@@ -32,8 +31,7 @@ class CompanyListType extends AbstractType
 
     /**
      * @param CompanyModel $companyModel
-     * @param UserHelper $userHelper
-     *
+     * @param UserHelper   $userHelper
      */
     public function __construct(CompanyModel $companyModel, UserHelper $userHelper)
     {
@@ -47,7 +45,7 @@ public function __construct(CompanyModel $companyModel, UserHelper $userHelper)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $companies = $this->repo->getCompanies(false);
+        $companies      = $this->repo->getCompanies(false);
         $companies_list = [];
 
         foreach ($companies as $company) {
@@ -55,13 +53,13 @@ public function configureOptions(OptionsResolver $resolver)
         }
         $resolver->setDefaults(
             [
-                'choices'          => $companies_list,
-                'expanded'         => false,
-                'multiple'         => true,
-                'required'         => false,
-                'empty_value'      => function (Options $options) {
+                'choices'     => $companies_list,
+                'expanded'    => false,
+                'multiple'    => true,
+                'required'    => false,
+                'empty_value' => function (Options $options) {
                     return (empty($options['choices'])) ? 'mautic.company.no.companies.note' : 'mautic.core.form.chooseone';
-                }
+                },
             ]
         );
         $resolver->setDefined(['top_level', 'top_level_parent', 'ignore_ids']);
@@ -72,7 +70,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getName()
     {
-        return "company_list";
+        return 'company_list';
     }
 
     /**
diff --git a/app/bundles/LeadBundle/Form/Type/CompanyType.php b/app/bundles/LeadBundle/Form/Type/CompanyType.php
index bebc34fa944..f6abda1017d 100644
--- a/app/bundles/LeadBundle/Form/Type/CompanyType.php
+++ b/app/bundles/LeadBundle/Form/Type/CompanyType.php
@@ -1,28 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
 use Doctrine\ORM\EntityManager;
+use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
-use Mautic\LeadBundle\Form\Type\EntityFieldsBuildFormTrait;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\LeadBundle\Entity\Company;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Mautic\LeadBundle\Helper\FormFieldHelper;
-use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class CompanyType
+ * Class CompanyType.
  */
 class CompanyType extends AbstractType
 {
@@ -36,11 +33,10 @@ class CompanyType extends AbstractType
 
     /**
      * @param EntityManager $entityManager
-     *
      */
     public function __construct(EntityManager $entityManager, CorePermissions $security)
     {
-        $this->em = $entityManager;
+        $this->em       = $entityManager;
         $this->security = $security;
     }
 
@@ -61,13 +57,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'owner',
                 'user_list',
                 [
-                    'label' => 'mautic.lead.lead.field.owner',
+                    'label'      => 'mautic.lead.lead.field.owner',
                     'label_attr' => ['class' => 'control-label'],
-                    'attr' => [
-                        'class' => 'form-control'
+                    'attr'       => [
+                        'class' => 'form-control',
                     ],
                     'required' => false,
-                    'multiple' => false
+                    'multiple' => false,
                 ]
             )
                 ->addModelTransformer($transformer)
@@ -78,15 +74,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'buttons',
                 'form_buttons',
                 [
-                    'apply_text' => false
+                    'apply_text' => false,
                 ]
             );
             $builder->add(
                 'updateSelect',
                 'hidden',
                 [
-                    'data' => $options['update_select'],
-                    'mapped' => false
+                    'data'   => $options['update_select'],
+                    'mapped' => false,
                 ]
             );
         } else {
@@ -105,7 +101,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(
             [
                 'data_class'  => 'Mautic\LeadBundle\Entity\Company',
-                'isShortForm' => false
+                'isShortForm' => false,
             ]
         );
 
@@ -117,6 +113,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "company";
+        return 'company';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php b/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php
index c687ce950fd..2de9dc54592 100644
--- a/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php
+++ b/app/bundles/LeadBundle/Form/Type/ContactFrequencyType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,17 +14,13 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class MergeType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class MergeType.
  */
 class ContactFrequencyType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -34,9 +31,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'channels',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'sms'   => 'mautic.sms.sms',
-                    'email' => 'mautic.email.email'
+                    'email' => 'mautic.email.email',
                 ],
                 'label'       => 'mautic.lead.contact.channels',
                 'label_attr'  => ['class' => 'control-label'],
@@ -44,13 +41,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'empty_value' => '',
                 'attr'        => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.lead.merge.select.modal.tooltip'
+                    'tooltip' => 'mautic.lead.merge.select.modal.tooltip',
                 ],
                 'required' => false,
             ]
         );
 
-        $formModifier = function(FormEvent $event) {
+        $formModifier = function (FormEvent $event) {
             $form = $event->getForm();
             $data = $event->getData();
 
@@ -59,22 +56,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $constraints = [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
+                    ),
                 ];
-            };
+            }
 
             $form->add(
                 'frequency_number',
                 'number',
                 [
-                    'precision'   => 0,
-                    'label'       => 'mautic.lead.list.frequency.number',
-                    'label_attr'  => ['class' => 'control-label'],
-                    'required'    => true,
-                    'attr'        => [
-                        'class' => 'form-control frequency'
+                    'precision'  => 0,
+                    'label'      => 'mautic.lead.list.frequency.number',
+                    'label_attr' => ['class' => 'control-label'],
+                    'required'   => true,
+                    'attr'       => [
+                        'class' => 'form-control frequency',
                     ],
                     'constraints' => $constraints,
                     'required'    => false,
@@ -85,16 +82,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'frequency_time',
                 'choice',
                 [
-                    'choices'     => [
+                    'choices' => [
                         'DAY'   => 'day',
                         'WEEK'  => 'week',
-                        'MONTH' => 'month'
+                        'MONTH' => 'month',
                     ],
-                    'label'       => 'mautic.lead.list.frequency.times',
-                    'label_attr'  => ['class' => 'control-label'],
-                    'multiple'    => false,
-                    'attr'        => [
-                        'class' => 'form-control'
+                    'label'      => 'mautic.lead.list.frequency.times',
+                    'label_attr' => ['class' => 'control-label'],
+                    'multiple'   => false,
+                    'attr'       => [
+                        'class' => 'form-control',
                     ],
                     'constraints' => $constraints,
                     'required'    => false,
@@ -122,13 +119,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'save_text'      => 'mautic.core.form.save',
                 'cancel_onclick' => 'javascript:void(0);',
                 'cancel_attr'    => [
-                    'data-dismiss' => 'modal'
+                    'data-dismiss' => 'modal',
                 ],
             ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -137,7 +134,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "lead_contact_frequency_rules";
+        return 'lead_contact_frequency_rules';
     }
 }
-
diff --git a/app/bundles/LeadBundle/Form/Type/DashboardLeadsInTimeWidgetType.php b/app/bundles/LeadBundle/Form/Type/DashboardLeadsInTimeWidgetType.php
index f42993b8cb4..b387f162977 100644
--- a/app/bundles/LeadBundle/Form/Type/DashboardLeadsInTimeWidgetType.php
+++ b/app/bundles/LeadBundle/Form/Type/DashboardLeadsInTimeWidgetType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class DashboardLeadsInTimeWidgetType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class DashboardLeadsInTimeWidgetType.
  */
 class DashboardLeadsInTimeWidgetType extends AbstractType
 {
@@ -25,21 +24,21 @@ class DashboardLeadsInTimeWidgetType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('flag', 'choice', array(
+        $builder->add('flag', 'choice', [
                 'label'   => 'mautic.lead.list.filter',
-                'choices' => array(
-                    ''                          => 'mautic.lead.show.all',
-                    'identified'                => 'mautic.lead.show.identified',
-                    'anonymous'                 => 'mautic.lead.show.anonymous',
-                    'identifiedVsAnonymous'     => 'mautic.lead.show.identified.vs.anonymous',
-                    'top'                       => 'mautic.lead.show.top',
-                    'topIdentifiedVsAnonymous'  => 'mautic.lead.show.top.leads.identified.vs.anonymous'
-                ),
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
+                'choices' => [
+                    ''                         => 'mautic.lead.show.all',
+                    'identified'               => 'mautic.lead.show.identified',
+                    'anonymous'                => 'mautic.lead.show.anonymous',
+                    'identifiedVsAnonymous'    => 'mautic.lead.show.identified.vs.anonymous',
+                    'top'                      => 'mautic.lead.show.top',
+                    'topIdentifiedVsAnonymous' => 'mautic.lead.show.top.leads.identified.vs.anonymous',
+                ],
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
                 'empty_data' => '',
-                'required'   => false
-            )
+                'required'   => false,
+            ]
         );
     }
 
@@ -48,6 +47,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "lead_dashboard_leads_in_time_widget";
+        return 'lead_dashboard_leads_in_time_widget';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/DashboardLeadsLifetimeWidgetType.php b/app/bundles/LeadBundle/Form/Type/DashboardLeadsLifetimeWidgetType.php
index 6eeb0319aa8..66f14a62e75 100644
--- a/app/bundles/LeadBundle/Form/Type/DashboardLeadsLifetimeWidgetType.php
+++ b/app/bundles/LeadBundle/Form/Type/DashboardLeadsLifetimeWidgetType.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
+use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class DashboardLeadsInTimeWidgetType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class DashboardLeadsInTimeWidgetType.
  */
 class DashboardLeadsLifetimeWidgetType extends AbstractType
 {
@@ -36,23 +35,23 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $model  = $this->factory->getModel('lead.list');
+        $model = $this->factory->getModel('lead.list');
 
-        $lists = $model->getUserLists();
-        $segments = array();
-        $segments[0]= $this->factory->getTranslator()->trans('mautic.lead.all.leads');
+        $lists       = $model->getUserLists();
+        $segments    = [];
+        $segments[0] = $this->factory->getTranslator()->trans('mautic.lead.all.leads');
         foreach ($lists as $list) {
             $segments[$list['id']] = $list['name'];
         }
 
-        $builder->add('flag', 'choice', array(
-                'label'   => 'mautic.lead.list.filter',
+        $builder->add('flag', 'choice', [
+                'label'      => 'mautic.lead.list.filter',
                 'multiple'   => true,
-                'choices' => $segments,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'required'   => false
-            )
+                'choices'    => $segments,
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'required'   => false,
+            ]
         );
     }
 
@@ -61,6 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "lead_dashboard_leads_lifetime_widget";
+        return 'lead_dashboard_leads_lifetime_widget';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/DncType.php b/app/bundles/LeadBundle/Form/Type/DncType.php
index ae8fbfa0f73..80636052222 100644
--- a/app/bundles/LeadBundle/Form/Type/DncType.php
+++ b/app/bundles/LeadBundle/Form/Type/DncType.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\LeadBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
@@ -13,7 +15,6 @@
 
 class DncType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -23,12 +24,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'reason',
             'textarea',
-            array(
+            [
                 'label'      => 'mautic.lead.batch.dnc_reason',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
 
         $builder->add(
@@ -39,18 +40,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'buttons',
             'form_buttons',
-            array(
+            [
                 'apply_text'     => false,
                 'save_text'      => 'mautic.core.form.save',
                 'cancel_onclick' => 'javascript:void(0);',
-                'cancel_attr'    => array(
-                    'data-dismiss' => 'modal'
-                )
-            )
+                'cancel_attr'    => [
+                    'data-dismiss' => 'modal',
+                ],
+            ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -59,6 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "lead_batch_dnc";
+        return 'lead_batch_dnc';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/EmailType.php b/app/bundles/LeadBundle/Form/Type/EmailType.php
index 16a27a6299b..9d4a8a3ac89 100644
--- a/app/bundles/LeadBundle/Form/Type/EmailType.php
+++ b/app/bundles/LeadBundle/Form/Type/EmailType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,13 +18,10 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class EmailType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class EmailType.
  */
 class EmailType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
@@ -40,67 +38,67 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('body' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['body' => 'html']));
 
         $builder->add(
             'subject',
             'text',
-            array(
+            [
                 'label'      => 'mautic.email.subject',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'required'   => false
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'required'   => false,
+            ]
         );
 
-        $user    = $this->factory->getUser();
-        
-        $default = (empty($options['data']['fromname'])) ? $user->getFirstName() . ' ' . $user->getLastName() : $options['data']['fromname'];
+        $user = $this->factory->getUser();
+
+        $default = (empty($options['data']['fromname'])) ? $user->getFirstName().' '.$user->getLastName() : $options['data']['fromname'];
         $builder->add(
-            'fromname', 
-            'text', 
-             array(
-                'label' => 'mautic.lead.email.from_name',
-                'label_attr' => array('class' => 'control-label'),
-                'attr' => array('class' => 'form-control'),
-                'required' => false,
-                'data' => $default
-            )
+            'fromname',
+            'text',
+             [
+                'label'      => 'mautic.lead.email.from_name',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'required'   => false,
+                'data'       => $default,
+            ]
         );
-        
+
         $default = (empty($options['data']['from'])) ? $user->getEmail() : $options['data']['from'];
         $builder->add(
             'from',
             'text',
-            array(
-                'label'      => 'mautic.lead.email.from_email',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'required'   => false,
-                'data'       => $default,
-                'constraints' => array(
-                    new NotBlank(array(
-                        'message' => 'mautic.core.email.required'
-                    )),
-                    new Email(array(
-                        'message' => 'mautic.core.email.required'
-                    )),
-                )
-            )
+            [
+                'label'       => 'mautic.lead.email.from_email',
+                'label_attr'  => ['class' => 'control-label'],
+                'attr'        => ['class' => 'form-control'],
+                'required'    => false,
+                'data'        => $default,
+                'constraints' => [
+                    new NotBlank([
+                        'message' => 'mautic.core.email.required',
+                    ]),
+                    new Email([
+                        'message' => 'mautic.core.email.required',
+                    ]),
+                ],
+            ]
         );
 
         $builder->add(
             'body',
             'textarea',
-            array(
+            [
                 'label'      => 'mautic.email.form.body',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'                => 'form-control editor editor-basic-fullpage editor-builder-tokens editor-email',
                     'data-token-callback'  => 'email:getBuilderTokens',
-                    'data-token-activator' => '{'
-                )
-            )
+                    'data-token-activator' => '{',
+                ],
+            ]
         );
 
         $builder->add('list', 'hidden');
@@ -108,28 +106,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'templates',
             'email_list',
-            array(
+            [
                 'label'      => 'mautic.lead.email.template',
-                'label_attr' => array('class' => 'control-label'),
+                'label_attr' => ['class' => 'control-label'],
                 'required'   => false,
-                'attr'       => array(
+                'attr'       => [
                     'class'    => 'form-control',
-                    'onchange' => 'Mautic.getLeadEmailContent(this)'
-                ),
-                'multiple'   => false
-            )
+                    'onchange' => 'Mautic.getLeadEmailContent(this)',
+                ],
+                'multiple' => false,
+            ]
         );
 
-        $builder->add('buttons', 'form_buttons', array(
-            'apply_text'   => false,
-            'save_text'    => 'mautic.email.send',
-            'save_class'   => 'btn btn-primary',
-            'save_icon'    => 'fa fa-send',
-            'cancel_icon'  => 'fa fa-times'
-        ));
+        $builder->add('buttons', 'form_buttons', [
+            'apply_text'  => false,
+            'save_text'   => 'mautic.email.send',
+            'save_class'  => 'btn btn-primary',
+            'save_icon'   => 'fa fa-send',
+            'cancel_icon' => 'fa fa-times',
+        ]);
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -138,6 +136,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "lead_quickemail";
+        return 'lead_quickemail';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/EntityFieldsBuildFormTrait.php b/app/bundles/LeadBundle/Form/Type/EntityFieldsBuildFormTrait.php
index a3d1db6f92c..30a57223f7f 100644
--- a/app/bundles/LeadBundle/Form/Type/EntityFieldsBuildFormTrait.php
+++ b/app/bundles/LeadBundle/Form/Type/EntityFieldsBuildFormTrait.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
 use Mautic\CoreBundle\Helper\DateTimeHelper;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 trait EntityFieldsBuildFormTrait
 {
-
-    private function getFormFields(FormBuilderInterface $builder, array $options, $object =  'lead')
+    private function getFormFields(FormBuilderInterface $builder, array $options, $object = 'lead')
     {
         $fieldValues = [];
         $isObject    = false;
@@ -29,20 +28,22 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
         $mapped = !$isObject;
 
         foreach ($options['fields'] as $field) {
-            if ($field['isPublished'] === false || $field['object'] !== $object) continue;
-            $attr        = ['class' => 'form-control'];
-            $properties  = $field['properties'];
-            $type        = $field['type'];
-            $required    = ($isObject) ? $field['isRequired'] : false;
-            $alias       = $field['alias'];
-            $group       = $field['group'];
+            if ($field['isPublished'] === false || $field['object'] !== $object) {
+                continue;
+            }
+            $attr       = ['class' => 'form-control'];
+            $properties = $field['properties'];
+            $type       = $field['type'];
+            $required   = ($isObject) ? $field['isRequired'] : false;
+            $alias      = $field['alias'];
+            $group      = $field['group'];
 
             if ($field['isUniqueIdentifer']) {
                 $attr['data-unique-identifier'] = $field['alias'];
             }
 
             if ($isObject) {
-                $value       = (isset($fieldValues[$group][$alias]['value'])) ?
+                $value = (isset($fieldValues[$group][$alias]['value'])) ?
                     $fieldValues[$group][$alias]['value'] : $field['defaultValue'];
             } else {
                 $value = (isset($fieldValues[$alias])) ? $fieldValues[$alias] : '';
@@ -81,7 +82,7 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
                             'mapped'        => $mapped,
                             'constraints'   => $constraints,
                             'precision'     => $properties['precision'],
-                            'rounding_mode' => isset($properties['roundmode']) ? (int) $properties['roundmode'] : 0
+                            'rounding_mode' => isset($properties['roundmode']) ? (int) $properties['roundmode'] : 0,
                         ]
                     );
                     break;
@@ -98,7 +99,7 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
                         'mapped'      => $mapped,
                         'input'       => 'string',
                         'html5'       => false,
-                        'constraints' => $constraints
+                        'constraints' => $constraints,
                     ];
 
                     if ($value) {
@@ -135,7 +136,7 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
                         'attr'        => $attr,
                         'mapped'      => $mapped,
                         'multiple'    => false,
-                        'constraints' => $constraints
+                        'constraints' => $constraints,
                     ];
 
                     $choiceType = 'choice';
@@ -146,7 +147,7 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
                         $typeProperties['multiple'] = ('multiselect' === $type);
                     }
                     if ($type == 'boolean' && !empty($properties['yes']) && !empty($properties['no'])) {
-                        $choiceType              = 'yesno_button_group';
+                        $choiceType                  = 'yesno_button_group';
                         $typeProperties['expanded']  = true;
                         $typeProperties['yes_label'] = $properties['yes'];
                         $typeProperties['no_label']  = $properties['no'];
@@ -156,7 +157,7 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
                             $value = (int) $value;
                         }
                     }
-                    $typeProperties['data'] = $value;
+                    $typeProperties['data']        = $value;
                     $typeProperties['empty_value'] = $emptyValue;
                     $builder->add(
                         $alias,
@@ -187,25 +188,25 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
                         $alias,
                         'choice',
                         [
-                            'choices'     => $choices,
-                            'required'    => $required,
-                            'label'       => $field['label'],
-                            'label_attr'  => ['class' => 'control-label'],
-                            'data'        => $value,
-                            'attr'        => [
+                            'choices'    => $choices,
+                            'required'   => $required,
+                            'label'      => $field['label'],
+                            'label_attr' => ['class' => 'control-label'],
+                            'data'       => $value,
+                            'attr'       => [
                                 'class'            => 'form-control',
-                                'data-placeholder' => $field['label']
+                                'data-placeholder' => $field['label'],
                             ],
                             'mapped'      => $mapped,
                             'multiple'    => false,
                             'expanded'    => false,
-                            'constraints' => $constraints
+                            'constraints' => $constraints,
                         ]
                     );
                     break;
                 default:
                     if ($type == 'lookup') {
-                        $type                = "text";
+                        $type                = 'text';
                         $attr['data-toggle'] = 'field-lookup';
                         $attr['data-target'] = $alias;
 
@@ -223,11 +224,11 @@ private function getFormFields(FormBuilderInterface $builder, array $options, $o
                             'attr'        => $attr,
                             'data'        => $value,
                             'mapped'      => $mapped,
-                            'constraints' => $constraints
+                            'constraints' => $constraints,
                         ]
                     );
                     break;
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/FieldType.php b/app/bundles/LeadBundle/Form/Type/FieldType.php
index 6a678ec4fbb..f3a170910b8 100644
--- a/app/bundles/LeadBundle/Form/Type/FieldType.php
+++ b/app/bundles/LeadBundle/Form/Type/FieldType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,6 +15,7 @@
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Mautic\LeadBundle\Form\DataTransformer\FieldToOrderTransformer;
+use Mautic\LeadBundle\Helper\FormFieldHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -21,16 +23,12 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Mautic\LeadBundle\Helper\FormFieldHelper;
 
 /**
- * Class FieldType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class FieldType.
  */
 class FieldType extends AbstractType
 {
-
     private $translator;
     private $em;
 
@@ -58,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'      => 'mautic.lead.field.label',
                 'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control', 'length' => 50]
+                'attr'       => ['class' => 'form-control', 'length' => 50],
             ]
         );
 
@@ -68,22 +66,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'group',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'core'         => 'mautic.lead.field.group.core',
                     'social'       => 'mautic.lead.field.group.social',
                     'personal'     => 'mautic.lead.field.group.personal',
-                    'professional' => 'mautic.lead.field.group.professional'
+                    'professional' => 'mautic.lead.field.group.professional',
                 ],
-                'attr'        => [
+                'attr' => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.lead.field.form.group.help'
+                    'tooltip' => 'mautic.lead.field.form.group.help',
                 ],
                 'expanded'    => false,
                 'multiple'    => false,
                 'label'       => 'mautic.lead.field.group',
                 'empty_value' => false,
                 'required'    => false,
-                'disabled'    => $disabled
+                'disabled'    => $disabled,
             ]
         );
 
@@ -104,10 +102,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'disabled'    => ($disabled || !$new),
                 'attr'        => [
                     'class'    => 'form-control',
-                    'onchange' => 'Mautic.updateLeadFieldProperties(this.value);'
+                    'onchange' => 'Mautic.updateLeadFieldProperties(this.value);',
                 ],
-                'data'        => $default,
-                'required'    => false
+                'data'     => $default,
+                'required' => false,
             ]
         );
 
@@ -118,7 +116,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'mapped'          => false,
                 'label'           => 'mautic.lead.field.form.properties.select',
                 'option_required' => false,
-                'with_labels'     => true
+                'with_labels'     => true,
             ]
         );
 
@@ -130,7 +128,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
                 'required'   => false,
-                'mapped'     => false
+                'mapped'     => false,
             ]
         );
 
@@ -138,12 +136,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'default_bool_template',
             'yesno_button_group',
             [
-                'label'      => 'mautic.core.defaultvalue',
-                'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control'],
-                'required'   => false,
-                'mapped'     => false,
-                'data'       => '',
+                'label'       => 'mautic.core.defaultvalue',
+                'label_attr'  => ['class' => 'control-label'],
+                'attr'        => ['class' => 'form-control'],
+                'required'    => false,
+                'mapped'      => false,
+                'data'        => '',
                 'empty_value' => ' x ',
             ]
         );
@@ -154,7 +152,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'required'       => false,
                 'allow_add'      => true,
-                'error_bubbling' => false
+                'error_bubbling' => false,
             ]
         );
 
@@ -188,10 +186,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'properties',
                         'sortablelist',
                         [
-                            'required' => false,
-                            'label'    => 'mautic.lead.field.form.properties.select',
+                            'required'    => false,
+                            'label'       => 'mautic.lead.field.form.properties.select',
                             'data'        => $properties,
-                            'with_labels' => true
+                            'with_labels' => true,
                         ]
                     );
                     break;
@@ -218,12 +216,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'defaultValue',
                         'choice',
                         [
-                            'choices'     => $choices,
-                            'label'       => 'mautic.core.defaultvalue',
-                            'label_attr'  => ['class' => 'control-label'],
-                            'attr'        => ['class' => 'form-control'],
-                            'required'    => false,
-                            'data'        => !empty($value),
+                            'choices'    => $choices,
+                            'label'      => 'mautic.core.defaultvalue',
+                            'label_attr' => ['class' => 'control-label'],
+                            'attr'       => ['class' => 'form-control'],
+                            'required'   => false,
+                            'data'       => !empty($value),
                         ]
                     );
                     break;
@@ -271,7 +269,7 @@ function ($object, ExecutionContextInterface $context) {
                                             $context->buildViolation('mautic.lead.datetime.invalid')->addViolation();
                                         }
                                     }
-                                )
+                                ),
                             ];
                             break;
                         case 'date':
@@ -279,7 +277,7 @@ function ($object, ExecutionContextInterface $context) {
                                 new Assert\Callback(
                                     function ($object, ExecutionContextInterface $context) {
                                         if (!empty($object)) {
-                                            $validator  = $context->getValidator();
+                                            $validator = $context->getValidator();
                                             $violations = $validator->validateValue($object, new Assert\Date());
 
                                             if (count($violations) > 0) {
@@ -287,7 +285,7 @@ function ($object, ExecutionContextInterface $context) {
                                             }
                                         }
                                     }
-                                )
+                                ),
                             ];
                             break;
                         case 'time':
@@ -295,7 +293,7 @@ function ($object, ExecutionContextInterface $context) {
                                 new Assert\Callback(
                                     function ($object, ExecutionContextInterface $context) {
                                         if (!empty($object)) {
-                                            $validator  = $context->getValidator();
+                                            $validator = $context->getValidator();
                                             $violations = $validator->validateValue(
                                                 $object,
                                                 new Assert\Regex(['pattern' => '/(2[0-3]|[01][0-9]):([0-5][0-9])/'])
@@ -306,7 +304,7 @@ function ($object, ExecutionContextInterface $context) {
                                             }
                                         }
                                     }
-                                )
+                                ),
                             ];
                             break;
                     }
@@ -319,12 +317,11 @@ function ($object, ExecutionContextInterface $context) {
                             'label_attr'  => ['class' => 'control-label'],
                             'attr'        => ['class' => 'form-control'],
                             'required'    => false,
-                            'constraints' => $constraints
+                            'constraints' => $constraints,
                         ]
                     );
                 break;
             }
-
         };
 
         $builder->addEventListener(
@@ -357,7 +354,7 @@ function (FormEvent $event) use ($formModifier) {
                         return $er->createQueryBuilder('f')
                             ->orderBy('f.order', 'ASC');
                     },
-                    'required'      => false
+                    'required' => false,
                 ]
             )->addModelTransformer($transformer)
         );
@@ -373,8 +370,8 @@ function (FormEvent $event) use ($formModifier) {
                     'length'  => 25,
                     'tooltip' => 'mautic.lead.field.help.alias',
                 ],
-                'required'   => false,
-                'disabled'   => ($disabled || !$new)
+                'required' => false,
+                'disabled' => ($disabled || !$new),
             ]
         );
 
@@ -383,7 +380,7 @@ function (FormEvent $event) use ($formModifier) {
             'yesno_button_group',
             [
                 'disabled' => ($options['data']->getAlias() == 'email'),
-                'data'     => ($options['data']->getAlias() == 'email') ? true : $options['data']->getIsPublished()
+                'data'     => ($options['data']->getAlias() == 'email') ? true : $options['data']->getIsPublished(),
             ]
         );
 
@@ -391,7 +388,7 @@ function (FormEvent $event) use ($formModifier) {
             'isRequired',
             'yesno_button_group',
             [
-                'label' => 'mautic.core.required'
+                'label' => 'mautic.core.required',
             ]
         );
 
@@ -399,7 +396,7 @@ function (FormEvent $event) use ($formModifier) {
             'isVisible',
             'yesno_button_group',
             [
-                'label' => 'mautic.lead.field.form.isvisible'
+                'label' => 'mautic.lead.field.form.isvisible',
             ]
         );
 
@@ -409,7 +406,7 @@ function (FormEvent $event) use ($formModifier) {
             [
                 'label' => 'mautic.lead.field.form.isshortvisible',
                 'attr'  => [
-                    'tooltip' => 'mautic.lead.field.form.isshortvisible.tooltip'
+                    'tooltip' => 'mautic.lead.field.form.isshortvisible.tooltip',
                 ],
             ]
         );
@@ -418,7 +415,7 @@ function (FormEvent $event) use ($formModifier) {
             'isListable',
             'yesno_button_group',
             [
-                'label' => 'mautic.lead.field.form.islistable'
+                'label' => 'mautic.lead.field.form.islistable',
             ]
         );
 
@@ -430,9 +427,9 @@ function (FormEvent $event) use ($formModifier) {
                 'label' => 'mautic.lead.field.form.isuniqueidentifer',
                 'attr'  => [
                     'tooltip'  => 'mautic.lead.field.form.isuniqueidentifer.tooltip',
-                    'onchange' => 'Mautic.displayUniqueIdentifierWarning(this)'
+                    'onchange' => 'Mautic.displayUniqueIdentifierWarning(this)',
                 ],
-                'data'  => (!empty($data))
+                'data' => (!empty($data)),
             ]
         );
 
@@ -442,8 +439,8 @@ function (FormEvent $event) use ($formModifier) {
             [
                 'label' => 'mautic.lead.field.form.ispubliclyupdatable',
                 'attr'  => [
-                    'tooltip' => 'mautic.lead.field.form.ispubliclyupdatable.tooltip'
-                ]
+                    'tooltip' => 'mautic.lead.field.form.ispubliclyupdatable.tooltip',
+                ],
             ]
         );
 
@@ -457,17 +454,17 @@ function (FormEvent $event) use ($formModifier) {
                 'label'       => 'mautic.lead.field.object',
                 'empty_value' => false,
                 'attr'        => [
-                    'class'    => 'form-control'
+                    'class' => 'form-control',
                 ],
-                'required'    => true,
-                'disabled'    => ($disabled || !$new)
+                'required' => true,
+                'disabled' => ($disabled || !$new),
             ]
         );
 
         $builder->add('buttons', 'form_buttons');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -478,7 +475,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
-                'data_class' => 'Mautic\LeadBundle\Entity\LeadField'
+                'data_class' => 'Mautic\LeadBundle\Entity\LeadField',
             ]
         );
     }
@@ -488,6 +485,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getName()
     {
-        return "leadfield";
+        return 'leadfield';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/FilterType.php b/app/bundles/LeadBundle/Form/Type/FilterType.php
index fdb48bf2d32..7fa12949292 100644
--- a/app/bundles/LeadBundle/Form/Type/FilterType.php
+++ b/app/bundles/LeadBundle/Form/Type/FilterType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
-use Mautic\UserBundle\Form\DataTransformer as Transformers;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -22,9 +22,7 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class FilterType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class FilterType.
  */
 class FilterType extends AbstractType
 {
@@ -39,9 +37,9 @@ class FilterType extends AbstractType
     public function __construct(MauticFactory $factory)
     {
         /** @var \Mautic\LeadBundle\Model\ListModel $listModel */
-        $listModel       = $factory->getModel('lead.list');
-        $operatorChoices = $listModel->getFilterExpressionFunctions();
-        $this->operatorChoices = array();
+        $listModel             = $factory->getModel('lead.list');
+        $operatorChoices       = $listModel->getFilterExpressionFunctions();
+        $this->operatorChoices = [];
         foreach ($operatorChoices as $key => $value) {
             if (empty($value['hide'])) {
                 $this->operatorChoices[$key] = $value['label'];
@@ -49,7 +47,7 @@ public function __construct(MauticFactory $factory)
         }
         $this->translator    = $factory->getTranslator();
         $this->currentListId = $factory->getRequest()->attributes->get('objectId', false);
-        $this->factory = $factory;
+        $this->factory       = $factory;
     }
 
     /**
@@ -61,17 +59,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'glue',
             'choice',
-            array(
+            [
                 'label'   => false,
-                'choices' => array(
+                'choices' => [
                     'and' => 'mautic.lead.list.form.glue.and',
-                    'or'  => 'mautic.lead.list.form.glue.or'
-                ),
-                'attr'    => array(
-                    'class' => 'form-control not-chosen glue-select',
-                    'onchange' => 'Mautic.updateFilterPositioning(this)'
-                )
-            )
+                    'or'  => 'mautic.lead.list.form.glue.or',
+                ],
+                'attr' => [
+                    'class'    => 'form-control not-chosen glue-select',
+                    'onchange' => 'Mautic.updateFilterPositioning(this)',
+                ],
+            ]
         );
 
         $translator      = $this->translator;
@@ -85,20 +83,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $fieldType = $data['type'];
             $fieldName = $data['field'];
 
-            $type        = 'text';
-            $attr        = array(
-                'class' => 'form-control'
-            );
+            $type = 'text';
+            $attr = [
+                'class' => 'form-control',
+            ];
             $displayType = 'hidden';
-            $displayAttr = array();
+            $displayAttr = [];
 
-            $customOptions = array();
+            $customOptions = [];
             switch ($fieldType) {
                 case 'leadlist':
                     if (!isset($data['filter'])) {
-                        $data['filter'] = array();
+                        $data['filter'] = [];
                     } elseif (!is_array($data['filter'])) {
-                        $data['filter'] = array($data['filter']);
+                        $data['filter'] = [$data['filter']];
                     }
 
                     // Don't show the current list ID in the choices
@@ -112,9 +110,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     break;
                 case 'lead_email_received':
                     if (!isset($data['filter'])) {
-                        $data['filter'] = array();
+                        $data['filter'] = [];
                     } elseif (!is_array($data['filter'])) {
-                        $data['filter'] = array($data['filter']);
+                        $data['filter'] = [$data['filter']];
                     }
 
                     $customOptions['choices']  = $options['emails'];
@@ -123,26 +121,26 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     break;
                 case 'tags':
                     if (!isset($data['filter'])) {
-                        $data['filter'] = array();
+                        $data['filter'] = [];
                     } elseif (!is_array($data['filter'])) {
-                        $data['filter'] = array($data['filter']);
+                        $data['filter'] = [$data['filter']];
                     }
                     $customOptions['choices']  = $options['tags'];
                     $customOptions['multiple'] = true;
                     $attr                      = array_merge(
                         $attr,
-                        array(
+                        [
                             'data-placeholder'     => $translator->trans('mautic.lead.tags.select_or_create'),
                             'data-no-results-text' => $translator->trans('mautic.lead.tags.enter_to_create'),
                             'data-allow-add'       => 'true',
-                            'onchange'             => 'Mautic.createLeadTag(this)'
-                        )
+                            'onchange'             => 'Mautic.createLeadTag(this)',
+                        ]
                     );
-                    $type                      = 'choice';
+                    $type = 'choice';
                     break;
                 case 'stage':
-                    $customOptions['choices']  = $options['stage'];
-                    $type                      = 'choice';
+                    $customOptions['choices'] = $options['stage'];
+                    $type                     = 'choice';
                     break;
                 case 'timezone':
                 case 'country':
@@ -162,13 +160,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $type                     = 'choice';
                     $customOptions['choices'] = $options[$choiceKey];
 
-                    $customOptions['multiple'] = (in_array($data['operator'], array('in', '!in')));
+                    $customOptions['multiple'] = (in_array($data['operator'], ['in', '!in']));
 
                     if ($customOptions['multiple']) {
-                        array_unshift($customOptions['choices'], array('' => ''));
+                        array_unshift($customOptions['choices'], ['' => '']);
 
                         if (!isset($data['filter'])) {
-                            $data['filter'] = array();
+                            $data['filter'] = [];
                         }
                     }
 
@@ -183,14 +181,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $displayType = 'text';
                     $displayAttr = array_merge(
                         $displayAttr,
-                        array(
+                        [
                             'class'       => 'form-control',
                             'data-toggle' => 'field-lookup',
                             'data-target' => $data['field'],
                             'placeholder' => $translator->trans(
                                 'mautic.lead.list.form.filtervalue'
-                            )
-                        )
+                            ),
+                        ]
                     );
 
                     if (isset($options['fields'][$fieldName]['properties']['list'])) {
@@ -203,30 +201,30 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $type = 'choice';
                     $attr = array_merge(
                         $attr,
-                        array(
-                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue')
-                        )
+                        [
+                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
+                        ]
                     );
 
-                    if (in_array($data['operator'], array('in', '!in'))) {
+                    if (in_array($data['operator'], ['in', '!in'])) {
                         $customOptions['multiple'] = true;
                         if (!isset($data['filter'])) {
-                            $data['filter'] = array();
+                            $data['filter'] = [];
                         } elseif (!is_array($data['filter'])) {
-                            $data['filter'] = array($data['filter']);
+                            $data['filter'] = [$data['filter']];
                         }
                     }
-                    $fields = (isset($options['fields']['lead']))?$options['fields']['lead']: [];
-                    $fields[] = (isset($options['fields']['company']))?$options['fields']['company']: [];
-
-                    $list = $options['fields'][$fieldName]['properties']['list'];
+                    $fields   = (isset($options['fields']['lead'])) ? $options['fields']['lead'] : [];
+                    $fields[] = (isset($options['fields']['company'])) ? $options['fields']['company'] : [];
+die(var_dump($options['fields']));
+                    $list    = $options['fields'][$fieldName]['properties']['list'];
                     $choices = FormFieldHelper::parseList($list);
 
                     if ($fieldType == 'select') {
                         // array_unshift cannot be used because numeric values get lost as keys
-                        $choices = array_reverse($choices, true);
+                        $choices     = array_reverse($choices, true);
                         $choices[''] = '';
-                        $choices = array_reverse($choices, true);
+                        $choices     = array_reverse($choices, true);
                     }
 
                     $customOptions['choices'] = $choices;
@@ -235,11 +233,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 default:
                     $attr = array_merge(
                         $attr,
-                        array(
+                        [
                             'data-toggle' => 'field-lookup',
                             'data-target' => $data['field'],
-                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue')
-                        )
+                            'placeholder' => $translator->trans('mautic.lead.list.form.filtervalue'),
+                        ]
                     );
 
                     if (isset($options['fields'][$fieldName]['properties']['list'])) {
@@ -249,43 +247,43 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     break;
             }
 
-            if (in_array($data['operator'], array('empty', '!empty'))) {
+            if (in_array($data['operator'], ['empty', '!empty'])) {
                 $attr['disabled'] = 'disabled';
             } else {
-                $customOptions['constraints'] = array(
+                $customOptions['constraints'] = [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                );
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ];
             }
 
             // @todo implement in UI
-            if (in_array($data['operator'], array('between', '!between'))) {
+            if (in_array($data['operator'], ['between', '!between'])) {
                 $form->add(
                     'filter',
                     'collection',
-                    array(
+                    [
                         'type'    => $type,
-                        'options' => array(
+                        'options' => [
                             'label' => false,
-                            'attr'  => $attr
-                        ),
-                        'label'   => false
-                    )
+                            'attr'  => $attr,
+                        ],
+                        'label' => false,
+                    ]
                 );
             } else {
                 $form->add(
                     'filter',
                     $type,
                     array_merge(
-                        array(
+                        [
                             'label'          => false,
                             'attr'           => $attr,
                             'data'           => isset($data['filter']) ? $data['filter'] : '',
                             'error_bubbling' => false,
-                        ),
+                        ],
                         $customOptions
                     )
                 );
@@ -294,12 +292,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $form->add(
                 'display',
                 $displayType,
-                array(
+                [
                     'label'          => false,
                     'attr'           => $displayAttr,
                     'data'           => $data['display'],
-                    'error_bubbling' => false
-                )
+                    'error_bubbling' => false,
+                ]
             );
 
             $choices = $operatorChoices;
@@ -314,14 +312,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $form->add(
                 'operator',
                 'choice',
-                array(
+                [
                     'label'   => false,
                     'choices' => $choices,
-                    'attr'    => array(
+                    'attr'    => [
                         'class'    => 'form-control not-chosen',
-                        'onchange' => 'Mautic.convertLeadFilterInput(this)'
-                    )
-                )
+                        'onchange' => 'Mautic.convertLeadFilterInput(this)',
+                    ],
+                ]
             );
 
             if ($eventName == FormEvents::PRE_SUBMIT) {
@@ -356,7 +354,7 @@ function (FormEvent $event) use ($formModifier) {
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setRequired(
-            array(
+            [
                 'timezones',
                 'countries',
                 'regions',
@@ -364,15 +362,15 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'lists',
                 'emails',
                 'tags',
-                'stage'
-            )
+                'stage',
+            ]
         );
 
         $resolver->setDefaults(
-            array(
+            [
                 'label'          => false,
-                'error_bubbling' => false
-            )
+                'error_bubbling' => false,
+            ]
         );
     }
 
@@ -389,6 +387,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function getName()
     {
-        return "leadlist_filter";
+        return 'leadlist_filter';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/FormSubmitActionPointsChangeType.php b/app/bundles/LeadBundle/Form/Type/FormSubmitActionPointsChangeType.php
index 024bf054ad8..b82c742cfc0 100644
--- a/app/bundles/LeadBundle/Form/Type/FormSubmitActionPointsChangeType.php
+++ b/app/bundles/LeadBundle/Form/Type/FormSubmitActionPointsChangeType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,56 +13,55 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class FormSubmitActionPointsChangeType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class FormSubmitActionPointsChangeType.
  */
 class FormSubmitActionPointsChangeType extends AbstractType
 {
     private $factory;
 
     /**
-     * @param MauticFactory       $factory
+     * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
-        $this->factory    = $factory;
+    public function __construct(MauticFactory $factory)
+    {
+        $this->factory = $factory;
     }
 
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('operator', 'choice', array(
+        $builder->add('operator', 'choice', [
             'label'      => 'mautic.lead.lead.submitaction.operator',
-            'attr'       => array('class' => 'form-control'),
-            'label_attr' => array('class' => 'control-label'),
-            'choices' => array(
+            'attr'       => ['class' => 'form-control'],
+            'label_attr' => ['class' => 'control-label'],
+            'choices'    => [
                 'plus'   => 'mautic.lead.lead.submitaction.operator_plus',
                 'minus'  => 'mautic.lead.lead.submitaction.operator_minus',
                 'times'  => 'mautic.lead.lead.submitaction.operator_times',
-                'divide' => 'mautic.lead.lead.submitaction.operator_divide'
-            )
-        ));
+                'divide' => 'mautic.lead.lead.submitaction.operator_divide',
+            ],
+        ]);
 
         $default = (empty($options['data']['points'])) ? 0 : (int) $options['data']['points'];
-        $builder->add('points', 'number', array(
+        $builder->add('points', 'number', [
             'label'      => 'mautic.lead.lead.submitaction.points',
-            'attr'       => array('class' => 'form-control'),
-            'label_attr' => array('class' => 'control-label'),
+            'attr'       => ['class' => 'form-control'],
+            'label_attr' => ['class' => 'control-label'],
             'precision'  => 0,
-            'data'       => $default
-        ));
+            'data'       => $default,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "lead_submitaction_pointschange";
+    public function getName()
+    {
+        return 'lead_submitaction_pointschange';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/LeadFieldsType.php b/app/bundles/LeadBundle/Form/Type/LeadFieldsType.php
index e531c783fbf..dd4f420c877 100644
--- a/app/bundles/LeadBundle/Form/Type/LeadFieldsType.php
+++ b/app/bundles/LeadBundle/Form/Type/LeadFieldsType.php
@@ -1,34 +1,32 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\DataTransformer\StringToDatetimeTransformer;
-use Mautic\UserBundle\Form\DataTransformer as Transformers;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class LeadFieldsType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class LeadFieldsType.
  */
 class LeadFieldsType extends AbstractType
 {
     private $model;
 
     /**
-     * @param MauticFactory       $factory
+     * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->model = $factory->getModel('lead.field');
     }
 
@@ -39,18 +37,19 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         /** @var \Mautic\LeadBundle\Model\FieldModel $model */
         $model = $this->model;
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'choices' => function (Options $options) use ($model) {
                 $fieldList = $model->getFieldList();
                 if ($options['with_tags']) {
                     $fieldList['Core']['tags'] = 'mautic.lead.field.tags';
                 }
+
                 return $fieldList;
             },
             'global_only' => false,
             'required'    => false,
-            'with_tags'   => false
-        ));
+            'with_tags'   => false,
+        ]);
     }
 
     /**
@@ -64,7 +63,8 @@ public function getParent()
     /**
      * @return string
      */
-    public function getName() {
-        return "leadfields_choices";
+    public function getName()
+    {
+        return 'leadfields_choices';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/LeadImportFieldType.php b/app/bundles/LeadBundle/Form/Type/LeadImportFieldType.php
index 417dfefffec..2d1375720b1 100644
--- a/app/bundles/LeadBundle/Form/Type/LeadImportFieldType.php
+++ b/app/bundles/LeadBundle/Form/Type/LeadImportFieldType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class LeadImportFieldType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class LeadImportFieldType.
  */
 class LeadImportFieldType extends AbstractType
 {
-
     private $factory;
 
     /**
@@ -42,147 +40,147 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add(
                 $field,
                 'choice',
-                array(
+                [
                     'choices'    => $options['import_fields'],
                     'label'      => $label,
                     'required'   => false,
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array('class' => 'form-control'),
-                    'data'       => $this->getDefaultValue($field, $options['import_fields'])
-                )
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => ['class' => 'form-control'],
+                    'data'       => $this->getDefaultValue($field, $options['import_fields']),
+                ]
             );
         }
 
-        $properties = $builder->create('properties', 'form', array('virtual' => true));
+        $properties = $builder->create('properties', 'form', ['virtual' => true]);
 
         $properties->add(
             'dateAdded',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.dateAdded',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('dateAdded', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('dateAdded', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'createdByUser',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.createdByUser',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('createdByUser', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('createdByUser', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'dateModified',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.dateModified',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('dateModified', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('dateModified', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'modifiedByUser',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.modifiedByUser',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('modifiedByUser', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('modifiedByUser', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'lastActive',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.lastActive',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('lastActive', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('lastActive', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'dateIdentified',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.dateIdentified',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('dateIdentified', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('dateIdentified', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'ip',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.ip',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('ip', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('ip', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'points',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.points',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('points', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('points', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'stage',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.stage',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('stage', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('stage', $options['import_fields']),
+            ]
         );
 
         $properties->add(
             'doNotEmail',
             'choice',
-            array(
+            [
                 'choices'    => $options['import_fields'],
                 'label'      => 'mautic.lead.import.label.doNotEmail',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'data'       => $this->getDefaultValue('doNotEmail', $options['import_fields'])
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'data'       => $this->getDefaultValue('doNotEmail', $options['import_fields']),
+            ]
         );
 
         $builder->add($properties);
@@ -196,15 +194,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->create(
                 'owner',
                 'user_list',
-                array(
+                [
                     'label'      => 'mautic.lead.lead.field.owner',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
-                        'class' => 'form-control'
-                    ),
-                    'required'   => false,
-                    'multiple'   => false
-                )
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
+                        'class' => 'form-control',
+                    ],
+                    'required' => false,
+                    'multiple' => false,
+                ]
             )
                 ->addModelTransformer($transformer)
         );
@@ -213,47 +211,46 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->create(
                 'list',
                 'leadlist_choices',
-                array(
+                [
                     'label'      => 'mautic.lead.lead.field.list',
-                    'label_attr' => array('class' => 'control-label'),
-                    'attr'       => array(
-                        'class' => 'form-control'
-                    ),
-                    'required'   => false,
-                    'multiple'   => false
-                )
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
+                        'class' => 'form-control',
+                    ],
+                    'required' => false,
+                    'multiple' => false,
+                ]
             )
         );
 
         $builder->add(
             'tags',
             'lead_tag',
-            array(
+            [
                 'label'      => 'mautic.lead.tags',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'                => 'form-control',
                     'data-placeholder'     => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
                     'data-no-results-text' => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
                     'data-allow-add'       => 'true',
-                    'onchange'             => 'Mautic.createLeadTag(this)'
-                )
-            )
+                    'onchange'             => 'Mautic.createLeadTag(this)',
+                ],
+            ]
         );
 
         $builder->add(
             'buttons',
             'form_buttons',
-            array(
+            [
                 'apply_text'  => false,
                 'save_text'   => 'mautic.lead.import.start',
                 'save_class'  => 'btn btn-primary',
                 'save_icon'   => 'fa fa-user-plus',
-                'cancel_icon' => 'fa fa-times'
-            )
+                'cancel_icon' => 'fa fa-times',
+            ]
         );
-
     }
 
     /**
@@ -261,21 +258,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array('lead_fields', 'import_fields'));
+        $resolver->setRequired(['lead_fields', 'import_fields']);
     }
 
-
     /**
      * @return string
      */
     public function getName()
     {
-        return "lead_field_import";
+        return 'lead_field_import';
     }
 
     /**
-     * @param  string $fieldName
-     * @param  array  $importFields
+     * @param string $fieldName
+     * @param array  $importFields
      *
      * @return string
      */
diff --git a/app/bundles/LeadBundle/Form/Type/LeadImportType.php b/app/bundles/LeadBundle/Form/Type/LeadImportType.php
index 3d017b34c31..37aac441574 100644
--- a/app/bundles/LeadBundle/Form/Type/LeadImportType.php
+++ b/app/bundles/LeadBundle/Form/Type/LeadImportType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,93 +14,90 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class LeadImportType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class LeadImportType.
  */
 class LeadImportType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('file', 'file', array(
+        $builder->add('file', 'file', [
             'label' => 'mautic.lead.import.file',
-            'attr'  => array(
+            'attr'  => [
                 'accept' => '.csv',
-                'class' => 'form-control'
-            )
-        ));
+                'class'  => 'form-control',
+            ],
+        ]);
 
-        $constraints = array(
+        $constraints = [
             new \Symfony\Component\Validator\Constraints\NotBlank(
-                array('message' => 'mautic.core.value.required')
-            )
-        );
-
-        $default = (empty($options['data']['delimiter'])) ? "," : htmlspecialchars($options['data']['delimiter']);
-        $builder->add('delimiter', 'text', array(
-            'label'       => 'mautic.lead.import.delimiter',
-            'attr'        => array(
-                'class' => 'form-control'
+                ['message' => 'mautic.core.value.required']
             ),
+        ];
+
+        $default = (empty($options['data']['delimiter'])) ? ',' : htmlspecialchars($options['data']['delimiter']);
+        $builder->add('delimiter', 'text', [
+            'label' => 'mautic.lead.import.delimiter',
+            'attr'  => [
+                'class' => 'form-control',
+            ],
             'data'        => $default,
-            'constraints' => $constraints
-        ));
+            'constraints' => $constraints,
+        ]);
 
         $default = (empty($options['data']['enclosure'])) ? '&quot;' : htmlspecialchars($options['data']['enclosure']);
-        $builder->add('enclosure', 'text', array(
-            'label'       => 'mautic.lead.import.enclosure',
-            'attr'        => array(
-                'class' => 'form-control'
-            ),
+        $builder->add('enclosure', 'text', [
+            'label' => 'mautic.lead.import.enclosure',
+            'attr'  => [
+                'class' => 'form-control',
+            ],
             'data'        => $default,
-            'constraints' => $constraints
-        ));
+            'constraints' => $constraints,
+        ]);
 
         $default = (empty($options['data']['escape'])) ? '\\' : $options['data']['escape'];
-        $builder->add('escape', 'text', array(
-            'label'       => 'mautic.lead.import.escape',
-            'attr'        => array(
-                'class' => 'form-control'
-            ),
+        $builder->add('escape', 'text', [
+            'label' => 'mautic.lead.import.escape',
+            'attr'  => [
+                'class' => 'form-control',
+            ],
             'data'        => $default,
-            'constraints' => $constraints
-        ));
+            'constraints' => $constraints,
+        ]);
 
         $default = (empty($options['data']['batchlimit'])) ? 100 : (int) $options['data']['batchlimit'];
-        $builder->add('batchlimit', 'text', array(
-            'label'       => 'mautic.lead.import.batchlimit',
-            'attr'        => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.lead.import.batchlimit_tooltip'
-            ),
+        $builder->add('batchlimit', 'text', [
+            'label' => 'mautic.lead.import.batchlimit',
+            'attr'  => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.lead.import.batchlimit_tooltip',
+            ],
             'data'        => $default,
-            'constraints' => $constraints
-        ));
+            'constraints' => $constraints,
+        ]);
 
-        $builder->add('start', 'submit', array(
-            'attr'  => array(
+        $builder->add('start', 'submit', [
+            'attr' => [
                 'class'   => 'btn btn-primary',
                 'icon'    => 'fa fa-upload',
-                'onclick' => "mQuery(this).prop('disabled', true); mQuery('form[name=\'lead_import\']').submit();"
-            ),
-            'label' => 'mautic.lead.import.upload'
-        ));
+                'onclick' => "mQuery(this).prop('disabled', true); mQuery('form[name=\'lead_import\']').submit();",
+            ],
+            'label' => 'mautic.lead.import.upload',
+        ]);
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "lead_import";
+        return 'lead_import';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/LeadListType.php b/app/bundles/LeadBundle/Form/Type/LeadListType.php
index 3df1dfc5dfe..9317934faaa 100644
--- a/app/bundles/LeadBundle/Form/Type/LeadListType.php
+++ b/app/bundles/LeadBundle/Form/Type/LeadListType.php
@@ -1,34 +1,32 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\DataTransformer\StringToDatetimeTransformer;
-use Mautic\UserBundle\Form\DataTransformer as Transformers;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class LeadListType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class LeadListType.
  */
 class LeadListType extends AbstractType
 {
     private $model;
 
     /**
-     * @param MauticFactory       $factory
+     * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->model = $factory->getModel('lead.list');
     }
 
@@ -39,11 +37,11 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         /** @var \Mautic\LeadBundle\Model\ListModel $model */
         $model = $this->model;
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'choices' => function (Options $options) use ($model) {
                 $lists = (empty($options['global_only'])) ? $model->getUserLists() : $model->getGlobalLists();
 
-                $choices = array();
+                $choices = [];
                 foreach ($lists as $l) {
                     $choices[$l['id']] = $l['name'];
                 }
@@ -51,8 +49,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 return $choices;
             },
             'global_only' => false,
-            'required'    => false
-        ));
+            'required'    => false,
+        ]);
     }
 
     /**
@@ -66,7 +64,8 @@ public function getParent()
     /**
      * @return string
      */
-    public function getName() {
-        return "leadlist_choices";
+    public function getName()
+    {
+        return 'leadlist_choices';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/LeadType.php b/app/bundles/LeadBundle/Form/Type/LeadType.php
index 26fc1107441..abbeaf65f17 100644
--- a/app/bundles/LeadBundle/Form/Type/LeadType.php
+++ b/app/bundles/LeadBundle/Form/Type/LeadType.php
@@ -1,35 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\LeadBundle\Form\Type\EntityFieldsBuildFormTrait;
 use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
-use Mautic\CoreBundle\Form\DataTransformer\StringToDatetimeTransformer;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
-use Mautic\LeadBundle\Model\CompanyModel;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Helper\FormFieldHelper;
-use Mautic\UserBundle\Form\DataTransformer as Transformers;
+use Mautic\LeadBundle\Model\CompanyModel;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\File;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class LeadType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class LeadType.
  */
 class LeadType extends AbstractType
 {
@@ -44,8 +37,8 @@ class LeadType extends AbstractType
      */
     public function __construct(MauticFactory $factory, CompanyModel $companyModel)
     {
-        $this->translator = $factory->getTranslator();
-        $this->factory    = $factory;
+        $this->translator   = $factory->getTranslator();
+        $this->factory      = $factory;
         $this->companyModel = $companyModel;
     }
 
@@ -61,7 +54,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         if (!$options['isShortForm']) {
             $imageChoices = [
                 'gravatar' => 'Gravatar',
-                'custom'   => 'mautic.lead.lead.field.custom_avatar'
+                'custom'   => 'mautic.lead.lead.field.custom_avatar',
             ];
 
             $cache = $options['data']->getSocialCache();
@@ -81,8 +74,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'required'   => true,
                     'multiple'   => false,
                     'attr'       => [
-                        'class' => 'form-control'
-                    ]
+                        'class' => 'form-control',
+                    ],
                 ]
             );
 
@@ -94,21 +87,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label_attr' => ['class' => 'control-label'],
                     'required'   => false,
                     'attr'       => [
-                        'class' => 'form-control'
+                        'class' => 'form-control',
                     ],
-                    'mapped'     => false,
+                    'mapped'      => false,
                     'constraints' => [
                         new File(
                             [
                                 'mimeTypes' => [
                                     'image/gif',
                                     'image/jpeg',
-                                    'image/png'
+                                    'image/png',
                                 ],
-                                'mimeTypesMessage' => 'mautic.lead.avatar.types_invalid'
+                                'mimeTypesMessage' => 'mautic.lead.avatar.types_invalid',
                             ]
-                        )
-                    ]
+                        ),
+                    ],
                 ]
             );
         }
@@ -121,17 +114,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'by_reference' => false,
                 'attr'         => [
-                    'data-placeholder'      => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
-                    'data-no-results-text'  => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
-                    'data-allow-add'        => 'true',
-                    'onchange'              => 'Mautic.createLeadTag(this)'
-                ]
+                    'data-placeholder'     => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
+                    'data-no-results-text' => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
+                    'data-allow-add'       => 'true',
+                    'onchange'             => 'Mautic.createLeadTag(this)',
+                ],
             ]
         );
 
         $companyLeadRepo = $this->companyModel->getCompanyLeadRepository();
-        $companies = $companyLeadRepo->getCompaniesByLeadId($options['data']->getId());
-        $leadCompanies = [];
+        $companies       = $companyLeadRepo->getCompaniesByLeadId($options['data']->getId());
+        $leadCompanies   = [];
         foreach ($companies as $company) {
             $leadCompanies[$company['company_id']] = $company['company_id'];
         }
@@ -140,16 +133,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         'companies',
             'company_list',
             [
-                'label'       => 'mautic.company.selectcompany',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                        'class'    => 'form-control',
-                        'tooltip'  => 'mautic.company.choose.company_descr',
+                'label'      => 'mautic.company.selectcompany',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.company.choose.company_descr',
                      ],
-                'multiple'    => true,
-                'required'    => false,
-                'mapped'     => false,
-                'data'      => $leadCompanies
+                'multiple' => true,
+                'required' => false,
+                'mapped'   => false,
+                'data'     => $leadCompanies,
             ]
         );
 
@@ -166,10 +159,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.lead.lead.field.owner',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
-                        'class' => 'form-control'
+                        'class' => 'form-control',
                     ],
-                    'required'   => false,
-                    'multiple'   => false
+                    'required' => false,
+                    'multiple' => false,
                 ]
             )
             ->addModelTransformer($transformer)
@@ -188,10 +181,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.lead.lead.field.stage',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => [
-                        'class' => 'form-control'
+                        'class' => 'form-control',
                     ],
-                    'required'   => false,
-                    'multiple'   => false
+                    'required' => false,
+                    'multiple' => false,
                 ]
             )
                 ->addModelTransformer($transformer)
@@ -205,13 +198,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'form_buttons',
                 [
                     'apply_text' => false,
-                    'save_text'  => 'mautic.core.form.save'
+                    'save_text'  => 'mautic.core.form.save',
                 ]
             );
         }
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -223,7 +216,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(
             [
                 'data_class'  => 'Mautic\LeadBundle\Entity\Lead',
-                'isShortForm' => false
+                'isShortForm' => false,
             ]
         );
 
@@ -235,6 +228,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "lead";
+        return 'lead';
     }
 }
diff --git a/app/bundles/LeadBundle/Form/Type/ListActionType.php b/app/bundles/LeadBundle/Form/Type/ListActionType.php
index 4ec02488951..85a253a77de 100644
--- a/app/bundles/LeadBundle/Form/Type/ListActionType.php
+++ b/app/bundles/LeadBundle/Form/Type/ListActionType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,44 +14,42 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class ListActionType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class ListActionType.
  */
 class ListActionType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('addToLists', 'leadlist_choices', array(
+        $builder->add('addToLists', 'leadlist_choices', [
             'label'      => 'mautic.lead.lead.events.addtolists',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'       => 'form-control'
-            ),
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
             'multiple' => true,
-            'expanded' => false
-        ));
+            'expanded' => false,
+        ]);
 
-        $builder->add('removeFromLists', 'leadlist_choices', array(
+        $builder->add('removeFromLists', 'leadlist_choices', [
             'label'      => 'mautic.lead.lead.events.removefromlists',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'       => 'form-control'
-            ),
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
             'multiple' => true,
-            'expanded' => false
-        ));
+            'expanded' => false,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "leadlist_action";
+    public function getName()
+    {
+        return 'leadlist_action';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/ListTriggerType.php b/app/bundles/LeadBundle/Form/Type/ListTriggerType.php
index f7e55000a16..892ed97babb 100644
--- a/app/bundles/LeadBundle/Form/Type/ListTriggerType.php
+++ b/app/bundles/LeadBundle/Form/Type/ListTriggerType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,44 +14,42 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class ListTriggerType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class ListTriggerType.
  */
 class ListTriggerType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('addedTo', 'leadlist_choices', array(
+        $builder->add('addedTo', 'leadlist_choices', [
             'label'      => 'mautic.lead.lead.events.listtrigger.added',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'       => 'form-control'
-            ),
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
             'multiple' => true,
-            'expanded' => false
-        ));
+            'expanded' => false,
+        ]);
 
-        $builder->add('removedFrom', 'leadlist_choices', array(
+        $builder->add('removedFrom', 'leadlist_choices', [
             'label'      => 'mautic.lead.lead.events.listtrigger.removed',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'       => 'form-control'
-            ),
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
             'multiple' => true,
-            'expanded' => false
-        ));
+            'expanded' => false,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "leadlist_trigger";
+    public function getName()
+    {
+        return 'leadlist_trigger';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/ListType.php b/app/bundles/LeadBundle/Form/Type/ListType.php
index df229de6918..e46698adbdc 100644
--- a/app/bundles/LeadBundle/Form/Type/ListType.php
+++ b/app/bundles/LeadBundle/Form/Type/ListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,6 @@
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Mautic\LeadBundle\Form\DataTransformer\FieldFilterTransformer;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
-use Mautic\UserBundle\Form\DataTransformer as Transformers;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
@@ -22,23 +22,20 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ListType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class ListType.
  */
 class ListType extends AbstractType
 {
-
     private $translator;
-    private $fieldChoices = [];
+    private $fieldChoices    = [];
     private $timezoneChoices = [];
-    private $countryChoices = [];
-    private $regionChoices = [];
-    private $listChoices = [];
-    private $emailChoices = [];
-    private $tagChoices = [];
-    private $stageChoices = [];
-    private $localeChoices = [];
+    private $countryChoices  = [];
+    private $regionChoices   = [];
+    private $listChoices     = [];
+    private $emailChoices    = [];
+    private $tagChoices      = [];
+    private $stageChoices    = [];
+    private $localeChoices   = [];
 
     /**
      * @param MauticFactory $factory
@@ -101,7 +98,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'      => 'mautic.core.name',
                 'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control']
+                'attr'       => ['class' => 'form-control'],
             ]
         );
 
@@ -114,9 +111,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'   => 'form-control',
                     'length'  => 25,
-                    'tooltip' => 'mautic.lead.list.help.alias'
+                    'tooltip' => 'mautic.lead.list.help.alias',
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -127,7 +124,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.core.description',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control editor'],
-                'required'   => false
+                'required'   => false,
             ]
         );
 
@@ -135,7 +132,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'isGlobal',
             'yesno_button_group',
             [
-                'label' => 'mautic.lead.list.form.isglobal'
+                'label' => 'mautic.lead.list.form.isglobal',
             ]
         );
 
@@ -147,8 +144,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'filters',
                 'collection',
                 [
-                    'type'           => 'leadlist_filter',
-                    'options'        => [
+                    'type'    => 'leadlist_filter',
+                    'options' => [
                         'label'     => false,
                         'timezones' => $this->timezoneChoices,
                         'countries' => $this->countryChoices,
@@ -157,21 +154,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'lists'     => $this->listChoices,
                         'emails'    => $this->emailChoices,
                         'tags'      => $this->tagChoices,
-                        'stage'     => $this->stageChoices
+                        'stage'     => $this->stageChoices,
                     ],
                     'error_bubbling' => false,
                     'mapped'         => true,
                     'allow_add'      => true,
                     'allow_delete'   => true,
-                    'label'          => false
+                    'label'          => false,
                 ]
             )->addModelTransformer($filterModalTransformer)
         );
 
         $builder->add('buttons', 'form_buttons');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -182,7 +179,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(
             [
-                'data_class' => 'Mautic\LeadBundle\Entity\LeadList'
+                'data_class' => 'Mautic\LeadBundle\Entity\LeadList',
             ]
         );
     }
@@ -208,6 +205,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function getName()
     {
-        return "leadlist";
+        return 'leadlist';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/MergeType.php b/app/bundles/LeadBundle/Form/Type/MergeType.php
index 080d0ef110d..ecc71cfc066 100644
--- a/app/bundles/LeadBundle/Form/Type/MergeType.php
+++ b/app/bundles/LeadBundle/Form/Type/MergeType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,13 +16,10 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class MergeType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class MergeType.
  */
 class MergeType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -31,38 +29,38 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'lead_to_merge',
             'choice',
-            array(
+            [
                 'choices'     => $options['leads'],
                 'label'       => 'mautic.lead.merge.select',
-                'label_attr'  => array('class' => 'control-label'),
+                'label_attr'  => ['class' => 'control-label'],
                 'multiple'    => false,
                 'empty_value' => '',
-                'attr'        => array(
-                    'class' => 'form-control',
-                    'tooltip' => 'mautic.lead.merge.select.modal.tooltip'
-                ),
-                'constraints' => array(
+                'attr'        => [
+                    'class'   => 'form-control',
+                    'tooltip' => 'mautic.lead.merge.select.modal.tooltip',
+                ],
+                'constraints' => [
                     new NotBlank(
-                        array(
-                            'message' => 'mautic.core.value.required'
-                        )
-                    )
-                )
-            )
+                        [
+                            'message' => 'mautic.core.value.required',
+                        ]
+                    ),
+                ],
+            ]
         );
 
         $builder->add(
             'buttons',
             'form_buttons',
-            array(
+            [
                 'apply_text' => false,
                 'save_text'  => 'mautic.lead.merge',
-                'save_icon'  => 'fa fa-user'
-            )
+                'save_icon'  => 'fa fa-user',
+            ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -71,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array('leads'));
+        $resolver->setRequired(['leads']);
     }
 
     /**
@@ -79,6 +77,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "lead_merge";
+        return 'lead_merge';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/ModifyLeadTagsType.php b/app/bundles/LeadBundle/Form/Type/ModifyLeadTagsType.php
index 0e097c10c45..af0bf9b0c85 100644
--- a/app/bundles/LeadBundle/Form/Type/ModifyLeadTagsType.php
+++ b/app/bundles/LeadBundle/Form/Type/ModifyLeadTagsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -32,38 +33,38 @@ public function __construct(MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add(
             'add_tags',
             'lead_tag',
-            array(
+            [
                 'label' => 'mautic.lead.tags.add',
-                'attr' => array(
-                    'data-placeholder'      => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
-                    'data-no-results-text'  => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
-                    'data-allow-add'        => 'true',
-                    'onchange'              => 'Mautic.createLeadTag(this)'
-                ),
-                'data' => (isset($options['data']['add_tags'])) ? $options['data']['add_tags'] : null,
-                'add_transformer' => true
-            )
+                'attr'  => [
+                    'data-placeholder'     => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
+                    'data-no-results-text' => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
+                    'data-allow-add'       => 'true',
+                    'onchange'             => 'Mautic.createLeadTag(this)',
+                ],
+                'data'            => (isset($options['data']['add_tags'])) ? $options['data']['add_tags'] : null,
+                'add_transformer' => true,
+            ]
         );
 
         $builder->add(
             'remove_tags',
             'lead_tag',
-            array(
+            [
                 'label' => 'mautic.lead.tags.remove',
-                'attr' => array(
-                    'data-placeholder'      => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
-                    'data-no-results-text'  => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
-                    'data-allow-add'        => 'true',
-                    'onchange'              => 'Mautic.createLeadTag(this)'
-                ),
-                'data' => (isset($options['data']['remove_tags'])) ? $options['data']['remove_tags'] : null,
-                'add_transformer' => true
-            )
+                'attr'  => [
+                    'data-placeholder'     => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
+                    'data-no-results-text' => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
+                    'data-allow-add'       => 'true',
+                    'onchange'             => 'Mautic.createLeadTag(this)',
+                ],
+                'data'            => (isset($options['data']['remove_tags'])) ? $options['data']['remove_tags'] : null,
+                'add_transformer' => true,
+            ]
         );
     }
 
@@ -74,4 +75,4 @@ public function getName()
     {
         return 'modify_lead_tags';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/NoteType.php b/app/bundles/LeadBundle/Form/Type/NoteType.php
index 7684a257389..6c9572ffbda 100644
--- a/app/bundles/LeadBundle/Form/Type/NoteType.php
+++ b/app/bundles/LeadBundle/Form/Type/NoteType.php
@@ -1,32 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Type;
 
-use Doctrine\ORM\EntityRepository;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
 // use Mautic\LeadBundle\Helper\FormFieldHelper;
 
 /**
- * Class NoteType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class NoteType.
  */
 class NoteType extends AbstractType
 {
-
     private $translator;
     private $em;
     private $dateHelper;
@@ -34,7 +31,7 @@ class NoteType extends AbstractType
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->translator = $factory->getTranslator();
         $this->em         = $factory->getEntityManager();
@@ -45,70 +42,70 @@ public function __construct (MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('text' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['text' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('lead.note', $options));
 
-        $builder->add('text', 'textarea', array(
+        $builder->add('text', 'textarea', [
             'label'      => 'mautic.lead.note.form.text',
-            'label_attr' => array('class' => 'control-label sr-only'),
-            'attr'       => array('class' => 'mousetrap form-control editor', 'rows' => 10, 'autofocus' => 'autofocus')
-        ));
+            'label_attr' => ['class' => 'control-label sr-only'],
+            'attr'       => ['class' => 'mousetrap form-control editor', 'rows' => 10, 'autofocus' => 'autofocus'],
+        ]);
 
-        $builder->add('type', 'choice', array(
-            'label'      => 'mautic.lead.note.form.type',
-            'choices'    => array(
+        $builder->add('type', 'choice', [
+            'label'   => 'mautic.lead.note.form.type',
+            'choices' => [
                 'general' => 'mautic.lead.note.type.general',
                 'email'   => 'mautic.lead.note.type.email',
                 'call'    => 'mautic.lead.note.type.call',
                 'meeting' => 'mautic.lead.note.type.meeting',
-            ),
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control')
-        ));
+            ],
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+        ]);
 
         $dt   = $options['data']->getDatetime();
         $data = ($dt == null) ? $this->dateHelper->getDateTime() : $dt;
 
-        $builder->add('dateTime', 'datetime', array(
+        $builder->add('dateTime', 'datetime', [
             'label'      => 'mautic.core.date.added',
-            'label_attr' => array('class' => 'control-label'),
+            'label_attr' => ['class' => 'control-label'],
             'widget'     => 'single_text',
-            'attr'       => array(
+            'attr'       => [
                 'class'       => 'form-control',
                 'data-toggle' => 'datetime',
-                'preaddon'    => 'fa fa-calendar'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'data'       => $data
-        ));
+                'preaddon'    => 'fa fa-calendar',
+            ],
+            'format' => 'yyyy-MM-dd HH:mm',
+            'data'   => $data,
+        ]);
 
-        $builder->add('buttons', 'form_buttons', array(
+        $builder->add('buttons', 'form_buttons', [
             'apply_text' => false,
-            'save_text'  => 'mautic.core.form.save'
-        ));
+            'save_text'  => 'mautic.core.form.save',
+        ]);
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
     /**
      * @param OptionsResolverInterface $resolver
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Mautic\LeadBundle\Entity\LeadNote'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Mautic\LeadBundle\Entity\LeadNote',
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "leadnote";
+        return 'leadnote';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/PointActionType.php b/app/bundles/LeadBundle/Form/Type/PointActionType.php
index ebb7074403d..3ea7a98a45c 100644
--- a/app/bundles/LeadBundle/Form/Type/PointActionType.php
+++ b/app/bundles/LeadBundle/Form/Type/PointActionType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,7 @@
 use Symfony\Component\Validator\Constraints\NotEqualTo;
 
 /**
- * Class PointsActionType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class PointsActionType.
  */
 class PointActionType extends AbstractType
 {
@@ -39,10 +38,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     new NotEqualTo(
                         [
                             'value'   => '0',
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
@@ -52,6 +51,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "leadpoints_action";
+        return 'leadpoints_action';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/PointTriggerType.php b/app/bundles/LeadBundle/Form/Type/PointTriggerType.php
index 7a2e75ccbc3..aef88ced4ca 100644
--- a/app/bundles/LeadBundle/Form/Type/PointTriggerType.php
+++ b/app/bundles/LeadBundle/Form/Type/PointTriggerType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PointsTriggerType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class PointsTriggerType.
  */
 class PointTriggerType extends AbstractType
 {
@@ -23,21 +22,22 @@ class PointTriggerType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('points', 'number', array(
+        $builder->add('points', 'number', [
             'label'      => 'mautic.lead.lead.event.pointtrigger',
-            'attr'       => array('class' => 'form-control'),
-            'label_attr' => array('class' => 'control-label'),
+            'attr'       => ['class' => 'form-control'],
+            'label_attr' => ['class' => 'control-label'],
             'precision'  => 0,
-            'data'       => (isset($options['data']['points'])) ? $options['data']['points'] : 0
-        ));
+            'data'       => (isset($options['data']['points'])) ? $options['data']['points'] : 0,
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "leadpoints_trigger";
+    public function getName()
+    {
+        return 'leadpoints_trigger';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/StageActionType.php b/app/bundles/LeadBundle/Form/Type/StageActionType.php
index e33fc77271c..f3d7150d18b 100644
--- a/app/bundles/LeadBundle/Form/Type/StageActionType.php
+++ b/app/bundles/LeadBundle/Form/Type/StageActionType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,23 +12,21 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PointsActionType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class PointsActionType.
  */
 class StageActionType extends AbstractType
 {
     private $model;
 
     /**
-     * @param MauticFactory       $factory
+     * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->model = $factory->getModel('stage');
     }
 
@@ -38,19 +37,19 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         /** @var \Mautic\StageBundle\Model\StageModel $model */
         $model = $this->model;
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'choices' => function (Options $options) use ($model) {
                 $stages = $model->getUserStages();
 
-                $choices = array();
+                $choices = [];
                 foreach ($stages as $s) {
                     $choices[$s['id']] = $s['name'];
                 }
 
                 return $choices;
             },
-            'required'    => false
-        ));
+            'required' => false,
+        ]);
     }
 
     /**
@@ -63,7 +62,8 @@ public function getParent()
     /**
      * @return string
      */
-    public function getName() {
-        return "leadstage_action";
+    public function getName()
+    {
+        return 'leadstage_action';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/StageType.php b/app/bundles/LeadBundle/Form/Type/StageType.php
index 8b983b9ce8d..34bd5bd598b 100644
--- a/app/bundles/LeadBundle/Form/Type/StageType.php
+++ b/app/bundles/LeadBundle/Form/Type/StageType.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\LeadBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class StageType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -25,14 +25,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'addstage',
             'choice',
-            array(
+            [
                 'label'      => 'mautic.lead.batch.add_to',
                 'multiple'   => false,
                 'choices'    => $options['items'],
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control')
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
 
         $builder->add(
@@ -43,18 +43,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'buttons',
             'form_buttons',
-            array(
+            [
                 'apply_text'     => false,
                 'save_text'      => 'mautic.core.form.save',
                 'cancel_onclick' => 'javascript:void(0);',
-                'cancel_attr'    => array(
-                    'data-dismiss' => 'modal'
-                )
-            )
+                'cancel_attr'    => [
+                    'data-dismiss' => 'modal',
+                ],
+            ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -64,9 +64,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setRequired(
-            array(
-                'items'
-            )
+            [
+                'items',
+            ]
         );
     }
 
@@ -75,6 +75,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "lead_batch_stage";
+        return 'lead_batch_stage';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/TagListType.php b/app/bundles/LeadBundle/Form/Type/TagListType.php
index e40c2a8a9f3..69e4b62d0e6 100644
--- a/app/bundles/LeadBundle/Form/Type/TagListType.php
+++ b/app/bundles/LeadBundle/Form/Type/TagListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -33,7 +34,7 @@ public function __construct(MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add(
             'id',
@@ -43,15 +44,15 @@ public function buildForm (FormBuilderInterface $builder, array $options)
         $builder->add(
             'tags',
             'lead_tag',
-            array(
-                'attr' => array(
-                    'data-placeholder'      => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
-                    'data-no-results-text'  => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
-                    'data-allow-add'        => 'true',
-                    'onchange'              => 'Mautic.updateLeadTags(this)'
-                ),
-                'disabled' => (!$options['allow_edit'])
-            )
+            [
+                'attr' => [
+                    'data-placeholder'     => $this->factory->getTranslator()->trans('mautic.lead.tags.select_or_create'),
+                    'data-no-results-text' => $this->factory->getTranslator()->trans('mautic.lead.tags.enter_to_create'),
+                    'data-allow-add'       => 'true',
+                    'onchange'             => 'Mautic.updateLeadTags(this)',
+                ],
+                'disabled' => (!$options['allow_edit']),
+            ]
         );
     }
 
@@ -60,9 +61,9 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array(
-            'allow_edit'
-        ));
+        $resolver->setRequired([
+            'allow_edit',
+        ]);
     }
 
     /**
@@ -72,4 +73,4 @@ public function getName()
     {
         return 'lead_tags';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/TagType.php b/app/bundles/LeadBundle/Form/Type/TagType.php
index 8a7e4983ea9..ee733e10cc9 100644
--- a/app/bundles/LeadBundle/Form/Type/TagType.php
+++ b/app/bundles/LeadBundle/Form/Type/TagType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,7 +19,6 @@
 
 class TagType extends AbstractType
 {
-
     /**
      * @var
      */
@@ -53,10 +53,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(
-            array(
-                'label'           => 'mautic.lead.tags',
-                'class'           => 'MauticLeadBundle:Tag',
-                'query_builder'   => function (EntityRepository $er) {
+            [
+                'label'         => 'mautic.lead.tags',
+                'class'         => 'MauticLeadBundle:Tag',
+                'query_builder' => function (EntityRepository $er) {
                     return $er->createQueryBuilder('t')
                         ->orderBy('t.tag', 'ASC');
                 },
@@ -64,8 +64,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'multiple'        => true,
                 'required'        => false,
                 'disabled'        => false,
-                'add_transformer' => false
-            )
+                'add_transformer' => false,
+            ]
         );
     }
 
@@ -84,4 +84,4 @@ public function getParent()
     {
         return 'entity';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Type/UpdateLeadActionType.php b/app/bundles/LeadBundle/Form/Type/UpdateLeadActionType.php
index 923c13729e1..4279d2a0b49 100644
--- a/app/bundles/LeadBundle/Form/Type/UpdateLeadActionType.php
+++ b/app/bundles/LeadBundle/Form/Type/UpdateLeadActionType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,13 +13,9 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
-use Mautic\LeadBundle\Helper\FormFieldHelper;
 
 /**
- * Class UpdateLeadActionType
- *
- * @package Mautic\LeadBundle\Form\Type
+ * Class UpdateLeadActionType.
  */
 class UpdateLeadActionType extends AbstractType
 {
@@ -27,33 +24,34 @@ class UpdateLeadActionType extends AbstractType
     private $factory;
 
     /**
-     * @param MauticFactory       $factory
+     * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
-        $this->factory    = $factory;
+    public function __construct(MauticFactory $factory)
+    {
+        $this->factory = $factory;
     }
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         /** @var \Mautic\LeadBundle\Model\FieldModel $fieldModel */
         $fieldModel = $this->factory->getModel('lead.field');
         $leadFields = $fieldModel->getEntities(
-            array(
-                'force'          => array(
-                    array(
+            [
+                'force' => [
+                    [
                         'column' => 'f.isPublished',
                         'expr'   => 'eq',
-                        'value'  => true
-                    )
-                ),
-                'hydration_mode' => 'HYDRATE_ARRAY'
-            )
+                        'value'  => true,
+                    ],
+                ],
+                'hydration_mode' => 'HYDRATE_ARRAY',
+            ]
         );
 
-        $options['fields'] = $leadFields;
+        $options['fields']                      = $leadFields;
         $options['ignore_required_constraints'] = true;
 
         $this->getFormFields($builder, $options);
@@ -62,7 +60,8 @@ public function buildForm (FormBuilderInterface $builder, array $options)
     /**
      * @return string
      */
-    public function getName() {
-        return "updatelead_action";
+    public function getName()
+    {
+        return 'updatelead_action';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccess.php b/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccess.php
index 9189179054e..d4899791451 100644
--- a/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccess.php
+++ b/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccess.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
diff --git a/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccessValidator.php b/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccessValidator.php
index fc34b084558..5f3f89729a5 100644
--- a/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccessValidator.php
+++ b/app/bundles/LeadBundle/Form/Validator/Constraints/LeadListAccessValidator.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Validator\Constraints;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\LeadBundle\Entity\LeadList;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
 class LeadListAccessValidator extends ConstraintValidator
 {
-
     /**
      * @var MauticFactory
      */
@@ -41,7 +40,7 @@ public function validate($value, Constraint $constraint)
                 if (!isset($lists[$l->getId()])) {
                     $this->context->addViolation(
                         $constraint->message,
-                        array('%string%' => $l->getName())
+                        ['%string%' => $l->getName()]
                     );
                     break;
                 }
diff --git a/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAlias.php b/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAlias.php
index 3a181e8d8f9..d48d323f036 100644
--- a/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAlias.php
+++ b/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAlias.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -31,11 +32,11 @@ public function getTargets()
 
     public function getRequiredOptions()
     {
-        return array('field');
+        return ['field'];
     }
 
     public function getDefaultOption()
     {
         return 'field';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAliasValidator.php b/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAliasValidator.php
index 152c500e532..8f8e76190eb 100644
--- a/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAliasValidator.php
+++ b/app/bundles/LeadBundle/Form/Validator/Constraints/UniqueUserAliasValidator.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Form\Validator\Constraints;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Symfony\Component\Security\Core\SecurityContext;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
 class UniqueUserAliasValidator extends ConstraintValidator
 {
-
     public $em;
     public $currentUser;
 
@@ -46,9 +45,9 @@ public function validate($list, Constraint $constraint)
                 $this->context->addViolationAt(
                     $field,
                     $constraint->message,
-                    array('%alias%' => $list->getAlias())
+                    ['%alias%' => $list->getAlias()]
                 );
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Helper/CampaignEventHelper.php b/app/bundles/LeadBundle/Helper/CampaignEventHelper.php
index fdedea51970..c732dab22c3 100644
--- a/app/bundles/LeadBundle/Helper/CampaignEventHelper.php
+++ b/app/bundles/LeadBundle/Helper/CampaignEventHelper.php
@@ -1,22 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Helper;
-use Mautic\CoreBundle\Factory\MauticFactory;
+
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\PointsChangeLog;
 use Mautic\LeadBundle\Event\ListChangeEvent;
 
 /**
- * Class CampaignEventHelper
- *
- * @package Mautic\LeadBundle\Helper
+ * Class CampaignEventHelper.
  */
 class CampaignEventHelper
 {
@@ -26,7 +24,7 @@ class CampaignEventHelper
      *
      * @return bool
      */
-    public static function validatePointChange ($event, Lead $lead)
+    public static function validatePointChange($event, Lead $lead)
     {
         $properties  = $event['properties'];
         $checkPoints = $properties['points'];
@@ -47,7 +45,7 @@ public static function validatePointChange ($event, Lead $lead)
      *
      * @return bool
      */
-    public static function validateListChange (ListChangeEvent $eventDetails, $event)
+    public static function validateListChange(ListChangeEvent $eventDetails, $event)
     {
         $limitAddTo      = $event['properties']['addedTo'];
         $limitRemoveFrom = $event['properties']['removedFrom'];
diff --git a/app/bundles/LeadBundle/Helper/EmailTokenHelper.php b/app/bundles/LeadBundle/Helper/EmailTokenHelper.php
index 16235a1eedc..1004e1919ec 100644
--- a/app/bundles/LeadBundle/Helper/EmailTokenHelper.php
+++ b/app/bundles/LeadBundle/Helper/EmailTokenHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class EmailTokenHelper
+ * Class EmailTokenHelper.
  */
 class EmailTokenHelper
 {
-
     /**
      * @var MauticFactory
      */
@@ -25,7 +25,7 @@ class EmailTokenHelper
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
@@ -35,7 +35,7 @@ public function __construct (MauticFactory $factory)
      *
      * @return string
      */
-    public function getTokenContent ($page = 1)
+    public function getTokenContent($page = 1)
     {
         if (!$this->factory->getSecurity()->isGranted('lead:fields:full')) {
             return;
@@ -56,27 +56,27 @@ public function getTokenContent ($page = 1)
 
         $session->set('mautic.lead.emailtoken.filter', $search);
 
-        $filter = array(
+        $filter = [
             'string' => $search,
-            'force'  => array(
-                array(
+            'force'  => [
+                [
                     'column' => 'f.isPublished',
                     'expr'   => 'eq',
-                    'value'  => true
-                )
-            )
-        );
+                    'value'  => true,
+                ],
+            ],
+        ];
 
         $fields = $this->factory->getModel('lead.field')->getEntities(
-            array(
+            [
                 'start'          => $start,
                 'limit'          => $limit,
                 'filter'         => $filter,
                 'orderBy'        => 'f.label',
                 'orderByDir'     => 'ASC',
-                'hydration_mode' => 'HYDRATE_ARRAY'
-            ));
-        $count  = count($fields);
+                'hydration_mode' => 'HYDRATE_ARRAY',
+            ]);
+        $count = count($fields);
 
         if ($count && $count < ($start + 1)) {
             //the number of entities are now less then the current page so redirect to the last page
@@ -88,13 +88,13 @@ public function getTokenContent ($page = 1)
             $session->set('mautic.lead.emailtoken.page', $page);
         }
 
-        return $this->factory->getTemplating()->render('MauticLeadBundle:SubscribedEvents\EmailToken:list.html.php', array(
+        return $this->factory->getTemplating()->render('MauticLeadBundle:SubscribedEvents\EmailToken:list.html.php', [
             'items'       => $fields,
             'page'        => $page,
             'limit'       => $limit,
             'totalCount'  => $count,
             'tmpl'        => $request->get('tmpl', 'index'),
-            'searchValue' => $search
-        ));
+            'searchValue' => $search,
+        ]);
     }
 }
diff --git a/app/bundles/LeadBundle/Helper/EventHelper.php b/app/bundles/LeadBundle/Helper/EventHelper.php
index 09b45ab46e8..fd384aa39f5 100644
--- a/app/bundles/LeadBundle/Helper/EventHelper.php
+++ b/app/bundles/LeadBundle/Helper/EventHelper.php
@@ -1,20 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Helper;
 
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Entity\UtmTag;
 
-
 class EventHelper
 {
     /**
@@ -29,8 +28,8 @@ public static function updateTags(Lead $lead, $config, MauticFactory $factory)
         /** @var \Mautic\LeadBundle\Model\LeadModel $leadModel */
         $leadModel = $factory->getModel('lead');
 
-        $addTags    = (!empty($config['add_tags'])) ? $config['add_tags'] : array();
-        $removeTags = (!empty($config['remove_tags'])) ? $config['remove_tags'] : array();
+        $addTags    = (!empty($config['add_tags'])) ? $config['add_tags'] : [];
+        $removeTags = (!empty($config['remove_tags'])) ? $config['remove_tags'] : [];
 
         $leadModel->modifyTags($lead, $addTags, $removeTags);
 
@@ -41,58 +40,53 @@ public static function updateTags(Lead $lead, $config, MauticFactory $factory)
      * @param $action
      * @param $factory
      */
-    public static function addUtmTags ($action, $factory,$config)
+    public static function addUtmTags($action, $factory, $config)
     {
         /** @var \Mautic\LeadBundle\Model\LeadModel $leadModel */
-        $leadModel  = $factory->getModel('lead');
-        $lead       = $leadModel->getCurrentLead();
+        $leadModel = $factory->getModel('lead');
+        $lead      = $leadModel->getCurrentLead();
 
-        $queryReferer = array();
+        $queryReferer = [];
 
         parse_str($factory->getRequest()->server->get('QUERY_STRING'), $query);
-        $refererURL = $factory->getRequest()->server->get('HTTP_REFERER');
-        $pageURI = $factory->getRequest()->server->get('REQUEST_URI');
+        $refererURL       = $factory->getRequest()->server->get('HTTP_REFERER');
+        $pageURI          = $factory->getRequest()->server->get('REQUEST_URI');
         $refererParsedUrl = parse_url($refererURL);
 
-        if(isset($refererParsedUrl['query'])){
-            parse_str($refererParsedUrl['query'],$queryReferer);
+        if (isset($refererParsedUrl['query'])) {
+            parse_str($refererParsedUrl['query'], $queryReferer);
         }
 
         $utmValues = new UtmTag();
         $utmValues->setDateAdded(new \Datetime());
 
-        if (key_exists('utm_campaign',$query)){
+        if (key_exists('utm_campaign', $query)) {
             $utmValues->setUtmCampaign($query['utm_campaign']);
-        }
-        elseif(key_exists('utm_campaign',$queryReferer)){
+        } elseif (key_exists('utm_campaign', $queryReferer)) {
             $utmValues->setUtmCampaign($queryReferer['utm_campaign']);
         }
 
-        if (key_exists('utm_content',$query)){
+        if (key_exists('utm_content', $query)) {
             $utmValues->setUtmCampaign($query['utm_content']);
-        }
-        elseif(key_exists('utm_content', $queryReferer)){
+        } elseif (key_exists('utm_content', $queryReferer)) {
             $utmValues->setUtmConent($queryReferer['utm_content']);
         }
 
-        if (key_exists('utm_medium',$query)){
+        if (key_exists('utm_medium', $query)) {
             $utmValues->setUtmCampaign($query['utm_medium']);
-        }
-        elseif(key_exists('utm_medium', $queryReferer)){
-            $utmValues['utm_medium'] =  $queryReferer['utm_medium'];
+        } elseif (key_exists('utm_medium', $queryReferer)) {
+            $utmValues['utm_medium'] = $queryReferer['utm_medium'];
         }
 
-        if (key_exists('utm_source',$query)){
+        if (key_exists('utm_source', $query)) {
             $utmValues->setUtmCampaign($query['utm_source']);
-        }
-        elseif(key_exists('utm_source', $queryReferer)){
+        } elseif (key_exists('utm_source', $queryReferer)) {
             $utmValues->setUtmSource($queryReferer['utm_source']);
         }
 
-        if (key_exists('utm_term',$query)){
+        if (key_exists('utm_term', $query)) {
             $utmValues->setUtmCampaign($query['utm_term']);
-        }
-        elseif(key_exists('utm_term', $queryReferer)){
+        } elseif (key_exists('utm_term', $queryReferer)) {
             $utmValues->setUtmTerm($queryReferer['utm_term']);
         }
 
@@ -109,5 +103,4 @@ public static function addUtmTags ($action, $factory,$config)
         $repo->saveEntity($utmValues);
         $leadModel->setUtmTags($lead, $utmValues);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Helper/FormEventHelper.php b/app/bundles/LeadBundle/Helper/FormEventHelper.php
index ec4c23bfad1..f9c3fd4e244 100644
--- a/app/bundles/LeadBundle/Helper/FormEventHelper.php
+++ b/app/bundles/LeadBundle/Helper/FormEventHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,13 +12,10 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\UtmTag;
 use Mautic\LeadBundle\Entity\PointsChangeLog;
 
 /**
- * Class FormEventHelper
- *
- * @package Mautic\LeadBundle\Helper
+ * Class FormEventHelper.
  */
 class FormEventHelper
 {
@@ -28,14 +26,14 @@ class FormEventHelper
      * @param               $config
      * @param               $form
      */
-    public static function changePoints (Lead $lead, MauticFactory $factory, $action, $config, $form)
+    public static function changePoints(Lead $lead, MauticFactory $factory, $action, $config, $form)
     {
         $model = $factory->getModel('lead');
 
         //create a new points change event
         $event = new PointsChangeLog();
         $event->setType('form');
-        $event->setEventName($form->getId() . ":" . $form->getName());
+        $event->setEventName($form->getId().':'.$form->getName());
         $event->setActionName($action->getName());
         $event->setIpAddress($factory->getIpAddress());
         $event->setDateAdded(new \DateTime());
@@ -58,7 +56,7 @@ public static function changePoints (Lead $lead, MauticFactory $factory, $action
      * @param $action
      * @param $factory
      */
-    public static function changeLists ($action, $factory)
+    public static function changeLists($action, $factory)
     {
         $properties = $action->getProperties();
 
@@ -76,6 +74,4 @@ public static function changeLists ($action, $factory)
             $leadModel->removeFromLists($lead, $removeFrom);
         }
     }
-
-
 }
diff --git a/app/bundles/LeadBundle/Helper/FormFieldHelper.php b/app/bundles/LeadBundle/Helper/FormFieldHelper.php
index 297123ac397..91bca00fb29 100644
--- a/app/bundles/LeadBundle/Helper/FormFieldHelper.php
+++ b/app/bundles/LeadBundle/Helper/FormFieldHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,97 +15,96 @@
 
 class FormFieldHelper extends AbstractFormFieldHelper
 {
-
     /**
      * @var array
      */
-    static private $types = [
-        'text'     => [
-            'properties' => []
+    private static $types = [
+        'text' => [
+            'properties' => [],
         ],
         'textarea' => [
-            'properties' => []
+            'properties' => [],
         ],
         'multiselect' => [
             'properties' => [
                 'list' => [
                     'required'  => true,
-                    'error_msg' => 'mautic.lead.field.select.listmissing'
-                ]
-            ]
+                    'error_msg' => 'mautic.lead.field.select.listmissing',
+                ],
+            ],
         ],
-        'select'   => [
+        'select' => [
             'properties' => [
                 'list' => [
                     'required'  => true,
-                    'error_msg' => 'mautic.lead.field.select.listmissing'
-                ]
-            ]
+                    'error_msg' => 'mautic.lead.field.select.listmissing',
+                ],
+            ],
         ],
-        'boolean'  => [
+        'boolean' => [
             'properties' => [
                 'yes' => [
                     'required'  => true,
-                    'error_msg' => 'mautic.lead.field.boolean.yesmissing'
+                    'error_msg' => 'mautic.lead.field.boolean.yesmissing',
                 ],
-                'no'  => [
+                'no' => [
                     'required'  => true,
-                    'error_msg' => 'mautic.lead.field.boolean.nomissing'
-                ]
-            ]
+                    'error_msg' => 'mautic.lead.field.boolean.nomissing',
+                ],
+            ],
         ],
-        'lookup'   => [
+        'lookup' => [
             'properties' => [
-                'list' => []
-            ]
+                'list' => [],
+            ],
         ],
-        'date'     => [
+        'date' => [
             'properties' => [
-                'format' => []
-            ]
+                'format' => [],
+            ],
         ],
         'datetime' => [
             'properties' => [
-                'format' => []
-            ]
+                'format' => [],
+            ],
         ],
-        'time'     => [
-            'properties' => []
+        'time' => [
+            'properties' => [],
         ],
         'timezone' => [
-            'properties' => []
+            'properties' => [],
         ],
-        'email'    => [
-            'properties' => []
+        'email' => [
+            'properties' => [],
         ],
-        'number'   => [
+        'number' => [
             'properties' => [
                 'roundmode' => [],
-                'precision' => []
-            ]
+                'precision' => [],
+            ],
         ],
-        'tel'      => [
-            'properties' => []
+        'tel' => [
+            'properties' => [],
         ],
-        'url'      => [
-            'properties' => []
+        'url' => [
+            'properties' => [],
         ],
-        'country'  => [
-            'properties' => []
+        'country' => [
+            'properties' => [],
         ],
-        'region'   => [
-            'properties' => []
+        'region' => [
+            'properties' => [],
         ],
         'timezone' => [
-            'properties' => []
+            'properties' => [],
+        ],
+        'locale' => [
+            'properties' => [],
         ],
-        'locale'   => [
-            'properties' => []
-        ]
     ];
 
     /**
-     * Set the translation key prefix
+     * Set the translation key prefix.
      */
     public function setTranslationKeyPrefix()
     {
@@ -122,7 +122,7 @@ public function getTypes()
     /**
      * @return array
      */
-    static public function getListTypes()
+    public static function getListTypes()
     {
         return ['select', 'boolean', 'lookup', 'country', 'region', 'timezone', 'locale'];
     }
@@ -133,7 +133,7 @@ static public function getListTypes()
      *
      * @return bool
      */
-    static public function validateProperties($type, &$properties)
+    public static function validateProperties($type, &$properties)
     {
         if (!array_key_exists($type, self::$types)) {
             //ensure the field type is supported
@@ -158,7 +158,7 @@ static public function validateProperties($type, &$properties)
     /**
      * @return array
      */
-    static public function getCountryChoices()
+    public static function getCountryChoices()
     {
         $countryJson = file_get_contents(__DIR__.'/../../CoreBundle/Assets/json/countries.json');
         $countries   = json_decode($countryJson);
@@ -171,7 +171,7 @@ static public function getCountryChoices()
     /**
      * @return array
      */
-    static public function getRegionChoices()
+    public static function getRegionChoices()
     {
         $regionJson = file_get_contents(__DIR__.'/../../CoreBundle/Assets/json/regions.json');
         $regions    = json_decode($regionJson);
@@ -186,11 +186,11 @@ static public function getRegionChoices()
 
     /**
      * Symfony deprecated and changed Symfony\Component\Form\Extension\Core\Type\TimezoneType::getTimezones to private
-     * in 3.0 - so duplicated code here
+     * in 3.0 - so duplicated code here.
      *
      * @return array
      */
-    static public function getTimezonesChoices()
+    public static function getTimezonesChoices()
     {
         static $timezones;
 
@@ -219,12 +219,12 @@ static public function getTimezonesChoices()
     }
 
     /**
-     * Get locale choices
+     * Get locale choices.
      *
      * @return array
      */
-    static function getLocaleChoices()
+    public static function getLocaleChoices()
     {
         return Intl::getLocaleBundle()->getLocaleNames();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Helper/IdentifyCompanyHelper.php b/app/bundles/LeadBundle/Helper/IdentifyCompanyHelper.php
index 00206fe768c..992c0374b18 100644
--- a/app/bundles/LeadBundle/Helper/IdentifyCompanyHelper.php
+++ b/app/bundles/LeadBundle/Helper/IdentifyCompanyHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Mautic\LeadBundle\Model\CompanyModel;
 
 /**
- * Class IdentifyCompanyHelper
+ * Class IdentifyCompanyHelper.
  */
 class IdentifyCompanyHelper
 {
-
     /**
      * @var MauticFactory
      */
@@ -27,19 +27,19 @@ class IdentifyCompanyHelper
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
 
     /**
-     * @param array $parameters
-     * @param Lead $lead
+     * @param array        $parameters
+     * @param Lead         $lead
      * @param CompanyModel $companyModel
-     * @return array
      *
+     * @return array
      */
-    static public function identifyLeadsCompany ($parameters = array(), Lead $lead, CompanyModel $companyModel)
+    public static function identifyLeadsCompany($parameters, Lead $lead, CompanyModel $companyModel)
     {
         $companyName = $companyDomain = null;
         $leadAdded   = false;
@@ -47,7 +47,7 @@ static public function identifyLeadsCompany ($parameters = array(), Lead $lead,
         if (isset($parameters['company'])) {
             $companyName = filter_var($parameters['company'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         } elseif (isset($parameters['email'])) {
-            $companyName = $companyDomain = IdentifyCompanyHelper::domainExists($parameters['email']);
+            $companyName = $companyDomain = self::domainExists($parameters['email']);
         }
 
         if ($companyName) {
@@ -64,7 +64,7 @@ static public function identifyLeadsCompany ($parameters = array(), Lead $lead,
                 $companyLeadRepo = $companyModel->getCompanyLeadRepository();
                 if (empty($companyLeadRepo->getCompaniesByLeadId($lead->getId(), $company[0]['id']))) {
                     $companyLeadRepo->getCompaniesByLeadId($lead->getId(), $company[0]['id']);
-                    $company = $companyModel->getEntity($company[0]['id']);
+                    $company   = $companyModel->getEntity($company[0]['id']);
                     $leadAdded = true;
                 }
             } else {
@@ -74,9 +74,9 @@ static public function identifyLeadsCompany ($parameters = array(), Lead $lead,
                     'companywebsite' => $companyDomain,
                     'companycity'    => $city,
                     'companystate'   => $state,
-                    'companycountry' => $country
+                    'companycountry' => $country,
                 ];
-                $company  = $companyModel->getEntity();
+                $company = $companyModel->getEntity();
                 $companyModel->setFieldValues($company, $companyData, true);
                 $companyModel->saveEntity($company);
                 $leadAdded = true;
@@ -93,11 +93,12 @@ static public function identifyLeadsCompany ($parameters = array(), Lead $lead,
      *
      * @return mixed
      */
-    private function domainExists($email){
+    private function domainExists($email)
+    {
         list($user, $domain) = explode('@', $email);
-        $arr= dns_get_record($domain,DNS_MX);
-        if($arr[0]['host']==$domain&&!empty($arr[0]['target'])){
-                return $arr[0]['target'];
+        $arr                 = dns_get_record($domain, DNS_MX);
+        if ($arr[0]['host'] == $domain && !empty($arr[0]['target'])) {
+            return $arr[0]['target'];
         }
     }
 }
diff --git a/app/bundles/LeadBundle/Helper/PointEventHelper.php b/app/bundles/LeadBundle/Helper/PointEventHelper.php
index 5df340940bc..7f60bff6769 100644
--- a/app/bundles/LeadBundle/Helper/PointEventHelper.php
+++ b/app/bundles/LeadBundle/Helper/PointEventHelper.php
@@ -1,18 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Helper;
 
 /**
- * Class PointEventHelper
- *
- * @package Mautic\LeadBundle\Helper
+ * Class PointEventHelper.
  */
 class PointEventHelper
 {
@@ -23,7 +22,7 @@ class PointEventHelper
      *
      * @return bool
      */
-    public static function changeLists ($event, $factory, $lead)
+    public static function changeLists($event, $factory, $lead)
     {
         $properties = $event['properties'];
 
@@ -46,4 +45,4 @@ public static function changeLists ($event, $factory, $lead)
 
         return $somethingHappened;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Helper/TokenHelper.php b/app/bundles/LeadBundle/Helper/TokenHelper.php
index 8e0ee3b7aaf..aeeb126b0ba 100644
--- a/app/bundles/LeadBundle/Helper/TokenHelper.php
+++ b/app/bundles/LeadBundle/Helper/TokenHelper.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Helper;
 
 /**
- * Class TokenHelper
+ * Class TokenHelper.
  */
 class TokenHelper
 {
@@ -22,15 +23,15 @@ class TokenHelper
      *
      * @return array|string
      */
-    static function findLeadTokens($content, $lead, $replace = false)
+    public static function findLeadTokens($content, $lead, $replace = false)
     {
         // Search for bracket or bracket encoded
         // @deprecated BC support for leadfield
         $tokenRegex = [
             '/({|%7B)leadfield=(.*?)(}|%7D)/',
-            '/({|%7B)contactfield=(.*?)(}|%7D)/'
+            '/({|%7B)contactfield=(.*?)(}|%7D)/',
         ];
-        $tokenList = array();
+        $tokenList = [];
 
         foreach ($tokenRegex as $regex) {
             $foundMatches = preg_match_all($regex, $content, $matches);
@@ -72,4 +73,4 @@ static function findLeadTokens($content, $lead, $replace = false)
 
         return $replace ? $content : $tokenList;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/LeadEvents.php b/app/bundles/LeadBundle/LeadEvents.php
index bfd1df98348..0f77c489d1e 100644
--- a/app/bundles/LeadBundle/LeadEvents.php
+++ b/app/bundles/LeadBundle/LeadEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,9 +12,7 @@
 
 /**
  * Class LeadEvents
- * Events available for LeadBundle
- *
- * @package Mautic\LeadBundle
+ * Events available for LeadBundle.
  */
 final class LeadEvents
 {
@@ -25,7 +24,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_PRE_SAVE   = 'mautic.lead_pre_save';
+    const LEAD_PRE_SAVE = 'mautic.lead_pre_save';
 
     /**
      * The mautic.lead_post_save event is dispatched right after a lead is persisted.
@@ -35,7 +34,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_POST_SAVE   = 'mautic.lead_post_save';
+    const LEAD_POST_SAVE = 'mautic.lead_post_save';
 
     /**
      * The mautic.lead_points_change event is dispatched if a lead's points changes.
@@ -65,7 +64,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_COMPANY_CHANGE   = 'mautic.lead_company_change';
+    const LEAD_COMPANY_CHANGE = 'mautic.lead_company_change';
     /**
      * The mautic.lead_list_change event is dispatched if a lead's lists changes.
      *
@@ -74,10 +73,10 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_LIST_CHANGE   = 'mautic.lead_list_change';
+    const LEAD_LIST_CHANGE = 'mautic.lead_list_change';
 
     /**
-     * The mautic.lead_list_batch_change event is dispatched if a batch of leads are changed from ListModel::rebuildListLeads()
+     * The mautic.lead_list_batch_change event is dispatched if a batch of leads are changed from ListModel::rebuildListLeads().
      *
      * The event listener receives a
      * Mautic\LeadBundle\Event\LeadListChange instance.
@@ -94,7 +93,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_PRE_DELETE   = 'mautic.lead_pre_delete';
+    const LEAD_PRE_DELETE = 'mautic.lead_pre_delete';
 
     /**
      * The mautic.lead_post_delete event is dispatched after a lead is deleted.
@@ -104,7 +103,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_POST_DELETE   = 'mautic.lead_post_delete';
+    const LEAD_POST_DELETE = 'mautic.lead_post_delete';
 
     /**
      * The mautic.lead_pre_merge event is dispatched before two leads are merged.
@@ -114,7 +113,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_PRE_MERGE   = 'mautic.lead_pre_merge';
+    const LEAD_PRE_MERGE = 'mautic.lead_pre_merge';
 
     /**
      * The mautic.lead_post_merge event is dispatched after two leads are merged.
@@ -124,28 +123,28 @@ final class LeadEvents
      *
      * @var string
      */
-    const LEAD_POST_MERGE   = 'mautic.lead_post_merge';
+    const LEAD_POST_MERGE = 'mautic.lead_post_merge';
 
     /**
-     * The mautic.lead_identified event is dispatched when a lead first becomes known, i.e. name, email, company
+     * The mautic.lead_identified event is dispatched when a lead first becomes known, i.e. name, email, company.
      *
      * The event listener receives a
      * Mautic\LeadBundle\Event\LeadEvent instance.
      *
      * @var string
      */
-    const LEAD_IDENTIFIED   = 'mautic.lead_identified';
+    const LEAD_IDENTIFIED = 'mautic.lead_identified';
 
     /**
      * The mautic.current_lead_changed event is dispatched when the current lead is changed to another such as when
-     * a new lead is created from a form submit.  This gives opportunity to update session data if applicable
+     * a new lead is created from a form submit.  This gives opportunity to update session data if applicable.
      *
      * The event listener receives a
      * Mautic\LeadBundle\Event\LeadChangeEvent instance.
      *
      * @var string
      */
-    const CURRENT_LEAD_CHANGED   = 'mautic.current_lead_changed';
+    const CURRENT_LEAD_CHANGED = 'mautic.current_lead_changed';
 
     /**
      * The mautic.lead_list_pre_save event is dispatched right before a lead_list is persisted.
@@ -155,7 +154,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LIST_PRE_SAVE   = 'mautic.lead_list_pre_save';
+    const LIST_PRE_SAVE = 'mautic.lead_list_pre_save';
 
     /**
      * The mautic.lead_list_post_save event is dispatched right after a lead_list is persisted.
@@ -165,7 +164,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LIST_POST_SAVE   = 'mautic.lead_list_post_save';
+    const LIST_POST_SAVE = 'mautic.lead_list_post_save';
 
     /**
      * The mautic.lead_list_pre_delete event is dispatched before a lead_list is deleted.
@@ -175,7 +174,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LIST_PRE_DELETE   = 'mautic.lead_list_pre_delete';
+    const LIST_PRE_DELETE = 'mautic.lead_list_pre_delete';
 
     /**
      * The mautic.lead_list_post_delete event is dispatched after a lead_list is deleted.
@@ -185,7 +184,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const LIST_POST_DELETE   = 'mautic.lead_list_post_delete';
+    const LIST_POST_DELETE = 'mautic.lead_list_post_delete';
 
     /**
      * The mautic.lead_field_pre_save event is dispatched right before a lead_field is persisted.
@@ -195,7 +194,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const FIELD_PRE_SAVE   = 'mautic.lead_field_pre_save';
+    const FIELD_PRE_SAVE = 'mautic.lead_field_pre_save';
 
     /**
      * The mautic.lead_field_post_save event is dispatched right after a lead_field is persisted.
@@ -205,7 +204,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const FIELD_POST_SAVE   = 'mautic.lead_field_post_save';
+    const FIELD_POST_SAVE = 'mautic.lead_field_post_save';
 
     /**
      * The mautic.lead_field_pre_delete event is dispatched before a lead_field is deleted.
@@ -215,7 +214,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const FIELD_PRE_DELETE   = 'mautic.lead_field_pre_delete';
+    const FIELD_PRE_DELETE = 'mautic.lead_field_pre_delete';
 
     /**
      * The mautic.lead_field_post_delete event is dispatched after a lead_field is deleted.
@@ -225,10 +224,10 @@ final class LeadEvents
      *
      * @var string
      */
-    const FIELD_POST_DELETE   = 'mautic.lead_field_post_delete';
+    const FIELD_POST_DELETE = 'mautic.lead_field_post_delete';
 
     /**
-     * The mautic.lead_timeline_on_generate event is dispatched when generating a lead's timeline view
+     * The mautic.lead_timeline_on_generate event is dispatched when generating a lead's timeline view.
      *
      * The event listener receives a
      * Mautic\LeadBundle\Event\LeadTimelineEvent instance.
@@ -245,7 +244,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const NOTE_PRE_SAVE   = 'mautic.lead_note_pre_save';
+    const NOTE_PRE_SAVE = 'mautic.lead_note_pre_save';
 
     /**
      * The mautic.lead_note_post_save event is dispatched right after a lead note is persisted.
@@ -255,7 +254,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const NOTE_POST_SAVE   = 'mautic.lead_note_post_save';
+    const NOTE_POST_SAVE = 'mautic.lead_note_post_save';
 
     /**
      * The mautic.lead_note_pre_delete event is dispatched before a lead note is deleted.
@@ -265,7 +264,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const NOTE_PRE_DELETE   = 'mautic.lead_note_pre_delete';
+    const NOTE_PRE_DELETE = 'mautic.lead_note_pre_delete';
 
     /**
      * The mautic.lead_note_post_delete event is dispatched after a lead note is deleted.
@@ -275,7 +274,7 @@ final class LeadEvents
      *
      * @var string
      */
-    const NOTE_POST_DELETE   = 'mautic.lead_note_post_delete';
+    const NOTE_POST_DELETE = 'mautic.lead_note_post_delete';
 
     /**
      * The mautic.filter_choice_fields event is dispatched when the list filter dropdown is populated.
@@ -344,7 +343,7 @@ final class LeadEvents
     const COMPANY_POST_DELETE = 'mautic.company_post_delete';
 
     /**
-     * The mautic.company_on_build event is thrown before displaying the company builder form to allow adding of custom actions
+     * The mautic.company_on_build event is thrown before displaying the company builder form to allow adding of custom actions.
      *
      * The event listener receives a Mautic\LeadBundle\Event\CompanyBuilderEvent instance.
      *
@@ -353,7 +352,7 @@ final class LeadEvents
     const COMPANY_ON_BUILD = 'mautic.company_on_build';
 
     /**
-     * The mautic.company_on_action event is thrown to execute a company action
+     * The mautic.company_on_action event is thrown to execute a company action.
      *
      * The event listener receives a Mautic\LeadBundle\Event\CompanyActionEvent instance.
      *
diff --git a/app/bundles/LeadBundle/MauticLeadBundle.php b/app/bundles/LeadBundle/MauticLeadBundle.php
index 3ae3b04c5f0..600d5900998 100644
--- a/app/bundles/LeadBundle/MauticLeadBundle.php
+++ b/app/bundles/LeadBundle/MauticLeadBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticLeadBundle
- *
- * @package Mautic\LeadBundle
+ * Class MauticLeadBundle.
  */
 class MauticLeadBundle extends Bundle
 {
-
 }
diff --git a/app/bundles/LeadBundle/Model/ChannelTimelineInterface.php b/app/bundles/LeadBundle/Model/ChannelTimelineInterface.php
index c04d51bada3..476aafdb9cd 100644
--- a/app/bundles/LeadBundle/Model/ChannelTimelineInterface.php
+++ b/app/bundles/LeadBundle/Model/ChannelTimelineInterface.php
@@ -1,52 +1,53 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Model;
 
 /**
- * Interface ChannelTimelineInterface
+ * Interface ChannelTimelineInterface.
  */
 interface ChannelTimelineInterface
 {
     /**
-     * Return the name of a template to use to customize the channel's timeline entry
+     * Return the name of a template to use to customize the channel's timeline entry.
      *
      * Return an empty value to ignore
      *
      * @param string $eventType
-     * @param array $details
+     * @param array  $details
      *
      * @return mixed
      */
     public function getChannelTimelineTemplate($eventType, $details);
 
     /**
-     * Override the timeline name for this channel's timeline entry
+     * Override the timeline name for this channel's timeline entry.
      *
      * Return an empty value to ignore
      *
      * @param string $eventType
-     * @param array $details
+     * @param array  $details
      *
      * @return mixed
      */
     public function getChannelTimelineLabel($eventType, $details);
 
     /**
-     * Override the icon for this channel's timeline entry
+     * Override the icon for this channel's timeline entry.
      *
      * Return an empty value to ignore
      *
      * @param string $eventType
-     * @param array $details
+     * @param array  $details
      *
      * @return mixed
      */
     public function getChannelTimelineIcon($eventType, $details);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Model/CompanyModel.php b/app/bundles/LeadBundle/Model/CompanyModel.php
index de9f3f4c799..c4d0330260b 100644
--- a/app/bundles/LeadBundle/Model/CompanyModel.php
+++ b/app/bundles/LeadBundle/Model/CompanyModel.php
@@ -1,28 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Model;
 
 use Mautic\CoreBundle\Model\FormModel as CommonFormModel;
-use Mautic\LeadBundle\Entity\LeadField;
-use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Entity\Company;
 use Mautic\LeadBundle\Entity\CompanyLead;
-use Mautic\LeadBundle\Entity\CompanyLeadRepository;
-use Mautic\LeadBundle\Event\CompanyBuilderEvent;
+use Mautic\LeadBundle\Entity\Lead;
+use Mautic\LeadBundle\Entity\LeadField;
 use Mautic\LeadBundle\Event\LeadChangeCompanyEvent;
 use Mautic\LeadBundle\LeadEvents;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class CompanyModel
+ * Class CompanyModel.
  */
 class CompanyModel extends CommonFormModel
 {
@@ -39,12 +38,11 @@ class CompanyModel extends CommonFormModel
      * PointModel constructor.
      *
      * @param Session $session
-     *
      */
     public function __construct(FieldModel $leadFieldModel, Session $session)
     {
         $this->leadFieldModel = $leadFieldModel;
-        $this->session = $session;
+        $this->session        = $session;
     }
     /**
      * {@inheritdoc}
@@ -66,7 +64,6 @@ public function getCompanyLeadRepository()
         return $this->em->getRepository('MauticLeadBundle:CompanyLead');
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -82,7 +79,7 @@ public function getPermissionBase()
      */
     public function getNameGetter()
     {
-        return "getPrimaryIdentifier";
+        return 'getPrimaryIdentifier';
     }
 
     /**
@@ -90,14 +87,15 @@ public function getNameGetter()
      *
      * @throws MethodNotAllowedHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Company) {
-            throw new MethodNotAllowedHttpException(array('Company'));
+            throw new MethodNotAllowedHttpException(['Company']);
         }
         if (!empty($action)) {
             $options['action'] = $action;
         }
+
         return $formFactory->create('company', $entity, $options);
     }
 
@@ -116,12 +114,11 @@ public function getEntity($id = null)
     }
 
     /**
-     *
      * @return mixed
      */
     public function getUserCompanies()
     {
-        $user  = (!$this->security->isGranted('lead:leads:viewother')) ?
+        $user = (!$this->security->isGranted('lead:leads:viewother')) ?
             $this->user : false;
         $companies = $this->em->getRepository('MauticLeadBundle:Company')->getCompanies($user);
 
@@ -129,14 +126,15 @@ public function getUserCompanies()
     }
 
     /**
-     * Reorganizes a field list to be keyed by field's group then alias
+     * Reorganizes a field list to be keyed by field's group then alias.
      *
      * @param $fields
+     *
      * @return array
      */
     public function organizeFieldsByGroup($fields)
     {
-        $array = array();
+        $array = [];
 
         foreach ($fields as $field) {
             if ($field instanceof LeadField) {
@@ -150,10 +148,10 @@ public function organizeFieldsByGroup($fields)
                     $array[$group][$alias]['type']  = $field->getType();
                 }
             } else {
-                $alias = $field['alias'];
-                $field[]=$alias;
+                $alias   = $field['alias'];
+                $field[] = $alias;
                 if ($field['object'] === 'company') {
-                    $group = $field['group'];
+                    $group                          = $field['group'];
                     $array[$group][$alias]['id']    = $field['id'];
                     $array[$group][$alias]['group'] = $group;
                     $array[$group][$alias]['label'] = $field['label'];
@@ -164,10 +162,10 @@ public function organizeFieldsByGroup($fields)
         }
 
         //make sure each group key is present
-        $groups = array('core', 'social', 'personal', 'professional');
+        $groups = ['core', 'social', 'personal', 'professional'];
         foreach ($groups as $g) {
             if (!isset($array[$g])) {
-                $array[$g] = array();
+                $array[$g] = [];
             }
         }
 
@@ -195,7 +193,7 @@ public function setFieldValues(Company &$company, array $data, $overwriteWithBla
                 $fields = $this->leadFieldModel->getEntities(
                     [
                         'filter'         => ['object' => 'company'],
-                        'hydration_mode' => 'HYDRATE_ARRAY'
+                        'hydration_mode' => 'HYDRATE_ARRAY',
                     ]
                 );
                 $fields = $this->organizeFieldsByGroup($fields);
@@ -224,13 +222,12 @@ public function setFieldValues(Company &$company, array $data, $overwriteWithBla
     }
 
     /** Add lead to company
-     *
-     * @param array|Company     $companies
-     * @param array|Lead        $lead
-     * @param bool              $manuallyAdded
-     * @param bool              $batchProcess
-     * @param int               $searchCompanyLead 0 = reference, 1 = yes, -1 = known to not exist
-     * @param \DateTime         $dateManipulated
+     * @param array|Company $companies
+     * @param array|Lead    $lead
+     * @param bool          $manuallyAdded
+     * @param bool          $batchProcess
+     * @param int           $searchCompanyLead 0 = reference, 1 = yes, -1 = known to not exist
+     * @param \DateTime     $dateManipulated
      *
      * @throws \Doctrine\ORM\ORMException
      */
@@ -251,10 +248,10 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
         }
 
         /** @var Company[] $companyLeadAdd */
-        $companyLeadAdd = array();
+        $companyLeadAdd = [];
         if (!$companies instanceof Company) {
             //make sure they are ints
-            $searchForCompanies = array();
+            $searchForCompanies = [];
             foreach ($companies as $k => &$l) {
                 $l = (int) $l;
 
@@ -264,17 +261,17 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
             }
 
             if (!empty($searchForCompanies)) {
-                $companyEntities = $this->getEntities(array(
-                    'filter' => array(
-                        'force' => array(
-                            array(
+                $companyEntities = $this->getEntities([
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'comp.id',
                                 'expr'   => 'in',
-                                'value'  => $searchForCompanies
-                            )
-                        )
-                    )
-                ));
+                                'value'  => $searchForCompanies,
+                            ],
+                        ],
+                    ],
+                ]);
 
                 foreach ($companyEntities as $company) {
                     $companyLeadAdd[$company->getId()] = $company;
@@ -285,15 +282,15 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
         } else {
             $companyLeadAdd[$companies->getId()] = $companies;
 
-            $companies = array($companies->getId());
+            $companies = [$companies->getId()];
         }
 
         if (!is_array($companies)) {
-            $companies = array($companies);
+            $companies = [$companies];
         }
 
-        $persistCompany   = array();
-        $dispatchEvents = array();
+        $persistCompany = [];
+        $dispatchEvents = [];
 
         foreach ($companies as $companyId) {
             if (!isset($companyLeadAdd[$companyId])) {
@@ -305,17 +302,17 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
                 $companyLead = null;
             } elseif ($searchCompanyLead) {
                 $companyLead = $this->getCompanyLeadRepository()->findOneBy(
-                    array(
-                        'lead' => $lead,
-                        'company' => $companyLeadAdd[$companyId]
-                    )
+                    [
+                        'lead'    => $lead,
+                        'company' => $companyLeadAdd[$companyId],
+                    ]
                 );
             } else {
                 $companyLead = $this->em->getReference('MauticLeadBundle:CompanyLead',
-                    array(
-                        'lead' => $leadId,
-                        'company' => $companyId
-                    )
+                    [
+                        'lead'    => $leadId,
+                        'company' => $companyId,
+                    ]
                 );
             }
 
@@ -326,8 +323,7 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
 
                     $persistLists[]   = $companyLead;
                     $dispatchEvents[] = $companyId;
-                    $companyName = $companyLeadAdd[$companyId]->getName();
-
+                    $companyName      = $companyLeadAdd[$companyId]->getName();
                 } else {
                     // Detach from Doctrine
                     $this->em->detach($companyLead);
@@ -341,9 +337,9 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
                 $companyLead->setManuallyAdded($manuallyAdded);
                 $companyLead->setDateAdded($dateManipulated);
 
-                $persistCompany[]   = $companyLead;
+                $persistCompany[] = $companyLead;
                 $dispatchEvents[] = $companyId;
-                $companyName = $companyLeadAdd[$companyId]->getName();
+                $companyName      = $companyLeadAdd[$companyId]->getName();
             }
         }
 
@@ -355,7 +351,7 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
         $this->em->clear('Mautic\CompanyBundle\Entity\CompanyLead');
 
         if (!empty($companyName)) {
-            $currentCompanyName  = $lead->getCompany();
+            $currentCompanyName = $lead->getCompany();
             if ($currentCompanyName !== $companyName) {
                 $lead->addUpdatedField('company', $companyName);
                 $this->em->getRepository('MauticLeadBundle:Lead')->saveEntity($lead);
@@ -378,13 +374,13 @@ public function addLeadToCompany($companies, $lead, $manuallyAdded = false, $bat
     }
 
     /**
-     * Remove a lead from company
+     * Remove a lead from company.
      *
-     * @param           $companies
-     * @param           $lead
-     * @param bool      $manuallyRemoved
-     * @param bool      $batchProcess
-     * @param bool      $skipFindOne
+     * @param      $companies
+     * @param      $lead
+     * @param bool $manuallyRemoved
+     * @param bool $batchProcess
+     * @param bool $skipFindOne
      *
      * @throws \Doctrine\ORM\ORMException
      */
@@ -397,28 +393,28 @@ public function removeLeadFromCompany($companies, $lead, $manuallyRemoved = fals
             $leadId = $lead->getId();
         }
 
-        $companyLeadRemove = array();
+        $companyLeadRemove = [];
         if (!$companies instanceof Company) {
             //make sure they are ints
-            $searchForCompanies = array();
+            $searchForCompanies = [];
             foreach ($companies as $k => &$l) {
-                $l = (int)$l;
+                $l = (int) $l;
                 if (!isset($companyLeadRemove[$l])) {
                     $searchForCompanies[] = $l;
                 }
             }
             if (!empty($searchForCompanies)) {
-                $companyEntities = $this->getEntities(array(
-                    'filter' => array(
-                        'force' => array(
-                            array(
+                $companyEntities = $this->getEntities([
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'comp.id',
                                 'expr'   => 'in',
-                                'value'  => $searchForCompanies
-                            )
-                        )
-                    )
-                ));
+                                'value'  => $searchForCompanies,
+                            ],
+                        ],
+                    ],
+                ]);
 
                 foreach ($companyEntities as $company) {
                     $companyLeadRemove[$company->getId()] = $company;
@@ -426,34 +422,33 @@ public function removeLeadFromCompany($companies, $lead, $manuallyRemoved = fals
             }
 
             unset($companyEntities, $searchForCompanies);
-
         } else {
             $companyLeadRemove[$companies->getId()] = $companies;
 
-            $companies = array($companies->getId());
+            $companies = [$companies->getId()];
         }
 
         if (!is_array($companies)) {
-            $companies = array($companies);
+            $companies = [$companies];
         }
-        $persistCompany   = array();
-        $deleteCompany    = array();
-        $dispatchEvents = array();
+        $persistCompany = [];
+        $deleteCompany  = [];
+        $dispatchEvents = [];
 
         foreach ($companies as $companyId) {
-            if (!isset( $companyLeadRemove[$companyId])) {
+            if (!isset($companyLeadRemove[$companyId])) {
                 continue;
             }
 
             $companyLead = (!$skipFindOne) ?
-                $this->getCompanyLeadRepository()->findOneBy(array(
-                    'lead' => $lead,
-                    'company' => $companyLeadRemove[$companyId]
-                )) :
-                $this->em->getReference('MauticCompanyBundle:CompanyLead', array(
-                    'lead' => $leadId,
-                    'company' => $companyId
-                ));
+                $this->getCompanyLeadRepository()->findOneBy([
+                    'lead'    => $lead,
+                    'company' => $companyLeadRemove[$companyId],
+                ]) :
+                $this->em->getReference('MauticCompanyBundle:CompanyLead', [
+                    'lead'    => $leadId,
+                    'company' => $companyId,
+                ]);
 
             if ($companyLead == null) {
                 // Lead is not part of this list
@@ -462,12 +457,12 @@ public function removeLeadFromCompany($companies, $lead, $manuallyRemoved = fals
 
             if (($manuallyRemoved && $companyLead->wasManuallyAdded()) || (!$manuallyRemoved && !$companyLead->wasManuallyAdded())) {
                 //lead was manually added and now manually removed or was not manually added and now being removed
-                $deleteCompanyLead[]    = $companyLead;
-                $dispatchEvents[] = $companyId;
+                $deleteCompanyLead[] = $companyLead;
+                $dispatchEvents[]    = $companyId;
             } elseif ($manuallyRemoved && !$companyLead->wasManuallyAdded()) {
                 $companyLead->setManuallyRemoved(true);
 
-                $persistCompany[]   = $companyLead;
+                $persistCompany[] = $companyLead;
                 $dispatchEvents[] = $companyId;
             }
 
diff --git a/app/bundles/LeadBundle/Model/FieldModel.php b/app/bundles/LeadBundle/Model/FieldModel.php
index a689a129c47..077aabf1df5 100644
--- a/app/bundles/LeadBundle/Model/FieldModel.php
+++ b/app/bundles/LeadBundle/Model/FieldModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,237 +23,236 @@
 /**
  * Class FieldModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class FieldModel extends FormModel
 {
-    static public $coreFields   = [
+    public static $coreFields = [
         // Listed according to $order for installation
-        'title'     => [
+        'title' => [
             'type'       => 'lookup',
             'properties' => ['list' => 'Mr|Mrs|Miss'],
             'fixed'      => true,
-            'object'     => 'lead'
+            'object'     => 'lead',
         ],
         'firstname' => [
-            'fixed' => true,
-            'short' => true,
-            'object'=> 'lead'
+            'fixed'  => true,
+            'short'  => true,
+            'object' => 'lead',
         ],
-        'lastname'  => [
-            'fixed' => true,
-            'short' => true,
-            'object'=> 'lead'
+        'lastname' => [
+            'fixed'  => true,
+            'short'  => true,
+            'object' => 'lead',
         ],
-        'company'          => [
-            'fixed' => true,
-            'object'=> 'lead'
+        'company' => [
+            'fixed'  => true,
+            'object' => 'lead',
         ],
-        'position'         => [
-            'fixed' => true,
-            'object'=> 'lead'
+        'position' => [
+            'fixed'  => true,
+            'object' => 'lead',
         ],
-        'email'            => [
+        'email' => [
             'type'   => 'email',
             'unique' => true,
             'fixed'  => true,
             'short'  => true,
-            'object' => 'lead'
+            'object' => 'lead',
         ],
-        'mobile'           => [
+        'mobile' => [
             'type'     => 'tel',
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
-        'phone'            => [
+        'phone' => [
             'type'     => 'tel',
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
-        'fax'              => [
+        'fax' => [
             'type'     => 'tel',
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
-        'address1'         => [
+        'address1' => [
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
-        'address2'         => [
+        'address2' => [
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
-        'city'             => [
-            'fixed' => true,
-            'object'=> 'lead'
+        'city' => [
+            'fixed'  => true,
+            'object' => 'lead',
         ],
-        'state'            => [
-            'type'  => 'region',
-            'fixed' => true,
-            'object'=> 'lead'
+        'state' => [
+            'type'   => 'region',
+            'fixed'  => true,
+            'object' => 'lead',
         ],
-        'zipcode'          => [
-            'fixed' => true,
-            'object'=> 'lead'
+        'zipcode' => [
+            'fixed'  => true,
+            'object' => 'lead',
         ],
-        'country'          => [
-            'type'  => 'country',
-            'fixed' => true,
-            'object'=> 'lead'
+        'country' => [
+            'type'   => 'country',
+            'fixed'  => true,
+            'object' => 'lead',
         ],
         'preferred_locale' => [
             'type'     => 'locale',
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
         'attribution_date' => [
             'type'     => 'datetime',
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
-        'attribution'      => [
+        'attribution' => [
             'type'       => 'number',
             'properties' => ['roundmode' => 4, 'precision' => 2],
             'fixed'      => true,
             'listable'   => true,
-            'object'     => 'lead'
+            'object'     => 'lead',
         ],
-        'website'          => [
+        'website' => [
             'type'     => 'url',
             'listable' => true,
-            'object'   => 'lead'
+            'object'   => 'lead',
         ],
-        'facebook'   => [
+        'facebook' => [
             'listable' => true,
-            'group' => 'social',
-            'object'=> 'lead'
+            'group'    => 'social',
+            'object'   => 'lead',
         ],
         'foursquare' => [
             'listable' => true,
-            'group' => 'social',
-            'object'=> 'lead'
+            'group'    => 'social',
+            'object'   => 'lead',
         ],
         'googleplus' => [
             'listable' => true,
-            'group' => 'social',
-            'object'=> 'lead'
+            'group'    => 'social',
+            'object'   => 'lead',
         ],
-        'instagram'  => [
+        'instagram' => [
             'listable' => true,
-            'group' => 'social',
-            'object'=> 'lead'
+            'group'    => 'social',
+            'object'   => 'lead',
         ],
-        'linkedin'   => [
+        'linkedin' => [
             'listable' => true,
-            'group' => 'social',
-            'object'=> 'lead'
+            'group'    => 'social',
+            'object'   => 'lead',
         ],
-        'skype'      => [
+        'skype' => [
             'listable' => true,
-            'group' => 'social',
-            'object'=> 'lead'
+            'group'    => 'social',
+            'object'   => 'lead',
         ],
-        'twitter'    => [
+        'twitter' => [
             'listable' => true,
-            'group' => 'social',
-            'object'=> 'lead'
+            'group'    => 'social',
+            'object'   => 'lead',
         ],
     ];
 
-    static public $coreCompanyFields   = [
+    public static $coreCompanyFields = [
         // Listed according to $order for installation
-        'companyaddress1'          => [
-            'fixed' => true,
+        'companyaddress1' => [
+            'fixed'    => true,
             'listable' => true,
-            'object'=> 'company'
+            'object'   => 'company',
         ],
-        'companyaddress2'         => [
-            'fixed' => true,
+        'companyaddress2' => [
+            'fixed'    => true,
             'listable' => true,
-            'object'=> 'company'
+            'object'   => 'company',
         ],
-        'companyemail'            => [
+        'companyemail' => [
             'type'   => 'email',
             'unique' => true,
             'fixed'  => true,
-            'object' => 'company'
+            'object' => 'company',
         ],
-        'companyphone'           => [
+        'companyphone' => [
             'type'     => 'tel',
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'company'
+            'object'   => 'company',
         ],
-        'companycity'            => [
+        'companycity' => [
             'type'     => 'tel',
             'fixed'    => true,
             'listable' => true,
-            'object'   => 'company'
+            'object'   => 'company',
         ],
-        'companystate'            => [
-            'type'  => 'region',
-            'fixed' => true,
-            'object'=> 'company'
+        'companystate' => [
+            'type'   => 'region',
+            'fixed'  => true,
+            'object' => 'company',
         ],
-        'companyzipcode'              => [
+        'companyzipcode' => [
             'type'     => 'tel',
             'listable' => true,
-            'object'   => 'company'
+            'object'   => 'company',
         ],
-        'companycountry'         => [
-            'type'  => 'country',
-            'fixed' => true,
-            'object'=> 'company'
+        'companycountry' => [
+            'type'   => 'country',
+            'fixed'  => true,
+            'object' => 'company',
         ],
-        'companyname'            => [
-            'fixed' => true,
-            'required' =>true,
-            'object'=> 'company'
+        'companyname' => [
+            'fixed'    => true,
+            'required' => true,
+            'object'   => 'company',
         ],
-        'companywebsite'          => [
+        'companywebsite' => [
             'type'     => 'url',
             'listable' => true,
-            'object'   => 'company'
+            'object'   => 'company',
         ],
         'companynumber_of_employees' => [
             'type'       => 'number',
             'properties' => ['roundmode' => 4, 'precision' => 0],
-            'fixed' => true,
-            'group' => 'professional',
-            'object'=> 'company'
+            'fixed'      => true,
+            'group'      => 'professional',
+            'object'     => 'company',
         ],
         'companyfax' => [
             'type'     => 'tel',
             'listable' => true,
-            'group' => 'professional',
-            'object'   => 'company'
+            'group'    => 'professional',
+            'object'   => 'company',
         ],
-        'companyannual_revenue'      => [
+        'companyannual_revenue' => [
             'type'       => 'number',
             'properties' => ['roundmode' => 4, 'precision' => 2],
             'fixed'      => true,
             'listable'   => true,
-            'group' => 'professional',
-            'object'     => 'company'
+            'group'      => 'professional',
+            'object'     => 'company',
         ],
-        'companyindustry'  => [
+        'companyindustry' => [
             'type'       => 'select',
-            'group'    => 'professional',
+            'group'      => 'professional',
             'properties' => ['list' => 'Agriculture|Apparel|Banking|Biotechnology|Chemicals|Communications|Construction|Education|Electronics|Energy|Engineering|Entertainment|Environmental|Finance|Food & Beverage|Government|Healthcare|Hospitality|Insurance|Machinery|Manufacturing|Media|Not for Profit|Recreation|Retail|Shipping|Technology|Telecommunications|Transportation|Utilities|Other'],
             'fixed'      => true,
-            'object'     => 'company'
+            'object'     => 'company',
+        ],
+        'companydescription' => [
+            'fixed'  => true,
+            'group'  => 'professional',
+            'object' => 'company',
         ],
-        'companydescription'         => [
-            'fixed'    => true,
-            'group'    => 'professional',
-            'object'   => 'company'
-        ]
     ];
 
     /**
@@ -289,9 +289,10 @@ public function getPermissionBase()
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
+     *
      * @return null|object
      */
     public function getEntity($id = null)
@@ -306,26 +307,27 @@ public function getEntity($id = null)
     }
 
     /**
-     * Returns lead custom fields
+     * Returns lead custom fields.
      *
      * @param $args
      *
      * @return array
      */
-    public function getEntities(array $args = array())
+    public function getEntities(array $args = [])
     {
         return $this->em->getRepository('MauticLeadBundle:LeadField')->getEntities($args);
     }
 
     /**
-     * @param       $entity
-     * @param       $unlock
+     * @param   $entity
+     * @param   $unlock
+     *
      * @return mixed
      */
     public function saveEntity($entity, $unlock = true)
     {
         if (!$entity instanceof LeadField) {
-            throw new MethodNotAllowedHttpException(array('LeadEntity'));
+            throw new MethodNotAllowedHttpException(['LeadEntity']);
         }
 
         $isNew = ($entity->getId()) ? false : true;
@@ -333,8 +335,8 @@ public function saveEntity($entity, $unlock = true)
         //set some defaults
         $this->setTimestamps($entity, $isNew, $unlock);
         $objects = ['lead' => 'leads', 'company' => 'companies'];
-        $alias = $entity->getAlias();
-        $object = $objects[$entity->getObject()];
+        $alias   = $entity->getAlias();
+        $object  = $objects[$entity->getObject()];
 
         if ($isNew) {
             if (empty($alias)) {
@@ -352,13 +354,13 @@ public function saveEntity($entity, $unlock = true)
             $repo      = $this->getRepository();
             $testAlias = $alias;
             $aliases   = $repo->getAliases($entity->getId());
-            $count     = (int)in_array($testAlias, $aliases);
+            $count     = (int) in_array($testAlias, $aliases);
             $aliasTag  = $count;
 
             while ($count) {
-                $testAlias = $alias . $aliasTag;
-                $count     = (int)in_array($testAlias, $aliases);
-                $aliasTag++;
+                $testAlias = $alias.$aliasTag;
+                $count     = (int) in_array($testAlias, $aliases);
+                ++$aliasTag;
             }
 
             if ($testAlias != $alias) {
@@ -373,9 +375,9 @@ public function saveEntity($entity, $unlock = true)
             $entity->setIsListable(false);
         }
 
-        $event = $this->dispatchEvent("pre_save", $entity, $isNew);
+        $event = $this->dispatchEvent('pre_save', $entity, $isNew);
         $this->getRepository()->saveEntity($entity);
-        $this->dispatchEvent("post_save", $entity, $isNew, $event);
+        $this->dispatchEvent('post_save', $entity, $isNew, $event);
 
         $isUnique = $entity->getIsUniqueIdentifier();
 
@@ -431,7 +433,7 @@ public function deleteEntity($entity)
         parent::deleteEntity($entity);
 
         $objects = ['lead' => 'leads', 'company' => 'companies'];
-        $object = $objects[$entity->getObject()];
+        $object  = $objects[$entity->getObject()];
 
         //remove the column from the leads table
         $leadsSchema = $this->schemaHelperFactory->getSchemaHelper('column', $object);
@@ -440,7 +442,7 @@ public function deleteEntity($entity)
     }
 
     /**
-     * Delete an array of entities
+     * Delete an array of entities.
      *
      * @param array $ids
      *
@@ -459,17 +461,17 @@ public function deleteEntities($ids)
     }
 
     /**
-     * Reorder fields based on passed entity position
+     * Reorder fields based on passed entity position.
      *
      * @param $entity
      */
     public function reorderFieldsByEntity($entity)
     {
         if (!$entity instanceof LeadField) {
-            throw new MethodNotAllowedHttpException(array('LeadEntity'));
+            throw new MethodNotAllowedHttpException(['LeadEntity']);
         }
 
-        $fields = $this->getRepository()->findBy(array(), array('order' => 'ASC'));
+        $fields = $this->getRepository()->findBy([], ['order' => 'ASC']);
         $count  = 1;
         $order  = $entity->getOrder();
         $id     = $entity->getId();
@@ -489,20 +491,20 @@ public function reorderFieldsByEntity($entity)
             } else {
                 $hit = true;
             }
-            $count++;
+            ++$count;
         }
         $this->em->flush();
     }
 
     /**
-     * Reorders fields by a list of field ids
+     * Reorders fields by a list of field ids.
      *
      * @param array $list
      * @param int   $start Number to start the order by (used for paginated reordering)
      */
     public function reorderFieldsByList(array $list, $start = 1)
     {
-        $fields = $this->getRepository()->findBy(array(), array('order' => 'ASC'));
+        $fields = $this->getRepository()->findBy([], ['order' => 'ASC']);
         foreach ($fields as $field) {
             if (in_array($field->getId(), $list)) {
                 $order = ((int) array_search($field->getId(), $list) + $start);
@@ -514,11 +516,12 @@ public function reorderFieldsByList(array $list, $start = 1)
     }
 
     /**
-     * Get list of custom field values for autopopulate fields
+     * Get list of custom field values for autopopulate fields.
      *
      * @param $type
      * @param $filter
      * @param $limit
+     *
      * @return array
      */
     public function getLookupResults($type, $filter = '', $limit = 10)
@@ -529,37 +532,41 @@ public function getLookupResults($type, $filter = '', $limit = 10)
     /**
      * {@inheritdoc}
      *
-     * @param      $entity
-     * @param      $formFactory
-     * @param null $action
+     * @param       $entity
+     * @param       $formFactory
+     * @param null  $action
      * @param array $options
+     *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof LeadField) {
-            throw new MethodNotAllowedHttpException(array('LeadField'));
+            throw new MethodNotAllowedHttpException(['LeadField']);
         }
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
+
         return $formFactory->create('leadfield', $entity, $params);
     }
 
     /**
      * @param $entity
      * @param properties
+     *
      * @return bool
      */
     public function setFieldProperties(&$entity, $properties)
     {
         if (!$entity instanceof LeadField) {
-            throw new MethodNotAllowedHttpException(array('LeadEntity'));
+            throw new MethodNotAllowedHttpException(['LeadEntity']);
         }
 
         if (!empty($properties) && is_array($properties)) {
             $properties = InputHelper::clean($properties);
         } else {
-            $properties = array();
+            $properties = [];
         }
 
         //validate properties
@@ -567,6 +574,7 @@ public function setFieldProperties(&$entity, $properties)
         $result = FormFieldHelper::validateProperties($type, $properties);
         if ($result[0]) {
             $entity->setProperties($properties);
+
             return true;
         } else {
             return $result[1];
@@ -580,25 +588,26 @@ public function setFieldProperties(&$entity, $properties)
      * @param $event
      * @param $entity
      * @param $isNew
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof LeadField) {
-            throw new MethodNotAllowedHttpException(array('LeadField'));
+            throw new MethodNotAllowedHttpException(['LeadField']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = LeadEvents::FIELD_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = LeadEvents::FIELD_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = LeadEvents::FIELD_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = LeadEvents::FIELD_POST_DELETE;
                 break;
             default:
@@ -626,30 +635,30 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
      *
      * @return array
      */
-    public function getFieldList($byGroup = true, $alphabetical = true, $filters = array('isPublished' => true, 'object' => 'lead'))
+    public function getFieldList($byGroup = true, $alphabetical = true, $filters = ['isPublished' => true, 'object' => 'lead'])
     {
-        $forceFilters = array();
+        $forceFilters = [];
         foreach ($filters as $col => $val) {
-            $forceFilters[] = array(
+            $forceFilters[] = [
                 'column' => "f.{$col}",
                 'expr'   => 'eq',
-                'value'  => $val
-            );
+                'value'  => $val,
+            ];
         }
         // Get a list of custom form fields
-        $fields = $this->getEntities(array(
-            'filter'     => array(
-                'force' => $forceFilters
-            ),
+        $fields = $this->getEntities([
+            'filter' => [
+                'force' => $forceFilters,
+            ],
             'orderBy'    => 'f.order',
-            'orderByDir' => 'asc'
-        ));
+            'orderByDir' => 'asc',
+        ]);
 
-        $leadFields = array();
+        $leadFields = [];
 
         foreach ($fields as $f) {
             if ($byGroup) {
-                $fieldName = $this->translator->trans('mautic.lead.field.group.' . $f->getGroup());
+                $fieldName                              = $this->translator->trans('mautic.lead.field.group.'.$f->getGroup());
                 $leadFields[$fieldName][$f->getAlias()] = $f->getLabel();
             } else {
                 $leadFields[$f->getAlias()] = $f->getLabel();
@@ -682,7 +691,7 @@ public function getFieldListWithProperties($object = 'lead')
             [
                 'object'           => $object,
                 'ignore_paginator' => true,
-                'hydration_mode'   => 'hydrate_array'
+                'hydration_mode'   => 'hydrate_array',
             ]
         );
 
@@ -693,7 +702,7 @@ public function getFieldListWithProperties($object = 'lead')
                 'alias'        => $contactField['alias'],
                 'type'         => $contactField['type'],
                 'group'        => $contactField['group'],
-                'group_label'  => $this->translator->trans('mautic.lead.field.group.' . $contactField['group']),
+                'group_label'  => $this->translator->trans('mautic.lead.field.group.'.$contactField['group']),
                 'defaultValue' => $contactField['defaultValue'],
                 'properties'   => $contactField['properties'],
             ];
@@ -703,39 +712,39 @@ public function getFieldListWithProperties($object = 'lead')
     }
 
     /**
-     * Get the fields for a specific group
+     * Get the fields for a specific group.
      *
      * @param       $group
      * @param array $filters
      *
      * @return array
      */
-    public function getGroupFields($group, $filters = array('isPublished' => true))
+    public function getGroupFields($group, $filters = ['isPublished' => true])
     {
-        $forceFilters = array(
-            array(
+        $forceFilters = [
+            [
                 'column' => 'f.group',
                 'expr'   => 'eq',
-                'value'  => $group
-            )
-        );
+                'value'  => $group,
+            ],
+        ];
         foreach ($filters as $col => $val) {
-            $forceFilters[] = array(
+            $forceFilters[] = [
                 'column' => "f.{$col}",
                 'expr'   => 'eq',
-                'value'  => $val
-            );
+                'value'  => $val,
+            ];
         }
         // Get a list of custom form fields
-        $fields = $this->getEntities(array(
-            'filter'     => array(
-                'force' => $forceFilters
-            ),
+        $fields = $this->getEntities([
+            'filter' => [
+                'force' => $forceFilters,
+            ],
             'orderBy'    => 'f.order',
-            'orderByDir' => 'asc'
-        ));
+            'orderByDir' => 'asc',
+        ]);
 
-        $leadFields = array();
+        $leadFields = [];
 
         foreach ($fields as $f) {
             $leadFields[$f->getAlias()] = $f->getLabel();
@@ -745,13 +754,13 @@ public function getGroupFields($group, $filters = array('isPublished' => true))
     }
 
     /**
-     * Retrieves a list of published fields that are unique identifers
+     * Retrieves a list of published fields that are unique identifers.
      *
      * @return array
      */
     public function getUniqueIdentiferFields()
     {
-        $filters = array ('isPublished' => true, 'isUniqueIdentifer' => true);
+        $filters = ['isPublished' => true, 'isUniqueIdentifer' => true];
 
         $fields = $this->getFieldList(false, true, $filters);
 
@@ -759,7 +768,7 @@ public function getUniqueIdentiferFields()
     }
 
     /**
-     * Wrapper for misspelled getUniqueIdentiferFields
+     * Wrapper for misspelled getUniqueIdentiferFields.
      *
      * @return array
      */
@@ -771,23 +780,22 @@ public function getUniqueIdentifierFields()
     /**
      * Get the MySQL database type based on the field type
      * Use a static function so that it's accessible from DoctrineSubscriber
-     * without causing a circular service injection error
+     * without causing a circular service injection error.
      *
      * @param $fieldType
      *
      * @return array
      */
-    static public function getSchemaDefinition($alias, $type, $isUnique = false)
+    public static function getSchemaDefinition($alias, $type, $isUnique = false)
     {
         // Unique is always a string in order to control index length
         if ($isUnique) {
-
             return [
                 'name'    => $alias,
                 'type'    => 'string',
                 'options' => [
-                    'notnull' => false
-                ]
+                    'notnull' => false,
+                ],
             ];
         }
 
@@ -817,7 +825,7 @@ static public function getSchemaDefinition($alias, $type, $isUnique = false)
         return [
             'name'    => $alias,
             'type'    => $schemaType,
-            'options' => ['notnull' => false]
+            'options' => ['notnull' => false],
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Model/LeadModel.php b/app/bundles/LeadBundle/Model/LeadModel.php
index d92a3e84f8f..bb4950bfdbb 100644
--- a/app/bundles/LeadBundle/Model/LeadModel.php
+++ b/app/bundles/LeadBundle/Model/LeadModel.php
@@ -1,24 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Model;
 
+use Mautic\CoreBundle\Entity\IpAddress;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
+use Mautic\CoreBundle\Helper\Chart\PieChart;
 use Mautic\CoreBundle\Helper\CookieHelper;
+use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Helper\PathsHelper;
-use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\CoreBundle\Model\FormModel;
+use Mautic\EmailBundle\Helper\MailHelper;
 use Mautic\LeadBundle\Entity\Company;
-use Mautic\LeadBundle\Helper\IdentifyCompanyHelper;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
-use Mautic\CoreBundle\Entity\IpAddress;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Entity\FrequencyRule;
 use Mautic\LeadBundle\Entity\Lead;
@@ -32,10 +35,8 @@
 use Mautic\LeadBundle\Event\LeadEvent;
 use Mautic\LeadBundle\Event\LeadMergeEvent;
 use Mautic\LeadBundle\Event\LeadTimelineEvent;
+use Mautic\LeadBundle\Helper\IdentifyCompanyHelper;
 use Mautic\LeadBundle\LeadEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\StageBundle\Entity\Stage;
 use Symfony\Component\EventDispatcher\Event;
@@ -47,7 +48,6 @@
 /**
  * Class LeadModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class LeadModel extends FormModel
 {
@@ -121,8 +121,7 @@ public function __construct(
         ListModel $leadListModel,
         FormFactory $formFactory,
         CompanyModel $companyModel
-    )
-    {
+    ) {
         $this->request           = $requestStack->getCurrentRequest();
         $this->cookieHelper      = $cookieHelper;
         $this->ipLookupHelper    = $ipLookupHelper;
@@ -151,10 +150,10 @@ public function getRepository()
             //set the point trigger model in order to get the color code for the lead
             $fields = $this->leadFieldModel->getFieldList(true, false);
 
-            $socialFields = (!empty($fields['social'])) ? array_keys($fields['social']) : array();
+            $socialFields = (!empty($fields['social'])) ? array_keys($fields['social']) : [];
             $repo->setAvailableSocialFields($socialFields);
 
-            $searchFields = array();
+            $searchFields = [];
             foreach ($fields as $group => $groupFields) {
                 $searchFields = array_merge($searchFields, array_keys($groupFields));
             }
@@ -165,7 +164,7 @@ public function getRepository()
     }
 
     /**
-     * Get the tags repository
+     * Get the tags repository.
      *
      * @return \Mautic\LeadBundle\Entity\TagRepository
      */
@@ -180,11 +179,10 @@ public function getTagRepository()
     public function getPointLogRepository()
     {
         return $this->em->getRepository('MauticLeadBundle:PointsChangeLog');
-
     }
 
     /**
-     * Get the tags repository
+     * Get the tags repository.
      *
      * @return \Mautic\LeadBundle\Entity\UtmTagRepository
      */
@@ -194,7 +192,7 @@ public function getUtmTagRepository()
     }
 
     /**
-     * Get the tags repository
+     * Get the tags repository.
      *
      * @return \Mautic\LeadBundle\Entity\StatDeviceRepository
      */
@@ -204,7 +202,7 @@ public function getDeviceRepository()
     }
 
     /**
-     * Get the frequency rules repository
+     * Get the frequency rules repository.
      *
      * @return \Mautic\LeadBundle\Entity\FrequencyRuleRepository
      */
@@ -230,7 +228,7 @@ public function getPermissionBase()
      */
     public function getNameGetter()
     {
-        return "getPrimaryIdentifier";
+        return 'getPrimaryIdentifier';
     }
 
     /**
@@ -242,23 +240,26 @@ public function getNameGetter()
      * @param array                               $options
      *
      * @return \Symfony\Component\Form\Form
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Lead) {
-            throw new MethodNotAllowedHttpException(array('Lead'), 'Entity must be of class Lead()');
+            throw new MethodNotAllowedHttpException(['Lead'], 'Entity must be of class Lead()');
         }
-        if (!empty($action))  {
+        if (!empty($action)) {
             $options['action'] = $action;
         }
+
         return $formFactory->create('lead', $entity, $options);
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
+     *
      * @return null|Lead
      */
     public function getEntity($id = null)
@@ -277,25 +278,26 @@ public function getEntity($id = null)
      * @param $event
      * @param $entity
      * @param $isNew
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Lead) {
-            throw new MethodNotAllowedHttpException(array('Lead'), 'Entity must be of class Lead()');
+            throw new MethodNotAllowedHttpException(['Lead'], 'Entity must be of class Lead()');
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = LeadEvents::LEAD_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = LeadEvents::LEAD_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = LeadEvents::LEAD_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = LeadEvents::LEAD_POST_DELETE;
                 break;
             default:
@@ -319,13 +321,13 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
      * {@inheritdoc}
      *
      * @param Lead $entity
-     * @param bool   $unlock
+     * @param bool $unlock
      */
     public function saveEntity($entity, $unlock = true)
     {
         $companyFieldMatches = [];
-        $fields = $entity->getFields();
-        $updatedFields = $entity->getUpdatedFields();
+        $fields              = $entity->getFields();
+        $updatedFields       = $entity->getUpdatedFields();
 
         if (isset($updatedFields['company'])) {
             $companyFieldMatches['company'] = $updatedFields['company'];
@@ -376,7 +378,7 @@ public function deleteEntity($entity)
     {
         // Delete custom avatar if one exists
         $imageDir = $this->pathsHelper->getSystemPath('images', true);
-        $avatar   = $imageDir . '/lead_avatars/avatar' . $entity->getId();
+        $avatar   = $imageDir.'/lead_avatars/avatar'.$entity->getId();
 
         if (file_exists($avatar)) {
             unlink($avatar);
@@ -386,7 +388,7 @@ public function deleteEntity($entity)
     }
 
     /**
-     * Populates custom field values for updating the lead. Also retrieves social media data
+     * Populates custom field values for updating the lead. Also retrieves social media data.
      *
      * @param Lead       $lead
      * @param array      $data
@@ -425,7 +427,7 @@ public function setFieldValues(Lead &$lead, array $data, $overwriteWithBlank = f
                 $fields = $this->leadFieldModel->getEntities(
                     [
                         'filter'         => ['isPublished' => true, 'object' => 'lead'],
-                        'hydration_mode' => 'HYDRATE_ARRAY'
+                        'hydration_mode' => 'HYDRATE_ARRAY',
                     ]
                 );
                 $fields = $this->organizeFieldsByGroup($fields);
@@ -446,7 +448,7 @@ public function setFieldValues(Lead &$lead, array $data, $overwriteWithBlank = f
                     $newValue = $data[$alias];
 
                     if (is_array($newValue)) {
-                        $newValue = implode("|", $newValue);
+                        $newValue = implode('|', $newValue);
                     }
 
                     if ($curValue !== $newValue && (strlen($newValue) > 0 || (strlen($newValue) === 0 && $overwriteWithBlank))) {
@@ -482,7 +484,7 @@ public function setFieldValues(Lead &$lead, array $data, $overwriteWithBlank = f
     }
 
     /**
-     * Disassociates a user from leads
+     * Disassociates a user from leads.
      *
      * @param $userId
      */
@@ -496,20 +498,21 @@ public function disassociateOwner($userId)
     }
 
     /**
-     * Get list of entities for autopopulate fields
+     * Get list of entities for autopopulate fields.
      *
      * @param $type
      * @param $filter
      * @param $limit
      * @param $start
+     *
      * @return array
      */
     public function getLookupResults($type, $filter = '', $limit = 10, $start = 0)
     {
-        $results = array();
+        $results = [];
         switch ($type) {
             case 'user':
-                $results = $this->em->getRepository('MauticUserBundle:User')->getUserList($filter, $limit, $start, array('lead' => 'leads'));
+                $results = $this->em->getRepository('MauticUserBundle:User')->getUserList($filter, $limit, $start, ['lead' => 'leads']);
                 break;
         }
 
@@ -517,18 +520,19 @@ public function getLookupResults($type, $filter = '', $limit = 10, $start = 0)
     }
 
     /**
-     * Obtain an array of users for api lead edits
+     * Obtain an array of users for api lead edits.
      *
      * @return mixed
      */
     public function getOwnerList()
     {
         $results = $this->em->getRepository('MauticUserBundle:User')->getUserList('', 0);
+
         return $results;
     }
 
     /**
-     * Obtains a list of leads based off IP
+     * Obtains a list of leads based off IP.
      *
      * @param $ip
      *
@@ -540,7 +544,7 @@ public function getLeadsByIp($ip)
     }
 
     /**
-     * Gets the details of a lead if not already set
+     * Gets the details of a lead if not already set.
      *
      * @param $lead
      *
@@ -548,12 +552,11 @@ public function getLeadsByIp($ip)
      */
     public function getLeadDetails($lead)
     {
-        static $details = array();
+        static $details = [];
 
         if ($lead instanceof Lead) {
             $fields = $lead->getFields();
             if (!empty($fields)) {
-
                 return $fields;
             }
         }
@@ -564,14 +567,15 @@ public function getLeadDetails($lead)
     }
 
     /**
-     * Reorganizes a field list to be keyed by field's group then alias
+     * Reorganizes a field list to be keyed by field's group then alias.
      *
      * @param $fields
+     *
      * @return array
      */
     public function organizeFieldsByGroup($fields)
     {
-        $array = array();
+        $array = [];
 
         foreach ($fields as $field) {
             if ($field instanceof LeadField) {
@@ -587,7 +591,7 @@ public function organizeFieldsByGroup($fields)
             } else {
                 $alias = $field['alias'];
                 if ($field['isPublished'] and $field['object'] === 'lead') {
-                    $group = $field['group'];
+                    $group                          = $field['group'];
                     $array[$group][$alias]['id']    = $field['id'];
                     $array[$group][$alias]['group'] = $group;
                     $array[$group][$alias]['label'] = $field['label'];
@@ -598,10 +602,10 @@ public function organizeFieldsByGroup($fields)
         }
 
         //make sure each group key is present
-        $groups = array('core', 'social', 'personal', 'professional');
+        $groups = ['core', 'social', 'personal', 'professional'];
         foreach ($groups as $g) {
             if (!isset($array[$g])) {
-                $array[$g] = array();
+                $array[$g] = [];
             }
         }
 
@@ -609,16 +613,17 @@ public function organizeFieldsByGroup($fields)
     }
 
     /**
-     * Takes leads organized by group and flattens them into just alias => value
+     * Takes leads organized by group and flattens them into just alias => value.
      *
      * @param $fields
+     *
      * @deprecated 2.0 to be removed in 3.0 - Use the Lead entity's getProfileFields() instead
      *
      * @return array
      */
     public function flattenFields($fields)
     {
-        $flat = array();
+        $flat = [];
         foreach ($fields as $group => $fields) {
             foreach ($fields as $field) {
                 $flat[$field['alias']] = $field['value'];
@@ -629,7 +634,7 @@ public function flattenFields($fields)
     }
 
     /**
-     * Returns flat array for single lead
+     * Returns flat array for single lead.
      *
      * @param $leadId
      *
@@ -642,7 +647,7 @@ public function getLead($leadId)
 
     /**
      * Get the current lead; if $returnTracking = true then array with lead, trackingId, and boolean of if trackingId
-     * was just generated or not
+     * was just generated or not.
      *
      * @param bool|false $returnTracking
      *
@@ -660,10 +665,10 @@ public function getCurrentLead($returnTracking = false)
         }
 
         if ($this->request) {
-            $this->logger->addDebug("LEAD: Tracking session for ".$this->request->getMethod()." ".$this->request->getRequestUri());
+            $this->logger->addDebug('LEAD: Tracking session for '.$this->request->getMethod().' '.$this->request->getRequestUri());
         }
         list($trackingId, $generated) = $this->getTrackingCookie();
-        $this->logger->addDebug("LEAD: Tracking ID for this contact is {$trackingId} (".(int) $generated.")");
+        $this->logger->addDebug("LEAD: Tracking ID for this contact is {$trackingId} (".(int) $generated.')');
 
         if (empty($this->currentLead)) {
             $leadId = $this->request->cookies->get($trackingId);
@@ -728,23 +733,23 @@ public function getCurrentLead($returnTracking = false)
             define('MAUTIC_LEAD_LASTACTIVE_LOGGED', 1);
         }
 
-        return ($returnTracking) ? array($this->currentLead, $trackingId, $generated) : $this->currentLead;
+        return ($returnTracking) ? [$this->currentLead, $trackingId, $generated] : $this->currentLead;
     }
 
     /**
-     * Get the lead from request (ct/clickthrough) and handles auto merging of lead data from request parameters
+     * Get the lead from request (ct/clickthrough) and handles auto merging of lead data from request parameters.
      *
      * @deprecated - here till all lead methods are converted to contact methods; preferably use getContactFromRequest instead
      *
      * @param array $queryFields
      */
-    public function getLeadFromRequest(array $queryFields =  [])
+    public function getLeadFromRequest(array $queryFields = [])
     {
         return $this->getContactFromRequest($queryFields);
     }
 
     /**
-     * Get the contat from request (ct/clickthrough) and handles auto merging of contact data from request parameters
+     * Get the contat from request (ct/clickthrough) and handles auto merging of contact data from request parameters.
      *
      * @param array $queryFields
      */
@@ -778,7 +783,7 @@ public function getContactFromRequest($queryFields = [])
             false,
             [
                 'isPublished'         => true,
-                'isPubliclyUpdatable' => true
+                'isPubliclyUpdatable' => true,
             ]
         );
 
@@ -831,7 +836,7 @@ public function getContactFromRequest($queryFields = [])
     }
 
     /**
-     * Sets current lead
+     * Sets current lead.
      *
      * @param Lead $lead
      */
@@ -879,11 +884,11 @@ public function setCurrentLead(Lead $lead)
     }
 
     /**
-     * Used by system processes that hook into events that use getCurrentLead()
+     * Used by system processes that hook into events that use getCurrentLead().
      *
      * @param Lead $lead
      */
-    function setSystemCurrentLead(Lead $lead = null)
+    public function setSystemCurrentLead(Lead $lead = null)
     {
         $fields = $lead->getFields();
         if (empty($fields)) {
@@ -894,7 +899,7 @@ function setSystemCurrentLead(Lead $lead = null)
     }
 
     /**
-     * Get a list of lists this lead belongs to
+     * Get a list of lists this lead belongs to.
      *
      * @param Lead       $lead
      * @param bool|false $forLists
@@ -905,11 +910,12 @@ function setSystemCurrentLead(Lead $lead = null)
     public function getLists(Lead $lead, $forLists = false, $arrayHydration = false)
     {
         $repo = $this->em->getRepository('MauticLeadBundle:LeadList');
+
         return $repo->getLeadLists($lead->getId(), $forLists, $arrayHydration);
     }
 
     /**
-     * Get or generate the tracking ID for the current session
+     * Get or generate the tracking ID for the current session.
      *
      * @param bool|false $forceRegeneration
      *
@@ -928,7 +934,7 @@ public function getTrackingCookie($forceRegeneration = false)
             //create a tracking cookie
             $this->cookieHelper->setCookie('mautic_session_id', $trackingId);
 
-            return array($trackingId, $oldTrackingId);
+            return [$trackingId, $oldTrackingId];
         }
 
         if (empty($trackingId)) {
@@ -944,18 +950,18 @@ public function getTrackingCookie($forceRegeneration = false)
             $this->cookieHelper->setCookie('mautic_session_id', $trackingId);
         }
 
-        return array($trackingId, $generated);
+        return [$trackingId, $generated];
     }
 
     /**
-     * Sets the leadId for the current session
+     * Sets the leadId for the current session.
      *
      * @param $leadId
      */
     public function setLeadCookie($leadId)
     {
         // Remove the old if set
-        $oldTrackingId = $this->request->cookies->get('mautic_session_id');
+        $oldTrackingId                = $this->request->cookies->get('mautic_session_id');
         list($trackingId, $generated) = $this->getTrackingCookie();
 
         if ($generated && $oldTrackingId) {
@@ -966,11 +972,11 @@ public function setLeadCookie($leadId)
     }
 
     /**
-     * Add lead to lists
+     * Add lead to lists.
      *
-     * @param array|Lead        $lead
-     * @param array|LeadList    $lists
-     * @param bool              $manuallyAdded
+     * @param array|Lead     $lead
+     * @param array|LeadList $lists
+     * @param bool           $manuallyAdded
      */
     public function addToLists($lead, $lists, $manuallyAdded = true)
     {
@@ -978,7 +984,7 @@ public function addToLists($lead, $lists, $manuallyAdded = true)
     }
 
     /**
-     * Remove lead from lists
+     * Remove lead from lists.
      *
      * @param      $lead
      * @param      $lists
@@ -989,11 +995,11 @@ public function removeFromLists($lead, $lists, $manuallyRemoved = true)
         $this->leadListModel->removeLead($lead, $lists, $manuallyRemoved);
     }
     /**
-     * Add lead to lists
+     * Add lead to lists.
      *
-     * @param array|Lead        $lead
-     * @param array|LeadList    $stage
-     * @param bool              $manuallyAdded
+     * @param array|Lead     $lead
+     * @param array|LeadList $stage
+     * @param bool           $manuallyAdded
      */
     public function addToStages($lead, $stage, $manuallyAdded = true)
     {
@@ -1004,14 +1010,13 @@ public function addToStages($lead, $stage, $manuallyAdded = true)
         $lead->setStage($stage);
         $lead->stageChangeLogEntry(
             'batch',
-            $stage->getId() . ": " . $stage->getName(),
+            $stage->getId().': '.$stage->getName(),
             'Manually Added'
         );
-
     }
 
     /**
-     * Remove lead from Stage
+     * Remove lead from Stage.
      *
      * @param      $lead
      * @param      $stage
@@ -1028,7 +1033,7 @@ public function removeFromStages($lead, $stage, $manuallyRemoved = true)
     }
 
     /**
-     * Merge two leads; if a conflict of data occurs, the newest lead will get precedence
+     * Merge two leads; if a conflict of data occurs, the newest lead will get precedence.
      *
      * @param Lead $lead
      * @param Lead $lead2
@@ -1058,7 +1063,7 @@ public function mergeLeads(Lead $lead, Lead $lead2, $autoMode = true)
             $mergeWith = $lead2;
             $mergeFrom = $lead;
         }
-        $this->logger->debug('LEAD: Lead ID# ' . $mergeFrom->getId() . ' will be merged into ID# ' . $mergeWith->getId());
+        $this->logger->debug('LEAD: Lead ID# '.$mergeFrom->getId().' will be merged into ID# '.$mergeWith->getId());
 
         //dispatch pre merge event
         $event = new LeadMergeEvent($mergeWith, $mergeFrom);
@@ -1071,7 +1076,7 @@ public function mergeLeads(Lead $lead, Lead $lead2, $autoMode = true)
         foreach ($ipAddresses as $ip) {
             $mergeWith->addIpAddress($ip);
 
-            $this->logger->debug('LEAD: Associating with IP ' . $ip->getIpAddress());
+            $this->logger->debug('LEAD: Associating with IP '.$ip->getIpAddress());
         }
 
         //merge fields
@@ -1082,7 +1087,7 @@ public function mergeLeads(Lead $lead, Lead $lead2, $autoMode = true)
                 if (!empty($details['value'])) {
                     $mergeWith->addUpdatedField($alias, $details['value']);
 
-                    $this->logger->debug('LEAD: Updated ' . $alias . ' = ' . $details['value']);
+                    $this->logger->debug('LEAD: Updated '.$alias.' = '.$details['value']);
                 }
             }
         }
@@ -1094,14 +1099,14 @@ public function mergeLeads(Lead $lead, Lead $lead2, $autoMode = true)
         if ($oldOwner === null && $newOwner !== null) {
             $mergeWith->setOwner($newOwner);
 
-            $this->logger->debug('LEAD: New owner is ' . $newOwner->getId());
+            $this->logger->debug('LEAD: New owner is '.$newOwner->getId());
         }
 
         //sum points
         $mergeWithPoints = $mergeWith->getPoints();
         $mergeFromPoints = $mergeFrom->getPoints();
         $mergeWith->setPoints($mergeWithPoints + $mergeFromPoints);
-        $this->logger->debug('LEAD: Adding ' . $mergeFromPoints . ' points to lead');
+        $this->logger->debug('LEAD: Adding '.$mergeFromPoints.' points to lead');
 
         //merge tags
         $mergeFromTags = $mergeFrom->getTags();
@@ -1124,7 +1129,7 @@ public function mergeLeads(Lead $lead, Lead $lead2, $autoMode = true)
     }
 
     /**
-     * @param Lead $lead
+     * @param Lead   $lead
      * @param string $channel
      *
      * @return int
@@ -1162,11 +1167,11 @@ public function isContactable(Lead $lead, $channel)
     /**
      * Remove a Lead's DNC entry based on channel.
      *
-     * @param Lead $lead
-     * @param string $channel
+     * @param Lead      $lead
+     * @param string    $channel
      * @param bool|true $persist
      *
-     * @return boolean
+     * @return bool
      */
     public function removeDncForLead(Lead $lead, $channel, $persist = true)
     {
@@ -1187,17 +1192,17 @@ public function removeDncForLead(Lead $lead, $channel, $persist = true)
     }
 
     /**
-     * Create a DNC entry for a lead
+     * Create a DNC entry for a lead.
      *
-     * @param Lead          $lead
-     * @param string|array  $channel  If an array with an ID, use the structure ['email' => 123]
-     * @param string        $comments
-     * @param int           $reason   Must be a class constant from the DoNotContact class.
-     * @param bool          $persist
-     * @param bool          $checkCurrentStatus
+     * @param Lead         $lead
+     * @param string|array $channel            If an array with an ID, use the structure ['email' => 123]
+     * @param string       $comments
+     * @param int          $reason             Must be a class constant from the DoNotContact class
+     * @param bool         $persist
+     * @param bool         $checkCurrentStatus
      *
-     * @return boolean|DoNotContact If a DNC entry is added or updated, returns the DoNotContact object. If a DNC is already present
-     *                 and has the specified reason, nothing is done and this returns false.
+     * @return bool|DoNotContact If a DNC entry is added or updated, returns the DoNotContact object. If a DNC is already present
+     *                           and has the specified reason, nothing is done and this returns false
      */
     public function addDncForLead(Lead $lead, $channel, $comments = '', $reason = DoNotContact::BOUNCED, $persist = true, $checkCurrentStatus = true)
     {
@@ -1218,7 +1223,7 @@ public function addDncForLead(Lead $lead, $channel, $comments = '', $reason = Do
             $dnc->setChannel($channel);
             $dnc->setReason($reason);
             $dnc->setLead($lead);
-            $dnc->setDateAdded(new \DateTime);
+            $dnc->setDateAdded(new \DateTime());
             $dnc->setComments($comments);
 
             $lead->addDoNotContactEntry($dnc);
@@ -1243,7 +1248,7 @@ public function addDncForLead(Lead $lead, $channel, $comments = '', $reason = Do
                     $dnc->setChannel($channel);
                     $dnc->setReason($reason);
                     $dnc->setLead($lead);
-                    $dnc->setDateAdded(new \DateTime);
+                    $dnc->setDateAdded(new \DateTime());
                     $dnc->setComments($comments);
 
                     // Re-add the entry to the lead
@@ -1263,11 +1268,10 @@ public function addDncForLead(Lead $lead, $channel, $comments = '', $reason = Do
     }
 
     /**
-     * @param Lead $lead
+     * @param Lead   $lead
      * @param string $channel
      *
      * @return mixed
-     *
      */
     public function getFrequencyRule(Lead $lead, $channel = null)
     {
@@ -1287,13 +1291,13 @@ public function getFrequencyRule(Lead $lead, $channel = null)
     }
 
     /**
-     * Set frequency rules for lead per channel
+     * Set frequency rules for lead per channel.
      *
      * @param Lead         $lead
-     * @param string|array $channel  If an array with an ID, use the structure ['email' => 123]
+     * @param string|array $channel If an array with an ID, use the structure ['email' => 123]
      * @param bool         $persist
      *
-     * @return boolean Returns true.
+     * @return bool Returns true
      */
     public function setFrequencyRules(Lead $lead, $channel, $frequencyTime = null, $frequencyNumber = null)
     {
@@ -1304,7 +1308,7 @@ public function setFrequencyRules(Lead $lead, $channel, $frequencyTime = null, $
             $frequencyRule = (isset($frequencyRules[$ch])) ? $frequencyRules[$ch] : new FrequencyRule();
             $frequencyRule->setChannel($ch);
             $frequencyRule->setLead($lead);
-            $frequencyRule->setDateAdded(new \DateTime);
+            $frequencyRule->setDateAdded(new \DateTime());
             $frequencyRule->setFrequencyNumber($frequencyNumber);
             $frequencyRule->setFrequencyTime($frequencyTime);
             $frequencyRule->setLead($lead);
@@ -1325,7 +1329,6 @@ public function setFrequencyRules(Lead $lead, $channel, $frequencyTime = null, $
         return true;
     }
 
-
     /**
      * @param      $fields
      * @param      $data
@@ -1335,6 +1338,7 @@ public function setFrequencyRules(Lead $lead, $channel, $frequencyTime = null, $
      * @param bool $persist Persist to the database; otherwise return entity
      *
      * @return bool
+     *
      * @throws \Doctrine\ORM\ORMException
      * @throws \Swift_RfcComplianceException
      */
@@ -1379,7 +1383,7 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
         unset($fields['dateIdentified']);
 
         if (!empty($fields['createdByUser']) && !empty($data[$fields['createdByUser']])) {
-            $userRepo = $this->em->getRepository('MauticUserBundle:User');
+            $userRepo      = $this->em->getRepository('MauticUserBundle:User');
             $createdByUser = $userRepo->findByIdentifier($data[$fields['createdByUser']]);
             if ($createdByUser !== null) {
                 $lead->setCreatedBy($createdByUser);
@@ -1388,7 +1392,7 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
         unset($fields['createdByUser']);
 
         if (!empty($fields['modifiedByUser']) && !empty($data[$fields['modifiedByUser']])) {
-            $userRepo = $this->em->getRepository('MauticUserBundle:User');
+            $userRepo       = $this->em->getRepository('MauticUserBundle:User');
             $modifiedByUser = $userRepo->findByIdentifier($data[$fields['modifiedByUser']]);
             if ($modifiedByUser !== null) {
                 $lead->setModifiedBy($modifiedByUser);
@@ -1399,7 +1403,7 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
         if (!empty($fields['ip']) && !empty($data[$fields['ip']])) {
             $addresses = explode(',', $data[$fields['ip']]);
             foreach ($addresses as $address) {
-                $ipAddress = new IpAddress;
+                $ipAddress = new IpAddress();
                 $ipAddress->setIpAddress(trim($address));
                 $lead->addIpAddress($ipAddress);
             }
@@ -1416,9 +1420,9 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
             $log->setLead($lead);
             $log->setType('lead');
             $log->setEventName($this->translator->trans('mautic.lead.import.event.name'));
-            $log->setActionName($this->translator->trans('mautic.lead.import.action.name', array(
-                '%name%' => $this->user->getUsername()
-            )));
+            $log->setActionName($this->translator->trans('mautic.lead.import.action.name', [
+                '%name%' => $this->user->getUsername(),
+            ]));
             $log->setIpAddress($this->ipLookupHelper->getIpAddress());
             $log->setDateAdded(new \DateTime());
             $lead->addPointsChangeLog($log);
@@ -1426,7 +1430,7 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
 
         if (!empty($fields['stage']) && !empty($data[$fields['stage']])) {
             static $stages = [];
-            $stageName = $data[$fields['stage']];
+            $stageName     = $data[$fields['stage']];
             if (!array_key_exists($stageName, $stages)) {
                 // Set stage for contact
                 $stage = $this->em->getRepository('MauticStageBundle:Stage')->getStageByName($stageName);
@@ -1444,13 +1448,13 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
 
             //add a contact stage change log
             $log = new StagesChangeLog();
-            $log->setEventName($stage->getId().":".$stage->getName());
+            $log->setEventName($stage->getId().':'.$stage->getName());
             $log->setLead($lead);
             $log->setActionName(
                 $this->translator->trans(
                     'mautic.lead.import.action.name',
                     [
-                        '%name%' => $this->user->getUsername()
+                        '%name%' => $this->user->getUsername(),
                     ]
                 )
             );
@@ -1463,9 +1467,9 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
         if (!empty($fields['doNotEmail']) && !empty($data[$fields['doNotEmail']]) && $hasEmail) {
             $doNotEmail = filter_var($data[$fields['doNotEmail']], FILTER_VALIDATE_BOOLEAN);
             if ($doNotEmail) {
-                $reason = $this->translator->trans('mautic.lead.import.by.user', array(
-                    "%user%" => $this->user->getUsername()
-                ));
+                $reason = $this->translator->trans('mautic.lead.import.by.user', [
+                    '%user%' => $this->user->getUsername(),
+                ]);
 
                 // The email must be set for successful unsubscribtion
                 $lead->addUpdatedField('email', $data[$fields['email']]);
@@ -1494,23 +1498,23 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
         static $leadFields;
         if (null === $leadFields) {
             $leadFields = $this->leadFieldModel->getEntities(
-                array(
-                    'force'          => array(
-                        array(
+                [
+                    'force' => [
+                        [
                             'column' => 'f.isPublished',
                             'expr'   => 'eq',
-                            'value'  => true
-                        ),
-                        array(
+                            'value'  => true,
+                        ],
+                        [
                             'column' => 'f.object',
                             'expr'   => 'eq',
-                            'value'  => 'lead'
-                        )
-                    ),
-                    'hydration_mode' => 'HYDRATE_ARRAY'
-                )
+                            'value'  => 'lead',
+                        ],
+                    ],
+                    'hydration_mode' => 'HYDRATE_ARRAY',
+                ]
             );
-        };
+        }
 
         $form = $this->createForm($lead, $this->formFactory, null, ['fields' => $leadFields, 'csrf_protection' => false]);
 
@@ -1524,7 +1528,7 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
             foreach ($form as $formField) {
                 $errors = $formField->getErrors(true);
                 if (count($errors)) {
-                    $errorString = $formField->getConfig()->getOption('label') .": ";
+                    $errorString = $formField->getConfig()->getOption('label').': ';
                     foreach ($errors as $error) {
                         $errorString .= " {$error->getMessage()}";
                     }
@@ -1546,7 +1550,7 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
             $this->saveEntity($lead);
 
             if ($list !== null) {
-                $this->addToLists($lead, array($list));
+                $this->addToLists($lead, [$list]);
             }
         }
 
@@ -1554,10 +1558,10 @@ public function importLead($fields, $data, $owner = null, $list = null, $tags =
     }
 
     /**
-     * Update a leads tags
+     * Update a leads tags.
      *
-     * @param Lead  $lead
-     * @param array $tags
+     * @param Lead       $lead
+     * @param array      $tags
      * @param bool|false $removeOrphans
      */
     public function setTags(Lead $lead, array $tags, $removeOrphans = false)
@@ -1578,7 +1582,7 @@ public function setTags(Lead $lead, array $tags, $removeOrphans = false)
         }
 
         if (!empty($tags)) {
-            foreach($tags as $tag) {
+            foreach ($tags as $tag) {
                 if (is_numeric($tag)) {
                     // Existing tag being added to this lead
                     $lead->addTag(
@@ -1605,10 +1609,10 @@ public function setTags(Lead $lead, array $tags, $removeOrphans = false)
     }
 
     /**
-     * Update a leads tags
+     * Update a leads tags.
      *
-     * @param Lead  $lead
-     * @param array $tags
+     * @param Lead       $lead
+     * @param array      $tags
      * @param bool|false $removeOrphans
      */
     public function setUtmTags(Lead $lead, UtmTag $utmTags)
@@ -1619,20 +1623,20 @@ public function setUtmTags(Lead $lead, UtmTag $utmTags)
     }
 
     /**
-     * Modify tags with support to remove via a prefixed minus sign
+     * Modify tags with support to remove via a prefixed minus sign.
      *
      * @param Lead $lead
      * @param      $tags
      * @param      $removeTags
      * @param      $persist
-     *
      * @param bool True if tags modified
+     *
      * @return bool
      */
     public function modifyTags(Lead $lead, $tags, array $removeTags = null, $persist = true)
     {
         $tagsModified = false;
-        $leadTags = $lead->getTags();
+        $leadTags     = $lead->getTags();
 
         if ($leadTags) {
             $this->logger->debug('LEAD: Lead currently has tags '.implode(', ', $leadTags->getKeys()));
@@ -1642,7 +1646,7 @@ public function modifyTags(Lead $lead, $tags, array $removeTags = null, $persist
             $tags = explode(',', $tags);
         }
 
-        $this->logger->debug('CONTACT: Adding ' . implode(', ', $tags) . ' to contact ID# ' . $lead->getId());
+        $this->logger->debug('CONTACT: Adding '.implode(', ', $tags).' to contact ID# '.$lead->getId());
 
         array_walk($tags, create_function('&$val', '$val = trim($val); \Mautic\CoreBundle\Helper\InputHelper::clean($val);'));
 
@@ -1657,7 +1661,7 @@ public function modifyTags(Lead $lead, $tags, array $removeTags = null, $persist
                     $tagsModified = true;
                     $lead->removeTag($foundTags[$tag]);
 
-                    $this->logger->debug('LEAD: Removed ' . $tag);
+                    $this->logger->debug('LEAD: Removed '.$tag);
                 }
             } else {
                 // Tag to be added
@@ -1668,12 +1672,12 @@ public function modifyTags(Lead $lead, $tags, array $removeTags = null, $persist
                     $lead->addTag($newTag);
                     $tagsModified = true;
 
-                    $this->logger->debug('LEAD: Added ' . $tag);
+                    $this->logger->debug('LEAD: Added '.$tag);
                 } elseif (!$leadTags->contains($foundTags[$tag])) {
                     $lead->addTag($foundTags[$tag]);
                     $tagsModified = true;
 
-                    $this->logger->debug('LEAD: Added ' . $tag);
+                    $this->logger->debug('LEAD: Added '.$tag);
                 }
             }
         }
@@ -1705,11 +1709,10 @@ public function modifyTags(Lead $lead, $tags, array $removeTags = null, $persist
     }
 
     /**
-     * Modify companies for lead
+     * Modify companies for lead.
      *
      * @param Lead $lead
      * @param $companies
-     *
      */
     public function modifyCompanies(Lead $lead, $companies)
     {
@@ -1732,11 +1735,11 @@ public function modifyCompanies(Lead $lead, $companies)
     }
 
     /**
-     * Get array of available lead tags
+     * Get array of available lead tags.
      */
     public function getTagList()
     {
-        return $this->getTagRepository()->getSimpleList(null, array(), 'tag', 'id');
+        return $this->getTagRepository()->getSimpleList(null, [], 'tag', 'id');
     }
 
     /**
@@ -1746,79 +1749,71 @@ public function getTagList()
      */
     public function getFilterExpressionFunctions($operator = null)
     {
-        $operatorOptions = array(
-            '='          =>
-                array(
+        $operatorOptions = [
+            '=' => [
                     'label'       => 'mautic.lead.list.form.operator.equals',
                     'expr'        => 'eq',
-                    'negate_expr' => 'neq'
-                ),
-            '!='         =>
-                array(
+                    'negate_expr' => 'neq',
+                ],
+            '!=' => [
                     'label'       => 'mautic.lead.list.form.operator.notequals',
                     'expr'        => 'neq',
-                    'negate_expr' => 'eq'
-                ),
-            'gt'         =>
-                array(
+                    'negate_expr' => 'eq',
+                ],
+            'gt' => [
                     'label'       => 'mautic.lead.list.form.operator.greaterthan',
                     'expr'        => 'gt',
-                    'negate_expr' => 'lt'
-                ),
-            'gte'        =>
-                array(
+                    'negate_expr' => 'lt',
+                ],
+            'gte' => [
                     'label'       => 'mautic.lead.list.form.operator.greaterthanequals',
                     'expr'        => 'gte',
-                    'negate_expr' => 'lt'
-                ),
-            'lt'         =>
-                array(
+                    'negate_expr' => 'lt',
+                ],
+            'lt' => [
                     'label'       => 'mautic.lead.list.form.operator.lessthan',
                     'expr'        => 'lt',
-                    'negate_expr' => 'gt'
-                ),
-            'lte'        =>
-                array(
+                    'negate_expr' => 'gt',
+                ],
+            'lte' => [
                     'label'       => 'mautic.lead.list.form.operator.lessthanequals',
                     'expr'        => 'lte',
-                    'negate_expr' => 'gt'
-                ),
-            'like'       =>
-                array(
+                    'negate_expr' => 'gt',
+                ],
+            'like' => [
                     'label'       => 'mautic.lead.list.form.operator.islike',
                     'expr'        => 'like',
-                    'negate_expr' => 'notLike'
-                ),
-            '!like'      =>
-                array(
+                    'negate_expr' => 'notLike',
+                ],
+            '!like' => [
                     'label'       => 'mautic.lead.list.form.operator.isnotlike',
                     'expr'        => 'notLike',
-                    'negate_expr' => 'like'
-                ),
-        );
+                    'negate_expr' => 'like',
+                ],
+        ];
 
         return ($operator === null) ? $operatorOptions : $operatorOptions[$operator];
     }
 
     /**
-     * Get bar chart data of contacts
+     * Get bar chart data of contacts.
      *
-     * @param char      $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getLeadsLineChartData($unit, $dateFrom, $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getLeadsLineChartData($unit, $dateFrom, $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
-        $flag = null;
-        $topLists  = null;
-        $allLeadsT = $this->translator->trans('mautic.lead.all.leads');
+        $flag        = null;
+        $topLists    = null;
+        $allLeadsT   = $this->translator->trans('mautic.lead.all.leads');
         $identifiedT = $this->translator->trans('mautic.lead.identified');
-        $anonymousT = $this->translator->trans('mautic.lead.lead.anonymous');
+        $anonymousT  = $this->translator->trans('mautic.lead.lead.anonymous');
 
         if (isset($filter['flag'])) {
             $flag = $filter['flag'];
@@ -1829,45 +1824,45 @@ public function getLeadsLineChartData($unit, $dateFrom, $dateTo, $dateFormat = n
             $filter['owner_id'] = $this->user->getId();
         }
 
-        $chart     = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
-        $query     = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
-        $anonymousFilter = $filter;
-        $anonymousFilter['date_identified'] = array(
-            'expression' => 'isNull'
-        );
-        $identifiedFilter = $filter;
-        $identifiedFilter['date_identified'] = array(
-            'expression' => 'isNotNull'
-        );
+        $chart                              = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
+        $query                              = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
+        $anonymousFilter                    = $filter;
+        $anonymousFilter['date_identified'] = [
+            'expression' => 'isNull',
+        ];
+        $identifiedFilter                    = $filter;
+        $identifiedFilter['date_identified'] = [
+            'expression' => 'isNotNull',
+        ];
 
         if ($flag == 'top') {
             $topLists = $this->leadListModel->getTopLists(6, $dateFrom, $dateTo);
             if ($topLists) {
                 foreach ($topLists as $list) {
-                    $filter['leadlist_id'] = array(
-                        'value' => $list['id'],
-                        'list_column_name' => 't.id'
-                    );
+                    $filter['leadlist_id'] = [
+                        'value'            => $list['id'],
+                        'list_column_name' => 't.id',
+                    ];
                     $all = $query->fetchTimeData('leads', 'date_added', $filter);
-                    $chart->setDataset($list['name'] . ': ' . $allLeadsT, $all);
+                    $chart->setDataset($list['name'].': '.$allLeadsT, $all);
                 }
             }
         } elseif ($flag == 'topIdentifiedVsAnonymous') {
             $topLists = $this->leadListModel->getTopLists(3, $dateFrom, $dateTo);
             if ($topLists) {
                 foreach ($topLists as $list) {
-                    $anonymousFilter['leadlist_id'] = array(
-                        'value' => $list['id'],
-                        'list_column_name' => 't.id'
-                    );
-                    $identifiedFilter['leadlist_id'] = array(
-                        'value' => $list['id'],
-                        'list_column_name' => 't.id'
-                    );
+                    $anonymousFilter['leadlist_id'] = [
+                        'value'            => $list['id'],
+                        'list_column_name' => 't.id',
+                    ];
+                    $identifiedFilter['leadlist_id'] = [
+                        'value'            => $list['id'],
+                        'list_column_name' => 't.id',
+                    ];
                     $identified = $query->fetchTimeData('leads', 'date_added', $identifiedFilter);
-                    $anonymous = $query->fetchTimeData('leads', 'date_added', $anonymousFilter);
-                    $chart->setDataset($list['name'] . ': ' . $identifiedT, $identified);
-                    $chart->setDataset($list['name'] . ': ' . $anonymousT, $anonymous);
+                    $anonymous  = $query->fetchTimeData('leads', 'date_added', $anonymousFilter);
+                    $chart->setDataset($list['name'].': '.$identifiedT, $identified);
+                    $chart->setDataset($list['name'].': '.$anonymousT, $anonymous);
                 }
             }
         } elseif ($flag == 'identified') {
@@ -1878,7 +1873,7 @@ public function getLeadsLineChartData($unit, $dateFrom, $dateTo, $dateFormat = n
             $chart->setDataset($anonymousT, $anonymous);
         } elseif ($flag == 'identifiedVsAnonymous') {
             $identified = $query->fetchTimeData('leads', 'date_added', $identifiedFilter);
-            $anonymous = $query->fetchTimeData('leads', 'date_added', $anonymousFilter);
+            $anonymous  = $query->fetchTimeData('leads', 'date_added', $anonymousFilter);
             $chart->setDataset($identifiedT, $identified);
             $chart->setDataset($anonymousT, $anonymous);
         } else {
@@ -1890,16 +1885,16 @@ public function getLeadsLineChartData($unit, $dateFrom, $dateTo, $dateFormat = n
     }
 
     /**
-     * Get pie chart data of dwell times
+     * Get pie chart data of dwell times.
      *
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
-    public function getAnonymousVsIdentifiedPieChartData($dateFrom, $dateTo, $filters = array(), $canViewOthers = true)
+    public function getAnonymousVsIdentifiedPieChartData($dateFrom, $dateTo, $filters = [], $canViewOthers = true)
     {
         $chart = new PieChart();
         $query = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
@@ -1909,7 +1904,7 @@ public function getAnonymousVsIdentifiedPieChartData($dateFrom, $dateTo, $filter
         }
 
         $identified = $query->count('leads', 'date_identified', 'date_added', $filters);
-        $all = $query->count('leads', 'id', 'date_added', $filters);
+        $all        = $query->count('leads', 'id', 'date_added', $filters);
         $chart->setDataset($this->translator->trans('mautic.lead.identified'), $identified);
         $chart->setDataset($this->translator->trans('mautic.lead.lead.anonymous'), ($all - $identified));
 
@@ -1920,14 +1915,14 @@ public function getAnonymousVsIdentifiedPieChartData($dateFrom, $dateTo, $filter
      * Get leads count per country name.
      * Can't use entity, because country is a custom field.
      *
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
-     * @param boolean $canViewOthers
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
+     * @param bool   $canViewOthers
      *
      * @return array
      */
-    public function getLeadMapData($dateFrom, $dateTo, $filters = array(), $canViewOthers = true)
+    public function getLeadMapData($dateFrom, $dateTo, $filters = [], $canViewOthers = true)
     {
         if (!$canViewOthers) {
             $filter['owner_id'] = $this->user->getId();
@@ -1946,7 +1941,7 @@ public function getLeadMapData($dateFrom, $dateTo, $filters = array(), $canViewO
         $results = $q->execute()->fetchAll();
 
         $countries = array_flip(Intl::getRegionBundle()->getCountryNames('en'));
-        $mapData = array();
+        $mapData   = [];
 
         // Convert country names to 2-char code
         if ($results) {
@@ -1961,16 +1956,16 @@ public function getLeadMapData($dateFrom, $dateTo, $filters = array(), $canViewO
     }
 
     /**
-     * Get a list of top (by leads owned) users
+     * Get a list of top (by leads owned) users.
      *
-     * @param integer $limit
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
+     * @param int    $limit
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
      *
      * @return array
      */
-    public function getTopOwners($limit = 10, $dateFrom = null, $dateTo = null, $filters = array())
+    public function getTopOwners($limit = 10, $dateFrom = null, $dateTo = null, $filters = [])
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('COUNT(t.id) AS leads, t.owner_id, u.first_name, u.last_name')
@@ -1986,20 +1981,21 @@ public function getTopOwners($limit = 10, $dateFrom = null, $dateTo = null, $fil
         $chartQuery->applyDateFilters($q, 'date_added');
 
         $results = $q->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Get a list of top (by leads owned) users
+     * Get a list of top (by leads owned) users.
      *
-     * @param integer $limit
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
+     * @param int    $limit
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
      *
      * @return array
      */
-    public function getTopCreators($limit = 10, $dateFrom = null, $dateTo = null, $filters = array())
+    public function getTopCreators($limit = 10, $dateFrom = null, $dateTo = null, $filters = [])
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('COUNT(t.id) AS leads, t.created_by, t.created_by_user')
@@ -2015,13 +2011,14 @@ public function getTopCreators($limit = 10, $dateFrom = null, $dateTo = null, $f
         $chartQuery->applyDateFilters($q, 'date_added');
 
         $results = $q->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Get a list of leads in a date range
+     * Get a list of leads in a date range.
      *
-     * @param integer   $limit
+     * @param int       $limit
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
@@ -2029,7 +2026,7 @@ public function getTopCreators($limit = 10, $dateFrom = null, $dateTo = null, $f
      *
      * @return array
      */
-    public function getLeadList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = array(), $options = array())
+    public function getLeadList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = [], $options = [])
     {
         if (!empty($options['canViewOthers'])) {
             $filter['owner_id'] = $this->user->getId();
@@ -2052,7 +2049,7 @@ public function getLeadList($limit = 10, \DateTime $dateFrom = null, \DateTime $
         if ($results) {
             foreach ($results as &$result) {
                 if ($result['firstname'] || $result['lastname']) {
-                    $result['name'] = trim($result['firstname'] . ' ' . $result['lastname']);
+                    $result['name'] = trim($result['firstname'].' '.$result['lastname']);
                 } elseif ($result['email']) {
                     $result['name'] = $result['email'];
                 } else {
@@ -2068,7 +2065,7 @@ public function getLeadList($limit = 10, \DateTime $dateFrom = null, \DateTime $
     }
 
     /**
-     * Get timeline/engagement data
+     * Get timeline/engagement data.
      *
      * @param Lead $lead
      * @param int  $page
@@ -2089,17 +2086,17 @@ public function getEngagements(Lead $lead, $filters = null, array $orderBy = nul
             'total'    => $event->getEventCounter()['total'],
             'page'     => $page,
             'limit'    => $limit,
-            'maxPages' => $event->getMaxPage()
+            'maxPages' => $event->getMaxPage(),
         ];
     }
 
     /**
-     * Get engagement counts by time unit
+     * Get engagement counts by time unit.
      *
      * @param Lead           $lead
      * @param \DateTime|null $dateFrom
      * @param \DateTime|null $dateTo
-     * @param string         $unit      Y, m, d, etc
+     * @param string         $unit     Y, m, d, etc
      *
      * @return array|int
      */
@@ -2119,19 +2116,21 @@ public function getEngagementCount(Lead $lead, \DateTime $dateFrom = null, \Date
      *
      * @return bool
      */
-    public function addToCompany(Lead $lead, $company) {
+    public function addToCompany(Lead $lead, $company)
+    {
         //check if lead is in company already
-        if (!$company instanceof Company)
-        {
-           $company = $this->companyModel->getEntity($company);
+        if (!$company instanceof Company) {
+            $company = $this->companyModel->getEntity($company);
         }
 
         $companyLead = $this->companyModel->getCompanyLeadRepository()->getCompaniesByLeadId($lead->getId(), $company->getId());
 
         if (empty($companyLead)) {
-            $this->companyModel->addLeadToCompany($company,$lead);
+            $this->companyModel->addLeadToCompany($company, $lead);
+
             return true;
         }
+
         return false;
     }
 }
diff --git a/app/bundles/LeadBundle/Model/ListModel.php b/app/bundles/LeadBundle/Model/ListModel.php
index 13d923c4c06..6d24746ab03 100644
--- a/app/bundles/LeadBundle/Model/ListModel.php
+++ b/app/bundles/LeadBundle/Model/ListModel.php
@@ -1,16 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Model;
 
+use Mautic\CoreBundle\Helper\Chart\BarChart;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\PieChart;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
+use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Mautic\CoreBundle\Model\FormModel;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Entity\LeadList;
@@ -19,10 +24,6 @@
 use Mautic\LeadBundle\Event\ListChangeEvent;
 use Mautic\LeadBundle\Helper\FormFieldHelper;
 use Mautic\LeadBundle\LeadEvents;
-use Mautic\CoreBundle\Helper\Chart\BarChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
-use Mautic\CoreBundle\Helper\ProgressBarHelper;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
@@ -30,7 +31,6 @@
 /**
  * Class ListModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class ListModel extends FormModel
 {
@@ -45,11 +45,11 @@ public function __construct(CoreParametersHelper $coreParametersHelper)
     }
 
     /**
-     * Used by addLead and removeLead functions
+     * Used by addLead and removeLead functions.
      *
      * @var array
      */
-    private $leadChangeLists = array();
+    private $leadChangeLists = [];
 
     /**
      * {@inheritdoc}
@@ -67,7 +67,7 @@ public function getRepository()
     }
 
     /**
-     * Returns the repository for the table that houses the leads associated with a list
+     * Returns the repository for the table that houses the leads associated with a list.
      *
      * @return \Mautic\LeadBundle\Entity\ListLeadRepository
      */
@@ -91,6 +91,7 @@ public function getPermissionBase()
      *
      * @param      $entity
      * @param bool $unlock
+     *
      * @return mixed|void
      */
     public function saveEntity($entity, $unlock = true)
@@ -114,44 +115,48 @@ public function saveEntity($entity, $unlock = true)
         $aliasTag  = $count;
 
         while ($count) {
-            $testAlias = $alias . $aliasTag;
+            $testAlias = $alias.$aliasTag;
             $existing  = $repo->getLists($this->user, $testAlias, $entity->getId());
             $count     = count($existing);
-            $aliasTag++;
+            ++$aliasTag;
         }
         if ($testAlias != $alias) {
             $alias = $testAlias;
         }
         $entity->setAlias($alias);
 
-        $event = $this->dispatchEvent("pre_save", $entity, $isNew);
+        $event = $this->dispatchEvent('pre_save', $entity, $isNew);
         $repo->saveEntity($entity);
-        $this->dispatchEvent("post_save", $entity, $isNew, $event);
+        $this->dispatchEvent('post_save', $entity, $isNew, $event);
     }
 
     /**
      * {@inheritdoc}
      *
-     * @param      $entity
-     * @param      $formFactory
-     * @param null $action
+     * @param       $entity
+     * @param       $formFactory
+     * @param null  $action
      * @param array $options
+     *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof LeadList) {
-            throw new MethodNotAllowedHttpException(array('LeadList'), 'Entity must be of class LeadList()');
+            throw new MethodNotAllowedHttpException(['LeadList'], 'Entity must be of class LeadList()');
         }
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
+
         return $formFactory->create('leadlist', $entity, $params);
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
+     *
      * @return null|object
      */
     public function getEntity($id = null)
@@ -172,25 +177,26 @@ public function getEntity($id = null)
      * @param $event
      * @param $entity
      * @param $isNew
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof LeadList) {
-            throw new MethodNotAllowedHttpException(array('LeadList'), 'Entity must be of class LeadList()');
+            throw new MethodNotAllowedHttpException(['LeadList'], 'Entity must be of class LeadList()');
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = LeadEvents::LIST_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = LeadEvents::LIST_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = LeadEvents::LIST_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = LeadEvents::LIST_POST_DELETE;
                 break;
             default:
@@ -219,244 +225,244 @@ public function getFilterExpressionFunctions()
     }
 
     /**
-     * Get a list of field choices for filters
+     * Get a list of field choices for filters.
      *
      * @return array
      */
     public function getChoiceFields()
     {
-        $operators = array(
-            'text' => array(
-                'include' => array(
+        $operators = [
+            'text' => [
+                'include' => [
                     '=',
                     '!=',
                     'empty',
                     '!empty',
                     'like',
-                    '!like'
-                )
-            ),
-            'select' => array(
-                'include' => array(
+                    '!like',
+                ],
+            ],
+            'select' => [
+                'include' => [
                     '=',
                     '!=',
                     'empty',
                     '!empty',
                     'in',
-                    '!in'
-                )
-            ),
-            'bool' => array(
-                'include' => array(
+                    '!in',
+                ],
+            ],
+            'bool' => [
+                'include' => [
                     '=',
-                    '!='
-                )
-            ),
-            'default' => array(
-                'exclude' => array(
+                    '!=',
+                ],
+            ],
+            'default' => [
+                'exclude' => [
                     'in',
-                    '!in'
-                )
-            ),
-            'multiselect' => array(
-                'include' => array(
+                    '!in',
+                ],
+            ],
+            'multiselect' => [
+                'include' => [
                     'in',
-                    '!in'
-                )
-            )
-        );
+                    '!in',
+                ],
+            ],
+        ];
 
         //field choices
-        $choices['lead'] = array(
-            'date_added' => array(
+        $choices['lead'] = [
+            'date_added' => [
                 'label'      => $this->translator->trans('mautic.core.date.added'),
-                'properties' => array('type' => 'date'),
+                'properties' => ['type' => 'date'],
                 'operators'  => 'default',
-                'object'     => 'lead'
-            ),
-            'date_identified' => array(
+                'object'     => 'lead',
+            ],
+            'date_identified' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.date_identified'),
-                'properties' => array('type' => 'date'),
+                'properties' => ['type' => 'date'],
                 'operators'  => 'default',
-                'object'     => 'lead'
-            ),
-            'last_active' => array(
+                'object'     => 'lead',
+            ],
+            'last_active' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.last_active'),
-                'properties' => array('type' => 'date'),
+                'properties' => ['type' => 'date'],
                 'operators'  => 'default',
-                'object'     => 'lead'
-            ),
-            'owner_id'   => array(
+                'object'     => 'lead',
+            ],
+            'owner_id' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.owner'),
-                'properties' => array(
+                'properties' => [
                     'type'     => 'lookup_id',
-                    'callback' => 'activateLeadFieldTypeahead'
-                ),
-                'operators'  => 'text',
-                'object'     => 'lead'
+                    'callback' => 'activateLeadFieldTypeahead',
+                ],
+                'operators' => 'text',
+                'object'    => 'lead',
 
-            ),
-            'points'     => array(
+            ],
+            'points' => [
                 'label'      => $this->translator->trans('mautic.lead.lead.event.points'),
-                'properties' => array('type' => 'number'),
+                'properties' => ['type' => 'number'],
                 'operators'  => 'default',
-                'object'     => 'lead'
+                'object'     => 'lead',
 
-            ),
-            'leadlist'       => array(
+            ],
+            'leadlist' => [
                 'label'      => 'lead '.$this->translator->trans('mautic.lead.list.filter.lists'),
-                'properties' => array(
-                    'type' => 'leadlist'
-                ),
-                'operators'  => 'multiselect',
-                'object'     => 'lead'
-
-            ),
-            'lead_email_received'       => array(
+                'properties' => [
+                    'type' => 'leadlist',
+                ],
+                'operators' => 'multiselect',
+                'object'    => 'lead',
+
+            ],
+            'lead_email_received' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.lead_email_received'),
-                'properties' => array(
-                    'type' => 'lead_email_received'
-                ),
-                'operators'  => array(
-                    'include' => array(
+                'properties' => [
+                    'type' => 'lead_email_received',
+                ],
+                'operators' => [
+                    'include' => [
                         'in',
-                        '!in'
-                    )
-                ),
-                'object'     => 'lead'
+                        '!in',
+                    ],
+                ],
+                'object' => 'lead',
 
-            ),
-            'tags'       => array(
+            ],
+            'tags' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.tags'),
-                'properties' => array(
-                    'type' => 'tags'
-                ),
-                'operators'  => 'multiselect',
-                'object'     => 'lead'
-
-            ),
-            'dnc_bounced'        => array(
+                'properties' => [
+                    'type' => 'tags',
+                ],
+                'operators' => 'multiselect',
+                'object'    => 'lead',
+
+            ],
+            'dnc_bounced' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.dnc_bounced'),
-                'properties' => array(
+                'properties' => [
                     'type' => 'boolean',
-                    'list' => array(
+                    'list' => [
                         0 => $this->translator->trans('mautic.core.form.no'),
-                        1 => $this->translator->trans('mautic.core.form.yes')
-                    )
-                ),
-                'operators'  => 'bool',
-                'object'     => 'lead'
-
-            ),
-            'dnc_unsubscribed'   => array(
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => 'bool',
+                'object'    => 'lead',
+
+            ],
+            'dnc_unsubscribed' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.dnc_unsubscribed'),
-                'properties' => array(
+                'properties' => [
                     'type' => 'boolean',
-                    'list' => array(
+                    'list' => [
                         0 => $this->translator->trans('mautic.core.form.no'),
-                        1 => $this->translator->trans('mautic.core.form.yes')
-                    )
-                ),
-                'operators'  => 'bool',
-                'object'     => 'lead'
-
-            ),
-            'dnc_bounced_sms'        => array(
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => 'bool',
+                'object'    => 'lead',
+
+            ],
+            'dnc_bounced_sms' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.dnc_bounced_sms'),
-                'properties' => array(
+                'properties' => [
                     'type' => 'boolean',
-                    'list' => array(
+                    'list' => [
                         0 => $this->translator->trans('mautic.core.form.no'),
-                        1 => $this->translator->trans('mautic.core.form.yes')
-                    )
-                ),
-                'operators'  => 'bool',
-                'object'     => 'lead'
-
-            ),
-            'dnc_unsubscribed_sms'   => array(
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => 'bool',
+                'object'    => 'lead',
+
+            ],
+            'dnc_unsubscribed_sms' => [
                 'label'      => $this->translator->trans('mautic.lead.list.filter.dnc_unsubscribed_sms'),
-                'properties' => array(
+                'properties' => [
                     'type' => 'boolean',
-                    'list' => array(
+                    'list' => [
                         0 => $this->translator->trans('mautic.core.form.no'),
-                        1 => $this->translator->trans('mautic.core.form.yes')
-                    )
-                ),
-                'operators'  => 'bool',
-                'object'     => 'lead'
-
-            ),
-            'hit_url' => array(
-                'label' => $this->translator->trans('mautic.lead.list.filter.visited_url'),
-                'properties' => array(
-                    'type' => 'text'
-                ),
-                'operators' => array(
-                    'include' => array(
+                        1 => $this->translator->trans('mautic.core.form.yes'),
+                    ],
+                ],
+                'operators' => 'bool',
+                'object'    => 'lead',
+
+            ],
+            'hit_url' => [
+                'label'      => $this->translator->trans('mautic.lead.list.filter.visited_url'),
+                'properties' => [
+                    'type' => 'text',
+                ],
+                'operators' => [
+                    'include' => [
                         '=',
-                        'like'
-                    )
-                ),
-                'object'     => 'lead'
-
-            ),
-            'stage' => array(
-                'label' => $this->translator->trans('mautic.lead.lead.field.stage'),
-                'properties' => array(
-                    'type' => 'stage'
-                ),
-                'operators' => array(
-                    'include' => array(
+                        'like',
+                    ],
+                ],
+                'object' => 'lead',
+
+            ],
+            'stage' => [
+                'label'      => $this->translator->trans('mautic.lead.lead.field.stage'),
+                'properties' => [
+                    'type' => 'stage',
+                ],
+                'operators' => [
+                    'include' => [
                         '=',
-                        '!='
-                    )
-                ),
-                'object'     => 'lead'
+                        '!=',
+                    ],
+                ],
+                'object' => 'lead',
 
-            )
-        );
+            ],
+        ];
 
         //get list of custom fields
         $fields = $this->em->getRepository('MauticLeadBundle:LeadField')->getEntities(
-            array(
-                'filter' => array(
+            [
+                'filter' => [
                     'isListable'  => true,
-                    'isPublished' => true
-                ),
-                'orderBy'    => 'f.object'
-            )
+                    'isPublished' => true,
+                ],
+                'orderBy' => 'f.object',
+            ]
         );
         foreach ($fields as $field) {
             $type               = $field->getType();
             $properties         = $field->getProperties();
             $properties['type'] = $type;
-            if (in_array($type, array('lookup', 'multiselect', 'boolean'))) {
+            if (in_array($type, ['lookup', 'multiselect', 'boolean'])) {
                 if ($type == 'boolean') {
                     //create a lookup list with ID
                     $properties['list'] = [
                         0 => $properties['no'],
-                        1 => $properties['yes']
+                        1 => $properties['yes'],
                     ];
                 } else {
                     $properties['callback'] = 'activateLeadFieldTypeahead';
                 }
                 $properties['list'] = (isset($properties['list'])) ? FormFieldHelper::formatList(FormFieldHelper::FORMAT_BAR, FormFieldHelper::parseList($properties['list'])) : '';
             }
-            $choices[$field->getObject()][$field->getAlias()] = array(
+            $choices[$field->getObject()][$field->getAlias()] = [
                 'label'      => $field->getLabel(),
                 'properties' => $properties,
-                'object'     => $field->getObject()
-            );
+                'object'     => $field->getObject(),
+            ];
 
             // Set operators allowed
             if ($type == 'boolean') {
                 $choices[$field->getObject()][$field->getAlias()]['operators'] = 'bool';
-            } elseif (in_array($type, array('select', 'country', 'timezone', 'region'))) {
+            } elseif (in_array($type, ['select', 'country', 'timezone', 'region'])) {
                 $choices[$field->getObject()][$field->getAlias()]['operators'] = 'select';
-            } elseif (in_array($type, array('select', 'multiselect', 'country', 'timezone', 'region'))) {
+            } elseif (in_array($type, ['select', 'multiselect', 'country', 'timezone', 'region'])) {
                 $choices[$field->getAlias()]['operators'] = 'select';
-            } elseif (in_array($type, array('lookup', 'lookup_id',  'text', 'email', 'url', 'email', 'tel'))) {
+            } elseif (in_array($type, ['lookup', 'lookup_id',  'text', 'email', 'url', 'email', 'tel'])) {
                 $choices[$field->getObject()][$field->getAlias()]['operators'] = 'text';
             } else {
                 $choices[$field->getObject()][$field->getAlias()]['operators'] = 'default';
@@ -466,13 +472,11 @@ public function getChoiceFields()
         foreach ($choices as $key => $choice) {
             $cmp = function ($a, $b) {
                 return strcmp($a['label'], $b['label']);
-
             };
             uasort($choice, $cmp);
             $choices[$key] = $choice;
         }
 
-
         foreach ($choices as $object => $choiceObject) {
             foreach ($choiceObject as $key => $choice) {
                 if (array_key_exists('operators', $choice) && is_string($choice['operators']) && array_key_exists($choice['operators'], $operators)) {
@@ -480,6 +484,7 @@ public function getChoiceFields()
                 }
             }
         }
+
         return $choices;
     }
 
@@ -490,7 +495,7 @@ public function getChoiceFields()
      */
     public function getUserLists($alias = '')
     {
-        $user  = (!$this->security->isGranted('lead:lists:viewother')) ?
+        $user = (!$this->security->isGranted('lead:lists:viewother')) ?
             $this->user : false;
         $lists = $this->em->getRepository('MauticLeadBundle:LeadList')->getLists($user, $alias);
 
@@ -498,18 +503,19 @@ public function getUserLists($alias = '')
     }
 
     /**
-     * Get a list of global lead lists
+     * Get a list of global lead lists.
      *
      * @return mixed
      */
     public function getGlobalLists()
     {
         $lists = $this->em->getRepository('MauticLeadBundle:LeadList')->getGlobalLists();
+
         return $lists;
     }
 
     /**
-     * Rebuild lead lists
+     * Rebuild lead lists.
      *
      * @param LeadList        $entity
      * @param int             $limit
@@ -523,12 +529,12 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
         defined('MAUTIC_REBUILDING_LEAD_LISTS') or define('MAUTIC_REBUILDING_LEAD_LISTS', 1);
 
         $id       = $entity->getId();
-        $list     = array('id' => $id, 'filters' => $entity->getFilters());
-        $dtHelper = new DateTimeHelper;
+        $list     = ['id' => $id, 'filters' => $entity->getFilters()];
+        $dtHelper = new DateTimeHelper();
 
-        $batchLimiters = array(
-            'dateTime' => $dtHelper->toUtcString()
-        );
+        $batchLimiters = [
+            'dateTime' => $dtHelper->toUtcString(),
+        ];
 
         $localDateTime = $dtHelper->getLocalDateTime();
 
@@ -536,11 +542,11 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
         $newLeadsCount = $this->getLeadsByList(
             $list,
             true,
-            array(
+            [
                 'countOnly'     => true,
                 'newOnly'       => true,
-                'batchLimiters' => $batchLimiters
-            )
+                'batchLimiters' => $batchLimiters,
+            ]
         );
 
         // Ensure the same list is used each batch
@@ -550,7 +556,7 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
         $leadCount = (int) $newLeadsCount[$id]['count'];
 
         if ($output) {
-            $output->writeln($this->translator->trans('mautic.lead.list.rebuild.to_be_added', array('%leads%' => $leadCount, '%batch%' => $limit)));
+            $output->writeln($this->translator->trans('mautic.lead.list.rebuild.to_be_added', ['%leads%' => $leadCount, '%batch%' => $limit]));
         }
 
         // Handle by batches
@@ -575,12 +581,12 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
                 $newLeadList = $this->getLeadsByList(
                     $list,
                     true,
-                    array(
-                        'newOnly'       => true,
+                    [
+                        'newOnly' => true,
                         // No start set because of newOnly thus always at 0
                         'limit'         => $limit,
-                        'batchLimiters' => $batchLimiters
-                    )
+                        'batchLimiters' => $batchLimiters,
+                    ]
                 );
 
                 if (empty($newLeadList[$id])) {
@@ -593,7 +599,7 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
 
                     unset($l);
 
-                    $leadsProcessed++;
+                    ++$leadsProcessed;
                     if ($output && $leadsProcessed < $maxCount) {
                         $progress->setProgress($leadsProcessed);
                     }
@@ -638,23 +644,22 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
         $removeLeadCount = $this->getLeadsByList(
             $list,
             true,
-            array(
+            [
                 'countOnly'      => true,
                 'nonMembersOnly' => true,
-                'batchLimiters'  => $batchLimiters
-            )
+                'batchLimiters'  => $batchLimiters,
+            ]
         );
 
         // Restart batching
-        $start     = $lastRoundPercentage = 0;
+        $start     = $lastRoundPercentage     = 0;
         $leadCount = $removeLeadCount[$id]['count'];
 
         if ($output) {
-            $output->writeln($this->translator->trans('mautic.lead.list.rebuild.to_be_removed', array('%leads%' => $leadCount, '%batch%' => $limit)));
+            $output->writeln($this->translator->trans('mautic.lead.list.rebuild.to_be_removed', ['%leads%' => $leadCount, '%batch%' => $limit]));
         }
 
         if ($leadCount) {
-
             $maxCount = ($maxLeads) ? $maxLeads : $leadCount;
 
             if ($output) {
@@ -670,12 +675,12 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
                 $removeLeadList = $this->getLeadsByList(
                     $list,
                     true,
-                    array(
+                    [
                         // No start because the items are deleted so always 0
                         'limit'          => $limit,
                         'nonMembersOnly' => true,
-                        'batchLimiters'  => $batchLimiters
-                    )
+                        'batchLimiters'  => $batchLimiters,
+                    ]
                 );
 
                 if (empty($removeLeadList[$id])) {
@@ -684,10 +689,9 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
                 }
 
                 foreach ($removeLeadList[$id] as $l) {
-
                     $this->removeLead($l, $entity, false, true, true);
 
-                    $leadsProcessed++;
+                    ++$leadsProcessed;
                     if ($output && $leadsProcessed < $maxCount) {
                         $progress->setProgress($leadsProcessed);
                     }
@@ -732,14 +736,14 @@ public function rebuildListLeads(LeadList $entity, $limit = 1000, $maxLeads = fa
     }
 
     /**
-     * Add lead to lists
+     * Add lead to lists.
      *
-     * @param array|Lead        $lead
-     * @param array|LeadList    $lists
-     * @param bool              $manuallyAdded
-     * @param bool              $batchProcess
-     * @param int               $searchListLead 0 = reference, 1 = yes, -1 = known to not exist
-     * @param \DateTime         $dateManipulated
+     * @param array|Lead     $lead
+     * @param array|LeadList $lists
+     * @param bool           $manuallyAdded
+     * @param bool           $batchProcess
+     * @param int            $searchListLead  0 = reference, 1 = yes, -1 = known to not exist
+     * @param \DateTime      $dateManipulated
      *
      * @throws \Doctrine\ORM\ORMException
      */
@@ -758,7 +762,7 @@ public function addLead($lead, $lists, $manuallyAdded = false, $batchProcess = f
 
         if (!$lists instanceof LeadList) {
             //make sure they are ints
-            $searchForLists = array();
+            $searchForLists = [];
             foreach ($lists as $k => &$l) {
                 $l = (int) $l;
                 if (!isset($this->leadChangeLists[$l])) {
@@ -767,17 +771,17 @@ public function addLead($lead, $lists, $manuallyAdded = false, $batchProcess = f
             }
 
             if (!empty($searchForLists)) {
-                $listEntities = $this->getEntities(array(
-                    'filter' => array(
-                        'force' => array(
-                            array(
+                $listEntities = $this->getEntities([
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'l.id',
                                 'expr'   => 'in',
-                                'value'  => $searchForLists
-                            )
-                        )
-                    )
-                ));
+                                'value'  => $searchForLists,
+                            ],
+                        ],
+                    ],
+                ]);
 
                 foreach ($listEntities as $list) {
                     $this->leadChangeLists[$list->getId()] = $list;
@@ -788,15 +792,15 @@ public function addLead($lead, $lists, $manuallyAdded = false, $batchProcess = f
         } else {
             $this->leadChangeLists[$lists->getId()] = $lists;
 
-            $lists = array($lists->getId());
+            $lists = [$lists->getId()];
         }
 
         if (!is_array($lists)) {
-            $lists = array($lists);
+            $lists = [$lists];
         }
 
-        $persistLists   = array();
-        $dispatchEvents = array();
+        $persistLists   = [];
+        $dispatchEvents = [];
 
         foreach ($lists as $listId) {
             if (!isset($this->leadChangeLists[$listId])) {
@@ -808,17 +812,17 @@ public function addLead($lead, $lists, $manuallyAdded = false, $batchProcess = f
                 $listLead = null;
             } elseif ($searchListLead) {
                 $listLead = $this->getListLeadRepository()->findOneBy(
-                    array(
+                    [
                         'lead' => $lead,
-                        'list' => $this->leadChangeLists[$listId]
-                    )
+                        'list' => $this->leadChangeLists[$listId],
+                    ]
                 );
             } else {
                 $listLead = $this->em->getReference('MauticLeadBundle:ListLead',
-                    array(
+                    [
                         'lead' => $leadId,
-                        'list' => $listId
-                    )
+                        'list' => $listId,
+                    ]
                 );
             }
 
@@ -870,13 +874,13 @@ public function addLead($lead, $lists, $manuallyAdded = false, $batchProcess = f
     }
 
     /**
-     * Remove a lead from lists
+     * Remove a lead from lists.
      *
-     * @param           $lead
-     * @param           $lists
-     * @param bool      $manuallyRemoved
-     * @param bool      $batchProcess
-     * @param bool      $skipFindOne
+     * @param      $lead
+     * @param      $lists
+     * @param bool $manuallyRemoved
+     * @param bool $batchProcess
+     * @param bool $skipFindOne
      *
      * @throws \Doctrine\ORM\ORMException
      */
@@ -891,26 +895,26 @@ public function removeLead($lead, $lists, $manuallyRemoved = false, $batchProces
 
         if (!$lists instanceof LeadList) {
             //make sure they are ints
-            $searchForLists = array();
+            $searchForLists = [];
             foreach ($lists as $k => &$l) {
-                $l = (int)$l;
+                $l = (int) $l;
                 if (!isset($this->leadChangeLists[$l])) {
                     $searchForLists[] = $l;
                 }
             }
 
             if (!empty($searchForLists)) {
-                $listEntities = $this->getEntities(array(
-                    'filter' => array(
-                        'force' => array(
-                            array(
+                $listEntities = $this->getEntities([
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'l.id',
                                 'expr'   => 'in',
-                                'value'  => $searchForLists
-                            )
-                        )
-                    )
-                ));
+                                'value'  => $searchForLists,
+                            ],
+                        ],
+                    ],
+                ]);
 
                 foreach ($listEntities as $list) {
                     $this->leadChangeLists[$list->getId()] = $list;
@@ -918,20 +922,19 @@ public function removeLead($lead, $lists, $manuallyRemoved = false, $batchProces
             }
 
             unset($listEntities, $searchForLists);
-
         } else {
             $this->leadChangeLists[$lists->getId()] = $lists;
 
-            $lists = array($lists->getId());
+            $lists = [$lists->getId()];
         }
 
         if (!is_array($lists)) {
-            $lists = array($lists);
+            $lists = [$lists];
         }
 
-        $persistLists   = array();
-        $deleteLists    = array();
-        $dispatchEvents = array();
+        $persistLists   = [];
+        $deleteLists    = [];
+        $dispatchEvents = [];
 
         foreach ($lists as $listId) {
             if (!isset($this->leadChangeLists[$listId])) {
@@ -940,14 +943,14 @@ public function removeLead($lead, $lists, $manuallyRemoved = false, $batchProces
             }
 
             $listLead = (!$skipFindOne) ?
-                $this->getListLeadRepository()->findOneBy(array(
+                $this->getListLeadRepository()->findOneBy([
                     'lead' => $lead,
-                    'list' => $this->leadChangeLists[$listId]
-                )) :
-                $this->em->getReference('MauticLeadBundle:ListLead', array(
+                    'list' => $this->leadChangeLists[$listId],
+                ]) :
+                $this->em->getReference('MauticLeadBundle:ListLead', [
                     'lead' => $leadId,
-                    'list' => $listId
-                ));
+                    'list' => $listId,
+                ]);
 
             if ($listLead == null) {
                 // Lead is not part of this list
@@ -994,7 +997,6 @@ public function removeLead($lead, $lists, $manuallyRemoved = false, $batchProces
         unset($lead, $deleteLists, $persistLists, $lists);
     }
 
-
     /**
      * @param       $lists
      * @param bool  $idOnly
@@ -1002,14 +1004,15 @@ public function removeLead($lead, $lists, $manuallyRemoved = false, $batchProces
      *
      * @return mixed
      */
-    public function getLeadsByList($lists, $idOnly = false, $args = array())
+    public function getLeadsByList($lists, $idOnly = false, $args = [])
     {
         $args['idOnly'] = $idOnly;
+
         return $this->getRepository()->getLeadsByList($lists, $args);
     }
 
     /**
-     * Batch sleep according to settings
+     * Batch sleep according to settings.
      */
     protected function batchSleep()
     {
@@ -1019,7 +1022,6 @@ protected function batchSleep()
         }
 
         if (empty($leadSleepTime)) {
-
             return;
         }
 
@@ -1031,16 +1033,16 @@ protected function batchSleep()
     }
 
     /**
-     * Get a list of top (by leads added) lists
+     * Get a list of top (by leads added) lists.
      *
-     * @param integer $limit
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
+     * @param int    $limit
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
      *
      * @return array
      */
-    public function getTopLists($limit = 10, $dateFrom = null, $dateTo = null, $filters = array())
+    public function getTopLists($limit = 10, $dateFrom = null, $dateTo = null, $filters = [])
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('COUNT(t.date_added) AS leads, ll.id, ll.name')
@@ -1066,40 +1068,40 @@ public function getTopLists($limit = 10, $dateFrom = null, $dateTo = null, $filt
         return $results;
     }
     /**
-     * Get a list of top (by leads added) lists
+     * Get a list of top (by leads added) lists.
      *
-     * @param integer $limit
-     * @param string  $dateFrom
-     * @param string  $dateTo
-     * @param array   $filters
+     * @param int    $limit
+     * @param string $dateFrom
+     * @param string $dateTo
+     * @param array  $filters
      *
      * @return array
      */
-    public function getLifeCycleSegments($limit = null, $dateFrom = null, $dateTo = null, $filters = array(), $segments)
+    public function getLifeCycleSegments($limit, $dateFrom, $dateTo, $filters, $segments)
     {
-        if(!empty($segments)){
+        if (!empty($segments)) {
             $segmentlist = "'".implode("','", $segments)."'";
         }
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('COUNT(t.date_added) AS leads, ll.id, ll.name as name,ll.alias as alias')
             ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 't')
             ->join('t', MAUTIC_TABLE_PREFIX.'lead_lists', 'll', 'll.id = t.leadlist_id')
-            ->join('t',MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = t.lead_id' )
+            ->join('t', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = t.lead_id')
             ->orderBy('leads', 'DESC')
             ->where($q->expr()->eq('ll.is_published', ':published'))
             ->setParameter('published', true)
             ->groupBy('ll.id');
 
-        if($limit){
+        if ($limit) {
             $q->setMaxResults($limit);
         }
-        if(!empty($segments)){
-            $q->andWhere("ll.id IN (".$segmentlist.")");
+        if (!empty($segments)) {
+            $q->andWhere('ll.id IN ('.$segmentlist.')');
         }
-        if(!empty($dateFrom)){
+        if (!empty($dateFrom)) {
             $q->andWhere("l.date_added >= '".$dateFrom->format('Y-m-d')."'");
         }
-        if(!empty($dateTo)){
+        if (!empty($dateTo)) {
             $q->andWhere("l.date_added <= '".$dateTo->format('Y-m-d')." 23:59:59'");
         }
         if (!empty($options['canViewOthers'])) {
@@ -1109,31 +1111,30 @@ public function getLifeCycleSegments($limit = null, $dateFrom = null, $dateTo =
 
         $results = $q->execute()->fetchAll();
 
-        if(in_array(0,$segments))
-        {
+        if (in_array(0, $segments)) {
             $qAll = $this->em->getConnection()->createQueryBuilder();
             $qAll->select('COUNT(t.date_added) AS leads, 0 as id, "All Contacts" as name, "" as alias')
                 ->from(MAUTIC_TABLE_PREFIX.'leads', 't');
 
-
             if (!empty($options['canViewOthers'])) {
                 $qAll->andWhere('ll.created_by = :userId')
                     ->setParameter('userId', $this->user->getId());
             }
-            if(!empty($dateFrom)){
+            if (!empty($dateFrom)) {
                 $qAll->andWhere("t.date_added >= '".$dateFrom->format('Y-m-d')."'");
             }
-            if(!empty($dateTo)){
+            if (!empty($dateTo)) {
                 $qAll->andWhere("t.date_added <= '".$dateTo->format('Y-m-d')." 23:59:59'");
             }
             $resultsAll = $qAll->execute()->fetchAll();
-            $results = array_merge($results,$resultsAll);
+            $results    = array_merge($results, $resultsAll);
         }
+
         return $results;
     }
 
-    public function getLifeCycleSegmentChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true, $listName){
-
+    public function getLifeCycleSegmentChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat, $filter, $canViewOthers, $listName)
+    {
         $chart = new PieChart();
         $query = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
 
@@ -1165,9 +1166,9 @@ public function getLifeCycleSegmentChartData($unit, \DateTime $dateFrom, \DateTi
     }
 
     /**
-     * Get bar chart data of hits
+     * Get bar chart data of hits.
      *
-     * @param char     $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char     $unit       {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param DateTime $dateFrom
      * @param DateTime $dateTo
      * @param string   $dateFormat
@@ -1175,31 +1176,31 @@ public function getLifeCycleSegmentChartData($unit, \DateTime $dateFrom, \DateTi
      *
      * @return array
      */
-    public function getStagesBarChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array())
+    public function getStagesBarChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [])
     {
-        $data['values'] = array();
-        $data['labels'] = array();
+        $data['values'] = [];
+        $data['labels'] = [];
 
         $q = $this->em->getConnection()->createQueryBuilder();
 
         $q->select('count(l.id) as leads, s.name as stage')
             ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 't')
             ->join('t', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = t.lead_id')
-            ->join('t', MAUTIC_TABLE_PREFIX.'stages','s', 's.id=l.stage_id')
+            ->join('t', MAUTIC_TABLE_PREFIX.'stages', 's', 's.id=l.stage_id')
             ->orderBy('leads', 'DESC')
             ->where($q->expr()->eq('s.is_published', ':published'))
 
             ->andWhere($q->expr()->gte('t.date_added', ':date_from'))
             ->setParameter('date_from', $dateFrom->format('Y-m-d'))
             ->andWhere($q->expr()->lte('t.date_added', ':date_to'))
-            ->setParameter('date_to', $dateTo->format('Y-m-d'." 23:59:59"))
+            ->setParameter('date_to', $dateTo->format('Y-m-d'.' 23:59:59'))
             ->setParameter('published', true);
 
-        if(isset($filter['leadlist_id']['value'])){
-           $q->andWhere($q->expr()->eq('t.leadlist_id', ':leadlistid'))->setParameter('leadlistid', $filter['leadlist_id']['value']);
+        if (isset($filter['leadlist_id']['value'])) {
+            $q->andWhere($q->expr()->eq('t.leadlist_id', ':leadlistid'))->setParameter('leadlistid', $filter['leadlist_id']['value']);
         }
 
-            $q->groupBy('s.name');
+        $q->groupBy('s.name');
 
         if (!empty($options['canViewOthers'])) {
             $q->andWhere('s.created_by = :userId')
@@ -1208,39 +1209,38 @@ public function getStagesBarChartData($unit, \DateTime $dateFrom, \DateTime $dat
 
         $results = $q->execute()->fetchAll();
 
-        foreach($results as $result){
-            $percentage = $result['leads'];
-            $data['labels'][]=substr($result['stage'],0,12);
-            $data['values'][]=$result['leads'];
-
+        foreach ($results as $result) {
+            $percentage       = $result['leads'];
+            $data['labels'][] = substr($result['stage'], 0, 12);
+            $data['values'][] = $result['leads'];
         }
-        $data['xAxes'][] =array('display' => true);
-        $data['yAxes'][] =array('display' => true);
+        $data['xAxes'][] = ['display' => true];
+        $data['yAxes'][] = ['display' => true];
 
-        $baseData = array(
+        $baseData = [
             'label' => $this->translator->trans('mautic.lead.leads'),
             'data'  => $data['values'],
-        );
+        ];
 
-        $chart     = new BarChart($data['labels']);
+        $chart = new BarChart($data['labels']);
 
-        $datasetId = count($data['values']);
+        $datasetId  = count($data['values']);
         $datasets[] = array_merge($baseData, $chart->generateColors(3));
 
-        $chartData = array(
-            'labels' => $data['labels'],
+        $chartData = [
+            'labels'   => $data['labels'],
             'datasets' => $datasets,
-            'options' => array(
+            'options'  => [
                 'xAxes' => $data['xAxes'],
-                'yAxes' => $data['yAxes']
-            ));
+                'yAxes' => $data['yAxes'],
+            ], ];
 
         return $chartData;
     }
     /**
-     * Get bar chart data of hits
+     * Get bar chart data of hits.
      *
-     * @param char     $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char     $unit       {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param DateTime $dateFrom
      * @param DateTime $dateTo
      * @param string   $dateFormat
@@ -1248,10 +1248,10 @@ public function getStagesBarChartData($unit, \DateTime $dateFrom, \DateTime $dat
      *
      * @return array
      */
-    public function getDeviceGranularityData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array())
+    public function getDeviceGranularityData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [])
     {
-        $data['values'] = array();
-        $data['labels'] = array();
+        $data['values'] = [];
+        $data['labels'] = [];
 
         $q = $this->em->getConnection()->createQueryBuilder();
 
@@ -1259,12 +1259,12 @@ public function getDeviceGranularityData($unit, \DateTime $dateFrom, \DateTime $
             ->from(MAUTIC_TABLE_PREFIX.'lead_lists_leads', 't')
             ->join('t', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = t.lead_id')
             ->join('t', MAUTIC_TABLE_PREFIX.'page_hits', 'h', 'h.lead_id=l.id')
-            ->join('h',MAUTIC_TABLE_PREFIX.'lead_devices', 'ds', 'ds.id = h.device_id')
+            ->join('h', MAUTIC_TABLE_PREFIX.'lead_devices', 'ds', 'ds.id = h.device_id')
             ->orderBy('ds.device', 'DESC')
             ->andWhere($q->expr()->gte('t.date_added', ':date_from'))
             ->setParameter('date_from', $dateFrom->format('Y-m-d'))
             ->andWhere($q->expr()->lte('t.date_added', ':date_to'))
-            ->setParameter('date_to', $dateTo->format('Y-m-d'." 23:59:59"));
+            ->setParameter('date_to', $dateTo->format('Y-m-d'.' 23:59:59'));
 
         if (isset($filter['leadlist_id']['value'])) {
             $q->andWhere($q->expr()->eq('t.leadlist_id', ':leadlistid'))->setParameter(
@@ -1283,30 +1283,30 @@ public function getDeviceGranularityData($unit, \DateTime $dateFrom, \DateTime $
         $results = $q->execute()->fetchAll();
 
         foreach ($results as $result) {
-            $data['labels'][] = substr( empty($result['device']) ? $this->translator->trans('mautic.core.no.info') : $result['device'], 0, 12 );
+            $data['labels'][] = substr(empty($result['device']) ? $this->translator->trans('mautic.core.no.info') : $result['device'], 0, 12);
             $data['values'][] = $result['leads'];
         }
 
-        $data['xAxes'][] = array('display' => true);
-        $data['yAxes'][] = array('display' => true);
+        $data['xAxes'][] = ['display' => true];
+        $data['yAxes'][] = ['display' => true];
 
-        $baseData = array(
+        $baseData = [
             'label' => $this->translator->trans('mautic.core.device'),
-            'data'  => $data['values']
-        );
+            'data'  => $data['values'],
+        ];
 
         $chart = new BarChart($data['labels']);
 
         $datasets[] = array_merge($baseData, $chart->generateColors(2));
 
-        $chartData = array(
+        $chartData = [
             'labels'   => $data['labels'],
             'datasets' => $datasets,
-            'options'  => array(
+            'options'  => [
                 'xAxes' => $data['xAxes'],
-                'yAxes' => $data['yAxes']
-            )
-        );
+                'yAxes' => $data['yAxes'],
+            ],
+        ];
 
         return $chartData;
     }
diff --git a/app/bundles/LeadBundle/Model/NoteModel.php b/app/bundles/LeadBundle/Model/NoteModel.php
index 65a0c0e21af..6c08591072c 100644
--- a/app/bundles/LeadBundle/Model/NoteModel.php
+++ b/app/bundles/LeadBundle/Model/NoteModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -21,7 +22,6 @@
 /**
  * Class NoteModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class NoteModel extends FormModel
 {
@@ -59,9 +59,10 @@ public function getPermissionBase()
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
+     *
      * @return null|object
      */
     public function getEntity($id = null)
@@ -76,19 +77,22 @@ public function getEntity($id = null)
     /**
      * {@inheritdoc}
      *
-     * @param      $entity
-     * @param      $formFactory
-     * @param null $action
+     * @param       $entity
+     * @param       $formFactory
+     * @param null  $action
      * @param array $options
+     *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof LeadNote) {
-            throw new MethodNotAllowedHttpException(array('LeadNote'));
+            throw new MethodNotAllowedHttpException(['LeadNote']);
         }
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
+
         return $formFactory->create('leadnote', $entity, $params);
     }
 
@@ -99,25 +103,26 @@ public function createForm($entity, $formFactory, $action = null, $options = arr
       * @param $event
       * @param $entity
       * @param $isNew
+      *
       * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
       */
      protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
      {
          if (!$entity instanceof LeadNote) {
-             throw new MethodNotAllowedHttpException(array('LeadNote'));
+             throw new MethodNotAllowedHttpException(['LeadNote']);
          }
 
          switch ($action) {
-             case "pre_save":
+             case 'pre_save':
                  $name = LeadEvents::NOTE_PRE_SAVE;
                  break;
-             case "post_save":
+             case 'post_save':
                  $name = LeadEvents::NOTE_POST_SAVE;
                  break;
-             case "pre_delete":
+             case 'pre_delete':
                  $name = LeadEvents::NOTE_PRE_DELETE;
                  break;
-             case "post_delete":
+             case 'post_delete':
                  $name = LeadEvents::NOTE_POST_DELETE;
                  break;
              default:
@@ -141,13 +146,14 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     /**
      * @param Lead $lead
      * @param      $useFilters
+     *
      * @return mixed
      */
     public function getNoteCount(Lead $lead, $useFilters = false)
     {
         $filter   = ($useFilters) ? $this->session->get('mautic.lead.'.$lead->getId().'.note.filter', '') : null;
-        $noteType = ($useFilters) ? $this->session->get('mautic.lead.'.$lead->getId().'.notetype.filter', array()) : null;
+        $noteType = ($useFilters) ? $this->session->get('mautic.lead.'.$lead->getId().'.notetype.filter', []) : null;
 
         return $this->getRepository()->getNoteCount($lead->getId(), $filter, $noteType);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Security/Permissions/LeadPermissions.php b/app/bundles/LeadBundle/Security/Permissions/LeadPermissions.php
index 715b96c41bb..ec1de09e9da 100644
--- a/app/bundles/LeadBundle/Security/Permissions/LeadPermissions.php
+++ b/app/bundles/LeadBundle/Security/Permissions/LeadPermissions.php
@@ -1,40 +1,38 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\LeadBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class LeadPermissions
- *
- * @package Mautic\LeadBundle\Security\Permissions
+ * Class LeadPermissions.
  */
 class LeadPermissions extends AbstractPermissions
 {
-
     public function __construct($params)
     {
         parent::__construct($params);
 
-        $this->permissions = array(
-            'lists' => array(
+        $this->permissions = [
+            'lists' => [
                 'viewother'   => 2,
                 'editother'   => 8,
                 'deleteother' => 64,
-                'full'        => 1024
-            ),
-            'fields' => array(
-                'full'        => 1024
-            )
-        );
+                'full'        => 1024,
+            ],
+            'fields' => [
+                'full' => 1024,
+            ],
+        ];
         $this->addExtendedPermissions('leads', false);
     }
 
@@ -43,7 +41,7 @@ public function __construct($params)
      *
      * @return string|void
      */
-    public function getName ()
+    public function getName()
     {
         return 'lead';
     }
@@ -55,32 +53,32 @@ public function getName ()
      * @param array                $options
      * @param array                $data
      */
-    public function buildForm (FormBuilderInterface &$builder, array $options, array $data)
+    public function buildForm(FormBuilderInterface &$builder, array $options, array $data)
     {
         $this->addExtendedFormFields('lead', 'leads', $builder, $data, false);
 
-        $builder->add('lead:lists', 'permissionlist', array(
-            'choices'  => array(
-                'viewother'    => 'mautic.core.permissions.viewother',
-                'editother'    => 'mautic.core.permissions.editother',
-                'deleteother'  => 'mautic.core.permissions.deleteother',
-                'full'         => 'mautic.core.permissions.full'
-            ),
-            'label'    => 'mautic.lead.permissions.lists',
-            'data'     => (!empty($data['lists']) ? $data['lists'] : array()),
-            'bundle'   => 'lead',
-            'level'    => 'lists'
-        ));
+        $builder->add('lead:lists', 'permissionlist', [
+            'choices' => [
+                'viewother'   => 'mautic.core.permissions.viewother',
+                'editother'   => 'mautic.core.permissions.editother',
+                'deleteother' => 'mautic.core.permissions.deleteother',
+                'full'        => 'mautic.core.permissions.full',
+            ],
+            'label'  => 'mautic.lead.permissions.lists',
+            'data'   => (!empty($data['lists']) ? $data['lists'] : []),
+            'bundle' => 'lead',
+            'level'  => 'lists',
+        ]);
 
-        $builder->add('lead:fields', 'permissionlist', array(
-            'choices'  => array(
-                'full' => 'mautic.core.permissions.manage'
-            ),
-            'label'    => 'mautic.lead.permissions.fields',
-            'data'     => (!empty($data['fields']) ? $data['fields'] : array()),
-            'bundle'   => 'lead',
-            'level'    => 'fields'
-        ));
+        $builder->add('lead:fields', 'permissionlist', [
+            'choices' => [
+                'full' => 'mautic.core.permissions.manage',
+            ],
+            'label'  => 'mautic.lead.permissions.fields',
+            'data'   => (!empty($data['fields']) ? $data['fields'] : []),
+            'bundle' => 'lead',
+            'level'  => 'fields',
+        ]);
     }
 
     /**
@@ -91,10 +89,10 @@ public function analyzePermissions(array &$permissions, $allPermissions, $isSeco
         parent::analyzePermissions($permissions, $allPermissions, $isSecondRound);
 
         //make sure the user has access to own leads as well if they have access to lists, notes or fields
-        $viewPerms = array('viewown', 'viewother', 'full');
+        $viewPerms = ['viewown', 'viewother', 'full'];
         if (
             (!isset($permissions['leads']) || (array_intersect($viewPerms, $permissions['leads']) == $viewPerms)) &&
-            (isset($permissions["lists"]) || isset($permission["fields"]))
+            (isset($permissions['lists']) || isset($permission['fields']))
         ) {
             $permissions['leads'][] = 'viewown';
         }
@@ -107,20 +105,21 @@ public function analyzePermissions(array &$permissions, $allPermissions, $isSeco
      *
      * @param $name
      * @param $level
+     *
      * @return array
      */
-    protected function getSynonym($name, $level) {
-        if ($name == "fields") {
+    protected function getSynonym($name, $level)
+    {
+        if ($name == 'fields') {
             //set some synonyms
             switch ($level) {
-                case "publishown":
-                case "publishother":
-                    $level = "full";
+                case 'publishown':
+                case 'publishother':
+                    $level = 'full';
                     break;
             }
         }
 
-        return array($name, $level);
+        return [$name, $level];
     }
-
 }
diff --git a/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php b/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php
index 81489e85c80..b96686cb9ec 100644
--- a/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php
+++ b/app/bundles/LeadBundle/Templating/Helper/AvatarHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -23,7 +24,7 @@ class AvatarHelper extends Helper
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
@@ -39,12 +40,12 @@ public function getAvatar(Lead $lead)
         $socialData = $lead->getSocialCache();
         $leadEmail  = $lead->getEmail();
 
-        if ($preferred == 'custom' ) {
-            $avatarPath = $this->getAvatarPath(true) . '/avatar'.$lead->getId();
+        if ($preferred == 'custom') {
+            $avatarPath = $this->getAvatarPath(true).'/avatar'.$lead->getId();
             if (file_exists($avatarPath) && $fmtime = filemtime($avatarPath)) {
                 // Append file modified time to ensure the latest is used by browser
                 $img = $this->factory->getHelper('template.assets')->getUrl(
-                    $this->getAvatarPath().'/avatar'.$lead->getId() . '?' . $fmtime,
+                    $this->getAvatarPath().'/avatar'.$lead->getId().'?'.$fmtime,
                     null,
                     null,
                     false,
@@ -68,7 +69,7 @@ public function getAvatar(Lead $lead)
     }
 
     /**
-     * Get avatar path
+     * Get avatar path.
      *
      * @param $absolute
      *
@@ -103,4 +104,4 @@ public function getName()
     {
         return 'lead_avatar';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Views/Batch/form.html.php b/app/bundles/LeadBundle/Views/Batch/form.html.php
index 2a83ba81194..c1d478ba8f6 100644
--- a/app/bundles/LeadBundle/Views/Batch/form.html.php
+++ b/app/bundles/LeadBundle/Views/Batch/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$attr = $form->vars['attr'];
-$attr['data-submit-callback'] = "leadBatchSubmit";
-echo $view['form']->form($form, array('attr' => $attr));
+$attr                         = $form->vars['attr'];
+$attr['data-submit-callback'] = 'leadBatchSubmit';
+echo $view['form']->form($form, ['attr' => $attr]);
diff --git a/app/bundles/LeadBundle/Views/Company/form.html.php b/app/bundles/LeadBundle/Views/Company/form.html.php
index e6cd5a395f6..d1ff3bb09ba 100644
--- a/app/bundles/LeadBundle/Views/Company/form.html.php
+++ b/app/bundles/LeadBundle/Views/Company/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'company');
 
@@ -14,11 +14,11 @@
     ?
     $view['translator']->trans(
         'mautic.company.menu.edit',
-        array('%name%' => $entity->getName())
+        ['%name%' => $entity->getName()]
     )
     :
     $view['translator']->trans('mautic.company.menu.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 $groups = array_keys($fields);
 sort($groups);
 echo $view['form']->start($form);
@@ -31,12 +31,14 @@
                     <?php $step = 1; ?>
                     <?php foreach ($groups as $g): ?>
                         <?php if (!empty($fields[$g])): ?>
-                            <li class="list-group-item <?php if ($step === 1) echo "active"; ?>">
+                            <li class="list-group-item <?php if ($step === 1) {
+    echo 'active';
+} ?>">
                                 <a href="#<?php echo $g; ?>" class="steps" data-toggle="tab">
-                                    <?php echo $view['translator']->trans('mautic.lead.field.group.' . $g); ?>
+                                    <?php echo $view['translator']->trans('mautic.lead.field.group.'.$g); ?>
                                 </a>
                             </li>
-                            <?php $step++; ?>
+                            <?php ++$step; ?>
                         <?php endif; ?>
                     <?php endforeach; ?>
                 </ul>
@@ -59,11 +61,11 @@
                         $groupFields = $fields[$group];
                         if (!empty($groupFields)): ?>
                             <div class="tab-pane fade<?php if ($key === 0) {
-                                echo ' in active';
-                            } ?> bdr-rds-0 bdr-w-0" id="<?php echo $group; ?>">
+                            echo ' in active';
+                        } ?> bdr-rds-0 bdr-w-0" id="<?php echo $group; ?>">
                                 <div class="pa-md bg-auto bg-light-xs bdr-b">
                                     <h4 class="fw-sb"><?php echo $view['translator']->trans(
-                                            'mautic.lead.field.group.' . $group
+                                            'mautic.lead.field.group.'.$group
                                         ); ?></h4>
                                 </div>
                                 <div class="pa-md">
@@ -75,12 +77,12 @@
                                                     <div class="col-sm-4">
                                                         <label class="control-label mb-xs required"><?php echo $view['translator']->trans('mautic.core.company'); ?></label>
                                                         <?php echo $view['form']->errors($form['companyname']); ?>
-                                                        <?php echo $view['form']->widget($form['companyname'], array('attr' => array('placeholder' => $view['translator']->trans('mautic.core.company')))); ?>
+                                                        <?php echo $view['form']->widget($form['companyname'], ['attr' => ['placeholder' => $view['translator']->trans('mautic.core.company')]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                                 <div class="col-sm-4">
                                                     <label class="control-label mb-xs"><?php echo $form['companyemail']->vars['label']; ?></label>
-                                                    <?php echo $view['form']->widget($form['companyemail'], array('attr' => array('placeholder' => $form['companyemail']->vars['label']))); ?>
+                                                    <?php echo $view['form']->widget($form['companyemail'], ['attr' => ['placeholder' => $form['companyemail']->vars['label']]]); ?>
                                                 </div>
                                             </div>
                                         </div>
@@ -92,38 +94,38 @@ class="control-label mb-xs"><?php echo $view['translator']->trans('mautic.compan
                                                 <?php if (isset($form['companyaddress1'])): ?>
                                                     <div class="row mb-xs">
                                                         <div class="col-sm-8">
-                                                            <?php echo $view['form']->widget($form['companyaddress1'], array('attr' => array('placeholder' => $form['companyaddress1']->vars['label']))); ?>
+                                                            <?php echo $view['form']->widget($form['companyaddress1'], ['attr' => ['placeholder' => $form['companyaddress1']->vars['label']]]); ?>
                                                         </div>
                                                     </div>
                                                 <?php endif; ?>
                                                 <?php if (isset($form['companyaddress2'])): ?>
                                                     <div class="row mb-xs">
                                                         <div class="col-sm-8">
-                                                            <?php echo $view['form']->widget($form['companyaddress2'], array('attr' => array('placeholder' => $form['companyaddress2']->vars['label']))); ?>
+                                                            <?php echo $view['form']->widget($form['companyaddress2'], ['attr' => ['placeholder' => $form['companyaddress2']->vars['label']]]); ?>
                                                         </div>
                                                     </div>
                                                 <?php endif; ?>
                                                 <div class="row mb-xs">
                                                     <?php if (isset($form['companycity'])): ?>
                                                         <div class="col-sm-4">
-                                                            <?php echo $view['form']->widget($form['companycity'], array('attr' => array('placeholder' => $form['companycity']->vars['label']))); ?>
+                                                            <?php echo $view['form']->widget($form['companycity'], ['attr' => ['placeholder' => $form['companycity']->vars['label']]]); ?>
                                                         </div>
                                                     <?php endif; ?>
                                                     <?php if (isset($form['companystate'])): ?>
                                                         <div class="col-sm-4">
-                                                            <?php echo $view['form']->widget($form['companystate'], array('attr' => array('placeholder' => $form['companystate']->vars['label']))); ?>
+                                                            <?php echo $view['form']->widget($form['companystate'], ['attr' => ['placeholder' => $form['companystate']->vars['label']]]); ?>
                                                         </div>
                                                     <?php endif; ?>
                                                 </div>
                                                 <div class="row">
                                                     <?php if (isset($form['companyzipcode'])): ?>
                                                         <div class="col-sm-4">
-                                                            <?php echo $view['form']->widget($form['companyzipcode'], array('attr' => array('placeholder' => $form['companyzipcode']->vars['label']))); ?>
+                                                            <?php echo $view['form']->widget($form['companyzipcode'], ['attr' => ['placeholder' => $form['companyzipcode']->vars['label']]]); ?>
                                                         </div>
                                                     <?php endif; ?>
                                                     <?php if (isset($form['companycountry'])): ?>
                                                         <div class="col-sm-4">
-                                                            <?php echo $view['form']->widget($form['companycountry'], array('attr' => array('placeholder' => $form['companycountry']->vars['label']))); ?>
+                                                            <?php echo $view['form']->widget($form['companycountry'], ['attr' => ['placeholder' => $form['companycountry']->vars['label']]]); ?>
                                                         </div>
                                                     <?php endif; ?>
                                                 </div>
diff --git a/app/bundles/LeadBundle/Views/Company/index.html.php b/app/bundles/LeadBundle/Views/Company/index.html.php
index 39750c294ff..60fff8c8fdb 100644
--- a/app/bundles/LeadBundle/Views/Company/index.html.php
+++ b/app/bundles/LeadBundle/Views/Company/index.html.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'company');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.companies.menu.root'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.companies.menu.root'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['lead:leads:create']
-            ),
-            'routeBase'       => 'company'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['lead:leads:create'],
+            ],
+            'routeBase' => 'company',
+        ]
     )
 );
 ?>
@@ -28,15 +28,15 @@
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render(
         'MauticCoreBundle:Helper:list_toolbar.html.php',
-        array(
-            'searchValue' => $searchValue,
-            'searchHelp'  => 'mautic.core.help.searchcommands',
+        [
+            'searchValue'     => $searchValue,
+            'searchHelp'      => 'mautic.core.help.searchcommands',
             'action'          => $currentRoute,
             'routeBase'       => 'company',
-            'templateButtons' => array(
-                'delete' => $permissions['lead:leads:deleteother']
-            )
-        )
+            'templateButtons' => [
+                'delete' => $permissions['lead:leads:deleteother'],
+            ],
+        ]
     ); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/LeadBundle/Views/Company/list.html.php b/app/bundles/LeadBundle/Views/Company/list.html.php
index 992c6743d5b..0ccb81ba2bd 100644
--- a/app/bundles/LeadBundle/Views/Company/list.html.php
+++ b/app/bundles/LeadBundle/Views/Company/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -19,52 +20,52 @@
                 <?php
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'checkall' => 'true',
-                        'target'   => '#companyTable'
-                    )
+                        'target'   => '#companyTable',
+                    ]
                 );
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'company',
                         'text'       => 'mautic.company.name',
                         'class'      => 'col-company-name',
                         'orderBy'    => 'comp.companyname',
-                    )
+                    ]
                 );
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'company',
                         'text'       => 'mautic.company.email',
                         'class'      => 'visible-md visible-lg col-company-category',
                         'orderBy'    => 'comp.companyemail',
-                    )
+                    ]
                 );
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'company',
                         'text'       => 'mautic.company.website',
                         'class'      => 'visible-md visible-lg col-company-website',
                         'orderBy'    => 'comp.companywebsite',
-                    )
+                    ]
                 );
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'company',
                     'text'       => 'mautic.lead.list.thead.leadcount',
-                    'class'      => 'visible-md visible-lg col-leadlist-leadcount'
-                ));
+                    'class'      => 'visible-md visible-lg col-leadlist-leadcount',
+                ]);
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'company',
                         'orderBy'    => 'comp.id',
                         'text'       => 'mautic.core.id',
-                        'class'      => 'visible-md visible-lg col-company-id'
-                    )
+                        'class'      => 'visible-md visible-lg col-company-id',
+                    ]
                 );
                 ?>
             </tr>
@@ -77,15 +78,15 @@
                         <?php
                         echo $view->render(
                             'MauticCoreBundle:Helper:list_actions.html.php',
-                            array(
+                            [
                                 'item'            => $item,
-                                'templateButtons' => array(
+                                'templateButtons' => [
                                     'edit'   => $permissions['lead:leads:editother'],
                                     'clone'  => $permissions['lead:leads:create'],
                                     'delete' => $permissions['lead:leads:deleteother'],
-                                ),
-                                'routeBase'       => 'company'
-                            )
+                                ],
+                                'routeBase' => 'company',
+                            ]
                         );
                         ?>
                     </td>
@@ -94,7 +95,7 @@
 
                             <a href="<?php echo $view['router']->generate(
                                 'mautic_company_action',
-                                array("objectAction" => "edit", "objectId" => $item->getId())
+                                ['objectAction' => 'edit', 'objectId' => $item->getId()]
                             ); ?>" data-toggle="ajax">
                                 <?php if (isset($fields['core']['companyname'])) :?>
                                 <?php echo $fields['core']['companyname']['value']; ?>
@@ -106,7 +107,7 @@
                             <div class="text-muted mt-4">
                 <?php if (isset($fields['core']['companyemail'])) :?>
                     <small>
-                        <?php echo $fields['core']['companyemail']['value'] ;?>
+                        <?php echo $fields['core']['companyemail']['value']; ?>
                     </small>
                 <?php   endif; ?>
                             </div>
@@ -118,8 +119,8 @@
                         <?php   endif; ?>
                     </td>
                     <td class="visible-md visible-lg">
-                        <a class="label label-primary" href="<?php echo $view['router']->path('mautic_contact_index', array('search' => $view['translator']->trans('mautic.company.lead.searchcommand.company') . ':' . $fields['core']['companyname']['value'])); ?>" data-toggle="ajax"<?php echo ($leadCounts[$item->getId()] == 0) ? "disabled=disabled" : ""; ?>>
-                            <?php echo $view['translator']->transChoice('mautic.lead.company.viewleads_count', $leadCounts[$item->getId()], array('%count%' => $leadCounts[$item->getId()])); ?>
+                        <a class="label label-primary" href="<?php echo $view['router']->path('mautic_contact_index', ['search' => $view['translator']->trans('mautic.company.lead.searchcommand.company').':'.$fields['core']['companyname']['value']]); ?>" data-toggle="ajax"<?php echo ($leadCounts[$item->getId()] == 0) ? 'disabled=disabled' : ''; ?>>
+                            <?php echo $view['translator']->transChoice('mautic.lead.company.viewleads_count', $leadCounts[$item->getId()], ['%count%' => $leadCounts[$item->getId()]]); ?>
                         </a>
                     </td>
                     <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
@@ -131,19 +132,19 @@
     <div class="panel-footer">
         <?php echo $view->render(
             'MauticCoreBundle:Helper:pagination.html.php',
-            array(
-                "totalItems" => $totalItems,
-                "page"       => $page,
-                "limit"      => $limit,
-                "menuLinkId" => 'mautic_company_index',
-                "baseUrl"    => $view['router']->generate('mautic_company_index'),
-                'sessionVar' => 'company'
-            )
+            [
+                'totalItems' => $totalItems,
+                'page'       => $page,
+                'limit'      => $limit,
+                'menuLinkId' => 'mautic_company_index',
+                'baseUrl'    => $view['router']->generate('mautic_company_index'),
+                'sessionVar' => 'company',
+            ]
         ); ?>
     </div>
 <?php else: ?>
     <?php echo $view->render(
         'MauticCoreBundle:Helper:noresults.html.php',
-        array('tip' => 'mautic.company.action.noresults.tip')
+        ['tip' => 'mautic.company.action.noresults.tip']
     ); ?>
 <?php endif; ?>
diff --git a/app/bundles/LeadBundle/Views/Dashboard/leads_in_time_chart.html.php b/app/bundles/LeadBundle/Views/Dashboard/leads_in_time_chart.html.php
index 735d6a75d5b..9c0ef9a9ae1 100644
--- a/app/bundles/LeadBundle/Views/Dashboard/leads_in_time_chart.html.php
+++ b/app/bundles/LeadBundle/Views/Dashboard/leads_in_time_chart.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/Field/form.html.php b/app/bundles/LeadBundle/Views/Field/form.html.php
index 8442388357b..05b12888eb0 100644
--- a/app/bundles/LeadBundle/Views/Field/form.html.php
+++ b/app/bundles/LeadBundle/Views/Field/form.html.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'leadfield');
 $userId = $form->vars['data']->getId();
 if (!empty($userId)) {
-    $isNew   = false;
-    $field   = $form->vars['data']->getLabel();
-    $header  = $view['translator']->trans('mautic.lead.field.header.edit', array("%name%" => $field));
+    $isNew  = false;
+    $field  = $form->vars['data']->getLabel();
+    $header = $view['translator']->trans('mautic.lead.field.header.edit', ['%name%' => $field]);
 } else {
     $isNew  = true;
     $header = $view['translator']->trans('mautic.lead.field.header.new');
 }
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 
 $selectTemplate      = $view['form']->row($form['properties_select_template']);
 $defaultTemplate     = $view['form']->widget($form['default_template']);
@@ -58,7 +58,7 @@
             $type          = $form['type']->vars['data'];
             $properties    = $form['properties']->vars['data'];
             $errors        = count($form['properties']->vars['errors']);
-            $feedbackClass = (!empty($errors)) ? " has-error" : "";
+            $feedbackClass = (!empty($errors)) ? ' has-error' : '';
             ?>
 
             <div class="row">
@@ -67,24 +67,24 @@
                         <?php
                         switch ($type):
                         case 'boolean':
-                            echo $view->render('MauticLeadBundle:Field:properties_boolean.html.php', array(
+                            echo $view->render('MauticLeadBundle:Field:properties_boolean.html.php', [
                                 'yes' => isset($properties['yes']) ? $properties['yes'] : '',
-                                'no'  => isset($properties['no'])  ? $properties['no'] : ''
-                            ));
+                                'no'  => isset($properties['no']) ? $properties['no'] : '',
+                            ]);
                             break;
                         case 'number':
-                            echo $view->render('MauticLeadBundle:Field:properties_number.html.php', array(
+                            echo $view->render('MauticLeadBundle:Field:properties_number.html.php', [
                                 'roundMode' => isset($properties['roundmode']) ? $properties['roundmode'] : '',
-                                'precision' => isset($properties['precision']) ? $properties['precision'] : ''
-                            ));
+                                'precision' => isset($properties['precision']) ? $properties['precision'] : '',
+                            ]);
                             break;
                         case 'select':
                         case 'multiselect':
                         case 'lookup':
-                            echo $view->render('MauticLeadBundle:Field:properties_select.html.php', array(
+                            echo $view->render('MauticLeadBundle:Field:properties_select.html.php', [
                                 'form'           => $form['properties'],
                                 'selectTemplate' => $selectTemplate,
-                            ));
+                            ]);
                             break;
                         endswitch;
                         ?>
@@ -125,7 +125,9 @@
                 <div class="col-md-6">
                     <?php echo $view['form']->row($form['isUniqueIdentifer']); ?>
                 </div>
-                <div class="unique-identifier-warning col-md-6" style="<?php if (!$form['isUniqueIdentifer']->vars['data']) echo "display:none;" ; ?>">
+                <div class="unique-identifier-warning col-md-6" style="<?php if (!$form['isUniqueIdentifer']->vars['data']) {
+                            echo 'display:none;';
+                        } ?>">
                     <div class="alert alert-danger">
                         <?php echo $view['translator']->trans('mautic.lead.field.form.isuniqueidentifer.warning'); ?>
                     </div>
@@ -148,9 +150,9 @@
 <?php
     echo $view->render('MauticLeadBundle:Field:properties_number.html.php');
     echo $view->render('MauticLeadBundle:Field:properties_boolean.html.php');
-    echo $view->render('MauticLeadBundle:Field:properties_select.html.php', array(
-        'selectTemplate' => $selectTemplate
-    ));
+    echo $view->render('MauticLeadBundle:Field:properties_select.html.php', [
+        'selectTemplate' => $selectTemplate,
+    ]);
 ?>
 </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/bundles/LeadBundle/Views/Field/index.html.php b/app/bundles/LeadBundle/Views/Field/index.html.php
index c4bc2e7dd43..1df085ff3c6 100644
--- a/app/bundles/LeadBundle/Views/Field/index.html.php
+++ b/app/bundles/LeadBundle/Views/Field/index.html.php
@@ -1,34 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'leadfield');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.lead.field.header.index'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.lead.field.header.index'));
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'templateButtons' => array(
-        'new' => true
-    ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'templateButtons' => [
+        'new' => true,
+    ],
     'routeBase' => 'contactfield',
-    'langVar'   => 'lead.field'
-)));
+    'langVar'   => 'lead.field',
+]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'action'      => $currentRoute,
-        'langVar'     => 'lead.field',
-        'routeBase'   => 'contactfield',
-        'templateButtons' => array(
-            'delete' => $permissions['lead:fields:full']
-        )
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'     => $searchValue,
+        'action'          => $currentRoute,
+        'langVar'         => 'lead.field',
+        'routeBase'       => 'contactfield',
+        'templateButtons' => [
+            'delete' => $permissions['lead:fields:full'],
+        ],
+    ]); ?>
 
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/LeadBundle/Views/Field/list.html.php b/app/bundles/LeadBundle/Views/Field/list.html.php
index 614d2bd9766..fd864d7df2a 100644
--- a/app/bundles/LeadBundle/Views/Field/list.html.php
+++ b/app/bundles/LeadBundle/Views/Field/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticLeadBundle:Field:index.html.php');
+}
 ?>
 <?php if (count($items)): ?>
 <div class="table-responsive">
@@ -16,10 +18,10 @@
             <tr>
                 <th class="col-leadfield-orderhandle"></th>
                 <?php
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#leadFieldTable'
-                ));
+                    'target'   => '#leadFieldTable',
+                ]);
                 ?>
                 <th class="col-leadfield-label"><?php echo $view['translator']->trans('mautic.lead.field.label'); ?></th>
                 <th class="visible-md visible-lg col-leadfield-alias"><?php echo $view['translator']->trans('mautic.core.alias'); ?></th>
@@ -35,23 +37,23 @@
                 <td><i class="fa fa-fw fa-ellipsis-v"></i></td>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => true,
-                            'clone'     => true,
-                            'delete'    => $item->isFixed() ? false : true,
-                        ),
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => true,
+                            'clone'  => true,
+                            'delete' => $item->isFixed() ? false : true,
+                        ],
                         'routeBase' => 'contactfield',
                         'langVar'   => 'lead.field',
-                        'pull'      => 'left'
-                    ));
+                        'pull'      => 'left',
+                    ]);
                     ?>
                 </td>
                 <td>
                     <span class="ellipsis">
-                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array('item' => $item, 'model' => 'lead.field', 'disableToggle' => ($item->getAlias() == 'email'))); ?>
-                        <a href="<?php echo $view['router']->path('mautic_contactfield_action', array('objectAction' => 'edit', 'objectId' => $item->getId())); ?>"><?php echo $item->getLabel(); ?></a>
+                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'lead.field', 'disableToggle' => ($item->getAlias() == 'email')]); ?>
+                        <a href="<?php echo $view['router']->path('mautic_contactfield_action', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>"><?php echo $item->getLabel(); ?></a>
                     </span>
                 </td>
                 <td class="visible-md visible-lg"><?php echo $item->getAlias(); ?></td>
@@ -85,13 +87,13 @@
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        'totalItems'      => $totalItems,
-        'page'            => $page,
-        'limit'           => $limit,
-        'baseUrl'         => $view['router']->path('mautic_contactfield_index'),
-        'sessionVar'      => 'leadfield'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => $totalItems,
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_contactfield_index'),
+        'sessionVar' => 'leadfield',
+    ]); ?>
 </div>
 <?php else: ?>
 <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php'); ?>
diff --git a/app/bundles/LeadBundle/Views/Field/properties_boolean.html.php b/app/bundles/LeadBundle/Views/Field/properties_boolean.html.php
index 067228af211..01751b71250 100644
--- a/app/bundles/LeadBundle/Views/Field/properties_boolean.html.php
+++ b/app/bundles/LeadBundle/Views/Field/properties_boolean.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $yes = (isset($yes)) ? $yes : $view['translator']->trans('mautic.core.form.yes');
 $no  = (isset($no)) ? $no : $view['translator']->trans('mautic.core.form.no');
 ?>
diff --git a/app/bundles/LeadBundle/Views/Field/properties_number.html.php b/app/bundles/LeadBundle/Views/Field/properties_number.html.php
index bda48b9e526..a40b95c49be 100644
--- a/app/bundles/LeadBundle/Views/Field/properties_number.html.php
+++ b/app/bundles/LeadBundle/Views/Field/properties_number.html.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 use \Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
 
-$roundMode = (isset($roundMode)) ? $roundMode : "";
-$precision = (isset($precision)) ? $precision : "";
+$roundMode = (isset($roundMode)) ? $roundMode : '';
+$precision = (isset($precision)) ? $precision : '';
 
-$options = array(
+$options = [
     NumberToLocalizedStringTransformer::ROUND_UP        => 'mautic.lead.field.form.number.roundup',
     NumberToLocalizedStringTransformer::ROUND_DOWN      => 'mautic.lead.field.form.number.rounddown',
     NumberToLocalizedStringTransformer::ROUND_HALF_UP   => 'mautic.lead.field.form.number.roundhalfup',
     NumberToLocalizedStringTransformer::ROUND_HALF_EVEN => 'mautic.lead.field.form.number.roundhalfeven',
-    NumberToLocalizedStringTransformer::ROUND_HALF_DOWN => 'mautic.lead.field.form.number.roundhalfdown'
-);
+    NumberToLocalizedStringTransformer::ROUND_HALF_DOWN => 'mautic.lead.field.form.number.roundhalfdown',
+];
 ?>
 
 <div class="number">
@@ -28,7 +28,9 @@
             <div class="input-group">
                 <select class="form-control not-chosen" autocomplete="false" name="leadfield[properties][roundmode]">
                     <?php foreach ($options as $v => $l): ?>
-                    <option value="<?php echo $v; ?>"<?php if ($roundMode == $v) echo ' selected="selected"'; ?>><?php echo $view['translator']->trans($l); ?></option>
+                    <option value="<?php echo $v; ?>"<?php if ($roundMode == $v) {
+    echo ' selected="selected"';
+} ?>><?php echo $view['translator']->trans($l); ?></option>
                     <?php endforeach; ?>
                 </select>
 
diff --git a/app/bundles/LeadBundle/Views/Field/properties_select.html.php b/app/bundles/LeadBundle/Views/Field/properties_select.html.php
index 525725dfe72..8747aa9dbf9 100644
--- a/app/bundles/LeadBundle/Views/Field/properties_select.html.php
+++ b/app/bundles/LeadBundle/Views/Field/properties_select.html.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$value = (isset($value)) ? $value : "";
+$value = (isset($value)) ? $value : '';
 if (!isset($form) || !$form->vars['value']) {
     $html = str_replace(['properties_select_template', 'leadfield_properties'], ['properties', 'leadfield_properties_template'], $selectTemplate);
 } else {
diff --git a/app/bundles/LeadBundle/Views/FormTheme/ActionUpdateLead/updatelead_action_widget.html.php b/app/bundles/LeadBundle/Views/FormTheme/ActionUpdateLead/updatelead_action_widget.html.php
index bd948d8df8b..fdd8f40695c 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/ActionUpdateLead/updatelead_action_widget.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/ActionUpdateLead/updatelead_action_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php b/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php
index 07edc9a3a9a..7b9991acd97 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/FieldValueCondition/campaignevent_lead_field_value_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php b/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php
index 31a345b424e..8b400580b1d 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_entry_widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $isPrototype = ($form->vars['name'] == '__name__');
 $filterType  = $form['field']->vars['value'];
 $inGroup     = $form->vars['data']['glue'] === 'and';
@@ -15,7 +15,9 @@
 ?>
 
 <div class="panel<?php echo ($inGroup && $first === false) ? ' in-group' : ''; ?>">
-    <div class="panel-heading <?php if (!$isPrototype && $form->vars['name'] === '0') echo " hide"; ?>">
+    <div class="panel-heading <?php if (!$isPrototype && $form->vars['name'] === '0') {
+    echo ' hide';
+} ?>">
         <div class="panel-glue col-sm-2 pl-0 ">
             <?php echo $view['form']->widget($form['glue']); ?>
         </div>
@@ -30,7 +32,9 @@
         </div>
 
         <?php $hasErrors = count($form['filter']->vars['errors']) || count($form['display']->vars['errors']); ?>
-        <div class="col-xs-10 col-sm-5 padding-none<?php if ($hasErrors) echo " has-error"; ?>">
+        <div class="col-xs-10 col-sm-5 padding-none<?php if ($hasErrors) {
+    echo ' has-error';
+} ?>">
             <?php echo $view['form']->widget($form['filter']); ?>
             <?php echo $view['form']->errors($form['filter']); ?>
             <?php echo $view['form']->widget($form['display']); ?>
diff --git a/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_widget.html.php b/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_widget.html.php
index 1544d7f8cd4..d40172963bc 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_widget.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/Filter/_leadlist_filters_widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 foreach ($form as $i => $filter) {
     $isPrototype = ($filter->vars['name'] == '__name__');
     $filterType  = $filter['field']->vars['value'];
@@ -16,4 +16,3 @@
         }
     }
 }
-?>
\ No newline at end of file
diff --git a/app/bundles/LeadBundle/Views/FormTheme/FormActionAddUtmTags/_formaction_properties_row.html.php b/app/bundles/LeadBundle/Views/FormTheme/FormActionAddUtmTags/_formaction_properties_row.html.php
index 49dee21613b..11ebd688004 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/FormActionAddUtmTags/_formaction_properties_row.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/FormActionAddUtmTags/_formaction_properties_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/FormTheme/FormActionChangePoints/_formaction_properties_row.html.php b/app/bundles/LeadBundle/Views/FormTheme/FormActionChangePoints/_formaction_properties_row.html.php
index f0b9539536c..4e5152817e9 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/FormActionChangePoints/_formaction_properties_row.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/FormActionChangePoints/_formaction_properties_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/FormTheme/FormActionCreateLead/_formaction_properties_mappedFields_row.html.php b/app/bundles/LeadBundle/Views/FormTheme/FormActionCreateLead/_formaction_properties_mappedFields_row.html.php
index 3aed08866d6..fcce703b322 100644
--- a/app/bundles/LeadBundle/Views/FormTheme/FormActionCreateLead/_formaction_properties_mappedFields_row.html.php
+++ b/app/bundles/LeadBundle/Views/FormTheme/FormActionCreateLead/_formaction_properties_mappedFields_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/Import/form.html.php b/app/bundles/LeadBundle/Views/Import/form.html.php
index 2494488879a..18d4ff0e8ea 100644
--- a/app/bundles/LeadBundle/Views/Import/form.html.php
+++ b/app/bundles/LeadBundle/Views/Import/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 
 $view['slots']->set('mauticContent', 'leadImport');
@@ -90,16 +90,16 @@
                 <?php $rowCount = 2; ?>
                 <?php foreach ($form->children as $key => $child): ?>
                     <?php if ($key != 'properties'): ?>
-                        <?php if ($rowCount++ % 3 == 1 ): ?>
+                        <?php if ($rowCount++ % 3 == 1): ?>
                             <div class="row">
                         <?php endif; ?>
                         <div class="col-sm-4">
                             <?php echo $view['form']->row($child); ?>
                         </div>
-                        <?php if ($rowCount++ % 3 == 1 ): ?>
+                        <?php if ($rowCount++ % 3 == 1): ?>
                             </div>
                         <?php endif; ?>
-                        <?php $rowCount++; ?>
+                        <?php ++$rowCount; ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </div>
@@ -111,16 +111,16 @@
             <div class="panel-body">
                 <?php $rowCount = 2; ?>
                 <?php foreach ($form->children['properties'] as $child): ?>
-                    <?php if ($rowCount++ % 3 == 1 ): ?>
+                    <?php if ($rowCount++ % 3 == 1): ?>
                         <div class="row">
                     <?php endif; ?>
                     <div class="col-sm-4">
                         <?php echo $view['form']->row($child); ?>
                     </div>
-                    <?php if ($rowCount++ % 3 == 1 ): ?>
+                    <?php if ($rowCount++ % 3 == 1): ?>
                         </div>
                     <?php endif; ?>
-                    <?php $rowCount++; ?>
+                    <?php ++$rowCount; ?>
                 <?php endforeach; ?>
             </div>
         </div>
diff --git a/app/bundles/LeadBundle/Views/Import/progress.html.php b/app/bundles/LeadBundle/Views/Import/progress.html.php
index e9cb5938cc7..42fc21306f8 100644
--- a/app/bundles/LeadBundle/Views/Import/progress.html.php
+++ b/app/bundles/LeadBundle/Views/Import/progress.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
@@ -11,9 +12,9 @@
 $view['slots']->set('mauticContent', 'leadImport');
 $view['slots']->set('headerTitle', $view['translator']->trans('mautic.lead.import.leads'));
 
-$percent  = ($progress[1]) ? ceil(($progress[0] / $progress[1]) * 100) : 100;
-$id       = ($complete) ? 'leadImportProgressComplete' : 'leadImportProgress';
-$header   = ($complete) ? 'mautic.lead.import.success': 'mautic.lead.import.donotleave';
+$percent = ($progress[1]) ? ceil(($progress[0] / $progress[1]) * 100) : 100;
+$id      = ($complete) ? 'leadImportProgressComplete' : 'leadImportProgress';
+$header  = ($complete) ? 'mautic.lead.import.success' : 'mautic.lead.import.donotleave';
 ?>
 
 <div class="row ma-lg" id="<?php echo $id; ?>">
@@ -27,10 +28,12 @@
                 <?php if (!$complete): ?>
                     <h4><?php echo $view['translator']->trans('mautic.lead.import.inprogress'); ?></h4>
                 <?php else: ?>
-                    <h4><?php echo $view['translator']->trans('mautic.lead.import.stats', array('%merged%' => $stats['merged'], '%created%' => $stats['created'], '%ignored%' => $stats['ignored'])); ?></h4>
+                    <h4><?php echo $view['translator']->trans('mautic.lead.import.stats', ['%merged%' => $stats['merged'], '%created%' => $stats['created'], '%ignored%' => $stats['ignored']]); ?></h4>
                 <?php endif; ?>
                 <div class="progress mt-md" style="height:50px;">
-                    <div class="progress-bar-import progress-bar progress-bar-striped<?php if (!$complete) echo ' active'; ?>" role="progressbar" aria-valuenow="<?php echo $progress[0]; ?>" aria-valuemin="0" aria-valuemax="<?php echo $progress[1]; ?>" style="width: <?php echo $percent; ?>%; height: 50px;">
+                    <div class="progress-bar-import progress-bar progress-bar-striped<?php if (!$complete) {
+    echo ' active';
+} ?>" role="progressbar" aria-valuenow="<?php echo $progress[0]; ?>" aria-valuemin="0" aria-valuemax="<?php echo $progress[1]; ?>" style="width: <?php echo $percent; ?>%; height: 50px;">
                         <span class="sr-only"><?php echo $percent; ?>%</span>
                     </div>
                 </div>
@@ -50,7 +53,7 @@
                 <p class="small"><span class="imported-count"><?php echo $progress[0]; ?></span> / <span class="total-count"><?php echo $progress[1]; ?></span></p>
                 <?php if (!$complete): ?>
                     <div>
-                        <a class="text-danger mt-md" href="<?php echo $view['router']->path('mautic_contact_action', array('objectAction' => 'import', 'cancel' => 1)); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.cancel'); ?></a>
+                        <a class="text-danger mt-md" href="<?php echo $view['router']->path('mautic_contact_action', ['objectAction' => 'import', 'cancel' => 1]); ?>" data-toggle="ajax"><?php echo $view['translator']->trans('mautic.core.form.cancel'); ?></a>
                     </div>
                 <?php else: ?>
                     <div>
diff --git a/app/bundles/LeadBundle/Views/Lead/company.html.php b/app/bundles/LeadBundle/Views/Lead/company.html.php
index 2c93ce79fcc..b18313f11e5 100644
--- a/app/bundles/LeadBundle/Views/Lead/company.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/company.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $leadId   = $lead->getId();
 $leadName = $lead->getPrimaryIdentifier();
 ?>
@@ -17,7 +17,7 @@
         $bgClass = isset($companyLead[$company['id']]) ? 'text-success' : 'text-danger';
         ?>
         <li class="list-group-item">
-            <i class="fa fa-lg fa-fw <?php echo $switch . ' ' . $bgClass; ?>" id="companyLeadsToggle<?php echo $company['id']; ?>" onclick="Mautic.toggleCompanyLead('companyLeadsToggle<?php echo $company['id']; ?>', <?php echo $leadId; ?>, <?php echo $company['id']; ?>);"></i>
+            <i class="fa fa-lg fa-fw <?php echo $switch.' '.$bgClass; ?>" id="companyLeadsToggle<?php echo $company['id']; ?>" onclick="Mautic.toggleCompanyLead('companyLeadsToggle<?php echo $company['id']; ?>', <?php echo $leadId; ?>, <?php echo $company['id']; ?>);"></i>
             <span><?php echo $company['companyname']; ?></span>
         </li>
     <?php endforeach; ?>
diff --git a/app/bundles/LeadBundle/Views/Lead/email.html.php b/app/bundles/LeadBundle/Views/Lead/email.html.php
index 38ac05bb916..fd3a6a5b59d 100644
--- a/app/bundles/LeadBundle/Views/Lead/email.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/email.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($dnc && $dnc['bounced']) {
     echo '<div class="alert alert-warning">'.$view['translator']->trans('mautic.lead.do.not.contact_bounced').': '.$dnc['comments'].'</div>';
 } else {
@@ -19,4 +19,4 @@
     echo $view['form']->row($form['templates']);
 
     echo $view['form']->end($form);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/LeadBundle/Views/Lead/form.html.php b/app/bundles/LeadBundle/Views/Lead/form.html.php
index 7f8e5e3e783..0bb59302614 100644
--- a/app/bundles/LeadBundle/Views/Lead/form.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/form.html.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $header = ($lead->getId()) ?
     $view['translator']->trans('mautic.lead.lead.header.edit',
-        array('%name%' => $view['translator']->trans($lead->getPrimaryIdentifier()))) :
+        ['%name%' => $view['translator']->trans($lead->getPrimaryIdentifier())]) :
     $view['translator']->trans('mautic.lead.lead.header.new');
 $view['slots']->set('headerTitle', $header);
 $view['slots']->set('mauticContent', 'lead');
@@ -37,9 +38,13 @@
                     <?php echo $view['form']->widget($form['preferred_profile_image']); ?>
                 </div>
                 <div
-                    class="col-sm-12<?php if ($view['form']->containsErrors($form['custom_avatar'])) echo ' has-error'; ?>"
+                    class="col-sm-12<?php if ($view['form']->containsErrors($form['custom_avatar'])) {
+    echo ' has-error';
+} ?>"
                     id="customAvatarContainer"
-                    style="<?php if ($form['preferred_profile_image']->vars['data'] != 'custom') echo 'display: none;'; ?>">
+                    style="<?php if ($form['preferred_profile_image']->vars['data'] != 'custom') {
+    echo 'display: none;';
+} ?>">
                     <?php echo $view['form']->widget($form['custom_avatar']); ?>
                     <?php echo $view['form']->errors($form['custom_avatar']); ?>
                 </div>
@@ -51,12 +56,14 @@ class="col-sm-12<?php if ($view['form']->containsErrors($form['custom_avatar']))
                 <?php $step = 1; ?>
                 <?php foreach ($groups as $g): ?>
                     <?php if (!empty($fields[$g])): ?>
-                        <li class="list-group-item <?php if ($step === 1) echo "active"; ?>">
+                        <li class="list-group-item <?php if ($step === 1) {
+    echo 'active';
+} ?>">
                             <a href="#<?php echo $g; ?>" class="steps" data-toggle="tab">
-                                <?php echo $view['translator']->trans('mautic.lead.field.group.' . $g); ?>
+                                <?php echo $view['translator']->trans('mautic.lead.field.group.'.$g); ?>
                             </a>
                         </li>
-                        <?php $step++; ?>
+                        <?php ++$step; ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </ul>
@@ -73,10 +80,12 @@ class="col-sm-12<?php if ($view['form']->containsErrors($form['custom_avatar']))
                 if (isset($fields[$group])):
                     $groupFields = $fields[$group];
                     if (!empty($groupFields)): ?>
-                        <div class="tab-pane fade<?php if ($key === 0) echo ' in active'; ?> bdr-rds-0 bdr-w-0"
+                        <div class="tab-pane fade<?php if ($key === 0) {
+                        echo ' in active';
+                    } ?> bdr-rds-0 bdr-w-0"
                              id="<?php echo $group; ?>">
                             <div class="pa-md bg-auto bg-light-xs bdr-b">
-                                <h4 class="fw-sb"><?php echo $view['translator']->trans('mautic.lead.field.group.' . $group); ?></h4>
+                                <h4 class="fw-sb"><?php echo $view['translator']->trans('mautic.lead.field.group.'.$group); ?></h4>
                             </div>
                             <div class="pa-md">
                                 <?php if ($group == 'core'): ?>
@@ -88,17 +97,17 @@ class="control-label mb-xs"><?php echo $view['translator']->trans('mautic.core.n
                                             <div class="row">
                                                 <?php if (isset($form['title'])): ?>
                                                     <div class="col-sm-2">
-                                                        <?php echo $view['form']->widget($form['title'], array('attr' => array('placeholder' => $form['title']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['title'], ['attr' => ['placeholder' => $form['title']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                                 <?php if (isset($form['firstname'])): ?>
                                                     <div class="col-sm-3">
-                                                        <?php echo $view['form']->widget($form['firstname'], array('attr' => array('placeholder' => $form['firstname']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['firstname'], ['attr' => ['placeholder' => $form['firstname']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                                 <?php if (isset($form['lastname'])): ?>
                                                     <div class="col-sm-3">
-                                                        <?php echo $view['form']->widget($form['lastname'], array('attr' => array('placeholder' => $form['lastname']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['lastname'], ['attr' => ['placeholder' => $form['lastname']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                             </div>
@@ -111,7 +120,7 @@ class="control-label mb-xs"><?php echo $view['translator']->trans('mautic.core.n
                                             class="control-label mb-xs"><?php echo $form['email']->vars['label']; ?></label>
                                         <div class="row">
                                             <div class="col-sm-8">
-                                                <?php echo $view['form']->widget($form['email'], array('attr' => array('placeholder' => $form['email']->vars['label']))); ?>
+                                                <?php echo $view['form']->widget($form['email'], ['attr' => ['placeholder' => $form['email']->vars['label']]]); ?>
                                             </div>
                                         </div>
                                     </div>
@@ -126,7 +135,7 @@ class="control-label mb-xs"><?php echo $form['email']->vars['label']; ?></label>
                                                 <?php endif; ?>
                                                 <?php if (isset($form['position'])): ?>
                                                     <div class="col-sm-4">
-                                                        <?php echo $view['form']->widget($form['position'], array('attr' => array('placeholder' => $form['position']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['position'], ['attr' => ['placeholder' => $form['position']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                             </div>
@@ -140,38 +149,38 @@ class="control-label mb-xs"><?php echo $view['translator']->trans('mautic.lead.f
                                             <?php if (isset($form['address1'])): ?>
                                                 <div class="row mb-xs">
                                                     <div class="col-sm-8">
-                                                        <?php echo $view['form']->widget($form['address1'], array('attr' => array('placeholder' => $form['address1']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['address1'], ['attr' => ['placeholder' => $form['address1']->vars['label']]]); ?>
                                                     </div>
                                                 </div>
                                             <?php endif; ?>
                                             <?php if (isset($form['address2'])): ?>
                                                 <div class="row mb-xs">
                                                     <div class="col-sm-8">
-                                                        <?php echo $view['form']->widget($form['address2'], array('attr' => array('placeholder' => $form['address2']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['address2'], ['attr' => ['placeholder' => $form['address2']->vars['label']]]); ?>
                                                     </div>
                                                 </div>
                                             <?php endif; ?>
                                             <div class="row mb-xs">
                                                 <?php if (isset($form['city'])): ?>
                                                     <div class="col-sm-4">
-                                                        <?php echo $view['form']->widget($form['city'], array('attr' => array('placeholder' => $form['city']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['city'], ['attr' => ['placeholder' => $form['city']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                                 <?php if (isset($form['state'])): ?>
                                                     <div class="col-sm-4">
-                                                        <?php echo $view['form']->widget($form['state'], array('attr' => array('placeholder' => $form['state']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['state'], ['attr' => ['placeholder' => $form['state']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                             </div>
                                             <div class="row">
                                                 <?php if (isset($form['zipcode'])): ?>
                                                     <div class="col-sm-4">
-                                                        <?php echo $view['form']->widget($form['zipcode'], array('attr' => array('placeholder' => $form['zipcode']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['zipcode'], ['attr' => ['placeholder' => $form['zipcode']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                                 <?php if (isset($form['country'])): ?>
                                                     <div class="col-sm-4">
-                                                        <?php echo $view['form']->widget($form['country'], array('attr' => array('placeholder' => $form['country']->vars['label']))); ?>
+                                                        <?php echo $view['form']->widget($form['country'], ['attr' => ['placeholder' => $form['country']->vars['label']]]); ?>
                                                     </div>
                                                 <?php endif; ?>
                                             </div>
@@ -185,10 +194,10 @@ class="control-label mb-xs"><?php echo $view['translator']->trans('mautic.lead.f
                                             class="control-label mb-xs"><?php echo $view['translator']->trans('mautic.lead.attribution'); ?></label>
                                         <div class="row">
                                             <div class="col-sm-4">
-                                                <?php echo $view['form']->widget($form['attribution'], array('attr' => array('placeholder' => $form['attribution']->vars['label'], 'preaddon' => 'fa fa-money'))); ?>
+                                                <?php echo $view['form']->widget($form['attribution'], ['attr' => ['placeholder' => $form['attribution']->vars['label'], 'preaddon' => 'fa fa-money']]); ?>
                                             </div>
                                             <div class="col-sm-4">
-                                                <?php echo $view['form']->widget($form['attribution_date'], array('attr' => array('placeholder' => $form['attribution_date']->vars['label']))); ?>
+                                                <?php echo $view['form']->widget($form['attribution_date'], ['attr' => ['placeholder' => $form['attribution_date']->vars['label']]]); ?>
                                             </div>
                                         </div>
                                     </div>
@@ -203,7 +212,9 @@ class="control-label mb-xs"><?php echo $view['translator']->trans('mautic.lead.a
                                                 continue;
                                                 ?>
                                                 <?php endif; ?>
-                                            <?php if ($form[$alias]->isRendered()) continue; ?>
+                                            <?php if ($form[$alias]->isRendered()) {
+                                                    continue;
+                                                } ?>
                                             <div class="col-sm-8">
                                                 <?php echo $view['form']->row($form[$alias]); ?>
                                             </div>
diff --git a/app/bundles/LeadBundle/Views/Lead/frequency.html.php b/app/bundles/LeadBundle/Views/Lead/frequency.html.php
index 7260df12fd4..e8c73b1c37b 100644
--- a/app/bundles/LeadBundle/Views/Lead/frequency.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/frequency.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/Lead/grid.html.php b/app/bundles/LeadBundle/Views/Lead/grid.html.php
index bb83c546d3d..0b06797b89e 100644
--- a/app/bundles/LeadBundle/Views/Lead/grid.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/grid.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticLeadBundle:Lead:index.html.php');
+}
 ?>
 
 <div class="pa-md bg-auto">
@@ -15,11 +17,11 @@
     <div class="row shuffle-grid">
         <?php
         foreach ($items as $item):
-        echo $view->render('MauticLeadBundle:Lead:grid_card.html.php', array(
+        echo $view->render('MauticLeadBundle:Lead:grid_card.html.php', [
             'contact'       => $item,
             'showCheckbox'  => !empty($showCheckbox), // default is false
-            'noContactList' => (isset($noContactList)) ? $noContactList : []
-        ));
+            'noContactList' => (isset($noContactList)) ? $noContactList : [],
+        ]);
         endforeach;
         ?>
     </div>
@@ -31,17 +33,17 @@
 <?php if (count($items)): ?>
     <div class="panel-footer">
         <?php
-        $link = (isset($link))? $link : 'mautic_contact_index';
-        echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-            'totalItems'      => $totalItems,
-            'page'            => $page,
-            'limit'           => $limit,
-            'menuLinkId'      => $link,
-            'baseUrl'         => (isset($objectId)) ? $view['router']->path($link, array('objectId' => $objectId)) : $view['router']->path($link),
-            'tmpl'            => (!in_array($tmpl, array('grid', 'index'))) ? $tmpl : $indexMode,
-            'sessionVar'      => (isset($sessionVar)) ? $sessionVar : 'lead',
-            'target'          => (isset($target)) ? $target : '.page-list'
-        ));
+        $link = (isset($link)) ? $link : 'mautic_contact_index';
+        echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+            'totalItems' => $totalItems,
+            'page'       => $page,
+            'limit'      => $limit,
+            'menuLinkId' => $link,
+            'baseUrl'    => (isset($objectId)) ? $view['router']->path($link, ['objectId' => $objectId]) : $view['router']->path($link),
+            'tmpl'       => (!in_array($tmpl, ['grid', 'index'])) ? $tmpl : $indexMode,
+            'sessionVar' => (isset($sessionVar)) ? $sessionVar : 'lead',
+            'target'     => (isset($target)) ? $target : '.page-list',
+        ]);
         ?>
     </div>
 <?php endif; ?>
diff --git a/app/bundles/LeadBundle/Views/Lead/grid_card.html.php b/app/bundles/LeadBundle/Views/Lead/grid_card.html.php
index 41be55f74c5..5522e08893d 100644
--- a/app/bundles/LeadBundle/Views/Lead/grid_card.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/grid_card.html.php
@@ -1,21 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $fields = $contact->getFields();
 $color  = $contact->getColor();
-if (empty($color))
+if (empty($color)) {
     $color = 'a0acb8';
+}
 
 $img = $view['lead_avatar']->getAvatar($contact);
 ?>
 <div class="shuffle shuffle-item grid col-sm-6 col-lg-4 contact-cards">
-    <div data-color="#<?php echo $color; ?>" class="panel<?php if (!empty($highlight)) echo " highlight"; ?> card ovf-h" style="border-top: 3px solid #<?php echo $color; ?>;">
+    <div data-color="#<?php echo $color; ?>" class="panel<?php if (!empty($highlight)) {
+    echo ' highlight';
+} ?> card ovf-h" style="border-top: 3px solid #<?php echo $color; ?>;">
         <div class="box-layout">
             <div class="col-xs-4 va-m">
                 <div class="panel-body">
@@ -41,7 +44,7 @@
                     <?php endif; ?>
                     <h4 class="fw-sb mb-xs ellipsis">
                         <a href="<?php echo $view['router']->path('mautic_contact_action',
-                            array("objectAction" => "view", "objectId" => $contact->getId())); ?>"
+                            ['objectAction' => 'view', 'objectId' => $contact->getId()]); ?>"
                            data-toggle="ajax">
                             <span><?php echo $contact->getPrimaryIdentifier(); ?></span>
                         </a>
@@ -51,7 +54,7 @@
                     </div>
                     <div class="text-muted mb-1 ellipsis">
                         <i class="fa fa-fw fa-map-marker mr-xs"></i><?php
-                        $location = array();
+                        $location = [];
                         if (!empty($fields['core']['city']['value'])):
                             $location[] = $fields['core']['city']['value'];
                         endif;
diff --git a/app/bundles/LeadBundle/Views/Lead/index.html.php b/app/bundles/LeadBundle/Views/Lead/index.html.php
index caf37a08e61..c88428ff520 100644
--- a/app/bundles/LeadBundle/Views/Lead/index.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/index.html.php
@@ -1,163 +1,163 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'lead');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.lead.leads'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.lead.leads'));
 
-$buttons = $preButtons = array();
+$buttons = $preButtons = [];
 if ($permissions['lead:leads:create']) {
-    $preButtons[] = array(
-        'attr'      => array(
+    $preButtons[] = [
+        'attr' => [
             'class'       => 'btn btn-default btn-nospin quickadd',
             'data-toggle' => 'ajaxmodal',
             'data-target' => '#MauticSharedModal',
-            'href'        => $view['router']->path('mautic_contact_action', array('objectAction' => 'quickAdd')),
+            'href'        => $view['router']->path('mautic_contact_action', ['objectAction' => 'quickAdd']),
             'data-header' => $view['translator']->trans('mautic.lead.lead.menu.quickadd'),
-        ),
+        ],
         'iconClass' => 'fa fa-bolt',
-        'btnText'   => 'mautic.lead.lead.menu.quickadd'
-    );
+        'btnText'   => 'mautic.lead.lead.menu.quickadd',
+    ];
 
-    $buttons[] = array(
-        'attr'      => array(
-            'href'  => $view['router']->path('mautic_contact_action', array('objectAction' => 'import')),
-        ),
+    $buttons[] = [
+        'attr' => [
+            'href' => $view['router']->path('mautic_contact_action', ['objectAction' => 'import']),
+        ],
         'iconClass' => 'fa fa-upload',
-        'btnText'   => 'mautic.lead.lead.import'
-    );
+        'btnText'   => 'mautic.lead.lead.import',
+    ];
 }
 
 // Only show toggle buttons for accessibility
 $extraHtml = <<<button
 <div class="btn-group ml-5 sr-only ">
-    <span data-toggle="tooltip" title="{$view['translator']->trans('mautic.lead.tooltip.list')}" data-placement="left"><a id="table-view" href="{$view['router']->path('mautic_contact_index', array('page' => $page, 'view' => 'list'))}" data-toggle="ajax" class="btn btn-default"><i class="fa fa-fw fa-table"></i></span></a>
-    <span data-toggle="tooltip" title="{$view['translator']->trans('mautic.lead.tooltip.grid')}" data-placement="left"><a id="card-view" href="{$view['router']->path('mautic_contact_index', array('page' => $page, 'view' => 'grid'))}" data-toggle="ajax" class="btn btn-default"><i class="fa fa-fw fa-th-large"></i></span></a>
+    <span data-toggle="tooltip" title="{$view['translator']->trans('mautic.lead.tooltip.list')}" data-placement="left"><a id="table-view" href="{$view['router']->path('mautic_contact_index', ['page' => $page, 'view' => 'list'])}" data-toggle="ajax" class="btn btn-default"><i class="fa fa-fw fa-table"></i></span></a>
+    <span data-toggle="tooltip" title="{$view['translator']->trans('mautic.lead.tooltip.grid')}" data-placement="left"><a id="card-view" href="{$view['router']->path('mautic_contact_index', ['page' => $page, 'view' => 'grid'])}" data-toggle="ajax" class="btn btn-default"><i class="fa fa-fw fa-th-large"></i></span></a>
 </div>
 button;
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'templateButtons' => array(
-        'new' => $permissions['lead:leads:create']
-    ),
-    'routeBase' => 'contact',
-    'langVar'   => 'lead.lead',
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'templateButtons' => [
+        'new' => $permissions['lead:leads:create'],
+    ],
+    'routeBase'        => 'contact',
+    'langVar'          => 'lead.lead',
     'preCustomButtons' => $preButtons,
     'customButtons'    => $buttons,
-    'extraHtml'        => $extraHtml
-)));
+    'extraHtml'        => $extraHtml,
+]));
 
-$customButtons = array(
-    array(
-        'attr'      => array(
-            'class'   => 'hidden-xs btn btn-default btn-sm btn-nospin',
-            'href'    => 'javascript: void(0)',
-            'onclick' => 'Mautic.toggleLiveLeadListUpdate();',
-            'id'      => 'liveModeButton',
+$customButtons = [
+    [
+        'attr' => [
+            'class'       => 'hidden-xs btn btn-default btn-sm btn-nospin',
+            'href'        => 'javascript: void(0)',
+            'onclick'     => 'Mautic.toggleLiveLeadListUpdate();',
+            'id'          => 'liveModeButton',
             'data-toggle' => false,
-            'data-max-id' => $maxLeadId
-        ),
-        'tooltip' => $view['translator']->trans('mautic.lead.lead.live_update'),
-        'iconClass' => 'fa fa-bolt'
-    )
-);
+            'data-max-id' => $maxLeadId,
+        ],
+        'tooltip'   => $view['translator']->trans('mautic.lead.lead.live_update'),
+        'iconClass' => 'fa fa-bolt',
+    ],
+];
 
 if ($indexMode == 'list') {
-    $customButtons[] = array(
-        'attr'      => array(
+    $customButtons[] = [
+        'attr' => [
             'class'          => 'hidden-xs btn btn-default btn-sm btn-nospin'.(($anonymousShowing) ? ' btn-primary' : ''),
             'href'           => 'javascript: void(0)',
             'onclick'        => 'Mautic.toggleAnonymousLeads();',
             'id'             => 'anonymousLeadButton',
-            'data-anonymous' => $view['translator']->trans('mautic.lead.lead.searchcommand.isanonymous')
-        ),
+            'data-anonymous' => $view['translator']->trans('mautic.lead.lead.searchcommand.isanonymous'),
+        ],
         'tooltip'   => $view['translator']->trans('mautic.lead.lead.anonymous_leads'),
-        'iconClass' => 'fa fa-user-secret'
-    );
+        'iconClass' => 'fa fa-user-secret',
+    ];
 }
 
 if ($permissions['lead:leads:editown'] || $permissions['lead:leads:editother']) {
     $customButtons = array_merge(
         $customButtons,
-        array(
-            array(
-                'attr'      => array(
+        [
+            [
+                'attr' => [
                     'class'       => 'btn btn-default btn-sm btn-nospin',
                     'data-toggle' => 'ajaxmodal',
                     'data-target' => '#MauticSharedModal',
-                    'href'        => $view['router']->path('mautic_contact_action', array('objectAction' => 'batchCompanies')),
-                    'data-header' => $view['translator']->trans('mautic.lead.batch.companies')
-                ),
-                'tooltip' => $view['translator']->trans('mautic.lead.batch.companies'),
-                'iconClass' => 'fa fa-building'
-            ),
-            array(
-                'attr'      => array(
+                    'href'        => $view['router']->path('mautic_contact_action', ['objectAction' => 'batchCompanies']),
+                    'data-header' => $view['translator']->trans('mautic.lead.batch.companies'),
+                ],
+                'tooltip'   => $view['translator']->trans('mautic.lead.batch.companies'),
+                'iconClass' => 'fa fa-building',
+            ],
+            [
+                'attr' => [
                     'class'       => 'btn btn-default btn-sm btn-nospin',
                     'data-toggle' => 'ajaxmodal',
                     'data-target' => '#MauticSharedModal',
-                    'href'        => $view['router']->path('mautic_contact_action', array('objectAction' => 'batchLists')),
-                    'data-header' => $view['translator']->trans('mautic.lead.batch.lists')
-                ),
-                'tooltip' => $view['translator']->trans('mautic.lead.batch.lists'),
-                'iconClass' => 'fa fa-pie-chart'
-            ),
-            array(
-                'attr'      => array(
+                    'href'        => $view['router']->path('mautic_contact_action', ['objectAction' => 'batchLists']),
+                    'data-header' => $view['translator']->trans('mautic.lead.batch.lists'),
+                ],
+                'tooltip'   => $view['translator']->trans('mautic.lead.batch.lists'),
+                'iconClass' => 'fa fa-pie-chart',
+            ],
+            [
+                'attr' => [
                     'class'       => 'btn btn-default btn-sm btn-nospin',
                     'data-toggle' => 'ajaxmodal',
                     'data-target' => '#MauticSharedModal',
-                    'href'        => $view['router']->path('mautic_contact_action', array('objectAction' => 'batchStages')),
+                    'href'        => $view['router']->path('mautic_contact_action', ['objectAction' => 'batchStages']),
                     'data-header' => $view['translator']->trans('mautic.lead.batch.stages'),
-                ),
-                'tooltip' => $view['translator']->trans('mautic.lead.batch.stages'),
-                'iconClass' => 'fa fa-tachometer'
-            ),
-            array(
-                'attr'      => array(
+                ],
+                'tooltip'   => $view['translator']->trans('mautic.lead.batch.stages'),
+                'iconClass' => 'fa fa-tachometer',
+            ],
+            [
+                'attr' => [
                     'class'       => 'btn btn-default btn-sm btn-nospin',
                     'data-toggle' => 'ajaxmodal',
                     'data-target' => '#MauticSharedModal',
-                    'href'        => $view['router']->path('mautic_contact_action', array('objectAction' => 'batchCampaigns')),
+                    'href'        => $view['router']->path('mautic_contact_action', ['objectAction' => 'batchCampaigns']),
                     'data-header' => $view['translator']->trans('mautic.lead.batch.campaigns'),
-                ),
-                'tooltip' => $view['translator']->trans('mautic.lead.batch.campaigns'),
-                'iconClass' => 'fa fa-clock-o'
-            ),
-            array(
-                'attr'      => array(
+                ],
+                'tooltip'   => $view['translator']->trans('mautic.lead.batch.campaigns'),
+                'iconClass' => 'fa fa-clock-o',
+            ],
+            [
+                'attr' => [
                     'class'       => 'hidden-xs btn btn-default btn-sm btn-nospin',
                     'data-toggle' => 'ajaxmodal',
                     'data-target' => '#MauticSharedModal',
-                    'href'        => $view['router']->path('mautic_contact_action', array('objectAction' => 'batchDnc')),
+                    'href'        => $view['router']->path('mautic_contact_action', ['objectAction' => 'batchDnc']),
                     'data-header' => $view['translator']->trans('mautic.lead.batch.dnc'),
-                ),
-                'tooltip' => $view['translator']->trans('mautic.lead.batch.dnc'),
-                'iconClass' => 'fa fa-ban text-danger'
-            )
-        )
+                ],
+                'tooltip'   => $view['translator']->trans('mautic.lead.batch.dnc'),
+                'iconClass' => 'fa fa-ban text-danger',
+            ],
+        ]
     );
 }
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'searchHelp'  => 'mautic.lead.lead.help.searchcommands',
-        'action'      => $currentRoute,
-        'langVar'     => 'lead.lead',
-        'routeBase'   => 'contact',
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'      => $searchValue,
+        'searchHelp'       => 'mautic.lead.lead.help.searchcommands',
+        'action'           => $currentRoute,
+        'langVar'          => 'lead.lead',
+        'routeBase'        => 'contact',
         'preCustomButtons' => $customButtons,
-        'templateButtons' => array(
-            'delete' => $permissions['lead:leads:deleteown'] || $permissions['lead:leads:deleteother']
-        )
-    )); ?>
+        'templateButtons'  => [
+            'delete' => $permissions['lead:leads:deleteown'] || $permissions['lead:leads:deleteother'],
+        ],
+    ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
     </div>
diff --git a/app/bundles/LeadBundle/Views/Lead/lead.html.php b/app/bundles/LeadBundle/Views/Lead/lead.html.php
index 09b56ba7b76..cc12137fd19 100644
--- a/app/bundles/LeadBundle/Views/Lead/lead.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/lead.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -44,7 +45,7 @@
 //Send email button
 if (!empty($fields['core']['email']['value'])) {
     $buttons[] = [
-        'attr'      => [
+        'attr' => [
             'id'          => 'sendEmailButton',
             'data-toggle' => 'ajaxmodal',
             'data-target' => '#MauticSharedModal',
@@ -52,7 +53,7 @@
                 'mautic.lead.email.send_email.header',
                 ['%email%' => $fields['core']['email']['value']]
             ),
-            'href'        => $view['router']->path(
+            'href' => $view['router']->path(
                 'mautic_contact_action',
                 ['objectId' => $lead->getId(), 'objectAction' => 'email']
             ),
@@ -63,7 +64,7 @@
 }
 //View Lead List button
 $buttons[] = [
-    'attr'      => [
+    'attr' => [
         'data-toggle' => 'ajaxmodal',
         'data-target' => '#MauticSharedModal',
         'data-header' => $view['translator']->trans(
@@ -73,7 +74,7 @@
         'data-footer' => 'false',
         'href'        => $view['router']->path(
             'mautic_contact_action',
-            ["objectId" => $lead->getId(), "objectAction" => "list"]
+            ['objectId' => $lead->getId(), 'objectAction' => 'list']
         ),
     ],
     'btnText'   => $view['translator']->trans('mautic.lead.lead.lists'),
@@ -84,26 +85,26 @@
 
 if ($edit) {
     $buttons[] = [
-        'attr'      => [
+        'attr' => [
             'data-toggle' => 'ajaxmodal',
             'data-target' => '#MauticSharedModal',
             'data-header' => $view['translator']->trans(
                 'mautic.lead.lead.header.contact.frequency',
                 ['%name%' => $lead->getPrimaryIdentifier()]
             ),
-            'href'        => $view['router']->path(
+            'href' => $view['router']->path(
                 'mautic_contact_action',
-                ["objectId" => $lead->getId(), "objectAction" => "contactFrequency"]
-            )
+                ['objectId' => $lead->getId(), 'objectAction' => 'contactFrequency']
+            ),
         ],
         'btnText'   => $view['translator']->trans('mautic.lead.contact.frequency'),
-        'iconClass' => 'fa fa-signal'
+        'iconClass' => 'fa fa-signal',
     ];
 }
 //View Campaigns List button
 if ($view['security']->isGranted('campaign:campaigns:edit')) {
     $buttons[] = [
-        'attr'      => [
+        'attr' => [
             'data-toggle' => 'ajaxmodal',
             'data-target' => '#MauticSharedModal',
             'data-header' => $view['translator']->trans(
@@ -113,7 +114,7 @@
             'data-footer' => 'false',
             'href'        => $view['router']->path(
                 'mautic_contact_action',
-                ["objectId" => $lead->getId(), "objectAction" => "campaign"]
+                ['objectId' => $lead->getId(), 'objectAction' => 'campaign']
             ),
         ],
         'btnText'   => $view['translator']->trans('mautic.campaign.campaigns'),
@@ -128,18 +129,17 @@
     ))
     && $edit
 ) {
-
     $buttons[] = [
-        'attr'      => [
+        'attr' => [
             'data-toggle' => 'ajaxmodal',
             'data-target' => '#MauticSharedModal',
             'data-header' => $view['translator']->trans(
                 'mautic.lead.lead.header.merge',
                 ['%name%' => $lead->getPrimaryIdentifier()]
             ),
-            'href'        => $view['router']->path(
+            'href' => $view['router']->path(
                 'mautic_contact_action',
-                ["objectId" => $lead->getId(), "objectAction" => "merge"]
+                ['objectId' => $lead->getId(), 'objectAction' => 'merge']
             ),
         ],
         'btnText'   => $view['translator']->trans('mautic.lead.merge'),
@@ -147,7 +147,6 @@
     ];
 }
 
-
 $view['slots']->set(
     'actions',
     $view->render(
@@ -164,7 +163,7 @@
                     $permissions['lead:leads:deleteother'],
                     $lead->getPermissionUser()
                 ),
-                'close'  => $view['security']->hasEntityAccess(
+                'close' => $view['security']->hasEntityAccess(
                     $permissions['lead:leads:viewown'],
                     $permissions['lead:leads:viewother'],
                     $lead->getPermissionUser()
@@ -189,13 +188,13 @@
                     <?php foreach ($groups as $g): ?>
                         <?php if (!empty($fields[$g])): ?>
                             <li class="<?php if ($step === 0) {
-                                echo "active";
-                            } ?>">
+    echo 'active';
+} ?>">
                                 <a href="#<?php echo $g; ?>" class="group" data-toggle="tab">
                                     <?php echo $view['translator']->trans('mautic.lead.field.group.'.$g); ?>
                                 </a>
                             </li>
-                            <?php $step++; ?>
+                            <?php ++$step; ?>
                         <?php endif; ?>
                     <?php endforeach; ?>
                 </ul>
@@ -220,7 +219,7 @@
                                                     <span class="mt-1"><?php echo $field['value']; ?>
                                                     <?php else: ?>
                                                         <?php if ('multiselect' === $field['type']): ?>
-                                                            <?php echo implode(", ",$field['value']); ?>
+                                                            <?php echo implode(', ', $field['value']); ?>
                                                         <?php else: ?>
                                                             <?php echo $field['value']; ?>
                                                         <?php endif; ?>
@@ -233,7 +232,7 @@
                                 </div>
                             </div>
                         </div>
-                        <?php $i++; ?>
+                        <?php ++$i; ?>
                     <?php endforeach; ?>
                 </div>
             </div>
@@ -327,7 +326,7 @@
                     [
                         'events' => $events,
                         'lead'   => $lead,
-                        'tmpl'   => 'index'
+                        'tmpl'   => 'index',
                     ]
                 ); ?>
             </div>
@@ -458,8 +457,8 @@ class="caret"></span></a>
                     <?php if (!empty($fields['core']['address2']['value'])) : echo $fields['core']['address2']['value']
                         .'<br>'; endif ?>
                     <?php echo $lead->getLocation(); ?> <?php if (isset($fields['core']['zipcode'])) {
-                        echo $fields['core']['zipcode']['value'];
-                    } ?><br>
+                            echo $fields['core']['zipcode']['value'];
+                        } ?><br>
                 </address>
 
                 <h6 class="fw-sb"><?php echo $view['translator']->trans('mautic.core.type.email'); ?></h6>
@@ -495,7 +494,7 @@ class="caret"></span></a>
                                 <div class="media-body">
                                     <?php $link = '<a href="'.$view['router']->path(
                                             'mautic_campaign_action',
-                                            ["objectAction" => "view", "objectId" => $event['campaign_id']]
+                                            ['objectAction' => 'view', 'objectId' => $event['campaign_id']]
                                         ).'" data-toggle="ajax">'.$event['campaign_name'].'</a>'; ?>
                                     <?php echo $view['translator']->trans(
                                         'mautic.lead.lead.upcoming.event.triggered.at',
@@ -522,7 +521,7 @@ class="caret"></span></a>
                     'mautic.lead.lead.companies'); ?></div>
             <?php foreach ($companies as $key => $company): ?>
                 <h5 class="pull-left mt-xs mr-xs"><span class="label <?php if ($key == 0): ?>label-primary <?php else: ?>label-success<?php endif?>" >
-                        <a href="<?php echo $view['router']->path('mautic_company_action', array("objectAction" => "edit", "objectId" => $company['id'])); ?>" style="color: white;"><?php echo $company['companyname']; ?></a>
+                        <a href="<?php echo $view['router']->path('mautic_company_action', ['objectAction' => 'edit', 'objectId' => $company['id']]); ?>" style="color: white;"><?php echo $company['companyname']; ?></a>
                     </span>
                 </h5>
             <?php endforeach; ?>
diff --git a/app/bundles/LeadBundle/Views/Lead/list.html.php b/app/bundles/LeadBundle/Views/Lead/list.html.php
index f90fac461da..3977d3ccfd7 100644
--- a/app/bundles/LeadBundle/Views/Lead/list.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticLeadBundle:Lead:index.html.php');
+}
 ?>
 
 <?php if (count($items)): ?>
@@ -16,82 +18,82 @@
         <thead>
             <tr>
                 <?php
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#leadTable'
-                ));
+                    'target'   => '#leadTable',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'lead',
                     'orderBy'    => 'l.lastname, l.firstname, l.company, l.email',
                     'text'       => 'mautic.core.name',
-                    'class'      => 'col-lead-name'
-                ));
+                    'class'      => 'col-lead-name',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'lead',
                     'orderBy'    => 'l.email',
                     'text'       => 'mautic.core.type.email',
-                    'class'      => 'col-lead-email visible-md visible-lg'
-                ));
+                    'class'      => 'col-lead-email visible-md visible-lg',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'lead',
                     'orderBy'    => 'l.city, l.state',
                     'text'       => 'mautic.lead.lead.thead.location',
-                    'class'      => 'col-lead-location visible-md visible-lg'
-                ));
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    'class'      => 'col-lead-location visible-md visible-lg',
+                ]);
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'lead',
                     'orderBy'    => 'l.stage_id',
                     'text'       => 'mautic.lead.stage.label',
-                    'class'      => 'col-lead-stage'
-                ));
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    'class'      => 'col-lead-stage',
+                ]);
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'lead',
                     'orderBy'    => 'l.points',
                     'text'       => 'mautic.lead.points',
-                    'class'      => 'visible-md visible-lg col-lead-points'
-                ));
+                    'class'      => 'visible-md visible-lg col-lead-points',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'lead',
                     'orderBy'    => 'l.last_active',
                     'text'       => 'mautic.lead.lastactive',
                     'class'      => 'col-lead-lastactive visible-md visible-lg',
-                    'default'    => true
-                ));
+                    'default'    => true,
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'lead',
                     'orderBy'    => 'l.id',
                     'text'       => 'mautic.core.id',
-                    'class'      => 'col-lead-id visible-md visible-lg'
-                ));
+                    'class'      => 'col-lead-id visible-md visible-lg',
+                ]);
                 ?>
             </tr>
         </thead>
         <tbody>
-        <?php echo $view->render('MauticLeadBundle:Lead:list_rows.html.php', array(
+        <?php echo $view->render('MauticLeadBundle:Lead:list_rows.html.php', [
             'items'         => $items,
             'security'      => $security,
             'currentList'   => $currentList,
             'permissions'   => $permissions,
-            'noContactList' => $noContactList
-        )); ?>
+            'noContactList' => $noContactList,
+        ]); ?>
         </tbody>
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems"      => $totalItems,
-        "page"            => $page,
-        "limit"           => $limit,
-        "menuLinkId"      => 'mautic_contact_index',
-        "baseUrl"         => $view['router']->path('mautic_contact_index'),
-        "tmpl"            => $indexMode,
-        'sessionVar'      => 'lead'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => $totalItems,
+        'page'       => $page,
+        'limit'      => $limit,
+        'menuLinkId' => 'mautic_contact_index',
+        'baseUrl'    => $view['router']->path('mautic_contact_index'),
+        'tmpl'       => $indexMode,
+        'sessionVar' => 'lead',
+    ]); ?>
 </div>
 <?php else: ?>
 <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php'); ?>
diff --git a/app/bundles/LeadBundle/Views/Lead/list_rows.html.php b/app/bundles/LeadBundle/Views/Lead/list_rows.html.php
index f1f554e84b9..6086beecf02 100644
--- a/app/bundles/LeadBundle/Views/Lead/list_rows.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/list_rows.html.php
@@ -1,16 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
         <?php foreach ($items as $item): ?>
             <?php /** @var \Mautic\LeadBundle\Entity\Lead $item */ ?>
             <?php $fields = $item->getFields(); ?>
-            <tr<?php if (!empty($highlight)) echo ' class="warning"'; ?>>
+            <tr<?php if (!empty($highlight)) {
+    echo ' class="warning"';
+} ?>>
                 <td>
                     <?php
                     $hasEditAccess = $security->hasEntityAccess(
@@ -19,51 +22,51 @@
                         $item->getPermissionUser()
                     );
 
-                    $custom = array();
+                    $custom = [];
                     if ($hasEditAccess && !empty($currentList)) {
                         //this lead was manually added to a list so give an option to remove them
-                        $custom[] = array(
-                            'attr' => array(
-                                'href' => $view['router']->path('mautic_segment_action', array(
-                                    "objectAction" => "removeLead",
-                                    "objectId" => $currentList['id'],
-                                    "leadId"   => $item->getId()
-                                )),
-                                'data-toggle' => "ajax",
-                                'data-method' => 'POST'
-                            ),
-                            'btnText' => 'mautic.lead.lead.remove.fromlist',
-                            'iconClass'  => 'fa fa-remove'
-                        );
+                        $custom[] = [
+                            'attr' => [
+                                'href' => $view['router']->path('mautic_segment_action', [
+                                    'objectAction' => 'removeLead',
+                                    'objectId'     => $currentList['id'],
+                                    'leadId'       => $item->getId(),
+                                ]),
+                                'data-toggle' => 'ajax',
+                                'data-method' => 'POST',
+                            ],
+                            'btnText'   => 'mautic.lead.lead.remove.fromlist',
+                            'iconClass' => 'fa fa-remove',
+                        ];
                     }
 
                     if (!empty($fields['core']['email']['value'])) {
-                        $custom[] = array(
-                            'attr'      => array(
+                        $custom[] = [
+                            'attr' => [
                                 'data-toggle' => 'ajaxmodal',
                                 'data-target' => '#MauticSharedModal',
-                                'data-header' => $view['translator']->trans('mautic.lead.email.send_email.header', array('%email%' => $fields['core']['email']['value'])),
-                                'href'        => $view['router']->path('mautic_contact_action', array('objectId' => $item->getId(), 'objectAction' => 'email', 'list' => 1))
-                            ),
+                                'data-header' => $view['translator']->trans('mautic.lead.email.send_email.header', ['%email%' => $fields['core']['email']['value']]),
+                                'href'        => $view['router']->path('mautic_contact_action', ['objectId' => $item->getId(), 'objectAction' => 'email', 'list' => 1]),
+                            ],
                             'btnText'   => 'mautic.lead.email.send_email',
-                            'iconClass'    => 'fa fa-send'
-                        );
+                            'iconClass' => 'fa fa-send',
+                        ];
                     }
 
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => $hasEditAccess,
-                            'delete'    => $security->hasEntityAccess($permissions['lead:leads:deleteown'], $permissions['lead:leads:deleteother'], $item->getPermissionUser()),
-                        ),
-                        'routeBase' => 'contact',
-                        'langVar'   => 'lead.lead',
-                        'customButtons' => $custom
-                    ));
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => $hasEditAccess,
+                            'delete' => $security->hasEntityAccess($permissions['lead:leads:deleteown'], $permissions['lead:leads:deleteother'], $item->getPermissionUser()),
+                        ],
+                        'routeBase'     => 'contact',
+                        'langVar'       => 'lead.lead',
+                        'customButtons' => $custom,
+                    ]);
                     ?>
                 </td>
                 <td>
-                    <a href="<?php echo $view['router']->path('mautic_contact_action', array("objectAction" => "view", "objectId" => $item->getId())); ?>" data-toggle="ajax">
+                    <a href="<?php echo $view['router']->path('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                         <?php if (in_array($item->getId(), $noContactList)) : ?>
                             <div class="pull-right label label-danger"><i class="fa fa-ban"> </i></div>
                         <?php endif; ?>
@@ -80,7 +83,7 @@
                     <img src="<?php echo $flag; ?>" style="max-height: 24px;" class="mr-sm" />
                     <?php
                     endif;
-                    $location = array();
+                    $location = [];
                     if (!empty($fields['core']['city']['value'])):
                         $location[] = $fields['core']['city']['value'];
                     endif;
@@ -96,16 +99,16 @@
                 <td class="text-center">
                     <?php
                     $color = $item->getColor();
-                    $style = !empty($color) ? ' style="background-color: ' . $color . ';"' : '';
+                    $style = !empty($color) ? ' style="background-color: '.$color.';"' : '';
                     ?>
-                    <?php if($item->getStage()):?>
+                    <?php if ($item->getStage()):?>
                     <span class="label label-default"<?php echo $style; ?>><?php echo $item->getStage()->getName(); ?></span>
                     <?php endif?>
                 </td>
                 <td class="visible-md visible-lg text-center">
                     <?php
                     $color = $item->getColor();
-                    $style = !empty($color) ? ' style="background-color: ' . $color . ';"' : '';
+                    $style = !empty($color) ? ' style="background-color: '.$color.';"' : '';
                     ?>
                     <span class="label label-default"<?php echo $style; ?>><?php echo $item->getPoints(); ?></span>
                 </td>
diff --git a/app/bundles/LeadBundle/Views/Lead/map.html.php b/app/bundles/LeadBundle/Views/Lead/map.html.php
index e6ba4ed793b..d2d39d46b9e 100644
--- a/app/bundles/LeadBundle/Views/Lead/map.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/map.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/Lead/merge.html.php b/app/bundles/LeadBundle/Views/Lead/merge.html.php
index d4b76bfd312..278f032910f 100644
--- a/app/bundles/LeadBundle/Views/Lead/merge.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/merge.html.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if ($tmpl == 'index'): ?>
 <div class="lead-merge-form">
-    <?php echo $view->render('MauticCoreBundle:Helper:search.html.php', array(
-        'searchId'      => (empty($searchId)) ? null : $searchId,
-        'searchValue'   => $searchValue,
-        'action'        => $currentRoute,
-        'searchHelp'    => false,
-        'target'        => '.lead-merge-options',
-        'tmpl'          => 'update'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:search.html.php', [
+        'searchId'    => (empty($searchId)) ? null : $searchId,
+        'searchValue' => $searchValue,
+        'action'      => $currentRoute,
+        'searchHelp'  => false,
+        'target'      => '.lead-merge-options',
+        'tmpl'        => 'update',
+    ]); ?>
     <div class="lead-merge-options mt-sm">
 <?php endif; ?>
 
diff --git a/app/bundles/LeadBundle/Views/Lead/quickadd.html.php b/app/bundles/LeadBundle/Views/Lead/quickadd.html.php
index 767bad6c0b9..fd9fd805830 100644
--- a/app/bundles/LeadBundle/Views/Lead/quickadd.html.php
+++ b/app/bundles/LeadBundle/Views/Lead/quickadd.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-echo $view['form']->form($quickForm);
\ No newline at end of file
+echo $view['form']->form($quickForm);
diff --git a/app/bundles/LeadBundle/Views/LeadCampaigns/index.html.php b/app/bundles/LeadBundle/Views/LeadCampaigns/index.html.php
index e3175e85ea7..8a8d334a043 100644
--- a/app/bundles/LeadBundle/Views/LeadCampaigns/index.html.php
+++ b/app/bundles/LeadBundle/Views/LeadCampaigns/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $leadId   = $lead->getId();
@@ -15,7 +16,7 @@
         $bgClass = $c['inCampaign'] ? 'text-success' : 'text-danger';
     ?>
     <li class="list-group-item">
-        <i class="fa fa-lg fa-fw <?php echo $switch . ' ' . $bgClass; ?>" id="leadCampaignToggle<?php echo $c['id']; ?>" onclick="Mautic.toggleLeadCampaign('leadCampaignToggle<?php echo $c['id']; ?>', <?php echo $leadId; ?>, <?php echo $c['id']; ?>);"></i>
+        <i class="fa fa-lg fa-fw <?php echo $switch.' '.$bgClass; ?>" id="leadCampaignToggle<?php echo $c['id']; ?>" onclick="Mautic.toggleLeadCampaign('leadCampaignToggle<?php echo $c['id']; ?>', <?php echo $leadId; ?>, <?php echo $c['id']; ?>);"></i>
         <span><?php echo $c['name']; ?></span>
     </li>
     <?php endforeach; ?>
diff --git a/app/bundles/LeadBundle/Views/LeadLists/index.html.php b/app/bundles/LeadBundle/Views/LeadLists/index.html.php
index 06985b9afd7..807ac865e5d 100644
--- a/app/bundles/LeadBundle/Views/LeadLists/index.html.php
+++ b/app/bundles/LeadBundle/Views/LeadLists/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $leadId   = $lead->getId();
 $leadName = $lead->getPrimaryIdentifier();
 ?>
@@ -18,8 +18,8 @@
         $bgClass = $inList ? 'text-success' : 'text-danger';
     ?>
     <li class="list-group-item">
-        <i class="fa fa-lg fa-fw <?php echo $switch . ' ' . $bgClass; ?>" id="leadListToggle<?php echo $l['id']; ?>" onclick="Mautic.toggleLeadList('leadListToggle<?php echo $l['id']; ?>', <?php echo $leadId; ?>, <?php echo $l['id']; ?>);"></i>
-        <span><?php echo $l['name'] . ' (' . $l['alias'] . ')'; ?></span>
+        <i class="fa fa-lg fa-fw <?php echo $switch.' '.$bgClass; ?>" id="leadListToggle<?php echo $l['id']; ?>" onclick="Mautic.toggleLeadList('leadListToggle<?php echo $l['id']; ?>', <?php echo $leadId; ?>, <?php echo $l['id']; ?>);"></i>
+        <span><?php echo $l['name'].' ('.$l['alias'].')'; ?></span>
     </li>
     <?php endforeach; ?>
 </ul>
\ No newline at end of file
diff --git a/app/bundles/LeadBundle/Views/List/form.html.php b/app/bundles/LeadBundle/Views/List/form.html.php
index 1b1443ce561..719a254b81e 100644
--- a/app/bundles/LeadBundle/Views/List/form.html.php
+++ b/app/bundles/LeadBundle/Views/List/form.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
@@ -14,13 +15,13 @@
 
 if (!empty($id)) {
     $name   = $form->vars['data']->getName();
-    $header = $view['translator']->trans('mautic.lead.list.header.edit', array("%name%" => $name));
+    $header = $view['translator']->trans('mautic.lead.list.header.edit', ['%name%' => $name]);
 } else {
     $header = $view['translator']->trans('mautic.lead.list.header.new');
 }
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 
-$templates = array(
+$templates = [
     'countries' => 'country-template',
     'regions'   => 'region-template',
     'timezones' => 'timezone-template',
@@ -29,10 +30,10 @@
     'emails'    => 'lead_email_received-template',
     'tags'      => 'tags-template',
     'stage'     => 'stage-template',
-    'locales'   => 'locale-template'
-);
+    'locales'   => 'locale-template',
+];
 
-$mainErrors   = ($view['form']->containsErrors($form, array('filters'))) ? 'class="text-danger"' : '';
+$mainErrors   = ($view['form']->containsErrors($form, ['filters'])) ? 'class="text-danger"' : '';
 $filterErrors = ($view['form']->containsErrors($form['filters'])) ? 'class="text-danger"' : '';
 ?>
 
@@ -84,19 +85,19 @@
                                     <option value=""></option>
                                     <?php
                                     foreach ($fields as $object => $field):
-                                        $header    = $object;
-                                        $icon      = ($object == 'company') ? 'fa-building' : 'fa-user';
+                                        $header = $object;
+                                        $icon   = ($object == 'company') ? 'fa-building' : 'fa-user';
                                     ?>
                                     <optgroup label="<?php echo $view['translator']->trans('mautic.lead.'.$header); ?>">
                                         <?php foreach ($field as $value => $params):
-                                            $list      = (!empty($params['properties']['list'])) ? $params['properties']['list'] : array();
+                                            $list      = (!empty($params['properties']['list'])) ? $params['properties']['list'] : [];
                                             $choices   = \Mautic\LeadBundle\Helper\FormFieldHelper::parseList($list);
                                             $object    = $object;
                                             $list      = json_encode($choices);
                                             $callback  = (!empty($params['properties']['callback'])) ? $params['properties']['callback'] : '';
                                             $operators = (!empty($params['operators'])) ? $view->escape(json_encode($params['operators'])) : '{}';
                                             ?>
-                                            <option value="<?php echo $value; ?>" id="available_<?php echo $value; ?>" data-field-object="<?php echo $object; ?>" data-field-type="<?php echo $params['properties']['type']; ?>" data-field-list="<?php echo $view->escape($list); ?>" data-field-callback="<?php echo $callback; ?>" data-field-operators="<?php echo $operators; ?>" class="segment-filter fa <?php echo $icon;?>"><?php echo $view['translator']->trans($params['label']); ?></option>
+                                            <option value="<?php echo $value; ?>" id="available_<?php echo $value; ?>" data-field-object="<?php echo $object; ?>" data-field-type="<?php echo $params['properties']['type']; ?>" data-field-list="<?php echo $view->escape($list); ?>" data-field-callback="<?php echo $callback; ?>" data-field-operators="<?php echo $operators; ?>" class="segment-filter fa <?php echo $icon; ?>"><?php echo $view['translator']->trans($params['label']); ?></option>
                                         <?php endforeach; ?>
                                     </optgroup>
                                     <?php endforeach; ?>
@@ -123,7 +124,7 @@
 
 <div class="hide" id="templates">
     <?php foreach ($templates as $dataKey => $template): ?>
-        <?php $attr = ($dataKey == 'tags') ? ' data-placeholder="' . $view['translator']->trans('mautic.lead.tags.select_or_create') . '" data-no-results-text="' . $view['translator']->trans('mautic.lead.tags.enter_to_create') . '" data-allow-add="true" onchange="Mautic.createLeadTag(this)"' : ''; ?>
+        <?php $attr = ($dataKey == 'tags') ? ' data-placeholder="'.$view['translator']->trans('mautic.lead.tags.select_or_create').'" data-no-results-text="'.$view['translator']->trans('mautic.lead.tags.enter_to_create').'" data-allow-add="true" onchange="Mautic.createLeadTag(this)"' : ''; ?>
         <select class="form-control not-chosen <?php echo $template; ?>" name="leadlist[filters][__name__][filter]" id="leadlist_filters___name___filter"<?php echo $attr; ?>>
             <?php
             if (isset($form->vars[$dataKey])):
@@ -135,8 +136,9 @@
                         endforeach;
                         echo "</optgroup>\n";
                     else:
-                        if ($dataKey == 'lists' && (isset($currentListId) && (int) $value === (int) $currentListId))
+                        if ($dataKey == 'lists' && (isset($currentListId) && (int) $value === (int) $currentListId)) {
                             continue;
+                        }
                         echo "<option value=\"$value\">$label</option>\n";
                     endif;
                 endforeach;
diff --git a/app/bundles/LeadBundle/Views/List/index.html.php b/app/bundles/LeadBundle/Views/List/index.html.php
index 56c71cdc053..dcc834dde7e 100644
--- a/app/bundles/LeadBundle/Views/List/index.html.php
+++ b/app/bundles/LeadBundle/Views/List/index.html.php
@@ -1,35 +1,36 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'leadlist');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.lead.list.header.index'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.lead.list.header.index'));
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'templateButtons' => array(
-        'new' => true // this is intentional. Each user can segment leads
-    ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'templateButtons' => [
+        'new' => true, // this is intentional. Each user can segment leads
+    ],
     'routeBase' => 'segment',
-    'langVar'   => 'lead.list'
-)));
+    'langVar'   => 'lead.list',
+]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'searchHelp'  => 'mautic.lead.list.help.searchcommands',
-        'action'      => $currentRoute,
-        'langVar'     => 'lead.list',
-        'routeBase'   => 'segment',
-        'templateButtons' => array(
-            'delete' => $permissions['lead:lists:deleteother']
-        )
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.lead.list.help.searchcommands',
+        'action'          => $currentRoute,
+        'langVar'         => 'lead.list',
+        'routeBase'       => 'segment',
+        'templateButtons' => [
+            'delete' => $permissions['lead:lists:deleteother'],
+        ],
+    ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
     </div>
diff --git a/app/bundles/LeadBundle/Views/List/list.html.php b/app/bundles/LeadBundle/Views/List/list.html.php
index 6c170e183fa..02a8b4681e2 100644
--- a/app/bundles/LeadBundle/Views/List/list.html.php
+++ b/app/bundles/LeadBundle/Views/List/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 //Check to see if the entire page should be displayed or just main content
@@ -19,30 +20,30 @@
             <thead>
             <tr>
                 <?php
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'checkall' => 'true',
-                    'target'   => '#leadListTable'
-                ));
+                    'target'   => '#leadListTable',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'segment',
                     'orderBy'    => 'l.name',
                     'text'       => 'mautic.core.name',
-                    'class'      => 'col-leadlist-name'
-                ));
+                    'class'      => 'col-leadlist-name',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'segment',
                     'text'       => 'mautic.lead.list.thead.leadcount',
-                    'class'      => 'visible-md visible-lg col-leadlist-leadcount'
-                ));
+                    'class'      => 'visible-md visible-lg col-leadlist-leadcount',
+                ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                     'sessionVar' => 'segment',
                     'orderBy'    => 'l.id',
                     'text'       => 'mautic.core.id',
-                    'class'      => 'visible-md visible-lg col-leadlist-id'
-                ));
+                    'class'      => 'visible-md visible-lg col-leadlist-id',
+                ]);
                 ?>
             </tr>
             </thead>
@@ -51,33 +52,33 @@
                 <tr>
                     <td>
                         <?php
-                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                            'item'      => $item,
-                            'templateButtons' => array(
-                                'delete'    => $security->hasEntityAccess(true, $permissions['lead:lists:deleteother'], $item->getCreatedBy()),
-                            ),
+                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                            'item'            => $item,
+                            'templateButtons' => [
+                                'delete' => $security->hasEntityAccess(true, $permissions['lead:lists:deleteother'], $item->getCreatedBy()),
+                            ],
                             'routeBase' => 'segment',
                             'langVar'   => 'lead.list',
-                            'custom'    => array(
-                                array(
-                                    'attr' => array(
+                            'custom'    => [
+                                [
+                                    'attr' => [
                                         'data-toggle' => 'ajax',
-                                        'href'        => $view['router']->path('mautic_contact_index', array(
-                                            'search' => "$listCommand:{$item->getAlias()}"
-                                        )),
-                                    ),
-                                    'icon' => 'fa-users',
-                                    'label' => 'mautic.lead.list.view_leads'
-                                )
-                            )
-                        ));
+                                        'href'        => $view['router']->path('mautic_contact_index', [
+                                            'search' => "$listCommand:{$item->getAlias()}",
+                                        ]),
+                                    ],
+                                    'icon'  => 'fa-users',
+                                    'label' => 'mautic.lead.list.view_leads',
+                                ],
+                            ],
+                        ]);
                         ?>
                     </td>
                     <td>
                         <div>
-                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', array('item' => $item, 'model' => 'lead.list')); ?>
+                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'lead.list']); ?>
                             <?php if ($security->hasEntityAccess(true, $permissions['lead:lists:editother'], $item->getCreatedBy())) : ?>
-                                <a href="<?php echo $view['router']->path('mautic_segment_action', array('objectAction' => 'edit', 'objectId' => $item->getId())); ?>" data-toggle="ajax">
+                                <a href="<?php echo $view['router']->path('mautic_segment_action', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                                     <?php echo $item->getName(); ?> (<?php echo $item->getAlias(); ?>)
                                 </a>
                             <?php else : ?>
@@ -96,8 +97,8 @@
                         <?php endif; ?>
                     </td>
                     <td class="visible-md visible-lg">
-                        <a class="label label-primary" href="<?php echo $view['router']->path('mautic_contact_index', array('search' => $view['translator']->trans('mautic.lead.lead.searchcommand.list') . ':' . $item->getAlias())); ?>" data-toggle="ajax"<?php echo ($leadCounts[$item->getId()] == 0) ? "disabled=disabled" : ""; ?>>
-                            <?php echo $view['translator']->transChoice('mautic.lead.list.viewleads_count', $leadCounts[$item->getId()], array('%count%' => $leadCounts[$item->getId()])); ?>
+                        <a class="label label-primary" href="<?php echo $view['router']->path('mautic_contact_index', ['search' => $view['translator']->trans('mautic.lead.lead.searchcommand.list').':'.$item->getAlias()]); ?>" data-toggle="ajax"<?php echo ($leadCounts[$item->getId()] == 0) ? 'disabled=disabled' : ''; ?>>
+                            <?php echo $view['translator']->transChoice('mautic.lead.list.viewleads_count', $leadCounts[$item->getId()], ['%count%' => $leadCounts[$item->getId()]]); ?>
                         </a>
                     </td>
                     <td class="visible-md visible-lg"><?php echo $item->getId(); ?></td>
@@ -106,13 +107,13 @@
             </tbody>
         </table>
         <div class="panel-footer">
-            <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-                "totalItems" => count($items),
-                "page"       => $page,
-                "limit"      => $limit,
-                "baseUrl"    =>  $view['router']->path('mautic_segment_index'),
-                'sessionVar' => 'segment'
-            )); ?>
+            <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+                'totalItems' => count($items),
+                'page'       => $page,
+                'limit'      => $limit,
+                'baseUrl'    => $view['router']->path('mautic_segment_index'),
+                'sessionVar' => 'segment',
+            ]); ?>
         </div>
     </div>
 <?php else: ?>
diff --git a/app/bundles/LeadBundle/Views/Note/form.html.php b/app/bundles/LeadBundle/Views/Note/form.html.php
index 016f0fece0c..f9be104433a 100644
--- a/app/bundles/LeadBundle/Views/Note/form.html.php
+++ b/app/bundles/LeadBundle/Views/Note/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view['slots']->set('mauticContent', 'leadnote');
 $userId = $form->vars['data']->getId();
 if (!empty($userId)) {
diff --git a/app/bundles/LeadBundle/Views/Note/index.html.php b/app/bundles/LeadBundle/Views/Note/index.html.php
index 61c91f34219..5848b479f8e 100644
--- a/app/bundles/LeadBundle/Views/Note/index.html.php
+++ b/app/bundles/LeadBundle/Views/Note/index.html.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 <div class="box-layout mb-lg">
 	<div class="col-xs-10 va-m">
-        <form action="<?php echo $view['router']->path('mautic_contactnote_index', array('page' => $page, 'leadId' => $lead->getId(), 'tmpl' => 'list')); ?>" class="panel" id="note-filters" method="post">
+        <form action="<?php echo $view['router']->path('mautic_contactnote_index', ['page' => $page, 'leadId' => $lead->getId(), 'tmpl' => 'list']); ?>" class="panel" id="note-filters" method="post">
             <div class="form-control-icon pa-xs">
-                <input type="text" name="search" value="<?php echo $search; ?>" id="NoteFilter" class="form-control bdr-w-0" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" data-toggle="livesearch" data-target="#NoteList" data-action="<?php echo $view['router']->path('mautic_contactnote_index', array('leadId' => $lead->getId(), 'page' => 1)); ?>">
+                <input type="text" name="search" value="<?php echo $search; ?>" id="NoteFilter" class="form-control bdr-w-0" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" data-toggle="livesearch" data-target="#NoteList" data-action="<?php echo $view['router']->path('mautic_contactnote_index', ['leadId' => $lead->getId(), 'page' => 1]); ?>">
                 <span class="the-icon fa fa-search text-muted mt-xs"></span><!-- must below `form-control` -->
             </div>
             <input type="hidden" name="leadId" id="leadId" value="<?php echo $lead->getId(); ?>" />
@@ -29,7 +30,7 @@
         </form>
 	</div>
 	<div class="col-xs-2 va-t">
-		<a class="btn btn-primary btn-leadnote-add pull-right" href="<?php echo $view['router']->path('mautic_contactnote_action', array('leadId' => $lead->getId(), 'objectAction' => 'new')); ?>" data-toggle="ajaxmodal" data-target="#MauticSharedModal" data-header="<?php echo $view['translator']->trans('mautic.lead.note.header.new'); ?>"><i class="fa fa-plus fa-lg"></i> <?php echo $view['translator']->trans('mautic.lead.add.note'); ?></a>
+		<a class="btn btn-primary btn-leadnote-add pull-right" href="<?php echo $view['router']->path('mautic_contactnote_action', ['leadId' => $lead->getId(), 'objectAction' => 'new']); ?>" data-toggle="ajaxmodal" data-target="#MauticSharedModal" data-header="<?php echo $view['translator']->trans('mautic.lead.note.header.new'); ?>"><i class="fa fa-plus fa-lg"></i> <?php echo $view['translator']->trans('mautic.lead.add.note'); ?></a>
 	</div>
 </div>
 
diff --git a/app/bundles/LeadBundle/Views/Note/list.html.php b/app/bundles/LeadBundle/Views/Note/list.html.php
index ad31a2325ef..65b22550d24 100644
--- a/app/bundles/LeadBundle/Views/Note/list.html.php
+++ b/app/bundles/LeadBundle/Views/Note/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') {
     $view->extend('MauticLeadBundle:Note:index.html.php');
 }
@@ -16,22 +16,22 @@
     <?php foreach ($notes as $note): ?>
         <?php
         //Use a separate layout for AJAX generated content
-        echo $view->render('MauticLeadBundle:Note:note.html.php', array(
+        echo $view->render('MauticLeadBundle:Note:note.html.php', [
             'note'        => $note,
             'lead'        => $lead,
-            'permissions' => $permissions
-        )); ?>
+            'permissions' => $permissions,
+        ]); ?>
     <?php endforeach; ?>
 </ul>
 <?php if ($totalNotes = count($notes)): ?>
 <div class="notes-pagination">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        'totalItems'      => $totalNotes,
-        'target'          => '#notes-container',
-        'page'            => $page,
-        'limit'           => $limit,
-        'sessionVar'      => 'lead.'.$lead->getId().'.note',
-        'baseUrl'         => $view['router']->path('mautic_contactnote_index', array('leadId' => $lead->getId()))
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => $totalNotes,
+        'target'     => '#notes-container',
+        'page'       => $page,
+        'limit'      => $limit,
+        'sessionVar' => 'lead.'.$lead->getId().'.note',
+        'baseUrl'    => $view['router']->path('mautic_contactnote_index', ['leadId' => $lead->getId()]),
+    ]); ?>
 </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/bundles/LeadBundle/Views/Note/note.html.php b/app/bundles/LeadBundle/Views/Note/note.html.php
index 1184e79ee65..d6f0fede5d3 100644
--- a/app/bundles/LeadBundle/Views/Note/note.html.php
+++ b/app/bundles/LeadBundle/Views/Note/note.html.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($note instanceof \Mautic\LeadBundle\Entity\LeadNote) {
-    $id        = $note->getId();
-    $text      = $note->getText();
-    $date      = $note->getDateTime();
-    $author    = $note->getCreatedByUser();
-    $type      = $note->getType();
+    $id     = $note->getId();
+    $text   = $note->getText();
+    $date   = $note->getDateTime();
+    $author = $note->getCreatedByUser();
+    $type   = $note->getType();
 } else {
     $id     = $note['id'];
     $text   = $note['text'];
@@ -47,16 +47,16 @@
             <div class="media-body col-xs-11 pa-10">
                 <div class="pull-right btn-group">
                     <?php if ($permissions['edit']): ?>
-                        <a class="btn btn-default btn-xs" href="<?php echo $this->container->get('router')->generate('mautic_contactnote_action', array('leadId' => $lead->getId(), 'objectAction' => 'edit', 'objectId' => $id)); ?>" data-toggle="ajaxmodal" data-target="#MauticSharedModal" data-header="<?php echo $view['translator']->trans('mautic.lead.note.header.edit'); ?>"><i class="fa fa-pencil"></i></a>
+                        <a class="btn btn-default btn-xs" href="<?php echo $this->container->get('router')->generate('mautic_contactnote_action', ['leadId' => $lead->getId(), 'objectAction' => 'edit', 'objectId' => $id]); ?>" data-toggle="ajaxmodal" data-target="#MauticSharedModal" data-header="<?php echo $view['translator']->trans('mautic.lead.note.header.edit'); ?>"><i class="fa fa-pencil"></i></a>
                     <?php endif; ?>
                      <?php if ($permissions['delete']): ?>
                          <a class="btn btn-default btn-xs"
                             data-toggle="confirmation"
-                            href="<?php echo $view['router']->path('mautic_contactnote_action', array('objectAction' => 'delete', 'objectId' => $id, 'leadId' => $lead->getId())); ?>"
-                            data-message="<?php echo $view->escape($view["translator"]->trans('mautic.lead.note.confirmdelete')); ?>"
-                            data-confirm-text="<?php echo $view->escape($view["translator"]->trans("mautic.core.form.delete")); ?>"
+                            href="<?php echo $view['router']->path('mautic_contactnote_action', ['objectAction' => 'delete', 'objectId' => $id, 'leadId' => $lead->getId()]); ?>"
+                            data-message="<?php echo $view->escape($view['translator']->trans('mautic.lead.note.confirmdelete')); ?>"
+                            data-confirm-text="<?php echo $view->escape($view['translator']->trans('mautic.core.form.delete')); ?>"
                             data-confirm-callback="executeAction"
-                            data-cancel-text="<?php echo $view->escape($view["translator"]->trans("mautic.core.form.cancel")); ?>">
+                            data-cancel-text="<?php echo $view->escape($view['translator']->trans('mautic.core.form.cancel')); ?>">
                              <i class="fa fa-trash text-danger"></i>
                          </a>
                      <?php endif; ?>
diff --git a/app/bundles/LeadBundle/Views/Social/index.html.php b/app/bundles/LeadBundle/Views/Social/index.html.php
index b86618a0240..4d9a6e3c59c 100644
--- a/app/bundles/LeadBundle/Views/Social/index.html.php
+++ b/app/bundles/LeadBundle/Views/Social/index.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <?php if (empty($socialProfiles)): ?>
 <div class="alert alert-warning col-md-6 col-md-offset-3 mt-md">
@@ -17,13 +17,13 @@
 <?php $count = 0; ?>
 <div class="row">
 <?php foreach ($socialProfiles as $integrationName => $details): ?>
-    <?php if ($count > 0 && $count%2 == 0): echo '</div><div class="row">'; endif; ?>
+    <?php if ($count > 0 && $count % 2 == 0): echo '</div><div class="row">'; endif; ?>
     <div class="col-md-6">
         <div class="panel panel-default panel-<?php echo strtolower($integrationName); ?>">
             <div class="panel-heading pr-0">
                 <h3 class="panel-title"><?php echo $view['translator']->trans('mautic.integration.'.$integrationName); ?></h3>
                 <div class="panel-toolbar text-right">
-                    <a href="javascript:void(0);" class="btn" data-toggle="tooltip" onclick="Mautic.refreshLeadSocialProfile('<?php echo $integrationName; ?>', '<?php echo $lead->getId(); ?>', event);" title="<?php echo $view['translator']->trans('mautic.lead.lead.social.lastupdate', array("%datetime%" => $view['date']->toFullConcat($details['lastRefresh'], 'utc'))); ?>">
+                    <a href="javascript:void(0);" class="btn" data-toggle="tooltip" onclick="Mautic.refreshLeadSocialProfile('<?php echo $integrationName; ?>', '<?php echo $lead->getId(); ?>', event);" title="<?php echo $view['translator']->trans('mautic.lead.lead.social.lastupdate', ['%datetime%' => $view['date']->toFullConcat($details['lastRefresh'], 'utc')]); ?>">
                         <i class="text-white fa fa-refresh"></i>
                     </a>
                     <!--<a href="javascript:void(0);" class="btn" data-toggle="panelcollapse"><i class="text-white fa fa-angle-up"></i></a>-->
@@ -31,27 +31,27 @@
                         <i class="text-white fa fa-times"></i>
                     </a>
                     <!-- trickery to allow tooltip and onclick for close button -->
-                    <a class="hide <?php echo $integrationName . '-panelremove'; ?>" data-toggle="panelremove" data-parent=".col-md-6">&amp;</a>
+                    <a class="hide <?php echo $integrationName.'-panelremove'; ?>" data-toggle="panelremove" data-parent=".col-md-6">&amp;</a>
                 </div>
             </div>
              <div class="panel-collapse pull out" id="<?php echo "{$integrationName}CompleteProfile"; ?>">
-                <?php echo $view->render($details['social_profile_template'], array(
+                <?php echo $view->render($details['social_profile_template'], [
                 'lead'              => $lead,
                 'details'           => $details,
                 'integrationName'   => $integrationName,
-                'socialProfileUrls' => $socialProfileUrls
-            )); ?>
+                'socialProfileUrls' => $socialProfileUrls,
+            ]); ?>
             </div>
         </div>
     </div>
-    <?php $count++; ?>
+    <?php ++$count; ?>
     <?php endforeach; ?>
 </div>
 <?php endif; ?>
 <?php
-$view['slots']->append('modal', $view->render('MauticCoreBundle:Helper:modal.html.php', array(
+$view['slots']->append('modal', $view->render('MauticCoreBundle:Helper:modal.html.php', [
     'id'      => 'socialImageModal',
     'body'    => '<img class="img-responsive img-thumbnail" />',
     'header'  => false,
-    'padding' => 'np'
-)));
\ No newline at end of file
+    'padding' => 'np',
+]));
diff --git a/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/index.html.php b/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/index.html.php
index 901d82665c6..68142963a25 100644
--- a/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/index.html.php
+++ b/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/index.html.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-$searchBtnClass = (!empty($searchValue)) ? "fa-eraser" : "fa-search";
+$searchBtnClass = (!empty($searchValue)) ? 'fa-eraser' : 'fa-search';
 ?>
 <div class="input-group ma-5">
-    <input type="search" class="form-control" id="leadEmailTokenSearch" name="search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#leadEmailTokens" data-action="<?php echo $view['router']->path('mautic_contact_emailtoken_index', array('page' => $page)); ?>" />
+    <input type="search" class="form-control" id="leadEmailTokenSearch" name="search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#leadEmailTokens" data-action="<?php echo $view['router']->path('mautic_contact_emailtoken_index', ['page' => $page]); ?>" />
     <div class="input-group-btn">
         <button type="button" class="btn btn-default btn-search btn-filter" data-livesearch-parent="leadEmailTokenSearch">
             <i class="fa <?php echo $searchBtnClass; ?> fa-fw"></i>
diff --git a/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/list.html.php b/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/list.html.php
index 4ab9b91b3d4..17986f12f93 100644
--- a/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/list.html.php
+++ b/app/bundles/LeadBundle/Views/SubscribedEvents/BuilderToken/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') {
     $view->extend('MauticLeadBundle:SubscribedEvents\BuilderToken:index.html.php');
 }
@@ -16,7 +16,7 @@
     <div class="list-group">
         <?php
         foreach ($items as $i):
-        $token = $view->escape(\Mautic\CoreBundle\Helper\BuilderTokenHelper::getVisualTokenHtml('{contactfield=' . $i['alias'] . '}', $i['label']))
+        $token = $view->escape(\Mautic\CoreBundle\Helper\BuilderTokenHelper::getVisualTokenHtml('{contactfield='.$i['alias'].'}', $i['label']))
         ?>
             <a href="#" class="list-group-item" data-token="<?php echo $token; ?>">
                 <span><?php echo $i['label']; ?></span>
@@ -24,18 +24,18 @@
         <?php endforeach; ?>
     </div>
 
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems"        => count($items),
-        "page"              => $page,
-        "limit"             => $limit,
-        "fixedLimit"        => true,
-        "baseUrl"           => $view['router']->path('mautic_contact_emailtoken_index'),
-        "paginationWrapper" => 'text-center',
-        "paginationClass"   => "sm",
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems'        => count($items),
+        'page'              => $page,
+        'limit'             => $limit,
+        'fixedLimit'        => true,
+        'baseUrl'           => $view['router']->path('mautic_contact_emailtoken_index'),
+        'paginationWrapper' => 'text-center',
+        'paginationClass'   => 'sm',
         'sessionVar'        => 'lead.emailtoken',
         'ignoreFormExit'    => true,
         'queryString'       => 'tmpl=list',
-        'target'            => '#leadEmailTokens'
-    )); ?>
+        'target'            => '#leadEmailTokens',
+    ]); ?>
     <?php endif; ?>
 </div>
\ No newline at end of file
diff --git a/app/bundles/LeadBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/LeadBundle/Views/SubscribedEvents/Search/global.html.php
index 83fbe2451e0..442ca9aa6f5 100644
--- a/app/bundles/LeadBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/LeadBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,26 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 <?php if (!empty($showMore)): ?>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_contact_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-        <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+    <a href="<?php echo $this->container->get('router')->generate('mautic_contact_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+        <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
     </a>
 <?php else: ?>
     <?php $fields = $lead->getFields(); ?>
     <span class="pull-left pr-xs pt-xs" style="width:36px">
-        <span class="img-wrapper img-rounded"><img src="<?php echo $view['gravatar']->getImage($fields['core']['email']['value'], '100');; ?>" /></span>
+        <span class="img-wrapper img-rounded"><img src="<?php echo $view['gravatar']->getImage($fields['core']['email']['value'], '100'); ?>" /></span>
     </span>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_contact_action', array('objectAction' => 'view', 'objectId' => $lead->getId())); ?>" data-toggle="ajax">
+    <a href="<?php echo $this->container->get('router')->generate('mautic_contact_action', ['objectAction' => 'view', 'objectId' => $lead->getId()]); ?>" data-toggle="ajax">
         <span><?php echo $lead->getPrimaryIdentifier(true); ?></span>
         <?php
         $color = $lead->getColor();
-        $style = !empty($color) ? ' style="background-color: ' . $color . ';"' : '';
+        $style = !empty($color) ? ' style="background-color: '.$color.';"' : '';
         ?>
         <span class="label label-default pull-right"<?php echo $style; ?> data-toggle="tooltip" data-placement="left" title="<?php echo $view['translator']->trans('mautic.lead.lead.pointscount'); ?>"><?php echo $lead->getPoints(); ?></span>
     </a>
diff --git a/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/donotcontact.html.php b/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/donotcontact.html.php
index c8398024346..2f06e58ceb8 100644
--- a/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/donotcontact.html.php
+++ b/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/donotcontact.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $dnc = $event['extra']['dnc'];
diff --git a/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/ipadded.html.php b/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/ipadded.html.php
index f7d99c04069..36155bb3dea 100644
--- a/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/ipadded.html.php
+++ b/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/ipadded.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $ip = $event['extra']['ipDetails'];
@@ -32,4 +33,4 @@
 if (!empty($details['country'])):
     $locations[] = $details['country'];
 endif;
-$location = implode(', ', $locations);
\ No newline at end of file
+$location = implode(', ', $locations);
diff --git a/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/utmadded.html.php b/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/utmadded.html.php
index 25215f534c9..2145c7ee0fd 100644
--- a/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/utmadded.html.php
+++ b/app/bundles/LeadBundle/Views/SubscribedEvents/Timeline/utmadded.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $utmTags = $event['extra']['utmtags'];
@@ -35,7 +36,6 @@
 
 $counter = 1;
 if (!empty($utmTags['query'])) {
-
     foreach ($utmTags['query'] as $k => $v) {
         if (in_array($v, ['', null, []])) {
             continue;
@@ -49,7 +49,7 @@
         }
 
         if (!empty($v)) {
-            $counter++;
+            ++$counter;
 
             $k = ucwords(str_replace('_', ' ', $k));
 
diff --git a/app/bundles/LeadBundle/Views/Timeline/index.html.php b/app/bundles/LeadBundle/Views/Timeline/index.html.php
index d0b8f160867..68cf4baaa99 100644
--- a/app/bundles/LeadBundle/Views/Timeline/index.html.php
+++ b/app/bundles/LeadBundle/Views/Timeline/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/LeadBundle/Views/Timeline/list.html.php b/app/bundles/LeadBundle/Views/Timeline/list.html.php
index b353169d633..63807fe6d29 100644
--- a/app/bundles/LeadBundle/Views/Timeline/list.html.php
+++ b/app/bundles/LeadBundle/Views/Timeline/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (isset($tmpl) && $tmpl == 'index') {
     $view->extend('MauticLeadBundle:Timeline:index.html.php');
 }
@@ -38,7 +38,7 @@
                 'class'      => 'timeline-name',
                 'sessionVar' => 'lead.'.$lead->getId().'.timeline',
                 'baseUrl'    => $baseUrl,
-                'target'     => '#timeline-table'
+                'target'     => '#timeline-table',
             ]);
 
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
@@ -47,7 +47,7 @@
                 'class'      => 'visible-md visible-lg timeline-type',
                 'sessionVar' => 'lead.'.$lead->getId().'.timeline',
                 'baseUrl'    => $baseUrl,
-                'target'     => '#timeline-table'
+                'target'     => '#timeline-table',
             ]);
 
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
@@ -56,7 +56,7 @@
                 'class'      => 'visible-md visible-lg timeline-timestamp',
                 'sessionVar' => 'lead.'.$lead->getId().'.timeline',
                 'baseUrl'    => $baseUrl,
-                'target'     => '#timeline-table'
+                'target'     => '#timeline-table',
             ]);
             ?>
         </tr>
@@ -83,15 +83,15 @@
             } ?>">
                 <td class="timeline-icon">
                     <a href="javascript:void(0);" data-activate-details="<?php echo $counter; ?>" class="btn btn-sm btn-nospin btn-default<?php if (empty($details)) {
-                        echo " disabled";
-                    } ?>" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.lead.timeline.toggle_details'); ?>">
+                echo ' disabled';
+            } ?>" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.lead.timeline.toggle_details'); ?>">
                         <span class="fa fa-fw <?php echo $icon ?>"></span>
                     </a>
                 </td>
                 <td class="timeline-name"><span class="ellipsis"><?php echo $eventLabel; ?></span></td>
                 <td class="timeline-type"><?php if (isset($event['eventType'])) {
-                        echo $event['eventType'];
-                    } ?></td>
+                echo $event['eventType'];
+            } ?></td>
                 <td class="timeline-timestamp"><?php echo $view['date']->toText($event['timestamp'], 'local', 'Y-m-d H:i:s', true); ?></td>
             </tr>
             <?php if (!empty($details)): ?>
diff --git a/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php b/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php
index 86b38a0ec3c..020e5b33e1e 100644
--- a/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php
+++ b/app/bundles/NotificationBundle/Api/AbstractNotificationApi.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Api;
 
 use Joomla\Http\Http;
@@ -37,7 +38,7 @@ abstract class AbstractNotificationApi
     public function __construct(MauticFactory $factory, Http $http)
     {
         $this->factory = $factory;
-        $this->http = $http;
+        $this->http    = $http;
     }
 
     /**
diff --git a/app/bundles/NotificationBundle/Api/OneSignalApi.php b/app/bundles/NotificationBundle/Api/OneSignalApi.php
index 355c056ae8f..d9c671d6016 100644
--- a/app/bundles/NotificationBundle/Api/OneSignalApi.php
+++ b/app/bundles/NotificationBundle/Api/OneSignalApi.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Api;
 
 use Joomla\Http\Response;
@@ -31,7 +32,7 @@ class OneSignalApi extends AbstractNotificationApi
      */
     public function send($endpoint, $data)
     {
-        $appId = $this->factory->getParameter('notification_app_id');
+        $appId      = $this->factory->getParameter('notification_app_id');
         $restApiKey = $this->factory->getParameter('notification_rest_api_key');
 
         if (!$restApiKey) {
@@ -50,7 +51,7 @@ public function send($endpoint, $data)
             $this->apiUrlBase.$endpoint,
             json_encode($data),
             [
-                'Content-Type' => 'application/json',
+                'Content-Type'  => 'application/json',
                 'Authorization' => 'Basic '.$restApiKey,
             ]
         );
diff --git a/app/bundles/NotificationBundle/Config/config.php b/app/bundles/NotificationBundle/Config/config.php
index 86bd4edf627..45ae1cdb1ad 100644
--- a/app/bundles/NotificationBundle/Config/config.php
+++ b/app/bundles/NotificationBundle/Config/config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -12,7 +12,7 @@
     'services' => [
         'events' => [
             'mautic.notification.campaignbundle.subscriber' => [
-                'class' => 'Mautic\NotificationBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\NotificationBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.helper.core_parameters',
                     'mautic.lead.model.lead',
@@ -24,17 +24,17 @@
                 'class' => 'Mautic\NotificationBundle\EventListener\ConfigSubscriber',
             ],
             'mautic.notification.pagebundle.subscriber' => [
-                'class' => 'Mautic\NotificationBundle\EventListener\PageSubscriber',
+                'class'     => 'Mautic\NotificationBundle\EventListener\PageSubscriber',
                 'arguments' => [
                     'templating.helper.assets',
-                    'mautic.helper.core_parameters'
-                ]
+                    'mautic.helper.core_parameters',
+                ],
             ],
             'mautic.core.js.subscriber' => [
                 'class' => 'Mautic\NotificationBundle\EventListener\BuildJsSubscriber',
             ],
             'mautic.notification.notificationbundle.subscriber' => [
-                'class' => 'Mautic\NotificationBundle\EventListener\NotificationSubscriber',
+                'class'     => 'Mautic\NotificationBundle\EventListener\NotificationSubscriber',
                 'arguments' => [
                     'mautic.core.model.auditlog',
                     'mautic.page.model.trackable',
@@ -45,35 +45,35 @@
         ],
         'forms' => [
             'mautic.form.type.notification' => [
-                'class' => 'Mautic\NotificationBundle\Form\Type\NotificationType',
+                'class'     => 'Mautic\NotificationBundle\Form\Type\NotificationType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'notification',
+                'alias'     => 'notification',
             ],
             'mautic.form.type.notificationconfig' => [
                 'class' => 'Mautic\NotificationBundle\Form\Type\ConfigType',
                 'alias' => 'notificationconfig',
             ],
             'mautic.form.type.notificationsend_list' => [
-                'class' => 'Mautic\NotificationBundle\Form\Type\NotificationSendType',
+                'class'     => 'Mautic\NotificationBundle\Form\Type\NotificationSendType',
                 'arguments' => 'router',
-                'alias' => 'notificationsend_list',
+                'alias'     => 'notificationsend_list',
             ],
             'mautic.form.type.notification_list' => [
-                'class' => 'Mautic\NotificationBundle\Form\Type\NotificationListType',
+                'class'     => 'Mautic\NotificationBundle\Form\Type\NotificationListType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'notification_list',
+                'alias'     => 'notification_list',
             ],
         ],
         'helpers' => [
             'mautic.helper.notification' => [
-                'class' => 'Mautic\NotificationBundle\Helper\NotificationHelper',
+                'class'     => 'Mautic\NotificationBundle\Helper\NotificationHelper',
                 'arguments' => 'mautic.factory',
-                'alias' => 'notification_helper',
+                'alias'     => 'notification_helper',
             ],
         ],
         'other' => [
             'mautic.notification.api' => [
-                'class' => 'Mautic\NotificationBundle\Api\OneSignalApi',
+                'class'     => 'Mautic\NotificationBundle\Api\OneSignalApi',
                 'arguments' => [
                     'mautic.factory',
                     'mautic.http.connector',
@@ -83,7 +83,7 @@
         ],
         'models' => [
             'mautic.notification.model.notification' => [
-                'class' => 'Mautic\NotificationBundle\Model\NotificationModel',
+                'class'     => 'Mautic\NotificationBundle\Model\NotificationModel',
                 'arguments' => [
                     'mautic.page.model.trackable',
                 ],
@@ -93,44 +93,44 @@
     'routes' => [
         'main' => [
             'mautic_notification_index' => [
-                'path' => '/notifications/{page}',
+                'path'       => '/notifications/{page}',
                 'controller' => 'MauticNotificationBundle:Notification:index',
             ],
             'mautic_notification_action' => [
-                'path' => '/notifications/{objectAction}/{objectId}',
+                'path'       => '/notifications/{objectAction}/{objectId}',
                 'controller' => 'MauticNotificationBundle:Notification:execute',
             ],
             'mautic_notification_contacts' => [
-                'path' => '/notifications/view/{objectId}/contact/{page}',
+                'path'       => '/notifications/view/{objectId}/contact/{page}',
                 'controller' => 'MauticNotificationBundle:Notification:contacts',
             ],
         ],
         'public' => [
             'mautic_receive_notification' => [
-                'path' => '/notification/receive',
+                'path'       => '/notification/receive',
                 'controller' => 'MauticNotificationBundle:Api\NotificationApi:receive',
 
             ],
             'mautic_subscribe_notification' => [
-                'path' => '/notification/subscribe',
+                'path'       => '/notification/subscribe',
                 'controller' => 'MauticNotificationBundle:Api\NotificationApi:subscribe',
             ],
             'mautic_notification_popup' => [
-                'path' => '/notification',
+                'path'       => '/notification',
                 'controller' => 'MauticNotificationBundle:Popup:index',
             ],
 
             // JS / Manifest URL's
             'mautic_onesignal_worker' => [
-                'path' => '/OneSignalSDKWorker.js',
+                'path'       => '/OneSignalSDKWorker.js',
                 'controller' => 'MauticNotificationBundle:Js:worker',
             ],
             'mautic_onesignal_updater' => [
-                'path' => '/OneSignalSDKUpdaterWorker.js',
+                'path'       => '/OneSignalSDKUpdaterWorker.js',
                 'controller' => 'MauticNotificationBundle:Js:updater',
             ],
             'mautic_onesignal_manifest' => [
-                'path' => '/manifest.json',
+                'path'       => '/manifest.json',
                 'controller' => 'MauticNotificationBundle:Js:manifest',
             ],
         ],
@@ -139,15 +139,15 @@
         'main' => [
             'items' => [
                 'mautic.notification.notifications' => [
-                    'route' => 'mautic_notification_index',
+                    'route'  => 'mautic_notification_index',
                     'access' => ['notification:notifications:viewown', 'notification:notifications:viewother'],
                     'checks' => [
                         'parameters' => [
                             'notification_enabled' => true,
                         ],
                     ],
-                    'parent' => 'mautic.core.channels',
-                    'priority'  => 80
+                    'parent'   => 'mautic.core.channels',
+                    'priority' => 80,
                 ],
             ],
         ],
@@ -156,9 +156,9 @@
     //    'notification' => null
     //],
     'parameters' => [
-        'notification_enabled' => false,
-        'notification_app_id' => null,
-        'notification_rest_api_key' => null,
+        'notification_enabled'       => false,
+        'notification_app_id'        => null,
+        'notification_rest_api_key'  => null,
         'notification_safari_web_id' => null,
     ],
 ];
diff --git a/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php b/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php
index f1792d78acd..a96112f6cf8 100644
--- a/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php
+++ b/app/bundles/NotificationBundle/Controller/Api/NotificationApiController.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Controller\Api;
 
 use Mautic\ApiBundle\Controller\CommonApiController;
diff --git a/app/bundles/NotificationBundle/Controller/JsController.php b/app/bundles/NotificationBundle/Controller/JsController.php
index 7a2ebcb576b..4b77ac29691 100644
--- a/app/bundles/NotificationBundle/Controller/JsController.php
+++ b/app/bundles/NotificationBundle/Controller/JsController.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Controller;
 
 use Mautic\CoreBundle\Controller\CommonController;
@@ -23,8 +24,8 @@ class JsController extends CommonController
     public function manifestAction()
     {
         $data = [
-            'start_url' => '/',
-            'gcm_sender_id' => '446150739532',
+            'start_url'             => '/',
+            'gcm_sender_id'         => '446150739532',
             'gcm_user_visible_only' => true,
         ];
 
@@ -47,7 +48,7 @@ public function workerAction()
             200,
             [
                 'Service-Worker-Allowed' => '/',
-                'Content-Type' => 'application/javascript',
+                'Content-Type'           => 'application/javascript',
             ]
         );
     }
@@ -62,7 +63,7 @@ public function updaterAction()
             200,
             [
                 'Service-Worker-Allowed' => '/',
-                'Content-Type' => 'application/javascript',
+                'Content-Type'           => 'application/javascript',
             ]
         );
     }
diff --git a/app/bundles/NotificationBundle/Controller/NotificationController.php b/app/bundles/NotificationBundle/Controller/NotificationController.php
index 8ebcb28f09e..64216e374d1 100644
--- a/app/bundles/NotificationBundle/Controller/NotificationController.php
+++ b/app/bundles/NotificationBundle/Controller/NotificationController.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Controller;
 
 use Mautic\CoreBundle\Controller\FormController;
@@ -85,19 +86,19 @@ public function indexAction($page = 1)
         //retrieve a list of categories
         $listFilters['filters']['groups']['mautic.core.filter.categories'] = [
             'options' => $this->getModel('category')->getLookupResults('email', '', 0),
-            'prefix' => 'category',
+            'prefix'  => 'category',
         ];
 
         //retrieve a list of Lead Lists
         $listFilters['filters']['groups']['mautic.core.filter.lists'] = [
             'options' => $this->getModel('lead.list')->getUserLists(),
-            'prefix' => 'list',
+            'prefix'  => 'list',
         ];
 
         //retrieve a list of themes
         $listFilters['filters']['groups']['mautic.core.filter.themes'] = [
             'options' => $this->factory->getInstalledThemes('email'),
-            'prefix' => 'theme',
+            'prefix'  => 'theme',
         ];
 
         $currentFilters = $session->get('mautic.notification.list_filters', []);
@@ -107,7 +108,7 @@ public function indexAction($page = 1)
             // Filters have been updated
 
             // Parse the selected values
-            $newFilters = [];
+            $newFilters     = [];
             $updatedFilters = json_decode($updatedFilters, true);
 
             if ($updatedFilters) {
@@ -159,15 +160,15 @@ public function indexAction($page = 1)
             }
         }
 
-        $orderBy = $session->get('mautic.notification.orderby', 'e.name');
+        $orderBy    = $session->get('mautic.notification.orderby', 'e.name');
         $orderByDir = $session->get('mautic.notification.orderbydir', 'DESC');
 
         $notifications = $model->getEntities(
             [
-                'start' => $start,
-                'limit' => $limit,
-                'filter' => $filter,
-                'orderBy' => $orderBy,
+                'start'      => $start,
+                'limit'      => $limit,
+                'filter'     => $filter,
+                'orderBy'    => $orderBy,
                 'orderByDir' => $orderByDir,
             ]
         );
@@ -186,11 +187,11 @@ public function indexAction($page = 1)
 
             return $this->postActionRedirect(
                 [
-                    'returnUrl' => $returnUrl,
-                    'viewParameters' => ['page' => $lastPage],
+                    'returnUrl'       => $returnUrl,
+                    'viewParameters'  => ['page' => $lastPage],
                     'contentTemplate' => 'MauticNotificationBundle:Notification:index',
                     'passthroughVars' => [
-                        'activeLink' => '#mautic_notification_index',
+                        'activeLink'    => '#mautic_notification_index',
                         'mauticContent' => 'notification',
                     ],
                 ]
@@ -202,21 +203,21 @@ public function indexAction($page = 1)
             [
                 'viewParameters' => [
                     'searchValue' => $search,
-                    'filters' => $listFilters,
-                    'items' => $notifications,
-                    'totalItems' => $count,
-                    'page' => $page,
-                    'limit' => $limit,
-                    'tmpl' => $this->request->get('tmpl', 'index'),
+                    'filters'     => $listFilters,
+                    'items'       => $notifications,
+                    'totalItems'  => $count,
+                    'page'        => $page,
+                    'limit'       => $limit,
+                    'tmpl'        => $this->request->get('tmpl', 'index'),
                     'permissions' => $permissions,
-                    'model' => $model,
-                    'security' => $this->get('mautic.security'),
+                    'model'       => $model,
+                    'security'    => $this->get('mautic.security'),
                 ],
                 'contentTemplate' => 'MauticNotificationBundle:Notification:list.html.php',
                 'passthroughVars' => [
-                    'activeLink' => '#mautic_notification_index',
+                    'activeLink'    => '#mautic_notification_index',
                     'mauticContent' => 'notification',
-                    'route' => $this->generateUrl('mautic_notification_index', ['page' => $page]),
+                    'route'         => $this->generateUrl('mautic_notification_index', ['page' => $page]),
                 ],
             ]
         );
@@ -232,7 +233,7 @@ public function indexAction($page = 1)
     public function viewAction($objectId)
     {
         /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
-        $model = $this->getModel('notification');
+        $model    = $this->getModel('notification');
         $security = $this->get('mautic.security');
 
         /** @var \Mautic\NotificationBundle\Entity\Notification $notification */
@@ -246,17 +247,17 @@ public function viewAction($objectId)
 
             return $this->postActionRedirect(
                 [
-                    'returnUrl' => $returnUrl,
-                    'viewParameters' => ['page' => $page],
+                    'returnUrl'       => $returnUrl,
+                    'viewParameters'  => ['page' => $page],
                     'contentTemplate' => 'MauticNotificationBundle:Notification:index',
                     'passthroughVars' => [
-                        'activeLink' => '#mautic_notification_index',
+                        'activeLink'    => '#mautic_notification_index',
                         'mauticContent' => 'notification',
                     ],
                     'flashes' => [
                         [
-                            'type' => 'error',
-                            'msg' => 'mautic.notification.error.notfound',
+                            'type'    => 'error',
+                            'msg'     => 'mautic.notification.error.notfound',
                             'msgVars' => ['%id%' => $objectId],
                         ],
                     ],
@@ -276,9 +277,9 @@ public function viewAction($objectId)
 
         // Init the date range filter form
         $dateRangeValues = $this->request->get('daterange', []);
-        $action = $this->generateUrl('mautic_notification_action', ['objectAction' => 'view', 'objectId' => $objectId]);
-        $dateRangeForm = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
-        $entityViews = $model->getHitsLineChartData(
+        $action          = $this->generateUrl('mautic_notification_action', ['objectAction' => 'view', 'objectId' => $objectId]);
+        $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
+        $entityViews     = $model->getHitsLineChartData(
             null,
             new \DateTime($dateRangeForm->get('date_from')->getData()),
             new \DateTime($dateRangeForm->get('date_to')->getData()),
@@ -290,12 +291,12 @@ public function viewAction($objectId)
         $trackableLinks = $model->getNotificationClickStats($notification->getId());
 
         return $this->delegateView([
-            'returnUrl' => $this->generateUrl('mautic_notification_action', ['objectAction' => 'view', 'objectId' => $notification->getId()]),
+            'returnUrl'      => $this->generateUrl('mautic_notification_action', ['objectAction' => 'view', 'objectId' => $notification->getId()]),
             'viewParameters' => [
                 'notification' => $notification,
-                'trackables' => $trackableLinks,
-                'logs' => $logs,
-                'permissions' => $security->isGranted([
+                'trackables'   => $trackableLinks,
+                'logs'         => $logs,
+                'permissions'  => $security->isGranted([
                     'notification:notifications:viewown',
                     'notification:notifications:viewother',
                     'notification:notifications:create',
@@ -306,13 +307,13 @@ public function viewAction($objectId)
                     'notification:notifications:publishown',
                     'notification:notifications:publishother',
                 ], 'RETURN_ARRAY'),
-                'security' => $security,
+                'security'    => $security,
                 'entityViews' => $entityViews,
-                'contacts' => $this->forward(
+                'contacts'    => $this->forward(
                     'MauticNotificationBundle:Notification:contacts',
                     [
-                        'objectId' => $notification->getId(),
-                        'page' => $this->get('session')->get('mautic.notification.contact.page', 1),
+                        'objectId'   => $notification->getId(),
+                        'page'       => $this->get('session')->get('mautic.notification.contact.page', 1),
                         'ignoreAjax' => true,
                     ]
                 )->getContent(),
@@ -320,7 +321,7 @@ public function viewAction($objectId)
             ],
             'contentTemplate' => 'MauticNotificationBundle:Notification:details.html.php',
             'passthroughVars' => [
-                'activeLink' => '#mautic_notification_index',
+                'activeLink'    => '#mautic_notification_index',
                 'mauticContent' => 'notification',
             ],
         ]);
@@ -343,7 +344,7 @@ public function newAction($entity = null)
             $entity = $model->getEntity();
         }
 
-        $method = $this->request->getMethod();
+        $method  = $this->request->getMethod();
         $session = $this->get('session');
 
         if (!$this->get('mautic.security')->isGranted('notification:notifications:create')) {
@@ -351,7 +352,7 @@ public function newAction($entity = null)
         }
 
         //set the page we came from
-        $page = $session->get('mautic.notification.page', 1);
+        $page   = $session->get('mautic.notification.page', 1);
         $action = $this->generateUrl('mautic_notification_action', ['objectAction' => 'new']);
 
         $updateSelect = ($method == 'POST')
@@ -376,13 +377,13 @@ public function newAction($entity = null)
                     $this->addFlash(
                         'mautic.core.notice.created',
                         [
-                            '%name%' => $entity->getName(),
+                            '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_notification_index',
-                            '%url%' => $this->generateUrl(
+                            '%url%'       => $this->generateUrl(
                                 'mautic_notification_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId' => $entity->getId(),
+                                    'objectId'     => $entity->getId(),
                                 ]
                             ),
                         ]
@@ -391,10 +392,10 @@ public function newAction($entity = null)
                     if ($form->get('buttons')->get('save')->isClicked()) {
                         $viewParameters = [
                             'objectAction' => 'view',
-                            'objectId' => $entity->getId(),
+                            'objectId'     => $entity->getId(),
                         ];
                         $returnUrl = $this->generateUrl('mautic_notification_action', $viewParameters);
-                        $template = 'MauticNotificationBundle:Notification:view';
+                        $template  = 'MauticNotificationBundle:Notification:view';
                     } else {
                         //return edit view so that all the session stuff is loaded
                         return $this->editAction($entity->getId(), true);
@@ -402,25 +403,25 @@ public function newAction($entity = null)
                 }
             } else {
                 $viewParameters = ['page' => $page];
-                $returnUrl = $this->generateUrl('mautic_notification_index', $viewParameters);
-                $template = 'MauticNotificationBundle:Notification:index';
+                $returnUrl      = $this->generateUrl('mautic_notification_index', $viewParameters);
+                $template       = 'MauticNotificationBundle:Notification:index';
                 //clear any modified content
                 $session->remove('mautic.notification.'.$entity->getSessionId().'.content');
             }
 
             $passthrough = [
-                'activeLink' => 'mautic_notification_index',
+                'activeLink'    => 'mautic_notification_index',
                 'mauticContent' => 'notification',
             ];
 
             // Check to see if this is a popup
             if (isset($form['updateSelect'])) {
-                $template = false;
+                $template    = false;
                 $passthrough = array_merge(
                     $passthrough,
                     [
-                        'updateSelect' => $form['updateSelect']->getData(),
-                        'notificationId' => $entity->getId(),
+                        'updateSelect'     => $form['updateSelect']->getData(),
+                        'notificationId'   => $entity->getId(),
                         'notificationName' => $entity->getName(),
                         'notificationLang' => $entity->getLanguage(),
                     ]
@@ -430,8 +431,8 @@ public function newAction($entity = null)
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 return $this->postActionRedirect(
                     [
-                        'returnUrl' => $returnUrl,
-                        'viewParameters' => $viewParameters,
+                        'returnUrl'       => $returnUrl,
+                        'viewParameters'  => $viewParameters,
                         'contentTemplate' => $template,
                         'passthroughVars' => $passthrough,
                     ]
@@ -442,15 +443,15 @@ public function newAction($entity = null)
         return $this->delegateView(
             [
                 'viewParameters' => [
-                    'form' => $this->setFormTheme($form, 'MauticNotificationBundle:Notification:form.html.php', 'MauticNotificationBundle:FormTheme\Notification'),
+                    'form'         => $this->setFormTheme($form, 'MauticNotificationBundle:Notification:form.html.php', 'MauticNotificationBundle:FormTheme\Notification'),
                     'notification' => $entity,
                 ],
                 'contentTemplate' => 'MauticNotificationBundle:Notification:form.html.php',
                 'passthroughVars' => [
-                    'activeLink' => '#mautic_notification_index',
+                    'activeLink'    => '#mautic_notification_index',
                     'mauticContent' => 'notification',
-                    'updateSelect' => InputHelper::clean($this->request->query->get('updateSelect')),
-                    'route' => $this->generateUrl(
+                    'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
+                    'route'         => $this->generateUrl(
                         'mautic_notification_action',
                         [
                             'objectAction' => 'new',
@@ -471,21 +472,21 @@ public function newAction($entity = null)
     public function editAction($objectId, $ignorePost = false, $forceTypeSelection = false)
     {
         /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
-        $model = $this->getModel('notification');
-        $method = $this->request->getMethod();
-        $entity = $model->getEntity($objectId);
+        $model   = $this->getModel('notification');
+        $method  = $this->request->getMethod();
+        $entity  = $model->getEntity($objectId);
         $session = $this->get('session');
-        $page = $session->get('mautic.notification.page', 1);
+        $page    = $session->get('mautic.notification.page', 1);
 
         //set the return URL
         $returnUrl = $this->generateUrl('mautic_notification_index', ['page' => $page]);
 
         $postActionVars = [
-            'returnUrl' => $returnUrl,
-            'viewParameters' => ['page' => $page],
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticNotificationBundle:Notification:index',
             'passthroughVars' => [
-                'activeLink' => 'mautic_notification_index',
+                'activeLink'    => 'mautic_notification_index',
                 'mauticContent' => 'notification',
             ],
         ];
@@ -498,8 +499,8 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                     [
                         'flashes' => [
                             [
-                                'type' => 'error',
-                                'msg' => 'mautic.notification.error.notfound',
+                                'type'    => 'error',
+                                'msg'     => 'mautic.notification.error.notfound',
                                 'msgVars' => ['%id%' => $objectId],
                             ],
                         ],
@@ -538,13 +539,13 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                     $this->addFlash(
                         'mautic.core.notice.updated',
                         [
-                            '%name%' => $entity->getName(),
+                            '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_notification_index',
-                            '%url%' => $this->generateUrl(
+                            '%url%'       => $this->generateUrl(
                                 'mautic_notification_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId' => $entity->getId(),
+                                    'objectId'     => $entity->getId(),
                                 ]
                             ),
                         ],
@@ -558,22 +559,22 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                 $model->unlockEntity($entity);
             }
 
-            $template = 'MauticNotificationBundle:Notification:view';
+            $template    = 'MauticNotificationBundle:Notification:view';
             $passthrough = [
-                'activeLink' => 'mautic_notification_index',
+                'activeLink'    => 'mautic_notification_index',
                 'mauticContent' => 'notification',
             ];
 
             // Check to see if this is a popup
             if (isset($form['updateSelect'])) {
-                $template = false;
+                $template    = false;
                 $passthrough = array_merge(
                     $passthrough,
                     [
-                        'updateSelect' => $form['updateSelect']->getData(),
-                        'notificationId' => $entity->getId(),
+                        'updateSelect'      => $form['updateSelect']->getData(),
+                        'notificationId'    => $entity->getId(),
                         'notificationTitle' => $entity->getName(),
-                        'notificationLang' => $entity->getLanguage(),
+                        'notificationLang'  => $entity->getLanguage(),
                     ]
                 );
             }
@@ -581,15 +582,15 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId' => $entity->getId(),
+                    'objectId'     => $entity->getId(),
                 ];
 
                 return $this->postActionRedirect(
                     array_merge(
                         $postActionVars,
                         [
-                            'returnUrl' => $this->generateUrl('mautic_notification_action', $viewParameters),
-                            'viewParameters' => $viewParameters,
+                            'returnUrl'       => $this->generateUrl('mautic_notification_action', $viewParameters),
+                            'viewParameters'  => $viewParameters,
                             'contentTemplate' => $template,
                             'passthroughVars' => $passthrough,
                         ]
@@ -604,20 +605,20 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
         return $this->delegateView(
             [
                 'viewParameters' => [
-                    'form' => $this->setFormTheme($form, 'MauticNotificationBundle:Notification:form.html.php', 'MauticNotificationBundle:FormTheme\Notification'),
-                    'notification' => $entity,
+                    'form'               => $this->setFormTheme($form, 'MauticNotificationBundle:Notification:form.html.php', 'MauticNotificationBundle:FormTheme\Notification'),
+                    'notification'       => $entity,
                     'forceTypeSelection' => $forceTypeSelection,
                 ],
                 'contentTemplate' => 'MauticNotificationBundle:Notification:form.html.php',
                 'passthroughVars' => [
-                    'activeLink' => '#mautic_notification_index',
+                    'activeLink'    => '#mautic_notification_index',
                     'mauticContent' => 'notification',
-                    'updateSelect' => InputHelper::clean($this->request->query->get('updateSelect')),
-                    'route' => $this->generateUrl(
+                    'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
+                    'route'         => $this->generateUrl(
                         'mautic_notification_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId' => $entity->getId(),
+                            'objectId'     => $entity->getId(),
                         ]
                     ),
                 ],
@@ -634,7 +635,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
      */
     public function cloneAction($objectId)
     {
-        $model = $this->getModel('notification');
+        $model  = $this->getModel('notification');
         $entity = $model->getEntity($objectId);
 
         if ($entity != null) {
@@ -648,8 +649,8 @@ public function cloneAction($objectId)
                 return $this->accessDenied();
             }
 
-            $entity = clone $entity;
-            $session = $this->get('session');
+            $entity      = clone $entity;
+            $session     = $this->get('session');
             $contentName = 'mautic.notification.'.$entity->getSessionId().'.content';
 
             $session->set($contentName, $entity->getContent());
@@ -667,28 +668,28 @@ public function cloneAction($objectId)
      */
     public function deleteAction($objectId)
     {
-        $page = $this->get('session')->get('mautic.notification.page', 1);
+        $page      = $this->get('session')->get('mautic.notification.page', 1);
         $returnUrl = $this->generateUrl('mautic_notification_index', ['page' => $page]);
-        $flashes = [];
+        $flashes   = [];
 
         $postActionVars = [
-            'returnUrl' => $returnUrl,
-            'viewParameters' => ['page' => $page],
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticNotificationBundle:Notification:index',
             'passthroughVars' => [
-                'activeLink' => 'mautic_notification_index',
+                'activeLink'    => 'mautic_notification_index',
                 'mauticContent' => 'notification',
             ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
-            $model = $this->getModel('notification');
+            $model  = $this->getModel('notification');
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
                 $flashes[] = [
-                    'type' => 'error',
-                    'msg' => 'mautic.notification.error.notfound',
+                    'type'    => 'error',
+                    'msg'     => 'mautic.notification.error.notfound',
                     'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -705,11 +706,11 @@ public function deleteAction($objectId)
             $model->deleteEntity($entity);
 
             $flashes[] = [
-                'type' => 'notice',
-                'msg' => 'mautic.core.notice.deleted',
+                'type'    => 'notice',
+                'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $entity->getName(),
-                    '%id%' => $objectId,
+                    '%id%'   => $objectId,
                 ],
             ];
         } //else don't do anything
@@ -731,23 +732,23 @@ public function deleteAction($objectId)
      */
     public function batchDeleteAction()
     {
-        $page = $this->get('session')->get('mautic.notification.page', 1);
+        $page      = $this->get('session')->get('mautic.notification.page', 1);
         $returnUrl = $this->generateUrl('mautic_notification_index', ['page' => $page]);
-        $flashes = [];
+        $flashes   = [];
 
         $postActionVars = [
-            'returnUrl' => $returnUrl,
-            'viewParameters' => ['page' => $page],
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticNotificationBundle:Notification:index',
             'passthroughVars' => [
-                'activeLink' => '#mautic_notification_index',
+                'activeLink'    => '#mautic_notification_index',
                 'mauticContent' => 'notification',
             ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
             $model = $this->getModel('notification');
-            $ids = json_decode($this->request->query->get('ids', '{}'));
+            $ids   = json_decode($this->request->query->get('ids', '{}'));
 
             $deleteIds = [];
 
@@ -757,8 +758,8 @@ public function batchDeleteAction()
 
                 if ($entity === null) {
                     $flashes[] = [
-                        'type' => 'error',
-                        'msg' => 'mautic.notification.error.notfound',
+                        'type'    => 'error',
+                        'msg'     => 'mautic.notification.error.notfound',
                         'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -780,8 +781,8 @@ public function batchDeleteAction()
                 $entities = $model->deleteEntities($deleteIds);
 
                 $flashes[] = [
-                    'type' => 'notice',
-                    'msg' => 'mautic.notification.notice.batch_deleted',
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.notification.notice.batch_deleted',
                     'msgVars' => [
                         '%count%' => count($entities),
                     ],
@@ -807,7 +808,7 @@ public function batchDeleteAction()
     public function previewAction($objectId)
     {
         /** @var \Mautic\NotificationBundle\Model\NotificationModel $model */
-        $model = $this->getModel('notification');
+        $model        = $this->getModel('notification');
         $notification = $model->getEntity($objectId);
 
         if ($notification != null
diff --git a/app/bundles/NotificationBundle/Controller/PopupController.php b/app/bundles/NotificationBundle/Controller/PopupController.php
index d30cfd2d519..eb58f4d1278 100644
--- a/app/bundles/NotificationBundle/Controller/PopupController.php
+++ b/app/bundles/NotificationBundle/Controller/PopupController.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Controller;
 
 use Mautic\CoreBundle\Controller\CommonController;
diff --git a/app/bundles/NotificationBundle/Entity/Notification.php b/app/bundles/NotificationBundle/Entity/Notification.php
index 5b2fa3df58f..8caa30bddbd 100644
--- a/app/bundles/NotificationBundle/Entity/Notification.php
+++ b/app/bundles/NotificationBundle/Entity/Notification.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -101,13 +102,10 @@ class Notification extends FormEntity
      */
     private $notificationType = 'template';
 
-    /**
-     *
-     */
     public function __clone()
     {
-        $this->id = null;
-        $this->stats = new ArrayCollection();
+        $this->id        = null;
+        $this->stats     = new ArrayCollection();
         $this->sentCount = 0;
         $this->readCount = 0;
 
@@ -272,12 +270,12 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
      */
     protected function isChanged($prop, $val)
     {
-        $getter = 'get'.ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
 
         if ($prop == 'category' || $prop == 'list') {
             $currentId = ($current) ? $current->getId() : '';
-            $newId = ($val) ? $val->getId() : null;
+            $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
                 $this->changes[$prop] = [$currentId, $newId];
             }
diff --git a/app/bundles/NotificationBundle/Entity/NotificationRepository.php b/app/bundles/NotificationBundle/Entity/NotificationRepository.php
index 1ff09ab1e2f..d49a511f1e6 100644
--- a/app/bundles/NotificationBundle/Entity/NotificationRepository.php
+++ b/app/bundles/NotificationBundle/Entity/NotificationRepository.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Entity;
 
 use Doctrine\ORM\Query;
@@ -70,17 +71,17 @@ public function getSentReadCount()
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
     {
-        $command = $filter->command;
-        $unique = $this->generateRandomParameterName();
+        $command         = $filter->command;
+        $unique          = $this->generateRandomParameterName();
         $returnParameter = true; //returning a parameter that is not used will lead to a Doctrine error
-        $expr = false;
+        $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq('e.isPublished', ":$unique");
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
                 $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq('e.isPublished', ":$unique");
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
                 $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
@@ -91,19 +92,19 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->eq('IDENTITY(e.createdBy)', $this->currentUser->getId());
+                $expr            = $q->expr()->eq('IDENTITY(e.createdBy)', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.category'):
-                $expr = $q->expr()->like('e.alias', ":$unique");
+                $expr           = $q->expr()->like('e.alias', ":$unique");
                 $filter->strict = true;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.lang'):
-                $langUnique = $this->generateRandomParameterName();
-                $langValue = $filter->string.'_%';
+                $langUnique      = $this->generateRandomParameterName();
+                $langValue       = $filter->string.'_%';
                 $forceParameters = [
                     $langUnique => $langValue,
-                    $unique => $filter->string,
+                    $unique     => $filter->string,
                 ];
                 $expr = $q->expr()->orX(
                     $q->expr()->eq('e.language', ":$unique"),
@@ -121,7 +122,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         } elseif (!$returnParameter) {
             $parameters = [];
         } else {
-            $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+            $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
             $parameters = ["$unique" => $string];
         }
 
diff --git a/app/bundles/NotificationBundle/Entity/PushID.php b/app/bundles/NotificationBundle/Entity/PushID.php
index 8aaa7ef783a..954eca0c347 100644
--- a/app/bundles/NotificationBundle/Entity/PushID.php
+++ b/app/bundles/NotificationBundle/Entity/PushID.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Entity;
 
-use Mautic\LeadBundle\Entity\Lead;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
+use Mautic\LeadBundle\Entity\Lead;
 
 class PushID
 {
diff --git a/app/bundles/NotificationBundle/Entity/PushIDRepository.php b/app/bundles/NotificationBundle/Entity/PushIDRepository.php
index 5d5d5e22962..3298493db5c 100644
--- a/app/bundles/NotificationBundle/Entity/PushIDRepository.php
+++ b/app/bundles/NotificationBundle/Entity/PushIDRepository.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
diff --git a/app/bundles/NotificationBundle/Entity/Stat.php b/app/bundles/NotificationBundle/Entity/Stat.php
index f4057bcf061..163fe23e931 100644
--- a/app/bundles/NotificationBundle/Entity/Stat.php
+++ b/app/bundles/NotificationBundle/Entity/Stat.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\IpAddress;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 
 /**
  * Class Stat.
@@ -352,9 +353,6 @@ public function setRetryCount($retryCount)
         $this->retryCount = $retryCount;
     }
 
-    /**
-     *
-     */
     public function upRetryCount()
     {
         ++$this->retryCount;
@@ -445,7 +443,7 @@ public function addClickDetails($details)
      */
     public function upClickCount()
     {
-        $count = (int) $this->clickCount + 1;
+        $count            = (int) $this->clickCount + 1;
         $this->clickCount = $count;
 
         return $this;
diff --git a/app/bundles/NotificationBundle/Entity/StatRepository.php b/app/bundles/NotificationBundle/Entity/StatRepository.php
index 7b272e2b901..4aa143088ff 100644
--- a/app/bundles/NotificationBundle/Entity/StatRepository.php
+++ b/app/bundles/NotificationBundle/Entity/StatRepository.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
@@ -43,6 +44,7 @@ public function getNotificationStatus($trackingHash)
 
     /**
      * Updates lead ID (e.g. after a lead merge).
+     *
      * @param      $notificationId
      * @param null $listId
      *
@@ -52,7 +54,7 @@ public function getSentStats($notificationId, $listId = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('s.lead_id')
-            ->from(MAUTIC_TABLE_PREFIX . 'push_notification_stats', 's')
+            ->from(MAUTIC_TABLE_PREFIX.'push_notification_stats', 's')
             ->where('s.notification_id = :notification')
             ->setParameter('notification', $notificationId);
 
@@ -64,7 +66,7 @@ public function getSentStats($notificationId, $listId = null)
         $result = $q->execute()->fetchAll();
 
         //index by lead
-        $stats = array();
+        $stats = [];
         foreach ($result as $r) {
             $stats[$r['lead_id']] = $r['lead_id'];
         }
@@ -85,11 +87,11 @@ public function getSentCount($notificationIds = null, $listId = null)
         $q = $this->_em->getConnection()->createQueryBuilder();
 
         $q->select('count(s.id) as sent_count')
-            ->from(MAUTIC_TABLE_PREFIX . 'push_notification_stats', 's');
+            ->from(MAUTIC_TABLE_PREFIX.'push_notification_stats', 's');
 
         if ($notificationIds) {
             if (!is_array($notificationIds)) {
-                $notificationIds = array((int) $notificationIds);
+                $notificationIds = [(int) $notificationIds];
             }
             $q->where(
                 $q->expr()->in('s.notification_id', $notificationIds)
@@ -97,7 +99,7 @@ public function getSentCount($notificationIds = null, $listId = null)
         }
 
         if ($listId) {
-            $q->andWhere('s.list_id = ' . (int) $listId);
+            $q->andWhere('s.list_id = '.(int) $listId);
         }
 
         $q->andWhere('s.is_failed = :false')
@@ -119,11 +121,11 @@ public function getReadCount($notificationIds = null, $listId = null)
         $q = $this->_em->getConnection()->createQueryBuilder();
 
         $q->select('count(s.id) as read_count')
-            ->from(MAUTIC_TABLE_PREFIX . 'push_notification_stats', 's');
+            ->from(MAUTIC_TABLE_PREFIX.'push_notification_stats', 's');
 
         if ($notificationIds) {
             if (!is_array($notificationIds)) {
-                $notificationIds = array((int) $notificationIds);
+                $notificationIds = [(int) $notificationIds];
             }
             $q->where(
                 $q->expr()->in('s.notification_id', $notificationIds)
@@ -131,7 +133,7 @@ public function getReadCount($notificationIds = null, $listId = null)
         }
 
         if ($listId) {
-            $q->andWhere('s.list_id = ' . (int) $listId);
+            $q->andWhere('s.list_id = '.(int) $listId);
         }
 
         $q->andWhere('is_read = :true')
@@ -142,16 +144,17 @@ public function getReadCount($notificationIds = null, $listId = null)
     }
 
     /**
-     * Get a lead's email stat
+     * Get a lead's email stat.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getLeadStats($leadId, array $options = array())
+    public function getLeadStats($leadId, array $options = [])
     {
         $query = $this->createQueryBuilder('s');
 
@@ -166,12 +169,12 @@ public function getLeadStats($leadId, array $options = array())
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere(
-                $query->expr()->like('e.title', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('e.title', $query->expr()->literal('%'.$options['search'].'%'))
             );
         }
 
         if (isset($options['order'])) {
-            list ($orderBy, $orderByDir) = $options['order'];
+            list($orderBy, $orderByDir) = $options['order'];
 
             switch ($orderBy) {
                 case 'eventLabel':
@@ -209,11 +212,12 @@ public function getLeadStats($leadId, array $options = array())
     }
 
     /**
-     * Get pie graph data for Sent, Read and Failed email count
+     * Get pie graph data for Sent, Read and Failed email count.
      *
      * @param QueryBuilder $query
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -224,21 +228,22 @@ public function getMostNotifications($query, $limit = 10, $offset = 0)
             ->setFirstResult($offset);
 
         $results = $query->execute()->fetchAll();
+
         return $results;
     }
 
     /**
-     * Get sent counts based grouped by email Id
+     * Get sent counts based grouped by email Id.
      *
      * @param array $emailIds
      *
      * @return array
      */
-    public function getSentCounts($emailIds = array(), \DateTime $fromDate = null)
+    public function getSentCounts($emailIds = [], \DateTime $fromDate = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('e.email_id, count(e.id) as sentcount')
-            ->from(MAUTIC_TABLE_PREFIX . 'push_notification_stats', 'e')
+            ->from(MAUTIC_TABLE_PREFIX.'push_notification_stats', 'e')
             ->where(
                 $q->expr()->in('e.notification_id', $emailIds)
             );
@@ -255,7 +260,7 @@ public function getSentCounts($emailIds = array(), \DateTime $fromDate = null)
         //get a total number of sent emails first
         $results = $q->execute()->fetchAll();
 
-        $counts = array();
+        $counts = [];
 
         foreach ($results as $r) {
             $counts[$r['notification_id']] = $r['sentcount'];
@@ -265,7 +270,7 @@ public function getSentCounts($emailIds = array(), \DateTime $fromDate = null)
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
diff --git a/app/bundles/NotificationBundle/Event/NotificationClickEvent.php b/app/bundles/NotificationBundle/Event/NotificationClickEvent.php
index 2758d28aa78..b4832f5679c 100644
--- a/app/bundles/NotificationBundle/Event/NotificationClickEvent.php
+++ b/app/bundles/NotificationBundle/Event/NotificationClickEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
@@ -28,9 +29,9 @@ class NotificationClickEvent extends CommonEvent
      */
     public function __construct(Stat $stat, $request)
     {
-        $this->entity = $stat;
+        $this->entity       = $stat;
         $this->notification = $stat->getNotification();
-        $this->request = $request;
+        $this->request      = $request;
     }
 
     /**
diff --git a/app/bundles/NotificationBundle/Event/NotificationEvent.php b/app/bundles/NotificationBundle/Event/NotificationEvent.php
index 3fd3b0ffe34..f5ca05bcf95 100644
--- a/app/bundles/NotificationBundle/Event/NotificationEvent.php
+++ b/app/bundles/NotificationBundle/Event/NotificationEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
@@ -24,7 +25,7 @@ class NotificationEvent extends CommonEvent
     public function __construct(Notification $notification, $isNew = false)
     {
         $this->entity = $notification;
-        $this->isNew = $isNew;
+        $this->isNew  = $isNew;
     }
 
     /**
diff --git a/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php b/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php
index 5db1879c2fb..be5eba4d3b4 100644
--- a/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/BuildJsSubscriber.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\EventListener;
 
 use Mautic\CoreBundle\CoreEvents;
@@ -34,10 +35,10 @@ public static function getSubscribedEvents()
      */
     public function onBuildJs(BuildJsEvent $event)
     {
-        $subscribeUrl = $this->router->generate('mautic_notification_popup', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $subscribeUrl   = $this->router->generate('mautic_notification_popup', [], UrlGeneratorInterface::ABSOLUTE_URL);
         $subscribeTitle = 'Subscribe To Notifications';
-        $width = 450;
-        $height = 450;
+        $width          = 450;
+        $height         = 450;
 
         $js = <<<JS
 MauticJS.notification = {
diff --git a/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php b/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php
index 5c95bcc4090..4ae1e062390 100644
--- a/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/CampaignSubscriber.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\EventListener;
 
+use Mautic\CampaignBundle\CampaignEvents;
+use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\Event\TokenReplacementEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
-use Mautic\CampaignBundle\CampaignEvents;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Model\LeadModel;
@@ -74,7 +75,7 @@ public static function getSubscribedEvents()
     {
         return [
             CampaignEvents::CAMPAIGN_ON_BUILD              => ['onCampaignBuild', 0],
-            NotificationEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerAction', 0]
+            NotificationEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerAction', 0],
         ];
     }
 
@@ -93,7 +94,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
                     'formType'         => 'notificationsend_list',
                     'formTypeOptions'  => ['update_select' => 'campaignevent_properties_notification'],
                     'formTheme'        => 'MauticNotificationBundle:FormTheme\NotificationSendList',
-                    'timelineTemplate' => 'MauticNotificationBundle:SubscribedEvents\Timeline:index.html.php'
+                    'timelineTemplate' => 'MauticNotificationBundle:SubscribedEvents\Timeline:index.html.php',
                 ]
             );
         }
@@ -107,7 +108,6 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         $lead = $event->getLead();
 
         if ($this->leadModel->isContactable($lead, 'notification') !== DoNotContact::IS_CONTACTABLE) {
-
             return $event->setFailed('mautic.notification.campaign.failed.not_contactable');
         }
 
@@ -122,7 +122,6 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         }
 
         if (empty($playerID)) {
-
             return $event->setFailed('mautic.notification.campaign.failed.not_subscribed');
         }
 
@@ -132,7 +131,6 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         $notification = $this->notificationModel->getEntity($notificationId);
 
         if ($notification->getId() !== $notificationId) {
-
             return $event->setFailed('mautic.notification.campaign.failed.missing_entity');
         }
 
@@ -141,7 +139,7 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
                 $url,
                 [
                     'notification' => $notification->getId(),
-                    'lead'         => $lead->getId()
+                    'lead'         => $lead->getId(),
                 ]
             );
         }
@@ -171,7 +169,6 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
 
         // If for some reason the call failed, tell mautic to try again by return false
         if ($response->code !== 200) {
-
             return $event->setResult(false);
         }
 
diff --git a/app/bundles/NotificationBundle/EventListener/ConfigSubscriber.php b/app/bundles/NotificationBundle/EventListener/ConfigSubscriber.php
index a59f1ff0f63..2b1484d0e5f 100644
--- a/app/bundles/NotificationBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/ConfigSubscriber.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
  * Class ConfigSubscriber.
@@ -31,9 +32,9 @@ public static function getSubscribedEvents()
     public function onConfigGenerate(ConfigBuilderEvent $event)
     {
         $event->addForm([
-            'bundle' => 'NotificationBundle',
-            'formAlias' => 'notificationconfig',
-            'formTheme' => 'MauticNotificationBundle:FormTheme\Config',
+            'bundle'     => 'NotificationBundle',
+            'formAlias'  => 'notificationconfig',
+            'formTheme'  => 'MauticNotificationBundle:FormTheme\Config',
             'parameters' => $event->getParametersFromConfig('MauticNotificationBundle'),
         ]);
     }
diff --git a/app/bundles/NotificationBundle/EventListener/NotificationSubscriber.php b/app/bundles/NotificationBundle/EventListener/NotificationSubscriber.php
index c4d0b47d400..38309905a1a 100644
--- a/app/bundles/NotificationBundle/EventListener/NotificationSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/NotificationSubscriber.php
@@ -1,27 +1,26 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\EventListener;
 
 use Mautic\AssetBundle\Helper\TokenHelper as AssetTokenHelper;
-use Mautic\CoreBundle\Model\AuditLogModel;
-use Mautic\PageBundle\Entity\Trackable;
-use Mautic\PageBundle\Helper\TokenHelper as PageTokenHelper;
 use Mautic\CoreBundle\Event\TokenReplacementEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Helper\TokenHelper;
-use Mautic\PageBundle\Model\TrackableModel;
 use Mautic\NotificationBundle\Event\NotificationEvent;
-use Mautic\NotificationBundle\Event\NotificationSendEvent;
 use Mautic\NotificationBundle\NotificationEvents;
+use Mautic\PageBundle\Entity\Trackable;
+use Mautic\PageBundle\Helper\TokenHelper as PageTokenHelper;
+use Mautic\PageBundle\Model\TrackableModel;
 
 /**
  * Class NotificationSubscriber.
@@ -58,9 +57,9 @@ class NotificationSubscriber extends CommonSubscriber
      */
     public function __construct(AuditLogModel $auditLogModel, TrackableModel $trackableModel, PageTokenHelper $pageTokenHelper, AssetTokenHelper $assetTokenHelper)
     {
-        $this->auditLogModel = $auditLogModel;
-        $this->trackableModel = $trackableModel;
-        $this->pageTokenHelper = $pageTokenHelper;
+        $this->auditLogModel    = $auditLogModel;
+        $this->trackableModel   = $trackableModel;
+        $this->pageTokenHelper  = $pageTokenHelper;
         $this->assetTokenHelper = $assetTokenHelper;
     }
 
@@ -70,9 +69,9 @@ public function __construct(AuditLogModel $auditLogModel, TrackableModel $tracka
     public static function getSubscribedEvents()
     {
         return [
-            NotificationEvents::NOTIFICATION_POST_SAVE => ['onPostSave', 0],
+            NotificationEvents::NOTIFICATION_POST_SAVE   => ['onPostSave', 0],
             NotificationEvents::NOTIFICATION_POST_DELETE => ['onDelete', 0],
-            NotificationEvents::TOKEN_REPLACEMENT => ['onTokenReplacement', 0],
+            NotificationEvents::TOKEN_REPLACEMENT        => ['onTokenReplacement', 0],
         ];
     }
 
@@ -86,11 +85,11 @@ public function onPostSave(NotificationEvent $event)
         $entity = $event->getNotification();
         if ($details = $event->getChanges()) {
             $log = [
-                'bundle' => 'notification',
-                'object' => 'notification',
+                'bundle'   => 'notification',
+                'object'   => 'notification',
                 'objectId' => $entity->getId(),
-                'action' => ($event->isNew()) ? 'create' : 'update',
-                'details' => $details,
+                'action'   => ($event->isNew()) ? 'create' : 'update',
+                'details'  => $details,
             ];
             $this->auditLogModel->writeToLog($log);
         }
@@ -104,12 +103,12 @@ public function onPostSave(NotificationEvent $event)
     public function onDelete(NotificationEvent $event)
     {
         $entity = $event->getNotification();
-        $log = [
-            'bundle' => 'notification',
-            'object' => 'notification',
+        $log    = [
+            'bundle'   => 'notification',
+            'object'   => 'notification',
             'objectId' => $entity->getId(),
-            'action' => 'delete',
-            'details' => ['name' => $entity->getName()],
+            'action'   => 'delete',
+            'details'  => ['name' => $entity->getName()],
         ];
         $this->auditLogModel->writeToLog($log);
     }
diff --git a/app/bundles/NotificationBundle/EventListener/PageSubscriber.php b/app/bundles/NotificationBundle/EventListener/PageSubscriber.php
index 13e695a54b6..90c28917410 100644
--- a/app/bundles/NotificationBundle/EventListener/PageSubscriber.php
+++ b/app/bundles/NotificationBundle/EventListener/PageSubscriber.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
@@ -62,7 +63,7 @@ public function onPageDisplay(PageDisplayEvent $event)
             return;
         }
 
-        $appId = $this->coreParametersHelper->getParameter('notification_app_id');
+        $appId       = $this->coreParametersHelper->getParameter('notification_app_id');
         $safariWebId = $this->coreParametersHelper->getParameter('notification_safari_web_id');
 
         $this->assetsHelper->addScript($this->router->generate('mautic_js', [], UrlGeneratorInterface::ABSOLUTE_URL), 'onPageDisplay_headClose', true, 'mautic_js');
diff --git a/app/bundles/NotificationBundle/Exception/MissingApiKeyException.php b/app/bundles/NotificationBundle/Exception/MissingApiKeyException.php
index 2cad23e3cdf..c6d9551f57c 100644
--- a/app/bundles/NotificationBundle/Exception/MissingApiKeyException.php
+++ b/app/bundles/NotificationBundle/Exception/MissingApiKeyException.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Exception;
 
 class MissingApiKeyException extends \Exception
diff --git a/app/bundles/NotificationBundle/Exception/MissingAppIDException.php b/app/bundles/NotificationBundle/Exception/MissingAppIDException.php
index 72bab0bb931..6cc84667da7 100644
--- a/app/bundles/NotificationBundle/Exception/MissingAppIDException.php
+++ b/app/bundles/NotificationBundle/Exception/MissingAppIDException.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Exception;
 
 class MissingAppIDException extends \Exception
diff --git a/app/bundles/NotificationBundle/Form/Type/ConfigType.php b/app/bundles/NotificationBundle/Form/Type/ConfigType.php
index 41434730ead..6eac6321c60 100644
--- a/app/bundles/NotificationBundle/Form/Type/ConfigType.php
+++ b/app/bundles/NotificationBundle/Form/Type/ConfigType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
@@ -28,8 +29,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'yesno_button_group',
             [
                 'label' => 'mautic.notification.config.form.notification.enabled',
-                'data' => (bool) $options['data']['notification_enabled'],
-                'attr' => [
+                'data'  => (bool) $options['data']['notification_enabled'],
+                'attr'  => [
                     'tooltip' => 'mautic.notification.config.form.notification.enabled.tooltip',
                 ],
             ]
@@ -40,10 +41,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'text',
             [
                 'label' => 'mautic.notification.config.form.notification.app_id',
-                'data' => $options['data']['notification_app_id'],
-                'attr' => [
-                    'tooltip' => 'mautic.notification.config.form.notification.app_id.tooltip',
-                    'class' => 'form-control',
+                'data'  => $options['data']['notification_app_id'],
+                'attr'  => [
+                    'tooltip'      => 'mautic.notification.config.form.notification.app_id.tooltip',
+                    'class'        => 'form-control',
                     'data-show-on' => '{"config_notificationconfig_notification_enabled_1":"checked"}',
                 ],
             ]
@@ -54,10 +55,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'text',
             [
                 'label' => 'mautic.notification.config.form.notification.safari_web_id',
-                'data' => $options['data']['notification_safari_web_id'],
-                'attr' => [
-                    'tooltip' => 'mautic.notification.config.form.notification.safari_web_id.tooltip',
-                    'class' => 'form-control',
+                'data'  => $options['data']['notification_safari_web_id'],
+                'attr'  => [
+                    'tooltip'      => 'mautic.notification.config.form.notification.safari_web_id.tooltip',
+                    'class'        => 'form-control',
                     'data-show-on' => '{"config_notificationconfig_notification_enabled_1":"checked"}',
                 ],
             ]
@@ -68,10 +69,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'text',
             [
                 'label' => 'mautic.notification.config.form.notification.rest_api_key',
-                'data' => $options['data']['notification_rest_api_key'],
-                'attr' => [
-                    'tooltip' => 'mautic.notification.config.form.notification.rest_api_key.tooltip',
-                    'class' => 'form-control',
+                'data'  => $options['data']['notification_rest_api_key'],
+                'attr'  => [
+                    'tooltip'      => 'mautic.notification.config.form.notification.rest_api_key.tooltip',
+                    'class'        => 'form-control',
                     'data-show-on' => '{"config_notificationconfig_notification_enabled_1":"checked"}',
                 ],
             ]
diff --git a/app/bundles/NotificationBundle/Form/Type/NotificationListType.php b/app/bundles/NotificationBundle/Form/Type/NotificationListType.php
index 90f14c2bba4..3c75c60841d 100644
--- a/app/bundles/NotificationBundle/Form/Type/NotificationListType.php
+++ b/app/bundles/NotificationBundle/Form/Type/NotificationListType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
@@ -28,7 +29,7 @@ class NotificationListType extends AbstractType
     public function __construct(MauticFactory $factory)
     {
         $this->viewOther = $factory->getSecurity()->isGranted('notification:notifications:viewother');
-        $this->repo = $factory->getModel('notification')->getRepository();
+        $this->repo      = $factory->getModel('notification')->getRepository();
 
         $this->repo->setCurrentUser($factory->getUser());
     }
@@ -39,7 +40,7 @@ public function __construct(MauticFactory $factory)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $viewOther = $this->viewOther;
-        $repo = $this->repo;
+        $repo      = $this->repo;
 
         $resolver->setDefaults(
             [
@@ -62,14 +63,14 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
                     return $choices;
                 },
-                'expanded' => false,
-                'multiple' => true,
-                'required' => false,
+                'expanded'    => false,
+                'multiple'    => true,
+                'required'    => false,
                 'empty_value' => function (Options $options) {
                     return (empty($options['choices'])) ? 'mautic.notification.no.notifications.note' : 'mautic.core.form.chooseone';
                 },
                 'notification_type' => 'template',
-                'disabled' => function (Options $options) {
+                'disabled'          => function (Options $options) {
                     return empty($options['choices']);
                 },
             ]
diff --git a/app/bundles/NotificationBundle/Form/Type/NotificationSendType.php b/app/bundles/NotificationBundle/Form/Type/NotificationSendType.php
index 2daa132c000..3c32b00f83f 100644
--- a/app/bundles/NotificationBundle/Form/Type/NotificationSendType.php
+++ b/app/bundles/NotificationBundle/Form/Type/NotificationSendType.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Form\Type;
 
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
  * Class NotificationSendType.
@@ -40,14 +41,14 @@ public function __construct(RouterInterface $router)
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('notification', 'notification_list', [
-            'label' => 'mautic.notification.send.selectnotifications',
+            'label'      => 'mautic.notification.send.selectnotifications',
             'label_attr' => ['class' => 'control-label'],
-            'attr' => [
-                'class' => 'form-control',
-                'tooltip' => 'mautic.notification.choose.notifications',
+            'attr'       => [
+                'class'    => 'form-control',
+                'tooltip'  => 'mautic.notification.choose.notifications',
                 'onchange' => 'Mautic.disabledNotificationAction()',
             ],
-            'multiple' => false,
+            'multiple'    => false,
             'constraints' => [
                 new NotBlank(
                     ['message' => 'mautic.notification.choosenotification.notblank']
@@ -58,13 +59,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         if (!empty($options['update_select'])) {
             $windowUrl = $this->router->generate('mautic_notification_action', [
                 'objectAction' => 'new',
-                'contentOnly' => 1,
+                'contentOnly'  => 1,
                 'updateSelect' => $options['update_select'],
             ]);
 
             $builder->add('newNotificationButton', 'button', [
                 'attr' => [
-                    'class' => 'btn btn-primary btn-nospin',
+                    'class'   => 'btn btn-primary btn-nospin',
                     'onclick' => 'Mautic.loadNewNotificationWindow({
                         "windowUrl": "'.$windowUrl.'"
                     })',
@@ -78,17 +79,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             // create button edit notification
             $windowUrlEdit = $this->router->generate('mautic_notification_action', [
                 'objectAction' => 'edit',
-                'objectId' => 'notificationId',
-                'contentOnly' => 1,
+                'objectId'     => 'notificationId',
+                'contentOnly'  => 1,
                 'updateSelect' => $options['update_select'],
             ]);
 
             $builder->add('editNotificationButton', 'button', [
                 'attr' => [
-                    'class' => 'btn btn-primary btn-nospin',
-                    'onclick' => 'Mautic.loadNewNotificationWindow(Mautic.standardNotificationUrl({"windowUrl": "'.$windowUrlEdit.'"}))',
+                    'class'    => 'btn btn-primary btn-nospin',
+                    'onclick'  => 'Mautic.loadNewNotificationWindow(Mautic.standardNotificationUrl({"windowUrl": "'.$windowUrlEdit.'"}))',
                     'disabled' => !isset($notification),
-                    'icon' => 'fa fa-edit',
+                    'icon'     => 'fa fa-edit',
                 ],
                 'label' => 'mautic.notification.send.edit.notification',
             ]);
diff --git a/app/bundles/NotificationBundle/Form/Type/NotificationType.php b/app/bundles/NotificationBundle/Form/Type/NotificationType.php
index 0c97c595e0c..aa5b7a5b858 100644
--- a/app/bundles/NotificationBundle/Form/Type/NotificationType.php
+++ b/app/bundles/NotificationBundle/Form/Type/NotificationType.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
@@ -32,8 +32,8 @@ class NotificationType extends AbstractType
     public function __construct(MauticFactory $factory)
     {
         $this->translator = $factory->getTranslator();
-        $this->em = $factory->getEntityManager();
-        $this->request = $factory->getRequest();
+        $this->em         = $factory->getEntityManager();
+        $this->request    = $factory->getRequest();
     }
 
     /**
@@ -49,9 +49,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'name',
             'text',
             [
-                'label' => 'mautic.notification.form.internal.name',
+                'label'      => 'mautic.notification.form.internal.name',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => ['class' => 'form-control'],
+                'attr'       => ['class' => 'form-control'],
             ]
         );
 
@@ -59,10 +59,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'description',
             'textarea',
             [
-                'label' => 'mautic.notification.form.internal.description',
+                'label'      => 'mautic.notification.form.internal.description',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => ['class' => 'form-control'],
-                'required' => false,
+                'attr'       => ['class' => 'form-control'],
+                'required'   => false,
             ]
         );
 
@@ -70,9 +70,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'heading',
             'text',
             [
-                'label' => 'mautic.notification.form.heading',
+                'label'      => 'mautic.notification.form.heading',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => ['class' => 'form-control'],
+                'attr'       => ['class' => 'form-control'],
             ]
         );
 
@@ -80,11 +80,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'message',
             'textarea',
             [
-                'label' => 'mautic.notification.form.message',
+                'label'      => 'mautic.notification.form.message',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
+                'attr'       => [
                     'class' => 'form-control',
-                    'rows' => 6,
+                    'rows'  => 6,
                 ],
             ]
         );
@@ -93,10 +93,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'url',
             'url',
             [
-                'label' => 'mautic.notification.form.url',
+                'label'      => 'mautic.notification.form.url',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
-                    'class' => 'form-control',
+                'attr'       => [
+                    'class'   => 'form-control',
                     'tooltip' => 'mautic.notification.form.url.tooltip',
                 ],
                 'required' => false,
@@ -109,14 +109,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'publishUp',
             'datetime',
             [
-                'widget' => 'single_text',
-                'label' => 'mautic.core.form.publishup',
+                'widget'     => 'single_text',
+                'label'      => 'mautic.core.form.publishup',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
-                    'class' => 'form-control',
+                'attr'       => [
+                    'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format' => 'yyyy-MM-dd HH:mm',
+                'format'   => 'yyyy-MM-dd HH:mm',
                 'required' => false,
             ]
         );
@@ -125,14 +125,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'publishDown',
             'datetime',
             [
-                'widget' => 'single_text',
-                'label' => 'mautic.core.form.publishdown',
+                'widget'     => 'single_text',
+                'label'      => 'mautic.core.form.publishdown',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
-                    'class' => 'form-control',
+                'attr'       => [
+                    'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format' => 'yyyy-MM-dd HH:mm',
+                'format'   => 'yyyy-MM-dd HH:mm',
                 'required' => false,
             ]
         );
@@ -150,9 +150,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'language',
             'locale',
             [
-                'label' => 'mautic.core.language',
+                'label'      => 'mautic.core.language',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
+                'attr'       => [
                     'class' => 'form-control',
                 ],
                 'required' => false,
@@ -173,7 +173,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'updateSelect',
                 'hidden',
                 [
-                    'data' => $options['update_select'],
+                    'data'   => $options['update_select'],
                     'mapped' => false,
                 ]
             );
diff --git a/app/bundles/NotificationBundle/Helper/NotificationHelper.php b/app/bundles/NotificationBundle/Helper/NotificationHelper.php
index 1e72f9178f1..e664bc926ca 100644
--- a/app/bundles/NotificationBundle/Helper/NotificationHelper.php
+++ b/app/bundles/NotificationBundle/Helper/NotificationHelper.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Helper;
 
+use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\CoreBundle\Factory\MauticFactory;
 
 class NotificationHelper
 {
diff --git a/app/bundles/NotificationBundle/MauticNotificationBundle.php b/app/bundles/NotificationBundle/MauticNotificationBundle.php
index 05e782d62c7..92e53341593 100644
--- a/app/bundles/NotificationBundle/MauticNotificationBundle.php
+++ b/app/bundles/NotificationBundle/MauticNotificationBundle.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/app/bundles/NotificationBundle/Model/NotificationModel.php b/app/bundles/NotificationBundle/Model/NotificationModel.php
index 3be8b831a75..0a75abc1cda 100644
--- a/app/bundles/NotificationBundle/Model/NotificationModel.php
+++ b/app/bundles/NotificationBundle/Model/NotificationModel.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Model;
 
 use Doctrine\DBAL\Query\QueryBuilder;
@@ -35,7 +36,7 @@ class NotificationModel extends FormModel
 
     /**
      * NotificationModel constructor.
-     * 
+     *
      * @param TrackableModel $pageTrackableModel
      */
     public function __construct(TrackableModel $pageTrackableModel)
@@ -283,7 +284,7 @@ public function getNotificationStatByLeadId($notificationId, $leadId)
         return $this->getStatRepository()->findBy(
             [
                 'notification' => (int) $notificationId,
-                'lead' => (int) $leadId,
+                'lead'         => (int) $leadId,
             ],
             ['dateSent' => 'DESC']
         );
diff --git a/app/bundles/NotificationBundle/NotificationEvents.php b/app/bundles/NotificationBundle/NotificationEvents.php
index f376f6b22e9..a539ca8fb2c 100644
--- a/app/bundles/NotificationBundle/NotificationEvents.php
+++ b/app/bundles/NotificationBundle/NotificationEvents.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle;
 
 /**
diff --git a/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php b/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php
index c1f0a5f64e4..3c5fd5556cc 100644
--- a/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php
+++ b/app/bundles/NotificationBundle/Security/Permissions/NotificationPermissions.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\NotificationBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Class NotificationPermissions.
diff --git a/app/bundles/NotificationBundle/Views/FormTheme/Config/_config_webpushconfig_widget.html.php b/app/bundles/NotificationBundle/Views/FormTheme/Config/_config_webpushconfig_widget.html.php
index b85015bc331..3db98f43e30 100644
--- a/app/bundles/NotificationBundle/Views/FormTheme/Config/_config_webpushconfig_widget.html.php
+++ b/app/bundles/NotificationBundle/Views/FormTheme/Config/_config_webpushconfig_widget.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/NotificationBundle/Views/FormTheme/NotificationSendList/notificationsend_list_row.html.php b/app/bundles/NotificationBundle/Views/FormTheme/NotificationSendList/notificationsend_list_row.html.php
index 2b428a12a85..6244c6fe57a 100644
--- a/app/bundles/NotificationBundle/Views/FormTheme/NotificationSendList/notificationsend_list_row.html.php
+++ b/app/bundles/NotificationBundle/Views/FormTheme/NotificationSendList/notificationsend_list_row.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/NotificationBundle/Views/Notification/details.html.php b/app/bundles/NotificationBundle/Views/Notification/details.html.php
index c63a66e2896..0df8b49b5af 100644
--- a/app/bundles/NotificationBundle/Views/Notification/details.html.php
+++ b/app/bundles/NotificationBundle/Views/Notification/details.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -23,8 +23,8 @@
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
         [
-            'item' => $notification,
-            'customButtons' => (isset($customButtons)) ? $customButtons : [],
+            'item'            => $notification,
+            'customButtons'   => (isset($customButtons)) ? $customButtons : [],
             'templateButtons' => [
                 'edit' => $view['security']->hasEntityAccess(
                     $permissions['notification:notifications:editown'],
@@ -32,7 +32,7 @@
                     $notification->getCreatedBy()
                 ),
                 'delete' => $permissions['notification:notifications:create'],
-                'close' => $view['security']->hasEntityAccess(
+                'close'  => $view['security']->hasEntityAccess(
                     $permissions['notification:notifications:viewown'],
                     $permissions['notification:notifications:viewother'],
                     $notification->getCreatedBy()
diff --git a/app/bundles/NotificationBundle/Views/Notification/form.html.php b/app/bundles/NotificationBundle/Views/Notification/form.html.php
index 4c86c89788b..e7cfde24389 100644
--- a/app/bundles/NotificationBundle/Views/Notification/form.html.php
+++ b/app/bundles/NotificationBundle/Views/Notification/form.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/NotificationBundle/Views/Notification/index.html.php b/app/bundles/NotificationBundle/Views/Notification/index.html.php
index 55590512529..d5549594845 100644
--- a/app/bundles/NotificationBundle/Views/Notification/index.html.php
+++ b/app/bundles/NotificationBundle/Views/Notification/index.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -15,23 +15,23 @@
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['notification:notifications:create']
-            ),
-            'routeBase'       => 'notification'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['notification:notifications:create'],
+            ],
+            'routeBase' => 'notification',
+        ]
     )
 );
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
-        'searchValue' => $searchValue,
-        'searchHelp' => 'mautic.notification.help.searchcommands',
-        'searchId' => 'notification-search',
-        'action' => $currentRoute,
-        'routeBase' => 'notification',
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.notification.help.searchcommands',
+        'searchId'        => 'notification-search',
+        'action'          => $currentRoute,
+        'routeBase'       => 'notification',
         'templateButtons' => [
             'delete' => $permissions['notification:notifications:deleteown'] || $permissions['notification:notifications:deleteother'],
         ],
diff --git a/app/bundles/NotificationBundle/Views/Notification/list.html.php b/app/bundles/NotificationBundle/Views/Notification/list.html.php
index cd4cb5d97de..54a7f846585 100644
--- a/app/bundles/NotificationBundle/Views/Notification/list.html.php
+++ b/app/bundles/NotificationBundle/Views/Notification/list.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -25,17 +25,17 @@
 
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'notification',
-                'orderBy' => 'e.name',
-                'text' => 'mautic.core.name',
-                'class' => 'col-notification-name',
-                'default' => true,
+                'orderBy'    => 'e.name',
+                'text'       => 'mautic.core.name',
+                'class'      => 'col-notification-name',
+                'default'    => true,
             ]);
 
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'notification',
-                'orderBy' => 'c.title',
-                'text' => 'mautic.core.category',
-                'class' => 'visible-md visible-lg col-notification-category',
+                'orderBy'    => 'c.title',
+                'text'       => 'mautic.core.category',
+                'class'      => 'visible-md visible-lg col-notification-category',
             ]);
             ?>
 
@@ -44,9 +44,9 @@
             <?php
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'notification',
-                'orderBy' => 'e.id',
-                'text' => 'mautic.core.id',
-                'class' => 'visible-md visible-lg col-notification-id',
+                'orderBy'    => 'e.id',
+                'text'       => 'mautic.core.id',
+                'class'      => 'visible-md visible-lg col-notification-id',
             ]);
             ?>
         </tr>
@@ -60,7 +60,7 @@
             <tr>
                 <td>
                     <?php
-                    $edit = $view['security']->hasEntityAccess($permissions['notification:notifications:editown'], $permissions['notification:notifications:editother'], $item->getCreatedBy());
+                    $edit          = $view['security']->hasEntityAccess($permissions['notification:notifications:editown'], $permissions['notification:notifications:editother'], $item->getCreatedBy());
                     $customButtons = [
                         [
                             'attr' => [
@@ -68,18 +68,18 @@
                                 'data-target' => '#MauticSharedModal',
                                 'data-header' => $view['translator']->trans('mautic.notification.notification.header.preview'),
                                 'data-footer' => 'false',
-                                'href' => $view['router']->path('mautic_notification_action', ['objectId' => $item->getId(), 'objectAction' => 'preview']),
+                                'href'        => $view['router']->path('mautic_notification_action', ['objectId' => $item->getId(), 'objectAction' => 'preview']),
                             ],
-                            'btnText' => $view['translator']->trans('mautic.notification.preview'),
+                            'btnText'   => $view['translator']->trans('mautic.notification.preview'),
                             'iconClass' => 'fa fa-share',
                         ],
                     ];
                     echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
-                        'item' => $item,
+                        'item'            => $item,
                         'templateButtons' => [
                             'delete' => $view['security']->hasEntityAccess($permissions['notification:notifications:deleteown'], $permissions['notification:notifications:deleteother'], $item->getCreatedBy()),
                         ],
-                        'routeBase' => 'notification',
+                        'routeBase'     => 'notification',
                         'customButtons' => $customButtons,
                     ]);
                     ?>
@@ -101,8 +101,8 @@
                 </td>
                 <td class="visible-md visible-lg">
                     <?php $category = $item->getCategory(); ?>
-                    <?php $catName = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                    <?php $color = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
+                    <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
+                    <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                     <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                 </td>
                 <td class="visible-sm visible-md visible-lg col-stats">
@@ -117,9 +117,9 @@
 <div class="panel-footer">
     <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
         'totalItems' => $totalItems,
-        'page' => $page,
-        'limit' => $limit,
-        'baseUrl' => $view['router']->path('mautic_notification_index'),
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_notification_index'),
         'sessionVar' => 'notification',
     ]); ?>
 </div>
diff --git a/app/bundles/NotificationBundle/Views/Notification/list_graph.html.php b/app/bundles/NotificationBundle/Views/Notification/list_graph.html.php
index 8db84587ded..8d918f20bba 100644
--- a/app/bundles/NotificationBundle/Views/Notification/list_graph.html.php
+++ b/app/bundles/NotificationBundle/Views/Notification/list_graph.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/NotificationBundle/Views/Notification/preview.html.php b/app/bundles/NotificationBundle/Views/Notification/preview.html.php
index 233fca1c17c..da3970a51e7 100644
--- a/app/bundles/NotificationBundle/Views/Notification/preview.html.php
+++ b/app/bundles/NotificationBundle/Views/Notification/preview.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/NotificationBundle/Views/Notification/template_graph.html.php b/app/bundles/NotificationBundle/Views/Notification/template_graph.html.php
index 07b342fa292..e588dac949e 100644
--- a/app/bundles/NotificationBundle/Views/Notification/template_graph.html.php
+++ b/app/bundles/NotificationBundle/Views/Notification/template_graph.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php
index 5f5f79a377e..22c0088831a 100644
--- a/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/NotificationBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $data = $event['extra']['log']['metadata'];
 
 ?>
diff --git a/app/bundles/PageBundle/Config/config.php b/app/bundles/PageBundle/Config/config.php
index 9bb9284ec5e..d319e5cc0f5 100644
--- a/app/bundles/PageBundle/Config/config.php
+++ b/app/bundles/PageBundle/Config/config.php
@@ -1,279 +1,280 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
-    'routes'     => [
-        'main'   => [
+    'routes' => [
+        'main' => [
             'mautic_page_buildertoken_index' => [
                 'path'       => '/pages/buildertokens/{page}',
-                'controller' => 'MauticPageBundle:SubscribedEvents\BuilderToken:index'
+                'controller' => 'MauticPageBundle:SubscribedEvents\BuilderToken:index',
             ],
-            'mautic_page_index'              => [
+            'mautic_page_index' => [
                 'path'       => '/pages/{page}',
-                'controller' => 'MauticPageBundle:Page:index'
+                'controller' => 'MauticPageBundle:Page:index',
             ],
-            'mautic_page_action'             => [
+            'mautic_page_action' => [
                 'path'       => '/pages/{objectAction}/{objectId}',
-                'controller' => 'MauticPageBundle:Page:execute'
+                'controller' => 'MauticPageBundle:Page:execute',
             ],
         ],
         'public' => [
-            'mautic_page_tracker'  => [
+            'mautic_page_tracker' => [
                 'path'       => '/mtracking.gif',
-                'controller' => 'MauticPageBundle:Public:trackingImage'
+                'controller' => 'MauticPageBundle:Public:trackingImage',
             ],
-            'mautic_page_tracker_getcontact'  => [
+            'mautic_page_tracker_getcontact' => [
                 'path'       => '/mtc',
-                'controller' => 'MauticPageBundle:Public:getContactId'
+                'controller' => 'MauticPageBundle:Public:getContactId',
             ],
             'mautic_url_redirect' => [
                 'path'       => '/r/{redirectId}',
-                'controller' => 'MauticPageBundle:Public:redirect'
+                'controller' => 'MauticPageBundle:Public:redirect',
             ],
             'mautic_page_redirect' => [
                 'path'       => '/redirect/{redirectId}',
-                'controller' => 'MauticPageBundle:Public:redirect'
+                'controller' => 'MauticPageBundle:Public:redirect',
             ],
             'mautic_page_preview' => [
                 'path'       => '/page/preview/{id}',
-                'controller' => 'MauticPageBundle:Public:preview'
+                'controller' => 'MauticPageBundle:Public:preview',
             ],
             'mautic_gated_video_hit' => [
-                'path' => '/video/hit',
-                'controller' => 'MauticPageBundle:Public:hitVideo'
-            ]
+                'path'       => '/video/hit',
+                'controller' => 'MauticPageBundle:Public:hitVideo',
+            ],
         ],
-        'api'    => [
+        'api' => [
             'mautic_api_getpages' => [
                 'path'       => '/pages',
                 'controller' => 'MauticPageBundle:Api\PageApi:getEntities',
             ],
-            'mautic_api_getpage'  => [
+            'mautic_api_getpage' => [
                 'path'       => '/pages/{id}',
                 'controller' => 'MauticPageBundle:Api\PageApi:getEntity',
-            ]
+            ],
         ],
-        'catchall'  => [
-            'mautic_page_public'   => [
-                'path'       => '/{slug}',
-                'controller' => 'MauticPageBundle:Public:index',
+        'catchall' => [
+            'mautic_page_public' => [
+                'path'         => '/{slug}',
+                'controller'   => 'MauticPageBundle:Public:index',
                 'requirements' => [
-                    'slug' => '^(?!(_(profiler|wdt)|css|images|js|favicon.ico|apps/bundles/|plugins/)).+'
-                ]
+                    'slug' => '^(?!(_(profiler|wdt)|css|images|js|favicon.ico|apps/bundles/|plugins/)).+',
+                ],
             ],
-        ]
+        ],
     ],
 
     'menu' => [
         'main' => [
-            'items'    => [
+            'items' => [
                 'mautic.page.pages' => [
-                    'route' => 'mautic_page_index',
-                    'access'    => ['page:pages:viewown', 'page:pages:viewother'],
-                    'parent'    => 'mautic.core.components',
-                    'priority'  => 100
-                ]
-            ]
-        ]
+                    'route'    => 'mautic_page_index',
+                    'access'   => ['page:pages:viewown', 'page:pages:viewother'],
+                    'parent'   => 'mautic.core.components',
+                    'priority' => 100,
+                ],
+            ],
+        ],
     ],
 
     'categories' => [
-        'page' => null
+        'page' => null,
     ],
 
-    'services'   => [
+    'services' => [
         'events' => [
-            'mautic.page.subscriber'                => [
-                'class' => 'Mautic\PageBundle\EventListener\PageSubscriber',
+            'mautic.page.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\PageSubscriber',
                 'arguments' => [
                     'templating.helper.assets',
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
+                    'mautic.core.model.auditlog',
+                ],
             ],
-            'mautic.pagebuilder.subscriber'         => [
-                'class' => 'Mautic\PageBundle\EventListener\BuilderSubscriber',
+            'mautic.pagebuilder.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\BuilderSubscriber',
                 'arguments' => [
                     'mautic.page.helper.token',
                     'mautic.helper.integration',
                     'mautic.page.model.page',
-                ]
+                ],
             ],
-            'mautic.pagetoken.subscriber'           => [
-                'class' => 'Mautic\PageBundle\EventListener\TokenSubscriber'
+            'mautic.pagetoken.subscriber' => [
+                'class' => 'Mautic\PageBundle\EventListener\TokenSubscriber',
             ],
-            'mautic.page.pointbundle.subscriber'    => [
-                'class' => 'Mautic\PageBundle\EventListener\PointSubscriber',
+            'mautic.page.pointbundle.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\PointSubscriber',
                 'arguments' => [
-                    'mautic.point.model.point'
-                ]
+                    'mautic.point.model.point',
+                ],
 
             ],
-            'mautic.page.reportbundle.subscriber'   => [
-                'class' => 'Mautic\PageBundle\EventListener\ReportSubscriber'
+            'mautic.page.reportbundle.subscriber' => [
+                'class' => 'Mautic\PageBundle\EventListener\ReportSubscriber',
             ],
             'mautic.page.campaignbundle.subscriber' => [
-                'class' => 'Mautic\PageBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\PageBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.page.model.page',
-                    'mautic.campaign.model.event'
-                ]
+                    'mautic.campaign.model.event',
+                ],
             ],
-            'mautic.page.leadbundle.subscriber'     => [
-                'class'       => 'Mautic\PageBundle\EventListener\LeadSubscriber',
+            'mautic.page.leadbundle.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\LeadSubscriber',
                 'arguments' => [
                     'mautic.page.model.page',
                     'mautic.page.model.video',
                 ],
                 'methodCalls' => [
-                    'setModelFactory' => ['mautic.model.factory']
+                    'setModelFactory' => ['mautic.model.factory'],
                 ],
             ],
             'mautic.page.calendarbundle.subscriber' => [
-                'class' => 'Mautic\PageBundle\EventListener\CalendarSubscriber',
+                'class'     => 'Mautic\PageBundle\EventListener\CalendarSubscriber',
                 'arguments' => [
-                    'mautic.page.model.page'
-                ]
+                    'mautic.page.model.page',
+                ],
             ],
-            'mautic.page.configbundle.subscriber'   => [
-                'class' => 'Mautic\PageBundle\EventListener\ConfigSubscriber'
+            'mautic.page.configbundle.subscriber' => [
+                'class' => 'Mautic\PageBundle\EventListener\ConfigSubscriber',
             ],
-            'mautic.page.search.subscriber'         => [
-                'class' => 'Mautic\PageBundle\EventListener\SearchSubscriber',
+            'mautic.page.search.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\SearchSubscriber',
                 'arguments' => [
                     'mautic.helper.user',
-                    'mautic.page.model.page'
-                ]
+                    'mautic.page.model.page',
+                ],
             ],
-            'mautic.page.webhook.subscriber'        => [
-                'class' => 'Mautic\PageBundle\EventListener\WebhookSubscriber'
+            'mautic.page.webhook.subscriber' => [
+                'class' => 'Mautic\PageBundle\EventListener\WebhookSubscriber',
             ],
-            'mautic.page.dashboard.subscriber'      => [
-                'class' => 'Mautic\PageBundle\EventListener\DashboardSubscriber',
+            'mautic.page.dashboard.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
-                    'mautic.page.model.page'
-                ]
+                    'mautic.page.model.page',
+                ],
             ],
-            'mautic.page.js.subscriber'           => [
-                'class' => 'Mautic\PageBundle\EventListener\BuildJsSubscriber',
+            'mautic.page.js.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\BuildJsSubscriber',
                 'arguments' => [
-                    'templating.helper.assets'
-                ]
+                    'templating.helper.assets',
+                ],
             ],
-            'mautic.page.maintenance.subscriber'    => [
-                'class' => 'Mautic\PageBundle\EventListener\MaintenanceSubscriber',
+            'mautic.page.maintenance.subscriber' => [
+                'class'     => 'Mautic\PageBundle\EventListener\MaintenanceSubscriber',
                 'arguments' => [
-                    'doctrine.dbal.default_connection'
-                ]
+                    'doctrine.dbal.default_connection',
+                ],
             ],
         ],
-        'forms'  => [
-            'mautic.form.type.page'                     => [
+        'forms' => [
+            'mautic.form.type.page' => [
                 'class'     => 'Mautic\PageBundle\Form\Type\PageType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'page'
+                'alias'     => 'page',
             ],
-            'mautic.form.type.pagevariant'              => [
+            'mautic.form.type.pagevariant' => [
                 'class'     => 'Mautic\PageBundle\Form\Type\VariantType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'pagevariant'
+                'alias'     => 'pagevariant',
             ],
-            'mautic.form.type.pointaction_pointhit'     => [
+            'mautic.form.type.pointaction_pointhit' => [
                 'class' => 'Mautic\PageBundle\Form\Type\PointActionPageHitType',
-                'alias' => 'pointaction_pagehit'
+                'alias' => 'pointaction_pagehit',
             ],
-            'mautic.form.type.pointaction_urlhit'       => [
+            'mautic.form.type.pointaction_urlhit' => [
                 'class' => 'Mautic\PageBundle\Form\Type\PointActionUrlHitType',
-                'alias' => 'pointaction_urlhit'
+                'alias' => 'pointaction_urlhit',
             ],
             'mautic.form.type.pagehit.campaign_trigger' => [
                 'class' => 'Mautic\PageBundle\Form\Type\CampaignEventPageHitType',
-                'alias' => 'campaignevent_pagehit'
+                'alias' => 'campaignevent_pagehit',
             ],
-            'mautic.form.type.pagelist'                 => [
+            'mautic.form.type.pagelist' => [
                 'class'     => 'Mautic\PageBundle\Form\Type\PageListType',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'page_list',
             ],
-            'mautic.form.type.page_abtest_settings'     => [
+            'mautic.form.type.page_abtest_settings' => [
                 'class' => 'Mautic\PageBundle\Form\Type\AbTestPropertiesType',
-                'alias' => 'page_abtest_settings'
+                'alias' => 'page_abtest_settings',
             ],
-            'mautic.form.type.page_publish_dates'       => [
+            'mautic.form.type.page_publish_dates' => [
                 'class' => 'Mautic\PageBundle\Form\Type\PagePublishDatesType',
-                'alias' => 'page_publish_dates'
+                'alias' => 'page_publish_dates',
             ],
-            'mautic.form.type.pageconfig'               => [
+            'mautic.form.type.pageconfig' => [
                 'class' => 'Mautic\PageBundle\Form\Type\ConfigType',
-                'alias' => 'pageconfig'
+                'alias' => 'pageconfig',
             ],
-            'mautic.form.type.slideshow_config'         => [
+            'mautic.form.type.slideshow_config' => [
                 'class' => 'Mautic\PageBundle\Form\Type\SlideshowGlobalConfigType',
-                'alias' => 'slideshow_config'
+                'alias' => 'slideshow_config',
             ],
-            'mautic.form.type.slideshow_slide_config'   => [
+            'mautic.form.type.slideshow_slide_config' => [
                 'class' => 'Mautic\PageBundle\Form\Type\SlideshowSlideConfigType',
-                'alias' => 'slideshow_slide_config'
+                'alias' => 'slideshow_slide_config',
             ],
-            'mautic.form.type.redirect_list'            => [
-                'class' => 'Mautic\PageBundle\Form\Type\RedirectListType',
+            'mautic.form.type.redirect_list' => [
+                'class'     => 'Mautic\PageBundle\Form\Type\RedirectListType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'redirect_list'
+                'alias'     => 'redirect_list',
             ],
             'mautic.form.type.page_dashboard_hits_in_time_widget' => [
                 'class' => 'Mautic\PageBundle\Form\Type\DashboardHitsInTimeWidgetType',
-                'alias' => 'page_dashboard_hits_in_time_widget'
-            ]
+                'alias' => 'page_dashboard_hits_in_time_widget',
+            ],
         ],
-        'models' =>  [
+        'models' => [
             'mautic.page.model.page' => [
-                'class' => 'Mautic\PageBundle\Model\PageModel',
+                'class'     => 'Mautic\PageBundle\Model\PageModel',
                 'arguments' => [
                     'mautic.helper.cookie',
                     'mautic.helper.ip_lookup',
                     'mautic.lead.model.lead',
                     'mautic.lead.model.field',
                     'mautic.page.model.redirect',
-                    'mautic.page.model.trackable'
+                    'mautic.page.model.trackable',
                 ],
                 'methodCalls' => [
                     'setCatInUrl' => [
-                        '%mautic.cat_in_page_url%'
-                    ]
-                ]
+                        '%mautic.cat_in_page_url%',
+                    ],
+                ],
             ],
             'mautic.page.model.redirect' => [
-                'class' => 'Mautic\PageBundle\Model\RedirectModel',
+                'class'     => 'Mautic\PageBundle\Model\RedirectModel',
                 'arguments' => [
-                    'mautic.helper.url'
-                ]
+                    'mautic.helper.url',
+                ],
             ],
             'mautic.page.model.trackable' => [
-                'class' => 'Mautic\PageBundle\Model\TrackableModel',
+                'class'     => 'Mautic\PageBundle\Model\TrackableModel',
                 'arguments' => [
-                    'mautic.page.model.redirect'
-                ]
+                    'mautic.page.model.redirect',
+                ],
             ],
             'mautic.page.model.video' => [
-                'class' => 'Mautic\PageBundle\Model\VideoModel',
+                'class'     => 'Mautic\PageBundle\Model\VideoModel',
                 'arguments' => [
                     'mautic.lead.model.lead',
-                    'mautic.helper.ip_lookup'
-                ]
-            ]
+                    'mautic.helper.ip_lookup',
+                ],
+            ],
         ],
         'other' => [
             'mautic.page.helper.token' => [
                 'class'     => 'Mautic\PageBundle\Helper\TokenHelper',
-                'arguments' => 'mautic.page.model.page'
-            ]
-        ]
+                'arguments' => 'mautic.page.model.page',
+            ],
+        ],
     ],
 
     'parameters' => [
@@ -282,7 +283,7 @@
 
         'redirect_list_types' => [
             '301' => 'mautic.page.form.redirecttype.permanent',
-            '302' => 'mautic.page.form.redirecttype.temporary'
-        ]
-    ]
+            '302' => 'mautic.page.form.redirecttype.temporary',
+        ],
+    ],
 ];
diff --git a/app/bundles/PageBundle/Controller/AjaxController.php b/app/bundles/PageBundle/Controller/AjaxController.php
index d2f5927b9ee..b09c5674a3b 100644
--- a/app/bundles/PageBundle/Controller/AjaxController.php
+++ b/app/bundles/PageBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
@@ -47,14 +48,15 @@ protected function pageListAction(Request $request)
     {
         $filter    = InputHelper::clean($request->query->get('filter'));
         $results   = $this->getModel('page.page')->getLookupResults('page', $filter);
-        $dataArray = array();
+        $dataArray = [];
 
         foreach ($results as $r) {
-            $dataArray[] = array(
-                "label" => $r['title'] . " ({$r['id']}:{$r['alias']})",
-                "value" => $r['id']
-            );
+            $dataArray[] = [
+                'label' => $r['title']." ({$r['id']}:{$r['alias']})",
+                'value' => $r['id'],
+            ];
         }
+
         return $this->sendJsonResponse($dataArray);
     }
 
@@ -65,19 +67,19 @@ protected function pageListAction(Request $request)
      */
     protected function setBuilderContentAction(Request $request)
     {
-        $dataArray = array('success' => 0);
+        $dataArray = ['success' => 0];
         $entityId  = InputHelper::clean($request->request->get('entity'));
         $session   = $this->get('session');
 
         if (!empty($entityId)) {
-            $sessionVar = 'mautic.pagebuilder.' . $entityId . '.content';
+            $sessionVar = 'mautic.pagebuilder.'.$entityId.'.content';
 
             // Check for an array of slots
-            $slots   = InputHelper::_($request->request->get('slots', array(), true), 'html');
-            $content = $session->get($sessionVar, array());
+            $slots   = InputHelper::_($request->request->get('slots', [], true), 'html');
+            $content = $session->get($sessionVar, []);
 
             if (!is_array($content)) {
-                $content = array();
+                $content = [];
             }
 
             if (!empty($slots)) {
@@ -105,7 +107,7 @@ protected function setBuilderContentAction(Request $request)
     }
 
     /**
-     * Called by parent::getBuilderTokensAction()
+     * Called by parent::getBuilderTokensAction().
      *
      * @param $query
      *
@@ -114,9 +116,8 @@ protected function setBuilderContentAction(Request $request)
     protected function getBuilderTokens($query)
     {
         /** @var \Mautic\PageBundle\Model\PageModel $model */
-        $model  = $this->getModel('page');
+        $model = $this->getModel('page');
 
-        return $model->getBuilderComponents(null, array('tokens', 'visualTokens'), $query);
+        return $model->getBuilderComponents(null, ['tokens', 'visualTokens'], $query);
     }
-
 }
diff --git a/app/bundles/PageBundle/Controller/Api/PageApiController.php b/app/bundles/PageBundle/Controller/Api/PageApiController.php
index 893f12610a4..dc69f7c79e7 100644
--- a/app/bundles/PageBundle/Controller/Api/PageApiController.php
+++ b/app/bundles/PageBundle/Controller/Api/PageApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,14 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class PageApiController
+ * Class PageApiController.
  */
 class PageApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('page');
@@ -29,34 +29,34 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'page';
         $this->entityNameMulti  = 'pages';
         $this->permissionBase   = 'page:pages';
-        $this->serializerGroups = array('pageDetails', 'categoryList', 'publishDetails');
+        $this->serializerGroups = ['pageDetails', 'categoryList', 'publishDetails'];
     }
 
     /**
-     * Obtains a list of pages
+     * Obtains a list of pages.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function getEntitiesAction ()
+    public function getEntitiesAction()
     {
         if (!$this->security->isGranted('page:pages:viewother')) {
-            $this->listFilters = array(
+            $this->listFilters = [
                 'column' => 'p.createdBy',
                 'expr'   => 'eq',
-                'value'  => $this->user->getId()
-            );
+                'value'  => $this->user->getId(),
+            ];
         }
 
         //get parent level only
-        $this->listFilters[] = array(
+        $this->listFilters[] = [
             'column' => 'p.variantParent',
-            'expr'   => 'isNull'
-        );
+            'expr'   => 'isNull',
+        ];
 
-        $this->listFilters[] = array(
+        $this->listFilters[] = [
             'column' => 'p.translationParent',
-            'expr'   => 'isNull'
-        );
+            'expr'   => 'isNull',
+        ];
 
         return parent::getEntitiesAction();
     }
@@ -64,7 +64,7 @@ public function getEntitiesAction ()
     /**
      * {@inheritdoc}
      */
-    protected function preSerializeEntity (&$entity, $action = 'view')
+    protected function preSerializeEntity(&$entity, $action = 'view')
     {
         $entity->url = $this->model->generateUrl($entity);
     }
diff --git a/app/bundles/PageBundle/Controller/PageController.php b/app/bundles/PageBundle/Controller/PageController.php
index d13cf02cdc0..a5474f32ed3 100644
--- a/app/bundles/PageBundle/Controller/PageController.php
+++ b/app/bundles/PageBundle/Controller/PageController.php
@@ -1,27 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Controller;
 
-use Mautic\PageBundle\Entity\Page;
 use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
 use Mautic\CoreBundle\Helper\InputHelper;
+use Mautic\PageBundle\Entity\Page;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Mautic\CoreBundle\Templating\TemplateNameParser;
 
 /**
- * Class PageController
+ * Class PageController.
  */
 class PageController extends FormController
 {
-
     /**
      * @param int $page
      *
@@ -32,7 +31,7 @@ public function indexAction($page = 1)
         $model = $this->getModel('page.page');
 
         //set some permissions
-        $permissions = $this->get('mautic.security')->isGranted(array(
+        $permissions = $this->get('mautic.security')->isGranted([
             'page:pages:viewown',
             'page:pages:viewother',
             'page:pages:create',
@@ -41,8 +40,8 @@ public function indexAction($page = 1)
             'page:pages:deleteown',
             'page:pages:deleteother',
             'page:pages:publishown',
-            'page:pages:publishother'
-        ), "RETURN_ARRAY");
+            'page:pages:publishother',
+        ], 'RETURN_ARRAY');
 
         if (!$permissions['page:pages:viewown'] && !$permissions['page:pages:viewother']) {
             return $this->accessDenied();
@@ -54,7 +53,7 @@ public function indexAction($page = 1)
 
         //set limits
         $limit = $this->get('session')->get('mautic.page.limit', $this->coreParametersHelper->getParameter('default_pagelimit'));
-        $start = ($page === 1) ? 0 : (($page-1) * $limit);
+        $start = ($page === 1) ? 0 : (($page - 1) * $limit);
         if ($start < 0) {
             $start = 0;
         }
@@ -62,50 +61,50 @@ public function indexAction($page = 1)
         $search = $this->request->get('search', $this->get('session')->get('mautic.page.filter', ''));
         $this->get('session')->set('mautic.page.filter', $search);
 
-        $filter = array('string' => $search, 'force' => array());
+        $filter = ['string' => $search, 'force' => []];
 
         if (!$permissions['page:pages:viewother']) {
-            $filter['force'][] = array('column' => 'p.createdBy', 'expr' => 'eq', 'value' => $this->user->getId());
+            $filter['force'][] = ['column' => 'p.createdBy', 'expr' => 'eq', 'value' => $this->user->getId()];
         }
 
         $translator = $this->get('translator');
 
         //do not list variants in the main list
-        $filter['force'][] = array('column' => 'p.variantParent', 'expr' => 'isNull');
+        $filter['force'][] = ['column' => 'p.variantParent', 'expr' => 'isNull'];
 
         $langSearchCommand = $translator->trans('mautic.core.searchcommand.lang');
         if (strpos($search, "{$langSearchCommand}:") === false) {
-            $filter['force'][] = array('column' => 'p.translationParent', 'expr' => 'isNull');
+            $filter['force'][] = ['column' => 'p.translationParent', 'expr' => 'isNull'];
         }
 
         $orderBy    = $this->get('session')->get('mautic.page.orderby', 'p.title');
         $orderByDir = $this->get('session')->get('mautic.page.orderbydir', 'DESC');
 
         $pages = $model->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
-            ));
+                'orderByDir' => $orderByDir,
+            ]);
 
         $count = count($pages);
         if ($count && $count < ($start + 1)) {
             //the number of entities are now less then the current page so redirect to the last page
             $lastPage = ($count === 1) ? 1 : (ceil($count / $limit)) ?: 1;
             $this->get('session')->set('mautic.page.page', $lastPage);
-            $returnUrl   = $this->generateUrl('mautic_page_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl('mautic_page_index', ['page' => $lastPage]);
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $returnUrl,
-                'viewParameters'  => array('page' => $lastPage),
+                'viewParameters'  => ['page' => $lastPage],
                 'contentTemplate' => 'MauticPageBundle:Page:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_page_index',
-                    'mauticContent' => 'page'
-                )
-            ));
+                    'mauticContent' => 'page',
+                ],
+            ]);
         }
 
         //set what page currently on so that we can return here after form submission/cancellation
@@ -116,8 +115,8 @@ public function indexAction($page = 1)
         //retrieve a list of categories
         $categories = $this->getModel('page.page')->getLookupResults('category', '', 0);
 
-        return $this->delegateView(array(
-            'viewParameters'  =>  array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'searchValue' => $search,
                 'items'       => $pages,
                 'categories'  => $categories,
@@ -126,19 +125,19 @@ public function indexAction($page = 1)
                 'permissions' => $permissions,
                 'model'       => $model,
                 'tmpl'        => $tmpl,
-                'security'    => $this->get('mautic.security')
-            ),
+                'security'    => $this->get('mautic.security'),
+            ],
             'contentTemplate' => 'MauticPageBundle:Page:list.html.php',
-            'passthroughVars' => array(
-                'activeLink'     => '#mautic_page_index',
-                'mauticContent'  => 'page',
-                'route'          => $this->generateUrl('mautic_page_index', array('page' => $page))
-            )
-        ));
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_page_index',
+                'mauticContent' => 'page',
+                'route'         => $this->generateUrl('mautic_page_index', ['page' => $page]),
+            ],
+        ]);
     }
 
     /**
-     * Loads a specific form into the detailed panel
+     * Loads a specific form into the detailed panel.
      *
      * @param int $objectId
      *
@@ -155,24 +154,24 @@ public function viewAction($objectId)
 
         if ($activePage === null) {
             //set the return URL
-            $returnUrl = $this->generateUrl('mautic_page_index', array('page' => $page));
+            $returnUrl = $this->generateUrl('mautic_page_index', ['page' => $page]);
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $returnUrl,
-                'viewParameters'  => array('page' => $page),
+                'viewParameters'  => ['page' => $page],
                 'contentTemplate' => 'MauticPageBundle:Page:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_page_index',
-                    'mauticContent' => 'page'
-                ),
-                'flashes'         => array(
-                    array(
+                    'mauticContent' => 'page',
+                ],
+                'flashes' => [
+                    [
                         'type'    => 'error',
                         'msg'     => 'mautic.page.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    )
-                )
-            ));
+                        'msgVars' => ['%id%' => $objectId],
+                    ],
+                ],
+            ]);
         } elseif (!$this->get('mautic.security')->hasEntityAccess(
             'page:pages:viewown', 'page:pages:viewother', $activePage->getCreatedBy()
         )
@@ -182,9 +181,9 @@ public function viewAction($objectId)
 
         //get A/B test information
         list($parent, $children) = $activePage->getVariants();
-        $properties   = array();
-        $variantError = false;
-        $weight       = 0;
+        $properties              = [];
+        $variantError            = false;
+        $weight                  = 0;
         if (count($children)) {
             foreach ($children as $c) {
                 $variantSettings = $c->getVariantSettings();
@@ -210,24 +209,24 @@ public function viewAction($objectId)
                 $properties[$c->getId()] = $variantSettings;
             }
 
-            $properties[$parent->getId()]['weight'] = 100 - $weight;
+            $properties[$parent->getId()]['weight']         = 100 - $weight;
             $properties[$parent->getId()]['winnerCriteria'] = '';
         }
 
-        $abTestResults = array();
-        $criteria = $model->getBuilderComponents($activePage, 'abTestWinnerCriteria');
+        $abTestResults = [];
+        $criteria      = $model->getBuilderComponents($activePage, 'abTestWinnerCriteria');
         if (!empty($lastCriteria) && empty($variantError)) {
             //there is a criteria to compare the pages against so let's shoot the page over to the criteria function to do its thing
             if (isset($criteria['criteria'][$lastCriteria])) {
                 $testSettings = $criteria['criteria'][$lastCriteria];
 
-                $args = array(
+                $args = [
                     'factory'    => $this->factory,
                     'page'       => $activePage,
                     'parent'     => $parent,
                     'children'   => $children,
-                    'properties' => $properties
-                );
+                    'properties' => $properties,
+                ];
 
                 //execute the callback
                 if (is_callable($testSettings['callback'])) {
@@ -240,7 +239,7 @@ public function viewAction($objectId)
                         $reflection = new \ReflectionMethod(null, $testSettings['callback']);
                     }
 
-                    $pass = array();
+                    $pass = [];
                     foreach ($reflection->getParameters() as $param) {
                         if (isset($args[$param->getName()])) {
                             $pass[] = $args[$param->getName()];
@@ -254,9 +253,9 @@ public function viewAction($objectId)
         }
 
         // Init the date range filter form
-        $dateRangeValues = $this->request->get('daterange', array());
-        $action          = $this->generateUrl('mautic_page_action', array('objectAction' => 'view', 'objectId' => $objectId));
-        $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, array('action' => $action));
+        $dateRangeValues = $this->request->get('daterange', []);
+        $action          = $this->generateUrl('mautic_page_action', ['objectAction' => 'view', 'objectId' => $objectId]);
+        $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
 
         // Audit Log
         $logs = $this->getModel('core.auditLog')->getLogForObject('page', $activePage->getId(), $activePage->getDateAdded());
@@ -266,30 +265,30 @@ public function viewAction($objectId)
             new \DateTime($dateRangeForm->get('date_from')->getData()),
             new \DateTime($dateRangeForm->get('date_to')->getData()),
             null,
-            array('page_id' => $activePage->getId(), 'flag' => 'total_and_unique')
+            ['page_id' => $activePage->getId(), 'flag' => 'total_and_unique']
         );
 
         //get related translations
         list($translationParent, $translationChildren) = $activePage->getTranslations();
 
-        return $this->delegateView(array(
-            'returnUrl'       => $this->generateUrl('mautic_page_action', array(
+        return $this->delegateView([
+            'returnUrl' => $this->generateUrl('mautic_page_action', [
                     'objectAction' => 'view',
-                    'objectId'     => $activePage->getId())
+                    'objectId'     => $activePage->getId(), ]
             ),
-            'viewParameters'  => array(
-                'activePage'    => $activePage,
-                'variants'      => array(
+            'viewParameters' => [
+                'activePage' => $activePage,
+                'variants'   => [
                     'parent'     => $parent,
                     'children'   => $children,
                     'properties' => $properties,
-                    'criteria'   => $criteria['criteria']
-                ),
-                'translations'  => array(
+                    'criteria'   => $criteria['criteria'],
+                ],
+                'translations' => [
                     'parent'   => $translationParent,
-                    'children' => $translationChildren
-                ),
-                'permissions'   => $security->isGranted(array(
+                    'children' => $translationChildren,
+                ],
+                'permissions' => $security->isGranted([
                     'page:pages:viewown',
                     'page:pages:viewother',
                     'page:pages:create',
@@ -298,45 +297,45 @@ public function viewAction($objectId)
                     'page:pages:deleteown',
                     'page:pages:deleteother',
                     'page:pages:publishown',
-                    'page:pages:publishother'
-                ), "RETURN_ARRAY"),
-                'stats'         => array(
+                    'page:pages:publishother',
+                ], 'RETURN_ARRAY'),
+                'stats' => [
                     'pageviews' => $pageviews,
-                    'hits'      => array(
+                    'hits'      => [
                         'total'  => $activePage->getHits(),
-                        'unique' => $activePage->getUniqueHits()
-                    )
-                ),
+                        'unique' => $activePage->getUniqueHits(),
+                    ],
+                ],
                 'abTestResults' => $abTestResults,
                 'security'      => $security,
                 'pageUrl'       => $model->generateUrl($activePage, true),
-                'previewUrl'    => $this->generateUrl('mautic_page_preview', array('id' => $objectId), true),
+                'previewUrl'    => $this->generateUrl('mautic_page_preview', ['id' => $objectId], true),
                 'logs'          => $logs,
-                'dateRangeForm' => $dateRangeForm->createView()
-            ),
+                'dateRangeForm' => $dateRangeForm->createView(),
+            ],
             'contentTemplate' => 'MauticPageBundle:Page:details.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_page_index',
-                'mauticContent' => 'page'
-            )
-        ));
+                'mauticContent' => 'page',
+            ],
+        ]);
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
-     * @param  \Mautic\PageBundle\Entity\Page|null $entity
+     * @param \Mautic\PageBundle\Entity\Page|null $entity
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function newAction($entity = null)
     {
         /** @var \Mautic\PageBundle\Model\PageModel $model */
-        $model   = $this->getModel('page.page');
+        $model = $this->getModel('page.page');
 
         if (!($entity instanceof Page)) {
             /** @var \Mautic\PageBundle\Entity\Page $entity */
-            $entity  = $model->getEntity();
+            $entity = $model->getEntity();
         }
 
         $method  = $this->request->getMethod();
@@ -347,7 +346,7 @@ public function newAction($entity = null)
 
         //set the page we came from
         $page   = $session->get('mautic.page.page', 1);
-        $action = $this->generateUrl('mautic_page_action', array('objectAction' => 'new'));
+        $action = $this->generateUrl('mautic_page_action', ['objectAction' => 'new']);
 
         //create the form
         $form = $model->createForm($entity, $this->get('form.factory'), $action);
@@ -367,53 +366,53 @@ public function newAction($entity = null)
                     //form is valid so process the data
                     $model->saveEntity($entity);
 
-                    $this->addFlash('mautic.core.notice.created', array(
+                    $this->addFlash('mautic.core.notice.created', [
                         '%name%'      => $entity->getTitle(),
                         '%menu_link%' => 'mautic_page_index',
-                        '%url%'       => $this->generateUrl('mautic_page_action', array(
+                        '%url%'       => $this->generateUrl('mautic_page_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ))
-                    ));
+                            'objectId'     => $entity->getId(),
+                        ]),
+                    ]);
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
-                        $viewParameters = array(
+                        $viewParameters = [
                             'objectAction' => 'view',
-                            'objectId'     => $entity->getId()
-                        );
-                        $returnUrl      = $this->generateUrl('mautic_page_action', $viewParameters);
-                        $template       = 'MauticPageBundle:Page:view';
+                            'objectId'     => $entity->getId(),
+                        ];
+                        $returnUrl = $this->generateUrl('mautic_page_action', $viewParameters);
+                        $template  = 'MauticPageBundle:Page:view';
                     } else {
                         //return edit view so that all the session stuff is loaded
                         return $this->editAction($entity->getId(), true);
                     }
                 }
             } else {
-                $viewParameters  = array('page' => $page);
-                $returnUrl = $this->generateUrl('mautic_page_index', $viewParameters);
-                $template  = 'MauticPageBundle:Page:index';
+                $viewParameters = ['page' => $page];
+                $returnUrl      = $this->generateUrl('mautic_page_index', $viewParameters);
+                $template       = 'MauticPageBundle:Page:index';
                 //clear any modified content
                 $session->remove('mautic.pagebuilder.'.$entity->getSessionId().'.content');
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-                return $this->postActionRedirect(array(
+                return $this->postActionRedirect([
                     'returnUrl'       => $returnUrl,
                     'viewParameters'  => $viewParameters,
                     'contentTemplate' => $template,
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => 'mautic_page_index',
-                        'mauticContent' => 'page'
-                    )
-                ));
+                        'mauticContent' => 'page',
+                    ],
+                ]);
             }
         }
 
-        $slotTypes = $model->getBuilderComponents($entity, 'slotTypes');
+        $slotTypes   = $model->getBuilderComponents($entity, 'slotTypes');
         $sectionForm = $this->get('form.factory')->create('builder_section');
 
-        return $this->delegateView(array(
-            'viewParameters'  =>  array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'form'          => $this->setFormTheme($form, 'MauticPageBundle:Page:form.html.php', 'MauticPageBundle:FormTheme\Page'),
                 'isVariant'     => $entity->isVariant(true),
                 'tokens'        => $model->getBuilderComponents($entity, 'tokenSections'),
@@ -421,21 +420,21 @@ public function newAction($entity = null)
                 'themes'        => $this->factory->getInstalledThemes('page', true),
                 'slots'         => $this->buildSlotForms($slotTypes),
                 'builderAssets' => trim(preg_replace('/\s+/', ' ', $this->getAssetsForBuilder())), // strip new lines
-                'sectionForm'   => $sectionForm->createView()
-            ),
+                'sectionForm'   => $sectionForm->createView(),
+            ],
             'contentTemplate' => 'MauticPageBundle:Page:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_page_index',
                 'mauticContent' => 'page',
-                'route'         => $this->generateUrl('mautic_page_action', array(
-                    'objectAction' => 'new'
-                ))
-            )
-        ));
+                'route'         => $this->generateUrl('mautic_page_action', [
+                    'objectAction' => 'new',
+                ]),
+            ],
+        ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -451,32 +450,32 @@ public function editAction($objectId, $ignorePost = false)
         $page    = $this->get('session')->get('mautic.page.page', 1);
 
         //set the return URL
-        $returnUrl = $this->generateUrl('mautic_page_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_page_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPageBundle:Page:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => 'mautic_page_index',
-                'mauticContent' => 'page'
-            )
-        );
+                'mauticContent' => 'page',
+            ],
+        ];
 
         //not found
         if ($entity === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
-                            'type' => 'error',
-                            'msg'  => 'mautic.page.error.notfound',
-                            'msgVars' => array('%id%' => $objectId)
-                        )
-                    )
-                ))
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
+                            'type'    => 'error',
+                            'msg'     => 'mautic.page.error.notfound',
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ])
             );
-        }  elseif (!$this->get('mautic.security')->hasEntityAccess(
+        } elseif (!$this->get('mautic.security')->hasEntityAccess(
             'page:pages:viewown', 'page:pages:viewother', $entity->getCreatedBy()
         )) {
             return $this->accessDenied();
@@ -486,7 +485,7 @@ public function editAction($objectId, $ignorePost = false)
         }
 
         //Create the form
-        $action = $this->generateUrl('mautic_page_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action = $this->generateUrl('mautic_page_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $form   = $model->createForm($entity, $this->get('form.factory'), $action);
 
         ///Check for a submitted form and process it
@@ -503,14 +502,14 @@ public function editAction($objectId, $ignorePost = false)
                     //form is valid so process the data
                     $model->saveEntity($entity, $form->get('buttons')->get('save')->isClicked());
 
-                    $this->addFlash('mautic.core.notice.updated', array(
+                    $this->addFlash('mautic.core.notice.updated', [
                         '%name%'      => $entity->getTitle(),
                         '%menu_link%' => 'mautic_page_index',
-                        '%url%'       => $this->generateUrl('mautic_page_action', array(
+                        '%url%'       => $this->generateUrl('mautic_page_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ))
-                    ));
+                            'objectId'     => $entity->getId(),
+                        ]),
+                    ]);
                 }
             } else {
                 //clear any modified content
@@ -520,16 +519,17 @@ public function editAction($objectId, $ignorePost = false)
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-                $viewParameters = array(
+                $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId'     => $entity->getId()
-                );
+                    'objectId'     => $entity->getId(),
+                ];
+
                 return $this->postActionRedirect(
-                    array_merge($postActionVars, array(
+                    array_merge($postActionVars, [
                         'returnUrl'       => $this->generateUrl('mautic_page_action', $viewParameters),
                         'viewParameters'  => $viewParameters,
-                        'contentTemplate' => 'MauticPageBundle:Page:view'
-                    ))
+                        'contentTemplate' => 'MauticPageBundle:Page:view',
+                    ])
                 );
             }
         } else {
@@ -541,11 +541,12 @@ public function editAction($objectId, $ignorePost = false)
 
             //set the lookup values
             $parent = $entity->getTranslationParent();
-            if ($parent && isset($form['translationParent_lookup']))
+            if ($parent && isset($form['translationParent_lookup'])) {
                 $form->get('translationParent_lookup')->setData($parent->getTitle());
+            }
 
             // Parse tokens into view data
-            $tokens = $model->getBuilderComponents($entity, array('tokens', 'visualTokens', 'tokenSections'));
+            $tokens = $model->getBuilderComponents($entity, ['tokens', 'visualTokens', 'tokenSections']);
 
             // Set to view content
             $template = $entity->getTemplate();
@@ -555,11 +556,11 @@ public function editAction($objectId, $ignorePost = false)
             }
         }
 
-        $slotTypes = $model->getBuilderComponents($entity, 'slotTypes');
+        $slotTypes   = $model->getBuilderComponents($entity, 'slotTypes');
         $sectionForm = $this->get('form.factory')->create('builder_section');
 
-        return $this->delegateView(array(
-            'viewParameters'  =>  array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'form'          => $this->setFormTheme($form, 'MauticPageBundle:Page:form.html.php', 'MauticPageBundle:FormTheme\Page'),
                 'isVariant'     => $entity->isVariant(true),
                 'tokens'        => (!empty($tokens)) ? $tokens['tokenSections'] : $model->getBuilderComponents($entity, 'tokenSections'),
@@ -567,22 +568,22 @@ public function editAction($objectId, $ignorePost = false)
                 'themes'        => $this->factory->getInstalledThemes('page', true),
                 'slots'         => $this->buildSlotForms($slotTypes),
                 'builderAssets' => trim(preg_replace('/\s+/', ' ', $this->getAssetsForBuilder())), // strip new lines
-                'sectionForm'   => $sectionForm->createView()
-            ),
+                'sectionForm'   => $sectionForm->createView(),
+            ],
             'contentTemplate' => 'MauticPageBundle:Page:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_page_index',
                 'mauticContent' => 'page',
-                'route'         => $this->generateUrl('mautic_page_action', array(
+                'route'         => $this->generateUrl('mautic_page_action', [
                     'objectAction' => 'edit',
-                    'objectId'     => $entity->getId()
-                ))
-            )
-        ));
+                    'objectId'     => $entity->getId(),
+                ]),
+            ],
+        ]);
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -591,8 +592,8 @@ public function editAction($objectId, $ignorePost = false)
     public function cloneAction($objectId)
     {
         /** @var \Mautic\PageBundle\Model\PageModel $model */
-        $model   = $this->getModel('page.page');
-        $entity  = $model->getEntity($objectId);
+        $model  = $this->getModel('page.page');
+        $entity = $model->getEntity($objectId);
 
         if ($entity != null) {
             if (!$this->get('mautic.security')->isGranted('page:pages:create') ||
@@ -616,7 +617,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param $objectId
      *
@@ -625,18 +626,18 @@ public function cloneAction($objectId)
     public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.page.page', 1);
-        $returnUrl = $this->generateUrl('mautic_page_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_page_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPageBundle:Page:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => 'mautic_page_index',
-                'mauticContent' => 'page'
-            )
-        );
+                'mauticContent' => 'page',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             /** @var \Mautic\PageBundle\Model\PageModel $model */
@@ -644,11 +645,11 @@ public function deleteAction($objectId)
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.page.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'page:pages:deleteown',
                 'page:pages:deleteother',
@@ -661,60 +662,60 @@ public function deleteAction($objectId)
 
             $model->deleteEntity($entity);
 
-            $flashes[] = array(
-                'type' => 'notice',
-                'msg'  => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+            $flashes[] = [
+                'type'    => 'notice',
+                'msg'     => 'mautic.core.notice.deleted',
+                'msgVars' => [
                     '%name%' => $entity->getTitle(),
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function batchDeleteAction()
     {
         $page      = $this->get('session')->get('mautic.page.page', 1);
-        $returnUrl = $this->generateUrl('mautic_page_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_page_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPageBundle:Page:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => 'mautic_page_index',
-                'mauticContent' => 'page'
-            )
-        );
+                'mauticContent' => 'page',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             /** @var \Mautic\PageBundle\Model\PageModel $model */
             $model     = $this->getModel('page');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.page.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
                     'page:pages:deleteown', 'page:pages:deleteother', $entity->getCreatedBy()
                 )) {
@@ -730,25 +731,25 @@ public function batchDeleteAction()
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
-                    'type' => 'notice',
-                    'msg'  => 'mautic.page.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.page.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Activate the builder
+     * Activate the builder.
      *
      * @param int $objectId
      *
@@ -768,7 +769,7 @@ public function builderAction($objectId)
             $entity = $model->getEntity();
             $entity->setSessionId($objectId);
         } else {
-            $isNew    = false;
+            $isNew  = false;
             $entity = $model->getEntity($objectId);
             if ($entity == null || !$this->get('mautic.security')->hasEntityAccess(
                 'page:pages:viewown', 'page:pages:viewother', $entity->getCreatedBy()
@@ -781,7 +782,7 @@ public function builderAction($objectId)
         $slots    = $this->factory->getTheme($template)->getSlots('page');
 
         //merge any existing changes
-        $newContent = $this->get('session')->get('mautic.pagebuilder.'.$objectId.'.content', array());
+        $newContent = $this->get('session')->get('mautic.pagebuilder.'.$objectId.'.content', []);
         $content    = $entity->getContent();
 
         if (is_array($newContent)) {
@@ -792,17 +793,17 @@ public function builderAction($objectId)
 
         $this->processSlots($slots, $entity);
 
-        $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':' . $template . ':page.html.php');
-
-        return $this->render($logicalName, array(
-            'isNew'         => $isNew,
-            'slots'         => $slots,
-            'formFactory'   => $this->get('form.factory'),
-            'content'       => $content,
-            'page'          => $entity,
-            'template'      => $template,
-            'basePath'      => $this->request->getBasePath()
-        ));
+        $logicalName = $this->factory->getHelper('theme')->checkForTwigTemplate(':'.$template.':page.html.php');
+
+        return $this->render($logicalName, [
+            'isNew'       => $isNew,
+            'slots'       => $slots,
+            'formFactory' => $this->get('form.factory'),
+            'content'     => $content,
+            'page'        => $entity,
+            'template'    => $template,
+            'basePath'    => $this->request->getBasePath(),
+        ]);
     }
 
     /**
@@ -813,8 +814,8 @@ public function builderAction($objectId)
     public function abtestAction($objectId)
     {
         /** @var \Mautic\PageBundle\Model\PageModel $model */
-        $model   = $this->getModel('page.page');
-        $entity  = $model->getEntity($objectId);
+        $model  = $this->getModel('page.page');
+        $entity = $model->getEntity($objectId);
 
         if ($entity != null) {
             $parent = $entity->getVariantParent();
@@ -843,7 +844,7 @@ public function abtestAction($objectId)
     }
 
     /**
-     * Make the variant the main
+     * Make the variant the main.
      *
      * @param $objectId
      *
@@ -852,19 +853,19 @@ public function abtestAction($objectId)
     public function winnerAction($objectId)
     {
         //todo - add confirmation to button click
-        $page        = $this->get('session')->get('mautic.page.page', 1);
-        $returnUrl   = $this->generateUrl('mautic_page_index', array('page' => $page));
-        $flashes     = array();
+        $page      = $this->get('session')->get('mautic.page.page', 1);
+        $returnUrl = $this->generateUrl('mautic_page_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPageBundle:Page:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => 'mautic_page_index',
-                'mauticContent' => 'page'
-            )
-        );
+                'mauticContent' => 'page',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             /** @var \Mautic\PageBundle\Model\PageModel $model */
@@ -872,11 +873,11 @@ public function winnerAction($objectId)
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.page.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
                 'page:pages:editown',
                 'page:pages:editother',
@@ -889,28 +890,27 @@ public function winnerAction($objectId)
 
             $model->convertVariant($entity);
 
-            $flashes[] = array(
-                'type' => 'notice',
-                'msg'  => 'mautic.page.notice.activated',
-                'msgVars' => array(
+            $flashes[] = [
+                'type'    => 'notice',
+                'msg'     => 'mautic.page.notice.activated',
+                'msgVars' => [
                     '%name%' => $entity->getTitle(),
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
 
-            $postActionVars['viewParameters'] = array(
+            $postActionVars['viewParameters'] = [
                 'objectAction' => 'view',
-                'objectId' => $objectId
-            );
+                'objectId'     => $objectId,
+            ];
             $postActionVars['returnUrl']       = $this->generateUrl('mautic_page_action', $postActionVars['viewParameters']);
             $postActionVars['contentTemplate'] = 'MauticPageBundle:Page:view';
-
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
@@ -918,7 +918,7 @@ public function winnerAction($objectId)
      * PreProcess page slots for public view.
      *
      * @param array $slots
-     * @param Page $entity
+     * @param Page  $entity
      */
     private function processSlots($slots, $entity)
     {
@@ -928,7 +928,7 @@ private function processSlots($slots, $entity)
         $slotsHelper = $this->factory->getHelper('template.slots');
         /** @var \Mautic\CoreBundle\Templating\Helper\TranslatorHelper $translatorHelper */
         $translatorHelper = $this->factory->getHelper('template.translator');
-        $formFactory = $this->get('form.factory');
+        $formFactory      = $this->get('form.factory');
 
         $slotsHelper->inBuilder(true);
 
@@ -938,8 +938,8 @@ private function processSlots($slots, $entity)
 
             // backward compatibility - if slotConfig array does not exist
             if (is_numeric($slot)) {
-                $slot = $slotConfig;
-                $slotConfig = array();
+                $slot       = $slotConfig;
+                $slotConfig = [];
             }
 
             // define default config if does not exist
@@ -951,67 +951,66 @@ private function processSlots($slots, $entity)
                 $slotConfig['placeholder'] = 'mautic.page.builder.addcontent';
             }
 
-            $value = isset($content[$slot]) ? $content[$slot] : "";
+            $value = isset($content[$slot]) ? $content[$slot] : '';
 
             if ($slotConfig['type'] == 'slideshow') {
                 if (isset($content[$slot])) {
                     $options = json_decode($content[$slot], true);
                 } else {
-                    $options = array(
-                        'width' => '100%',
-                        'height' => '250px',
+                    $options = [
+                        'width'            => '100%',
+                        'height'           => '250px',
                         'background_color' => 'transparent',
                         'arrow_navigation' => false,
-                        'dot_navigation' => true,
-                        'interval' => 5000,
-                        'pause' => 'hover',
-                        'wrap' => true,
-                        'keyboard' => true
-                    );
+                        'dot_navigation'   => true,
+                        'interval'         => 5000,
+                        'pause'            => 'hover',
+                        'wrap'             => true,
+                        'keyboard'         => true,
+                    ];
                 }
 
                 // Create sample slides for first time or if all slides were deleted
                 if (empty($options['slides'])) {
-                    $options['slides'] =  array (
-                        array (
-                            'order' => 0,
+                    $options['slides'] = [
+                        [
+                            'order'            => 0,
                             'background-image' => $assetsHelper->getUrl('media/images/mautic_logo_lb200.png'),
-                            'captionheader' => 'Caption 1'
-                        ),
-                        array (
-                            'order' => 1,
+                            'captionheader'    => 'Caption 1',
+                        ],
+                        [
+                            'order'            => 1,
                             'background-image' => $assetsHelper->getUrl('media/images/mautic_logo_db200.png'),
-                            'captionheader' => 'Caption 2'
-                        )
-                    );
+                            'captionheader'    => 'Caption 2',
+                        ],
+                    ];
                 }
 
                 // Order slides
-                usort($options['slides'], function($a, $b)
-                {
+                usort($options['slides'], function ($a, $b) {
                     return strcmp($a['order'], $b['order']);
                 });
 
-                $options['slot'] = $slot;
+                $options['slot']   = $slot;
                 $options['public'] = false;
 
                 // create config form
                 $options['configForm'] = $formFactory->createNamedBuilder(
                     null,
                     'slideshow_config',
-                    array(),
-                    array('data' => $options)
+                    [],
+                    ['data' => $options]
                 )->getForm()->createView();
 
                 // create slide config forms
                 foreach ($options['slides'] as $key => &$slide) {
-                    $slide['key'] = $key;
+                    $slide['key']  = $key;
                     $slide['slot'] = $slot;
                     $slide['form'] = $formFactory->createNamedBuilder(
                         null,
                         'slideshow_slide_config',
-                        array(),
-                        array('data' => $slide)
+                        [],
+                        ['data' => $slide]
                     )->getForm()->createView();
                 }
 
@@ -1027,8 +1026,7 @@ private function processSlots($slots, $entity)
         }
 
         //add builder toolbar
-        $slotsHelper->start('builder');
-        ?>
+        $slotsHelper->start('builder'); ?>
         <input type="hidden" id="builder_entity_id" value="<?php echo $entity->getSessionId(); ?>" />
         <?php
         $slotsHelper->stop();
@@ -1043,10 +1041,10 @@ private function getAssetsForBuilder()
 
         $existingAssets = $assetsHelper->getAssets();
 
-        $assetsHelper->addScriptDeclaration("var mauticBasePath    = '" . $this->request->getBasePath() . "';");
-        $assetsHelper->addScriptDeclaration("var mauticAjaxUrl     = '" . $routerHelper->generate("mautic_core_ajax") . "';");
-        $assetsHelper->addScriptDeclaration("var mauticBaseUrl     = '" . $routerHelper->generate("mautic_base_index") . "';");
-        $assetsHelper->addScriptDeclaration("var mauticAssetPrefix = '" . $assetsHelper->getAssetPrefix(true) . "';");
+        $assetsHelper->addScriptDeclaration("var mauticBasePath    = '".$this->request->getBasePath()."';");
+        $assetsHelper->addScriptDeclaration("var mauticAjaxUrl     = '".$routerHelper->generate('mautic_core_ajax')."';");
+        $assetsHelper->addScriptDeclaration("var mauticBaseUrl     = '".$routerHelper->generate('mautic_base_index')."';");
+        $assetsHelper->addScriptDeclaration("var mauticAssetPrefix = '".$assetsHelper->getAssetPrefix(true)."';");
         $assetsHelper->addCustomDeclaration($assetsHelper->getSystemScripts(true, true));
         $assetsHelper->addStylesheet('app/bundles/CoreBundle/Assets/css/libraries/builder.css');
 
@@ -1063,7 +1061,7 @@ private function buildSlotForms($slotTypes)
     {
         foreach ($slotTypes as &$slotType) {
             if (isset($slotType['form'])) {
-                $slotForm = $this->get('form.factory')->create($slotType['form']);
+                $slotForm         = $this->get('form.factory')->create($slotType['form']);
                 $slotType['form'] = $slotForm->createView();
             }
         }
diff --git a/app/bundles/PageBundle/Controller/PublicController.php b/app/bundles/PageBundle/Controller/PublicController.php
index 4f04fd55c5f..0d314b62333 100644
--- a/app/bundles/PageBundle/Controller/PublicController.php
+++ b/app/bundles/PageBundle/Controller/PublicController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,26 +14,26 @@
 use Mautic\CoreBundle\Helper\TrackingPixelHelper;
 use Mautic\LeadBundle\Helper\TokenHelper;
 use Mautic\LeadBundle\Model\LeadModel;
+use Mautic\PageBundle\Entity\Page;
 use Mautic\PageBundle\Event\PageDisplayEvent;
 use Mautic\PageBundle\Model\VideoModel;
 use Mautic\PageBundle\PageEvents;
-use Mautic\PageBundle\Entity\Page;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
- * Class PublicController
+ * Class PublicController.
  */
 class PublicController extends CommonFormController
 {
-
     /**
      * @param         $slug
      * @param Request $request
      *
      * @return Response
+     *
      * @throws \Exception
      * @throws \Mautic\CoreBundle\Exception\FileNotFoundException
      */
@@ -107,7 +108,6 @@ public function indexAction($slug, Request $request)
             if (!$userAccess) {
                 // Check to see if a variant should be shown versus the parent but ignore if a user is previewing
                 if (count($childrenVariants)) {
-
                     $variants      = [];
                     $variantWeight = 0;
                     $totalHits     = $entity->getVariantHits();
@@ -225,7 +225,6 @@ function ($a, $b) {
                 /**
                  * @deprecated  BC support to be removed in 3.0
                  */
-
                 $template = $entity->getTemplate();
                 //all the checks pass so display the content
                 $slots   = $this->factory->getTheme($template)->getSlots('page');
@@ -283,6 +282,7 @@ function ($a, $b) {
      * @param $id
      *
      * @return Response|\Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+     *
      * @throws \Exception
      * @throws \Mautic\CoreBundle\Exception\FileNotFoundException
      */
@@ -321,7 +321,7 @@ public function previewAction($id)
                     'content'  => $content,
                     'page'     => $entity,
                     'template' => $template,
-                    'public'   => true // @deprecated Remove in 2.0
+                    'public'   => true, // @deprecated Remove in 2.0
                 ]
             );
 
@@ -359,6 +359,7 @@ public function trackingImageAction()
      * @param $redirectId
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
     public function redirectAction($redirectId)
@@ -471,11 +472,11 @@ function ($a, $b) {
                 $renderingEngine = $this->container->get('templating')->getEngine('MauticPageBundle:Page:Slots/slideshow.html.php');
                 $slotsHelper->set($slot, $renderingEngine->render('MauticPageBundle:Page:Slots/slideshow.html.php', $options));
             } elseif (isset($slotConfig['type']) && $slotConfig['type'] == 'textarea') {
-                $value = isset($content[$slot]) ? nl2br($content[$slot]) : "";
+                $value = isset($content[$slot]) ? nl2br($content[$slot]) : '';
                 $slotsHelper->set($slot, $value);
             } else {
                 // Fallback for other types like html, text, textarea and all unknown
-                $value = isset($content[$slot]) ? $content[$slot] : "";
+                $value = isset($content[$slot]) ? $content[$slot] : '';
                 $slotsHelper->set($slot, $value);
             }
         }
@@ -486,7 +487,7 @@ function ($a, $b) {
     }
 
     /**
-     * Track video views
+     * Track video views.
      */
     public function hitVideoAction()
     {
@@ -508,7 +509,7 @@ public function hitVideoAction()
     }
 
     /**
-     * Get the ID of the currently tracked Contact
+     * Get the ID of the currently tracked Contact.
      *
      * @return JsonResponse
      */
diff --git a/app/bundles/PageBundle/Controller/SubscribedEvents/BuilderTokenController.php b/app/bundles/PageBundle/Controller/SubscribedEvents/BuilderTokenController.php
index 49b13d1719b..410991dd31e 100644
--- a/app/bundles/PageBundle/Controller/SubscribedEvents/BuilderTokenController.php
+++ b/app/bundles/PageBundle/Controller/SubscribedEvents/BuilderTokenController.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Controller\SubscribedEvents;
 
 /**
- * Class BuilderTokenController
+ * Class BuilderTokenController.
  */
 class BuilderTokenController extends \Mautic\CoreBundle\Controller\SubscribedEvents\BuilderTokenController
 {
-
     /**
      * @return string
      */
@@ -22,4 +22,4 @@ protected function getModelName()
     {
         return 'page';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/DataFixtures/ORM/LoadPageCategoryData.php b/app/bundles/PageBundle/DataFixtures/ORM/LoadPageCategoryData.php
index 3285de8ff68..52c6ee49f4a 100644
--- a/app/bundles/PageBundle/DataFixtures/ORM/LoadPageCategoryData.php
+++ b/app/bundles/PageBundle/DataFixtures/ORM/LoadPageCategoryData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,11 +18,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadPageCategoryData
+ * Class LoadPageCategoryData.
  */
 class LoadPageCategoryData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -45,7 +45,7 @@ public function load(ObjectManager $manager)
         $repo    = $factory->getModel('category.category')->getRepository();
         $today   = new \DateTime();
 
-        $cat    = new Category();
+        $cat = new Category();
         $cat->setBundle('page');
         $events = 'Events';
 
diff --git a/app/bundles/PageBundle/DataFixtures/ORM/LoadPageData.php b/app/bundles/PageBundle/DataFixtures/ORM/LoadPageData.php
index 8c9f7ceb74c..ed32110b391 100644
--- a/app/bundles/PageBundle/DataFixtures/ORM/LoadPageData.php
+++ b/app/bundles/PageBundle/DataFixtures/ORM/LoadPageData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,13 +19,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadPageData
- *
- * @package Mautic\PageBundle\DataFixtures\ORM
+ * Class LoadPageData.
  */
 class LoadPageData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -45,18 +43,18 @@ public function load(ObjectManager $manager)
     {
         $factory = $this->container->get('mautic.factory');
         $repo    = $factory->getModel('page.page')->getRepository();
-        $pages = CsvHelper::csv_to_array(__DIR__ . '/fakepagedata.csv');
+        $pages   = CsvHelper::csv_to_array(__DIR__.'/fakepagedata.csv');
         foreach ($pages as $count => $rows) {
             $page = new Page();
-            $key = $count+1;
+            $key  = $count + 1;
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set" . ucfirst($col);
-                    if (in_array($col, array('translationParent', 'variantParent'))) {
-                        $page->$setter($this->getReference('page-' . $val));
-                    } elseif (in_array($col, array('dateAdded', 'variantStartDate'))) {
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
+                    if (in_array($col, ['translationParent', 'variantParent'])) {
+                        $page->$setter($this->getReference('page-'.$val));
+                    } elseif (in_array($col, ['dateAdded', 'variantStartDate'])) {
                         $page->$setter(new \DateTime($val));
-                    } elseif (in_array($col, array('content','variantSettings'))) {
+                    } elseif (in_array($col, ['content', 'variantSettings'])) {
                         $val = unserialize(stripslashes($val));
                         $page->$setter($val);
                     } else {
diff --git a/app/bundles/PageBundle/DataFixtures/ORM/LoadPageHitData.php b/app/bundles/PageBundle/DataFixtures/ORM/LoadPageHitData.php
index 9c06376b283..82763891f64 100644
--- a/app/bundles/PageBundle/DataFixtures/ORM/LoadPageHitData.php
+++ b/app/bundles/PageBundle/DataFixtures/ORM/LoadPageHitData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,11 +19,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadPageHitData
+ * Class LoadPageHitData.
  */
 class LoadPageHitData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -44,15 +44,15 @@ public function load(ObjectManager $manager)
         $factory = $this->container->get('mautic.factory');
         $repo    = $factory->getModel('page.page')->getRepository();
 
-        $hits = CsvHelper::csv_to_array(__DIR__ . '/fakepagehitdata.csv');;
+        $hits = CsvHelper::csv_to_array(__DIR__.'/fakepagehitdata.csv');
         foreach ($hits as $count => $rows) {
             $hit = new Hit();
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set" . ucfirst($col);
-                    if (in_array($col, array('page', 'ipAddress'))) {
-                        $hit->$setter($this->getReference($col.'-' . $val));
-                    } elseif (in_array($col, array('dateHit', 'dateLeft'))) {
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
+                    if (in_array($col, ['page', 'ipAddress'])) {
+                        $hit->$setter($this->getReference($col.'-'.$val));
+                    } elseif (in_array($col, ['dateHit', 'dateLeft'])) {
                         $hit->$setter(new \DateTime($val));
                     } elseif ($col == 'browserLanguages') {
                         $val = unserialize(stripslashes($val));
diff --git a/app/bundles/PageBundle/Entity/Hit.php b/app/bundles/PageBundle/Entity/Hit.php
index ee5b69dcab6..cd4ae594a66 100644
--- a/app/bundles/PageBundle/Entity/Hit.php
+++ b/app/bundles/PageBundle/Entity/Hit.php
@@ -1,28 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\EmailBundle\Entity\Email;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 
 /**
- * Class Hit
- *
- * @package Mautic\PageBundle\Entity
+ * Class Hit.
  */
 class Hit
 {
-
     /**
      * @var int
      */
@@ -89,7 +87,7 @@ class Hit
     private $organization;
 
     /**
-     * @var integer
+     * @var int
      */
     private $code;
 
@@ -126,7 +124,7 @@ class Hit
     /**
      * @var string
      */
-    private $browserLanguages = array();
+    private $browserLanguages = [];
 
     /**
      * @var string
@@ -139,14 +137,14 @@ class Hit
     private $source;
 
     /**
-     * @var integer
+     * @var int
      */
     private $sourceId;
 
     /**
      * @var array
      */
-    private $query = array();
+    private $query = [];
     /**
      * @var \Mautic\LeadBundle\Entity\LeadDevice
      */
@@ -155,7 +153,7 @@ class Hit
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -270,7 +268,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -278,7 +276,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('hit')
             ->addProperties(
-                array(
+                [
                     'dateHit',
                     'dateLeft',
                     'page',
@@ -302,16 +300,16 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'trackingId',
                     'source',
                     'sourceId',
-                    'query'
-                )
+                    'query',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -319,7 +317,7 @@ public function getId()
     }
 
     /**
-     * Set dateHit
+     * Set dateHit.
      *
      * @param \DateTime $dateHit
      *
@@ -333,7 +331,7 @@ public function setDateHit($dateHit)
     }
 
     /**
-     * Get dateHit
+     * Get dateHit.
      *
      * @return \DateTime
      */
@@ -363,7 +361,7 @@ public function setDateLeft($dateLeft)
     }
 
     /**
-     * Set country
+     * Set country.
      *
      * @param string $country
      *
@@ -377,7 +375,7 @@ public function setCountry($country)
     }
 
     /**
-     * Get country
+     * Get country.
      *
      * @return string
      */
@@ -387,7 +385,7 @@ public function getCountry()
     }
 
     /**
-     * Set region
+     * Set region.
      *
      * @param string $region
      *
@@ -401,7 +399,7 @@ public function setRegion($region)
     }
 
     /**
-     * Get region
+     * Get region.
      *
      * @return string
      */
@@ -411,7 +409,7 @@ public function getRegion()
     }
 
     /**
-     * Set city
+     * Set city.
      *
      * @param string $city
      *
@@ -425,7 +423,7 @@ public function setCity($city)
     }
 
     /**
-     * Get city
+     * Get city.
      *
      * @return string
      */
@@ -435,7 +433,7 @@ public function getCity()
     }
 
     /**
-     * Set isp
+     * Set isp.
      *
      * @param string $isp
      *
@@ -449,7 +447,7 @@ public function setIsp($isp)
     }
 
     /**
-     * Get isp
+     * Get isp.
      *
      * @return string
      */
@@ -459,7 +457,7 @@ public function getIsp()
     }
 
     /**
-     * Set organization
+     * Set organization.
      *
      * @param string $organization
      *
@@ -473,7 +471,7 @@ public function setOrganization($organization)
     }
 
     /**
-     * Get organization
+     * Get organization.
      *
      * @return string
      */
@@ -483,9 +481,9 @@ public function getOrganization()
     }
 
     /**
-     * Set code
+     * Set code.
      *
-     * @param integer $code
+     * @param int $code
      *
      * @return Hit
      */
@@ -497,9 +495,9 @@ public function setCode($code)
     }
 
     /**
-     * Get code
+     * Get code.
      *
-     * @return integer
+     * @return int
      */
     public function getCode()
     {
@@ -507,7 +505,7 @@ public function getCode()
     }
 
     /**
-     * Set referer
+     * Set referer.
      *
      * @param string $referer
      *
@@ -521,7 +519,7 @@ public function setReferer($referer)
     }
 
     /**
-     * Get referer
+     * Get referer.
      *
      * @return string
      */
@@ -531,7 +529,7 @@ public function getReferer()
     }
 
     /**
-     * Set url
+     * Set url.
      *
      * @param string $url
      *
@@ -545,7 +543,7 @@ public function setUrl($url)
     }
 
     /**
-     * Get url
+     * Get url.
      *
      * @return string
      */
@@ -555,7 +553,7 @@ public function getUrl()
     }
 
     /**
-     * Set url title
+     * Set url title.
      *
      * @param string $urlTitle
      *
@@ -569,7 +567,7 @@ public function setUrlTitle($urlTitle)
     }
 
     /**
-     * Get url title
+     * Get url title.
      *
      * @return string
      */
@@ -579,7 +577,7 @@ public function getUrlTitle()
     }
 
     /**
-     * Set userAgent
+     * Set userAgent.
      *
      * @param string $userAgent
      *
@@ -593,7 +591,7 @@ public function setUserAgent($userAgent)
     }
 
     /**
-     * Get userAgent
+     * Get userAgent.
      *
      * @return string
      */
@@ -603,7 +601,7 @@ public function getUserAgent()
     }
 
     /**
-     * Set remoteHost
+     * Set remoteHost.
      *
      * @param string $remoteHost
      *
@@ -617,7 +615,7 @@ public function setRemoteHost($remoteHost)
     }
 
     /**
-     * Get remoteHost
+     * Get remoteHost.
      *
      * @return string
      */
@@ -627,7 +625,7 @@ public function getRemoteHost()
     }
 
     /**
-     * Set page
+     * Set page.
      *
      * @param Page $page
      *
@@ -641,7 +639,7 @@ public function setPage(Page $page = null)
     }
 
     /**
-     * Get page
+     * Get page.
      *
      * @return Page
      */
@@ -651,7 +649,7 @@ public function getPage()
     }
 
     /**
-     * Set ipAddress
+     * Set ipAddress.
      *
      * @param \Mautic\CoreBundle\Entity\IpAddress $ipAddress
      *
@@ -665,7 +663,7 @@ public function setIpAddress(\Mautic\CoreBundle\Entity\IpAddress $ipAddress)
     }
 
     /**
-     * Get ipAddress
+     * Get ipAddress.
      *
      * @return \Mautic\CoreBundle\Entity\IpAddress
      */
@@ -675,9 +673,9 @@ public function getIpAddress()
     }
 
     /**
-     * Set trackingId
+     * Set trackingId.
      *
-     * @param integer $trackingId
+     * @param int $trackingId
      *
      * @return Page
      */
@@ -689,9 +687,9 @@ public function setTrackingId($trackingId)
     }
 
     /**
-     * Get trackingId
+     * Get trackingId.
      *
-     * @return integer
+     * @return int
      */
     public function getTrackingId()
     {
@@ -699,7 +697,7 @@ public function getTrackingId()
     }
 
     /**
-     * Set pageLanguage
+     * Set pageLanguage.
      *
      * @param string $pageLanguage
      *
@@ -713,7 +711,7 @@ public function setPageLanguage($pageLanguage)
     }
 
     /**
-     * Get pageLanguage
+     * Get pageLanguage.
      *
      * @return string
      */
@@ -723,7 +721,7 @@ public function getPageLanguage()
     }
 
     /**
-     * Set browserLanguages
+     * Set browserLanguages.
      *
      * @param string $browserLanguages
      *
@@ -737,7 +735,7 @@ public function setBrowserLanguages($browserLanguages)
     }
 
     /**
-     * Get browserLanguages
+     * Get browserLanguages.
      *
      * @return string
      */
@@ -787,7 +785,7 @@ public function setSource($source)
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getSourceId()
     {
@@ -795,7 +793,7 @@ public function getSourceId()
     }
 
     /**
-     * @param integer $sourceId
+     * @param int $sourceId
      *
      * @return Hit
      */
@@ -829,7 +827,7 @@ public function setRedirect(Redirect $redirect)
     /**
      * @return mixed
      */
-    public function getEmail ()
+    public function getEmail()
     {
         return $this->email;
     }
@@ -837,7 +835,7 @@ public function getEmail ()
     /**
      * @param mixed $email
      */
-    public function setEmail (Email $email)
+    public function setEmail(Email $email)
     {
         $this->email = $email;
     }
diff --git a/app/bundles/PageBundle/Entity/HitRepository.php b/app/bundles/PageBundle/Entity/HitRepository.php
index 287d9cd3871..4024723e2d8 100644
--- a/app/bundles/PageBundle/Entity/HitRepository.php
+++ b/app/bundles/PageBundle/Entity/HitRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,14 +16,14 @@
 use Mautic\LeadBundle\Entity\TimelineTrait;
 
 /**
- * Class HitRepository
+ * Class HitRepository.
  */
 class HitRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Determine if the page hit is a unique
+     * Determine if the page hit is a unique.
      *
      * @param Page|Redirect $page
      * @param string        $trackingId
@@ -62,27 +63,27 @@ public function isUniquePageHit($page, $trackingId)
     }
 
     /**
-     * Get a lead's page hits
+     * Get a lead's page hits.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
      */
-    public function getLeadHits($leadId, array $options = array())
+    public function getLeadHits($leadId, array $options = [])
     {
         $query = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
         $query->select('h.page_id, h.user_agent as userAgent, h.date_hit as dateHit, h.date_left as dateLeft, h.referer, h.source, h.source_id as sourceId, h.url, h.url_title as urlTitle, h.query, ds.client_info as clientInfo, ds.device, ds.device_os_name as deviceOsName, ds.device_brand as deviceBrand, ds.device_model as deviceModel')
             ->from(MAUTIC_TABLE_PREFIX.'page_hits', 'h')
             ->leftJoin('h', MAUTIC_TABLE_PREFIX.'pages', 'p', 'h.page_id = p.id')
-            ->where('h.lead_id = ' . (int) $leadId);
+            ->where('h.lead_id = '.(int) $leadId);
 
         if (isset($options['search']) && $options['search']) {
-            $query->andWhere($query->expr()->like('p.title', $query->expr()->literal('%' . $options['search'] . '%')));
+            $query->andWhere($query->expr()->like('p.title', $query->expr()->literal('%'.$options['search'].'%')));
         }
 
-        $query->leftjoin('h',MAUTIC_TABLE_PREFIX.'lead_devices', 'ds', 'ds.id = h.device_id');
+        $query->leftjoin('h', MAUTIC_TABLE_PREFIX.'lead_devices', 'ds', 'ds.id = h.device_id');
 
         if (isset($options['url']) && $options['url']) {
             $query->andWhere($query->expr()->eq('h.url', $query->expr()->literal($options['url'])));
@@ -101,7 +102,7 @@ public function getLeadHits($leadId, array $options = array())
     public function getHitCountForSource($source, $sourceId = null, $fromDate = null, $code = 200)
     {
         $query = $this->createQueryBuilder('h');
-        $query->select("count(distinct(h.trackingId)) as \"hitCount\"");
+        $query->select('count(distinct(h.trackingId)) as "hitCount"');
         $query->andWhere($query->expr()->eq('h.source', $query->expr()->literal($source)));
 
         if ($sourceId != null) {
@@ -124,7 +125,7 @@ public function getHitCountForSource($source, $sourceId = null, $fromDate = null
     }
 
     /**
-     * Get an array of hits via an email clickthrough
+     * Get an array of hits via an email clickthrough.
      *
      * @param           $emailIds
      * @param \DateTime $fromDate
@@ -137,7 +138,7 @@ public function getEmailClickthroughHitCount($emailIds, \DateTime $fromDate = nu
         $q = $this->_em->getConnection()->createQueryBuilder();
 
         if (!is_array($emailIds)) {
-            $emailIds = array($emailIds);
+            $emailIds = [$emailIds];
         }
 
         $q->select('count(distinct(h.tracking_id)) as hit_count, h.email_id')
@@ -153,9 +154,9 @@ public function getEmailClickthroughHitCount($emailIds, \DateTime $fromDate = nu
 
         $q->andWhere($q->expr()->eq('h.code', (int) $code));
 
-        $results = $q->execute()->fetchAll();;
+        $results = $q->execute()->fetchAll();
 
-        $hits = array();
+        $hits = [];
         foreach ($results as $r) {
             $hits[$r['email_id']] = $r['hit_count'];
         }
@@ -164,7 +165,7 @@ public function getEmailClickthroughHitCount($emailIds, \DateTime $fromDate = nu
     }
 
     /**
-     * Count returning IP addresses
+     * Count returning IP addresses.
      *
      * @return int
      */
@@ -180,7 +181,7 @@ public function countReturningIp()
     }
 
     /**
-     * Count email clickthrough
+     * Count email clickthrough.
      *
      * @return int
      */
@@ -194,7 +195,7 @@ public function countEmailClickthrough()
     }
 
     /**
-     * Count how many visitors hit some page in last X $seconds
+     * Count how many visitors hit some page in last X $seconds.
      *
      * @param int  $seconds
      * @param bool $notLeft
@@ -203,7 +204,7 @@ public function countEmailClickthrough()
      */
     public function countVisitors($seconds = 60, $notLeft = false)
     {
-        $now = new \DateTime();
+        $now         = new \DateTime();
         $viewingTime = new \DateInterval('PT'.$seconds.'S');
         $now->sub($viewingTime);
         $query = $this->createQueryBuilder('h');
@@ -229,7 +230,7 @@ public function countVisitors($seconds = 60, $notLeft = false)
     }
 
     /**
-     * Get the latest hit
+     * Get the latest hit.
      *
      * @param array $options
      *
@@ -247,7 +248,7 @@ public function getLatestHit($options)
             );
         }
         if (isset($options['urls']) && $options['urls']) {
-            $inUrls = (!is_array($options['urls'])) ? array($options['urls']) : $options['urls'];
+            $inUrls = (!is_array($options['urls'])) ? [$options['urls']] : $options['urls'];
             foreach ($inUrls as $k => $u) {
                 $sq->andWhere($sq->expr()->like('h.url', ':url_'.$k))
                     ->setParameter('url_'.$k, $u);
@@ -256,7 +257,7 @@ public function getLatestHit($options)
         if (isset($options['second_to_last'])) {
             $sq->andWhere($sq->expr()->neq('h.id', $options['second_to_last']));
         } else {
-            $sq->orderBy('h.date_hit','DESC limit 1');
+            $sq->orderBy('h.date_hit', 'DESC limit 1');
         }
         $result = $sq->execute()->fetch();
 
@@ -264,7 +265,7 @@ public function getLatestHit($options)
     }
 
     /**
-     * Get the number of bounces
+     * Get the number of bounces.
      *
      * @param array|string $pageIds
      * @param \DateTime    $fromDate
@@ -290,13 +291,13 @@ public function getBounces($pageIds, \DateTime $fromDate = null, $isVariantCheck
                 'totalHits' => (int) $p['totalHits'],
                 'bounces'   => 0,
                 'rate'      => 0,
-                'title'     => $p['title']
+                'title'     => $p['title'],
             ];
         }
 
         // Get the total number of bounces - simplified query for if date_left is null, it'll more than likely be a bounce or
         // else we would have recorded the date_left on a subsequent page hit
-        $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
+        $q    = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $expr = $q->expr()->andX(
             $q->expr()->$inOrEq('h.page_id', $pageIds),
             $q->expr()->eq('h.code', 200),
@@ -330,39 +331,39 @@ public function getBounces($pageIds, \DateTime $fromDate = null, $isVariantCheck
     }
 
     /**
-     * Get array of dwell time labels with ranges
+     * Get array of dwell time labels with ranges.
      *
      * @return array
      */
     public function getDwellTimeLabels()
     {
-        return array(
-            array(
+        return [
+            [
                 'label' => '< 1m',
-                'from' => 0,
-                'till' => 60
-            ),
-            array(
+                'from'  => 0,
+                'till'  => 60,
+            ],
+            [
                 'label' => '1 - 5m',
-                'from' => 60,
-                'till' => 300
-            ),
-            array(
+                'from'  => 60,
+                'till'  => 300,
+            ],
+            [
                 'label' => '5 - 10m',
                 'value' => 0,
-                'from' => 300,
-                'till' => 600
-            ),
-            array(
+                'from'  => 300,
+                'till'  => 600,
+            ],
+            [
                 'label' => '> 10m',
-                'from' => 600,
-                'till' => 999999
-            )
-        );
+                'from'  => 600,
+                'till'  => 999999,
+            ],
+        ];
     }
 
     /**
-     * Get the dwell times for bunch of pages
+     * Get the dwell times for bunch of pages.
      *
      * @param array $pageIds
      * @param array $options
@@ -372,8 +373,8 @@ public function getDwellTimeLabels()
     public function getDwellTimesForPages(array $pageIds, array $options)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->from(MAUTIC_TABLE_PREFIX . 'page_hits', 'ph')
-            ->leftJoin('ph', MAUTIC_TABLE_PREFIX . 'pages', 'p', 'ph.page_id = p.id')
+        $q->from(MAUTIC_TABLE_PREFIX.'page_hits', 'ph')
+            ->leftJoin('ph', MAUTIC_TABLE_PREFIX.'pages', 'p', 'ph.page_id = p.id')
             ->select('ph.page_id, ph.date_hit, ph.date_left, p.title')
             ->orderBy('ph.date_hit', 'ASC')
             ->andWhere(
@@ -393,22 +394,22 @@ public function getDwellTimesForPages(array $pageIds, array $options)
         $results = $q->execute()->fetchAll();
 
         //loop to structure
-        $times = array();
-        $titles = array();
+        $times  = [];
+        $titles = [];
 
         foreach ($results as $r) {
             $dateHit  = $r['date_hit'] ? new \DateTime($r['date_hit']) : 0;
             $dateLeft = $r['date_left'] ? new \DateTime($r['date_left']) : 0;
 
-            $titles[$r['page_id']] = $r['title'];
+            $titles[$r['page_id']]  = $r['title'];
             $times[$r['page_id']][] = $dateLeft ? ($dateLeft->getTimestamp() - $dateHit->getTimestamp()) : 0;
         }
 
         //now loop to create stats
-        $stats = array();
+        $stats = [];
 
         foreach ($times as $pid => $time) {
-            $stats[$pid] = $this->countStats($time);
+            $stats[$pid]          = $this->countStats($time);
             $stats[$pid]['title'] = $titles[$pid];
         }
 
@@ -416,7 +417,7 @@ public function getDwellTimesForPages(array $pageIds, array $options)
     }
 
     /**
-     * Get the dwell times for bunch of URLs
+     * Get the dwell times for bunch of URLs.
      *
      * @param string $url
      * @param array  $options
@@ -426,8 +427,8 @@ public function getDwellTimesForPages(array $pageIds, array $options)
     public function getDwellTimesForUrl($url, array $options)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->from(MAUTIC_TABLE_PREFIX . 'page_hits', 'ph')
-            ->leftJoin('ph', MAUTIC_TABLE_PREFIX . 'pages', 'p', 'ph.page_id = p.id')
+        $q->from(MAUTIC_TABLE_PREFIX.'page_hits', 'ph')
+            ->leftJoin('ph', MAUTIC_TABLE_PREFIX.'pages', 'p', 'ph.page_id = p.id')
             ->select('ph.id, ph.page_id, ph.date_hit, ph.date_left, ph.tracking_id, ph.page_language, p.title')
             ->orderBy('ph.date_hit', 'ASC')
             ->andWhere($q->expr()->like('ph.url', ':url'))
@@ -441,7 +442,7 @@ public function getDwellTimesForUrl($url, array $options)
 
         $results = $q->execute()->fetchAll();
 
-        $times = array();
+        $times = [];
 
         foreach ($results as $r) {
             $dateHit  = $r['date_hit'] ? new \DateTime($r['date_hit']) : 0;
@@ -453,7 +454,7 @@ public function getDwellTimesForUrl($url, array $options)
     }
 
     /**
-     * Count stats from hit times
+     * Count stats from hit times.
      *
      * @param array $times
      *
@@ -461,39 +462,40 @@ public function getDwellTimesForUrl($url, array $options)
      */
     public function countStats($times)
     {
-        return array(
+        return [
             'sum'     => array_sum($times),
             'min'     => count($times) ? min($times) : 0,
             'max'     => count($times) ? max($times) : 0,
             'average' => count($times) ? round(array_sum($times) / count($times)) : 0,
-            'count'   => count($times)
-        );
+            'count'   => count($times),
+        ];
     }
 
     /**
-     * Update a hit with the the time the user left
+     * Update a hit with the the time the user left.
      *
      * @param int $lastHitId
      */
     public function updateHitDateLeft($lastHitId)
     {
         $dt = new DateTimeHelper();
-        $q = $this->_em->getConnection()->createQueryBuilder();
+        $q  = $this->_em->getConnection()->createQueryBuilder();
         $q->update(MAUTIC_TABLE_PREFIX.'page_hits')
             ->set('date_left', ':datetime')
-            ->where('id = ' . (int) $lastHitId)
+            ->where('id = '.(int) $lastHitId)
             ->setParameter('datetime', $dt->toUtcString());
         $q->execute();
     }
 
     /**
-     * Get list of referers ordered by it's count
+     * Get list of referers ordered by it's count.
      *
      * @param \Doctrine\DBAL\Query\QueryBuilder $query
      * @param int                               $limit
      * @param int                               $offset
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -509,7 +511,7 @@ public function getReferers($query, $limit = 10, $offset = 0)
     }
 
     /**
-     * Get list of referers ordered by it's count
+     * Get list of referers ordered by it's count.
      *
      * @param \Doctrine\DBAL\Query\QueryBuilder $query
      * @param int                               $limit
@@ -518,17 +520,18 @@ public function getReferers($query, $limit = 10, $offset = 0)
      * @param string                            $as
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getMostVisited($query, $limit = 10, $offset = 0, $column = 'p.hits', $as = '')
     {
         if ($as) {
-            $as = ' as "' . $as . '"';
+            $as = ' as "'.$as.'"';
         }
 
-        $query->select('p.title, p.id, ' . $column . $as)
-            ->groupBy('p.id, p.title, ' . $column)
+        $query->select('p.title, p.id, '.$column.$as)
+            ->groupBy('p.id, p.title, '.$column)
             ->orderBy($column, 'DESC')
             ->setMaxResults($limit)
             ->setFirstResult($offset);
@@ -544,21 +547,21 @@ public function getMostVisited($query, $limit = 10, $offset = 0, $column = 'p.hi
     public function updateLeadByTrackingId($leadId, $newTrackingId, $oldTrackingId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'page_hits')
+        $q->update(MAUTIC_TABLE_PREFIX.'page_hits')
             ->set('lead_id', (int) $leadId)
             ->set('tracking_id', ':newTrackingId')
             ->where(
                 $q->expr()->eq('tracking_id', ':oldTrackingId')
             )
-            ->setParameters(array(
+            ->setParameters([
                 'newTrackingId' => $newTrackingId,
-                'oldTrackingId' => $oldTrackingId
-            ))
+                'oldTrackingId' => $oldTrackingId,
+            ])
             ->execute();
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -566,9 +569,9 @@ public function updateLeadByTrackingId($leadId, $newTrackingId, $oldTrackingId)
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'page_hits')
+        $q->update(MAUTIC_TABLE_PREFIX.'page_hits')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 }
diff --git a/app/bundles/PageBundle/Entity/Page.php b/app/bundles/PageBundle/Entity/Page.php
index 286b9052781..1e862c19f74 100644
--- a/app/bundles/PageBundle/Entity/Page.php
+++ b/app/bundles/PageBundle/Entity/Page.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,16 +19,14 @@
 use Mautic\CoreBundle\Entity\TranslationEntityTrait;
 use Mautic\CoreBundle\Entity\VariantEntityInterface;
 use Mautic\CoreBundle\Entity\VariantEntityTrait;
+use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class Page
- *
- * @package Mautic\PageBundle\Entity
+ * Class Page.
  */
 class Page extends FormEntity implements TranslationEntityInterface, VariantEntityInterface
 {
@@ -62,7 +61,7 @@ class Page extends FormEntity implements TranslationEntityInterface, VariantEnti
     /**
      * @var array
      */
-    private $content = array();
+    private $content = [];
 
     /**
      * @var \DateTime
@@ -115,7 +114,7 @@ class Page extends FormEntity implements TranslationEntityInterface, VariantEnti
     private $category;
 
     /**
-     * Used to identify the page for the builder
+     * Used to identify the page for the builder.
      *
      * @var
      */
@@ -131,9 +130,9 @@ public function __clone()
     }
 
     /**
-     * Constructor
+     * Constructor.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->translationChildren = new \Doctrine\Common\Collections\ArrayCollection();
         $this->variantChildren     = new \Doctrine\Common\Collections\ArrayCollection();
@@ -142,13 +141,13 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('pages')
             ->setCustomRepositoryClass('Mautic\PageBundle\Entity\PageRepository')
-            ->addIndex(array('alias'), 'page_alias_search');
+            ->addIndex(['alias'], 'page_alias_search');
 
         $builder->addId();
 
@@ -207,24 +206,24 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('title', new NotBlank(array(
-            'message' => 'mautic.core.title.required'
-        )));
+        $metadata->addPropertyConstraint('title', new NotBlank([
+            'message' => 'mautic.core.title.required',
+        ]));
 
-        $metadata->addConstraint(new Callback(array(
+        $metadata->addConstraint(new Callback([
             'callback' => function (Page $page, ExecutionContextInterface $context) {
                 $type = $page->getRedirectType();
                 if (!is_null($type)) {
                     $validator = $context->getValidator();
-                    $violations = $validator->validate($page->getRedirectUrl(), array(
+                    $violations = $validator->validate($page->getRedirectUrl(), [
                         new Assert\Url(
-                            array(
-                                'message' => 'mautic.core.value.required'
-                            )
-                        )
-                    ));
+                            [
+                                'message' => 'mautic.core.value.required',
+                            ]
+                        ),
+                    ]);
 
                     if (count($violations) > 0) {
                         $string = (string) $violations;
@@ -251,12 +250,12 @@ public static function loadValidatorMetadata (ClassMetadata $metadata)
                             ->addViolation();
                     }
                 }
-            }
-        )));
+            },
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -264,15 +263,15 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('page')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'title',
                     'alias',
                     'category',
-                )
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'language',
                     'publishUp',
                     'publishDown',
@@ -288,8 +287,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'variantParent',
                     'variantChildren',
                     'translationParent',
-                    'translationChildren'
-                )
+                    'translationChildren',
+                ]
             )
             ->setMaxDepth(1, 'variantParent')
             ->setMaxDepth(1, 'variantChildren')
@@ -299,23 +298,23 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set title
+     * Set title.
      *
      * @param string $title
      *
      * @return Page
      */
-    public function setTitle ($title)
+    public function setTitle($title)
     {
         $this->isChanged('title', $title);
         $this->title = $title;
@@ -324,23 +323,23 @@ public function setTitle ($title)
     }
 
     /**
-     * Get title
+     * Get title.
      *
      * @return string
      */
-    public function getTitle ()
+    public function getTitle()
     {
         return $this->title;
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
      *
      * @return Page
      */
-    public function setAlias ($alias)
+    public function setAlias($alias)
     {
         $this->isChanged('alias', $alias);
         $this->alias = $alias;
@@ -349,23 +348,23 @@ public function setAlias ($alias)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
-    public function getAlias ()
+    public function getAlias()
     {
         return $this->alias;
     }
 
     /**
-     * Set content
+     * Set content.
      *
      * @param string $content
      *
      * @return Page
      */
-    public function setContent ($content)
+    public function setContent($content)
     {
         $this->isChanged('content', $content);
         $this->content = $content;
@@ -374,23 +373,23 @@ public function setContent ($content)
     }
 
     /**
-     * Get content
+     * Get content.
      *
      * @return string
      */
-    public function getContent ()
+    public function getContent()
     {
         return $this->content;
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
      *
      * @return Page
      */
-    public function setPublishUp ($publishUp)
+    public function setPublishUp($publishUp)
     {
         $this->isChanged('publishUp', $publishUp);
         $this->publishUp = $publishUp;
@@ -399,23 +398,23 @@ public function setPublishUp ($publishUp)
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
-    public function getPublishUp ()
+    public function getPublishUp()
     {
         return $this->publishUp;
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
      *
      * @return Page
      */
-    public function setPublishDown ($publishDown)
+    public function setPublishDown($publishDown)
     {
         $this->isChanged('publishDown', $publishDown);
         $this->publishDown = $publishDown;
@@ -424,23 +423,23 @@ public function setPublishDown ($publishDown)
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
-    public function getPublishDown ()
+    public function getPublishDown()
     {
         return $this->publishDown;
     }
 
     /**
-     * Set hits
+     * Set hits.
      *
-     * @param integer $hits
+     * @param int $hits
      *
      * @return Page
      */
-    public function setHits ($hits)
+    public function setHits($hits)
     {
         $this->hits = $hits;
 
@@ -448,25 +447,25 @@ public function setHits ($hits)
     }
 
     /**
-     * Get hits
+     * Get hits.
      *
      * @param bool $includeVariants
      *
      * @return int|mixed
      */
-    public function getHits ($includeVariants = false)
+    public function getHits($includeVariants = false)
     {
         return ($includeVariants) ? $this->getAccumulativeVariantCount('getHits') : $this->hits;
     }
 
     /**
-     * Set revision
+     * Set revision.
      *
-     * @param integer $revision
+     * @param int $revision
      *
      * @return Page
      */
-    public function setRevision ($revision)
+    public function setRevision($revision)
     {
         $this->revision = $revision;
 
@@ -474,23 +473,23 @@ public function setRevision ($revision)
     }
 
     /**
-     * Get revision
+     * Get revision.
      *
-     * @return integer
+     * @return int
      */
-    public function getRevision ()
+    public function getRevision()
     {
         return $this->revision;
     }
 
     /**
-     * Set metaDescription
+     * Set metaDescription.
      *
      * @param string $metaDescription
      *
      * @return Page
      */
-    public function setMetaDescription ($metaDescription)
+    public function setMetaDescription($metaDescription)
     {
         $this->isChanged('metaDescription', $metaDescription);
         $this->metaDescription = $metaDescription;
@@ -499,23 +498,24 @@ public function setMetaDescription ($metaDescription)
     }
 
     /**
-     * Get metaDescription
+     * Get metaDescription.
      *
      * @return string
      */
-    public function getMetaDescription ()
+    public function getMetaDescription()
     {
         return $this->metaDescription;
     }
 
     /**
-     * Set redirectType
+     * Set redirectType.
      *
      * @param string $redirectType
      *
      * @return Page
      */
-    public function setRedirectType($redirectType) {
+    public function setRedirectType($redirectType)
+    {
         $this->isChanged('redirectType', $redirectType);
         $this->redirectType = $redirectType;
 
@@ -523,22 +523,24 @@ public function setRedirectType($redirectType) {
     }
 
     /**
-     * Get redirectType
+     * Get redirectType.
      *
      * @return string
      */
-    public function getRedirectType() {
+    public function getRedirectType()
+    {
         return $this->redirectType;
     }
 
     /**
-     * Set redirectUrl
+     * Set redirectUrl.
      *
      * @param string $redirectUrl
      *
      * @return Page
      */
-    public function setRedirectUrl($redirectUrl) {
+    public function setRedirectUrl($redirectUrl)
+    {
         $this->isChanged('redirectUrl', $redirectUrl);
         $this->redirectUrl = $redirectUrl;
 
@@ -546,22 +548,23 @@ public function setRedirectUrl($redirectUrl) {
     }
 
     /**
-     * Get redirectUrl
+     * Get redirectUrl.
      *
      * @return string
      */
-    public function getRedirectUrl(){
+    public function getRedirectUrl()
+    {
         return $this->redirectUrl;
     }
 
     /**
-     * Set category
+     * Set category.
      *
      * @param \Mautic\CategoryBundle\Entity\Category $category
      *
      * @return Page
      */
-    public function setCategory (Category $category = null)
+    public function setCategory(Category $category = null)
     {
         $this->isChanged('category', $category);
         $this->category = $category;
@@ -570,23 +573,23 @@ public function setCategory (Category $category = null)
     }
 
     /**
-     * Get category
+     * Get category.
      *
      * @return \Mautic\CategoryBundle\Entity\Category
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
 
     /**
-     * Set sessionId
+     * Set sessionId.
      *
      * @param string $id
      *
      * @return Page
      */
-    public function setSessionId ($id)
+    public function setSessionId($id)
     {
         $this->sessionId = $id;
 
@@ -594,23 +597,23 @@ public function setSessionId ($id)
     }
 
     /**
-     * Get sessionId
+     * Get sessionId.
      *
      * @return string
      */
-    public function getSessionId ()
+    public function getSessionId()
     {
         return $this->sessionId;
     }
 
     /**
-     * Set template
+     * Set template.
      *
      * @param string $template
      *
      * @return Page
      */
-    public function setTemplate ($template)
+    public function setTemplate($template)
     {
         $this->isChanged('template', $template);
         $this->template = $template;
@@ -619,11 +622,11 @@ public function setTemplate ($template)
     }
 
     /**
-     * Get template
+     * Get template.
      *
      * @return string
      */
-    public function getTemplate ()
+    public function getTemplate()
     {
         return $this->template;
     }
@@ -632,16 +635,16 @@ public function getTemplate ()
      * @param $prop
      * @param $val
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
 
         if ($prop == 'translationParent' || $prop == 'variantParent' || $prop == 'category') {
             $currentId = ($current) ? $current->getId() : '';
             $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
-                $this->changes[$prop] = array($currentId, $newId);
+                $this->changes[$prop] = [$currentId, $newId];
             }
         } else {
             parent::isChanged($prop, $val);
@@ -649,13 +652,13 @@ protected function isChanged ($prop, $val)
     }
 
     /**
-     * Set uniqueHits
+     * Set uniqueHits.
      *
-     * @param integer $uniqueHits
+     * @param int $uniqueHits
      *
      * @return Page
      */
-    public function setUniqueHits ($uniqueHits)
+    public function setUniqueHits($uniqueHits)
     {
         $this->uniqueHits = $uniqueHits;
 
@@ -663,11 +666,11 @@ public function setUniqueHits ($uniqueHits)
     }
 
     /**
-     * Get uniqueHits
+     * Get uniqueHits.
      *
-     * @return integer
+     * @return int
      */
-    public function getUniqueHits ($includeVariants = false)
+    public function getUniqueHits($includeVariants = false)
     {
         return ($includeVariants) ? $this->getAccumulativeVariantCount('getUniqueHits') : $this->uniqueHits;
     }
@@ -677,7 +680,7 @@ public function getUniqueHits ($includeVariants = false)
      *
      * @return int|mixed
      */
-    public function getVariantHits ($includeVariants = false)
+    public function getVariantHits($includeVariants = false)
     {
         return ($includeVariants) ? $this->getAccumulativeVariantCount('getVariantHits') : $this->variantHits;
     }
@@ -685,7 +688,7 @@ public function getVariantHits ($includeVariants = false)
     /**
      * @param mixed $variantHits
      */
-    public function setVariantHits ($variantHits)
+    public function setVariantHits($variantHits)
     {
         $this->variantHits = $variantHits;
     }
@@ -693,7 +696,7 @@ public function setVariantHits ($variantHits)
     /**
      * @return mixed
      */
-    public function getCustomHtml ()
+    public function getCustomHtml()
     {
         return $this->customHtml;
     }
@@ -701,7 +704,7 @@ public function getCustomHtml ()
     /**
      * @param mixed $customHtml
      */
-    public function setCustomHtml ($customHtml)
+    public function setCustomHtml($customHtml)
     {
         $this->customHtml = $customHtml;
     }
diff --git a/app/bundles/PageBundle/Entity/PageRepository.php b/app/bundles/PageBundle/Entity/PageRepository.php
index 8ef0351bc08..a41476331f5 100644
--- a/app/bundles/PageBundle/Entity/PageRepository.php
+++ b/app/bundles/PageBundle/Entity/PageRepository.php
@@ -1,29 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Entity;
 
-use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class PageRepository
+ * Class PageRepository.
  */
 class PageRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('p')
@@ -66,11 +64,11 @@ public function checkPageUniqueAlias($alias, $ignoreIds = [])
      * @param int    $start
      * @param bool   $viewOther
      * @param bool   $topLevel
-     * @param array $ignoreIds
+     * @param array  $ignoreIds
      *
      * @return array
      */
-    public function getPageList($search = '', $limit = 10, $start = 0, $viewOther = false, $topLevel = false, $ignoreIds = array())
+    public function getPageList($search = '', $limit = 10, $start = 0, $viewOther = false, $topLevel = false, $ignoreIds = [])
     {
         $q = $this->createQueryBuilder('p');
         $q->select('partial p.{id, title, language, alias}');
@@ -111,8 +109,8 @@ public function getPageList($search = '', $limit = 10, $start = 0, $viewOther =
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('p.title',  ":$unique"),
@@ -121,10 +119,11 @@ protected function addCatchAllWhereClause(&$q, $filter)
         if ($filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -138,12 +137,12 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq("p.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('p.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq("p.isPublished", ":$unique");
-                $forceParameters = array($unique => false);
+                $expr            = $q->expr()->eq('p.isPublished', ":$unique");
+                $forceParameters = [$unique => false];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
                 $expr = $q->expr()->orX(
@@ -153,20 +152,20 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->eq("IDENTITY(p.createdBy)", $this->currentUser->getId());
+                $expr            = $q->expr()->eq('IDENTITY(p.createdBy)', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.category'):
-                $expr = $q->expr()->like('c.alias', ":$unique");
+                $expr           = $q->expr()->like('c.alias', ":$unique");
                 $filter->strict = true;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.lang'):
-                $langUnique       = $this->generateRandomParameterName();
-                $langValue        = $filter->string . "_%";
-                $forceParameters = array(
+                $langUnique      = $this->generateRandomParameterName();
+                $langValue       = $filter->string.'_%';
+                $forceParameters = [
                     $langUnique => $langValue,
-                    $unique     => $filter->string
-                );
+                    $unique     => $filter->string,
+                ];
                 $expr = $q->expr()->orX(
                     $q->expr()->eq('p.language', ":$unique"),
                     $q->expr()->like('p.language', ":$langUnique")
@@ -181,13 +180,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif (!$returnParameter) {
-            $parameters = array();
+            $parameters = [];
         } else {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array( $expr, $parameters );
+        return [$expr, $parameters];
     }
 
     /**
@@ -195,14 +194,14 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isunpublished',
             'mautic.core.searchcommand.isuncategorized',
             'mautic.core.searchcommand.ismine',
             'mautic.core.searchcommand.category',
-            'mautic.core.searchcommand.lang'
-        );
+            'mautic.core.searchcommand.lang',
+        ];
     }
 
     /**
@@ -210,9 +209,9 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('p.title', 'ASC')
-        );
+        return [
+            ['p.title', 'ASC'],
+        ];
     }
 
     /**
@@ -224,7 +223,7 @@ public function getTableAlias()
     }
 
     /**
-     * Resets variant_start_date and variant_hits
+     * Resets variant_start_date and variant_hits.
      *
      * @param $relatedIds
      * @param $date
@@ -236,7 +235,7 @@ public function resetVariants($relatedIds, $date)
         }
 
         $qb = $this->getEntityManager()->getConnection()->createQueryBuilder();
-        $qb->update(MAUTIC_TABLE_PREFIX . 'pages')
+        $qb->update(MAUTIC_TABLE_PREFIX.'pages')
             ->set('variant_hits', 0)
             ->set('variant_start_date', ':date')
             ->setParameter('date', $date)
@@ -247,7 +246,7 @@ public function resetVariants($relatedIds, $date)
     }
 
     /**
-     * Up the hit count
+     * Up the hit count.
      *
      * @param            $id
      * @param int        $increaseBy
@@ -259,15 +258,15 @@ public function upHitCount($id, $increaseBy = 1, $unique = false, $variant = fal
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
         $q->update(MAUTIC_TABLE_PREFIX.'pages')
-            ->set('hits', 'hits + ' . (int) $increaseBy)
-            ->where('id = ' . (int) $id);
+            ->set('hits', 'hits + '.(int) $increaseBy)
+            ->where('id = '.(int) $id);
 
         if ($unique) {
-            $q->set('unique_hits', 'unique_hits + ' . (int) $increaseBy);
+            $q->set('unique_hits', 'unique_hits + '.(int) $increaseBy);
         }
 
         if ($variant) {
-            $q->set('variant_hits', 'variant_hits + ' . (int) $increaseBy);
+            $q->set('variant_hits', 'variant_hits + '.(int) $increaseBy);
         }
 
         $q->execute();
diff --git a/app/bundles/PageBundle/Entity/Redirect.php b/app/bundles/PageBundle/Entity/Redirect.php
index 37a0a3ead4a..5053549375e 100644
--- a/app/bundles/PageBundle/Entity/Redirect.php
+++ b/app/bundles/PageBundle/Entity/Redirect.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
-use Doctrine\Common\Collections\ArrayCollection;
-use Mautic\EmailBundle\Entity\Email;
 
 /**
- * Class Redirect
- *
- * @package Mautic\PageBundle\Entity
+ * Class Redirect.
  */
 class Redirect extends FormEntity
 {
@@ -64,7 +62,7 @@ public function __construct()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -93,7 +91,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -101,23 +99,23 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('redirect')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'redirectId',
-                    'url'
-                )
+                    'url',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'hits',
-                    'uniqueHits'
-                )
+                    'uniqueHits',
+                ]
             )
             ->build();
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -160,9 +158,9 @@ public function setUrl($url)
     }
 
     /**
-     * Set hits
+     * Set hits.
      *
-     * @param integer $hits
+     * @param int $hits
      *
      * @return Page
      */
@@ -174,9 +172,9 @@ public function setHits($hits)
     }
 
     /**
-     * Get hits
+     * Get hits.
      *
-     * @return integer
+     * @return int
      */
     public function getHits()
     {
@@ -184,9 +182,9 @@ public function getHits()
     }
 
     /**
-     * Set uniqueHits
+     * Set uniqueHits.
      *
-     * @param integer $uniqueHits
+     * @param int $uniqueHits
      *
      * @return Page
      */
@@ -198,9 +196,9 @@ public function setUniqueHits($uniqueHits)
     }
 
     /**
-     * Get uniqueHits
+     * Get uniqueHits.
      *
-     * @return integer
+     * @return int
      */
     public function getUniqueHits()
     {
diff --git a/app/bundles/PageBundle/Entity/RedirectRepository.php b/app/bundles/PageBundle/Entity/RedirectRepository.php
index 028df1bbd1d..02901a9b9e3 100644
--- a/app/bundles/PageBundle/Entity/RedirectRepository.php
+++ b/app/bundles/PageBundle/Entity/RedirectRepository.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\EmailBundle\Entity\Email;
 
 /**
- * Class RedirectRepository
+ * Class RedirectRepository.
  */
 class RedirectRepository extends CommonRepository
 {
@@ -69,7 +69,7 @@ public function findByIds(array $ids, Email $email = null)
     }
 
     /**
-     * Up the hit count
+     * Up the hit count.
      *
      * @param            $id
      * @param int        $increaseBy
@@ -80,11 +80,11 @@ public function upHitCount($id, $increaseBy = 1, $unique = false)
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
         $q->update(MAUTIC_TABLE_PREFIX.'page_redirects')
-            ->set('hits', 'hits + ' . (int) $increaseBy)
-            ->where('id = ' . (int) $id);
+            ->set('hits', 'hits + '.(int) $increaseBy)
+            ->where('id = '.(int) $id);
 
         if ($unique) {
-            $q->set('unique_hits', 'unique_hits + ' . (int) $increaseBy);
+            $q->set('unique_hits', 'unique_hits + '.(int) $increaseBy);
         }
 
         $q->execute();
diff --git a/app/bundles/PageBundle/Entity/Trackable.php b/app/bundles/PageBundle/Entity/Trackable.php
index 57498f64ecf..9418ed8af37 100644
--- a/app/bundles/PageBundle/Entity/Trackable.php
+++ b/app/bundles/PageBundle/Entity/Trackable.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,7 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class Trackable
- *
- * @package Mautic\PageBundle\Entity
+ * Class Trackable.
  */
 class Trackable
 {
@@ -48,13 +47,13 @@ class Trackable
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('channel_url_trackables')
             ->setCustomRepositoryClass('Mautic\PageBundle\Entity\TrackableRepository')
-            ->addIndex(array('channel', 'channel_id'), 'channel_url_trackable_search');
+            ->addIndex(['channel', 'channel_id'], 'channel_url_trackable_search');
 
         $builder->createManyToOne('redirect', 'Mautic\PageBundle\Entity\Redirect')
             ->addJoinColumn('redirect_id', 'id', true, false, 'CASCADE')
@@ -76,7 +75,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -84,13 +83,13 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('trackable')
             ->addListProperties(
-                array(
+                [
                     'redirect',
                     'channelId',
                     'channel',
                     'hits',
-                    'uniqueHits'
-                )
+                    'uniqueHits',
+                ]
             )
             ->build();
     }
diff --git a/app/bundles/PageBundle/Entity/TrackableRepository.php b/app/bundles/PageBundle/Entity/TrackableRepository.php
index 847c841a883..a30f652d9e5 100644
--- a/app/bundles/PageBundle/Entity/TrackableRepository.php
+++ b/app/bundles/PageBundle/Entity/TrackableRepository.php
@@ -1,26 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 use Mautic\CoreBundle\Helper\Chart\ChartQuery;
-use Mautic\EmailBundle\Entity\Email;
 
 /**
- * Class TrackableRepository
+ * Class TrackableRepository.
  */
 class TrackableRepository extends CommonRepository
 {
     /**
-     * Find redirects that are trackable
+     * Find redirects that are trackable.
      *
      * @param $channel
      * @param $channelId
@@ -33,7 +32,7 @@ public function findByChannel($channel, $channelId)
 
         return $q->select('r.redirect_id, r.url, r.hits, r.unique_hits')
             ->from(MAUTIC_TABLE_PREFIX.'page_redirects', 'r')
-            ->innerJoin('r',MAUTIC_TABLE_PREFIX.'channel_url_trackables', $this->getTableAlias(),
+            ->innerJoin('r', MAUTIC_TABLE_PREFIX.'channel_url_trackables', $this->getTableAlias(),
                 $q->expr()->andX(
                     $q->expr()->eq('r.id', 't.redirect_id'),
                     $q->expr()->eq('t.channel', ':channel'),
@@ -47,7 +46,7 @@ public function findByChannel($channel, $channelId)
     }
 
     /**
-     * Get a Trackable by Redirect URL
+     * Get a Trackable by Redirect URL.
      *
      * @param $url
      * @param $channel
@@ -58,7 +57,7 @@ public function findByChannel($channel, $channelId)
     public function findByUrl($url, $channel, $channelId)
     {
         $alias = $this->getTableAlias();
-        $q = $this->createQueryBuilder($alias)
+        $q     = $this->createQueryBuilder($alias)
             ->innerJoin("$alias.redirect", 'r');
 
         $q->where(
@@ -77,7 +76,7 @@ public function findByUrl($url, $channel, $channelId)
     }
 
     /**
-     * Get an array of Trackable entities by Redirect URLs
+     * Get an array of Trackable entities by Redirect URLs.
      *
      * @param array $urls
      * @param       $channel
@@ -88,7 +87,7 @@ public function findByUrl($url, $channel, $channelId)
     public function findByUrls(array $urls, $channel, $channelId)
     {
         $alias = $this->getTableAlias();
-        $q = $this->createQueryBuilder($alias)
+        $q     = $this->createQueryBuilder($alias)
             ->innerJoin("$alias.redirect", 'r');
 
         $q->where(
@@ -105,7 +104,7 @@ public function findByUrls(array $urls, $channel, $channelId)
     }
 
     /**
-     * Up the hit count
+     * Up the hit count.
      *
      * @param      $redirectId
      * @param      $channel
@@ -118,10 +117,10 @@ public function upHitCount($redirectId, $channel, $channelId, $increaseBy = 1, $
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
 
         $q->update(MAUTIC_TABLE_PREFIX.'channel_url_trackables')
-            ->set('hits', 'hits + ' . (int) $increaseBy)
+            ->set('hits', 'hits + '.(int) $increaseBy)
             ->where(
                 $q->expr()->andX(
-                    $q->expr()->eq('redirect_id' , (int) $redirectId),
+                    $q->expr()->eq('redirect_id', (int) $redirectId),
                     $q->expr()->eq('channel', ':channel'),
                     $q->expr()->eq('channel_id', (int) $channelId)
                 )
@@ -129,14 +128,14 @@ public function upHitCount($redirectId, $channel, $channelId, $increaseBy = 1, $
             ->setParameter('channel', $channel);
 
         if ($unique) {
-            $q->set('unique_hits', 'unique_hits + ' . (int) $increaseBy);
+            $q->set('unique_hits', 'unique_hits + '.(int) $increaseBy);
         }
 
         $q->execute();
     }
 
     /**
-     * Get hit count
+     * Get hit count.
      *
      * @param                 $channel
      * @param                 $channelIds
@@ -158,7 +157,7 @@ public function getCount($channel, $channelIds, $listId, ChartQuery $chartQuery
 
         if ($channelIds) {
             if (!is_array($channelIds)) {
-                $channelIds = array((int) $channelIds);
+                $channelIds = [(int) $channelIds];
             }
             $q->where(
                 $q->expr()->in('cut.channel_id', $channelIds)
@@ -187,7 +186,7 @@ public function getCount($channel, $channelIds, $listId, ChartQuery $chartQuery
             // Return array of results
             $byList = [];
             foreach ($results as $result) {
-                $byList[$result['leadlist_id']]= $result['click_count'];
+                $byList[$result['leadlist_id']] = $result['click_count'];
             }
 
             return $byList;
diff --git a/app/bundles/PageBundle/Entity/VideoHit.php b/app/bundles/PageBundle/Entity/VideoHit.php
index a31957f91f3..e1fd8d41fd4 100644
--- a/app/bundles/PageBundle/Entity/VideoHit.php
+++ b/app/bundles/PageBundle/Entity/VideoHit.php
@@ -1,24 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Mautic\EmailBundle\Entity\Email;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 
 /**
- * Class VideoHit
- *
- * @package Mautic\PageBundle\Entity
+ * Class VideoHit.
  */
 class VideoHit
 {
@@ -93,7 +91,7 @@ class VideoHit
     private $organization;
 
     /**
-     * @var integer
+     * @var int
      */
     private $code;
 
@@ -125,7 +123,7 @@ class VideoHit
     /**
      * @var string
      */
-    private $browserLanguages = array();
+    private $browserLanguages = [];
 
     /**
      * @var string
@@ -133,19 +131,19 @@ class VideoHit
     private $channel;
 
     /**
-     * @var integer
+     * @var int
      */
     private $channelId;
 
     /**
      * @var array
      */
-    private $query = array();
+    private $query = [];
 
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -247,7 +245,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -255,7 +253,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('hit')
             ->addProperties(
-                array(
+                [
                     'dateHit',
                     'dateLeft',
                     'lead',
@@ -276,16 +274,16 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'sourceId',
                     'query',
                     'timeWatched',
-                    'guid'
-                )
+                    'guid',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -293,7 +291,7 @@ public function getId()
     }
 
     /**
-     * Set dateHit
+     * Set dateHit.
      *
      * @param \DateTime $dateHit
      *
@@ -307,7 +305,7 @@ public function setDateHit($dateHit)
     }
 
     /**
-     * Get dateHit
+     * Get dateHit.
      *
      * @return \DateTime
      */
@@ -337,7 +335,7 @@ public function setDateLeft($dateLeft)
     }
 
     /**
-     * Set country
+     * Set country.
      *
      * @param string $country
      *
@@ -351,7 +349,7 @@ public function setCountry($country)
     }
 
     /**
-     * Get country
+     * Get country.
      *
      * @return string
      */
@@ -361,7 +359,7 @@ public function getCountry()
     }
 
     /**
-     * Set region
+     * Set region.
      *
      * @param string $region
      *
@@ -375,7 +373,7 @@ public function setRegion($region)
     }
 
     /**
-     * Get region
+     * Get region.
      *
      * @return string
      */
@@ -385,7 +383,7 @@ public function getRegion()
     }
 
     /**
-     * Set city
+     * Set city.
      *
      * @param string $city
      *
@@ -399,7 +397,7 @@ public function setCity($city)
     }
 
     /**
-     * Get city
+     * Get city.
      *
      * @return string
      */
@@ -409,7 +407,7 @@ public function getCity()
     }
 
     /**
-     * Set isp
+     * Set isp.
      *
      * @param string $isp
      *
@@ -423,7 +421,7 @@ public function setIsp($isp)
     }
 
     /**
-     * Get isp
+     * Get isp.
      *
      * @return string
      */
@@ -433,7 +431,7 @@ public function getIsp()
     }
 
     /**
-     * Set organization
+     * Set organization.
      *
      * @param string $organization
      *
@@ -447,7 +445,7 @@ public function setOrganization($organization)
     }
 
     /**
-     * Get organization
+     * Get organization.
      *
      * @return string
      */
@@ -457,9 +455,9 @@ public function getOrganization()
     }
 
     /**
-     * Set code
+     * Set code.
      *
-     * @param integer $code
+     * @param int $code
      *
      * @return VideoHit
      */
@@ -471,9 +469,9 @@ public function setCode($code)
     }
 
     /**
-     * Get code
+     * Get code.
      *
-     * @return integer
+     * @return int
      */
     public function getCode()
     {
@@ -481,7 +479,7 @@ public function getCode()
     }
 
     /**
-     * Set referer
+     * Set referer.
      *
      * @param string $referer
      *
@@ -495,7 +493,7 @@ public function setReferer($referer)
     }
 
     /**
-     * Get referer
+     * Get referer.
      *
      * @return string
      */
@@ -505,7 +503,7 @@ public function getReferer()
     }
 
     /**
-     * Set url
+     * Set url.
      *
      * @param string $url
      *
@@ -519,7 +517,7 @@ public function setUrl($url)
     }
 
     /**
-     * Get url
+     * Get url.
      *
      * @return string
      */
@@ -529,7 +527,7 @@ public function getUrl()
     }
 
     /**
-     * Set userAgent
+     * Set userAgent.
      *
      * @param string $userAgent
      *
@@ -543,7 +541,7 @@ public function setUserAgent($userAgent)
     }
 
     /**
-     * Get userAgent
+     * Get userAgent.
      *
      * @return string
      */
@@ -553,7 +551,7 @@ public function getUserAgent()
     }
 
     /**
-     * Set remoteHost
+     * Set remoteHost.
      *
      * @param string $remoteHost
      *
@@ -567,7 +565,7 @@ public function setRemoteHost($remoteHost)
     }
 
     /**
-     * Get remoteHost
+     * Get remoteHost.
      *
      * @return string
      */
@@ -577,7 +575,7 @@ public function getRemoteHost()
     }
 
     /**
-     * Set ipAddress
+     * Set ipAddress.
      *
      * @param \Mautic\CoreBundle\Entity\IpAddress $ipAddress
      *
@@ -591,7 +589,7 @@ public function setIpAddress(\Mautic\CoreBundle\Entity\IpAddress $ipAddress)
     }
 
     /**
-     * Get ipAddress
+     * Get ipAddress.
      *
      * @return \Mautic\CoreBundle\Entity\IpAddress
      */
@@ -601,7 +599,7 @@ public function getIpAddress()
     }
 
     /**
-     * Set pageLanguage
+     * Set pageLanguage.
      *
      * @param string $pageLanguage
      *
@@ -615,7 +613,7 @@ public function setPageLanguage($pageLanguage)
     }
 
     /**
-     * Get pageLanguage
+     * Get pageLanguage.
      *
      * @return string
      */
@@ -625,7 +623,7 @@ public function getPageLanguage()
     }
 
     /**
-     * Set browserLanguages
+     * Set browserLanguages.
      *
      * @param string $browserLanguages
      *
@@ -639,7 +637,7 @@ public function setBrowserLanguages($browserLanguages)
     }
 
     /**
-     * Get browserLanguages
+     * Get browserLanguages.
      *
      * @return string
      */
@@ -689,7 +687,7 @@ public function setChannel($channel)
     }
 
     /**
-     * @return integer
+     * @return int
      */
     public function getChannelId()
     {
@@ -697,7 +695,7 @@ public function getChannelId()
     }
 
     /**
-     * @param integer $channelId
+     * @param int $channelId
      *
      * @return VideoHit
      */
diff --git a/app/bundles/PageBundle/Entity/VideoHitRepository.php b/app/bundles/PageBundle/Entity/VideoHitRepository.php
index caf6140688f..10b45ac8a46 100644
--- a/app/bundles/PageBundle/Entity/VideoHitRepository.php
+++ b/app/bundles/PageBundle/Entity/VideoHitRepository.php
@@ -1,30 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Entity;
 
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Entity\TimelineTrait;
 
 /**
- * Class VideoHitRepository
+ * Class VideoHitRepository.
  */
 class VideoHitRepository extends CommonRepository
 {
     use TimelineTrait;
 
     /**
-     * Get video hit info for lead timeline
+     * Get video hit info for lead timeline.
      *
      * @param       $leadId
      * @param array $options
@@ -41,7 +40,7 @@ public function getTimelineStats($leadId, array $options = [])
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere(
-                $query->expr()->like('h.url', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('h.url', $query->expr()->literal('%'.$options['search'].'%'))
             );
         }
 
@@ -58,16 +57,17 @@ public function getHitForLeadByGuid(Lead $lead, $guid)
     {
         $result = $this->findOneBy(['guid' => $guid, 'lead' => $lead]);
 
-        return $result ?: new VideoHit;
+        return $result ?: new VideoHit();
     }
 
     /**
-     * Get a lead's page hits
+     * Get a lead's page hits.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -75,7 +75,7 @@ public function getLeadHits($leadId, array $options = [])
     {
         $query = $this->createQueryBuilder('h');
         $query->select('h.userAgent, h.dateHit, h.dateLeft, h.referer, h.channel, h.channelId, h.url, h.duration, h.query, h.timeWatched')
-            ->where('h.lead = ' . (int) $leadId);
+            ->where('h.lead = '.(int) $leadId);
 
         if (isset($options['url']) && $options['url']) {
             $query->andWhere($query->expr()->eq('h.url', $query->expr()->literal($options['url'])));
@@ -85,7 +85,7 @@ public function getLeadHits($leadId, array $options = [])
     }
 
     /**
-     * Count stats from hit times
+     * Count stats from hit times.
      *
      * @param array $times
      *
@@ -93,23 +93,24 @@ public function getLeadHits($leadId, array $options = [])
      */
     public function countStats($times)
     {
-        return array(
+        return [
             'sum'     => array_sum($times),
             'min'     => count($times) ? min($times) : 0,
             'max'     => count($times) ? max($times) : 0,
             'average' => count($times) ? round(array_sum($times) / count($times)) : 0,
-            'count'   => count($times)
-        );
+            'count'   => count($times),
+        ];
     }
 
     /**
-     * Get list of referers ordered by it's count
+     * Get list of referers ordered by it's count.
      *
      * @param \Doctrine\DBAL\Query\QueryBuilder $query
      * @param int                               $limit
      * @param int                               $offset
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -125,7 +126,7 @@ public function getReferers($query, $limit = 10, $offset = 0)
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -133,9 +134,9 @@ public function getReferers($query, $limit = 10, $offset = 0)
     public function updateLead($fromLeadId, $toLeadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'video_hits')
+        $q->update(MAUTIC_TABLE_PREFIX.'video_hits')
             ->set('lead_id', (int) $toLeadId)
-            ->where('lead_id = ' . (int) $fromLeadId)
+            ->where('lead_id = '.(int) $fromLeadId)
             ->execute();
     }
 }
diff --git a/app/bundles/PageBundle/Event/PageBuilderEvent.php b/app/bundles/PageBundle/Event/PageBuilderEvent.php
index 5bd1694abe9..27de9f20376 100644
--- a/app/bundles/PageBundle/Event/PageBuilderEvent.php
+++ b/app/bundles/PageBundle/Event/PageBuilderEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Mautic\PageBundle\Entity\Page;
 
 /**
- * Class PageBuilderEvent
+ * Class PageBuilderEvent.
  */
 class PageBuilderEvent extends BuilderEvent
 {
@@ -24,4 +25,4 @@ public function getPage()
     {
         return $this->entity;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/Event/PageDisplayEvent.php b/app/bundles/PageBundle/Event/PageDisplayEvent.php
index 99489cf5ce0..0ccea304a63 100644
--- a/app/bundles/PageBundle/Event/PageDisplayEvent.php
+++ b/app/bundles/PageBundle/Event/PageDisplayEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class PageDisplayEvent
+ * Class PageDisplayEvent.
  */
 class PageDisplayEvent extends Event
 {
-
     /**
      * @var string
      */
@@ -41,7 +41,7 @@ public function __construct($content, Page $page)
     }
 
     /**
-     * Returns the Page entity
+     * Returns the Page entity.
      *
      * @return Page
      */
@@ -51,7 +51,7 @@ public function getPage()
     }
 
     /**
-     * Get page content
+     * Get page content.
      *
      * @return string
      */
@@ -61,7 +61,7 @@ public function getContent()
     }
 
     /**
-     * Set page content
+     * Set page content.
      *
      * @param string $content
      */
diff --git a/app/bundles/PageBundle/Event/PageEvent.php b/app/bundles/PageBundle/Event/PageEvent.php
index 698ab64cfdd..09921a36382 100644
--- a/app/bundles/PageBundle/Event/PageEvent.php
+++ b/app/bundles/PageBundle/Event/PageEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,22 @@
 use Mautic\PageBundle\Entity\Page;
 
 /**
- * Class PageEvent
+ * Class PageEvent.
  */
 class PageEvent extends CommonEvent
 {
-
     /**
      * @param Page $page
      * @param bool $isNew
      */
     public function __construct(Page $page, $isNew = false)
     {
-        $this->entity  = $page;
-        $this->isNew   = $isNew;
+        $this->entity = $page;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Page entity
+     * Returns the Page entity.
      *
      * @return Page
      */
@@ -39,7 +39,7 @@ public function getPage()
     }
 
     /**
-     * Sets the Page entity
+     * Sets the Page entity.
      *
      * @param Page $page
      */
diff --git a/app/bundles/PageBundle/Event/PageHitEvent.php b/app/bundles/PageBundle/Event/PageHitEvent.php
index edb81d5b3c4..65429b53214 100644
--- a/app/bundles/PageBundle/Event/PageHitEvent.php
+++ b/app/bundles/PageBundle/Event/PageHitEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Mautic\PageBundle\Entity\Page;
 
 /**
- * Class PageHitEvent
+ * Class PageHitEvent.
  */
 class PageHitEvent extends CommonEvent
 {
-
     /**
      * @var
      */
@@ -64,7 +64,7 @@ public function __construct(Hit $hit, $request, $code, $clickthrough = [], $isUn
     }
 
     /**
-     * Returns the Page entity
+     * Returns the Page entity.
      *
      * @return Page
      */
@@ -74,7 +74,7 @@ public function getPage()
     }
 
     /**
-     * Get page request
+     * Get page request.
      *
      * @return string
      */
@@ -84,7 +84,7 @@ public function getRequest()
     }
 
     /**
-     * Get HTML code
+     * Get HTML code.
      *
      * @return mixed
      */
@@ -110,7 +110,7 @@ public function getClickthroughData()
     }
 
     /**
-     * Returns if this page hit is unique
+     * Returns if this page hit is unique.
      *
      * @return bool
      */
diff --git a/app/bundles/PageBundle/Event/UntrackableUrlsEvent.php b/app/bundles/PageBundle/Event/UntrackableUrlsEvent.php
index dc6599ccb8c..4eaaca3bbf1 100644
--- a/app/bundles/PageBundle/Event/UntrackableUrlsEvent.php
+++ b/app/bundles/PageBundle/Event/UntrackableUrlsEvent.php
@@ -1,33 +1,33 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Event;
 
-use Mautic\EmailBundle\Entity\Email;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class UntrackableUrlsEvent
+ * Class UntrackableUrlsEvent.
  */
 class UntrackableUrlsEvent extends Event
 {
     /**
      * @var array
      */
-    private $doNotTrack = array(
+    private $doNotTrack = [
         '{webview_url}',
         '{unsubscribe_url}',
         '{trackable=(.*?)}',
         // Ignore lead fields with URLs for tracking since each is unique
         '^{leadfield=(.*?)}',
-        '^{contactfield=(.*?)}'
-    );
+        '^{contactfield=(.*?)}',
+    ];
 
     /**
      * @var string
@@ -45,7 +45,7 @@ public function __construct($content)
     }
 
     /**
-     * set a URL or token to not convert to trackables
+     * set a URL or token to not convert to trackables.
      *
      * @param $url
      */
@@ -55,7 +55,7 @@ public function addNonTrackable($url)
     }
 
     /**
-     * Get array of non-trackables
+     * Get array of non-trackables.
      *
      * @return array
      */
diff --git a/app/bundles/PageBundle/Event/VideoHitEvent.php b/app/bundles/PageBundle/Event/VideoHitEvent.php
index 71d05050571..58bc0d7aaf4 100644
--- a/app/bundles/PageBundle/Event/VideoHitEvent.php
+++ b/app/bundles/PageBundle/Event/VideoHitEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\PageBundle\Entity\VideoHit;
 
 /**
- * Class PageHitEvent
+ * Class PageHitEvent.
  */
 class VideoHitEvent extends CommonEvent
 {
-
     /**
      * @var
      */
@@ -37,13 +37,13 @@ class VideoHitEvent extends CommonEvent
      */
     public function __construct(VideoHit $hit, $request, $code)
     {
-        $this->entity           = $hit;
-        $this->request          = $request;
-        $this->code             = $code;
+        $this->entity  = $hit;
+        $this->request = $request;
+        $this->code    = $code;
     }
 
     /**
-     * Get page request
+     * Get page request.
      *
      * @return string
      */
@@ -53,7 +53,7 @@ public function getRequest()
     }
 
     /**
-     * Get HTML code
+     * Get HTML code.
      *
      * @return mixed
      */
diff --git a/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php b/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php
index 9e6be8f4105..5a6d6066f80 100644
--- a/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/BuildJsSubscriber.php
@@ -1,19 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\PageBundle\EventListener;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
+
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\BuildJsEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Templating\Helper\AssetsHelper;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
 /**
- * Class BuildJsSubscriber
+ * Class BuildJsSubscriber.
  */
 class BuildJsSubscriber extends CommonSubscriber
 {
@@ -40,25 +44,23 @@ public static function getSubscribedEvents()
         return [
             CoreEvents::BUILD_MAUTIC_JS => [
                 ['onBuildJs', 255],
-                ['onBuildJsForVideo', 256]
-            ]
+                ['onBuildJsForVideo', 256],
+            ],
         ];
     }
 
     /**
      * @param BuildJsEvent $event
-     *
-     * @return void
      */
     public function onBuildJs(BuildJsEvent $event)
     {
         $pageTrackingUrl = str_replace(
-            array('http://', 'https://'),
+            ['http://', 'https://'],
             '',
-            $this->router->generate('mautic_page_tracker', array(), UrlGeneratorInterface::ABSOLUTE_URL)
+            $this->router->generate('mautic_page_tracker', [], UrlGeneratorInterface::ABSOLUTE_URL)
         );
 
-        $contactIdUrl = $router->generate('mautic_page_tracker_getcontact', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $contactIdUrl = $router->generate('mautic_page_tracker_getcontact', [], UrlGeneratorInterface::ABSOLUTE_URL);
 
         $js = <<<JS
 (function(m, l, n, d) {
@@ -144,10 +146,10 @@ public function onBuildJs(BuildJsEvent $event)
 
     public function onBuildJsForVideo(BuildJsEvent $event)
     {
-        $formSubmitUrl = $this->router->generate('mautic_form_postresults_ajax', [], UrlGeneratorInterface::ABSOLUTE_URL);
-        $mauticBaseUrl = $this->router->generate('mautic_base_index', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $formSubmitUrl   = $this->router->generate('mautic_form_postresults_ajax', [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $mauticBaseUrl   = $this->router->generate('mautic_base_index', [], UrlGeneratorInterface::ABSOLUTE_URL);
         $mediaElementCss = $this->assetsHelper->getUrl('media/css/mediaelementplayer.css', null, null, true);
-        $jQueryUrl = $this->assetsHelper->getUrl('app/bundles/CoreBundle/Assets/js/libraries/2.jquery.js', null, null, true);
+        $jQueryUrl       = $this->assetsHelper->getUrl('app/bundles/CoreBundle/Assets/js/libraries/2.jquery.js', null, null, true);
 
         $mediaElementJs = <<<'JS'
 /*!
diff --git a/app/bundles/PageBundle/EventListener/BuilderSubscriber.php b/app/bundles/PageBundle/EventListener/BuilderSubscriber.php
index 057be426b1a..0fdd7076c54 100644
--- a/app/bundles/PageBundle/EventListener/BuilderSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/BuilderSubscriber.php
@@ -1,28 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
+use Mautic\EmailBundle\EmailEvents;
+use Mautic\EmailBundle\Event\EmailBuilderEvent;
+use Mautic\EmailBundle\Event\EmailSendEvent;
 use Mautic\PageBundle\Event as Events;
 use Mautic\PageBundle\Helper\TokenHelper;
 use Mautic\PageBundle\Model\PageModel;
 use Mautic\PageBundle\PageEvents;
-use Mautic\EmailBundle\EmailEvents;
-use Mautic\EmailBundle\Event\EmailBuilderEvent;
-use Mautic\EmailBundle\Event\EmailSendEvent;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
 
 /**
- * Class BuilderSubscriber
+ * Class BuilderSubscriber.
  */
 class BuilderSubscriber extends CommonSubscriber
 {
@@ -41,13 +41,13 @@ class BuilderSubscriber extends CommonSubscriber
      */
     protected $pageModel;
 
-    protected $pageTokenRegex = '{pagelink=(.*?)}';
-    protected $langBarRegex = '{langbar}';
-    protected $shareButtonsRegex = '{sharebuttons}';
-    protected $titleRegex = '{pagetitle}';
-    protected $descriptionRegex = '{pagemetadescription}';
+    protected $pageTokenRegex      = '{pagelink=(.*?)}';
+    protected $langBarRegex        = '{langbar}';
+    protected $shareButtonsRegex   = '{sharebuttons}';
+    protected $titleRegex          = '{pagetitle}';
+    protected $descriptionRegex    = '{pagemetadescription}';
     protected $emailIsInternalSend = false;
-    protected $emailEntity = null;
+    protected $emailEntity         = null;
 
     public function __construct(TokenHelper $tokenHelper, IntegrationHelper $integrationHelper, PageModel $pageModel)
     {
@@ -66,12 +66,12 @@ public static function getSubscribedEvents()
             PageEvents::PAGE_ON_BUILD     => ['onPageBuild', 0],
             EmailEvents::EMAIL_ON_BUILD   => ['onEmailBuild', 0],
             EmailEvents::EMAIL_ON_SEND    => ['onEmailGenerate', 0],
-            EmailEvents::EMAIL_ON_DISPLAY => ['onEmailGenerate', 0]
+            EmailEvents::EMAIL_ON_DISPLAY => ['onEmailGenerate', 0],
         ];
     }
 
     /**
-     * Add forms to available page tokens
+     * Add forms to available page tokens.
      *
      * @param Events\PageBuilderEvent $event
      */
@@ -92,9 +92,9 @@ public function onPageBuild(Events\PageBuilderEvent $event)
                     [
                         'filter' => [
                             'force' => [
-                                ['column' => 'p.variantParent', 'expr' => 'isNull']
-                            ]
-                        ]
+                                ['column' => 'p.variantParent', 'expr' => 'isNull'],
+                            ],
+                        ],
                     ]
                 ),
                 -254
@@ -106,14 +106,14 @@ public function onPageBuild(Events\PageBuilderEvent $event)
             $bounceRate = [
                 'group'    => 'mautic.page.abtest.criteria',
                 'label'    => 'mautic.page.abtest.criteria.bounce',
-                'callback' => '\Mautic\PageBundle\Helper\AbTestHelper::determineBounceTestWinner'
+                'callback' => '\Mautic\PageBundle\Helper\AbTestHelper::determineBounceTestWinner',
             ];
             $event->addAbTestWinnerCriteria('page.bouncerate', $bounceRate);
 
             $dwellTime = [
                 'group'    => 'mautic.page.abtest.criteria',
                 'label'    => 'mautic.page.abtest.criteria.dwelltime',
-                'callback' => '\Mautic\PageBundle\Helper\AbTestHelper::determineDwellTimeTestWinner'
+                'callback' => '\Mautic\PageBundle\Helper\AbTestHelper::determineDwellTimeTestWinner',
             ];
             $event->addAbTestWinnerCriteria('page.dwelltime', $dwellTime);
         }
@@ -206,13 +206,13 @@ public function onPageDisplay(Events\PageDisplayEvent $event)
     }
 
     /**
-     * Renders the HTML for the social share buttons
+     * Renders the HTML for the social share buttons.
      *
      * @return string
      */
     protected function renderSocialShareButtons()
     {
-        static $content = "";
+        static $content = '';
 
         if (empty($content)) {
             $shareButtons = $this->integrationHelper->getShareButtons();
@@ -231,7 +231,7 @@ protected function renderSocialShareButtons()
     }
 
     /**
-     * Renders the HTML for the language bar for a given page
+     * Renders the HTML for the language bar for a given page.
      *
      * @param $page
      *
@@ -247,7 +247,6 @@ protected function renderLanguageBar($page)
 
             //check to see if this page is grouped with another
             if (empty($parent) && empty($children)) {
-
                 return;
             }
 
@@ -267,9 +266,9 @@ protected function renderLanguageBar($page)
                     $trans = $lang;
                 }
                 $related[$parent->getId()] = [
-                    "lang" => $trans,
+                    'lang' => $trans,
                     // Add ntrd to not auto redirect to another language
-                    "url"  => $this->pageModel->generateUrl($parent, false).'?ntrd=1'
+                    'url' => $this->pageModel->generateUrl($parent, false).'?ntrd=1',
                 ];
                 foreach ($children as $c) {
                     $lang  = $c->getLanguage();
@@ -278,9 +277,9 @@ protected function renderLanguageBar($page)
                         $trans = $lang;
                     }
                     $related[$c->getId()] = [
-                        "lang" => $trans,
+                        'lang' => $trans,
                         // Add ntrd to not auto redirect to another language
-                        "url"  => $this->pageModel->generateUrl($c, false).'?ntrd=1'
+                        'url' => $this->pageModel->generateUrl($c, false).'?ntrd=1',
                     ];
                 }
             }
@@ -294,7 +293,6 @@ function ($a, $b) {
             );
 
             if (empty($related)) {
-
                 return;
             }
 
@@ -306,8 +304,6 @@ function ($a, $b) {
 
     /**
      * @param EmailBuilderEvent $event
-     *
-     * @return void
      */
     public function onEmailBuild(EmailBuilderEvent $event)
     {
@@ -321,9 +317,9 @@ public function onEmailBuild(EmailBuilderEvent $event)
                     [
                         'filter' => [
                             'force' => [
-                                ['column' => 'p.variantParent', 'expr' => 'isNull']
-                            ]
-                        ]
+                                ['column' => 'p.variantParent', 'expr' => 'isNull'],
+                            ],
+                        ],
                     ]
                 ),
                 -254
@@ -337,8 +333,6 @@ public function onEmailBuild(EmailBuilderEvent $event)
 
     /**
      * @param EmailSendEvent $event
-     *
-     * @return void
      */
     public function onEmailGenerate(EmailSendEvent $event)
     {
diff --git a/app/bundles/PageBundle/EventListener/CalendarSubscriber.php b/app/bundles/PageBundle/EventListener/CalendarSubscriber.php
index 00fe863dbbe..42fee58ff32 100644
--- a/app/bundles/PageBundle/EventListener/CalendarSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/CalendarSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\PageBundle\EventListener;
 
 use Mautic\CalendarBundle\CalendarEvents;
@@ -16,9 +18,7 @@
 use Mautic\PageBundle\Model\PageModel;
 
 /**
- * Class CalendarSubscriber
- *
- * @package Mautic\PageBundle\EventListener
+ * Class CalendarSubscriber.
  */
 class CalendarSubscriber extends CommonSubscriber
 {
@@ -40,35 +40,34 @@ public function __construct(PageModel $pageModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CalendarEvents::CALENDAR_ON_GENERATE => array('onCalendarGenerate', 0),
-            CalendarEvents::CALENDAR_EVENT_ON_GENERATE => array('onCalendarEventGenerate', 0)
-        );
+        return [
+            CalendarEvents::CALENDAR_ON_GENERATE       => ['onCalendarGenerate', 0],
+            CalendarEvents::CALENDAR_EVENT_ON_GENERATE => ['onCalendarEventGenerate', 0],
+        ];
     }
 
     /**
-     * Adds events to the calendar
+     * Adds events to the calendar.
      *
      * @param CalendarGeneratorEvent $event
      *
-     * @return void
      * @todo   This method is only a model and should be removed when actual data is being populated
      */
     public function onCalendarGenerate(CalendarGeneratorEvent $event)
     {
-        $dates  = $event->getDates();
+        $dates = $event->getDates();
 
         $commonSelect = 'p.title, p.id as page_id, c.color';
-        $eventTypes = array(
-            'publish.up'   => array('dateName' => 'publish_up', 'setter' => 'PublishUp'),
-            'publish.down' => array('dateName' => 'publish_down', 'setter' => 'PublishDown')
-        );
+        $eventTypes   = [
+            'publish.up'   => ['dateName' => 'publish_up', 'setter' => 'PublishUp'],
+            'publish.down' => ['dateName' => 'publish_down', 'setter' => 'PublishDown'],
+        ];
 
         $query = $this->em->getConnection()->createQueryBuilder();
-        $query->from(MAUTIC_TABLE_PREFIX . 'pages', 'p')
-            ->leftJoin('p', MAUTIC_TABLE_PREFIX . 'categories', 'c', 'c.id = p.category_id AND c.bundle=:bundle')
+        $query->from(MAUTIC_TABLE_PREFIX.'pages', 'p')
+            ->leftJoin('p', MAUTIC_TABLE_PREFIX.'categories', 'c', 'c.id = p.category_id AND c.bundle=:bundle')
             ->setParameter('bundle', 'page')
             ->setParameter('start', $dates['start_date'])
             ->setParameter('end', $dates['end_date'])
@@ -76,37 +75,37 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
             ->setMaxResults(50);
 
         foreach ($eventTypes as $eventKey => $eventType) {
-            $query->select($commonSelect . ', ' . $eventType['dateName'] . ' AS start')
+            $query->select($commonSelect.', '.$eventType['dateName'].' AS start')
                 ->where($query->expr()->andX(
-                    $query->expr()->gte('p.' . $eventType['dateName'], ':start'),
-                    $query->expr()->lte('p.' . $eventType['dateName'], ':end')
+                    $query->expr()->gte('p.'.$eventType['dateName'], ':start'),
+                    $query->expr()->lte('p.'.$eventType['dateName'], ':end')
                 ));
 
             $results = $query->execute()->fetchAll();
 
             // We need to convert the date to a ISO8601 compliant string
             foreach ($results as &$object) {
-                $date = new DateTimeHelper($object['start']);
-                $eventTitle = $this->translator->trans('mautic.page.event.' . $eventKey, array('%page%' => $object['title']));
-                $object['start'] = $date->toLocalString(\DateTime::ISO8601);
-                $object['setter'] = $eventType['setter'];
-                $object['entityId'] = $object['page_id'];
+                $date                 = new DateTimeHelper($object['start']);
+                $eventTitle           = $this->translator->trans('mautic.page.event.'.$eventKey, ['%page%' => $object['title']]);
+                $object['start']      = $date->toLocalString(\DateTime::ISO8601);
+                $object['setter']     = $eventType['setter'];
+                $object['entityId']   = $object['page_id'];
                 $object['entityType'] = 'page';
-                $object['editable'] = true;
-                $object['url']   = $this->router->generate('mautic_calendar_action', array(
+                $object['editable']   = true;
+                $object['url']        = $this->router->generate('mautic_calendar_action', [
                     'objectAction' => 'edit',
-                    'source' => 'page',
-                    'objectId' => $object['page_id'],
-                    'startDate' => $date->toLocalString()
-                ), true);
-                $object['viewUrl']   = $this->router->generate('mautic_page_action', array('objectAction' => 'view', 'objectId' => $object['page_id']), true);
-                $object['attr']  = array(
+                    'source'       => 'page',
+                    'objectId'     => $object['page_id'],
+                    'startDate'    => $date->toLocalString(),
+                ], true);
+                $object['viewUrl'] = $this->router->generate('mautic_page_action', ['objectAction' => 'view', 'objectId' => $object['page_id']], true);
+                $object['attr']    = [
                     'data-toggle' => 'ajaxmodal',
                     'data-target' => '#CalendarEditModal',
-                    'data-header' => $eventTitle
-                );
-                $object['description'] = $this->translator->trans('mautic.page.event.' . $eventKey . '.description', array('%page%' => $object['title']));
-                $object['title'] = $eventTitle;
+                    'data-header' => $eventTitle,
+                ];
+                $object['description'] = $this->translator->trans('mautic.page.event.'.$eventKey.'.description', ['%page%' => $object['title']]);
+                $object['title']       = $eventTitle;
             }
 
             $event->addEvents($results);
@@ -114,22 +113,20 @@ public function onCalendarGenerate(CalendarGeneratorEvent $event)
     }
 
     /**
-     * Let the calendar to edit / create new entities
+     * Let the calendar to edit / create new entities.
      *
      * @param EventGeneratorEvent $event
-     *
-     * @return void
      */
     public function onCalendarEventGenerate(EventGeneratorEvent $event)
     {
-        $source     = $event->getSource();
+        $source = $event->getSource();
 
         if ($source != 'page') {
             return;
         }
 
-        $entityId   = $event->getEntityId();
-        $entity     = $this->pageModel->getEntity($entityId);
+        $entityId = $event->getEntityId();
+        $entity   = $this->pageModel->getEntity($entityId);
 
         $event->setModel($this->pageModel);
         $event->setEntity($entity);
diff --git a/app/bundles/PageBundle/EventListener/CampaignSubscriber.php b/app/bundles/PageBundle/EventListener/CampaignSubscriber.php
index 23d490e66fa..89c0d6ecf0b 100644
--- a/app/bundles/PageBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/CampaignSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,7 +21,7 @@
 use Mautic\PageBundle\PageEvents;
 
 /**
- * Class CampaignSubscriber
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -37,12 +38,12 @@ class CampaignSubscriber extends CommonSubscriber
     /**
      * CampaignSubscriber constructor.
      *
-     * @param PageModel $pageModel
+     * @param PageModel  $pageModel
      * @param EventModel $campaignEventModel
      */
     public function __construct(PageModel $pageModel, EventModel $campaignEventModel)
     {
-        $this->pageModel = $pageModel;
+        $this->pageModel          = $pageModel;
         $this->campaignEventModel = $campaignEventModel;
     }
 
@@ -52,31 +53,31 @@ public function __construct(PageModel $pageModel, EventModel $campaignEventModel
     public static function getSubscribedEvents()
     {
         return [
-            CampaignEvents::CAMPAIGN_ON_BUILD => ['onCampaignBuild', 0],
-            PageEvents::PAGE_ON_HIT           => ['onPageHit', 0],
-            PageEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0]
+            CampaignEvents::CAMPAIGN_ON_BUILD        => ['onCampaignBuild', 0],
+            PageEvents::PAGE_ON_HIT                  => ['onPageHit', 0],
+            PageEvents::ON_CAMPAIGN_TRIGGER_DECISION => ['onCampaignTriggerDecision', 0],
         ];
     }
 
     /**
-     * Add event triggers and actions
+     * Add event triggers and actions.
      *
      * @param CampaignBuilderEvent $event
      */
     public function onCampaignBuild(CampaignBuilderEvent $event)
     {
         //Add trigger
-        $pageHitTrigger = array(
+        $pageHitTrigger = [
             'label'       => 'mautic.page.campaign.event.pagehit',
             'description' => 'mautic.page.campaign.event.pagehit_descr',
             'formType'    => 'campaignevent_pagehit',
-            'eventName'   => PageEvents::ON_CAMPAIGN_TRIGGER_DECISION
-        );
+            'eventName'   => PageEvents::ON_CAMPAIGN_TRIGGER_DECISION,
+        ];
         $event->addDecision('page.pagehit', $pageHitTrigger);
     }
 
     /**
-     * Trigger actions for page hits
+     * Trigger actions for page hits.
      *
      * @param PageHitEvent $event
      */
@@ -102,7 +103,7 @@ public function onPageHit(PageHitEvent $event)
     public function onCampaignTriggerDecision(CampaignExecutionEvent $event)
     {
         $eventDetails = $event->getEventDetails();
-        $config = $event->getConfig();
+        $config       = $event->getConfig();
 
         if ($eventDetails == null) {
             return true;
@@ -112,7 +113,7 @@ public function onCampaignTriggerDecision(CampaignExecutionEvent $event)
 
         // Check Landing Pages
         if ($pageHit instanceof Page) {
-            list($parent, $children)  = $pageHit->getVariants();
+            list($parent, $children) = $pageHit->getVariants();
             //use the parent (self or configured parent)
             $pageHitId = $parent->getId();
         } else {
@@ -121,15 +122,15 @@ public function onCampaignTriggerDecision(CampaignExecutionEvent $event)
 
         $limitToPages = $config['pages'];
 
-        $urlMatches   = array();
+        $urlMatches = [];
 
         // Check Landing Pages URL or Tracing Pixel URL
         if (isset($config['url']) && $config['url']) {
-            $pageUrl        = $eventDetails->getUrl();
-            $limitToUrls    = explode(',', $config['url']);
+            $pageUrl     = $eventDetails->getUrl();
+            $limitToUrls = explode(',', $config['url']);
 
             foreach ($limitToUrls as $url) {
-                $url = trim($url);
+                $url              = trim($url);
                 $urlMatches[$url] = fnmatch($url, $pageUrl);
             }
         }
diff --git a/app/bundles/PageBundle/EventListener/ConfigSubscriber.php b/app/bundles/PageBundle/EventListener/ConfigSubscriber.php
index 4dc9902defa..90bd32fa4aa 100644
--- a/app/bundles/PageBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/ConfigSubscriber.php
@@ -1,46 +1,44 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\EventListener;
 
-use Mautic\ConfigBundle\Event\ConfigEvent;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\ConfigBundle\Event\ConfigEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class ConfigSubscriber
- *
- * @package Mautic\PageBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE => array('onConfigGenerate', 0),
-            ConfigEvents::CONFIG_PRE_SAVE    => array('onConfigSave', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+            ConfigEvents::CONFIG_PRE_SAVE    => ['onConfigSave', 0],
+        ];
     }
 
-    public function onConfigGenerate (ConfigBuilderEvent $event)
+    public function onConfigGenerate(ConfigBuilderEvent $event)
     {
-        $event->addForm(array(
+        $event->addForm([
             'bundle'     => 'PageBundle',
             'formAlias'  => 'pageconfig',
             'formTheme'  => 'MauticPageBundle:FormTheme\Config',
-            'parameters' => $event->getParametersFromConfig('MauticPageBundle')
-        ));
+            'parameters' => $event->getParametersFromConfig('MauticPageBundle'),
+        ]);
     }
 
     public function onConfigSave(ConfigEvent $event)
diff --git a/app/bundles/PageBundle/EventListener/DashboardSubscriber.php b/app/bundles/PageBundle/EventListener/DashboardSubscriber.php
index 24f55b18130..5c9e2ec5f78 100644
--- a/app/bundles/PageBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/DashboardSubscriber.php
@@ -1,58 +1,56 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\PageBundle\EventListener;
 
-use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\PageBundle\Model\PageModel;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\PageBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'page';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'page.hits.in.time' => array(
-            'formAlias' => 'page_dashboard_hits_in_time_widget'
-        ),
-        'unique.vs.returning.leads' => array(),
-        'dwell.times' => array(),
-        'popular.pages' => array(),
-        'created.pages' => array(),
-        'device.granularity' => array()
-    );
+    protected $types = [
+        'page.hits.in.time' => [
+            'formAlias' => 'page_dashboard_hits_in_time_widget',
+        ],
+        'unique.vs.returning.leads' => [],
+        'dwell.times'               => [],
+        'popular.pages'             => [],
+        'created.pages'             => [],
+        'device.granularity'        => [],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'page:pages:viewown',
-        'page:pages:viewother'
-    );
+        'page:pages:viewother',
+    ];
 
     /**
      * @var PageModel
@@ -70,17 +68,15 @@ public function __construct(PageModel $pageModel)
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
         $this->checkPermissions($event);
         $canViewOthers = $event->hasPermission('page:pages:viewother');
-        
+
         if ($event->getType() == 'page.hits.in.time') {
             $widget = $event->getWidget();
             $params = $widget->getParams();
@@ -90,7 +86,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             }
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->pageModel->getHitsLineChartData(
@@ -100,8 +96,8 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateFormat'],
                         $params['filter'],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -111,11 +107,11 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
         if ($event->getType() == 'unique.vs.returning.leads') {
             if (!$event->isCached()) {
                 $params = $event->getWidget()->getParams();
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'pie',
                     'chartHeight' => $event->getWidget()->getHeight() - 80,
-                    'chartData'   => $this->pageModel->getNewVsReturningPieChartData($params['dateFrom'], $params['dateTo'], array(), $canViewOthers)
-                ));
+                    'chartData'   => $this->pageModel->getNewVsReturningPieChartData($params['dateFrom'], $params['dateTo'], [], $canViewOthers),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -125,11 +121,11 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
         if ($event->getType() == 'dwell.times') {
             if (!$event->isCached()) {
                 $params = $event->getWidget()->getParams();
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'pie',
                     'chartHeight' => $event->getWidget()->getHeight() - 80,
-                    'chartData'   => $this->pageModel->getDwellTimesPieChartData($params['dateFrom'], $params['dateTo'], array(), $canViewOthers)
-                ));
+                    'chartData'   => $this->pageModel->getDwellTimesPieChartData($params['dateFrom'], $params['dateTo'], [], $canViewOthers),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
@@ -147,37 +143,37 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit = $params['limit'];
                 }
 
-                $pages = $this->pageModel->getPopularPages($limit, $params['dateFrom'], $params['dateTo'], array(), $canViewOthers);
-                $items = array();
+                $pages = $this->pageModel->getPopularPages($limit, $params['dateFrom'], $params['dateTo'], [], $canViewOthers);
+                $items = [];
 
                 // Build table rows with links
                 if ($pages) {
                     foreach ($pages as &$page) {
-                        $pageUrl = $this->router->generate('mautic_page_action', array('objectAction' => 'view', 'objectId' => $page['id']));
-                        $row = array(
-                            array(
+                        $pageUrl = $this->router->generate('mautic_page_action', ['objectAction' => 'view', 'objectId' => $page['id']]);
+                        $row     = [
+                            [
                                 'value' => $page['title'],
-                                'type' => 'link',
-                                'link' => $pageUrl
-                            ),
-                            array(
-                                'value' => $page['hits']
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $pageUrl,
+                            ],
+                            [
+                                'value' => $page['hits'],
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
+                $event->setTemplateData([
+                    'headItems' => [
                         $event->getTranslator()->trans('mautic.dashboard.label.title'),
-                        $event->getTranslator()->trans('mautic.dashboard.label.hits')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $pages
-                ));
+                        $event->getTranslator()->trans('mautic.dashboard.label.hits'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $pages,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
@@ -193,33 +189,33 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                     $limit = $params['limit'];
                 }
 
-                $pages = $this->pageModel->getPageList($limit, $params['dateFrom'], $params['dateTo'], array(), $canViewOthers);
-                $items = array();
+                $pages = $this->pageModel->getPageList($limit, $params['dateFrom'], $params['dateTo'], [], $canViewOthers);
+                $items = [];
 
                 // Build table rows with links
                 if ($pages) {
                     foreach ($pages as &$page) {
-                        $pageUrl = $this->router->generate('mautic_page_action', array('objectAction' => 'view', 'objectId' => $page['id']));
-                        $row = array(
-                            array(
+                        $pageUrl = $this->router->generate('mautic_page_action', ['objectAction' => 'view', 'objectId' => $page['id']]);
+                        $row     = [
+                            [
                                 'value' => $page['name'],
-                                'type' => 'link',
-                                'link' => $pageUrl
-                            )
-                        );
+                                'type'  => 'link',
+                                'link'  => $pageUrl,
+                            ],
+                        ];
                         $items[] = $row;
                     }
                 }
 
-                $event->setTemplateData(array(
-                    'headItems'   => array(
-                        $event->getTranslator()->trans('mautic.dashboard.label.title')
-                    ),
-                    'bodyItems'   => $items,
-                    'raw'         => $pages
-                ));
+                $event->setTemplateData([
+                    'headItems' => [
+                        $event->getTranslator()->trans('mautic.dashboard.label.title'),
+                    ],
+                    'bodyItems' => $items,
+                    'raw'       => $pages,
+                ]);
             }
-            
+
             $event->setTemplate('MauticCoreBundle:Helper:table.html.php');
             $event->stopPropagation();
         }
@@ -229,16 +225,16 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'pie',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->pageModel->getDeviceGranularityData(
                         $params['dateFrom'],
                         $params['dateTo'],
-                        array(),
+                        [],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
diff --git a/app/bundles/PageBundle/EventListener/LeadSubscriber.php b/app/bundles/PageBundle/EventListener/LeadSubscriber.php
index 869d853aa3c..9311bb9bbab 100644
--- a/app/bundles/PageBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/LeadSubscriber.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\PageBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\ChannelTrait;
@@ -19,7 +21,7 @@
 use Mautic\PageBundle\Model\VideoModel;
 
 /**
- * Class LeadSubscriber
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
@@ -43,7 +45,7 @@ class LeadSubscriber extends CommonSubscriber
      */
     public function __construct(PageModel $pageModel, VideoModel $pageVideoModel)
     {
-        $this->pageModel = $pageModel;
+        $this->pageModel      = $pageModel;
         $this->pageVideoModel = $pageVideoModel;
     }
 
@@ -55,7 +57,7 @@ public static function getSubscribedEvents()
         return [
             LeadEvents::TIMELINE_ON_GENERATE => [
                 ['onTimelineGenerate', 0],
-                ['onTimelineGenerateVideo', 0]
+                ['onTimelineGenerateVideo', 0],
             ],
             LeadEvents::CURRENT_LEAD_CHANGED => ['onLeadChange', 0],
             LeadEvents::LEAD_POST_MERGE      => ['onLeadMerge', 0],
@@ -63,7 +65,7 @@ public static function getSubscribedEvents()
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -75,15 +77,14 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
         $event->addEventType($eventTypeKey, $eventTypeName);
 
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
         $lead = $event->getLead();
 
         /** @var \Mautic\PageBundle\Entity\HitRepository $hitRepository */
-        $hitRepository = $this->em->getRepository('MauticPageBundle:Hit');;
-        $hits = $hitRepository->getLeadHits($lead->getId(), $event->getQueryOptions());
+        $hitRepository = $this->em->getRepository('MauticPageBundle:Hit');
+        $hits          = $hitRepository->getLeadHits($lead->getId(), $event->getQueryOptions());
 
         // Add to counter
         $event->addToCounter($eventTypeKey, $hits);
@@ -110,7 +111,7 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                             }
                         }
 
-                        /** @deprecated - BC support to be removed in 3.0 */
+                        /* @deprecated - BC support to be removed in 3.0 */
                         // Allow a custom template if applicable
                         if (method_exists($channelModel, 'getPageHitLeadTimelineTemplate')) {
                             $template = $channelModel->getPageHitLeadTimelineTemplate($hit);
@@ -121,7 +122,7 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                         if (method_exists($channelModel, 'getPageHitLeadTimelineIcon')) {
                             $icon = $channelModel->getPageHitLeadTimelineIcon($hit);
                         }
-                        /** end deprecation */
+                        /* end deprecation */
 
                         if (!empty($hit['sourceId'])) {
                             if ($source = $this->getChannelEntityName($hit['source'], $hit['sourceId'], true)) {
@@ -136,27 +137,27 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                     $page       = $this->pageModel->getEntity($hit['page_id']);
                     $eventLabel = [
                         'label' => $page->getTitle(),
-                        'href'  => $this->router->generate('mautic_page_action', ['objectAction' => 'view', 'objectId' => $hit['page_id']])
+                        'href'  => $this->router->generate('mautic_page_action', ['objectAction' => 'view', 'objectId' => $hit['page_id']]),
                     ];
                 } else {
                     $eventLabel = [
                         'label'      => (isset($hit['urlTitle'])) ? $hit['urlTitle'] : $hit['url'],
                         'href'       => $hit['url'],
-                        'isExternal' => true
+                        'isExternal' => true,
                     ];
                 }
 
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => $eventLabel,
-                        'eventType'       => $eventTypeName,
-                        'timestamp'       => $hit['dateHit'],
-                        'extra'           => [
-                            'hit' => $hit
+                        'event'      => $eventTypeKey,
+                        'eventLabel' => $eventLabel,
+                        'eventType'  => $eventTypeName,
+                        'timestamp'  => $hit['dateHit'],
+                        'extra'      => [
+                            'hit' => $hit,
                         ],
                         'contentTemplate' => $template,
-                        'icon'            => $icon
+                        'icon'            => $icon,
                     ]
                 );
             }
@@ -164,7 +165,7 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -194,15 +195,15 @@ public function onTimelineGenerateVideo(LeadTimelineEvent $event)
 
                 $event->addEvent(
                     [
-                        'event'           => $eventTypeKey,
-                        'eventLabel'      => $eventLabel,
-                        'eventType'       => $eventTypeName,
-                        'timestamp'       => $hit['date_hit'],
-                        'extra'           => [
-                            'hit' => $hit
+                        'event'      => $eventTypeKey,
+                        'eventLabel' => $eventLabel,
+                        'eventType'  => $eventTypeName,
+                        'timestamp'  => $hit['date_hit'],
+                        'extra'      => [
+                            'hit' => $hit,
                         ],
                         'contentTemplate' => $template,
-                        'icon'            => 'fa-video-camera'
+                        'icon'            => 'fa-video-camera',
                     ]
                 );
             }
diff --git a/app/bundles/PageBundle/EventListener/MaintenanceSubscriber.php b/app/bundles/PageBundle/EventListener/MaintenanceSubscriber.php
index b7588be3fa7..24b4023a86f 100644
--- a/app/bundles/PageBundle/EventListener/MaintenanceSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/MaintenanceSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,10 +14,9 @@
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event\MaintenanceEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class MaintenanceSubscriber
+ * Class MaintenanceSubscriber.
  */
 class MaintenanceSubscriber extends CommonSubscriber
 {
@@ -28,7 +28,7 @@ class MaintenanceSubscriber extends CommonSubscriber
     /**
      * MaintenanceSubscriber constructor.
      *
-     * @param Connection    $db
+     * @param Connection $db
      */
     public function __construct(Connection $db)
     {
@@ -38,17 +38,17 @@ public function __construct(Connection $db)
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
         return [
-            CoreEvents::MAINTENANCE_CLEANUP_DATA => ['onDataCleanup', 10] // Cleanup before visitors are processed
+            CoreEvents::MAINTENANCE_CLEANUP_DATA => ['onDataCleanup', 10], // Cleanup before visitors are processed
         ];
     }
 
     /**
      * @param MaintenanceEvent $event
      */
-    public function onDataCleanup (MaintenanceEvent $event)
+    public function onDataCleanup(MaintenanceEvent $event)
     {
         $this->cleanData($event, 'page_hits');
         $this->cleanData($event, 'lead_utmtags');
diff --git a/app/bundles/PageBundle/EventListener/PageSubscriber.php b/app/bundles/PageBundle/EventListener/PageSubscriber.php
index 616994f872e..6aaa5da1507 100644
--- a/app/bundles/PageBundle/EventListener/PageSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/PageSubscriber.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\CoreBundle\Templating\Helper\AssetsHelper;
@@ -18,7 +18,7 @@
 use Mautic\PageBundle\PageEvents;
 
 /**
- * Class PageSubscriber
+ * Class PageSubscriber.
  */
 class PageSubscriber extends CommonSubscriber
 {
@@ -56,15 +56,15 @@ public function __construct(AssetsHelper $assetsHelper, IpLookupHelper $ipLookup
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            PageEvents::PAGE_POST_SAVE       => array('onPagePostSave', 0),
-            PageEvents::PAGE_POST_DELETE     => array('onPageDelete', 0),
-            PageEvents::PAGE_ON_DISPLAY      => array('onPageDisplay', -255) // We want this to run last
-        );
+        return [
+            PageEvents::PAGE_POST_SAVE   => ['onPagePostSave', 0],
+            PageEvents::PAGE_POST_DELETE => ['onPageDelete', 0],
+            PageEvents::PAGE_ON_DISPLAY  => ['onPageDisplay', -255], // We want this to run last
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\PageEvent $event
      */
@@ -72,34 +72,34 @@ public function onPagePostSave(Events\PageEvent $event)
     {
         $page = $event->getPage();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "page",
-                "object"    => "page",
-                "objectId"  => $page->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'page',
+                'object'    => 'page',
+                'objectId'  => $page->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\PageEvent $event
      */
     public function onPageDelete(Events\PageEvent $event)
     {
         $page = $event->getPage();
-        $log = array(
-            "bundle"     => "page",
-            "object"     => "page",
-            "objectId"   => $page->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $page->getTitle()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log  = [
+            'bundle'    => 'page',
+            'object'    => 'page',
+            'objectId'  => $page->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $page->getTitle()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 
@@ -107,7 +107,7 @@ public function onPageDelete(Events\PageEvent $event)
      * Allow event listeners to add scripts to
      * - </head> : onPageDisplay_headClose
      * - <body>  : onPageDisplay_bodyOpen
-     * - </body> : onPageDisplay_bodyClose
+     * - </body> : onPageDisplay_bodyClose.
      *
      * @param Events\PageDisplayEvent $event
      */
@@ -121,7 +121,7 @@ public function onPageDisplay(Events\PageDisplayEvent $event)
         $headCloseScripts = ob_get_clean();
 
         if ($headCloseScripts) {
-            $content = str_ireplace('</head>', $headCloseScripts . "\n</head>", $content);
+            $content = str_ireplace('</head>', $headCloseScripts."\n</head>", $content);
         }
 
         // Get scripts to insert after <body>
@@ -132,7 +132,7 @@ public function onPageDisplay(Events\PageDisplayEvent $event)
         if ($bodyOpenScripts) {
             preg_match('/(<body[a-z=\s\-_:"\']*>)/i', $content, $matches);
 
-            $content = str_ireplace($matches[0], $matches[0] . "\n" . $bodyOpenScripts, $content);
+            $content = str_ireplace($matches[0], $matches[0]."\n".$bodyOpenScripts, $content);
         }
 
         // Get scripts to insert before </body>
@@ -141,7 +141,7 @@ public function onPageDisplay(Events\PageDisplayEvent $event)
         $bodyCloseScripts = ob_get_clean();
 
         if ($bodyCloseScripts) {
-            $content = str_ireplace('</body>', $bodyCloseScripts . "\n</body>", $content);
+            $content = str_ireplace('</body>', $bodyCloseScripts."\n</body>", $content);
         }
 
         $event->setContent($content);
diff --git a/app/bundles/PageBundle/EventListener/PointSubscriber.php b/app/bundles/PageBundle/EventListener/PointSubscriber.php
index 45fe9086b60..b0544ef5c65 100644
--- a/app/bundles/PageBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/PointSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
@@ -41,10 +42,10 @@ public function __construct(PointModel $pointModel)
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::POINT_ON_BUILD => array('onPointBuild', 0),
-            PageEvents::PAGE_ON_HIT     => array('onPageHit', 0)
-        );
+        return [
+            PointEvents::POINT_ON_BUILD => ['onPointBuild', 0],
+            PageEvents::PAGE_ON_HIT     => ['onPageHit', 0],
+        ];
     }
 
     /**
@@ -52,30 +53,30 @@ public static function getSubscribedEvents()
      */
     public function onPointBuild(PointBuilderEvent $event)
     {
-        $action = array(
+        $action = [
             'group'       => 'mautic.page.point.action',
             'label'       => 'mautic.page.point.action.pagehit',
             'description' => 'mautic.page.point.action.pagehit_descr',
-            'callback'    => array('\\Mautic\\PageBundle\\Helper\\PointActionHelper', 'validatePageHit'),
-            'formType'    => 'pointaction_pagehit'
-        );
+            'callback'    => ['\\Mautic\\PageBundle\\Helper\\PointActionHelper', 'validatePageHit'],
+            'formType'    => 'pointaction_pagehit',
+        ];
 
         $event->addAction('page.hit', $action);
 
-        $action = array(
+        $action = [
             'group'       => 'mautic.page.point.action',
             'label'       => 'mautic.page.point.action.urlhit',
             'description' => 'mautic.page.point.action.urlhit_descr',
-            'callback'    => array('\\Mautic\\PageBundle\\Helper\\PointActionHelper', 'validateUrlHit'),
+            'callback'    => ['\\Mautic\\PageBundle\\Helper\\PointActionHelper', 'validateUrlHit'],
             'formType'    => 'pointaction_urlhit',
-            'formTheme'   => 'MauticPageBundle:FormTheme\Point'
-        );
+            'formTheme'   => 'MauticPageBundle:FormTheme\Point',
+        ];
 
         $event->addAction('url.hit', $action);
     }
 
     /**
-     * Trigger point actions for page hits
+     * Trigger point actions for page hits.
      *
      * @param Events\PageHitEvent $event
      */
diff --git a/app/bundles/PageBundle/EventListener/ReportSubscriber.php b/app/bundles/PageBundle/EventListener/ReportSubscriber.php
index c6bfac3ab11..98aea072b8b 100644
--- a/app/bundles/PageBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/ReportSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,19 +12,18 @@
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
+use Mautic\CoreBundle\Helper\Chart\PieChart;
 use Mautic\ReportBundle\Event\ReportBuilderEvent;
 use Mautic\ReportBundle\Event\ReportGeneratorEvent;
 use Mautic\ReportBundle\Event\ReportGraphEvent;
 use Mautic\ReportBundle\ReportEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
 
 /**
- * Class ReportSubscriber
+ * Class ReportSubscriber.
  */
 class ReportSubscriber extends CommonSubscriber
 {
-
     /**
      * {@inheritdoc}
      */
@@ -32,16 +32,14 @@ public static function getSubscribedEvents()
         return [
             ReportEvents::REPORT_ON_BUILD          => ['onReportBuilder', 0],
             ReportEvents::REPORT_ON_GENERATE       => ['onReportGenerate', 0],
-            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0]
+            ReportEvents::REPORT_ON_GRAPH_GENERATE => ['onReportGraphGenerate', 0],
         ];
     }
 
     /**
-     * Add available tables and columns to the report builder lookup
+     * Add available tables and columns to the report builder lookup.
      *
      * @param ReportBuilderEvent $event
-     *
-     * @return void
      */
     public function onReportBuilder(ReportBuilderEvent $event)
     {
@@ -51,63 +49,63 @@ public function onReportBuilder(ReportBuilderEvent $event)
             $variantPrefix     = 'vp.';
 
             $columns = [
-                $prefix.'title'              => [
+                $prefix.'title' => [
                     'label' => 'mautic.core.title',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'alias'              => [
+                $prefix.'alias' => [
                     'label' => 'mautic.core.alias',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'revision'           => [
+                $prefix.'revision' => [
                     'label' => 'mautic.page.report.revision',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'hits'               => [
+                $prefix.'hits' => [
                     'label' => 'mautic.page.field.hits',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                $prefix.'unique_hits'        => [
+                $prefix.'unique_hits' => [
                     'label' => 'mautic.page.field.unique_hits',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                $translationPrefix.'id'      => [
+                $translationPrefix.'id' => [
                     'label' => 'mautic.page.report.translation_parent_id',
-                    'type'  => 'int'
+                    'type'  => 'int',
                 ],
-                $translationPrefix.'title'   => [
+                $translationPrefix.'title' => [
                     'label' => 'mautic.page.report.translation_parent_title',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $variantPrefix.'id'          => [
+                $variantPrefix.'id' => [
                     'label' => 'mautic.page.report.variant_parent_id',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $variantPrefix.'title'       => [
+                $variantPrefix.'title' => [
                     'label' => 'mautic.page.report.variant_parent_title',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
-                $prefix.'lang'               => [
+                $prefix.'lang' => [
                     'label' => 'mautic.core.language',
-                    'type'  => 'string'
+                    'type'  => 'string',
                 ],
                 $prefix.'variant_start_date' => [
                     'label' => 'mautic.page.report.variant_start_date',
-                    'type'  => 'datetime'
+                    'type'  => 'datetime',
                 ],
-                $prefix.'variant_hits'       => [
+                $prefix.'variant_hits' => [
                     'label' => 'mautic.page.report.variant_hits',
-                    'type'  => 'int'
-                ]
+                    'type'  => 'int',
+                ],
             ];
             $columns = array_merge(
                 $columns,
                 $event->getStandardColumns('p.', ['name', 'description'], 'mautic_page_action'),
                 $event->getCategoryColumns()
             );
-            $data    = [
+            $data = [
                 'display_name' => 'mautic.page.pages',
-                'columns'      => $columns
+                'columns'      => $columns,
             ];
             $event->addTable('pages', $data);
 
@@ -115,115 +113,115 @@ public function onReportBuilder(ReportBuilderEvent $event)
                 $hitPrefix   = 'ph.';
                 $redirectHit = 'r.';
                 $hitColumns  = [
-                    $hitPrefix.'date_hit'          => [
+                    $hitPrefix.'date_hit' => [
                         'label' => 'mautic.page.report.hits.date_hit',
-                        'type'  => 'datetime'
+                        'type'  => 'datetime',
                     ],
-                    $hitPrefix.'date_left'         => [
+                    $hitPrefix.'date_left' => [
                         'label' => 'mautic.page.report.hits.date_left',
-                        'type'  => 'datetime'
+                        'type'  => 'datetime',
                     ],
-                    $hitPrefix.'country'           => [
+                    $hitPrefix.'country' => [
                         'label' => 'mautic.page.report.hits.country',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'region'            => [
+                    $hitPrefix.'region' => [
                         'label' => 'mautic.page.report.hits.region',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'city'              => [
+                    $hitPrefix.'city' => [
                         'label' => 'mautic.page.report.hits.city',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'isp'               => [
+                    $hitPrefix.'isp' => [
                         'label' => 'mautic.page.report.hits.isp',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'organization'      => [
+                    $hitPrefix.'organization' => [
                         'label' => 'mautic.page.report.hits.organization',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'code'              => [
+                    $hitPrefix.'code' => [
                         'label' => 'mautic.page.report.hits.code',
-                        'type'  => 'int'
+                        'type'  => 'int',
                     ],
-                    $hitPrefix.'referer'           => [
+                    $hitPrefix.'referer' => [
                         'label' => 'mautic.page.report.hits.referer',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'url'               => [
+                    $hitPrefix.'url' => [
                         'label' => 'mautic.page.report.hits.url',
-                        'type'  => 'url'
+                        'type'  => 'url',
                     ],
-                    $hitPrefix.'url_title'         => [
+                    $hitPrefix.'url_title' => [
                         'label' => 'mautic.page.report.hits.url_title',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'user_agent'        => [
+                    $hitPrefix.'user_agent' => [
                         'label' => 'mautic.page.report.hits.user_agent',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'remote_host'       => [
+                    $hitPrefix.'remote_host' => [
                         'label' => 'mautic.page.report.hits.remote_host',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
                     $hitPrefix.'browser_languages' => [
                         'label' => 'mautic.page.report.hits.browser_languages',
-                        'type'  => 'array'
+                        'type'  => 'array',
                     ],
-                    $hitPrefix.'source'            => [
+                    $hitPrefix.'source' => [
                         'label' => 'mautic.report.field.source',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    $hitPrefix.'source_id'         => [
+                    $hitPrefix.'source_id' => [
                         'label' => 'mautic.report.field.source_id',
-                        'type'  => 'int'
+                        'type'  => 'int',
                     ],
-                    $redirectHit.'url'             => [
+                    $redirectHit.'url' => [
                         'label' => 'mautic.page.report.hits.redirect_url',
-                        'type'  => 'url'
+                        'type'  => 'url',
                     ],
-                    $redirectHit.'hits'            => [
+                    $redirectHit.'hits' => [
                         'label' => 'mautic.page.report.hits.redirect_hit_count',
-                        'type'  => 'int'
+                        'type'  => 'int',
                     ],
-                    $redirectHit.'unique_hits'     => [
+                    $redirectHit.'unique_hits' => [
                         'label' => 'mautic.page.report.hits.redirect_unique_hits',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    'ds.device'         => [
+                    'ds.device' => [
                         'label' => 'mautic.lead.device',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    'ds.device_brand'         => [
+                    'ds.device_brand' => [
                         'label' => 'mautic.lead.device_brand',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    'ds.device_model'         => [
+                    'ds.device_model' => [
                         'label' => 'mautic.lead.device_model',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    'ds.device_os_name'         => [
+                    'ds.device_os_name' => [
                         'label' => 'mautic.lead.device_os_name',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    'ds.device_os_shortname'         => [
+                    'ds.device_os_shortname' => [
                         'label' => 'mautic.lead.device_os_shortname',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    'ds.device_os_version'         => [
+                    'ds.device_os_version' => [
                         'label' => 'mautic.lead.device_os_version',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
-                    'ds.device_os_platform'         => [
+                    'ds.device_os_platform' => [
                         'label' => 'mautic.lead.device_os_platform',
-                        'type'  => 'string'
+                        'type'  => 'string',
                     ],
 
                 ];
-                $data        = [
+                $data = [
                     'display_name' => 'mautic.page.hits',
-                    'columns'      => array_merge($columns, $hitColumns, $event->getLeadColumns(), $event->getIpColumn())
+                    'columns'      => array_merge($columns, $hitColumns, $event->getLeadColumns(), $event->getIpColumn()),
                 ];
                 $event->addTable('page.hits', $data, 'pages');
 
@@ -243,11 +241,9 @@ public function onReportBuilder(ReportBuilderEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGeneratorEvent $event
-     *
-     * @return void
      */
     public function onReportGenerate(ReportGeneratorEvent $event)
     {
@@ -269,7 +265,7 @@ public function onReportGenerate(ReportGeneratorEvent $event)
                     ->leftJoin('p', MAUTIC_TABLE_PREFIX.'pages', 'tp', 'p.id = tp.id')
                     ->leftJoin('p', MAUTIC_TABLE_PREFIX.'pages', 'vp', 'p.id = vp.id')
                     ->leftJoin('ph', MAUTIC_TABLE_PREFIX.'page_redirects', 'r', 'r.id = ph.redirect_id')
-                    ->leftJoin('ph',MAUTIC_TABLE_PREFIX.'lead_devices', 'ds', 'ds.id = ph.device_id');
+                    ->leftJoin('ph', MAUTIC_TABLE_PREFIX.'lead_devices', 'ds', 'ds.id = ph.device_id');
 
                 $event->addIpAddressLeftJoin($qb, 'ph');
                 $event->addCategoryLeftJoin($qb, 'p');
@@ -281,11 +277,9 @@ public function onReportGenerate(ReportGeneratorEvent $event)
     }
 
     /**
-     * Initialize the QueryBuilder object to generate reports from
+     * Initialize the QueryBuilder object to generate reports from.
      *
      * @param ReportGraphEvent $event
-     *
-     * @return void
      */
     public function onReportGraphGenerate(ReportGraphEvent $event)
     {
@@ -303,7 +297,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
             $queryBuilder = clone $qb;
 
             /** @var ChartQuery $chartQuery */
-            $chartQuery   = clone $options['chartQuery'];
+            $chartQuery = clone $options['chartQuery'];
             $chartQuery->applyDateFilters($queryBuilder, 'date_hit', 'ph');
 
             switch ($g) {
@@ -347,7 +341,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
                         [
                             'data'      => $chart->render(),
                             'name'      => $g,
-                            'iconClass' => 'fa-clock-o'
+                            'iconClass' => 'fa-clock-o',
                         ]
                     );
                     break;
@@ -369,7 +363,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
                         [
                             'data'      => $chart->render(),
                             'name'      => $g,
-                            'iconClass' => 'fa-bookmark-o'
+                            'iconClass' => 'fa-bookmark-o',
                         ]
                     );
                     break;
@@ -390,7 +384,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
                         [
                             'data'      => $chart->render(),
                             'name'      => $g,
-                            'iconClass' => 'fa-globe'
+                            'iconClass' => 'fa-globe',
                         ]
                     );
                     break;
@@ -401,7 +395,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
                     $chart = new PieChart();
 
                     foreach ($data as $device) {
-                        $label = substr(empty($device['device'])?  $this->translator->trans('mautic.core.no.info'): $device['device'],0,12);
+                        $label = substr(empty($device['device']) ? $this->translator->trans('mautic.core.no.info') : $device['device'], 0, 12);
                         $chart->setDataset($label, $device['the_count']);
                     }
 
@@ -410,7 +404,7 @@ public function onReportGraphGenerate(ReportGraphEvent $event)
                         [
                             'data'      => $chart->render(),
                             'name'      => $g,
-                            'iconClass' => 'fa-globe'
+                            'iconClass' => 'fa-globe',
                         ]
                     );
                     break;
diff --git a/app/bundles/PageBundle/EventListener/SearchSubscriber.php b/app/bundles/PageBundle/EventListener/SearchSubscriber.php
index 7f3716f238c..37e0f99c96f 100644
--- a/app/bundles/PageBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/SearchSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\UserHelper;
 use Mautic\PageBundle\Model\PageModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\PageBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -47,12 +46,12 @@ public function __construct(UserHelper $userHelper, PageModel $pageModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
@@ -65,44 +64,44 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
             return;
         }
 
-        $filter     = array("string" => $str, "force" => array());
+        $filter = ['string' => $str, 'force' => []];
 
         $permissions = $this->security->isGranted(
-            array('page:pages:viewown', 'page:pages:viewother'),
+            ['page:pages:viewown', 'page:pages:viewother'],
             'RETURN_ARRAY'
         );
         if ($permissions['page:pages:viewown'] || $permissions['page:pages:viewother']) {
             if (!$permissions['page:pages:viewother']) {
-                $filter['force'][] = array(
+                $filter['force'][] = [
                     'column' => 'IDENTITY(p.createdBy)',
                     'expr'   => 'eq',
-                    'value'  => $this->userHelper->getUser()->getId()
-                );
+                    'value'  => $this->userHelper->getUser()->getId(),
+                ];
             }
 
             $pages = $this->pageModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $filter
-                ));
+                    'filter' => $filter,
+                ]);
 
             if (count($pages) > 0) {
-                $pageResults = array();
+                $pageResults = [];
 
                 foreach ($pages as $page) {
                     $pageResults[] = $this->templating->renderResponse(
                         'MauticPageBundle:SubscribedEvents\Search:global.html.php',
-                        array('page' => $page)
+                        ['page' => $page]
                     )->getContent();
                 }
                 if (count($pages) > 5) {
                     $pageResults[] = $this->templating->renderResponse(
                         'MauticPageBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($pages) - 5)
-                        )
+                            'remaining'    => (count($pages) - 5),
+                        ]
                     )->getContent();
                 }
                 $pageResults['count'] = count($pages);
@@ -116,11 +115,11 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
      */
     public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        if ($this->security->isGranted(array('page:pages:viewown', 'page:pages:viewother'), "MATCH_ONE")) {
+        if ($this->security->isGranted(['page:pages:viewown', 'page:pages:viewother'], 'MATCH_ONE')) {
             $event->addCommands(
                 'mautic.page.pages',
                 $this->pageModel->getCommandList()
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/EventListener/TokenSubscriber.php b/app/bundles/PageBundle/EventListener/TokenSubscriber.php
index eff0b96eaf3..fd5a955eee1 100644
--- a/app/bundles/PageBundle/EventListener/TokenSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/TokenSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\PageBundle\PageEvents;
 
 /**
- * Class TokenSubscriber
+ * Class TokenSubscriber.
  */
 class TokenSubscriber extends CommonSubscriber
 {
@@ -23,15 +24,13 @@ class TokenSubscriber extends CommonSubscriber
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            PageEvents::PAGE_ON_DISPLAY => array('decodeTokens', 254)
-        );
+        return [
+            PageEvents::PAGE_ON_DISPLAY => ['decodeTokens', 254],
+        ];
     }
 
     /**
      * @param PageDisplayEvent $event
-     *
-     * @return void
      */
     public function decodeTokens(PageDisplayEvent $event)
     {
diff --git a/app/bundles/PageBundle/EventListener/WebhookSubscriber.php b/app/bundles/PageBundle/EventListener/WebhookSubscriber.php
index a07b38be99c..324b4822139 100644
--- a/app/bundles/PageBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/PageBundle/EventListener/WebhookSubscriber.php
@@ -1,50 +1,49 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\EventListener;
 
-use Mautic\WebhookBundle\WebhookEvents;
-use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\PageBundle\PageEvents;
+use Mautic\WebhookBundle\Event\WebhookBuilderEvent;
+use Mautic\WebhookBundle\WebhookEvents;
 
 /**
- * Class WebhookSubscriber
- *
- * @package Mautic\PageBundle\EventListener
+ * Class WebhookSubscriber.
  */
 class WebhookSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            WebhookEvents::WEBHOOK_ON_BUILD => array('onWebhookBuild', 0)
-        );
+        return [
+            WebhookEvents::WEBHOOK_ON_BUILD => ['onWebhookBuild', 0],
+        ];
     }
 
     /**
-     * Add event triggers and actions
+     * Add event triggers and actions.
      *
      * @param WebhookBuilderEvent $event
      */
     public function onWebhookBuild(WebhookBuilderEvent $event)
     {
         // add checkbox to the webhook form for new leads
-        $pageHit     = array(
+        $pageHit = [
             'label'       => 'mautic.page.webhook.event.hit',
             'description' => 'mautic.page.webhook.event.hit_desc',
-        );
+        ];
 
         // add it to the list
         $event->addEvent(PageEvents::PAGE_ON_HIT, $pageHit);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/Form/Type/AbTestPropertiesType.php b/app/bundles/PageBundle/Form/Type/AbTestPropertiesType.php
index ceb2e490f77..da33ddd1c4d 100644
--- a/app/bundles/PageBundle/Form/Type/AbTestPropertiesType.php
+++ b/app/bundles/PageBundle/Form/Type/AbTestPropertiesType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,17 +15,16 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class AbTestPropertiesType
+ * Class AbTestPropertiesType.
  */
 class AbTestPropertiesType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $options = array('label' => false);
+        $options = ['label' => false];
         if (isset($options['formTypeOptions'])) {
             $options = array_merge($options, $options['formTypeOptions']);
         }
@@ -36,10 +36,10 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(array(
+        $resolver->setOptional([
             'formType',
-            'formTypeOptions'
-        ));
+            'formTypeOptions',
+        ]);
     }
 
     /**
@@ -47,6 +47,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "page_abtest_settings";
+        return 'page_abtest_settings';
     }
 }
diff --git a/app/bundles/PageBundle/Form/Type/CampaignEventPageHitType.php b/app/bundles/PageBundle/Form/Type/CampaignEventPageHitType.php
index 1b710a06f6c..780657c21d1 100644
--- a/app/bundles/PageBundle/Form/Type/CampaignEventPageHitType.php
+++ b/app/bundles/PageBundle/Form/Type/CampaignEventPageHitType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class CampaignEventPageHitType
+ * Class CampaignEventPageHitType.
  */
 class CampaignEventPageHitType extends AbstractType
 {
@@ -22,24 +23,24 @@ class CampaignEventPageHitType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('pages', 'page_list', array(
+        $builder->add('pages', 'page_list', [
             'label'      => 'mautic.page.campaign.event.form.pages',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.page.campaign.event.form.pages.descr'
-            )
-        ));
+                'tooltip' => 'mautic.page.campaign.event.form.pages.descr',
+            ],
+        ]);
 
-        $builder->add('url', 'text', array(
+        $builder->add('url', 'text', [
             'label'      => 'mautic.page.campaign.event.form.url',
-            'label_attr' => array('class' => 'control-label'),
+            'label_attr' => ['class' => 'control-label'],
             'required'   => false,
-            'attr'       => array(
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.page.campaign.event.form.url.descr'
-            )
-        ));
+                'tooltip' => 'mautic.page.campaign.event.form.url.descr',
+            ],
+        ]);
     }
 
     /**
diff --git a/app/bundles/PageBundle/Form/Type/ConfigType.php b/app/bundles/PageBundle/Form/Type/ConfigType.php
index ecd248f5abc..c2cbde23d19 100644
--- a/app/bundles/PageBundle/Form/Type/ConfigType.php
+++ b/app/bundles/PageBundle/Form/Type/ConfigType.php
@@ -1,22 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class ConfigType
- *
- * @package Mautic\PageBundle\Form\Type
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
@@ -24,28 +22,26 @@ class ConfigType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('cat_in_page_url', 'yesno_button_group', array(
-            'label'       => 'mautic.page.config.form.cat.in.url',
-            'data'        => (bool) $options['data']['cat_in_page_url'],
-            'attr'        => array(
-                'tooltip' => 'mautic.page.config.form.cat.in.url.tooltip'
-            )
-        ));
+        $builder->add('cat_in_page_url', 'yesno_button_group', [
+            'label' => 'mautic.page.config.form.cat.in.url',
+            'data'  => (bool) $options['data']['cat_in_page_url'],
+            'attr'  => [
+                'tooltip' => 'mautic.page.config.form.cat.in.url.tooltip',
+            ],
+        ]);
 
-        $builder->add('google_analytics', 'textarea', array(
+        $builder->add('google_analytics', 'textarea', [
             'label'      => 'mautic.page.config.form.google.analytics',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
                 'tooltip' => 'mautic.page.config.form.google.analytics.tooltip',
-                'rows'    => 10
-            ),
-            'required' => false
-        ));
-
-
+                'rows'    => 10,
+            ],
+            'required' => false,
+        ]);
     }
 
     /**
@@ -55,4 +51,4 @@ public function getName()
     {
         return 'pageconfig';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/Form/Type/DashboardHitsInTimeWidgetType.php b/app/bundles/PageBundle/Form/Type/DashboardHitsInTimeWidgetType.php
index cac4804d572..edb0cf5ec00 100644
--- a/app/bundles/PageBundle/Form/Type/DashboardHitsInTimeWidgetType.php
+++ b/app/bundles/PageBundle/Form/Type/DashboardHitsInTimeWidgetType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class DashboardHitsInTimeWidgetType
- *
- * @package Mautic\PageBundle\Form\Type
+ * Class DashboardHitsInTimeWidgetType.
  */
 class DashboardHitsInTimeWidgetType extends AbstractType
 {
@@ -25,18 +24,18 @@ class DashboardHitsInTimeWidgetType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('flag', 'choice', array(
+        $builder->add('flag', 'choice', [
                 'label'   => 'mautic.page.visit.flag.filter',
-                'choices' => array(
-                    ''                  => 'mautic.page.show.total.visits',
-                    'unique'            => 'mautic.page.show.unique.visits',
-                    'total_and_unique'  => 'mautic.page.show.unique.and.total.visits'
-                ),
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
+                'choices' => [
+                    ''                 => 'mautic.page.show.total.visits',
+                    'unique'           => 'mautic.page.show.unique.visits',
+                    'total_and_unique' => 'mautic.page.show.unique.and.total.visits',
+                ],
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
                 'empty_data' => '',
-                'required'   => false
-            )
+                'required'   => false,
+            ]
         );
     }
 
@@ -45,6 +44,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "page_dashboard_hits_in_time_widget";
+        return 'page_dashboard_hits_in_time_widget';
     }
 }
diff --git a/app/bundles/PageBundle/Form/Type/PageListType.php b/app/bundles/PageBundle/Form/Type/PageListType.php
index 7a16c7e8dfe..ca98a361f99 100644
--- a/app/bundles/PageBundle/Form/Type/PageListType.php
+++ b/app/bundles/PageBundle/Form/Type/PageListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,10 +14,9 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PageListType
+ * Class PageListType.
  */
 class PageListType extends AbstractType
 {
@@ -49,9 +49,9 @@ public function configureOptions(OptionsResolver $resolver)
 
         $resolver->setDefaults(
             [
-                'choices'     => function (Options $options) use ($model, $canViewOther) {
+                'choices' => function (Options $options) use ($model, $canViewOther) {
                     $choices = [];
-                    $pages   = $model->getRepository()->getPageList('', 0, 0, $canViewOther, $options['top_level'], $options['ignore_ids']);
+                    $pages = $model->getRepository()->getPageList('', 0, 0, $canViewOther, $options['top_level'], $options['ignore_ids']);
                     foreach ($pages as $page) {
                         $choices[$page['language']][$page['id']] = "{$page['title']} ({$page['id']})";
                     }
@@ -70,7 +70,7 @@ public function configureOptions(OptionsResolver $resolver)
                 'multiple'    => true,
                 'required'    => false,
                 'top_level'   => 'variant',
-                'ignore_ids'  => []
+                'ignore_ids'  => [],
             ]
         );
 
diff --git a/app/bundles/PageBundle/Form/Type/PagePublishDatesType.php b/app/bundles/PageBundle/Form/Type/PagePublishDatesType.php
index 287e71f3a81..ed6570b9056 100644
--- a/app/bundles/PageBundle/Form/Type/PagePublishDatesType.php
+++ b/app/bundles/PageBundle/Form/Type/PagePublishDatesType.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PagePublishDatesType
+ * Class PagePublishDatesType.
  */
 class PagePublishDatesType extends AbstractType
 {
@@ -27,42 +26,42 @@ class PagePublishDatesType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('content' => 'html', 'customHtml' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['content' => 'html', 'customHtml' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('page.page', $options));
 
         $builder->add('isPublished', 'yesno_button_group');
 
-        $builder->add('publishUp', 'datetime', array(
+        $builder->add('publishUp', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishup',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
-        $builder->add('publishDown', 'datetime', array(
+        $builder->add('publishDown', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishdown',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
         $builder->add('sessionId', 'hidden');
 
-        $builder->add('buttons', 'form_buttons', array(
+        $builder->add('buttons', 'form_buttons', [
             'container_class' => 'lead-note-buttons',
             'apply_text'      => false,
-            'save_text'       => 'mautic.core.form.save'
-        ));
+            'save_text'       => 'mautic.core.form.save',
+        ]);
 
         if (!empty($options['action'])) {
             $builder->setAction($options['action']);
@@ -74,9 +73,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Mautic\PageBundle\Entity\Page'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Mautic\PageBundle\Entity\Page',
+        ]);
     }
 
     /**
diff --git a/app/bundles/PageBundle/Form/Type/PageType.php b/app/bundles/PageBundle/Form/Type/PageType.php
index a126e415893..f4c4adcddfa 100644
--- a/app/bundles/PageBundle/Form/Type/PageType.php
+++ b/app/bundles/PageBundle/Form/Type/PageType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,11 +23,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PageType
+ * Class PageType.
  */
 class PageType extends AbstractType
 {
-
     /**
      * @var \Symfony\Bundle\FrameworkBundle\Translation\Translator
      */
@@ -74,31 +74,31 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('content' => 'html', 'customHtml' => 'html', 'redirectUrl' => 'url')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['content' => 'html', 'customHtml' => 'html', 'redirectUrl' => 'url']));
         $builder->addEventSubscriber(new FormExitSubscriber('page.page', $options));
 
         $builder->add(
             'title',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.title',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control')
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
 
         $builder->add(
             'customHtml',
             'textarea',
-            array(
-                'label'      => 'mautic.page.form.customhtml',
-                'required'   => false,
-                'attr'       => array(
+            [
+                'label'    => 'mautic.page.form.customhtml',
+                'required' => false,
+                'attr'     => [
                     'class'                => 'form-control editor editor-basic-fullpage editor-builder-tokens builder-html',
                     'data-token-callback'  => 'page:getBuilderTokens',
-                    'data-token-activator' => '{'
-                )
-            )
+                    'data-token-activator' => '{',
+                ],
+            ]
         );
 
         $template = $options['data']->getTemplate();
@@ -108,16 +108,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'template',
             'theme_list',
-            array(
+            [
                 'feature' => 'page',
                 'data'    => $template,
-                'attr'    => array(
+                'attr'    => [
                     'class'   => 'form-control not-chosen hidden',
                     'tooltip' => 'mautic.page.form.template.help',
-                ),
+                ],
                 'empty_value' => 'mautic.core.none',
-                'data' => $options['data']->getTemplate() ? $options['data']->getTemplate() : 'blank'
-            )
+                'data'        => $options['data']->getTemplate() ? $options['data']->getTemplate() : 'blank',
+            ]
         );
 
         $builder->add('isPublished', 'yesno_button_group');
@@ -125,33 +125,33 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'publishUp',
             'datetime',
-            array(
+            [
                 'widget'     => 'single_text',
                 'label'      => 'mautic.core.form.publishup',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
-                    'data-toggle' => 'datetime'
-                ),
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false
-            )
+                    'data-toggle' => 'datetime',
+                ],
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'publishDown',
             'datetime',
-            array(
+            [
                 'widget'     => 'single_text',
                 'label'      => 'mautic.core.form.publishdown',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
-                    'data-toggle' => 'datetime'
-                ),
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false
-            )
+                    'data-toggle' => 'datetime',
+                ],
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
+            ]
         );
 
         $builder->add('sessionId', 'hidden');
@@ -160,7 +160,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $this->model->getRepository()->setCurrentUser($this->user);
 
         $redirectUrlDataOptions = '';
-        $pages                  = $this->model->getRepository()->getPageList('', 0, 0, $this->canViewOther, 'variant', array($options['data']->getId()));
+        $pages                  = $this->model->getRepository()->getPageList('', 0, 0, $this->canViewOther, 'variant', [$options['data']->getId()]);
         foreach ($pages as $page) {
             $redirectUrlDataOptions .= "|{$page['alias']}";
         }
@@ -177,30 +177,30 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->create(
                 'translationParent',
                 'page_list',
-                array(
-                    'label'       => 'mautic.core.form.translation_parent',
-                    'label_attr'  => array('class' => 'control-label'),
-                    'attr'        => array(
+                [
+                    'label'      => 'mautic.core.form.translation_parent',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'   => 'form-control',
-                        'tooltip' => 'mautic.core.form.translation_parent.help'
-                    ),
+                        'tooltip' => 'mautic.core.form.translation_parent.help',
+                    ],
                     'required'    => false,
                     'multiple'    => false,
                     'empty_value' => 'mautic.core.form.translation_parent.empty',
                     'top_level'   => 'translation',
-                    'ignore_ids'  => array((int) $options['data']->getId())
-                )
+                    'ignore_ids'  => [(int) $options['data']->getId()],
+                ]
             )->addModelTransformer($transformer)
         );
 
-        $formModifier = function(FormInterface $form, $isVariant) {
+        $formModifier = function (FormInterface $form, $isVariant) {
             if ($isVariant) {
                 $form->add(
                     'variantSettings',
                     'pagevariant',
-                    array(
-                        'label' => false
-                    )
+                    [
+                        'label' => false,
+                    ]
                 );
             }
         };
@@ -231,98 +231,98 @@ function (FormEvent $event) use ($formModifier) {
         $builder->add(
             'metaDescription',
             'textarea',
-            array(
+            [
                 'label'      => 'mautic.page.form.metadescription',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control', 'maxlength' => 160),
-                'required'   => false
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control', 'maxlength' => 160],
+                'required'   => false,
+            ]
         );
 
         $builder->add(
           'redirectType',
           'redirect_list',
-          array(
-              'feature'     => 'page',
-              'attr'        => array(
+          [
+              'feature' => 'page',
+              'attr'    => [
                   'class'   => 'form-control',
                   'tooltip' => 'mautic.page.form.redirecttype.help',
-              ),
-              'empty_value' => 'mautic.page.form.redirecttype.none'
-          )
+              ],
+              'empty_value' => 'mautic.page.form.redirecttype.none',
+          ]
         );
 
         $builder->add(
             'redirectUrl',
             'url',
-            array(
+            [
                 'required'   => true,
                 'label'      => 'mautic.page.form.redirecturl',
-                'label_attr' => array(
-                    'class' => 'control-label'
-                ),
-                'attr'       => array(
+                'label_attr' => [
+                    'class' => 'control-label',
+                ],
+                'attr' => [
                     'class'        => 'form-control',
                     'maxlength'    => 200,
                     'tooltip'      => 'mautic.page.form.redirecturl.help',
                     'data-toggle'  => 'field-lookup',
                     'data-target'  => 'redirectUrl',
-                    'data-options' => $redirectUrlDataOptions
-                ),
-            )
+                    'data-options' => $redirectUrlDataOptions,
+                ],
+            ]
         );
 
         $builder->add(
             'alias',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.alias',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
                     'tooltip' => 'mautic.page.help.alias',
-                ),
-                'required'   => false
-            )
+                ],
+                'required' => false,
+            ]
         );
 
         //add category
         $builder->add(
             'category',
             'category',
-            array(
-                'bundle'   => 'page'
-            )
+            [
+                'bundle' => 'page',
+            ]
         );
 
         $builder->add(
             'language',
             'locale',
-            array(
+            [
                 'label'      => 'mautic.core.language',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
                     'tooltip' => 'mautic.page.form.language.help',
-                ),
+                ],
                 'required'   => false,
-                'empty_data' => 'en'
-            )
+                'empty_data' => 'en',
+            ]
         );
 
-        $builder->add('buttons', 'form_buttons', array(
-            'pre_extra_buttons' => array(
-                array(
+        $builder->add('buttons', 'form_buttons', [
+            'pre_extra_buttons' => [
+                [
                     'name'  => 'builder',
                     'label' => 'mautic.core.builder',
-                    'attr'  => array(
+                    'attr'  => [
                         'class'   => 'btn btn-default btn-dnd btn-nospin btn-builder text-primary',
                         'icon'    => 'fa fa-cube',
-                        'onclick' => "Mautic.launchBuilder('page');"
-                    )
-                )
-            )
-        ));
+                        'onclick' => "Mautic.launchBuilder('page');",
+                    ],
+                ],
+            ],
+        ]);
 
         if (!empty($options['action'])) {
             $builder->setAction($options['action']);
@@ -334,9 +334,9 @@ function (FormEvent $event) use ($formModifier) {
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Mautic\PageBundle\Entity\Page'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Mautic\PageBundle\Entity\Page',
+        ]);
     }
 
     /**
diff --git a/app/bundles/PageBundle/Form/Type/PointActionPageHitType.php b/app/bundles/PageBundle/Form/Type/PointActionPageHitType.php
index 10d990fce30..d4d9c9cd928 100644
--- a/app/bundles/PageBundle/Form/Type/PointActionPageHitType.php
+++ b/app/bundles/PageBundle/Form/Type/PointActionPageHitType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PointActionPageHitType
- *
- * @package Mautic\PageBundle\Form\Type
+ * Class PointActionPageHitType.
  */
 class PointActionPageHitType extends AbstractType
 {
@@ -24,14 +23,14 @@ class PointActionPageHitType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('pages', 'page_list', array(
-            'label'         => 'mautic.page.point.action.form.pages',
-            'label_attr'    => array('class' => 'control-label'),
-            'attr'       => array(
+        $builder->add('pages', 'page_list', [
+            'label'      => 'mautic.page.point.action.form.pages',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.page.point.action.form.pages.descr'
-            )
-        ));
+                'tooltip' => 'mautic.page.point.action.form.pages.descr',
+            ],
+        ]);
     }
 
     /**
diff --git a/app/bundles/PageBundle/Form/Type/PointActionUrlHitType.php b/app/bundles/PageBundle/Form/Type/PointActionUrlHitType.php
index 07a4cff2337..eeb6e993092 100644
--- a/app/bundles/PageBundle/Form/Type/PointActionUrlHitType.php
+++ b/app/bundles/PageBundle/Form/Type/PointActionUrlHitType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,15 +13,12 @@
 use Mautic\CoreBundle\Form\DataTransformer\SecondsConversionTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 
 /**
- * Class PointActionUrlHitType
- *
- * @package Mautic\PageBundle\Form\Type
+ * Class PointActionUrlHitType.
  */
 class PointActionUrlHitType extends AbstractType
 {
@@ -29,15 +27,15 @@ class PointActionUrlHitType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('page_url', 'text', array(
-            'label'       => 'mautic.page.point.action.form.page.url',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
-                'class'         => 'form-control',
-                'tooltip'       => 'mautic.page.point.action.form.page.url.descr',
-                'placeholder'   => 'http://'
-            )
-        ));
+        $builder->add('page_url', 'text', [
+            'label'      => 'mautic.page.point.action.form.page.url',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'       => 'form-control',
+                'tooltip'     => 'mautic.page.point.action.form.page.url.descr',
+                'placeholder' => 'http://',
+            ],
+        ]);
 
         // $default = (isset($options['data']) && isset($options['data']['first_time'])) ? $options['data']['first_time'] : false;
         // $builder->add('first_time', 'yesno_button_group', array(
@@ -48,78 +46,77 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         //     'data'        => $default
         // ));
 
-        $builder->add('page_hits', 'integer', array(
-            'label'       => 'mautic.page.hits',
-            'label_attr'  => array('class' => 'control-label'),
-            'required'    => false,
-            'attr'        => array(
-                'class'         => 'form-control',
-                'tooltip'       => 'mautic.page.point.action.form.page.hits.descr'
-            )
-        ));
+        $builder->add('page_hits', 'integer', [
+            'label'      => 'mautic.page.hits',
+            'label_attr' => ['class' => 'control-label'],
+            'required'   => false,
+            'attr'       => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.page.point.action.form.page.hits.descr',
+            ],
+        ]);
 
         $formModifier = function (FormInterface $form, $data) use ($builder) {
-
             $unit = (isset($data['accumulative_time_unit'])) ? $data['accumulative_time_unit'] : 'H';
-            $form->add('accumulative_time_unit', 'hidden', array(
-                'data' => $unit
-            ));
+            $form->add('accumulative_time_unit', 'hidden', [
+                'data' => $unit,
+            ]);
 
             $secondsTransformer = new SecondsConversionTransformer($unit);
             $form->add(
-                $builder->create('accumulative_time', 'text', array(
-                    'label'         => 'mautic.page.point.action.form.accumulative.time',
-                    'required'      => false,
-                    'label_attr'    => array('class' => 'control-label'),
-                    'attr'          => array(
-                        'class'         => 'form-control',
-                        'tooltip'       => 'mautic.page.point.action.form.accumulative.time.descr'
-                    ),
-                    'auto_initialize' => false
-                ))
+                $builder->create('accumulative_time', 'text', [
+                    'label'      => 'mautic.page.point.action.form.accumulative.time',
+                    'required'   => false,
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.page.point.action.form.accumulative.time.descr',
+                    ],
+                    'auto_initialize' => false,
+                ])
                     ->addViewTransformer($secondsTransformer)
                     ->getForm()
             );
 
-            $unit = (isset($data['returns_within_unit'])) ? $data['returns_within_unit'] : 'H';
+            $unit               = (isset($data['returns_within_unit'])) ? $data['returns_within_unit'] : 'H';
             $secondsTransformer = new SecondsConversionTransformer($unit);
-            $form->add('returns_within_unit', 'hidden', array(
-                'data' => $unit
-            ));
+            $form->add('returns_within_unit', 'hidden', [
+                'data' => $unit,
+            ]);
 
             $form->add(
-                $builder->create('returns_within', 'text', array(
-                    'label'         => 'mautic.page.point.action.form.returns.within',
-                    'required'      => false,
-                    'label_attr'    => array('class' => 'control-label'),
-                    'attr'          => array(
-                        'class'         => 'form-control',
-                        'tooltip'       => 'mautic.page.point.action.form.returns.within.descr',
-                        'onBlur'       => 'Mautic.EnablesOption(this.id)'
-                    ),
-                    'auto_initialize' => false
-                ))
+                $builder->create('returns_within', 'text', [
+                    'label'      => 'mautic.page.point.action.form.returns.within',
+                    'required'   => false,
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.page.point.action.form.returns.within.descr',
+                        'onBlur'  => 'Mautic.EnablesOption(this.id)',
+                    ],
+                    'auto_initialize' => false,
+                ])
                     ->addViewTransformer($secondsTransformer)
                     ->getForm()
             );
 
-            $unit = (isset($data['returns_after_unit'])) ? $data['returns_after_unit'] : 'H';
+            $unit               = (isset($data['returns_after_unit'])) ? $data['returns_after_unit'] : 'H';
             $secondsTransformer = new SecondsConversionTransformer($unit);
-            $form->add('returns_after_unit', 'hidden', array(
-                'data' => $unit
-            ));
+            $form->add('returns_after_unit', 'hidden', [
+                'data' => $unit,
+            ]);
             $form->add(
-                $builder->create('returns_after', 'text', array(
-                    'label'         => 'mautic.page.point.action.form.returns.after',
-                    'required'      => false,
-                    'label_attr'    => array('class' => 'control-label'),
-                    'attr'          => array(
-                        'class'         => 'form-control',
-                        'tooltip'       => 'mautic.page.point.action.form.returns.after.descr',
-                        'onBlur'       => 'Mautic.EnablesOption(this.id)'
-                    ),
-                    'auto_initialize' => false
-                ))
+                $builder->create('returns_after', 'text', [
+                    'label'      => 'mautic.page.point.action.form.returns.after',
+                    'required'   => false,
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.page.point.action.form.returns.after.descr',
+                        'onBlur'  => 'Mautic.EnablesOption(this.id)',
+                    ],
+                    'auto_initialize' => false,
+                ])
                     ->addViewTransformer($secondsTransformer)
                     ->getForm()
             );
@@ -134,7 +131,7 @@ function (FormEvent $event) use ($formModifier) {
 
         $builder->addEventListener(FormEvents::PRE_SUBMIT,
             function (FormEvent $event) use ($formModifier) {
-                $data    = $event->getData();
+                $data = $event->getData();
                 $formModifier($event->getForm(), $data);
             }
         );
diff --git a/app/bundles/PageBundle/Form/Type/RedirectListType.php b/app/bundles/PageBundle/Form/Type/RedirectListType.php
index 55116290d0c..fb631079711 100644
--- a/app/bundles/PageBundle/Form/Type/RedirectListType.php
+++ b/app/bundles/PageBundle/Form/Type/RedirectListType.php
@@ -3,62 +3,60 @@
 namespace Mautic\PageBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\DataTransformer\IdToEntityModelTransformer;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class RedirectListType
- *
- * @package Mautic\PageBundle\Form\Type
+ * Class RedirectListType.
  */
-class RedirectListType extends AbstractType {
-    
+class RedirectListType extends AbstractType
+{
     private $factory;
-    
+
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->factory = $factory;
     }
-    
+
     /**
      * @param OptionsResolverInterface $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver) {
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
         $factory = $this->factory;
-        $resolver->setDefaults(array(
-            'choices'       => $factory->getParameter('redirect_list_types'),
-            'expanded'      => false,
-            'multiple'      => false,
-            'label'         => 'mautic.page.form.redirecttype',
-            'label_attr'    => array('class' => 'control-label'),
-            'empty_value'   => false,
-            'required'      => false,
-            'attr'          => array(
-                'class' => 'form-control'
-            ),
-            'feature'       => 'all'
-        ));
+        $resolver->setDefaults([
+            'choices'     => $factory->getParameter('redirect_list_types'),
+            'expanded'    => false,
+            'multiple'    => false,
+            'label'       => 'mautic.page.form.redirecttype',
+            'label_attr'  => ['class' => 'control-label'],
+            'empty_value' => false,
+            'required'    => false,
+            'attr'        => [
+                'class' => 'form-control',
+            ],
+            'feature' => 'all',
+        ]);
 
-        $resolver->setOptional(array('feature'));
+        $resolver->setOptional(['feature']);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "redirect_list";
+    public function getName()
+    {
+        return 'redirect_list';
     }
-    
+
     /**
      * @return string
      */
-    public function getParent() {
-        return "choice";
+    public function getParent()
+    {
+        return 'choice';
     }
-    
 }
diff --git a/app/bundles/PageBundle/Form/Type/SlideshowGlobalConfigType.php b/app/bundles/PageBundle/Form/Type/SlideshowGlobalConfigType.php
index 878ee348b1f..abf6d4c5831 100644
--- a/app/bundles/PageBundle/Form/Type/SlideshowGlobalConfigType.php
+++ b/app/bundles/PageBundle/Form/Type/SlideshowGlobalConfigType.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
-use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class SlideshowGlobalConfigType
+ * Class SlideshowGlobalConfigType.
  */
 class SlideshowGlobalConfigType extends AbstractType
 {
@@ -26,69 +23,69 @@ class SlideshowGlobalConfigType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('slideshow_enabled', 'yesno_button_group', array(
-            'label'       => 'mautic.page.slideshow.enabled',
-            'data'        => (bool) isset($options['data']['slideshow_enabled']) ? $options['data']['slideshow_enabled'] : true,
-            'attr'        => array(
-                'tooltip' => 'mautic.page.slideshow.enabled.desc',
-                'data-slot-config' => $options['data']['slot']
-            )
-        ));
+        $builder->add('slideshow_enabled', 'yesno_button_group', [
+            'label' => 'mautic.page.slideshow.enabled',
+            'data'  => (bool) isset($options['data']['slideshow_enabled']) ? $options['data']['slideshow_enabled'] : true,
+            'attr'  => [
+                'tooltip'          => 'mautic.page.slideshow.enabled.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+        ]);
 
-        $builder->add('dot_navigation', 'yesno_button_group', array(
-            'label'       => 'mautic.page.slideshow.dot.navigation',
-            'data'        => (bool) isset($options['data']['dot_navigation']) ? $options['data']['dot_navigation'] : true,
-            'attr'        => array(
-                'tooltip' => 'mautic.page.slideshow.dot.navigation.desc',
-                'data-slot-config' => $options['data']['slot']
-            )
-        ));
+        $builder->add('dot_navigation', 'yesno_button_group', [
+            'label' => 'mautic.page.slideshow.dot.navigation',
+            'data'  => (bool) isset($options['data']['dot_navigation']) ? $options['data']['dot_navigation'] : true,
+            'attr'  => [
+                'tooltip'          => 'mautic.page.slideshow.dot.navigation.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+        ]);
 
-        $builder->add('arrow_navigation', 'yesno_button_group', array(
-            'label'       => 'mautic.page.slideshow.arrow.navigation',
-            'data'        => (bool) isset($options['data']['arrow_navigation']) ? $options['data']['arrow_navigation'] : true,
-            'attr'        => array(
-                'tooltip' => 'mautic.page.slideshow.arrow.navigation.desc',
-                'data-slot-config' => $options['data']['slot']
-            )
-        ));
+        $builder->add('arrow_navigation', 'yesno_button_group', [
+            'label' => 'mautic.page.slideshow.arrow.navigation',
+            'data'  => (bool) isset($options['data']['arrow_navigation']) ? $options['data']['arrow_navigation'] : true,
+            'attr'  => [
+                'tooltip'          => 'mautic.page.slideshow.arrow.navigation.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+        ]);
 
-        $builder->add('height', 'text', array(
+        $builder->add('height', 'text', [
             'label'      => 'mautic.page.slideshow.height',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'   => 'form-control',
-                'tooltip' => 'mautic.page.slideshow.height.desc',
-                'data-slot-config' => $options['data']['slot']
-            ),
-            'required'   => false,
-            'data'      => isset($options['data']['height']) ? $options['data']['height'] : ''
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'            => 'form-control',
+                'tooltip'          => 'mautic.page.slideshow.height.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+            'required' => false,
+            'data'     => isset($options['data']['height']) ? $options['data']['height'] : '',
+        ]);
 
-        $builder->add('width', 'text', array(
+        $builder->add('width', 'text', [
             'label'      => 'mautic.page.slideshow.width',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'   => 'form-control',
-                'tooltip' => 'mautic.page.slideshow.width.desc',
-                'data-slot-config' => $options['data']['slot']
-            ),
-            'required'   => false,
-            'data'      => isset($options['data']['width']) ? $options['data']['width'] : ''
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'            => 'form-control',
+                'tooltip'          => 'mautic.page.slideshow.width.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+            'required' => false,
+            'data'     => isset($options['data']['width']) ? $options['data']['width'] : '',
+        ]);
 
-        $builder->add('background_color', 'text', array(
+        $builder->add('background_color', 'text', [
             'label'      => 'mautic.page.slideshow.background.color',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'       => 'form-control',
-                'tooltip'     => 'mautic.page.slideshow.background.color.desc',
-                'data-toggle' => 'color',
-                'data-slot-config' => $options['data']['slot']
-            ),
-            'required'   => false,
-            'data'       => isset($options['data']['background_color']) ? $options['data']['background_color'] : ''
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'            => 'form-control',
+                'tooltip'          => 'mautic.page.slideshow.background.color.desc',
+                'data-toggle'      => 'color',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+            'required' => false,
+            'data'     => isset($options['data']['background_color']) ? $options['data']['background_color'] : '',
+        ]);
     }
 
     /**
diff --git a/app/bundles/PageBundle/Form/Type/SlideshowSlideConfigType.php b/app/bundles/PageBundle/Form/Type/SlideshowSlideConfigType.php
index 4a6be11cc3e..169adcead9e 100644
--- a/app/bundles/PageBundle/Form/Type/SlideshowSlideConfigType.php
+++ b/app/bundles/PageBundle/Form/Type/SlideshowSlideConfigType.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
-use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class SlideshowSlideConfigType
+ * Class SlideshowSlideConfigType.
  */
 class SlideshowSlideConfigType extends AbstractType
 {
@@ -26,59 +23,59 @@ class SlideshowSlideConfigType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('slides:' . $options['data']['key'] . ':remove', 'checkbox', array(
-            'label'      => 'mautic.page.slideshow.remove',
-            'attr'       => array(
+        $builder->add('slides:'.$options['data']['key'].':remove', 'checkbox', [
+            'label' => 'mautic.page.slideshow.remove',
+            'attr'  => [
                 'data-slot-config'  => $options['data']['slot'],
-                'data-remove-slide' => $options['data']['key']
-            ),
-            'required'   => false
-        ));
+                'data-remove-slide' => $options['data']['key'],
+            ],
+            'required' => false,
+        ]);
 
-        $builder->add('slides:' . $options['data']['key'] . ':captionheader', 'text', array(
+        $builder->add('slides:'.$options['data']['key'].':captionheader', 'text', [
             'label'      => 'mautic.page.slideshow.caption.header',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'   => 'form-control',
-                'tooltip' => 'mautic.page.slideshow.caption.header.desc',
-                'data-slot-config' => $options['data']['slot']
-            ),
-            'required'   => false,
-            'data'       => isset($options['data']['captionheader']) ? $options['data']['captionheader'] : ''
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'            => 'form-control',
+                'tooltip'          => 'mautic.page.slideshow.caption.header.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+            'required' => false,
+            'data'     => isset($options['data']['captionheader']) ? $options['data']['captionheader'] : '',
+        ]);
 
-        $builder->add('slides:' . $options['data']['key'] . ':captionbody', 'text', array(
+        $builder->add('slides:'.$options['data']['key'].':captionbody', 'text', [
             'label'      => 'mautic.page.slideshow.caption.body',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'   => 'form-control',
-                'tooltip' => 'mautic.page.slideshow.caption.body.desc',
-                'data-slot-config' => $options['data']['slot']
-            ),
-            'required'   => false,
-            'data'       => isset($options['data']['captionbody']) ? $options['data']['captionbody'] : '' 
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'            => 'form-control',
+                'tooltip'          => 'mautic.page.slideshow.caption.body.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+            'required' => false,
+            'data'     => isset($options['data']['captionbody']) ? $options['data']['captionbody'] : '',
+        ]);
 
-        $builder->add('slides:' . $options['data']['key'] . ':background-image', 'text', array(
+        $builder->add('slides:'.$options['data']['key'].':background-image', 'text', [
             'label'      => 'mautic.page.slideshow.background',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'   => 'form-control background-image',
-                'tooltip' => 'mautic.page.slideshow.background.desc',
-                'data-slot-config' => $options['data']['slot']
-            ),
-            'required'   => false,
-            'data'      => isset($options['data']['background-image']) ? $options['data']['background-image'] : '' 
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'            => 'form-control background-image',
+                'tooltip'          => 'mautic.page.slideshow.background.desc',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+            'required' => false,
+            'data'     => isset($options['data']['background-image']) ? $options['data']['background-image'] : '',
+        ]);
 
-        $builder->add('slides:' . $options['data']['key'] . ':order', 'hidden', array(
-            'attr'       => array(
-                'class'   => 'slide-order',
-                'data-slot-config' => $options['data']['slot']
-            ),
-            'required'   => false,
-            'data'      => isset($options['data']['order']) ? $options['data']['order'] : $options['data']['key'] 
-        ));
+        $builder->add('slides:'.$options['data']['key'].':order', 'hidden', [
+            'attr' => [
+                'class'            => 'slide-order',
+                'data-slot-config' => $options['data']['slot'],
+            ],
+            'required' => false,
+            'data'     => isset($options['data']['order']) ? $options['data']['order'] : $options['data']['key'],
+        ]);
     }
 
     /**
diff --git a/app/bundles/PageBundle/Form/Type/VariantType.php b/app/bundles/PageBundle/Form/Type/VariantType.php
index eaa6c11ce66..e1b3ba55265 100644
--- a/app/bundles/PageBundle/Form/Type/VariantType.php
+++ b/app/bundles/PageBundle/Form/Type/VariantType.php
@@ -1,29 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class VariantType
+ * Class VariantType.
  */
 class VariantType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
@@ -42,19 +40,19 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('weight', 'integer', array(
+        $builder->add('weight', 'integer', [
             'label'      => 'mautic.core.ab_test.form.traffic_weight',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
-                'tooltip' => 'mautic.core.ab_test.form.traffic_weight.help'
-            ),
-            'constraints' => array(
+                'tooltip' => 'mautic.core.ab_test.form.traffic_weight.help',
+            ],
+            'constraints' => [
                 new NotBlank(
-                    array('message' => 'mautic.page.variant.weight.notblank')
-                )
-            )
-        ));
+                    ['message' => 'mautic.page.variant.weight.notblank']
+                ),
+            ],
+        ]);
 
         $abTestWinnerCriteria = $this->factory->getModel('page.page')->getBuilderComponents(null, 'abTestWinnerCriteria');
 
@@ -62,33 +60,33 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $criteria = $abTestWinnerCriteria['criteria'];
             $choices  = $abTestWinnerCriteria['choices'];
 
-            $builder->add('winnerCriteria', 'choice', array(
+            $builder->add('winnerCriteria', 'choice', [
                 'label'      => 'mautic.core.ab_test.form.winner',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
-                    'onchange' => 'Mautic.getAbTestWinnerForm(\'page\', \'page\', this);'
-                ),
-                'expanded'   => false,
-                'multiple'   => false,
-                'choices'    => $choices,
+                    'onchange' => 'Mautic.getAbTestWinnerForm(\'page\', \'page\', this);',
+                ],
+                'expanded'    => false,
+                'multiple'    => false,
+                'choices'     => $choices,
                 'empty_value' => 'mautic.core.form.chooseone',
-                'constraints' => array(
+                'constraints' => [
                     new NotBlank(
-                        array('message' => 'mautic.core.ab_test.winner_criteria.not_blank')
-                    )
-                )
-            ));
+                        ['message' => 'mautic.core.ab_test.winner_criteria.not_blank']
+                    ),
+                ],
+            ]);
 
             $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($options, $criteria) {
                 $form = $event->getForm();
                 $data = $event->getData();
                 if (isset($data['winnerCriteria'])) {
                     if (!empty($criteria[$data['winnerCriteria']]['formType'])) {
-                        $formTypeOptions = array(
+                        $formTypeOptions = [
                             'required' => false,
-                            'label'    => false
-                        );
+                            'label'    => false,
+                        ];
                         if (!empty($criteria[$data]['formTypeOptions'])) {
                             $formTypeOptions = array_merge($formTypeOptions, $criteria[$data]['formTypeOptions']);
                         }
@@ -104,6 +102,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "pagevariant";
+        return 'pagevariant';
     }
 }
diff --git a/app/bundles/PageBundle/Helper/AbTestHelper.php b/app/bundles/PageBundle/Helper/AbTestHelper.php
index b01a73dee33..d4aa34fa502 100644
--- a/app/bundles/PageBundle/Helper/AbTestHelper.php
+++ b/app/bundles/PageBundle/Helper/AbTestHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,16 +14,15 @@
 use Mautic\PageBundle\Entity\Page;
 
 /**
- * Class AbTestHelper
+ * Class AbTestHelper.
  */
 class AbTestHelper
 {
-
     /**
-     * Determines the winner of A/B test based on bounce rates
+     * Determines the winner of A/B test based on bounce rates.
      *
      * @param $factory
-     * @param Page $parent
+     * @param Page   $parent
      * @param Page[] $children
      *
      * @return array
@@ -40,7 +40,7 @@ public static function determineBounceTestWinner($factory, $parent, $children)
             if ($counts) {
                 // Group by translation
                 $combined = [
-                    $parent->getId() => $counts[$parent->getId()]
+                    $parent->getId() => $counts[$parent->getId()],
                 ];
 
                 if ($parent->hasTranslations()) {
@@ -59,7 +59,7 @@ public static function determineBounceTestWinner($factory, $parent, $children)
                 foreach ($children as $child) {
                     if ($child->hasTranslations()) {
                         $combined[$child->getId()] = $counts[$child->getId()];
-                        $translations = $child->getTranslationChildren()->getKeys();
+                        $translations              = $child->getTranslationChildren()->getKeys();
                         foreach ($translations as $translation) {
                             $combined[$child->getId()]['bounces'] += $counts[$translation]['bounces'];
                             $combined[$child->getId()]['totalHits'] += $counts[$translation]['totalHits'];
@@ -94,7 +94,7 @@ public static function determineBounceTestWinner($factory, $parent, $children)
                     'winners'         => $winners,
                     'support'         => $support,
                     'basedOn'         => 'page.bouncerate',
-                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php'
+                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php',
                 ];
             }
         }
@@ -102,12 +102,12 @@ public static function determineBounceTestWinner($factory, $parent, $children)
         return [
             'winners' => [],
             'support' => [],
-            'basedOn' => 'page.bouncerate'
+            'basedOn' => 'page.bouncerate',
         ];
     }
 
     /**
-     * Determines the winner of A/B test based on dwell time rates
+     * Determines the winner of A/B test based on dwell time rates.
      *
      * @param MauticFactory $factory
      * @param Page          $parent
@@ -151,7 +151,7 @@ public static function determineDwellTimeTestWinner($factory, $parent)
                     'winners'         => $winners,
                     'support'         => $support,
                     'basedOn'         => 'page.dwelltime',
-                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php'
+                    'supportTemplate' => 'MauticPageBundle:SubscribedEvents\AbTest:bargraph.html.php',
                 ];
             }
         }
@@ -159,7 +159,7 @@ public static function determineDwellTimeTestWinner($factory, $parent)
         return [
             'winners' => [],
             'support' => [],
-            'basedOn' => 'page.dwelltime'
+            'basedOn' => 'page.dwelltime',
         ];
     }
 }
diff --git a/app/bundles/PageBundle/Helper/PointActionHelper.php b/app/bundles/PageBundle/Helper/PointActionHelper.php
index 1925e60f12b..85db802bcf2 100644
--- a/app/bundles/PageBundle/Helper/PointActionHelper.php
+++ b/app/bundles/PageBundle/Helper/PointActionHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\PageBundle\Entity\Page;
 
 /**
- * Class PointActionHelper
+ * Class PointActionHelper.
  */
 class PointActionHelper
 {
-
     /**
      * @param MauticFactory $factory
      * @param               $eventDetails
@@ -31,8 +31,8 @@ public static function validatePageHit($factory, $eventDetails, $action)
 
         if ($pageHit instanceof Page) {
             /** @var \Mautic\PageBundle\Model\PageModel $pageModel */
-            $pageModel = $factory->getModel('page');
-            list($parent, $children)  = $pageHit->getVariants();
+            $pageModel               = $factory->getModel('page');
+            list($parent, $children) = $pageHit->getVariants();
             //use the parent (self or configured parent)
             $pageHitId = $parent->getId();
         } else {
@@ -58,18 +58,18 @@ public static function validatePageHit($factory, $eventDetails, $action)
      */
     public static function validateUrlHit($factory, $eventDetails, $action)
     {
-        $changePoints   = array();
-        $url            = $eventDetails->getUrl();
-        $limitToUrl     = html_entity_decode(trim($action['properties']['page_url']));
+        $changePoints = [];
+        $url          = $eventDetails->getUrl();
+        $limitToUrl   = html_entity_decode(trim($action['properties']['page_url']));
 
         if (!$limitToUrl || !fnmatch($limitToUrl, $url)) {
             //no points change
             return false;
         }
 
-        $hitRepository  = $factory->getEntityManager()->getRepository('MauticPageBundle:Hit');
-        $lead           = $eventDetails->getLead();
-        $urlWithSqlWC   = str_replace('*', '%', $url);
+        $hitRepository = $factory->getEntityManager()->getRepository('MauticPageBundle:Hit');
+        $lead          = $eventDetails->getLead();
+        $urlWithSqlWC  = str_replace('*', '%', $url);
 
         if (isset($action['properties']['first_time']) && $action['properties']['first_time'] === true) {
             $hitStats = $hitRepository->getDwellTimesForUrl($urlWithSqlWC, ['leadId' => $lead->getId()]);
@@ -79,7 +79,7 @@ public static function validateUrlHit($factory, $eventDetails, $action)
                 $changePoints['first_time'] = true;
             }
         }
-        $now = new \DateTime();
+        $now       = new \DateTime();
         $latestHit = $hitRepository->getLatestHit(['leadId' => $lead->getId(), $urlWithSqlWC, 'second_to_last' => $eventDetails->getId()]);
 
         if ($action['properties']['accumulative_time']) {
@@ -88,7 +88,7 @@ public static function validateUrlHit($factory, $eventDetails, $action)
             }
 
             if (isset($hitStats['sum'])) {
-                if($now->getTimestamp() - $latestHit->getTimestamp() == $hitStats['sum']) {
+                if ($now->getTimestamp() - $latestHit->getTimestamp() == $hitStats['sum']) {
                     $changePoints['accumulative_time'] = true;
                 } else {
                     $changePoints['accumulative_time'] = false;
diff --git a/app/bundles/PageBundle/Helper/TokenHelper.php b/app/bundles/PageBundle/Helper/TokenHelper.php
index 63e71f5e6fd..245046876af 100644
--- a/app/bundles/PageBundle/Helper/TokenHelper.php
+++ b/app/bundles/PageBundle/Helper/TokenHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\PageBundle\Model\PageModel;
 
 /**
- * Class TokenHelper
+ * Class TokenHelper.
  */
 class TokenHelper
 {
@@ -37,23 +38,21 @@ public function __construct(PageModel $model)
      *
      * @return array
      */
-    public function findPageTokens($content, $clickthrough = array())
+    public function findPageTokens($content, $clickthrough = [])
     {
         preg_match_all('/{pagelink=(.*?)}/', $content, $matches);
 
-        $tokens = array();
+        $tokens = [];
         if (!empty($matches[1])) {
             foreach ($matches[1] as $key => $pageId) {
                 $token = $matches[0][$key];
                 if (!empty($tokens[$token])) {
-
                     continue;
                 }
 
                 $page = $this->model->getEntity($pageId);
 
                 if (!$page) {
-
                     continue;
                 }
 
@@ -65,4 +64,4 @@ public function findPageTokens($content, $clickthrough = array())
 
         return $tokens;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/MauticPageBundle.php b/app/bundles/PageBundle/MauticPageBundle.php
index c2928f3c20e..eed1ea91e19 100644
--- a/app/bundles/PageBundle/MauticPageBundle.php
+++ b/app/bundles/PageBundle/MauticPageBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticPageBundle
+ * Class MauticPageBundle.
  */
 class MauticPageBundle extends Bundle
 {
diff --git a/app/bundles/PageBundle/Model/PageModel.php b/app/bundles/PageBundle/Model/PageModel.php
index eb01b930edf..925ac757c4a 100644
--- a/app/bundles/PageBundle/Model/PageModel.php
+++ b/app/bundles/PageBundle/Model/PageModel.php
@@ -1,21 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Model;
 
+use DeviceDetector\DeviceDetector;
+use Doctrine\DBAL\Query\QueryBuilder;
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
+use Mautic\CoreBundle\Helper\Chart\PieChart;
 use Mautic\CoreBundle\Helper\CookieHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\FormModel;
-use Mautic\LeadBundle\Entity\LeadDevice;
 use Mautic\CoreBundle\Model\TranslationModelTrait;
 use Mautic\CoreBundle\Model\VariantModelTrait;
 use Mautic\LeadBundle\Entity\Lead;
+use Mautic\LeadBundle\Entity\LeadDevice;
 use Mautic\LeadBundle\Entity\UtmTag;
 use Mautic\LeadBundle\Model\FieldModel;
 use Mautic\LeadBundle\Model\LeadModel;
@@ -26,17 +32,12 @@
 use Mautic\PageBundle\Event\PageEvent;
 use Mautic\PageBundle\Event\PageHitEvent;
 use Mautic\PageBundle\PageEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Doctrine\DBAL\Query\QueryBuilder;
-use DeviceDetector\DeviceDetector;
 
 /**
- * Class PageModel
+ * Class PageModel.
  */
 class PageModel extends FormModel
 {
@@ -81,11 +82,11 @@ class PageModel extends FormModel
     /**
      * PageModel constructor.
      *
-     * @param CookieHelper $cookieHelper
+     * @param CookieHelper   $cookieHelper
      * @param IpLookupHelper $ipLookupHelper
-     * @param LeadModel $leadModel
-     * @param FieldModel $leadFieldModel
-     * @param RedirectModel $pageRedirectModel
+     * @param LeadModel      $leadModel
+     * @param FieldModel     $leadFieldModel
+     * @param RedirectModel  $pageRedirectModel
      * @param TrackableModel $pageTrackableModel
      */
     public function __construct(
@@ -95,13 +96,12 @@ public function __construct(
         FieldModel $leadFieldModel,
         RedirectModel $pageRedirectModel,
         TrackableModel $pageTrackableModel
-    )
-    {
-        $this->cookieHelper = $cookieHelper;
-        $this->ipLookupHelper = $ipLookupHelper;
-        $this->leadModel = $leadModel;
-        $this->leadFieldModel = $leadFieldModel;
-        $this->pageRedirectModel = $pageRedirectModel;
+    ) {
+        $this->cookieHelper       = $cookieHelper;
+        $this->ipLookupHelper     = $ipLookupHelper;
+        $this->leadModel          = $leadModel;
+        $this->leadFieldModel     = $leadFieldModel;
+        $this->pageRedirectModel  = $pageRedirectModel;
         $this->pageTrackableModel = $pageTrackableModel;
     }
 
@@ -116,10 +116,11 @@ public function setCatInUrl($catInUrl)
     /**
      * @return \Mautic\PageBundle\Entity\PageRepository
      */
-    public function getRepository ()
+    public function getRepository()
     {
         $repo = $this->em->getRepository('MauticPageBundle:Page');
         $repo->setCurrentUser($this->user);
+
         return $repo;
     }
 
@@ -134,7 +135,7 @@ public function getHitRepository()
     /**
      * {@inheritdoc}
      */
-    public function getPermissionBase ()
+    public function getPermissionBase()
     {
         return 'page:pages';
     }
@@ -142,7 +143,7 @@ public function getPermissionBase ()
     /**
      * {@inheritdoc}
      */
-    public function getNameGetter ()
+    public function getNameGetter()
     {
         return 'getTitle';
     }
@@ -153,7 +154,7 @@ public function getNameGetter ()
      * @param Page $entity
      * @param bool $unlock
      */
-    public function saveEntity ($entity, $unlock = true)
+    public function saveEntity($entity, $unlock = true)
     {
         $pageIds = $entity->getRelatedEntityIds();
 
@@ -171,9 +172,9 @@ public function saveEntity ($entity, $unlock = true)
             $aliasTag  = 1;
 
             while ($count) {
-                $testAlias = $alias . $aliasTag;
+                $testAlias = $alias.$aliasTag;
                 $count     = $repo->checkPageUniqueAlias($testAlias, $pageIds);
-                $aliasTag++;
+                ++$aliasTag;
             }
             if ($testAlias != $alias) {
                 $alias = $testAlias;
@@ -186,7 +187,7 @@ public function saveEntity ($entity, $unlock = true)
         if (!$isNew) {
             //increase the revision
             $revision = $entity->getRevision();
-            $revision++;
+            ++$revision;
             $entity->setRevision($revision);
         }
 
@@ -217,17 +218,17 @@ public function deleteEntity($entity)
      *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm ($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Page) {
-            throw new MethodNotAllowedHttpException(array('Page'));
+            throw new MethodNotAllowedHttpException(['Page']);
         }
 
         if (!isset($options['formName'])) {
             $options['formName'] = 'page';
         }
 
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
 
         return $formFactory->create($options['formName'], $entity, $params);
     }
@@ -237,11 +238,11 @@ public function createForm ($entity, $formFactory, $action = null, $options = ar
      *
      * @return null|Page
      */
-    public function getEntity ($id = null)
+    public function getEntity($id = null)
     {
         if ($id === null) {
             $entity = new Page();
-            $entity->setSessionId('new_' . hash('sha1', uniqid(mt_rand())));
+            $entity->setSessionId('new_'.hash('sha1', uniqid(mt_rand())));
         } else {
             $entity = parent::getEntity($id);
             if ($entity !== null) {
@@ -257,10 +258,10 @@ public function getEntity ($id = null)
      *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
-    protected function dispatchEvent ($action, &$entity, $isNew = false, Event $event = null)
+    protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Page) {
-            throw new MethodNotAllowedHttpException(array('Page'));
+            throw new MethodNotAllowedHttpException(['Page']);
         }
 
         switch ($action) {
@@ -295,7 +296,7 @@ protected function dispatchEvent ($action, &$entity, $isNew = false, Event $even
     }
 
     /**
-     * Get list of entities for autopopulate fields
+     * Get list of entities for autopopulate fields.
      *
      * @param string $type
      * @param string $filter
@@ -303,9 +304,9 @@ protected function dispatchEvent ($action, &$entity, $isNew = false, Event $even
      *
      * @return array
      */
-    public function getLookupResults ($type, $filter = '', $limit = 10)
+    public function getLookupResults($type, $filter = '', $limit = 10)
     {
-        $results = array();
+        $results = [];
         switch ($type) {
             case 'page':
                 $viewOther = $this->security->isGranted('page:pages:viewother');
@@ -319,7 +320,7 @@ public function getLookupResults ($type, $filter = '', $limit = 10)
     }
 
     /**
-     * Generate URL for a page
+     * Generate URL for a page.
      *
      * @param Page  $entity
      * @param bool  $absolute
@@ -327,7 +328,7 @@ public function getLookupResults ($type, $filter = '', $limit = 10)
      *
      * @return string
      */
-    public function generateUrl ($entity, $absolute = true, $clickthrough = array())
+    public function generateUrl($entity, $absolute = true, $clickthrough = [])
     {
         // If this is a variant, then get the parent's URL
         $parent = $entity->getVariantParent();
@@ -337,19 +338,19 @@ public function generateUrl ($entity, $absolute = true, $clickthrough = array())
 
         $slug = $this->generateSlug($entity);
 
-        return $this->buildUrl('mautic_page_public', array('slug' => $slug), $absolute, $clickthrough);
+        return $this->buildUrl('mautic_page_public', ['slug' => $slug], $absolute, $clickthrough);
     }
 
     /**
-     * Generates slug string
+     * Generates slug string.
      *
      * @param $entity
      *
      * @return string
      */
-    public function generateSlug ($entity)
+    public function generateSlug($entity)
     {
-        $pageSlug =  $entity->getAlias();
+        $pageSlug = $entity->getAlias();
 
         //should the url include the category
         if ($this->catInUrl) {
@@ -359,7 +360,7 @@ public function generateSlug ($entity)
         }
 
         $parent = $entity->getTranslationParent();
-        $slugs  = array();
+        $slugs  = [];
         if ($parent) {
             //multiple languages so tack on the language
             $slugs[] = $entity->getLanguage();
@@ -378,7 +379,7 @@ public function generateSlug ($entity)
     }
 
     /**
-     * Record page hit
+     * Record page hit.
      *
      * @param           $page
      * @param Request   $request
@@ -386,15 +387,14 @@ public function generateSlug ($entity)
      * @param Lead|null $lead
      * @param array     $query
      *
-     *
      * @return Hit $hit
+     *
      * @throws \Exception
      */
     public function hitPage($page, Request $request, $code = '200', Lead $lead = null, $query = [])
     {
         // Don't skew results with user hits
         if (!$this->security->isAnonymous()) {
-
             return;
         }
 
@@ -434,7 +434,7 @@ public function hitPage($page, Request $request, $code = '200', Lead $lead = nul
             }
 
             if (!empty($clickthrough['email'])) {
-                $emailRepo = $this->em->getRepository("MauticEmailBundle:Email");
+                $emailRepo = $this->em->getRepository('MauticEmailBundle:Email');
                 if ($emailEntity = $emailRepo->getEntity($clickthrough['email'])) {
                     $hit->setEmail($emailEntity);
                 }
@@ -496,7 +496,6 @@ public function hitPage($page, Request $request, $code = '200', Lead $lead = nul
                 $hit->setRedirect($page);
 
                 try {
-
                     $this->pageRedirectModel->getRepository()->upHitCount($page->getId(), 1, $isUnique);
 
                     // If this is a trackable, up the trackable counts as well
@@ -508,7 +507,6 @@ public function hitPage($page, Request $request, $code = '200', Lead $lead = nul
                     }
                 } catch (\Exception $exception) {
                     if (MAUTIC_ENV === 'dev') {
-
                         throw $exception;
                     } else {
                         $this->logger->addError(
@@ -599,10 +597,9 @@ public function hitPage($page, Request $request, $code = '200', Lead $lead = nul
         $dd->parse();
 
         $deviceRepo = $this->leadModel->getDeviceRepository();
-        $device = $deviceRepo->getDevice(null, $lead, $dd->getDeviceName(), $dd->getBrand(), $dd->getModel());
+        $device     = $deviceRepo->getDevice(null, $lead, $dd->getDeviceName(), $dd->getBrand(), $dd->getModel());
 
         if (empty($device)) {
-
             $device = new LeadDevice();
 
             $device->setClientInfo($dd->getClient());
@@ -626,7 +623,6 @@ public function hitPage($page, Request $request, $code = '200', Lead $lead = nul
             $this->em->flush($hit);
         } catch (\Exception $exception) {
             if (MAUTIC_ENV === 'dev') {
-
                 throw $exception;
             } else {
                 $this->logger->addError(
@@ -653,7 +649,7 @@ public function hitPage($page, Request $request, $code = '200', Lead $lead = nul
      *
      * @return array
      */
-    public function getHitQuery(Request $request, $page =  null)
+    public function getHitQuery(Request $request, $page = null)
     {
         if ($page instanceof Redirect) {
             //use the configured redirect URL
@@ -741,7 +737,7 @@ public function getHitQuery(Request $request, $page =  null)
     }
 
     /**
-     * Get array of page builder tokens from bundles subscribed PageEvents::PAGE_ON_BUILD
+     * Get array of page builder tokens from bundles subscribed PageEvents::PAGE_ON_BUILD.
      *
      * @param null|Page    $page
      * @param array|string $requestedComponents all | tokens | tokenSections | abTestWinnerCriteria
@@ -749,15 +745,15 @@ public function getHitQuery(Request $request, $page =  null)
      *
      * @return array
      */
-    public function getBuilderComponents (Page $page = null, $requestedComponents = 'all', $tokenFilter = null)
+    public function getBuilderComponents(Page $page = null, $requestedComponents = 'all', $tokenFilter = null)
     {
         $singleComponent = (!is_array($requestedComponents) && $requestedComponents != 'all');
-        $components      = array();
+        $components      = [];
         $event           = new PageBuilderEvent($this->translator, $page, $requestedComponents, $tokenFilter);
         $this->dispatcher->dispatch(PageEvents::PAGE_ON_BUILD, $event);
 
         if (!is_array($requestedComponents)) {
-            $requestedComponents = array($requestedComponents);
+            $requestedComponents = [$requestedComponents];
         }
 
         foreach ($requestedComponents as $requested) {
@@ -790,20 +786,20 @@ public function getBuilderComponents (Page $page = null, $requestedComponents =
     }
 
     /**
-     * Get number of page bounces
+     * Get number of page bounces.
      *
      * @param Page      $page
      * @param \DateTime $fromDate
      *
      * @return int
      */
-    public function getBounces (Page $page, \DateTime $fromDate = null)
+    public function getBounces(Page $page, \DateTime $fromDate = null)
     {
         return $this->getHitRepository()->getBounces($page->getId(), $fromDate);
     }
 
     /**
-     * Joins the page table and limits created_by to currently logged in user
+     * Joins the page table and limits created_by to currently logged in user.
      *
      * @param QueryBuilder $q
      */
@@ -815,18 +811,18 @@ public function limitQueryToCreator(QueryBuilder &$q)
     }
 
     /**
-     * Get line chart data of hits
+     * Get line chart data of hits.
      *
-     * @param char      $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getHitsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getHitsLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
         $flag = null;
 
@@ -871,16 +867,16 @@ public function getHitsLineChartData($unit, \DateTime $dateFrom, \DateTime $date
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getNewVsReturningPieChartData($dateFrom, $dateTo, $filters = array(), $canViewOthers = true)
+    public function getNewVsReturningPieChartData($dateFrom, $dateTo, $filters = [], $canViewOthers = true)
     {
-        $chart     = new PieChart();
-        $query     = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
-        $allQ      = $query->getCountQuery('page_hits', 'id', 'date_hit', $filters);
-        $uniqueQ   = $query->getCountQuery('page_hits', 'lead_id', 'date_hit', $filters, array('getUnique' => true, 'selectAlso' => array('t.page_id')));
+        $chart   = new PieChart();
+        $query   = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
+        $allQ    = $query->getCountQuery('page_hits', 'id', 'date_hit', $filters);
+        $uniqueQ = $query->getCountQuery('page_hits', 'lead_id', 'date_hit', $filters, ['getUnique' => true, 'selectAlso' => ['t.page_id']]);
 
         if (!$canViewOthers) {
             $this->limitQueryToCreator($allQ);
@@ -892,20 +888,21 @@ public function getNewVsReturningPieChartData($dateFrom, $dateTo, $filters = arr
         $returning = $all - $unique;
         $chart->setDataset($this->translator->trans('mautic.page.unique'), $unique);
         $chart->setDataset($this->translator->trans('mautic.page.graph.pie.new.vs.returning.returning'), $returning);
+
         return $chart->render();
     }
 
     /**
-     * Get pie chart data of dwell times
+     * Get pie chart data of dwell times.
      *
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getDwellTimesPieChartData(\DateTime $dateFrom, \DateTime $dateTo, $filters = array(), $canViewOthers = true)
+    public function getDwellTimesPieChartData(\DateTime $dateFrom, \DateTime $dateTo, $filters = [], $canViewOthers = true)
     {
         $timesOnSite = $this->getHitRepository()->getDwellTimeLabels();
         $chart       = new PieChart();
@@ -926,9 +923,9 @@ public function getDwellTimesPieChartData(\DateTime $dateFrom, \DateTime $dateTo
     }
 
     /**
-     * Get bar chart data of hits
+     * Get bar chart data of hits.
      *
-     * @param char     $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char     $unit       {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param DateTime $dateFrom
      * @param DateTime $dateTo
      * @param string   $dateFormat
@@ -936,10 +933,10 @@ public function getDwellTimesPieChartData(\DateTime $dateFrom, \DateTime $dateTo
      *
      * @return array
      */
-    public function getDeviceGranularityData(\DateTime $dateFrom, \DateTime $dateTo, $filters = array(), $canViewOthers = true)
+    public function getDeviceGranularityData(\DateTime $dateFrom, \DateTime $dateTo, $filters = [], $canViewOthers = true)
     {
-        $data['values'] = array();
-        $data['labels'] = array();
+        $data['values'] = [];
+        $data['labels'] = [];
 
         $q = $this->em->getConnection()->createQueryBuilder();
 
@@ -950,15 +947,15 @@ public function getDeviceGranularityData(\DateTime $dateFrom, \DateTime $dateTo,
             ->andWhere($q->expr()->gte('h.date_hit', ':date_from'))
             ->setParameter('date_from', $dateFrom->format('Y-m-d'))
             ->andWhere($q->expr()->lte('h.date_hit', ':date_to'))
-            ->setParameter('date_to', $dateTo->format('Y-m-d'." 23:59:59"));
+            ->setParameter('date_to', $dateTo->format('Y-m-d'.' 23:59:59'));
         $q->groupBy('ds.device');
 
         $results = $q->execute()->fetchAll();
 
-        $chart     = new PieChart($data['labels']);
+        $chart = new PieChart($data['labels']);
 
-        foreach($results as $result){
-            $label=substr(empty($result['device'])?  $this->translator->trans('mautic.core.no.info'): $result['device'],0,12);
+        foreach ($results as $result) {
+            $label = substr(empty($result['device']) ? $this->translator->trans('mautic.core.no.info') : $result['device'], 0, 12);
 
             // $data['backgroundColor'][]='rgba(220,220,220,0.5)';
             $chart->setDataset($label,  $result['count']);
@@ -968,17 +965,17 @@ public function getDeviceGranularityData(\DateTime $dateFrom, \DateTime $dateTo,
     }
 
     /**
-     * Get a list of popular (by hits) pages
+     * Get a list of popular (by hits) pages.
      *
-     * @param integer   $limit
+     * @param int       $limit
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getPopularPages($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = array(), $canViewOthers = true)
+    public function getPopularPages($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = [], $canViewOthers = true)
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('COUNT(DISTINCT t.id) AS hits, p.id, p.title, p.alias')
@@ -1003,17 +1000,17 @@ public function getPopularPages($limit = 10, \DateTime $dateFrom = null, \DateTi
     }
 
     /**
-     * Get a list of pages created in a date range
+     * Get a list of pages created in a date range.
      *
-     * @param integer   $limit
+     * @param int       $limit
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param array     $filters
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getPageList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = array(), $canViewOthers = true)
+    public function getPageList($limit = 10, \DateTime $dateFrom = null, \DateTime $dateTo = null, $filters = [], $canViewOthers = true)
     {
         $q = $this->em->getConnection()->createQueryBuilder();
         $q->select('t.id, t.title AS name, t.date_added, t.date_modified')
diff --git a/app/bundles/PageBundle/Model/RedirectModel.php b/app/bundles/PageBundle/Model/RedirectModel.php
index d4057d0131f..b25cd4d3e60 100644
--- a/app/bundles/PageBundle/Model/RedirectModel.php
+++ b/app/bundles/PageBundle/Model/RedirectModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\PageBundle\Entity\Redirect;
 
 /**
- * Class RedirectModel
+ * Class RedirectModel.
  */
 class RedirectModel extends FormModel
 {
@@ -50,11 +51,11 @@ public function getRepository()
      */
     public function getRedirectById($identifier)
     {
-        return $this->getRepository()->findOneBy(array('redirectId' => $identifier));
+        return $this->getRepository()->findOneBy(['redirectId' => $identifier]);
     }
 
     /**
-     * Generate a Mautic redirect/passthrough URL
+     * Generate a Mautic redirect/passthrough URL.
      *
      * @param Redirect $redirect
      * @param array    $clickthrough
@@ -62,11 +63,11 @@ public function getRedirectById($identifier)
      *
      * @return string
      */
-    public function generateRedirectUrl(Redirect $redirect, $clickthrough = array(), $shortenUrl = false)
+    public function generateRedirectUrl(Redirect $redirect, $clickthrough = [], $shortenUrl = false)
     {
         $url = $this->buildUrl(
             'mautic_url_redirect',
-            array('redirectId' => $redirect->getRedirectId()),
+            ['redirectId' => $redirect->getRedirectId()],
             true,
             $clickthrough,
             $shortenUrl
@@ -80,7 +81,7 @@ public function generateRedirectUrl(Redirect $redirect, $clickthrough = array(),
     }
 
     /**
-     * Get a Redirect entity by URL
+     * Get a Redirect entity by URL.
      *
      * Use Mautic\PageBundle\Model\TrackableModel::getTrackableByUrl() if associated with a channel
      *
@@ -88,7 +89,7 @@ public function generateRedirectUrl(Redirect $redirect, $clickthrough = array(),
      *
      * @return Redirect|null
      */
-    public function getRedirectByUrl ($url)
+    public function getRedirectByUrl($url)
     {
         // Ensure the URL saved to the database does not have encoded ampersands
         while (strpos($url, '&amp;') !== false) {
@@ -96,7 +97,7 @@ public function getRedirectByUrl ($url)
         }
 
         $repo     = $this->getRepository();
-        $redirect = $repo->findOneBy(array('url' => $url));
+        $redirect = $repo->findOneBy(['url' => $url]);
 
         if ($redirect == null) {
             $redirect = $this->createRedirectEntity($url);
@@ -106,18 +107,18 @@ public function getRedirectByUrl ($url)
     }
 
     /**
-     * Get Redirect entities by an array of URLs
+     * Get Redirect entities by an array of URLs.
      *
      * @param array $urls
      *
      * @return array
      */
-    public function getRedirectsByUrls (array $urls)
+    public function getRedirectsByUrls(array $urls)
     {
         $redirects   = $this->getRepository()->findByUrls(array_values($urls));
-        $newEntities = array();
-        $return      = array();
-        $byUrl       = array();
+        $newEntities = [];
+        $return      = [];
+        $byUrl       = [];
 
         foreach ($redirects as $redirect) {
             $byUrl[$redirect->getUrl()] = $redirect;
@@ -125,14 +126,13 @@ public function getRedirectsByUrls (array $urls)
 
         foreach ($urls as $key => $url) {
             if (empty($url)) {
-
                 continue;
             }
 
             if (isset($byUrl[$url])) {
                 $return[$key] = $byUrl[$url];
             } else {
-                $redirect = $this->createRedirectEntity($url);
+                $redirect      = $this->createRedirectEntity($url);
                 $newEntities[] = $redirect;
                 $return[$key]  = $redirect;
             }
@@ -149,7 +149,7 @@ public function getRedirectsByUrls (array $urls)
     }
 
     /**
-     * Create a Redirect entity for URL
+     * Create a Redirect entity for URL.
      *
      * @param $url
      *
diff --git a/app/bundles/PageBundle/Model/TrackableModel.php b/app/bundles/PageBundle/Model/TrackableModel.php
index 3b74be483f4..ea3bdd40cbe 100644
--- a/app/bundles/PageBundle/Model/TrackableModel.php
+++ b/app/bundles/PageBundle/Model/TrackableModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,33 +17,33 @@
 use Mautic\PageBundle\PageEvents;
 
 /**
- * Class TrackableModel
+ * Class TrackableModel.
  */
 class TrackableModel extends AbstractCommonModel
 {
     /**
-     * Array of URLs and/or tokens that should not be converted to trackables
+     * Array of URLs and/or tokens that should not be converted to trackables.
      *
      * @var array
      */
     protected $doNotTrack = [];
 
     /**
-     * Tokens with values that could be used as URLs
+     * Tokens with values that could be used as URLs.
      *
      * @var array
      */
     protected $contentTokens = [];
 
     /**
-     * Stores content that needs to be replaced when URLs are parsed out of content
+     * Stores content that needs to be replaced when URLs are parsed out of content.
      *
      * @var array
      */
     protected $contentReplacements = [];
 
     /**
-     * Used to rebuild correct URLs when the tokenized URL contains query parameters
+     * Used to rebuild correct URLs when the tokenized URL contains query parameters.
      *
      * @var bool
      */
@@ -84,7 +85,7 @@ protected function getRedirectModel()
     /**
      * @param Trackable  $trackable
      * @param array      $clickthrough
-     * @param bool|false $shortenUrl If true, use the configured shortener service to shorten the URLs
+     * @param bool|false $shortenUrl   If true, use the configured shortener service to shorten the URLs
      *
      * @return string
      */
@@ -100,18 +101,17 @@ public function generateTrackableUrl(Trackable $trackable, $clickthrough = [], $
     }
 
     /**
-     * Return a channel Trackable entity by URL
+     * Return a channel Trackable entity by URL.
      *
-     * @param      $url
-     * @param      $channel
-     * @param      $channelId
+     * @param   $url
+     * @param   $channel
+     * @param   $channelId
      *
      * @return Trackable|null
      */
     public function getTrackableByUrl($url, $channel, $channelId)
     {
         if (empty($url)) {
-
             return null;
         }
 
@@ -131,7 +131,7 @@ public function getTrackableByUrl($url, $channel, $channelId)
     }
 
     /**
-     * Get Trackable entities by an array of URLs
+     * Get Trackable entities by an array of URLs.
      *
      * @param $urls
      * @param $channel
@@ -164,7 +164,6 @@ public function getTrackablesByUrls($urls, $channel, $channelId)
 
         foreach ($urls as $key => $url) {
             if (empty($url)) {
-
                 continue;
             }
 
@@ -195,7 +194,7 @@ public function getTrackablesByUrls($urls, $channel, $channelId)
     }
 
     /**
-     * Get a list of URLs that are tracked by a specific channel
+     * Get a list of URLs that are tracked by a specific channel.
      *
      * @param $channel
      * @param $channelId
@@ -208,7 +207,7 @@ public function getTrackableList($channel, $channelId)
     }
 
     /**
-     * Returns a list of tokens and/or URLs that should not be converted to trackables
+     * Returns a list of tokens and/or URLs that should not be converted to trackables.
      *
      * @param null $content
      *
@@ -225,14 +224,14 @@ public function getDoNotTrackList($content = null)
     }
 
     /**
-     * Extract URLs from content and return as trackables
+     * Extract URLs from content and return as trackables.
      *
      * @param mixed      $content
      * @param array      $contentTokens
      * @param null       $channel
      * @param null       $channelId
      * @param bool|false $usingClickthrough Set to false if not using a clickthrough parameter. This is to ensure that URLs are built correctly with ?
-     *                                      or & for URLs tracked that include query parameters.
+     *                                      or & for URLs tracked that include query parameters
      *
      * @return array[mixed $content, array $trackables]
      */
@@ -242,15 +241,15 @@ public function parseContentForTrackables($content, array $contentTokens = [], $
 
         // Reset content replacement arrays
         $this->contentReplacements = [
-            'first_pass'  => [
+            'first_pass' => [
                 // Remove internal attributes
                 // Editor may convert to HTML4
                 'mautic:disable-tracking=""' => '',
                 // HTML5
-                'mautic:disable-tracking'    => ''
+                'mautic:disable-tracking' => '',
             ],
             'first_pass'  => [],
-            'second_pass' => []
+            'second_pass' => [],
         ];
 
         // Set do not track list for validateUrlIsTrackable()
@@ -308,12 +307,12 @@ public function parseContentForTrackables($content, array $contentTokens = [], $
 
         return [
             $contentWasString ? $content[0] : $content,
-            $trackableTokens
+            $trackableTokens,
         ];
     }
 
     /**
-     * Converts array of Trackable or Redirect entities into {trackable} tokens
+     * Converts array of Trackable or Redirect entities into {trackable} tokens.
      *
      * @param array $entities
      *
@@ -335,17 +334,16 @@ protected function createTrackingTokens(array $entities)
     }
 
     /**
-     * Prepares content for tokenized trackable URLs by replacing them with {trackable=ID} tokens
+     * Prepares content for tokenized trackable URLs by replacing them with {trackable=ID} tokens.
      *
      * @param string $content
-     * @param string $type html|text
+     * @param string $type    html|text
      *
      * @return string
      */
     protected function prepareContentWithTrackableTokens($content, $type)
     {
         if (empty($content)) {
-
             return '';
         }
 
@@ -379,9 +377,9 @@ protected function prepareContentWithTrackableTokens($content, $type)
     }
 
     /**
-     * Find URLs in HTML and parse into trackables
+     * Find URLs in HTML and parse into trackables.
      *
-     * @param  string $html HTML content
+     * @param string $html HTML content
      *
      * @return array
      */
@@ -390,7 +388,7 @@ protected function extractTrackablesFromHtml($html)
         // Find links using DOM to only find <a> tags
         $libxmlPreviousState = libxml_use_internal_errors(true);
         libxml_use_internal_errors(true);
-        $dom = new \DOMDocument;
+        $dom = new \DOMDocument();
         $dom->loadHTML('<?xml encoding="UTF-8">'.$html);
         libxml_clear_errors();
         libxml_use_internal_errors($libxmlPreviousState);
@@ -411,7 +409,7 @@ protected function extractTrackablesFromHtml($html)
 
             if ($preparedUrl = $this->prepareUrlForTracking($url)) {
                 list($urlKey, $urlValue) = $preparedUrl;
-                $trackableUrls[$urlKey] = $urlValue;
+                $trackableUrls[$urlKey]  = $urlValue;
             }
         }
 
@@ -419,9 +417,9 @@ protected function extractTrackablesFromHtml($html)
     }
 
     /**
-     * Find URLs in plain text and parse into trackables
+     * Find URLs in plain text and parse into trackables.
      *
-     * @param  string $text Plain text content
+     * @param string $text Plain text content
      *
      * @return array
      */
@@ -436,7 +434,7 @@ protected function extractTrackablesFromText($text)
             foreach ($matches[0] as $url) {
                 if ($preparedUrl = $this->prepareUrlForTracking($url)) {
                     list($urlKey, $urlValue) = $preparedUrl;
-                    $trackableUrls[$urlKey] = $urlValue;
+                    $trackableUrls[$urlKey]  = $urlValue;
                 }
             }
         }
@@ -447,7 +445,7 @@ protected function extractTrackablesFromText($text)
             foreach ($matches[0] as $url) {
                 if ($preparedUrl = $this->prepareUrlForTracking($url)) {
                     list($urlKey, $urlValue) = $preparedUrl;
-                    $trackableUrls[$urlKey] = $urlValue;
+                    $trackableUrls[$urlKey]  = $urlValue;
                 }
             }
         }
@@ -456,7 +454,7 @@ protected function extractTrackablesFromText($text)
     }
 
     /**
-     * Create a Trackable entity
+     * Create a Trackable entity.
      *
      * @param $url
      * @param $channel
@@ -477,7 +475,7 @@ protected function createTrackableEntity($url, $channel, $channelId)
     }
 
     /**
-     * Validate and parse link for tracking
+     * Validate and parse link for tracking.
      *
      * @param $url
      *
@@ -495,7 +493,6 @@ protected function prepareUrlForTracking($url)
 
         // If this is just a token, validate it's supported before going further
         if (preg_match('/^{.*?}$/i', $url) && !$this->validateTokenIsTrackable($url)) {
-
             return false;
         }
 
@@ -506,7 +503,6 @@ protected function prepareUrlForTracking($url)
         $urlParts = parse_url($url);
 
         if (!$this->isValidUrl($urlParts, false)) {
-
             return false;
         }
 
@@ -527,7 +523,6 @@ protected function prepareUrlForTracking($url)
 
             // Validate that the token is something that can be trackable
             if (!$this->validateTokenIsTrackable($token, $tokenizedHost)) {
-
                 return false;
             }
 
@@ -541,7 +536,6 @@ protected function prepareUrlForTracking($url)
             $trackableUrl = $this->httpBuildUrl($urlParts);
 
             if ($this->isInDoNotTrack($trackableUrl)) {
-
                 return false;
             }
         }
@@ -564,7 +558,7 @@ protected function prepareUrlForTracking($url)
     }
 
     /**
-     * Determines if a URL/token is in the do not track list
+     * Determines if a URL/token is in the do not track list.
      *
      * @param $url
      *
@@ -575,7 +569,6 @@ protected function isInDoNotTrack($url)
         // Ensure it's not in the do not track list
         foreach ($this->doNotTrack as $notTrackable) {
             if (preg_match('/'.preg_quote($notTrackable, '/').'/', $url)) {
-
                 return true;
             }
         }
@@ -584,7 +577,7 @@ protected function isInDoNotTrack($url)
     }
 
     /**
-     * Validates that a token is trackable as a URL
+     * Validates that a token is trackable as a URL.
      *
      * @param      $token
      * @param null $tokenizedHost
@@ -602,13 +595,11 @@ protected function validateTokenIsTrackable($token, $tokenizedHost = null)
 
         // Validate if this token is listed as not to be tracked
         if ($this->isInDoNotTrack($token)) {
-
             return false;
         }
 
         // Validate that the token is available and is a URL
         if (!isset($this->contentTokens[$token]) || !$this->isValidUrl($this->contentTokens[$token])) {
-
             return false;
         }
 
@@ -627,13 +618,11 @@ protected function isValidUrl($url, $forceScheme = true)
 
         // Ensure a applicable URL (rule out URLs as just #)
         if (!isset($urlParts['host']) && !isset($urlParts['path'])) {
-
             return false;
         }
 
         // Ensure a valid scheme
         if (($forceScheme && !isset($urlParts['scheme'])) || (isset($urlParts['scheme']) && !in_array($urlParts['scheme'], ['http', 'https', 'ftp', 'ftps']))) {
-
             return false;
         }
 
@@ -641,7 +630,7 @@ protected function isValidUrl($url, $forceScheme = true)
     }
 
     /**
-     * Find and extract tokens from the URL as this have to be processed outside of tracking tokens
+     * Find and extract tokens from the URL as this have to be processed outside of tracking tokens.
      *
      * @param $urlParts Array from parse_url
      *
@@ -675,7 +664,7 @@ protected function extractTokensFromQuery(&$urlParts)
     }
 
     /**
-     * Group query parameters into those that have tokens and those that do not
+     * Group query parameters into those that have tokens and those that do not.
      *
      * @param $query
      *
@@ -683,7 +672,7 @@ protected function extractTokensFromQuery(&$urlParts)
      */
     protected function parseTokenizedQuery($query)
     {
-        $tokenizedParams =
+        $tokenizedParams   =
         $untokenizedParams = [];
 
         // Test to see if there are tokens in the query and if so, extract and append them to the end of the tracked link
@@ -734,10 +723,9 @@ protected function getEntitiesFromUrls($trackableUrls, $channel, $channelId)
     protected function httpBuildUrl($parts)
     {
         if (function_exists('http_build_url')) {
-
             return http_build_url($parts);
         } else {
-            /**
+            /*
              * Used if extension is not installed
              *
              * http_build_url
@@ -872,7 +860,7 @@ protected function httpBuildUrl($parts)
     }
 
     /**
-     * Build query string while accounting for tokens that include an equal sign
+     * Build query string while accounting for tokens that include an equal sign.
      *
      * @param array $queryParts
      *
diff --git a/app/bundles/PageBundle/Model/VideoModel.php b/app/bundles/PageBundle/Model/VideoModel.php
index dd6092c3c64..27a1ee25d0a 100644
--- a/app/bundles/PageBundle/Model/VideoModel.php
+++ b/app/bundles/PageBundle/Model/VideoModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,7 +20,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class PageModel
+ * Class PageModel.
  */
 class VideoModel extends FormModel
 {
@@ -41,7 +42,7 @@ class VideoModel extends FormModel
      */
     public function __construct(LeadModel $leadModel, IpLookupHelper $ipLookupHelper)
     {
-        $this->leadModel = $leadModel;
+        $this->leadModel      = $leadModel;
         $this->ipLookupHelper = $ipLookupHelper;
     }
 
@@ -153,12 +154,11 @@ public function hitVideo($request, $code = '200')
             $this->em->flush($hit);
         } catch (\Exception $exception) {
             if (MAUTIC_ENV === 'dev') {
-
                 throw $exception;
             } else {
                 $this->logger->addError(
                     $exception->getMessage(),
-                    array('exception' => $exception)
+                    ['exception' => $exception]
                 );
             }
         }
diff --git a/app/bundles/PageBundle/PageEvents.php b/app/bundles/PageBundle/PageEvents.php
index 58c42c51879..dd5faa504e3 100644
--- a/app/bundles/PageBundle/PageEvents.php
+++ b/app/bundles/PageBundle/PageEvents.php
@@ -1,24 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle;
 
 /**
- * Class PageEvents
+ * Class PageEvents.
  *
  * Events available for PageBundle
  */
 final class PageEvents
 {
-
     /**
-     * The mautic.video_on_hit event is thrown when a public page is browsed and a hit recorded in the analytics table
+     * The mautic.video_on_hit event is thrown when a public page is browsed and a hit recorded in the analytics table.
      *
      * The event listener receives a Mautic\PageBundle\Event\VideoHitEvent instance.
      *
@@ -27,7 +27,7 @@ final class PageEvents
     const VIDEO_ON_HIT = 'mautic.video_on_hit';
 
     /**
-     * The mautic.page_on_hit event is thrown when a public page is browsed and a hit recorded in the analytics table
+     * The mautic.page_on_hit event is thrown when a public page is browsed and a hit recorded in the analytics table.
      *
      * The event listener receives a Mautic\PageBundle\Event\PageHitEvent instance.
      *
@@ -36,7 +36,7 @@ final class PageEvents
     const PAGE_ON_HIT = 'mautic.page_on_hit';
 
     /**
-     * The mautic.page_on_build event is thrown before displaying the page builder form to allow adding of tokens
+     * The mautic.page_on_build event is thrown before displaying the page builder form to allow adding of tokens.
      *
      * The event listener receives a Mautic\PageBundle\Event\PageEvent instance.
      *
@@ -45,7 +45,7 @@ final class PageEvents
     const PAGE_ON_BUILD = 'mautic.page_on_build';
 
     /**
-     * The mautic.page_on_display event is thrown before displaying the page content
+     * The mautic.page_on_display event is thrown before displaying the page content.
      *
      * The event listener receives a Mautic\PageBundle\Event\PageDisplayEvent instance.
      *
diff --git a/app/bundles/PageBundle/Security/Permissions/PagePermissions.php b/app/bundles/PageBundle/Security/Permissions/PagePermissions.php
index 5353e75a50f..5d648db36b1 100644
--- a/app/bundles/PageBundle/Security/Permissions/PagePermissions.php
+++ b/app/bundles/PageBundle/Security/Permissions/PagePermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PagePermissions
+ * Class PagePermissions.
  */
 class PagePermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/PageBundle/Tests/Controller/PublicController.php b/app/bundles/PageBundle/Tests/Controller/PublicController.php
index 7bb05dd693c..86bdb904168 100644
--- a/app/bundles/PageBundle/Tests/Controller/PublicController.php
+++ b/app/bundles/PageBundle/Tests/Controller/PublicController.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PageBundle\Tests\Controller;
 
-
 use Mautic\CoreBundle\Helper\CookieHelper;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
 use Mautic\CoreBundle\Templating\Helper\AnalyticsHelper;
@@ -26,7 +26,7 @@
 class PublicController extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Test that the appropriate variant is displayed based on hit counts and variant weights
+     * Test that the appropriate variant is displayed based on hit counts and variant weights.
      */
     public function testVariantPageWeightsAreAppropriate()
     {
@@ -36,34 +36,34 @@ public function testVariantPageWeightsAreAppropriate()
         // C = 25%
 
         // A = 0/50; B = 0/25; C = 0/25
-        $this->assertEquals('pageA', $this->getVariantContent(0,0,0));
+        $this->assertEquals('pageA', $this->getVariantContent(0, 0, 0));
 
         // A = 100/50; B = 0/25; C = 0/25
-        $this->assertEquals('pageB', $this->getVariantContent(1,0,0));
+        $this->assertEquals('pageB', $this->getVariantContent(1, 0, 0));
 
         // A = 50/50; B = 50/25; C = 0/25;
-        $this->assertEquals('pageC', $this->getVariantContent(1,1,0));
+        $this->assertEquals('pageC', $this->getVariantContent(1, 1, 0));
 
         // A = 33/50; B = 33/25; C = 33/25;
-        $this->assertEquals('pageA', $this->getVariantContent(1,1,1));
+        $this->assertEquals('pageA', $this->getVariantContent(1, 1, 1));
 
         // A = 66/50; B = 33/25; C = 0/25
-        $this->assertEquals('pageC', $this->getVariantContent(2,1,0));
+        $this->assertEquals('pageC', $this->getVariantContent(2, 1, 0));
 
         // A = 50/50; B = 25/25; C = 25/25
-        $this->assertEquals('pageA', $this->getVariantContent(2,1,1));
+        $this->assertEquals('pageA', $this->getVariantContent(2, 1, 1));
 
         // A = 33/50; B = 66/50; C = 0/25
-        $this->assertEquals('pageC', $this->getVariantContent(1,2,0));
+        $this->assertEquals('pageC', $this->getVariantContent(1, 2, 0));
 
         // A = 25/50; B = 50/50; C = 25/25
-        $this->assertEquals('pageA', $this->getVariantContent(1,2,1));
+        $this->assertEquals('pageA', $this->getVariantContent(1, 2, 1));
 
         // A = 55/50; B = 18/25; C = 27/25
-        $this->assertEquals('pageB', $this->getVariantContent(6,2,3));
+        $this->assertEquals('pageB', $this->getVariantContent(6, 2, 3));
 
         // A = 50/50; B = 25/25; C = 25/25
-        $this->assertEquals('pageA', $this->getVariantContent(6,3,3));
+        $this->assertEquals('pageA', $this->getVariantContent(6, 3, 3));
     }
 
     /**
@@ -209,4 +209,4 @@ private function getVariantContent($aCount, $bCount, $cCount)
 
         return $response->getContent();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php b/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php
index d09056548df..3474086cb20 100644
--- a/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php
+++ b/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -37,24 +38,24 @@ public function testHtmlIsDetectedInContent()
 
         $mockModel->expects($this->once())
             ->method('getEntitiesFromUrls')
-            ->willReturn(array());
+            ->willReturn([]);
 
         $mockModel->expects($this->once())
             ->method('extractTrackablesFromHtml')
             ->willReturn(
-                array(
+                [
                     '',
-                    array()
-                )
+                    [],
+                ]
             );
 
         $mockModel->expects($this->once())
             ->method('createTrackingTokens')
-            ->willReturn(array());
+            ->willReturn([]);
 
         list($content, $trackables) = $mockModel->parseContentForTrackables(
             $this->generateContent('https://foo-bar.com', 'html'),
-            array(),
+            [],
             'email',
             1
         );
@@ -82,24 +83,24 @@ public function testPlainTextIsDetectedInContent()
 
         $mockModel->expects($this->once())
             ->method('getEntitiesFromUrls')
-            ->willReturn(array());
+            ->willReturn([]);
 
         $mockModel->expects($this->once())
             ->method('extractTrackablesFromText')
             ->willReturn(
-                array(
+                [
                     '',
-                    array()
-                )
+                    [],
+                ]
             );
 
         $mockModel->expects($this->once())
             ->method('createTrackingTokens')
-            ->willReturn(array());
+            ->willReturn([]);
 
         list($content, $trackables) = $mockModel->parseContentForTrackables(
             $this->generateContent('https://foo-bar.com', 'text'),
-            array(),
+            [],
             'email',
             1
         );
@@ -116,12 +117,12 @@ public function testPlainTextIsDetectedInContent()
      */
     public function testStandardLinkWithStandardQuery()
     {
-        $url = 'https://foo-bar.com?foo=bar';
+        $url   = 'https://foo-bar.com?foo=bar';
         $model = $this->getModel($url);
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'html'),
-            array(),
+            [],
             'email',
             1
         );
@@ -150,12 +151,12 @@ public function testStandardLinkWithStandardQuery()
      */
     public function testStandardLinkWithoutQuery()
     {
-        $url = 'https://foo-bar.com';
+        $url   = 'https://foo-bar.com';
         $model = $this->getModel($url);
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'html'),
-            array(),
+            [],
             'email',
             1
         );
@@ -189,9 +190,9 @@ public function testStandardLinkWithTokenizedQuery()
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'html'),
-            array(
-                '{contactfield=bar}' => ''
-            ),
+            [
+                '{contactfield=bar}' => '',
+            ],
             'email',
             1
         );
@@ -219,9 +220,9 @@ public function testTokenizedHostIsIgnored()
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'html'),
-            array(
-                '{contactfield=foo}' => ''
-            ),
+            [
+                '{contactfield=foo}' => '',
+            ],
             'email',
             1
         );
@@ -239,13 +240,13 @@ public function testTokenizedHostIsIgnored()
     public function testIgnoredTokensAreNotConverted()
     {
         $url   = 'https://{unsubscribe_url}';
-        $model = $this->getModel($url, null, array('{unsubscribe_url}'));
+        $model = $this->getModel($url, null, ['{unsubscribe_url}']);
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'html'),
-            array(
-                '{unsubscribe_url}' => 'https://domain.com/email/unsubscribe/xxxxxxx'
-            ),
+            [
+                '{unsubscribe_url}' => 'https://domain.com/email/unsubscribe/xxxxxxx',
+            ],
             'email',
             1
         );
@@ -254,7 +255,6 @@ public function testIgnoredTokensAreNotConverted()
         $this->assertFalse(strpos($url, $content), 'https:// should have been stripped from the token URL');
     }
 
-
     /**
      * @testdox Test that tokens that are supposed to be ignored are
      *
@@ -269,9 +269,9 @@ public function testUnsupportedTokensAreNotConverted()
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'text'),
-            array(
-                '{unsubscribe_url}' => 'https://domain.com/email/unsubscribe/xxxxxxx'
-            ),
+            [
+                '{unsubscribe_url}' => 'https://domain.com/email/unsubscribe/xxxxxxx',
+            ],
             'email',
             1
         );
@@ -289,11 +289,11 @@ public function testUnsupportedTokensAreNotConverted()
     public function testIgnoredUrlDoesNotCrash()
     {
         $url   = 'https://domain.com';
-        $model = $this->getModel($url, null, array($url));
+        $model = $this->getModel($url, null, [$url]);
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'html'),
-            array(),
+            [],
             'email',
             1
         );
@@ -318,9 +318,9 @@ public function testTokenAsHostIsConvertedToTrackableToken()
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($url, 'html'),
-            array(
-                '{pagelink=1}' => 'http://foo-bar.com'
-            ),
+            [
+                '{pagelink=1}' => 'http://foo-bar.com',
+            ],
             'email',
             1
         );
@@ -339,16 +339,16 @@ public function testTokenAsHostIsConvertedToTrackableToken()
      */
     public function testUrlsWithSameBaseAreReplacedCorrectly()
     {
-        $urls = array(
+        $urls = [
             'https://foo-bar.com',
             'https://foo-bar.com?foo=bar',
-        );
+        ];
 
         $model = $this->getModel($urls);
 
         list($content, $trackables) = $model->parseContentForTrackables(
             $this->generateContent($urls, 'html'),
-            array(),
+            [],
             'email',
             1
         );
@@ -363,17 +363,18 @@ public function testUrlsWithSameBaseAreReplacedCorrectly()
      * @param       $urls
      * @param null  $tokenUrls
      * @param array $doNotTrack
+     *
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getModel($urls, $tokenUrls = null, $doNotTrack = array())
+    protected function getModel($urls, $tokenUrls = null, $doNotTrack = [])
     {
         if (!is_array($urls)) {
-            $urls = array($urls);
+            $urls = [$urls];
         }
         if (null === $tokenUrls) {
             $tokenUrls = $urls;
         } elseif (!is_array($tokenUrls)) {
-            $tokenUrls = array($tokenUrls);
+            $tokenUrls = [$tokenUrls];
         }
 
         $mockRedirectModel = $this->getMockBuilder('Mautic\PageBundle\Model\RedirectModel')
@@ -389,7 +390,7 @@ protected function getModel($urls, $tokenUrls = null, $doNotTrack = array())
             ->method('getDoNotTrackList')
             ->willReturn($doNotTrack);
 
-        $entities = array();
+        $entities = [];
         foreach ($urls as $k => $url) {
             $entities[$url] = $this->getTrackableEntity($tokenUrls[$k]);
         }
@@ -435,12 +436,12 @@ protected function generateContent($urls, $type, $doNotTrack = false)
     {
         $content = '';
         if (!is_array($urls)) {
-            $urls = array($urls);
+            $urls = [$urls];
         }
 
         foreach ($urls as $url) {
             if ($type == 'html') {
-                $dnc = ($doNotTrack) ? " mautic:disable-tracking" : "";
+                $dnc = ($doNotTrack) ? ' mautic:disable-tracking' : '';
 
                 $content .= <<<CONTENT
     ABC123 321ABC
diff --git a/app/bundles/PageBundle/Views/AbTest/form.html.php b/app/bundles/PageBundle/Views/AbTest/form.html.php
index 26369c45f8e..2d647ddea39 100644
--- a/app/bundles/PageBundle/Views/AbTest/form.html.php
+++ b/app/bundles/PageBundle/Views/AbTest/form.html.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 //do not include the surrounding form since this will be embedded into the current form
 foreach ($form as $f) {
     echo $view['form']->row($f);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php b/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php
index 35598128a19..c454c87f264 100644
--- a/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php
+++ b/app/bundles/PageBundle/Views/FormTheme/Config/_config_pageconfig_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/PageBundle/Views/FormTheme/Page/_page_abtest_settings_properties_row.html.php b/app/bundles/PageBundle/Views/FormTheme/Page/_page_abtest_settings_properties_row.html.php
index 137fa2e79f5..da6e22852ae 100644
--- a/app/bundles/PageBundle/Views/FormTheme/Page/_page_abtest_settings_properties_row.html.php
+++ b/app/bundles/PageBundle/Views/FormTheme/Page/_page_abtest_settings_properties_row.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-echo $view['form']->widget($form);
\ No newline at end of file
+echo $view['form']->widget($form);
diff --git a/app/bundles/PageBundle/Views/FormTheme/Page/_page_variantSettings_properties_row.html.php b/app/bundles/PageBundle/Views/FormTheme/Page/_page_variantSettings_properties_row.html.php
index 137fa2e79f5..da6e22852ae 100644
--- a/app/bundles/PageBundle/Views/FormTheme/Page/_page_variantSettings_properties_row.html.php
+++ b/app/bundles/PageBundle/Views/FormTheme/Page/_page_variantSettings_properties_row.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-echo $view['form']->widget($form);
\ No newline at end of file
+echo $view['form']->widget($form);
diff --git a/app/bundles/PageBundle/Views/FormTheme/Point/pointaction_urlhit_widget.html.php b/app/bundles/PageBundle/Views/FormTheme/Point/pointaction_urlhit_widget.html.php
index 89ed66e7931..d1ce1e21071 100644
--- a/app/bundles/PageBundle/Views/FormTheme/Point/pointaction_urlhit_widget.html.php
+++ b/app/bundles/PageBundle/Views/FormTheme/Point/pointaction_urlhit_widget.html.php
@@ -1,18 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-
-$timeFrames = array(
+$timeFrames = [
     'i' => $view['translator']->trans('mautic.core.time.minutes'),
     'H' => $view['translator']->trans('mautic.core.time.hours'),
     'd' => $view['translator']->trans('mautic.core.time.days'),
-);
+];
 
 ?>
 
@@ -27,7 +26,7 @@
         <?php echo $view['form']->row($form['page_hits']); ?>
     </div>
     <!-- <div class="col-xs-6">
-        <?php //echo $view['form']->row($form['first_time']); ?>
+        <?php //echo $view['form']->row($form['first_time']);?>
     </div> -->
 </div>
 
diff --git a/app/bundles/PageBundle/Views/Page/Slots/slideshow.html.php b/app/bundles/PageBundle/Views/Page/Slots/slideshow.html.php
index 7edf4596b46..08d9c5e956f 100644
--- a/app/bundles/PageBundle/Views/Page/Slots/slideshow.html.php
+++ b/app/bundles/PageBundle/Views/Page/Slots/slideshow.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,11 @@
 
 // define default values
 if (!isset($height) || !$height) {
-	$height = '300px';
+    $height = '300px';
 }
 
 if (!isset($width) || !$width) {
-	$width = '100%';
+    $width = '100%';
 }
 
 if (!isset($background_color) || !$background_color) {
@@ -26,7 +27,7 @@
 }
 
 if ($background_color != 'transparent') {
-    $background_color = '#' . $background_color;
+    $background_color = '#'.$background_color;
 }
 
 // css declaration for whole slideshow
@@ -52,7 +53,7 @@
 <?php if (isset($dot_navigation) && $dot_navigation) : ?>
     <!-- Indicators -->
     <ol class="carousel-indicators">
-    <?php foreach($slides as $key => $slide) : ?>
+    <?php foreach ($slides as $key => $slide) : ?>
         <li data-target="#carousel-generic-<?php echo $slot ?>" data-slide-to="<?php echo $key; ?>" <?php echo $key == 0 ? 'class="active"' : '' ?>></li>
 	<?php endforeach; ?>
     </ol>
@@ -60,7 +61,7 @@
 
     <!-- Wrapper for slides -->
     <div class="carousel-inner" role="listbox">
-	<?php foreach($slides as $key => $slide) : ?>
+	<?php foreach ($slides as $key => $slide) : ?>
 		<?php
 // css declaration for each slide
 $css = <<<CSS
@@ -71,7 +72,7 @@
 CSS;
 
 $view['assets']->addStyleDeclaration($css);
-		?>
+        ?>
         <div class="item text-center <?php echo $key == 0 ? 'active' : '' ?> slide-<?php echo $slot ?>-<?php echo $key ?>">
             <?php if (!empty($slide['captionheader']) || !empty($slide['captionheader'])) : ?>
             <div class="carousel-caption">
@@ -158,7 +159,7 @@
 			<div class="modal-body">
 				<div class="col-md-3 bg-white height-auto list-of-slides">
 					<ul class="list-group list-group-tabs" data-toggle="sortablelist">
-					<?php foreach($slides as $key => $slide) : ?>
+					<?php foreach ($slides as $key => $slide) : ?>
 		                 <li class="list-group-item <?php echo $key == 0 ? 'active' : '' ?>">
 							<a href="#slide-tab-<?php echo $key; ?>" class="steps" data-toggle="tab">
 								Slide <span class="slide-id"><?php echo $key; ?></span>
@@ -178,14 +179,14 @@
 					<div class="tab-pane fade bdr-rds-0 bdr-w-0 <?php echo $key == 0 ? 'in active' : '' ?>" id="slide-tab-<?php echo $key; ?>">
 						<?php echo $view['form']->start($slide['form']); ?>
 						<div class="row text-right">
-							<?php echo $view['form']->row($slide['form']['slides:' . $key . ':remove']); ?>
+							<?php echo $view['form']->row($slide['form']['slides:'.$key.':remove']); ?>
 						</div>
-						<?php echo $view['form']->row($slide['form']['slides:' . $key . ':captionheader']); ?>
-						<?php echo $view['form']->row($slide['form']['slides:' . $key . ':captionbody']); ?>
-						<?php echo $view['form']->row($slide['form']['slides:' . $key . ':order']); ?>
+						<?php echo $view['form']->row($slide['form']['slides:'.$key.':captionheader']); ?>
+						<?php echo $view['form']->row($slide['form']['slides:'.$key.':captionbody']); ?>
+						<?php echo $view['form']->row($slide['form']['slides:'.$key.':order']); ?>
 						<div class="row">
 							<div class="col-md-9">
-								<?php echo $view['form']->row($slide['form']['slides:' . $key . ':background-image']); ?>
+								<?php echo $view['form']->row($slide['form']['slides:'.$key.':background-image']); ?>
 							</div>
 							<div class="col-md-3">
 								<button type="button" onclick="SlideshowManager.BrowseServer('slides:<?php echo $key; ?>:background-image');" class="btn button-default file-manager-toggle">
diff --git a/app/bundles/PageBundle/Views/Page/details.html.php b/app/bundles/PageBundle/Views/Page/details.html.php
index d0b07e3bb32..041f900a341 100644
--- a/app/bundles/PageBundle/Views/Page/details.html.php
+++ b/app/bundles/PageBundle/Views/Page/details.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,7 @@
 //@todo - add landing page stats/analytics
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'page');
-$view['slots']->set("headerTitle", $activePage->getTitle());
+$view['slots']->set('headerTitle', $activePage->getTitle());
 
 $variantContent = $view->render(
     'MauticCoreBundle:Variant:index.html.php',
@@ -24,7 +25,7 @@
         'nameGetter'    => 'getTitle',
     ]
 );
-$showVariants    = !empty(trim($variantContent));
+$showVariants = !empty(trim($variantContent));
 
 $translationContent = $view->render(
     'MauticCoreBundle:Translation:index.html.php',
@@ -36,7 +37,7 @@
         'nameGetter'   => 'getTitle',
     ]
 );
-$showTranslations   = !empty(trim($translationContent));
+$showTranslations = !empty(trim($translationContent));
 
 // Only show A/B test button if not already a translation of an a/b test
 $allowAbTest = $activePage->isTranslation(true) && $translations['parent']->isVariant() ? false : true;
@@ -49,7 +50,7 @@
             'item'            => $activePage,
             'customButtons'   => (isset($customButtons)) ? $customButtons : [],
             'templateButtons' => [
-                'edit'   => $view['security']->hasEntityAccess(
+                'edit' => $view['security']->hasEntityAccess(
                     $permissions['page:pages:editown'],
                     $permissions['page:pages:editother'],
                     $activePage->getCreatedBy()
@@ -61,13 +62,13 @@
                     $permissions['page:pages:deleteown'],
                     $activePage->getCreatedBy()
                 ),
-                'close'  => $view['security']->hasEntityAccess(
+                'close' => $view['security']->hasEntityAccess(
                     $permissions['page:pages:viewown'],
                     $permissions['page:pages:viewother'],
                     $activePage->getCreatedBy()
                 ),
             ],
-            'routeBase'       => 'page',
+            'routeBase' => 'page',
         ]
     )
 );
diff --git a/app/bundles/PageBundle/Views/Page/form.html.php b/app/bundles/PageBundle/Views/Page/form.html.php
index ea4a5f8da60..1f20eb210a5 100644
--- a/app/bundles/PageBundle/Views/Page/form.html.php
+++ b/app/bundles/PageBundle/Views/Page/form.html.php
@@ -1,33 +1,33 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'page');
 $isExisting = $activePage->getId();
 
 $variantParent = $activePage->getVariantParent();
-$subheader = ($variantParent) ? '<div><span class="small">' . $view['translator']->trans('mautic.core.variant_of', [
-    '%name%' => $activePage->getTitle(),
-    '%parent%' => $variantParent->getTitle()
-]) . '</span></div>' : '';
+$subheader     = ($variantParent) ? '<div><span class="small">'.$view['translator']->trans('mautic.core.variant_of', [
+    '%name%'   => $activePage->getTitle(),
+    '%parent%' => $variantParent->getTitle(),
+]).'</span></div>' : '';
 
 $header = $isExisting ?
     $view['translator']->trans('mautic.page.header.edit',
         ['%name%' => $activePage->getTitle()]) :
     $view['translator']->trans('mautic.page.header.new');
 
-$view['slots']->set("headerTitle", $header.$subheader);
+$view['slots']->set('headerTitle', $header.$subheader);
 
 $template = $form['template']->vars['data'];
 
-$attr = $form->vars['attr'];
-$attr['data-submit-callback-async'] = "clearThemeHtmlBeforeSave";
+$attr                               = $form->vars['attr'];
+$attr['data-submit-callback-async'] = 'clearThemeHtmlBeforeSave';
 ?>
 
 <?php echo $view['form']->start($form, ['attr' => $attr]); ?>
@@ -39,13 +39,13 @@
             <div class="col-xs-12">
                 <!-- tabs controls -->
                 <ul class="bg-auto nav nav-tabs pr-md pl-md">
-                    <li <?php echo !$isExisting ? "class='active'" : ""; ?>><a href="#theme-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.form.theme'); ?></a></li>
-                    <li <?php echo $isExisting ? "class='active'" : ""; ?>><a href="#source-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.content'); ?></a></li>
+                    <li <?php echo !$isExisting ? "class='active'" : ''; ?>><a href="#theme-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.form.theme'); ?></a></li>
+                    <li <?php echo $isExisting ? "class='active'" : ''; ?>><a href="#source-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.core.content'); ?></a></li>
                 </ul>
 
                 <!--/ tabs controls -->
                 <div class="tab-content pa-md">
-                    <div class="tab-pane fade <?php echo !$isExisting ? "in active" : ""; ?> bdr-w-0" id="theme-container">
+                    <div class="tab-pane fade <?php echo !$isExisting ? 'in active' : ''; ?> bdr-w-0" id="theme-container">
                         <div class="row">
                             <div class="col-md-12">
                                 <?php echo $view['form']->row($form['template']); ?>
@@ -55,11 +55,11 @@
                         <?php echo $view->render('MauticCoreBundle:Helper:theme_select.html.php', [
                             'type'   => 'page',
                             'themes' => $themes,
-                            'active' => $form['template']->vars['value']
+                            'active' => $form['template']->vars['value'],
                         ]); ?>
                     </div>
 
-                    <div class="tab-pane fade <?php echo $isExisting ? "in active" : ""; ?> bdr-w-0" id="source-container">
+                    <div class="tab-pane fade <?php echo $isExisting ? 'in active' : ''; ?> bdr-w-0" id="source-container">
                         <div class="row">
                             <div class="col-md-12" id="customHtmlContainer" style="min-height: 325px;">
                                 <?php echo $view['form']->row($form['customHtml']); ?>
@@ -115,5 +115,5 @@
     'sectionForm'   => $sectionForm,
     'builderAssets' => $builderAssets,
     'slots'         => $slots,
-    'objectId'      => $activePage->getSessionId()
+    'objectId'      => $activePage->getSessionId(),
 ]); ?>
diff --git a/app/bundles/PageBundle/Views/Page/index.html.php b/app/bundles/PageBundle/Views/Page/index.html.php
index 91ac87f5300..35a38601c52 100644
--- a/app/bundles/PageBundle/Views/Page/index.html.php
+++ b/app/bundles/PageBundle/Views/Page/index.html.php
@@ -1,40 +1,40 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'page');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.page.pages'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.page.pages'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['page:pages:create']
-            ),
-            'routeBase'       => 'page'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['page:pages:create'],
+            ],
+            'routeBase' => 'page',
+        ]
     )
 );
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'searchHelp'  => 'mautic.page.help.searchcommands',
-        'action'      => $currentRoute,
-        'routeBase'   => 'page',
-        'templateButtons' => array(
-            'delete' => $permissions['page:pages:deleteown'] || $permissions['page:pages:deleteother']
-        )
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.page.help.searchcommands',
+        'action'          => $currentRoute,
+        'routeBase'       => 'page',
+        'templateButtons' => [
+            'delete' => $permissions['page:pages:deleteown'] || $permissions['page:pages:deleteother'],
+        ],
+    ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
     </div>
diff --git a/app/bundles/PageBundle/Views/Page/list.html.php b/app/bundles/PageBundle/Views/Page/list.html.php
index 7dec0d5e069..c7cf941ce93 100644
--- a/app/bundles/PageBundle/Views/Page/list.html.php
+++ b/app/bundles/PageBundle/Views/Page/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
-$view->extend('MauticPageBundle:Page:index.html.php');
+if ($tmpl == 'index') {
+    $view->extend('MauticPageBundle:Page:index.html.php');
+}
 ?>
 
 <?php if (count($items)): ?>
@@ -16,39 +18,39 @@
                 <thead>
                 <tr>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'checkall' => 'true',
-                        'target'   => '#pageTable'
-                    ));
+                        'target'   => '#pageTable',
+                    ]);
 
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'page',
                         'orderBy'    => 'p.title',
                         'text'       => 'mautic.core.title',
                         'class'      => 'col-page-title',
-                        'default'    => true
-                    ));
+                        'default'    => true,
+                    ]);
 
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'page',
                         'orderBy'    => 'c.title',
                         'text'       => 'mautic.core.category',
-                        'class'      => 'visible-md visible-lg col-page-category'
-                    ));
+                        'class'      => 'visible-md visible-lg col-page-category',
+                    ]);
 
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'page',
                         'orderBy'    => 'p.hits',
                         'text'       => 'mautic.page.thead.hits',
-                        'class'      => 'col-page-hits visible-md visible-lg'
-                    ));
+                        'class'      => 'col-page-hits visible-md visible-lg',
+                    ]);
 
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'page',
                         'orderBy'    => 'p.id',
                         'text'       => 'mautic.core.id',
-                        'class'      => 'col-page-id visible-md visible-lg'
-                    ));
+                        'class'      => 'col-page-id visible-md visible-lg',
+                    ]);
                     ?>
                 </tr>
                 </thead>
@@ -57,21 +59,21 @@
                     <tr>
                         <td>
                             <?php
-                            echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                                'item'      => $item,
-                                'templateButtons' => array(
-                                    'edit'      => $view['security']->hasEntityAccess($permissions['page:pages:editown'], $permissions['page:pages:editother'], $item->getCreatedBy()),
-                                    'clone'     => $permissions['page:pages:create'],
-                                    'delete'    => $view['security']->hasEntityAccess($permissions['page:pages:deleteown'], $permissions['page:pages:deleteother'], $item->getCreatedBy()),
-                                ),
-                                'routeBase' => 'page',
-                                'nameGetter' => 'getTitle'
-                            ));
+                            echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                                'item'            => $item,
+                                'templateButtons' => [
+                                    'edit'   => $view['security']->hasEntityAccess($permissions['page:pages:editown'], $permissions['page:pages:editother'], $item->getCreatedBy()),
+                                    'clone'  => $permissions['page:pages:create'],
+                                    'delete' => $view['security']->hasEntityAccess($permissions['page:pages:deleteown'], $permissions['page:pages:deleteother'], $item->getCreatedBy()),
+                                ],
+                                'routeBase'  => 'page',
+                                'nameGetter' => 'getTitle',
+                            ]);
                             ?>
                         </td>
                         <td>
-                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array('item' => $item, 'model' => 'page.page')); ?>
-                            <a href="<?php echo $view['router']->path('mautic_page_action', array("objectAction" => "view", "objectId" => $item->getId())); ?>" data-toggle="ajax">
+                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'page.page']); ?>
+                            <a href="<?php echo $view['router']->path('mautic_page_action', ['objectAction' => 'view', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                                 <?php echo $item->getTitle(); ?> (<?php echo $item->getAlias(); ?>)
                                 <?php
                                 $hasVariants     = $item->isVariant();
@@ -96,7 +98,7 @@
                         <td class="visible-md visible-lg">
                             <?php $category = $item->getCategory(); ?>
                             <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                            <?php $color    = ($category) ? '#' . $category->getColor() : 'inherit'; ?>
+                            <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                             <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                         </td>
                         <td class="visible-md visible-lg"><?php echo $item->getHits(); ?></td>
@@ -106,14 +108,14 @@
                 </tbody>
             </table>
         <div class="panel-footer">
-        <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-            "totalItems"      => count($items),
-            "page"            => $page,
-            "limit"           => $limit,
-            "menuLinkId"      => 'mautic_page_index',
-            "baseUrl"         => $view['router']->path('mautic_page_index'),
-            'sessionVar'      => 'page'
-        )); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+            'totalItems' => count($items),
+            'page'       => $page,
+            'limit'      => $limit,
+            'menuLinkId' => 'mautic_page_index',
+            'baseUrl'    => $view['router']->path('mautic_page_index'),
+            'sessionVar' => 'page',
+        ]); ?>
         </div>
     </div>
 <?php else: ?>
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/AbTest/bargraph.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/AbTest/bargraph.html.php
index 8f2c795db9c..f6645f28529 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/AbTest/bargraph.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/AbTest/bargraph.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $support = $results['support'];
-$label = $view['translator']->trans($variants['criteria'][$results['basedOn']]['label']);
-$chart = new \Mautic\CoreBundle\Helper\Chart\BarChart($support['labels']);
+$label   = $view['translator']->trans($variants['criteria'][$results['basedOn']]['label']);
+$chart   = new \Mautic\CoreBundle\Helper\Chart\BarChart($support['labels']);
 
 if ($support['data']) {
     foreach ($support['data'] as $datasetLabel => $values) {
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/index.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/index.html.php
index 113c81ece07..242bad755bb 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/index.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/index.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-$searchBtnClass = (!empty($searchValue)) ? "fa-eraser" : "fa-search";
+$searchBtnClass = (!empty($searchValue)) ? 'fa-eraser' : 'fa-search';
 ?>
 
 <div class="input-group ma-5">
-    <input type="search" class="form-control" id="pageBuilderTokenSearch" name="search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#pageBuilderTokens" data-action="<?php echo $view['router']->path('mautic_page_buildertoken_index', array('page' => $page)); ?>" />
+    <input type="search" class="form-control" id="pageBuilderTokenSearch" name="search" placeholder="<?php echo $view['translator']->trans('mautic.core.search.placeholder'); ?>" value="<?php echo $searchValue; ?>" autocomplete="false" data-toggle="livesearch" data-target="#pageBuilderTokens" data-action="<?php echo $view['router']->path('mautic_page_buildertoken_index', ['page' => $page]); ?>" />
     <div class="input-group-btn">
         <button type="button" class="btn btn-default btn-search btn-filter" data-livesearch-parent="pageBuilderTokenSearch">
             <i class="fa <?php echo $searchBtnClass; ?> fa-fw"></i>
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/list.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/list.html.php
index b9833c6ad41..f6b29a29e41 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/list.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/BuilderToken/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') {
     $view->extend('MauticPageBundle:SubscribedEvents\BuilderToken:index.html.php');
 }
@@ -16,23 +16,23 @@
     <div class="list-group ma-5">
         <?php foreach ($items as $i): ?>
             <a href="#" class="list-group-item" data-token='<a href="%url={pagelink=<?php echo $i->getId(); ?>}%">%text=<?php echo $i->getName(); ?>%</a>' data-drop="showBuilderLinkModal">
-                <span><i class="fa fa-fw fa-file-text-o"></i><?php echo $i->getName() . ' (' . $i->getLanguage() . ')'; ?></span>
+                <span><i class="fa fa-fw fa-file-text-o"></i><?php echo $i->getName().' ('.$i->getLanguage().')'; ?></span>
             </a>
         <?php endforeach; ?>
     </div>
 
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems"        => count($items),
-        "page"              => $page,
-        "limit"             => $limit,
-        "fixedLimit"        => true,
-        "baseUrl"           => $view['router']->path('mautic_page_buildertoken_index'),
-        "paginationWrapper" => 'text-center',
-        "paginationClass"   => "sm",
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems'        => count($items),
+        'page'              => $page,
+        'limit'             => $limit,
+        'fixedLimit'        => true,
+        'baseUrl'           => $view['router']->path('mautic_page_buildertoken_index'),
+        'paginationWrapper' => 'text-center',
+        'paginationClass'   => 'sm',
         'sessionVar'        => 'page.buildertoken',
         'ignoreFormExit'    => true,
         'queryString'       => 'tmpl=list',
-        'target'            => '#pageBuilderTokens'
-    )); ?>
+        'target'            => '#pageBuilderTokens',
+    ]); ?>
     <?php endif; ?>
 </div>
\ No newline at end of file
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/Calendar/modal.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/Calendar/modal.html.php
index 11a9c7e8836..28036988dcd 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/Calendar/modal.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/Calendar/modal.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <?php echo $view['form']->start($form); ?>
 <?php echo $view['form']->errors($form) ?>
@@ -17,13 +17,13 @@
 <br />
 <div class="text-center">
 	<a href="<?php echo $view['router']->path('mautic_page_action',
-	    array("objectAction" => "edit", "objectId" => $entity->getId())); ?>"
+        ['objectAction' => 'edit', 'objectId' => $entity->getId()]); ?>"
 	    data-toggle="ajax">
 	    <?php echo $view['translator']->trans('mautic.page.menu.edit'); ?>
 	</a>
 	|
 	<a href="<?php echo $view['router']->path('mautic_page_action',
-	    array("objectAction" => "view", "objectId" => $entity->getId())); ?>"
+        ['objectAction' => 'view', 'objectId' => $entity->getId()]); ?>"
 	    data-toggle="ajax">
 	    <?php echo $view['translator']->trans('mautic.core.details'); ?>
 	</a>
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/langbar.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/langbar.html.php
index 9c0e90176f7..d3cc2d6d389 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/langbar.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/langbar.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $count = count($pages);
@@ -14,13 +15,13 @@
     <?php $active = ($app->getRequest()->getRequestUri() == $page['url']); ?>
     <span>
         <?php if (!$active): ?>
-        <a href="<?php echo $page["url"]; ?>">
+        <a href="<?php echo $page['url']; ?>">
             <?php endif; ?>
-        <?php echo $page["lang"]; ?>
+        <?php echo $page['lang']; ?>
         <?php if (!$active): ?>
         </a>
         <?php endif; ?>
     </span>
-    <?php $count--; ?>
+    <?php --$count; ?>
     <?php endforeach; ?>
 </div>
\ No newline at end of file
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/sharebtn_css.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/sharebtn_css.html.php
index 7add352ef02..48e7ffb11cd 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/sharebtn_css.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/sharebtn_css.html.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$css = <<<CSS
+$css = <<<'CSS'
 .share-buttons { display: block; }
 .share-button { float: left; margin-right: 5px; }
 .share-button.facebook-share-button.layout-box_count.action-like  iframe { width: 50px !important; }
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/token.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/token.html.php
index 0d7dc02a872..e9eaa6b7341 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/token.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/PageToken/token.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/Search/global.html.php
index 105d15eca91..312dcec1833 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,18 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_page_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_page_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
 </a>
 <?php else: ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_page_action', array('objectAction' => 'view', 'objectId' => $page->getId())); ?>" data-toggle="ajax">
+<a href="<?php echo $this->container->get('router')->generate('mautic_page_action', ['objectAction' => 'view', 'objectId' => $page->getId()]); ?>" data-toggle="ajax">
     <?php echo $page->getTitle(); ?>
     <span class="label label-default pull-right" data-toggle="tooltip" title="<?php echo $view['translator']->trans('mautic.page.hits'); ?>" data-placement="left">
         <?php echo $page->getHits(); ?>
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/index.html.php
index 91bd30b34c8..0b91478eee4 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $timeOnPage = $view['translator']->trans('mautic.core.unknown');
 if ($event['extra']['hit']['dateLeft']) {
     $timeOnPage = ($event['extra']['hit']['dateLeft']->getTimestamp() - $event['extra']['hit']['dateHit']->getTimestamp());
 
     // format the time
     if ($timeOnPage > 60) {
-        $sec = $timeOnPage % 60;
-        $min = floor($timeOnPage / 60);
-        $timeOnPage = $min . 'm ' . $sec . 's';
+        $sec        = $timeOnPage % 60;
+        $min        = floor($timeOnPage / 60);
+        $timeOnPage = $min.'m '.$sec.'s';
     } else {
         $timeOnPage .= 's';
     }
diff --git a/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/videohit.html.php b/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/videohit.html.php
index b39b3f7eb82..4aa3700fe2f 100644
--- a/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/videohit.html.php
+++ b/app/bundles/PageBundle/Views/SubscribedEvents/Timeline/videohit.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $viewTime = $duration = $percentage = $unknown = $view['translator']->trans('mautic.core.unknown');
 
 if ($event['extra']['hit']['time_watched']) {
@@ -16,7 +16,7 @@
     if ($viewTime > 60) {
         $sec      = $viewTime % 60;
         $min      = floor($viewTime / 60);
-        $viewTime = $min . 'm ' . $sec . 's';
+        $viewTime = $min.'m '.$sec.'s';
     } else {
         $viewTime .= 's';
     }
@@ -29,7 +29,7 @@
     if ($duration > 60) {
         $sec      = $duration % 60;
         $min      = floor($duration / 60);
-        $duration = $min . 'm ' . $sec . 's';
+        $duration = $min.'m '.$sec.'s';
     } else {
         $duration .= 's';
     }
diff --git a/app/bundles/PageBundle/Views/Trackable/click_counts.html.php b/app/bundles/PageBundle/Views/Trackable/click_counts.html.php
index d3563dc0c86..d0beeb7443c 100644
--- a/app/bundles/PageBundle/Views/Trackable/click_counts.html.php
+++ b/app/bundles/PageBundle/Views/Trackable/click_counts.html.php
@@ -11,11 +11,11 @@
             </thead>
             <tbody>
                 <?php 
-                    $totalClicks = 0;
+                    $totalClicks       = 0;
                     $totalUniqueClicks = 0;
-                    foreach ($trackables as $link): 
-                        $totalClicks +=  $link['hits'];
-                        $totalUniqueClicks +=  $link['unique_hits'];
+                    foreach ($trackables as $link):
+                        $totalClicks += $link['hits'];
+                        $totalUniqueClicks += $link['unique_hits'];
                         ?>
                         <tr>
                             <td class="long-text"><a href="<?php echo $link['url']; ?>"><?php echo $link['url']; ?></a></td>
@@ -38,10 +38,10 @@
 <?php else: ?>
     <?php echo $view->render(
         'MauticCoreBundle:Helper:noresults.html.php',
-        array(
+        [
             'header'  => 'mautic.trackable.click_counts.header_none',
-            'message' => 'mautic.trackable.click_counts.none'
-        )
+            'message' => 'mautic.trackable.click_counts.none',
+        ]
     ); ?>
     <div class="clearfix"></div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Bundle/PluginBundleBase.php b/app/bundles/PluginBundle/Bundle/PluginBundleBase.php
index c03c6d707dc..9f8fc0291d6 100644
--- a/app/bundles/PluginBundle/Bundle/PluginBundleBase.php
+++ b/app/bundles/PluginBundle/Bundle/PluginBundleBase.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,12 +12,12 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\ORM\Tools\SchemaTool;
-use Mautic\PluginBundle\Entity\Plugin;
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\PluginBundle\Entity\Plugin;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Base Bundle class which should be extended by addon bundles
+ * Base Bundle class which should be extended by addon bundles.
  */
 abstract class PluginBundleBase extends Bundle
 {
@@ -28,7 +29,7 @@ abstract class PluginBundleBase extends Bundle
      *
      * @throws \Exception
      */
-    static public function onPluginInstall(Plugin $plugin, MauticFactory $factory, $metadata = null, $installedSchema = null)
+    public static function onPluginInstall(Plugin $plugin, MauticFactory $factory, $metadata = null, $installedSchema = null)
     {
         if ($metadata !== null) {
             self::installPluginSchema($metadata, $factory, $installedSchema);
@@ -36,7 +37,7 @@ static public function onPluginInstall(Plugin $plugin, MauticFactory $factory, $
     }
 
     /**
-     * Install plugin schema based on Doctrine metadata
+     * Install plugin schema based on Doctrine metadata.
      *
      * @param array         $metadata
      * @param MauticFactory $factory
@@ -44,7 +45,7 @@ static public function onPluginInstall(Plugin $plugin, MauticFactory $factory, $
      *
      * @throws \Exception
      */
-    static public function installPluginSchema(array $metadata, MauticFactory $factory, $installedSchema = null)
+    public static function installPluginSchema(array $metadata, MauticFactory $factory, $installedSchema = null)
     {
         if (null !== $installedSchema) {
             // Schema exists so bail
@@ -70,7 +71,7 @@ static public function installPluginSchema(array $metadata, MauticFactory $facto
     }
 
     /**
-     * Called by PluginController::reloadAction when the addon version does not match what's installed
+     * Called by PluginController::reloadAction when the addon version does not match what's installed.
      *
      * @param Plugin        $plugin
      * @param MauticFactory $factory
@@ -79,14 +80,14 @@ static public function installPluginSchema(array $metadata, MauticFactory $facto
      *
      * @throws \Exception
      */
-    static public function onPluginUpdate(Plugin $plugin, MauticFactory $factory, $metadata = null, Schema $installedSchema = null)
+    public static function onPluginUpdate(Plugin $plugin, MauticFactory $factory, $metadata = null, Schema $installedSchema = null)
     {
         // Not recommended although availalbe for simple schema changes - see updatePluginSchema docblock
         //self::updatePluginSchema($metadata, $installedSchema, $factory);
     }
 
     /**
-     * Update plugin schema based on Doctrine metadata
+     * Update plugin schema based on Doctrine metadata.
      *
      * WARNING - this is not recommended as Doctrine does not guarantee results. There is a risk
      * that Doctrine will generate an incorrect query leading to lost data. If using this method,
@@ -99,7 +100,7 @@ static public function onPluginUpdate(Plugin $plugin, MauticFactory $factory, $m
      * @throws \Doctrine\DBAL\ConnectionException
      * @throws \Exception
      */
-    static public function updatePluginSchema(array $metadata, Schema $installedSchema, MauticFactory $factory)
+    public static function updatePluginSchema(array $metadata, Schema $installedSchema, MauticFactory $factory)
     {
         $db         = $factory->getDatabase();
         $schemaTool = new SchemaTool($factory->getEntityManager());
@@ -121,19 +122,18 @@ static public function updatePluginSchema(array $metadata, Schema $installedSche
     }
 
     /**
-     * Not used yet :-)
+     * Not used yet :-).
      *
      * @param Plugin        $plugin
      * @param MauticFactory $factory
      * @param null          $metadata
      */
-    static public function onPluginUninstall(Plugin $plugin, MauticFactory $factory, $metadata = null)
+    public static function onPluginUninstall(Plugin $plugin, MauticFactory $factory, $metadata = null)
     {
-
     }
 
     /**
-     * Drops plugin's tables based on Doctrine metadata
+     * Drops plugin's tables based on Doctrine metadata.
      *
      * @param array         $metadata
      * @param MauticFactory $factory
@@ -141,7 +141,7 @@ static public function onPluginUninstall(Plugin $plugin, MauticFactory $factory,
      * @throws \Doctrine\DBAL\ConnectionException
      * @throws \Exception
      */
-    static public function dropPluginSchema(array $metadata, MauticFactory $factory)
+    public static function dropPluginSchema(array $metadata, MauticFactory $factory)
     {
         $db          = $factory->getDatabase();
         $schemaTool  = new SchemaTool($factory->getEntityManager());
diff --git a/app/bundles/PluginBundle/Command/FetchLeadsCommand.php b/app/bundles/PluginBundle/Command/FetchLeadsCommand.php
index 219352b9080..3104d9b33a6 100644
--- a/app/bundles/PluginBundle/Command/FetchLeadsCommand.php
+++ b/app/bundles/PluginBundle/Command/FetchLeadsCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,10 +14,9 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class FetchLeadsCommand
+ * Class FetchLeadsCommand.
  */
 class FetchLeadsCommand extends ContainerAwareCommand
 {
@@ -28,10 +28,10 @@ protected function configure()
         $this
             ->setName('mautic:integration:fetchleads')
             ->setAliases(
-                array(
+                [
                     'mautic:integration:fetchleads',
-                    'mautic:fetchleads:integration'
-                )
+                    'mautic:fetchleads:integration',
+                ]
             )
             ->setDescription('Fetch leads from integration.')
             ->addOption(
@@ -69,20 +69,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /** @var \Mautic\CoreBundle\Factory\MauticFactory $factory */
         $factory = $container->get('mautic.factory');
 
-        $translator     = $factory->getTranslator();
-        $integration    = $input->getOption('integration');
-        $startDate      = $input->getOption('start-date');
-        $endDate        = $input->getOption('end-date');
-        $interval       = $input->getOption('time-interval');
+        $translator  = $factory->getTranslator();
+        $integration = $input->getOption('integration');
+        $startDate   = $input->getOption('start-date');
+        $endDate     = $input->getOption('end-date');
+        $interval    = $input->getOption('time-interval');
 
-        if(!$interval){
-            $interval = "15 minutes";
+        if (!$interval) {
+            $interval = '15 minutes';
         }
-        if(!$startDate){
-            $startDate= date('c', strtotime("-".$interval));
+        if (!$startDate) {
+            $startDate = date('c', strtotime('-'.$interval));
         }
-        if(!$endDate){
-            $endDate= date('c');
+        if (!$endDate) {
+            $endDate = date('c');
         }
         if ($integration && $startDate && $endDate) {
             /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
@@ -91,24 +91,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $integrationObject = $integrationHelper->getIntegrationObject($integration);
 
             if ($integrationObject !== null && method_exists($integrationObject, 'getLeads')) {
+                $output->writeln('<info>'.$translator->trans('mautic.plugin.command.fetch.leads', ['%integration%' => $integration]).'</info>');
 
-                $output->writeln('<info>'.$translator->trans('mautic.plugin.command.fetch.leads', array('%integration%' => $integration)).'</info>');
+                $params['start'] = $startDate;
+                $params['end']   = $endDate;
 
-                $params['start']=$startDate;
-                $params['end']=$endDate;
-
-                if(strtotime($startDate) > strtotime('-30 days')) {
+                if (strtotime($startDate) > strtotime('-30 days')) {
                     $processed = intval($integrationObject->getLeads($params));
 
                     $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.fetch.leads.starting').'</comment>');
 
-                    $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.fetch.leads.events_executed', array('%events%' => $processed)).'</comment>'."\n");
-                }
-                else{
+                    $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.fetch.leads.events_executed', ['%events%' => $processed]).'</comment>'."\n");
+                } else {
                     $output->writeln('<error>'.$translator->trans('mautic.plugin.command.fetch.leads.wrong.date').'</error>');
                 }
             }
         }
+
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php b/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php
index 94d5682d02c..67cd7b61cca 100644
--- a/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php
+++ b/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,10 +14,9 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class PushLeadActivityCommand
+ * Class PushLeadActivityCommand.
  */
 class PushLeadActivityCommand extends ContainerAwareCommand
 {
@@ -28,10 +28,10 @@ protected function configure()
         $this
             ->setName('mautic:integration:pushleadactivity')
             ->setAliases(
-                array(
+                [
                     'mautic:integration:pushactivity',
-                    'mautic:pushactivity:integration'
-                )
+                    'mautic:pushactivity:integration',
+                ]
             )
             ->setDescription('Push lead activity to integration.')
             ->addOption(
@@ -69,21 +69,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /** @var \Mautic\CoreBundle\Factory\MauticFactory $factory */
         $factory = $container->get('mautic.factory');
 
-        $translator     = $factory->getTranslator();
-        $integration    = $input->getOption('integration');
-        $startDate      = $input->getOption('start-date');
-        $endDate        = $input->getOption('end-date');
-        $interval       = $input->getOption('time-interval');
+        $translator  = $factory->getTranslator();
+        $integration = $input->getOption('integration');
+        $startDate   = $input->getOption('start-date');
+        $endDate     = $input->getOption('end-date');
+        $interval    = $input->getOption('time-interval');
 
-        if(!$interval){
-            $interval = "15 minutes";
+        if (!$interval) {
+            $interval = '15 minutes';
         }
-        if(!$startDate){
-            $startDate= date('c', strtotime("-".$interval));
+        if (!$startDate) {
+            $startDate = date('c', strtotime('-'.$interval));
         }
 
-        if(!$endDate){
-            $endDate= date('c');
+        if (!$endDate) {
+            $endDate = date('c');
         }
 
         if ($integration && $startDate && $endDate) {
@@ -93,19 +93,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $integrationObject = $integrationHelper->getIntegrationObject($integration);
 
             if ($integrationObject !== null && method_exists($integrationObject, 'pushLeadActivity')) {
+                $output->writeln('<info>'.$translator->trans('mautic.plugin.command.push.leads.activity', ['%integration%' => $integration]).'</info>');
 
-                $output->writeln('<info>'.$translator->trans('mautic.plugin.command.push.leads.activity', array('%integration%' => $integration)).'</info>');
-
-                $params['start']=$startDate;
-                $params['end']=$endDate;
+                $params['start'] = $startDate;
+                $params['end']   = $endDate;
 
                 $processed = intval($integrationObject->pushLeadActivity($params));
 
-                $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.push.leads.events_executed', array('%events%' => $processed)).'</comment>'."\n");
-
+                $output->writeln('<comment>'.$translator->trans('mautic.plugin.command.push.leads.events_executed', ['%events%' => $processed]).'</comment>'."\n");
             }
         }
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Config/config.php b/app/bundles/PluginBundle/Config/config.php
index 719ba4a32d3..1aadae37710 100644
--- a/app/bundles/PluginBundle/Config/config.php
+++ b/app/bundles/PluginBundle/Config/config.php
@@ -1,60 +1,61 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
-    'routes'   => [
+    'routes' => [
         'main' => [
-            'mautic_integration_auth_callback_secure'    => [
+            'mautic_integration_auth_callback_secure' => [
                 'path'       => '/plugins/integrations/authcallback/{integration}',
-                'controller' => 'MauticPluginBundle:Auth:authCallback'
+                'controller' => 'MauticPluginBundle:Auth:authCallback',
             ],
-            'mautic_integration_auth_postauth_secure'    => [
+            'mautic_integration_auth_postauth_secure' => [
                 'path'       => '/plugins/integrations/authstatus/{integration}',
-                'controller' => 'MauticPluginBundle:Auth:authStatus'
+                'controller' => 'MauticPluginBundle:Auth:authStatus',
             ],
-            'mautic_plugin_index'                 => [
+            'mautic_plugin_index' => [
                 'path'       => '/plugins',
-                'controller' => 'MauticPluginBundle:Plugin:index'
+                'controller' => 'MauticPluginBundle:Plugin:index',
             ],
-            'mautic_plugin_config'                => [
+            'mautic_plugin_config' => [
                 'path'       => '/plugins/config/{name}',
-                'controller' => 'MauticPluginBundle:Plugin:config'
+                'controller' => 'MauticPluginBundle:Plugin:config',
             ],
-            'mautic_plugin_info'                  => [
+            'mautic_plugin_info' => [
                 'path'       => '/plugins/info/{name}',
-                'controller' => 'MauticPluginBundle:Plugin:info'
+                'controller' => 'MauticPluginBundle:Plugin:info',
             ],
-            'mautic_plugin_reload'                => [
+            'mautic_plugin_reload' => [
                 'path'       => '/plugins/reload',
-                'controller' => 'MauticPluginBundle:Plugin:reload'
-            ]
+                'controller' => 'MauticPluginBundle:Plugin:reload',
+            ],
         ],
         'public' => [
-            'mautic_integration_auth_user'        => [
+            'mautic_integration_auth_user' => [
                 'path'       => '/plugins/integrations/authuser/{integration}',
-                'controller' => 'MauticPluginBundle:Auth:authUser'
+                'controller' => 'MauticPluginBundle:Auth:authUser',
             ],
             'mautic_integration_auth_callback_bc' => [
                 'path'       => '/addon/integrations/authcallback/{integration}',
-                'controller' => 'MauticPluginBundle:Auth:authCallback'
+                'controller' => 'MauticPluginBundle:Auth:authCallback',
             ],
-            'mautic_integration_auth_callback'    => [
+            'mautic_integration_auth_callback' => [
                 'path'       => '/plugins/integrations/authcallback/{integration}',
-                'controller' => 'MauticPluginBundle:Auth:authCallback'
+                'controller' => 'MauticPluginBundle:Auth:authCallback',
             ],
-            'mautic_integration_auth_postauth'    => [
+            'mautic_integration_auth_postauth' => [
                 'path'       => '/plugins/integrations/authstatus/{integration}',
-                'controller' => 'MauticPluginBundle:Auth:authStatus'
+                'controller' => 'MauticPluginBundle:Auth:authStatus',
             ],
-        ]
+        ],
     ],
-    'menu'     => [
+    'menu' => [
         'admin' => [
             'priority' => 50,
             'items'    => [
@@ -62,68 +63,68 @@
                     'id'        => 'mautic_plugin_root',
                     'iconClass' => 'fa-plus-circle',
                     'access'    => 'plugin:plugins:manage',
-                    'route'     => 'mautic_plugin_index'
-                ]
-            ]
-        ]
+                    'route'     => 'mautic_plugin_index',
+                ],
+            ],
+        ],
     ],
 
     'services' => [
         'events' => [
             'mautic.plugin.pointbundle.subscriber' => [
-                'class' => 'Mautic\PluginBundle\EventListener\PointSubscriber'
+                'class' => 'Mautic\PluginBundle\EventListener\PointSubscriber',
             ],
             'mautic.plugin.formbundle.subscriber' => [
-                'class' => 'Mautic\PluginBundle\EventListener\FormSubscriber'
+                'class' => 'Mautic\PluginBundle\EventListener\FormSubscriber',
             ],
             'mautic.plugin.campaignbundle.subscriber' => [
-                'class' => 'Mautic\PluginBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\PluginBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
-                    'mautic.helper.integration'
-                ]
-            ]
+                    'mautic.helper.integration',
+                ],
+            ],
         ],
-        'forms'  => [
-            'mautic.form.type.integration.details'  => [
+        'forms' => [
+            'mautic.form.type.integration.details' => [
                 'class' => 'Mautic\PluginBundle\Form\Type\DetailsType',
-                'alias' => 'integration_details'
+                'alias' => 'integration_details',
             ],
             'mautic.form.type.integration.settings' => [
                 'class'     => 'Mautic\PluginBundle\Form\Type\FeatureSettingsType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'integration_featuresettings'
+                'alias'     => 'integration_featuresettings',
             ],
-            'mautic.form.type.integration.fields'   => [
+            'mautic.form.type.integration.fields' => [
                 'class' => 'Mautic\PluginBundle\Form\Type\FieldsType',
-                'alias' => 'integration_fields'
+                'alias' => 'integration_fields',
             ],
-            'mautic.form.type.integration.keys'     => [
+            'mautic.form.type.integration.keys' => [
                 'class' => 'Mautic\PluginBundle\Form\Type\KeysType',
-                'alias' => 'integration_keys'
+                'alias' => 'integration_keys',
             ],
-            'mautic.form.type.integration.list'     => [
+            'mautic.form.type.integration.list' => [
                 'class'     => 'Mautic\PluginBundle\Form\Type\IntegrationsListType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'integration_list'
+                'alias'     => 'integration_list',
             ],
             'mautic.form.type.integration.config' => [
-                'class'     => 'Mautic\PluginBundle\Form\Type\IntegrationConfigType',
-                'alias'     => 'integration_config'
-            ]
+                'class' => 'Mautic\PluginBundle\Form\Type\IntegrationConfigType',
+                'alias' => 'integration_config',
+            ],
         ],
-        'other'  => [
+        'other' => [
             'mautic.helper.integration' => [
                 'class'     => 'Mautic\PluginBundle\Helper\IntegrationHelper',
-                'arguments' => 'mautic.factory'
-            ]
+                'arguments' => 'mautic.factory',
+            ],
         ],
-        'models' =>  [
+        'models' => [
             'mautic.plugin.model.plugin' => [
-                'class' => 'Mautic\PluginBundle\Model\PluginModel',
+                'class'     => 'Mautic\PluginBundle\Model\PluginModel',
                 'arguments' => [
-                    'mautic.lead.model.field'
-                ]
-            ]
-        ]
-    ]
-];
\ No newline at end of file
+                    'mautic.lead.model.field',
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/bundles/PluginBundle/Controller/AjaxController.php b/app/bundles/PluginBundle/Controller/AjaxController.php
index 59f1eecac17..15683b7c2bc 100644
--- a/app/bundles/PluginBundle/Controller/AjaxController.php
+++ b/app/bundles/PluginBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
- *
- * @package Mautic\PluginBundle\Controller
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
@@ -25,28 +24,28 @@ class AjaxController extends CommonAjaxController
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    protected function setIntegrationFilterAction (Request $request)
+    protected function setIntegrationFilterAction(Request $request)
     {
-        $session     = $this->get('session');
+        $session      = $this->get('session');
         $pluginFilter = InputHelper::int($this->request->get('plugin'));
         $session->set('mautic.integrations.filter', $pluginFilter);
 
-        return $this->sendJsonResponse(array('success' => 1));
+        return $this->sendJsonResponse(['success' => 1]);
     }
 
     /**
-     * Get the HTML for list of fields
+     * Get the HTML for list of fields.
      *
      * @param Request $request
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    protected function getIntegrationLeadFieldsAction (Request $request)
+    protected function getIntegrationLeadFieldsAction(Request $request)
     {
         $integration = $request->request->get('integration');
         $settings    = $request->request->get('settings');
 
-        $dataArray   = array('success' => 0);
+        $dataArray = ['success' => 0];
 
         if (!empty($integration) && !empty($settings)) {
             /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
@@ -59,28 +58,28 @@ protected function getIntegrationLeadFieldsAction (Request $request)
 
                 if (!empty($integrationFields)) {
                     // Get a list of custom form fields
-                    $leadFields = $this->getModel('plugin')->getLeadFields();
-                    list ($specialInstructions, $alertType) = $object->getFormNotes('leadfield_match');
-                    $defaults                               = $object->getIntegrationSettings()->getFeatureSettings();
-                    $data                                   = isset($defaults['leadFields']) ? $defaults['leadFields'] : array();
+                    $leadFields                            = $this->getModel('plugin')->getLeadFields();
+                    list($specialInstructions, $alertType) = $object->getFormNotes('leadfield_match');
+                    $defaults                              = $object->getIntegrationSettings()->getFeatureSettings();
+                    $data                                  = isset($defaults['leadFields']) ? $defaults['leadFields'] : [];
 
-                    $form = $this->createForm('integration_fields', $data, array(
+                    $form = $this->createForm('integration_fields', $data, [
                         'lead_fields'          => $leadFields,
                         'integration_fields'   => $integrationFields,
                         'csrf_protection'      => false,
                         'special_instructions' => $specialInstructions,
-                        'alert_type'           => $alertType
-                    ));
+                        'alert_type'           => $alertType,
+                    ]);
 
                     $form = $this->setFormTheme($form, 'MauticCoreBundle:Helper:blank_form.html.php', 'MauticPluginBundle:FormTheme\Integration');
 
-                    $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', array(
+                    $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', [
                         'form'      => $form,
                         'function'  => 'row',
-                        'variables' => array(
-                            'integration' => $object
-                        )
-                    ))->getContent();
+                        'variables' => [
+                            'integration' => $object,
+                        ],
+                    ])->getContent();
 
                     if (!isset($settings['prefix'])) {
                         $prefix = 'integration_details[featureSettings][leadFields]';
@@ -88,12 +87,12 @@ protected function getIntegrationLeadFieldsAction (Request $request)
                         $prefix = $settings['prefix'];
                     }
 
-                    $idPrefix = str_replace(array('][', '[', ']'), '_', $prefix);
+                    $idPrefix = str_replace(['][', '[', ']'], '_', $prefix);
                     if (substr($idPrefix, -1) == '_') {
                         $idPrefix = substr($idPrefix, 0, -1);
                     }
 
-                    $html = preg_replace('/integration_fields\[(.*?)\]/', $prefix . '[$1]', $html);
+                    $html = preg_replace('/integration_fields\[(.*?)\]/', $prefix.'[$1]', $html);
                     $html = str_replace('integration_fields', $idPrefix, $html);
 
                     $dataArray['success'] = 1;
@@ -105,19 +104,18 @@ protected function getIntegrationLeadFieldsAction (Request $request)
         return $this->sendJsonResponse($dataArray);
     }
 
-
     /**
-     * Get the HTML for integration properties
+     * Get the HTML for integration properties.
      *
      * @param Request $request
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    protected function getIntegrationConfigAction (Request $request)
+    protected function getIntegrationConfigAction(Request $request)
     {
         $integration = $request->request->get('integration');
         $settings    = $request->request->get('settings');
-        $dataArray   = array('success' => 0);
+        $dataArray   = ['success' => 0];
 
         if (!empty($integration) && !empty($settings)) {
             /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
@@ -129,28 +127,28 @@ protected function getIntegrationConfigAction (Request $request)
                 $objectSettings = $object->getIntegrationSettings();
                 $defaults       = $objectSettings->getFeatureSettings();
 
-                $form           = $this->createForm('integration_config', $defaults, array(
+                $form = $this->createForm('integration_config', $defaults, [
                     'integration'     => $object,
-                    'csrf_protection' => false
-                ));
+                    'csrf_protection' => false,
+                ]);
 
                 $form = $this->setFormTheme($form, 'MauticCoreBundle:Helper:blank_form.html.php', 'MauticPluginBundle:FormTheme\Integration');
 
-                $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', array(
+                $html = $this->render('MauticCoreBundle:Helper:blank_form.html.php', [
                     'form'      => $form,
                     'function'  => 'widget',
-                    'variables' => array(
-                        'integration' => $object
-                    )
-                ))->getContent();
+                    'variables' => [
+                        'integration' => $object,
+                    ],
+                ])->getContent();
 
                 $prefix   = str_replace('[integration]', '[config]', $settings['name']);
-                $idPrefix = str_replace(array('][', '[', ']'), '_', $prefix);
+                $idPrefix = str_replace(['][', '[', ']'], '_', $prefix);
                 if (substr($idPrefix, -1) == '_') {
                     $idPrefix = substr($idPrefix, 0, -1);
                 }
 
-                $html = preg_replace('/integration_config\[(.*?)\]/', $prefix . '[$1]', $html);
+                $html = preg_replace('/integration_config\[(.*?)\]/', $prefix.'[$1]', $html);
                 $html = str_replace('integration_config', $idPrefix, $html);
 
                 $dataArray['success'] = 1;
@@ -160,4 +158,4 @@ protected function getIntegrationConfigAction (Request $request)
 
         return $this->sendJsonResponse($dataArray);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Controller/AuthController.php b/app/bundles/PluginBundle/Controller/AuthController.php
index 11d58aa1fa2..1a9a37e7381 100644
--- a/app/bundles/PluginBundle/Controller/AuthController.php
+++ b/app/bundles/PluginBundle/Controller/AuthController.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle\Controller;
 
-use Mautic\PluginBundle\PluginEvents;
-use Mautic\PluginBundle\Event\PluginIntegrationAuthRedirectEvent;
 use Mautic\CoreBundle\Controller\FormController;
+use Mautic\PluginBundle\Event\PluginIntegrationAuthRedirectEvent;
+use Mautic\PluginBundle\PluginEvents;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
- * Class AuthController
+ * Class AuthController.
  */
 class AuthController extends FormController
 {
@@ -25,36 +26,34 @@ class AuthController extends FormController
      *
      * @return JsonResponse
      */
-    public function authCallbackAction ($integration)
+    public function authCallbackAction($integration)
     {
         $isAjax  = $this->request->isXmlHttpRequest();
         $session = $this->get('session');
 
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
-        $integrationHelper  = $this->factory->getHelper('integration');
-        $integrationObject  = $integrationHelper->getIntegrationObject($integration);
+        $integrationHelper = $this->factory->getHelper('integration');
+        $integrationObject = $integrationHelper->getIntegrationObject($integration);
 
         //check to see if the service exists
         if (!$integrationObject) {
-            $session->set('mautic.integration.postauth.message', array('mautic.integration.notfound', array('%name%' => $integration), 'error'));
+            $session->set('mautic.integration.postauth.message', ['mautic.integration.notfound', ['%name%' => $integration], 'error']);
             if ($isAjax) {
-
-                return new JsonResponse(array('url' => $this->generateUrl('mautic_integration_auth_postauth',array('integration'=>$integration))));
+                return new JsonResponse(['url' => $this->generateUrl('mautic_integration_auth_postauth', ['integration' => $integration])]);
             } else {
-
-                return new RedirectResponse($this->generateUrl('mautic_integration_auth_postauth',array('integration'=>$integration)));
+                return new RedirectResponse($this->generateUrl('mautic_integration_auth_postauth', ['integration' => $integration]));
             }
         }
 
-        $state      = $session->get($integration . '_csrf_token', false);
+        $state      = $session->get($integration.'_csrf_token', false);
         $givenState = ($isAjax) ? $this->request->request->get('state') : $this->request->get('state');
         if ($state && $state !== $givenState) {
-            $session->remove($integration . '_csrf_token');
-            $session->set('mautic.integration.postauth.message', array('mautic.integration.auth.invalid.state', array(), 'error'));
+            $session->remove($integration.'_csrf_token');
+            $session->set('mautic.integration.postauth.message', ['mautic.integration.auth.invalid.state', [], 'error']);
             if ($isAjax) {
-                return new JsonResponse(array('url' => $this->generateUrl('mautic_integration_auth_postauth',array('integration'=>$integration))));
+                return new JsonResponse(['url' => $this->generateUrl('mautic_integration_auth_postauth', ['integration' => $integration])]);
             } else {
-                return new RedirectResponse($this->generateUrl('mautic_integration_auth_postauth',array('integration'=>$integration)));
+                return new RedirectResponse($this->generateUrl('mautic_integration_auth_postauth', ['integration' => $integration]));
             }
         }
 
@@ -64,22 +63,22 @@ public function authCallbackAction ($integration)
         if ($error) {
             $type    = 'error';
             $message = 'mautic.integration.error.oauthfail';
-            $params  = array('%error%' => $error);
+            $params  = ['%error%' => $error];
         } else {
             $type    = 'notice';
             $message = 'mautic.integration.notice.oauthsuccess';
-            $params  = array();
+            $params  = [];
         }
 
-        $session->set('mautic.integration.postauth.message', array($message, $params, $type));
+        $session->set('mautic.integration.postauth.message', [$message, $params, $type]);
 
         $identifier[$integration] = null;
-        $socialCache              = array();
+        $socialCache              = [];
         $userData                 = $integrationObject->getUserData($identifier, $socialCache);
 
         $session->set('mautic.integration.'.$integration.'.userdata', $userData);
 
-        return new RedirectResponse($this->generateUrl('mautic_integration_auth_postauth',array('integration'=>$integration)));
+        return new RedirectResponse($this->generateUrl('mautic_integration_auth_postauth', ['integration' => $integration]));
     }
 
     /**
@@ -87,13 +86,13 @@ public function authCallbackAction ($integration)
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function authStatusAction ($integration)
+    public function authStatusAction($integration)
     {
         $postAuthTemplate = 'MauticPluginBundle:Auth:postauth.html.php';
 
         $session     = $this->get('session');
         $postMessage = $session->get('mautic.integration.postauth.message');
-        $userData    = array();
+        $userData    = [];
 
         if (isset($integration)) {
             $userData = $session->get('mautic.integration.'.$integration.'.userdata');
@@ -110,7 +109,7 @@ public function authStatusAction ($integration)
             }
         }
 
-        return $this->render($postAuthTemplate, array('message' => $message, 'alert' => $alert, 'data' => $userData));
+        return $this->render($postAuthTemplate, ['message' => $message, 'alert' => $alert, 'data' => $userData]);
     }
 
     /**
@@ -118,7 +117,7 @@ public function authStatusAction ($integration)
      *
      * @return RedirectResponse
      */
-    public function authUserAction ($integration)
+    public function authUserAction($integration)
     {
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
         $integrationHelper = $this->factory->getHelper('integration');
@@ -141,6 +140,4 @@ public function authUserAction ($integration)
 
         return $response;
     }
-
-
 }
diff --git a/app/bundles/PluginBundle/Controller/PluginController.php b/app/bundles/PluginBundle/Controller/PluginController.php
index 7559eab924f..f0aa7e327ee 100644
--- a/app/bundles/PluginBundle/Controller/PluginController.php
+++ b/app/bundles/PluginBundle/Controller/PluginController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,12 +17,12 @@
 use Mautic\PluginBundle\Event\PluginIntegrationAuthRedirectEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationEvent;
 use Mautic\PluginBundle\PluginEvents;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class PluginController
+ * Class PluginController.
  */
 class PluginController extends FormController
 {
@@ -40,7 +41,7 @@ public function indexAction()
         // List of plugins for filter and to show as a single integration
         $plugins = $pluginModel->getEntities(
             [
-                'hydration_mode' => 'hydrate_array'
+                'hydration_mode' => 'hydrate_array',
             ]
         );
 
@@ -52,7 +53,7 @@ public function indexAction()
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
         $integrationHelper  = $this->factory->getHelper('integration');
         $integrationObjects = $integrationHelper->getIntegrationObjects(null, null, true);
-        $integrations       = $foundPlugins = [];
+        $integrations       = $foundPlugins       = [];
 
         foreach ($integrationObjects as $name => $object) {
             $settings            = $object->getIntegrationSettings();
@@ -62,7 +63,7 @@ public function indexAction()
                 'icon'     => $integrationHelper->getIconPath($object),
                 'enabled'  => $settings->isPublished(),
                 'plugin'   => $settings->getPlugin()->getId(),
-                'isBundle' => false
+                'isBundle' => false,
             ];
 
             $foundPlugins[$settings->getPlugin()->getId()] = true;
@@ -77,7 +78,7 @@ public function indexAction()
                 'enabled'     => true,
                 'plugin'      => $plugin['id'],
                 'description' => $plugin['description'],
-                'isBundle'    => true
+                'isBundle'    => true,
             ];
         }
 
@@ -103,18 +104,18 @@ function ($a, $b) {
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'items'        => $integrations,
                     'tmpl'         => $tmpl,
                     'pluginFilter' => ($pluginFilter) ? ['id' => $pluginId, 'name' => $pluginName] : false,
-                    'plugins'      => $plugins
+                    'plugins'      => $plugins,
                 ],
                 'contentTemplate' => 'MauticPluginBundle:Integration:grid.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_plugin_index',
                     'mauticContent' => 'integration',
                     'route'         => $this->generateUrl('mautic_plugin_index'),
-                ]
+                ],
             ]
         );
     }
@@ -153,7 +154,7 @@ public function configAction($name)
                 'integration'        => $entity->getName(),
                 'lead_fields'        => $leadFields,
                 'integration_object' => $integrationObject,
-                'action'             => $this->generateUrl('mautic_plugin_config', ['name' => $name])
+                'action'             => $this->generateUrl('mautic_plugin_config', ['name' => $name]),
             ]
         );
 
@@ -210,7 +211,7 @@ public function configAction($name)
                     if ($authorize) {
                         //redirect to the oauth URL
                         /** @var \Mautic\PluginBundle\Integration\AbstractIntegration $integrationObject */
-                        $event    = $this->dispatcher->dispatch(
+                        $event = $this->dispatcher->dispatch(
                             PluginEvents::PLUGIN_ON_INTEGRATION_AUTH_REDIRECT,
                             new PluginIntegrationAuthRedirectEvent(
                                 $integrationObject,
@@ -224,7 +225,7 @@ public function configAction($name)
                                 'integration'         => $integration,
                                 'authUrl'             => $oauthUrl,
                                 'authorize'           => 1,
-                                'popupBlockerMessage' => $this->translator->trans('mautic.core.popupblocked')
+                                'popupBlockerMessage' => $this->translator->trans('mautic.core.popupblocked'),
                             ]
                         );
                     }
@@ -250,7 +251,7 @@ public function configAction($name)
         $themes      = [$default];
         if (is_array($objectTheme)) {
             $themes = array_merge($themes, $objectTheme);
-        } else if ($objectTheme !== $default) {
+        } elseif ($objectTheme !== $default) {
             $themes[] = $objectTheme;
         }
 
@@ -264,26 +265,26 @@ public function configAction($name)
             if (!empty($specialInstructions)) {
                 $formNotes[$section] = [
                     'note' => $specialInstructions,
-                    'type' => $alertType
+                    'type' => $alertType,
                 ];
             }
         }
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'form'         => $this->setFormTheme($form, $template, $themes),
                     'description'  => $integrationObject->getDescription(),
                     'formSettings' => $formSettings,
                     'formNotes'    => $formNotes,
-                    'callbackUrl'  => $callbackUrl
+                    'callbackUrl'  => $callbackUrl,
                 ],
                 'contentTemplate' => $template,
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_plugin_index',
                     'mauticContent' => 'integration',
-                    'route'         => false
-                ]
+                    'route'         => false,
+                ],
             ]
         );
     }
@@ -304,7 +305,7 @@ public function infoAction($name)
 
         $bundle = $pluginModel->getRepository()->findOneBy(
             [
-                'bundle' => InputHelper::clean($name)
+                'bundle' => InputHelper::clean($name),
             ]
         );
 
@@ -317,7 +318,7 @@ public function infoAction($name)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'bundle' => $bundle,
                     'icon'   => $integrationHelper->getIconPath($bundle),
                 ],
@@ -325,14 +326,14 @@ public function infoAction($name)
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_plugin_index',
                     'mauticContent' => 'integration',
-                    'route'         => false
-                ]
+                    'route'         => false,
+                ],
             ]
         );
     }
 
     /**
-     * Scans the addon bundles directly and loads bundles which are not registered to the database
+     * Scans the addon bundles directly and loads bundles which are not registered to the database.
      *
      * @return JsonResponse
      */
@@ -345,7 +346,7 @@ public function reloadAction()
         /** @var \Mautic\PluginBundle\Model\PluginModel $model */
         $model   = $this->getModel('plugin');
         $plugins = $this->coreParametersHelper->getParameter('plugin.bundles');
-        $added   = $disabled = $updated = 0;
+        $added   = $disabled   = $updated   = 0;
 
         // Get the metadata for plugins for installation
         $em             = $this->get('doctrine.orm.entity_manager');
@@ -388,12 +389,12 @@ public function reloadAction()
 
         $installedPlugins = $model->getEntities(
             [
-                'index' => 'bundle'
+                'index' => 'bundle',
             ]
         );
 
         /**
-         * @var string $bundle
+         * @var string
          * @var Plugin $plugin
          */
         foreach ($installedPlugins as $bundle => $plugin) {
@@ -402,7 +403,7 @@ public function reloadAction()
                 if (!$plugin->getIsMissing()) {
                     //files are no longer found
                     $plugin->setIsMissing(true);
-                    $disabled++;
+                    ++$disabled;
                 }
             } else {
                 if ($plugin->getIsMissing()) {
@@ -421,11 +422,11 @@ public function reloadAction()
                     //compare versions to see if an update is necessary
                     $version = isset($details['version']) ? $details['version'] : '';
                     if (!empty($version) && version_compare($plugin->getVersion(), $version) == -1) {
-                        $updated++;
+                        ++$updated;
 
                         //call the update callback
-                        $callback        = $plugins[$bundle]['bundleClass'];
-                        $metadata        = (isset($pluginMetadata[$plugins[$bundle]['namespace']]))
+                        $callback = $plugins[$bundle]['bundleClass'];
+                        $metadata = (isset($pluginMetadata[$plugins[$bundle]['namespace']]))
                             ? $pluginMetadata[$plugins[$bundle]['namespace']] : null;
                         $installedSchema = (isset($pluginInstalledSchemas[$plugins[$bundle]['namespace']]))
                             ? $pluginInstalledSchemas[$plugins[$bundle]['namespace']] : null;
@@ -461,7 +462,7 @@ public function reloadAction()
 
         //rest are new
         foreach ($plugins as $plugin) {
-            $added++;
+            ++$added;
             $entity = new Plugin();
             $entity->setBundle($plugin['bundle']);
 
@@ -473,7 +474,7 @@ public function reloadAction()
 
                 if (isset($details['version'])) {
                     $entity->setVersion($details['version']);
-                };
+                }
 
                 $entity->setName(
                     isset($details['name']) ? $details['name'] : $plugin['base']
@@ -509,12 +510,12 @@ public function reloadAction()
             [
                 '%added%'    => $added,
                 '%disabled%' => $disabled,
-                '%updated%'  => $updated
+                '%updated%'  => $updated,
             ]
         );
 
         $viewParameters = [
-            'page' => $this->get('session')->get('mautic.plugin.page')
+            'page' => $this->get('session')->get('mautic.plugin.page'),
         ];
 
         // Refresh the index contents
@@ -525,9 +526,9 @@ public function reloadAction()
                 'contentTemplate' => 'MauticPluginBundle:Plugin:index',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_plugin_index',
-                    'mauticContent' => 'plugin'
-                ]
+                    'mauticContent' => 'plugin',
+                ],
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Entity/Integration.php b/app/bundles/PluginBundle/Entity/Integration.php
index 205f469715c..dcdae2b0c54 100644
--- a/app/bundles/PluginBundle/Entity/Integration.php
+++ b/app/bundles/PluginBundle/Entity/Integration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Mautic\CoreBundle\Entity\CommonEntity;
 
 /**
- * Class Integration
+ * Class Integration.
  */
 class Integration extends CommonEntity
 {
-
     /**
      * @var int
      */
@@ -230,4 +230,4 @@ public function setFeatureSettings($featureSettings)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Entity/IntegrationEntity.php b/app/bundles/PluginBundle/Entity/IntegrationEntity.php
index b403308e4b6..1e16215743c 100644
--- a/app/bundles/PluginBundle/Entity/IntegrationEntity.php
+++ b/app/bundles/PluginBundle/Entity/IntegrationEntity.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Mautic\CoreBundle\Entity\CommonEntity;
 
 /**
- * Class Plugin
+ * Class Plugin.
  */
 class IntegrationEntity extends CommonEntity
 {
-
     /**
      * @var int
      */
@@ -65,7 +65,7 @@ class IntegrationEntity extends CommonEntity
      */
     private $internal;
 
-    public function __construct ()
+    public function __construct()
     {
         $this->internal = new ArrayCollection();
     }
@@ -73,7 +73,7 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -116,23 +116,23 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set integration
+     * Set integration.
      *
      * @param string $integration
      *
      * @return string
      */
-    public function setIntegration ($integration)
+    public function setIntegration($integration)
     {
         $this->integration = $integration;
 
@@ -140,33 +140,33 @@ public function setIntegration ($integration)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getIntegration ()
+    public function getIntegration()
     {
         return $this->integration;
     }
 
     /**
-     * Set integrationEntity
+     * Set integrationEntity.
      *
      * @param string $integrationEntity
      *
      * @return integrationEntity
      */
-    public function setIntegrationEntity ($integrationEntity)
+    public function setIntegrationEntity($integrationEntity)
     {
         $this->integrationEntity = $integrationEntity;
     }
 
     /**
-     * Get integrationEntity
+     * Get integrationEntity.
      *
      * @return string
      */
-    public function getIntegrationEntity ()
+    public function getIntegrationEntity()
     {
         return $this->integrationEntity;
     }
@@ -174,16 +174,15 @@ public function getIntegrationEntity ()
     /**
      * @return int
      */
-    public function getIntegrationEntityId ()
+    public function getIntegrationEntityId()
     {
         return $this->integrationEntityId;
     }
 
-
     /**
      * @param mixed $integrationEntityId
      */
-    public function setIntegrationEntityId ($integrationEntityId)
+    public function setIntegrationEntityId($integrationEntityId)
     {
         $this->integrationEntityId = $integrationEntityId;
     }
@@ -191,7 +190,7 @@ public function setIntegrationEntityId ($integrationEntityId)
     /**
      * @return string
      */
-    public function getInternalEntity ()
+    public function getInternalEntity()
     {
         return $this->integrationEntity;
     }
@@ -199,7 +198,7 @@ public function getInternalEntity ()
     /**
      * @param mixed string
      */
-    public function setInternalEntity ($internalEntity)
+    public function setInternalEntity($internalEntity)
     {
         $this->internalEntity = $internalEntity;
     }
@@ -207,7 +206,7 @@ public function setInternalEntity ($internalEntity)
     /**
      * @return mixed
      */
-    public function getInternalEntityId ()
+    public function getInternalEntityId()
     {
         return $this->internalEntityId;
     }
@@ -215,7 +214,7 @@ public function getInternalEntityId ()
     /**
      * @param mixed $isMissing
      */
-    public function setInternalEntityId ($internalEntityId)
+    public function setInternalEntityId($internalEntityId)
     {
         $this->internalEntityId = $internalEntityId;
     }
@@ -223,7 +222,7 @@ public function setInternalEntityId ($internalEntityId)
     /**
      * @return mixed
      */
-    public function getInternal ()
+    public function getInternal()
     {
         return $this->internal;
     }
@@ -231,15 +230,15 @@ public function getInternal ()
     /**
      * @param mixed $internal
      */
-    public function setInternal ($internal)
+    public function setInternal($internal)
     {
         $this->internal = $internal;
     }
 
     /**
- * @return mixed
- */
-    public function getDateAdded ()
+     * @return mixed
+     */
+    public function getDateAdded()
     {
         return $this->dateAdded;
     }
@@ -247,7 +246,7 @@ public function getDateAdded ()
     /**
      * @param mixed $dateAdded
      */
-    public function setDateAdded ($dateAdded)
+    public function setDateAdded($dateAdded)
     {
         $this->dateAdded = $dateAdded;
     }
@@ -255,7 +254,7 @@ public function setDateAdded ($dateAdded)
     /**
      * @return mixed
      */
-    public function getLastSyncDate ()
+    public function getLastSyncDate()
     {
         return $this->lastSyncDate;
     }
@@ -263,7 +262,7 @@ public function getLastSyncDate ()
     /**
      * @param mixed $dateAdded
      */
-    public function setLastSyncDate ($lastSyncDate)
+    public function setLastSyncDate($lastSyncDate)
     {
         $this->lastSyncDate = $lastSyncDate;
     }
diff --git a/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php b/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php
index 5406aaeb7f4..4914dc2c9c5 100644
--- a/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php
+++ b/app/bundles/PluginBundle/Entity/IntegrationEntityRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * IntegrationRepository
+ * IntegrationRepository.
  */
 class IntegrationEntityRepository extends CommonRepository
 {
-
     /**
      * @param      $integration
      * @param      $integrationEntity
@@ -30,11 +30,11 @@ class IntegrationEntityRepository extends CommonRepository
      *
      * @return array
      */
-    public function getIntegrationsEntityId($integration, $integrationEntity, $internalEntity, $internalEntityId = null, $startDate =  null, $endDate =  null, $push = false, $start = 0, $limit = 0)
+    public function getIntegrationsEntityId($integration, $integrationEntity, $internalEntity, $internalEntityId = null, $startDate = null, $endDate = null, $push = false, $start = 0, $limit = 0)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('i.integration_entity_id, i.id, i.internal_entity_id')
-            ->from(MAUTIC_TABLE_PREFIX . 'integration_entity', 'i');
+            ->from(MAUTIC_TABLE_PREFIX.'integration_entity', 'i');
 
         $q->where('i.integration = :integration')
             ->andWhere('i.integration_entity = :integrationEntity')
@@ -44,7 +44,7 @@ public function getIntegrationsEntityId($integration, $integrationEntity, $inter
             ->setParameter('integrationEntity', $integrationEntity)
             ->setParameter('internalEntity', $internalEntity);
         if ($push) {
-            $q->join('i', MAUTIC_TABLE_PREFIX . 'leads', 'l', 'l.id = i.internal_entity_id and l.last_active >= :startDate')
+            $q->join('i', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = i.internal_entity_id and l.last_active >= :startDate')
                 ->setParameter('startDate', $startDate);
         }
 
@@ -73,4 +73,4 @@ public function getIntegrationsEntityId($integration, $integrationEntity, $inter
 
         return $results;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Entity/IntegrationRepository.php b/app/bundles/PluginBundle/Entity/IntegrationRepository.php
index 3ebbf89c398..a5208961b7b 100644
--- a/app/bundles/PluginBundle/Entity/IntegrationRepository.php
+++ b/app/bundles/PluginBundle/Entity/IntegrationRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,10 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * IntegrationRepository
+ * IntegrationRepository.
  */
 class IntegrationRepository extends CommonRepository
 {
-
     public function getIntegrations()
     {
         $services = $this->createQueryBuilder('i')
@@ -24,10 +24,11 @@ public function getIntegrations()
             ->getQuery()
             ->getResult();
 
-        $results = array();
+        $results = [];
         foreach ($services as $s) {
             $results[$s->getName()] = $s;
         }
+
         return $results;
     }
 }
diff --git a/app/bundles/PluginBundle/Entity/Plugin.php b/app/bundles/PluginBundle/Entity/Plugin.php
index 8c60ff03776..7ce28421683 100644
--- a/app/bundles/PluginBundle/Entity/Plugin.php
+++ b/app/bundles/PluginBundle/Entity/Plugin.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Mautic\CoreBundle\Entity\CommonEntity;
 
 /**
- * Class Plugin
+ * Class Plugin.
  */
 class Plugin extends CommonEntity
 {
-
     /**
      * @var int
      */
@@ -60,7 +60,7 @@ class Plugin extends CommonEntity
      */
     private $integrations;
 
-    public function __construct ()
+    public function __construct()
     {
         $this->integrations = new ArrayCollection();
     }
@@ -68,13 +68,13 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('plugins')
             ->setCustomRepositoryClass('Mautic\PluginBundle\Entity\PluginRepository')
-            ->addUniqueConstraint(array('bundle'), 'unique_bundle');
+            ->addUniqueConstraint(['bundle'], 'unique_bundle');
 
         $builder->addIdColumns();
 
@@ -101,32 +101,29 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->build();
     }
 
-    /**
-     * @return void
-     */
-    public function __clone ()
+    public function __clone()
     {
         $this->id = null;
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Addon
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->name = $name;
 
@@ -134,33 +131,33 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Set bundle
+     * Set bundle.
      *
      * @param string $bundle
      *
      * @return Addon
      */
-    public function setBundle ($bundle)
+    public function setBundle($bundle)
     {
         $this->bundle = $bundle;
     }
 
     /**
-     * Get bundle
+     * Get bundle.
      *
      * @return string
      */
-    public function getBundle ()
+    public function getBundle()
     {
         return $this->bundle;
     }
@@ -168,7 +165,7 @@ public function getBundle ()
     /**
      * @return mixed
      */
-    public function getIntegrations ()
+    public function getIntegrations()
     {
         return $this->integrations;
     }
@@ -176,7 +173,7 @@ public function getIntegrations ()
     /**
      * @return mixed
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
@@ -184,7 +181,7 @@ public function getDescription ()
     /**
      * @param mixed $description
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->description = $description;
     }
@@ -192,7 +189,7 @@ public function setDescription ($description)
     /**
      * @return mixed
      */
-    public function getVersion ()
+    public function getVersion()
     {
         return $this->version;
     }
@@ -200,7 +197,7 @@ public function getVersion ()
     /**
      * @param mixed $version
      */
-    public function setVersion ($version)
+    public function setVersion($version)
     {
         $this->version = $version;
     }
@@ -208,7 +205,7 @@ public function setVersion ($version)
     /**
      * @return mixed
      */
-    public function getIsMissing ()
+    public function getIsMissing()
     {
         return $this->isMissing;
     }
@@ -216,7 +213,7 @@ public function getIsMissing ()
     /**
      * @param mixed $isMissing
      */
-    public function setIsMissing ($isMissing)
+    public function setIsMissing($isMissing)
     {
         $this->isMissing = $isMissing;
     }
@@ -224,7 +221,7 @@ public function setIsMissing ($isMissing)
     /**
      * @return mixed
      */
-    public function getAuthor ()
+    public function getAuthor()
     {
         return $this->author;
     }
@@ -232,7 +229,7 @@ public function getAuthor ()
     /**
      * @param mixed $author
      */
-    public function setAuthor ($author)
+    public function setAuthor($author)
     {
         $this->author = $author;
     }
diff --git a/app/bundles/PluginBundle/Entity/PluginRepository.php b/app/bundles/PluginBundle/Entity/PluginRepository.php
index 77575d2fb9a..c3f0a823080 100644
--- a/app/bundles/PluginBundle/Entity/PluginRepository.php
+++ b/app/bundles/PluginBundle/Entity/PluginRepository.php
@@ -1,29 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle\Entity;
 
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class PluginRepository
+ * Class PluginRepository.
  */
 class PluginRepository extends CommonRepository
 {
-
     /**
-     * Find an addon record by bundle name
+     * Find an addon record by bundle name.
      *
      * @param string $bundle
      *
      * @return mixed
+     *
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findByBundle($bundle)
@@ -38,13 +38,13 @@ public function findByBundle($bundle)
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this->_em->createQueryBuilder();
         $q->select($this->getTableAlias())
-            ->from('MauticPluginBundle:Plugin', $this->getTableAlias(), (!empty($args['index'])) ? $this->getTableAlias() . '.' . $args['index'] : $this->getTableAlias() . '.id');
+            ->from('MauticPluginBundle:Plugin', $this->getTableAlias(), (!empty($args['index'])) ? $this->getTableAlias().'.'.$args['index'] : $this->getTableAlias().'.id');
 
-        $args['qb'] = $q;
+        $args['qb']               = $q;
         $args['ignore_paginator'] = true;
 
         return parent::getEntities($args);
@@ -55,9 +55,9 @@ public function getEntities($args = array())
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('p.name', 'ASC')
-        );
+        return [
+            ['p.name', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/PluginBundle/Event/AbstractPluginIntegrationEvent.php b/app/bundles/PluginBundle/Event/AbstractPluginIntegrationEvent.php
index c2e7751849b..121e8ec44fe 100644
--- a/app/bundles/PluginBundle/Event/AbstractPluginIntegrationEvent.php
+++ b/app/bundles/PluginBundle/Event/AbstractPluginIntegrationEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * Class AbstractPluginIntegrationEvent
+ * Class AbstractPluginIntegrationEvent.
  */
 class AbstractPluginIntegrationEvent extends Event
 {
@@ -23,7 +24,7 @@ class AbstractPluginIntegrationEvent extends Event
     protected $integration;
 
     /**
-     * Get the integration's name
+     * Get the integration's name.
      *
      * @return mixed
      */
@@ -33,7 +34,7 @@ public function getIntegrationName()
     }
 
     /**
-     * Get the integration object
+     * Get the integration object.
      *
      * @return AbstractIntegration
      */
@@ -42,4 +43,3 @@ public function getIntegration()
         return $this->integration;
     }
 }
-
diff --git a/app/bundles/PluginBundle/Event/PluginIntegrationAuthCallbackUrlEvent.php b/app/bundles/PluginBundle/Event/PluginIntegrationAuthCallbackUrlEvent.php
index 77b8b8e10a1..73b596d4ea8 100644
--- a/app/bundles/PluginBundle/Event/PluginIntegrationAuthCallbackUrlEvent.php
+++ b/app/bundles/PluginBundle/Event/PluginIntegrationAuthCallbackUrlEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class PluginIntegrationAuthCallbackUrlEvent
+ * Class PluginIntegrationAuthCallbackUrlEvent.
  */
 class PluginIntegrationAuthCallbackUrlEvent extends AbstractPluginIntegrationEvent
 {
@@ -51,4 +52,3 @@ public function setCallbackUrl($callbackUrl)
         $this->stopPropagation();
     }
 }
-
diff --git a/app/bundles/PluginBundle/Event/PluginIntegrationAuthRedirectEvent.php b/app/bundles/PluginBundle/Event/PluginIntegrationAuthRedirectEvent.php
index aa3ad83cde9..57c98f13a84 100644
--- a/app/bundles/PluginBundle/Event/PluginIntegrationAuthRedirectEvent.php
+++ b/app/bundles/PluginBundle/Event/PluginIntegrationAuthRedirectEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class PluginIntegrationAuthRedirectEvent
+ * Class PluginIntegrationAuthRedirectEvent.
  */
 class PluginIntegrationAuthRedirectEvent extends AbstractPluginIntegrationEvent
 {
@@ -50,4 +51,4 @@ public function setAuthUrl($authUrl)
 
         $this->stopPropagation();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Event/PluginIntegrationEvent.php b/app/bundles/PluginBundle/Event/PluginIntegrationEvent.php
index 34fbab6697b..75495f3d63a 100644
--- a/app/bundles/PluginBundle/Event/PluginIntegrationEvent.php
+++ b/app/bundles/PluginBundle/Event/PluginIntegrationEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class PluginIntegrationEvent
+ * Class PluginIntegrationEvent.
  */
 class PluginIntegrationEvent extends AbstractPluginIntegrationEvent
 {
diff --git a/app/bundles/PluginBundle/Event/PluginIntegrationFormDisplayEvent.php b/app/bundles/PluginBundle/Event/PluginIntegrationFormDisplayEvent.php
index 19a08de4623..b63397ef08b 100644
--- a/app/bundles/PluginBundle/Event/PluginIntegrationFormDisplayEvent.php
+++ b/app/bundles/PluginBundle/Event/PluginIntegrationFormDisplayEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,14 +13,14 @@
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class PluginIntegrationFormDisplayEvent
+ * Class PluginIntegrationFormDisplayEvent.
  */
 class PluginIntegrationFormDisplayEvent extends AbstractPluginIntegrationEvent
 {
     /**
      * @var string
      */
-    private $settings = array();
+    private $settings = [];
 
     /**
      * PluginIntegrationAuthCallbackUrlEvent constructor.
@@ -51,4 +52,3 @@ public function setSettings(array $settings)
         $this->stopPropagation();
     }
 }
-
diff --git a/app/bundles/PluginBundle/Event/PluginIntegrationKeyEvent.php b/app/bundles/PluginBundle/Event/PluginIntegrationKeyEvent.php
index f7e258f263a..db8c0b063fc 100644
--- a/app/bundles/PluginBundle/Event/PluginIntegrationKeyEvent.php
+++ b/app/bundles/PluginBundle/Event/PluginIntegrationKeyEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class PluginIntegrationKeyEvent
+ * Class PluginIntegrationKeyEvent.
  */
 class PluginIntegrationKeyEvent extends AbstractPluginIntegrationEvent
 {
@@ -34,7 +35,7 @@ public function __construct(AbstractIntegration $integration, array $keys = null
     }
 
     /**
-     * Get the keys array
+     * Get the keys array.
      */
     public function getKeys()
     {
@@ -42,7 +43,7 @@ public function getKeys()
     }
 
     /**
-     * Set new keys array
+     * Set new keys array.
      *
      * @param $keys
      */
diff --git a/app/bundles/PluginBundle/Event/PluginIntegrationRequestEvent.php b/app/bundles/PluginBundle/Event/PluginIntegrationRequestEvent.php
index 4378a16d8c8..cc2d95547d7 100644
--- a/app/bundles/PluginBundle/Event/PluginIntegrationRequestEvent.php
+++ b/app/bundles/PluginBundle/Event/PluginIntegrationRequestEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class PluginIntegrationRequestEvent
+ * Class PluginIntegrationRequestEvent.
  */
 class PluginIntegrationRequestEvent extends AbstractPluginIntegrationEvent
 {
diff --git a/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php b/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php
index 6ae5137ea15..c0f7aed5d84 100644
--- a/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/PluginBundle/EventListener/CampaignSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,12 +14,11 @@
 use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\PluginBundle\PluginEvents;
 
 /**
- * Class CampaignSubscriber
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -26,7 +26,7 @@ class CampaignSubscriber extends CommonSubscriber
      * @var IntegrationHelper
      */
     protected $integrationHelper;
-    
+
     /**
      * CampaignSubscriber constructor.
      *
@@ -40,11 +40,11 @@ public function __construct(IntegrationHelper $integrationHelper)
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
-            CampaignEvents::CAMPAIGN_ON_BUILD => ['onCampaignBuild', 0],
-            PluginEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerAction', 0]
+            CampaignEvents::CAMPAIGN_ON_BUILD        => ['onCampaignBuild', 0],
+            PluginEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerAction', 0],
         ];
     }
 
@@ -58,7 +58,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             'description' => 'mautic.plugin.actions.tooltip',
             'formType'    => 'integration_list',
             'formTheme'   => 'MauticPluginBundle:FormTheme\Integration',
-            'eventName'   => PluginEvents::ON_CAMPAIGN_TRIGGER_ACTION
+            'eventName'   => PluginEvents::ON_CAMPAIGN_TRIGGER_ACTION,
         ];
 
         $event->addAction('plugin.leadpush', $action);
@@ -71,7 +71,7 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
     {
         $config = $event->getConfig();
         $lead   = $event->getLead();
-        
+
         $integration = (!empty($config['integration'])) ? $config['integration'] : null;
         $feature     = (empty($integration)) ? 'push_lead' : null;
 
diff --git a/app/bundles/PluginBundle/EventListener/FormSubscriber.php b/app/bundles/PluginBundle/EventListener/FormSubscriber.php
index cdca0f7d596..5f8a76b757c 100644
--- a/app/bundles/PluginBundle/EventListener/FormSubscriber.php
+++ b/app/bundles/PluginBundle/EventListener/FormSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,19 +15,18 @@
 use Mautic\FormBundle\FormEvents;
 
 /**
- * Class FormSubscriber
+ * Class FormSubscriber.
  */
 class FormSubscriber extends CommonSubscriber
 {
-
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            FormEvents::FORM_ON_BUILD  => ['onFormBuild', 0]
-        );
+        return [
+            FormEvents::FORM_ON_BUILD => ['onFormBuild', 0],
+        ];
     }
 
     /**
@@ -34,14 +34,14 @@ static public function getSubscribedEvents()
      */
     public function onFormBuild(FormBuilderEvent $event)
     {
-        $action = array(
+        $action = [
             'group'       => 'mautic.plugin.actions',
             'description' => 'mautic.plugin.actions.tooltip',
             'label'       => 'mautic.plugin.actions.push_lead',
             'formType'    => 'integration_list',
             'formTheme'   => 'MauticPluginBundle:FormTheme\Integration',
-            'callback'    => array('\\Mautic\\PluginBundle\\Helper\\EventHelper', 'pushLead')
-        );
+            'callback'    => ['\\Mautic\\PluginBundle\\Helper\\EventHelper', 'pushLead'],
+        ];
         $event->addSubmitAction('plugin.leadpush', $action);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/EventListener/PointSubscriber.php b/app/bundles/PluginBundle/EventListener/PointSubscriber.php
index 1ca3526658a..cd960963ada 100644
--- a/app/bundles/PluginBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/PluginBundle/EventListener/PointSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,34 +15,33 @@
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
-
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::TRIGGER_ON_BUILD => array('onTriggerBuild', 0)
-        );
+        return [
+            PointEvents::TRIGGER_ON_BUILD => ['onTriggerBuild', 0],
+        ];
     }
 
     /**
      * @param TriggerBuilderEvent $event
      */
-    public function onTriggerBuild (TriggerBuilderEvent $event)
+    public function onTriggerBuild(TriggerBuilderEvent $event)
     {
-        $action = array(
+        $action = [
             'group'     => 'mautic.plugin.point.action',
             'label'     => 'mautic.plugin.actions.push_lead',
             'formType'  => 'integration_list',
             'formTheme' => 'MauticPluginBundle:FormTheme\Integration',
-            'callback'  => array('\\Mautic\\PluginBundle\\Helper\\EventHelper', 'pushLead')
-        );
+            'callback'  => ['\\Mautic\\PluginBundle\\Helper\\EventHelper', 'pushLead'],
+        ];
 
         $event->addEvent('plugin.leadpush', $action);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Exception/ApiErrorException.php b/app/bundles/PluginBundle/Exception/ApiErrorException.php
index 0681178c405..256c714825d 100644
--- a/app/bundles/PluginBundle/Exception/ApiErrorException.php
+++ b/app/bundles/PluginBundle/Exception/ApiErrorException.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 class ApiErrorException extends \Exception
 {
-
     public function __construct($message = 'API error', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
diff --git a/app/bundles/PluginBundle/Form/Type/DetailsType.php b/app/bundles/PluginBundle/Form/Type/DetailsType.php
index ade5765eebd..143766c44ce 100644
--- a/app/bundles/PluginBundle/Form/Type/DetailsType.php
+++ b/app/bundles/PluginBundle/Form/Type/DetailsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,16 +17,14 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class DetailsType
- *
- * @package Mautic\PluginBundle\Form\Type
+ * Class DetailsType.
  */
 class DetailsType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('isPublished', 'yesno_button_group');
 
@@ -39,40 +38,40 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             }
         }
 
-        $builder->add('apiKeys', 'integration_keys', array(
-            'label'               => false,
-            'integration_keys'    => $keys,
-            'data'                => $decryptedKeys,
-            'integration_object'  => $options['integration_object']
-        ));
+        $builder->add('apiKeys', 'integration_keys', [
+            'label'              => false,
+            'integration_keys'   => $keys,
+            'data'               => $decryptedKeys,
+            'integration_object' => $options['integration_object'],
+        ]);
 
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use($keys, $decryptedKeys, $options) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($keys, $decryptedKeys, $options) {
             $data = $event->getData();
             $form = $event->getForm();
 
-            $form->add('apiKeys', 'integration_keys', array(
-                'label'               => false,
-                'integration_keys'    => $keys,
-                'data'                => $decryptedKeys,
-                'integration_object'  => $options['integration_object'],
-                'is_published'        => (int) $data['isPublished']
-            ));
+            $form->add('apiKeys', 'integration_keys', [
+                'label'              => false,
+                'integration_keys'   => $keys,
+                'data'               => $decryptedKeys,
+                'integration_object' => $options['integration_object'],
+                'is_published'       => (int) $data['isPublished'],
+            ]);
         });
 
         if (!empty($formSettings['requires_authorization'])) {
-            $disabled     = false;
-            $label        = ($options['integration_object']->isAuthorized()) ? 'reauthorize' : 'authorize';
+            $disabled = false;
+            $label    = ($options['integration_object']->isAuthorized()) ? 'reauthorize' : 'authorize';
 
-            $builder->add('authButton', 'standalone_button', array(
-                'attr'     => array(
+            $builder->add('authButton', 'standalone_button', [
+                'attr' => [
                     'class'   => 'btn btn-success btn-lg',
                     'onclick' => 'Mautic.initiateIntegrationAuthorization()',
-                    'icon'    => 'fa fa-key'
+                    'icon'    => 'fa fa-key',
 
-                ),
-                'label'    => 'mautic.integration.form.' . $label,
-                'disabled' => $disabled
-            ));
+                ],
+                'label'    => 'mautic.integration.form.'.$label,
+                'disabled' => $disabled,
+            ]);
         }
 
         $features = $options['integration_object']->getSupportedFeatures();
@@ -82,40 +81,40 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $enabledFeatures = $options['data']->getSupportedFeatures();
             $data            = ($configured) ? $enabledFeatures : $features;
 
-            $choices = array();
+            $choices = [];
             foreach ($features as $f) {
-                $choices[$f] = 'mautic.integration.form.feature.' . $f;
+                $choices[$f] = 'mautic.integration.form.feature.'.$f;
             }
 
-            $builder->add('supportedFeatures', 'choice', array(
-                'choices'     => $choices,
-                'expanded'    => true,
-                'label_attr'  => array('class' => 'control-label'),
-                'multiple'    => true,
-                'label'       => 'mautic.integration.form.features',
-                'required'    => false,
-                'data'        => $data
-            ));
-        };
-
-        $builder->add('featureSettings', 'integration_featuresettings', array(
+            $builder->add('supportedFeatures', 'choice', [
+                'choices'    => $choices,
+                'expanded'   => true,
+                'label_attr' => ['class' => 'control-label'],
+                'multiple'   => true,
+                'label'      => 'mautic.integration.form.features',
+                'required'   => false,
+                'data'       => $data,
+            ]);
+        }
+
+        $builder->add('featureSettings', 'integration_featuresettings', [
             'label'              => 'mautic.integration.form.feature.settings',
             'required'           => true,
             'data'               => $options['data']->getFeatureSettings(),
-            'label_attr'         => array('class' => 'control-label'),
+            'label_attr'         => ['class' => 'control-label'],
             'integration'        => $options['integration'],
             'integration_object' => $options['integration_object'],
-            'lead_fields'        => $options['lead_fields']
-        ));
+            'lead_fields'        => $options['lead_fields'],
+        ]);
 
-        $builder->add('name', 'hidden', array('data' => $options['integration']));
+        $builder->add('name', 'hidden', ['data' => $options['integration']]);
 
-        $builder->add('in_auth', 'hidden', array('mapped' => false));
+        $builder->add('in_auth', 'hidden', ['mapped' => false]);
 
-        $builder->add('buttons', 'form_buttons', array(
+        $builder->add('buttons', 'form_buttons', [
             'apply_text' => false,
-            'save_text'  => 'mautic.core.form.save'
-        ));
+            'save_text'  => 'mautic.core.form.save',
+        ]);
 
         if (!empty($options['action'])) {
             $builder->setAction($options['action']);
@@ -125,19 +124,19 @@ public function buildForm (FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Mautic\PluginBundle\Entity\Integration'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Mautic\PluginBundle\Entity\Integration',
+        ]);
 
-        $resolver->setRequired(array('integration', 'integration_object', 'lead_fields'));
+        $resolver->setRequired(['integration', 'integration_object', 'lead_fields']);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
         return 'integration_details';
     }
diff --git a/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php b/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php
index 1346f80d2d2..232d1612ae6 100644
--- a/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php
+++ b/app/bundles/PluginBundle/Form/Type/FeatureSettingsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,17 +20,14 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FeatureSettingsType
- *
- * @package Mautic\PluginBundle\Form\Type
+ * Class FeatureSettingsType.
  */
 class FeatureSettingsType extends AbstractType
 {
-
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
@@ -38,9 +36,8 @@ public function __construct (MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
         $integration_object = $options['integration_object'];
 
         //add custom feature settings
@@ -48,51 +45,49 @@ public function buildForm (FormBuilderInterface $builder, array $options)
         $leadFields = $options['lead_fields'];
 
         $formModifier = function (FormInterface $form, $data, $method = 'get') use ($integration_object, $leadFields) {
-
-            $settings = array(
+            $settings = [
                 'silence_exceptions' => false,
-                'feature_settings'   => $data
-            );
+                'feature_settings'   => $data,
+            ];
             try {
                 $fields = $integration_object->getFormLeadFields($settings);
                 if (!is_array($fields)) {
-                    $fields = array();
+                    $fields = [];
                 }
                 $error = '';
             } catch (\Exception $e) {
-                $fields = array();
+                $fields = [];
                 $error  = $e->getMessage();
             }
 
-            list ($specialInstructions, $alertType) = $integration_object->getFormNotes('leadfield_match');
+            list($specialInstructions, $alertType) = $integration_object->getFormNotes('leadfield_match');
 
             /**
              * Auto Match Integration Fields with Mautic Fields.
              */
-            $flattenLeadFields = array();
+            $flattenLeadFields = [];
             foreach (array_values($leadFields) as $fieldsWithoutGroups) {
                 $flattenLeadFields = array_merge($flattenLeadFields, $fieldsWithoutGroups);
             }
 
             $integrationFields  = array_keys($fields);
             $flattenLeadFields  = array_keys($flattenLeadFields);
-            $fieldsIntersection = array_uintersect($integrationFields, $flattenLeadFields, "strcasecmp");
+            $fieldsIntersection = array_uintersect($integrationFields, $flattenLeadFields, 'strcasecmp');
 
-
-            $autoMatchedFields = array();
+            $autoMatchedFields = [];
             foreach ($fieldsIntersection as $field) {
                 $autoMatchedFields[$field] = strtolower($field);
             }
 
-            $form->add('leadFields', 'integration_fields', array(
+            $form->add('leadFields', 'integration_fields', [
                 'label'                => 'mautic.integration.leadfield_matches',
                 'required'             => true,
                 'lead_fields'          => $leadFields,
                 'data'                 => isset($data['leadFields']) && !empty($data['leadFields']) ? $data['leadFields'] : $autoMatchedFields,
                 'integration_fields'   => $fields,
                 'special_instructions' => $specialInstructions,
-                'alert_type'           => $alertType
-            ));
+                'alert_type'           => $alertType,
+            ]);
 
             if ($method == 'get' && $error) {
                 $form->addError(new FormError($error));
@@ -101,7 +96,6 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
         $builder->addEventListener(FormEvents::PRE_SET_DATA,
             function (FormEvent $event) use ($formModifier) {
-
                 $data = $event->getData();
                 $formModifier($event->getForm(), $data);
             }
@@ -118,16 +112,16 @@ function (FormEvent $event) use ($formModifier) {
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array('integration', 'integration_object', 'lead_fields'));
+        $resolver->setRequired(['integration', 'integration_object', 'lead_fields']);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
-        return "integration_featuresettings";
+        return 'integration_featuresettings';
     }
 }
diff --git a/app/bundles/PluginBundle/Form/Type/FieldsType.php b/app/bundles/PluginBundle/Form/Type/FieldsType.php
index 194b6f63dd9..28afcfea3ab 100644
--- a/app/bundles/PluginBundle/Form/Type/FieldsType.php
+++ b/app/bundles/PluginBundle/Form/Type/FieldsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,30 +18,27 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class SocialMediaServiceType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class SocialMediaServiceType.
  */
 class FieldsType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         foreach ($options['integration_fields'] as $field => $details) {
             $label = (is_array($details)) ? $details['label'] : $details;
             $field = InputHelper::alphanum($field, false, '_');
 
-            $builder->add($field, 'choice', array(
+            $builder->add($field, 'choice', [
                 'choices'    => $options['lead_fields'],
                 'label'      => $label,
                 'required'   => (is_array($details) && isset($details['required'])) ? $details['required'] : false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control', 'data-placeholder' => ' ')
-            ));
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control', 'data-placeholder' => ' '],
+            ]);
         }
     }
 
@@ -54,7 +52,7 @@ public function configureOptions(OptionsResolver $resolver)
             [
                 'special_instructions' => '',
                 'alert_type'           => '',
-                'allow_extra_fields'   => true
+                'allow_extra_fields'   => true,
             ]
         );
     }
@@ -62,8 +60,9 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * @return string
      */
-    public function getName() {
-        return "integration_fields";
+    public function getName()
+    {
+        return 'integration_fields';
     }
 
     /**
@@ -74,4 +73,4 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['specialInstructions'] = $options['special_instructions'];
         $view->vars['alertType']           = $options['alert_type'];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php b/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php
index 9b559a7d8d0..486d5c10dae 100644
--- a/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php
+++ b/app/bundles/PluginBundle/Form/Type/IntegrationConfigType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,17 +15,14 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class IntegrationConfigType
- *
- * @package Mautic\PluginBundle\Form\Type
+ * Class IntegrationConfigType.
  */
 class IntegrationConfigType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ($options['integration'] != null) {
             $options['integration']->appendToForm($builder, $options['data'], 'integration');
@@ -34,18 +32,18 @@ public function buildForm (FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array('integration'));
-        $resolver->setDefaults(array(
-            'label' => false
-        ));
+        $resolver->setRequired(['integration']);
+        $resolver->setDefaults([
+            'label' => false,
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
         return 'integration_config';
     }
diff --git a/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php b/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php
index 56befaa1b8b..1d9ed039eb2 100644
--- a/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php
+++ b/app/bundles/PluginBundle/Form/Type/IntegrationsListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -20,13 +20,10 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class IntegrationsListType
- *
- * @package Mautic\PluginBundle\Form\Type
+ * Class IntegrationsListType.
  */
 class IntegrationsListType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
@@ -62,22 +59,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'integration',
             'choice',
             [
-                'choices'     => $integrations,
-                'expanded'    => false,
-                'label_attr'  => ['class' => 'control-label'],
-                'multiple'    => false,
-                'label'       => 'mautic.integration.integration',
-                'attr'        => [
+                'choices'    => $integrations,
+                'expanded'   => false,
+                'label_attr' => ['class' => 'control-label'],
+                'multiple'   => false,
+                'label'      => 'mautic.integration.integration',
+                'attr'       => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.integration.integration.tooltip',
-                    'onchange' => 'Mautic.getIntegrationConfig(this);'
+                    'onchange' => 'Mautic.getIntegrationConfig(this);',
                 ],
                 'required'    => true,
                 'constraints' => [
                     new NotBlank(
                         ['message' => 'mautic.core.value.required']
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -86,12 +83,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'config',
                 'integration_config',
                 [
-                    'label'       => false,
-                    'attr'        => [
-                        'class' => 'integration-config-container'
+                    'label' => false,
+                    'attr'  => [
+                        'class' => 'integration-config-container',
                     ],
                     'integration' => (isset($integrationObjects[$data['integration']])) ? $integrationObjects[$data['integration']] : null,
-                    'data'        => (isset($data['config'])) ? $data['config'] : []
+                    'data'        => (isset($data['config'])) ? $data['config'] : [],
                 ]
             );
         };
@@ -121,7 +118,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setOptional(['supported_features']);
         $resolver->setDefaults(
             [
-                'supported_features' => 'push_lead'
+                'supported_features' => 'push_lead',
             ]
         );
     }
diff --git a/app/bundles/PluginBundle/Form/Type/KeysType.php b/app/bundles/PluginBundle/Form/Type/KeysType.php
index 2565982de69..8b3ca9ffa91 100644
--- a/app/bundles/PluginBundle/Form/Type/KeysType.php
+++ b/app/bundles/PluginBundle/Form/Type/KeysType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,13 +17,10 @@
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * Class SocialMediaKeysType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class SocialMediaKeysType.
  */
 class KeysType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
@@ -50,7 +48,7 @@ function ($validateMe, ExecutionContextInterface $context) use ($options) {
                                 $context->buildViolation('mautic.core.value.required')->addViolation();
                             }
                         }
-                    )
+                    ),
                 ] : [];
 
             $type = ($isSecret) ? 'password' : 'text';
@@ -59,15 +57,15 @@ function ($validateMe, ExecutionContextInterface $context) use ($options) {
                 $key,
                 $type,
                 [
-                    'label'          => $label,
-                    'label_attr'     => ['class' => 'control-label'],
-                    'attr'           => [
+                    'label'      => $label,
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'       => 'form-control',
-                        'placeholder' => ($type == 'password') ? '**************' : ''
+                        'placeholder' => ($type == 'password') ? '**************' : '',
                     ],
                     'required'       => $required,
                     'constraints'    => $constraints,
-                    'error_bubbling' => false
+                    'error_bubbling' => false,
                 ]
             );
         }
@@ -89,6 +87,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "integration_keys";
+        return 'integration_keys';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Helper/EventHelper.php b/app/bundles/PluginBundle/Helper/EventHelper.php
index 3c2d6028576..661a399f2be 100644
--- a/app/bundles/PluginBundle/Helper/EventHelper.php
+++ b/app/bundles/PluginBundle/Helper/EventHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,18 +13,15 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 
 /**
- * Class EventHelper
- *
- * @package Mautic\PluginBundle\Helper
+ * Class EventHelper.
  */
 class EventHelper
 {
-
     /**
      * @param               $lead
      * @param MauticFactory $factory
      */
-    static public function pushLead($config, $lead, MauticFactory $factory)
+    public static function pushLead($config, $lead, MauticFactory $factory)
     {
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
         $integrationHelper = $factory->getHelper('integration');
@@ -49,4 +47,4 @@ static public function pushLead($config, $lead, MauticFactory $factory)
 
         return $success;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Helper/IntegrationHelper.php b/app/bundles/PluginBundle/Helper/IntegrationHelper.php
index b2b68dc8b26..46031afabd2 100644
--- a/app/bundles/PluginBundle/Helper/IntegrationHelper.php
+++ b/app/bundles/PluginBundle/Helper/IntegrationHelper.php
@@ -1,27 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle\Helper;
 
-use Mautic\PluginBundle\Entity\Plugin;
-use Mautic\PluginBundle\Entity\Integration;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
+use Mautic\PluginBundle\Entity\Integration;
+use Mautic\PluginBundle\Entity\Plugin;
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Symfony\Component\Finder\Finder;
 
 /**
- * Class IntegrationHelper
+ * Class IntegrationHelper.
  */
 class IntegrationHelper
 {
-
     /**
      * @var MauticFactory
      */
@@ -30,13 +30,13 @@ class IntegrationHelper
     /**
      * @param MauticFactory $factory
      */
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
 
     /**
-     * Get a list of integration helper classes
+     * Get a list of integration helper classes.
      *
      * @param array|string $specificIntegrations
      * @param array        $withFeatures
@@ -46,15 +46,15 @@ public function __construct (MauticFactory $factory)
      *
      * @return mixed
      */
-    public function getIntegrationObjects ($specificIntegrations = null, $withFeatures = null, $alphabetical = false, $pluginFilter = null, $publishedOnly = false)
+    public function getIntegrationObjects($specificIntegrations = null, $withFeatures = null, $alphabetical = false, $pluginFilter = null, $publishedOnly = false)
     {
-        static $integrations = array(), $available = array(), $byFeatureList = array(), $byPlugin = array();
+        static $integrations = [], $available = [], $byFeatureList = [], $byPlugin = [];
 
         // Build the service classes
         if (empty($available)) {
             $em = $this->factory->getEntityManager();
 
-            $available = array();
+            $available = [];
 
             // Get currently installed integrations
             $integrationSettings = $this->getIntegrationSettings();
@@ -63,17 +63,17 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
             $plugins = $this->factory->getPluginBundles();
 
             // Get a list of already installed integrations
-            $pluginModel      = $this->factory->getModel('plugin');
-            $integrationRepo  = $em->getRepository('MauticPluginBundle:Integration');
+            $pluginModel     = $this->factory->getModel('plugin');
+            $integrationRepo = $em->getRepository('MauticPluginBundle:Integration');
             //get a list of plugins for filter
             $installedPlugins = $pluginModel->getEntities(
-                array(
+                [
                     'hydration_mode' => 'hydrate_array',
-                    'index'          => 'bundle'
-                )
+                    'index'          => 'bundle',
+                ]
             );
 
-            $newIntegrations  = array();
+            $newIntegrations = [];
 
             // Scan the plugins for integration classes
             foreach ($plugins as $plugin) {
@@ -87,7 +87,7 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
                     $finder->files()->name('*Integration.php')->in($plugin['directory'].'/Integration')->ignoreDotFiles(true);
 
                     $id              = $installedPlugins[$plugin['bundle']]['id'];
-                    $byPlugin[$id]   = array();
+                    $byPlugin[$id]   = [];
                     $pluginReference = $em->getReference('MauticPluginBundle:Plugin', $id);
                     $pluginNamespace = str_replace('MauticPlugin', '', $plugin['bundle']);
 
@@ -101,7 +101,7 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
                             $integrationSettings[$integrationName] = $newIntegration;
 
                             // Initiate the class in order to get the features supported
-                            $class = "\\MauticPlugin\\" . $pluginNamespace . "\\Integration\\" . $integrationName . "Integration";
+                            $class           = '\\MauticPlugin\\'.$pluginNamespace.'\\Integration\\'.$integrationName.'Integration';
                             $reflectionClass = new \ReflectionClass($class);
                             if ($reflectionClass->isInstantiable()) {
                                 $integrations[$integrationName] = new $class($this->factory);
@@ -122,18 +122,18 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
                         }
 
                         /** @var \Mautic\PluginBundle\Entity\Integration $settings */
-                        $settings = $integrationSettings[$integrationName];
-                        $available[$integrationName]  = array(
+                        $settings                    = $integrationSettings[$integrationName];
+                        $available[$integrationName] = [
                             'integration' => $integrationName,
                             'settings'    => $settings,
-                            'namespace'   => $pluginNamespace
-                        );
+                            'namespace'   => $pluginNamespace,
+                        ];
 
                         // Sort by feature and plugin for later
                         $features = $settings->getSupportedFeatures();
                         foreach ($features as $feature) {
                             if (!isset($byFeatureList[$feature])) {
-                                $byFeatureList[$feature] = array();
+                                $byFeatureList[$feature] = [];
                             }
                             $byFeatureList[$feature][] = $integrationName;
                         }
@@ -151,11 +151,11 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
 
         // Ensure appropriate formats
         if ($specificIntegrations !== null && !is_array($specificIntegrations)) {
-            $specificIntegrations = array($specificIntegrations);
+            $specificIntegrations = [$specificIntegrations];
         }
 
         if ($withFeatures !== null && !is_array($withFeatures)) {
-            $withFeatures = array($withFeatures);
+            $withFeatures = [$withFeatures];
         }
 
         // Build the integrations wanted
@@ -172,7 +172,7 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
 
         // Filter by features
         if (!empty($withFeatures)) {
-            $integrationsWithFeatures = array();
+            $integrationsWithFeatures = [];
             foreach ($withFeatures as $feature) {
                 if (isset($byFeatureList[$feature])) {
                     $integrationsWithFeatures = $integrationsWithFeatures + $byFeatureList[$feature];
@@ -182,7 +182,7 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
             $filteredIntegrations = array_intersect($filteredIntegrations, $integrationsWithFeatures);
         }
 
-        $returnServices = array();
+        $returnServices = [];
 
         // Build the classes if not already
         foreach ($filteredIntegrations as $integrationName) {
@@ -191,8 +191,8 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
             }
 
             if (!isset($integrations[$integrationName])) {
-                $integration = $available[$integrationName];
-                $class           = "\\MauticPlugin\\" . $integration['namespace'] . "\\Integration\\" . $integrationName . "Integration";
+                $integration     = $available[$integrationName];
+                $class           = '\\MauticPlugin\\'.$integration['namespace'].'\\Integration\\'.$integrationName.'Integration';
                 $reflectionClass = new \ReflectionClass($class);
                 if ($reflectionClass->isInstantiable()) {
                     $integrations[$integrationName] = new $class($this->factory);
@@ -208,8 +208,8 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
         if (empty($alphabetical)) {
             // Sort by priority
             uasort($returnServices, function ($a, $b) {
-                $aP = (int)$a->getPriority();
-                $bP = (int)$b->getPriority();
+                $aP = (int) $a->getPriority();
+                $bP = (int) $b->getPriority();
 
                 if ($aP === $bP) {
                     return 0;
@@ -231,7 +231,7 @@ public function getIntegrationObjects ($specificIntegrations = null, $withFeatur
     }
 
     /**
-     * Get a single integration object
+     * Get a single integration object.
      *
      * @param $name
      *
@@ -241,17 +241,17 @@ public function getIntegrationObject($name)
     {
         $integrationObjects = $this->getIntegrationObjects($name);
 
-        return ((isset($integrationObjects[$name]))) ?  $integrationObjects[$name] : false;
+        return ((isset($integrationObjects[$name]))) ? $integrationObjects[$name] : false;
     }
 
     /**
-     * Gets a count of integrations
+     * Gets a count of integrations.
      *
      * @param $plugin
      *
      * @return int
      */
-    public function getIntegrationCount ($plugin)
+    public function getIntegrationCount($plugin)
     {
         if (!is_array($plugin)) {
             $plugins = $this->factory->getParameter('plugin.bundles');
@@ -264,9 +264,9 @@ public function getIntegrationCount ($plugin)
             }
         }
 
-        if (is_dir($plugin['directory'] . '/Integration')) {
+        if (is_dir($plugin['directory'].'/Integration')) {
             $finder = new Finder();
-            $finder->files()->name('*Integration.php')->in($plugin['directory'] . '/Integration')->ignoreDotFiles(true);
+            $finder->files()->name('*Integration.php')->in($plugin['directory'].'/Integration')->ignoreDotFiles(true);
 
             return iterator_count($finder);
         }
@@ -275,65 +275,66 @@ public function getIntegrationCount ($plugin)
     }
 
     /**
-     * Returns popular social media services and regex URLs for parsing purposes
+     * Returns popular social media services and regex URLs for parsing purposes.
      *
      * @param bool $find If true, array of regexes to find a handle will be returned;
      *                   If false, array of URLs with a placeholder of %handle% will be returned
      *
      * @return array
+     *
      * @todo Extend this method to allow plugins to add URLs to these arrays
      */
-    public function getSocialProfileUrlRegex ($find = true)
+    public function getSocialProfileUrlRegex($find = true)
     {
         if ($find) {
             //regex to find a match
-            return array(
-                "twitter"   => "/twitter.com\/(.*?)($|\/)/",
-                "facebook"  => array(
+            return [
+                'twitter'  => "/twitter.com\/(.*?)($|\/)/",
+                'facebook' => [
                     "/facebook.com\/(.*?)($|\/)/",
-                    "/fb.me\/(.*?)($|\/)/"
-                ),
-                "linkedin"  => "/linkedin.com\/in\/(.*?)($|\/)/",
-                "instagram" => "/instagram.com\/(.*?)($|\/)/",
-                "pinterest" => "/pinterest.com\/(.*?)($|\/)/",
-                "klout"     => "/klout.com\/(.*?)($|\/)/",
-                "youtube"   => array(
+                    "/fb.me\/(.*?)($|\/)/",
+                ],
+                'linkedin'  => "/linkedin.com\/in\/(.*?)($|\/)/",
+                'instagram' => "/instagram.com\/(.*?)($|\/)/",
+                'pinterest' => "/pinterest.com\/(.*?)($|\/)/",
+                'klout'     => "/klout.com\/(.*?)($|\/)/",
+                'youtube'   => [
                     "/youtube.com\/user\/(.*?)($|\/)/",
-                    "/youtu.be\/user\/(.*?)($|\/)/"
-                ),
-                "flickr"    => "/flickr.com\/photos\/(.*?)($|\/)/",
-                "skype"     => "/skype:(.*?)($|\?)/",
-                "google"    => "/plus.google.com\/(.*?)($|\/)/",
-            );
+                    "/youtu.be\/user\/(.*?)($|\/)/",
+                ],
+                'flickr' => "/flickr.com\/photos\/(.*?)($|\/)/",
+                'skype'  => "/skype:(.*?)($|\?)/",
+                'google' => "/plus.google.com\/(.*?)($|\/)/",
+            ];
         } else {
             //populate placeholder
-            return array(
-                "twitter"    => "https://twitter.com/%handle%",
-                "facebook"   => "https://facebook.com/%handle%",
-                "linkedin"   => "https://linkedin.com/in/%handle%",
-                "instagram"  => "https://instagram.com/%handle%",
-                "pinterest"  => "https://pinterest.com/%handle%",
-                "klout"      => "https://klout.com/%handle%",
-                "youtube"    => "https://youtube.com/user/%handle%",
-                "flickr"     => "https://flickr.com/photos/%handle%",
-                "skype"      => "skype:%handle%?call",
-                "googleplus" => "https://plus.google.com/%handle%"
-            );
+            return [
+                'twitter'    => 'https://twitter.com/%handle%',
+                'facebook'   => 'https://facebook.com/%handle%',
+                'linkedin'   => 'https://linkedin.com/in/%handle%',
+                'instagram'  => 'https://instagram.com/%handle%',
+                'pinterest'  => 'https://pinterest.com/%handle%',
+                'klout'      => 'https://klout.com/%handle%',
+                'youtube'    => 'https://youtube.com/user/%handle%',
+                'flickr'     => 'https://flickr.com/photos/%handle%',
+                'skype'      => 'skype:%handle%?call',
+                'googleplus' => 'https://plus.google.com/%handle%',
+            ];
         }
     }
 
     /**
-     * Get array of integration entities
+     * Get array of integration entities.
      *
      * @return mixed
      */
-    public function getIntegrationSettings ()
+    public function getIntegrationSettings()
     {
         return $this->factory->getEntityManager()->getRepository('MauticPluginBundle:Integration')->getIntegrations();
     }
 
     /**
-     * Get the user's social profile data from cache or integrations if indicated
+     * Get the user's social profile data from cache or integrations if indicated.
      *
      * @param \Mautic\LeadBundle\Entity\Lead $lead
      * @param array                          $fields
@@ -344,16 +345,16 @@ public function getIntegrationSettings ()
      *
      * @return array
      */
-    public function getUserProfiles ($lead, $fields = array(), $refresh = false, $specificIntegration = null, $persistLead = true, $returnSettings = false)
+    public function getUserProfiles($lead, $fields = [], $refresh = false, $specificIntegration = null, $persistLead = true, $returnSettings = false)
     {
         $socialCache     = $lead->getSocialCache();
-        $featureSettings = array();
+        $featureSettings = [];
         if ($refresh) {
             //regenerate from integrations
             $now = new DateTimeHelper();
 
             //check to see if there are social profiles activated
-            $socialIntegrations = $this->getIntegrationObjects($specificIntegration, array('public_profile', 'public_activity'));
+            $socialIntegrations = $this->getIntegrationObjects($specificIntegration, ['public_profile', 'public_activity']);
 
             /* @var \MauticPlugin\MauticSocialBundle\Integration\SocialIntegration $sn */
             foreach ($socialIntegrations as $integration => $sn) {
@@ -366,7 +367,7 @@ public function getUserProfiles ($lead, $fields = array(), $refresh = false, $sp
                 }
 
                 if ($identifierField && $settings->isPublished()) {
-                    $profile = (!isset($socialCache[$integration])) ? array() : $socialCache[$integration];
+                    $profile = (!isset($socialCache[$integration])) ? [] : $socialCache[$integration];
 
                     //clear the cache
                     unset($profile['profile'], $profile['activity']);
@@ -381,11 +382,11 @@ public function getUserProfiles ($lead, $fields = array(), $refresh = false, $sp
 
                     if (!empty($profile['profile']) || !empty($profile['activity'])) {
                         if (!isset($socialCache[$integration])) {
-                            $socialCache[$integration] = array();
+                            $socialCache[$integration] = [];
                         }
 
-                        $socialCache[$integration]['profile']     = (!empty($profile['profile'])) ? $profile['profile'] : array();
-                        $socialCache[$integration]['activity']    = (!empty($profile['activity'])) ? $profile['activity'] : array();
+                        $socialCache[$integration]['profile']     = (!empty($profile['profile'])) ? $profile['profile'] : [];
+                        $socialCache[$integration]['activity']    = (!empty($profile['activity'])) ? $profile['activity'] : [];
                         $socialCache[$integration]['lastRefresh'] = $now->toUtcString();
                     }
                 } elseif (isset($socialCache[$integration])) {
@@ -399,7 +400,7 @@ public function getUserProfiles ($lead, $fields = array(), $refresh = false, $sp
                 $this->factory->getEntityManager()->getRepository('MauticLeadBundle:Lead')->saveEntity($lead);
             }
         } elseif ($returnSettings) {
-            $socialIntegrations = $this->getIntegrationObjects($specificIntegration, array('public_profile', 'public_activity'));
+            $socialIntegrations = $this->getIntegrationObjects($specificIntegration, ['public_profile', 'public_activity']);
             foreach ($socialIntegrations as $integration => $sn) {
                 $settings                      = $sn->getIntegrationSettings();
                 $featureSettings[$integration] = $settings->getFeatureSettings();
@@ -407,11 +408,11 @@ public function getUserProfiles ($lead, $fields = array(), $refresh = false, $sp
         }
 
         if ($specificIntegration) {
-            return ($returnSettings) ? array(array($specificIntegration => $socialCache[$specificIntegration]), $featureSettings)
-                : array($specificIntegration => $socialCache[$specificIntegration]);
+            return ($returnSettings) ? [[$specificIntegration => $socialCache[$specificIntegration]], $featureSettings]
+                : [$specificIntegration => $socialCache[$specificIntegration]];
         }
 
-        return ($returnSettings) ? array($socialCache, $featureSettings) : $socialCache;
+        return ($returnSettings) ? [$socialCache, $featureSettings] : $socialCache;
     }
 
     /**
@@ -420,13 +421,13 @@ public function getUserProfiles ($lead, $fields = array(), $refresh = false, $sp
      *
      * @return array
      */
-    public function clearIntegrationCache ($lead, $integration = false)
+    public function clearIntegrationCache($lead, $integration = false)
     {
         $socialCache = $lead->getSocialCache();
         if (!empty($integration)) {
             unset($socialCache[$integration]);
         } else {
-            $socialCache = array();
+            $socialCache = [];
         }
         $lead->setSocialCache($socialCache);
         $this->factory->getEntityManager()->getRepository('MauticLeadBundle:Lead')->saveEntity($lead);
@@ -435,19 +436,19 @@ public function clearIntegrationCache ($lead, $integration = false)
     }
 
     /**
-     * Gets an array of the HTML for share buttons
+     * Gets an array of the HTML for share buttons.
      */
-    public function getShareButtons ()
+    public function getShareButtons()
     {
-        static $shareBtns = array();
+        static $shareBtns = [];
 
         if (empty($shareBtns)) {
-            $socialIntegrations = $this->getIntegrationObjects(null, array('share_button'), true);
+            $socialIntegrations = $this->getIntegrationObjects(null, ['share_button'], true);
             $templating         = $this->factory->getTemplating();
 
             /**
-             * @var  string                                              $integration
-             * @var  \Mautic\PluginBundle\Integration\AbstractIntegration $details
+             * @var string
+             * @var \Mautic\PluginBundle\Integration\AbstractIntegration $details
              */
             foreach ($socialIntegrations as $integration => $details) {
                 /** @var \Mautic\PluginBundle\Entity\Integration $settings */
@@ -455,14 +456,14 @@ public function getShareButtons ()
 
                 $featureSettings = $settings->getFeatureSettings();
                 $apiKeys         = $details->decryptApiKeys($settings->getApiKeys());
-                $plugin           = $settings->getPlugin();
-                $shareSettings   = isset($featureSettings['shareButton']) ? $featureSettings['shareButton'] : array();
+                $plugin          = $settings->getPlugin();
+                $shareSettings   = isset($featureSettings['shareButton']) ? $featureSettings['shareButton'] : [];
 
                 //add the api keys for use within the share buttons
                 $shareSettings['keys']   = $apiKeys;
-                $shareBtns[$integration] = $templating->render($plugin->getBundle() . ":Integration/$integration:share.html.php", array(
+                $shareBtns[$integration] = $templating->render($plugin->getBundle().":Integration/$integration:share.html.php", [
                     'settings' => $shareSettings,
-                ));
+                ]);
             }
         }
 
@@ -470,17 +471,17 @@ public function getShareButtons ()
     }
 
     /**
-     * Loops through field values available and finds the field the integration needs to obtain the user
+     * Loops through field values available and finds the field the integration needs to obtain the user.
      *
      * @param $integrationObject
      * @param $fields
      *
      * @return bool
      */
-    public function getUserIdentifierField ($integrationObject, $fields)
+    public function getUserIdentifierField($integrationObject, $fields)
     {
         $identifierField = $integrationObject->getIdentifierFields();
-        $identifier      = (is_array($identifierField)) ? array() : false;
+        $identifier      = (is_array($identifierField)) ? [] : false;
         $matchFound      = false;
 
         $findMatch = function ($f, $fields) use (&$identifierField, &$identifier, &$matchFound) {
@@ -504,7 +505,7 @@ public function getUserIdentifierField ($integrationObject, $fields)
             }
         };
 
-        $groups = array('core', 'social', 'professional', 'personal');
+        $groups = ['core', 'social', 'professional', 'personal'];
         $keys   = array_keys($fields);
         if (count(array_intersect($groups, $keys)) !== 0 && count($keys) <= 4) {
             //fields are group
@@ -533,18 +534,18 @@ public function getUserIdentifierField ($integrationObject, $fields)
     }
 
     /**
-     * Get the path to the integration's icon relative to the site root
+     * Get the path to the integration's icon relative to the site root.
      *
      * @param $integration
      *
      * @return string
      */
-    public function getIconPath ($integration)
+    public function getIconPath($integration)
     {
         $systemPath  = $this->factory->getSystemPath('root');
         $bundlePath  = $this->factory->getSystemPath('bundles');
         $pluginPath  = $this->factory->getSystemPath('plugins');
-        $genericIcon = $bundlePath . '/PluginBundle/Assets/img/generic.png';
+        $genericIcon = $bundlePath.'/PluginBundle/Assets/img/generic.png';
 
         if (is_array($integration)) {
             // A bundle so check for an icon
@@ -553,14 +554,13 @@ public function getIconPath ($integration)
             // A bundle so check for an icon
             $icon = $pluginPath.'/'.$integration->getBundle().'/Assets/img/icon.png';
         } elseif ($integration instanceof AbstractIntegration) {
-
             return $integration->getIcon();
         }
 
-        if (file_exists($systemPath . '/' . $icon)) {
+        if (file_exists($systemPath.'/'.$icon)) {
             return $icon;
         }
 
         return $genericIcon;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Helper/oAuthHelper.php b/app/bundles/PluginBundle/Helper/oAuthHelper.php
index 577243aff55..fa19c5c11b8 100644
--- a/app/bundles/PluginBundle/Helper/oAuthHelper.php
+++ b/app/bundles/PluginBundle/Helper/oAuthHelper.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle\Helper;
+
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class oAuthHelper
+ * Class oAuthHelper.
  *
  * Portions modified from https://code.google.com/p/simple-php-oauth/
- *
- * @package Mautic\PluginBundle\Helper
  */
 class oAuthHelper
 {
@@ -34,7 +34,7 @@ class oAuthHelper
 
     private $request;
 
-    public  function __construct (AbstractIntegration $integration, Request $request, $settings = array())
+    public function __construct(AbstractIntegration $integration, Request $request, $settings = [])
     {
         $keys                    = $integration->getDecryptedApiKeys();
         $this->clientId          = $keys[$integration->getClientIdKey()];
@@ -63,7 +63,6 @@ public function getAuthorizationHeader($url, $parameters, $method)
             $headers['oauth_verifier'] = $this->request->query->get('oauth_verifier');
         }
 
-
         if (!empty($this->settings['query'])) {
             // Include query in the base string if appended
             $parameters = array_merge($parameters, $this->settings['query']);
@@ -80,41 +79,41 @@ public function getAuthorizationHeader($url, $parameters, $method)
         $composite_key              = $this->getCompositeKey();
         $headers['oauth_signature'] = base64_encode(hash_hmac('sha1', $base_info, $composite_key, true));
 
-        return array($this->buildAuthorizationHeader($headers), 'Expect:');
+        return [$this->buildAuthorizationHeader($headers), 'Expect:'];
     }
 
     /**
-     * Get composite key for OAuth 1 signature signing
+     * Get composite key for OAuth 1 signature signing.
      *
      * @return string
      */
-    private function getCompositeKey ()
+    private function getCompositeKey()
     {
         if (strlen($this->accessTokenSecret) > 0) {
-            $composite_key = $this->encode($this->clientSecret) . '&' . $this->encode($this->accessTokenSecret);
+            $composite_key = $this->encode($this->clientSecret).'&'.$this->encode($this->accessTokenSecret);
         } else {
-            $composite_key = $this->encode($this->clientSecret) . '&';
+            $composite_key = $this->encode($this->clientSecret).'&';
         }
 
         return $composite_key;
     }
 
     /**
-     * Get OAuth 1.0 Headers
+     * Get OAuth 1.0 Headers.
      *
      * @return array
      */
-    private function getOauthHeaders ()
+    private function getOauthHeaders()
     {
-        $oauth = array(
+        $oauth = [
             'oauth_consumer_key'     => $this->clientId,
             'oauth_nonce'            => $this->generateNonce(),
             'oauth_signature_method' => 'HMAC-SHA1',
             'oauth_timestamp'        => time(),
-            'oauth_version'          => '1.0'
-        );
+            'oauth_version'          => '1.0',
+        ];
 
-        if (empty($this->settings['authorize_session']) && !empty($this->accessToken))  {
+        if (empty($this->settings['authorize_session']) && !empty($this->accessToken)) {
             $oauth['oauth_token'] = $this->accessToken;
         } elseif (!empty($this->settings['request_token'])) {
             // OAuth1.a access_token request that requires the retrieved request_token to be appended
@@ -129,7 +128,7 @@ private function getOauthHeaders ()
     }
 
     /**
-     * Build base string for OAuth 1 signature signing
+     * Build base string for OAuth 1 signature signing.
      *
      * @param $baseURI
      * @param $method
@@ -137,21 +136,21 @@ private function getOauthHeaders ()
      *
      * @return string
      */
-    private function buildBaseString ($baseURI, $method, $params)
+    private function buildBaseString($baseURI, $method, $params)
     {
         $r = $this->normalizeParameters($params);
 
-        return $method . '&' . $this->encode($baseURI) . '&' . $this->encode($r);
+        return $method.'&'.$this->encode($baseURI).'&'.$this->encode($r);
     }
 
     /**
-     * Build header for OAuth 1 authorization
+     * Build header for OAuth 1 authorization.
      *
      * @param $oauth
      *
      * @return string
      */
-    private function buildAuthorizationHeader ($oauth)
+    private function buildAuthorizationHeader($oauth)
     {
         $r      = 'Authorization: OAuth ';
         $values = $this->normalizeParameters($oauth, true, true);
@@ -161,7 +160,7 @@ private function buildAuthorizationHeader ($oauth)
     }
 
     /**
-     * Normalize parameters
+     * Normalize parameters.
      *
      * @param      $parameters
      * @param bool $encode
@@ -169,7 +168,7 @@ private function buildAuthorizationHeader ($oauth)
      *
      * @return string
      */
-    private function normalizeParameters ($parameters, $encode = false, $returnarray = false, $normalized = array(), $key = '')
+    private function normalizeParameters($parameters, $encode = false, $returnarray = false, $normalized = [], $key = '')
     {
         //Sort by key
         ksort($parameters);
@@ -184,9 +183,9 @@ private function normalizeParameters ($parameters, $encode = false, $returnarray
                     $k = $key;
                 }
                 if ($encode) {
-                    $normalized[] = $this->encode($k) . '="' . $this->encode($v).'"';
+                    $normalized[] = $this->encode($k).'="'.$this->encode($v).'"';
                 } else {
-                    $normalized[] = $k . '=' . $v;
+                    $normalized[] = $k.'='.$v;
                 }
             }
         }
@@ -201,19 +200,19 @@ private function normalizeParameters ($parameters, $encode = false, $returnarray
      *
      * @return string
      */
-    public function encode ($string)
+    public function encode($string)
     {
         return str_replace('%7E', '~', rawurlencode($string));
     }
 
     /**
-     * OAuth1.0 nonce generator
+     * OAuth1.0 nonce generator.
      *
      * @param int $bits
      *
      * @return string
      */
-    private function generateNonce ($bits = 64)
+    private function generateNonce($bits = 64)
     {
         $result          = '';
         $accumulatedBits = 0;
@@ -234,11 +233,11 @@ private function generateNonce ($bits = 64)
             $moreBits = mt_rand() & ((1 << $bitsToAdd) - 1);
 
             // format as hex (this will be safe)
-            $format_string = '%0' . ($bitsToAdd / 4) . 'x';
+            $format_string = '%0'.($bitsToAdd / 4).'x';
             $result .= sprintf($format_string, $moreBits);
             $accumulatedBits += $bitsToAdd;
         }
 
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Integration/AbstractIntegration.php b/app/bundles/PluginBundle/Integration/AbstractIntegration.php
index e4bbf2bc4ee..dc3a71f30f1 100644
--- a/app/bundles/PluginBundle/Integration/AbstractIntegration.php
+++ b/app/bundles/PluginBundle/Integration/AbstractIntegration.php
@@ -1,32 +1,32 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle\Integration;
 
 use Joomla\Http\HttpFactory;
+use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\LeadBundle\Entity\Lead;
 use Mautic\PluginBundle\Entity\Integration;
 use Mautic\PluginBundle\Event\PluginIntegrationAuthCallbackUrlEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationFormDisplayEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationKeyEvent;
 use Mautic\PluginBundle\Event\PluginIntegrationRequestEvent;
 use Mautic\PluginBundle\Helper\oAuthHelper;
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\LeadBundle\Entity\Lead;
 use Mautic\PluginBundle\PluginEvents;
 use Symfony\Component\Form\FormBuilder;
 
 /**
- * Class AbstractIntegration
+ * Class AbstractIntegration.
  */
 abstract class AbstractIntegration
 {
-
     /**
      * @var MauticFactory
      */
@@ -67,15 +67,14 @@ public function getTranslator()
     }
 
     /**
-     * Called on construct
+     * Called on construct.
      */
     public function init()
     {
-
     }
 
     /**
-     * Determines what priority the integration should have against the other integrations
+     * Determines what priority the integration should have against the other integrations.
      *
      * @return int
      */
@@ -86,14 +85,14 @@ public function getPriority()
 
     /**
      * Returns the name of the social integration that must match the name of the file
-     * For example, IcontactIntegration would need Icontact here
+     * For example, IcontactIntegration would need Icontact here.
      *
      * @return string
      */
     abstract public function getName();
 
     /**
-     * Name to display for the integration. e.g. iContact  Uses value of getName() by default
+     * Name to display for the integration. e.g. iContact  Uses value of getName() by default.
      *
      * @return string
      */
@@ -103,7 +102,7 @@ public function getDisplayName()
     }
 
     /**
-     * Returns a description shown in the config form
+     * Returns a description shown in the config form.
      *
      * @return string
      */
@@ -113,7 +112,7 @@ public function getDescription()
     }
 
     /**
-     * Get icon for Integration
+     * Get icon for Integration.
      *
      * @return string
      */
@@ -122,14 +121,13 @@ public function getIcon()
         $systemPath  = $this->factory->getSystemPath('root');
         $bundlePath  = $this->factory->getSystemPath('bundles');
         $pluginPath  = $this->factory->getSystemPath('plugins');
-        $genericIcon = $bundlePath . '/PluginBundle/Assets/img/generic.png';
+        $genericIcon = $bundlePath.'/PluginBundle/Assets/img/generic.png';
 
-        $name       = $this->getName();
-        $bundle     = $this->settings->getPlugin()->getBundle();
-        $icon       = $pluginPath.'/'.$bundle.'/Assets/img/'.strtolower($name).'.png';
-
-        if (file_exists($systemPath . '/' . $icon)) {
+        $name   = $this->getName();
+        $bundle = $this->settings->getPlugin()->getBundle();
+        $icon   = $pluginPath.'/'.$bundle.'/Assets/img/'.strtolower($name).'.png';
 
+        if (file_exists($systemPath.'/'.$icon)) {
             return $icon;
         }
 
@@ -138,14 +136,14 @@ public function getIcon()
 
     /**
      * Get the type of authentication required for this API.  Values can be none, key, oauth2 or callback
-     * (will call $this->authenticationTypeCallback)
+     * (will call $this->authenticationTypeCallback).
      *
      * @return string
      */
     abstract public function getAuthenticationType();
 
     /**
-     * Get a list of supported features for this integration
+     * Get a list of supported features for this integration.
      *
      * Options are:
      *  cloud_storage - Asset remote storage
@@ -159,21 +157,21 @@ abstract public function getAuthenticationType();
      */
     public function getSupportedFeatures()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Returns the field the integration needs in order to find the user
+     * Returns the field the integration needs in order to find the user.
      *
      * @return mixed
      */
     public function getIdentifierFields()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Allows integration to set a custom form template
+     * Allows integration to set a custom form template.
      *
      * @return string
      */
@@ -183,7 +181,7 @@ public function getFormTemplate()
     }
 
     /**
-     * Allows integration to set a custom theme folder
+     * Allows integration to set a custom theme folder.
      *
      * @return string
      */
@@ -193,7 +191,7 @@ public function getFormTheme()
     }
 
     /**
-     * Set the social integration entity
+     * Set the social integration entity.
      *
      * @param Integration $settings
      */
@@ -205,7 +203,7 @@ public function setIntegrationSettings(Integration $settings)
     }
 
     /**
-     * Get the social integration entity
+     * Get the social integration entity.
      *
      * @return Integration
      */
@@ -215,7 +213,7 @@ public function getIntegrationSettings()
     }
 
     /**
-     * Persist settings to the database
+     * Persist settings to the database.
      */
     public function persistIntegrationSettings()
     {
@@ -225,15 +223,15 @@ public function persistIntegrationSettings()
     }
 
     /**
-     * Merge api keys
+     * Merge api keys.
      *
-     * @param             $mergeKeys
-     * @param             $withKeys
-     * @param bool|false  $return Returns the key array rather than setting them
+     * @param            $mergeKeys
+     * @param            $withKeys
+     * @param bool|false $return    Returns the key array rather than setting them
      *
      * @return void|array
      */
-    public function mergeApiKeys($mergeKeys, $withKeys = array(), $return = false)
+    public function mergeApiKeys($mergeKeys, $withKeys = [], $return = false)
     {
         $settings = $this->settings;
         if (empty($withKeys)) {
@@ -266,7 +264,7 @@ public function mergeApiKeys($mergeKeys, $withKeys = array(), $return = false)
     }
 
     /**
-     * Encrypts and saves keys to the entity
+     * Encrypts and saves keys to the entity.
      *
      * @param array       $keys
      * @param Integration $entity
@@ -287,7 +285,7 @@ public function encryptAndSetApiKeys(array $keys, Integration $entity)
     }
 
     /**
-     * Returns already decrypted keys
+     * Returns already decrypted keys.
      *
      * @return mixed
      */
@@ -297,7 +295,7 @@ public function getKeys()
     }
 
     /**
-     * Returns decrypted API keys
+     * Returns decrypted API keys.
      *
      * @param bool $entity
      *
@@ -305,7 +303,7 @@ public function getKeys()
      */
     public function getDecryptedApiKeys($entity = false)
     {
-        static $decryptedKeys = array();
+        static $decryptedKeys = [];
 
         if (!$entity) {
             $entity = $this->settings;
@@ -325,7 +323,7 @@ public function getDecryptedApiKeys($entity = false)
     }
 
     /**
-     * Encrypts API keys
+     * Encrypts API keys.
      *
      * @param array $keys
      *
@@ -335,7 +333,7 @@ public function encryptApiKeys(array $keys)
     {
         /** @var \Mautic\CoreBundle\Helper\EncryptionHelper $helper */
         $helper    = $this->factory->getHelper('encryption');
-        $encrypted = array();
+        $encrypted = [];
 
         foreach ($keys as $name => $key) {
             $key              = $helper->encrypt($key);
@@ -346,7 +344,7 @@ public function encryptApiKeys(array $keys)
     }
 
     /**
-     * Decrypts API keys
+     * Decrypts API keys.
      *
      * @param array $keys
      *
@@ -356,7 +354,7 @@ public function decryptApiKeys(array $keys)
     {
         /** @var \Mautic\CoreBundle\Helper\EncryptionHelper $helper */
         $helper    = $this->factory->getHelper('encryption');
-        $decrypted = array();
+        $decrypted = [];
 
         foreach ($keys as $name => $key) {
             $key              = $helper->decrypt($key);
@@ -367,7 +365,7 @@ public function decryptApiKeys(array $keys)
     }
 
     /**
-     * Get the array key for clientId
+     * Get the array key for clientId.
      *
      * @return string
      */
@@ -386,7 +384,7 @@ public function getClientIdKey()
     }
 
     /**
-     * Get the array key for client secret
+     * Get the array key for client secret.
      *
      * @return string
      */
@@ -405,17 +403,17 @@ public function getClientSecretKey()
     }
 
     /**
-     * Array of keys to mask in the config form
+     * Array of keys to mask in the config form.
      *
      * @return array
      */
     public function getSecretKeys()
     {
-        return array($this->getClientSecretKey());
+        return [$this->getClientSecretKey()];
     }
 
     /**
-     * Get the array key for the auth token
+     * Get the array key for the auth token.
      *
      * @return string
      */
@@ -432,17 +430,17 @@ public function getAuthTokenKey()
     }
 
     /**
-     * Get the keys for the refresh token and expiry
+     * Get the keys for the refresh token and expiry.
      *
      * @return array
      */
     public function getRefreshTokenKeys()
     {
-        return array();
+        return [];
     }
 
     /**
-     * Get a list of keys required to make an API call.  Examples are key, clientId, clientSecret
+     * Get a list of keys required to make an API call.  Examples are key, clientId, clientSecret.
      *
      * @return array
      */
@@ -450,31 +448,31 @@ public function getRequiredKeyFields()
     {
         switch ($this->getAuthenticationType()) {
             case 'oauth1a':
-                return array(
+                return [
                     'consumer_id'     => 'mautic.integration.keyfield.consumerid',
-                    'consumer_secret' => 'mautic.integration.keyfield.consumersecret'
-                );
+                    'consumer_secret' => 'mautic.integration.keyfield.consumersecret',
+                ];
             case 'oauth2':
-                return array(
+                return [
                     'client_id'     => 'mautic.integration.keyfield.clientid',
-                    'client_secret' => 'mautic.integration.keyfield.clientsecret'
-                );
+                    'client_secret' => 'mautic.integration.keyfield.clientsecret',
+                ];
             case 'key':
-                return array(
-                    'key' => 'mautic.integration.keyfield.api'
-                );
+                return [
+                    'key' => 'mautic.integration.keyfield.api',
+                ];
             case 'basic':
-                return array(
+                return [
                     'username' => 'mautic.integration.keyfield.username',
-                    'password' => 'mautic.integration.keyfield.password'
-                );
+                    'password' => 'mautic.integration.keyfield.password',
+                ];
             default:
-                return array();
+                return [];
         }
     }
 
     /**
-     * Extract the tokens returned by the oauth callback
+     * Extract the tokens returned by the oauth callback.
      *
      * @param string $data
      * @param bool   $postAuthorization
@@ -491,7 +489,7 @@ public function parseCallbackResponse($data, $postAuthorization = false)
     }
 
     /**
-     * Generic error parser
+     * Generic error parser.
      *
      * @param $response
      *
@@ -501,7 +499,7 @@ public function getErrorsFromResponse($response)
     {
         if (is_object($response)) {
             if (!empty($response->errors)) {
-                $errors = array();
+                $errors = [];
                 foreach ($response->errors as $e) {
                     $errors[] = $e->message;
                 }
@@ -526,7 +524,7 @@ public function getErrorsFromResponse($response)
                     return $response['error'];
                 }
             } elseif (isset($response['errors'])) {
-                $errors = array();
+                $errors = [];
                 foreach ($response['errors'] as $err) {
                     if (is_array($err)) {
                         if (isset($err['message'])) {
@@ -549,7 +547,7 @@ public function getErrorsFromResponse($response)
     }
 
     /**
-     * Make a basic call using cURL to get the data
+     * Make a basic call using cURL to get the data.
      *
      * @param        $url
      * @param array  $parameters
@@ -558,7 +556,7 @@ public function getErrorsFromResponse($response)
      *
      * @return mixed|string
      */
-    public function makeRequest($url, $parameters = array(), $method = 'GET', $settings = array())
+    public function makeRequest($url, $parameters = [], $method = 'GET', $settings = [])
     {
         $method   = strtoupper($method);
         $authType = (empty($settings['auth_type'])) ? $this->getAuthenticationType() : $settings['auth_type'];
@@ -576,7 +574,7 @@ public function makeRequest($url, $parameters = array(), $method = 'GET', $setti
         }
 
         if (!isset($settings['query'])) {
-            $settings['query'] = array();
+            $settings['query'] = [];
         }
 
         if (isset($parameters['append_to_query'])) {
@@ -589,13 +587,13 @@ public function makeRequest($url, $parameters = array(), $method = 'GET', $setti
         }
 
         if (!$this->isConfigured()) {
-            return array(
-                'error' => array(
+            return [
+                'error' => [
                     'message' => $this->factory->getTranslator()->trans(
                         'mautic.integration.missingkeys'
-                    )
-                )
-            );
+                    ),
+                ],
+            ];
         }
 
         if ($method == 'GET' && !empty($parameters)) {
@@ -630,14 +628,14 @@ public function makeRequest($url, $parameters = array(), $method = 'GET', $setti
             }
         }
 
-        $options = array(
+        $options = [
             CURLOPT_HTTP_VERSION   => CURL_HTTP_VERSION_1_1,
             CURLOPT_HEADER         => 1,
             CURLOPT_RETURNTRANSFER => 1,
             CURLOPT_FOLLOWLOCATION => 0,
             CURLOPT_REFERER        => $this->getRefererUrl(),
-            CURLOPT_USERAGENT      => $this->getUserAgent()
-        );
+            CURLOPT_USERAGENT      => $this->getUserAgent(),
+        ];
 
         if (isset($settings['curl_options'])) {
             $options = array_merge($options, $settings['curl_options']);
@@ -648,21 +646,21 @@ public function makeRequest($url, $parameters = array(), $method = 'GET', $setti
         }
 
         $connector = HttpFactory::getHttp(
-            array(
-                'transport.curl' => $options
-            )
+            [
+                'transport.curl' => $options,
+            ]
         );
 
         $parseHeaders = (isset($settings['headers'])) ? array_merge($headers, $settings['headers']) : $headers;
 
         // HTTP library requires that headers are in key => value pairs
-        $headers = array();
+        $headers = [];
         if (is_array($parseHeaders)) {
             foreach ($parseHeaders as $key => $value) {
                 if (strpos($value, ':') !== false) {
                     list($key, $value) = explode(':', $value);
-                    $key   = trim($key);
-                    $value = trim($value);
+                    $key               = trim($key);
+                    $value             = trim($value);
                 }
 
                 $headers[$key] = $value;
@@ -685,8 +683,7 @@ public function makeRequest($url, $parameters = array(), $method = 'GET', $setti
                     break;
             }
         } catch (\Exception $exception) {
-
-            return array('error' => array('message' => $exception->getMessage(), 'code' => $exception->getCode()));
+            return ['error' => ['message' => $exception->getMessage(), 'code' => $exception->getCode()]];
         }
         if (empty($settings['ignore_event_dispatch'])) {
             $event->setResponse($result);
@@ -696,10 +693,8 @@ public function makeRequest($url, $parameters = array(), $method = 'GET', $setti
             );
         }
         if (!empty($settings['return_raw'])) {
-
             return $result;
         } else {
-
             $response = $this->parseCallbackResponse($result->body, !empty($settings['authorize_session']));
 
             return $response;
@@ -728,7 +723,7 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
             $authTokenKey = $settings[$authTokenKey];
         }
 
-        $headers = array();
+        $headers = [];
 
         if (!empty($settings['authorize_session'])) {
             switch ($authType) {
@@ -742,27 +737,27 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
                     break;
                 case 'oauth2':
                     if ($bearerToken = $this->getBearerToken(true)) {
-                        $headers                  = array(
+                        $headers = [
                             "Authorization: Basic {$bearerToken}",
-                            "Content-Type: application/x-www-form-urlencoded;charset=UTF-8"
-                        );
+                            'Content-Type: application/x-www-form-urlencoded;charset=UTF-8',
+                        ];
                         $parameters['grant_type'] = 'client_credentials';
                     } else {
                         $defaultGrantType = (!empty($settings['refresh_token'])) ? 'refresh_token'
                             : 'authorization_code';
-                        $grantType        = (!isset($settings['grant_type'])) ? $defaultGrantType
+                        $grantType = (!isset($settings['grant_type'])) ? $defaultGrantType
                             : $settings['grant_type'];
 
                         $useClientIdKey     = (empty($settings[$clientIdKey])) ? $clientIdKey : $settings[$clientIdKey];
                         $useClientSecretKey = (empty($settings[$clientSecretKey])) ? $clientSecretKey
                             : $settings[$clientSecretKey];
-                        $parameters         = array_merge(
+                        $parameters = array_merge(
                             $parameters,
-                            array(
+                            [
                                 $useClientIdKey     => $this->keys[$clientIdKey],
                                 $useClientSecretKey => $this->keys[$clientSecretKey],
-                                'grant_type'        => $grantType
-                            )
+                                'grant_type'        => $grantType,
+                            ]
                         );
 
                         if (!empty($settings['refresh_token']) && !empty($this->keys[$settings['refresh_token']])) {
@@ -782,9 +777,9 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
         } else {
             switch ($authType) {
                 case 'basic':
-                    $headers = array(
+                    $headers = [
                         'Authorization' => 'Basic '.base64_encode($this->keys['username'].':'.$this->keys['password']),
-                    );
+                    ];
                     break;
                 case 'oauth1a':
                     $oauthHelper = new oAuthHelper($this, $this->factory->getRequest(), $settings);
@@ -792,24 +787,24 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
                     break;
                 case 'oauth2':
                     if ($bearerToken = $this->getBearerToken()) {
-                        $headers = array(
+                        $headers = [
                             "Authorization: Bearer {$bearerToken}",
                             //"Content-Type: application/x-www-form-urlencoded;charset=UTF-8"
-                        );
+                        ];
                     } else {
                         if (!empty($settings['append_auth_token'])) {
                             // Workaround because $settings cannot be manipulated here
-                            $parameters['append_to_query'] = array(
-                                $authTokenKey => $authToken
-                            );
+                            $parameters['append_to_query'] = [
+                                $authTokenKey => $authToken,
+                            ];
                         } else {
                             $parameters[$authTokenKey] = $authToken;
                         }
 
-                        $headers = array(
+                        $headers = [
                             "oauth-token: $authTokenKey",
                             "Authorization: OAuth {$authToken}",
-                        );
+                        ];
                     }
                     break;
                 case 'key':
@@ -818,7 +813,7 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
             }
         }
 
-        return array($parameters, $headers);
+        return [$parameters, $headers];
     }
 
     /**
@@ -851,13 +846,13 @@ public function getAuthLoginUrl()
         } else {
             return $this->factory->getRouter()->generate(
                 'mautic_integration_auth_callback',
-                array('integration' => $this->getName())
+                ['integration' => $this->getName()]
             );
         }
     }
 
     /**
-     * State variable to append to login url (usually used in oAuth flows)
+     * State variable to append to login url (usually used in oAuth flows).
      *
      * @return string
      */
@@ -867,7 +862,7 @@ public function getAuthLoginState()
     }
 
     /**
-     * Get the scope for auth flows
+     * Get the scope for auth flows.
      *
      * @return string
      */
@@ -877,7 +872,7 @@ public function getAuthScope()
     }
 
     /**
-     * Gets the URL for the built in oauth callback
+     * Gets the URL for the built in oauth callback.
      *
      * @return string
      */
@@ -885,7 +880,7 @@ public function getAuthCallbackUrl()
     {
         $defaultUrl = $this->factory->getRouter()->generate(
             'mautic_integration_auth_callback',
-            array('integration' => $this->getName()),
+            ['integration' => $this->getName()],
             true //absolute
         );
 
@@ -899,14 +894,14 @@ public function getAuthCallbackUrl()
     }
 
     /**
-     * Retrieves and stores tokens returned from oAuthLogin
+     * Retrieves and stores tokens returned from oAuthLogin.
      *
      * @param array $settings
      * @param array $parameters
      *
      * @return bool|string false if no error; otherwise the error string
      */
-    public function authCallback($settings = array(), $parameters = array())
+    public function authCallback($settings = [], $parameters = [])
     {
         $authType = $this->getAuthenticationType();
 
@@ -940,11 +935,10 @@ public function authCallback($settings = array(), $parameters = array())
         $data   = $this->makeRequest($this->getAccessTokenUrl(), $parameters, $method, $settings);
 
         return $this->extractAuthKeys($data);
-
     }
 
     /**
-     * Extacts the auth keys from response and saves entity
+     * Extacts the auth keys from response and saves entity.
      *
      * @param $data
      * @param $tokenOverride
@@ -979,9 +973,9 @@ public function extractAuthKeys($data, $tokenOverride = null)
             $error = $this->getErrorsFromResponse($data);
             if (empty($error)) {
                 $error = $this->factory->getTranslator()->trans(
-                    "mautic.integration.error.genericerror",
-                    array(),
-                    "flashes"
+                    'mautic.integration.error.genericerror',
+                    [],
+                    'flashes'
                 );
             }
         }
@@ -997,7 +991,7 @@ public function extractAuthKeys($data, $tokenOverride = null)
     }
 
     /**
-     * Called in extractAuthKeys before key comparison begins to give opportunity to set expiry, rename keys, etc
+     * Called in extractAuthKeys before key comparison begins to give opportunity to set expiry, rename keys, etc.
      *
      * @param $data
      *
@@ -1009,7 +1003,7 @@ public function prepareResponseForExtraction($data)
     }
 
     /**
-     * Checks to see if the integration is configured by checking that required keys are populated
+     * Checks to see if the integration is configured by checking that required keys are populated.
      *
      * @return bool
      */
@@ -1018,7 +1012,6 @@ public function isConfigured()
         $requiredTokens = $this->getRequiredKeyFields();
         foreach ($requiredTokens as $token => $label) {
             if (empty($this->keys[$token])) {
-
                 return false;
             }
         }
@@ -1027,14 +1020,13 @@ public function isConfigured()
     }
 
     /**
-     * Checks if an integration is authorized and/or authorizes the request
+     * Checks if an integration is authorized and/or authorizes the request.
      *
      * @return bool
      */
     public function isAuthorized()
     {
         if (!$this->isConfigured()) {
-
             return false;
         }
 
@@ -1053,7 +1045,7 @@ public function isAuthorized()
                         && time() > $this->keys[$expiryKey]
                     ) {
                         //token has expired so try to refresh it
-                        $error = $this->authCallback(array('refresh_token' => $refreshTokenKey));
+                        $error = $this->authCallback(['refresh_token' => $refreshTokenKey]);
                         $valid = (empty($error));
                     } else {
                         // The refresh token doesn't have an expiry so the integration will have to check for expired sessions and request new token
@@ -1081,7 +1073,7 @@ public function isAuthorized()
     }
 
     /**
-     * Get the URL required to obtain an oauth2 access token
+     * Get the URL required to obtain an oauth2 access token.
      *
      * @return string
      */
@@ -1091,7 +1083,7 @@ public function getAccessTokenUrl()
     }
 
     /**
-     * Get the authentication/login URL for oauth2 access
+     * Get the authentication/login URL for oauth2 access.
      *
      * @return string
      */
@@ -1101,17 +1093,17 @@ public function getAuthenticationUrl()
     }
 
     /**
-     * Get request token for oauth1a authorization request
+     * Get request token for oauth1a authorization request.
      *
      * @param array $settings
      *
      * @return mixed|string
      */
-    public function getRequestToken($settings = array())
+    public function getRequestToken($settings = [])
     {
         // Child classes can easily pass in custom settings this way
         $settings = array_merge(
-            array('authorize_session' => true, 'append_callback' => false, 'ssl_verifypeer' => true),
+            ['authorize_session' => true, 'append_callback' => false, 'ssl_verifypeer' => true],
             $settings
         );
 
@@ -1122,7 +1114,7 @@ public function getRequestToken($settings = array())
         if (!empty($url)) {
             $result = $this->makeRequest(
                 $url,
-                array(),
+                [],
                 'POST',
                 $settings
             );
@@ -1132,7 +1124,7 @@ public function getRequestToken($settings = array())
     }
 
     /**
-     * Url to post in order to get the request token if required; leave empty if not required
+     * Url to post in order to get the request token if required; leave empty if not required.
      *
      * @return string
      */
@@ -1142,7 +1134,7 @@ public function getRequestTokenUrl()
     }
 
     /**
-     * Generate a bearer token
+     * Generate a bearer token.
      *
      * @param $inAuthorization
      *
@@ -1154,7 +1146,7 @@ public function getBearerToken($inAuthorization = false)
     }
 
     /**
-     * Gets the ID of the user for the integration
+     * Gets the ID of the user for the integration.
      *
      * @param       $identifier
      * @param array $socialCache
@@ -1166,7 +1158,6 @@ public function getBearerToken($inAuthorization = false)
     public function getUserId($identifier, &$socialCache)
     {
         if (!empty($socialCache['id'])) {
-
             return $socialCache['id'];
         }
 
@@ -1174,7 +1165,7 @@ public function getUserId($identifier, &$socialCache)
     }
 
     /**
-     * Get an array of public activity
+     * Get an array of public activity.
      *
      * @param $identifier
      * @param $socialCache
@@ -1183,11 +1174,11 @@ public function getUserId($identifier, &$socialCache)
      */
     public function getPublicActivity($identifier, &$socialCache)
     {
-        return array();
+        return [];
     }
 
     /**
-     * Get an array of public data
+     * Get an array of public data.
      *
      * @param $identifier
      * @param $socialCache
@@ -1196,11 +1187,11 @@ public function getPublicActivity($identifier, &$socialCache)
      */
     public function getUserData($identifier, &$socialCache)
     {
-        return array();
+        return [];
     }
 
     /**
-     * Generates current URL to set as referer for curl calls
+     * Generates current URL to set as referer for curl calls.
      *
      * @return string
      */
@@ -1212,7 +1203,7 @@ protected function getRefererUrl()
     }
 
     /**
-     * Generate a user agent string
+     * Generate a user agent string.
      *
      * @return string
      */
@@ -1224,33 +1215,32 @@ protected function getUserAgent()
     }
 
     /**
-     * Get a list of available fields from the connecting API
+     * Get a list of available fields from the connecting API.
      *
      * @param array $settings
      *
      * @return array
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        return array();
+        return [];
     }
 
     /**
-     * Match lead data with integration fields
+     * Match lead data with integration fields.
      *
      * @param $lead
      * @param $config
      *
      * @return array
      */
-    public function populateLeadData($lead, $config = array())
+    public function populateLeadData($lead, $config = [])
     {
         if (!isset($config['leadFields'])) {
             $config = $this->mergeConfigToFeatureSettings($config);
 
             if (empty($config['leadFields'])) {
-
-                return array();
+                return [];
             }
         }
 
@@ -1263,7 +1253,7 @@ public function populateLeadData($lead, $config = array())
         $leadFields      = $config['leadFields'];
         $availableFields = $this->getAvailableLeadFields($config);
         $unknown         = $this->factory->getTranslator()->trans('mautic.integration.form.lead.unknown');
-        $matched         = array();
+        $matched         = [];
 
         foreach ($availableFields as $key => $field) {
             $integrationKey = $this->convertLeadFieldKey($key, $field);
@@ -1284,14 +1274,14 @@ public function populateLeadData($lead, $config = array())
     }
 
     /**
-     * Takes profile data from an integration and maps it to Mautic's lead fields
+     * Takes profile data from an integration and maps it to Mautic's lead fields.
      *
      * @param       $data
      * @param array $config
      *
      * @return array
      */
-    public function populateMauticLeadData($data, $config = array())
+    public function populateMauticLeadData($data, $config = [])
     {
         // Glean supported fields from what was returned by the integration
         $gleanedData = $data;
@@ -1300,14 +1290,13 @@ public function populateMauticLeadData($data, $config = array())
             $config = $this->mergeConfigToFeatureSettings($config);
 
             if (empty($config['leadFields'])) {
-
-                return array();
+                return [];
             }
         }
 
         $leadFields      = $config['leadFields'];
         $availableFields = $this->getAvailableLeadFields($config);
-        $matched         = array();
+        $matched         = [];
 
         foreach ($gleanedData as $key => $field) {
             if (isset($leadFields[$key]) && isset($gleanedData[$key])) {
@@ -1315,16 +1304,15 @@ public function populateMauticLeadData($data, $config = array())
             }
         }
 
-
         return $matched;
     }
 
     /**
-     * Create or update existing Mautic lead from the integration's profile data
+     * Create or update existing Mautic lead from the integration's profile data.
      *
-     * @param mixed      $data    Profile data from integration
-     * @param bool|true  $persist Set to false to not persist lead to the database in this method
-     * @param array|null $socialCache
+     * @param mixed       $data        Profile data from integration
+     * @param bool|true   $persist     Set to false to not persist lead to the database in this method
+     * @param array|null  $socialCache
      * @param mixed||null $identifiers
      *
      * @return Lead
@@ -1343,7 +1331,6 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
         $matchedFields = $this->populateMauticLeadData($data);
 
         if (empty($matchedFields)) {
-
             return;
         }
 
@@ -1351,7 +1338,7 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
         /** @var \Mautic\LeadBundle\Model\LeadModel $leadModel */
         $leadModel           = $this->factory->getModel('lead');
         $uniqueLeadFields    = $this->factory->getModel('lead.field')->getUniqueIdentiferFields();
-        $uniqueLeadFieldData = array();
+        $uniqueLeadFieldData = [];
 
         foreach ($matchedFields as $leadField => $value) {
             if (array_key_exists($leadField, $uniqueLeadFields) && !empty($value)) {
@@ -1364,7 +1351,6 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
         $lead->setNewlyCreated(true);
 
         if (count($uniqueLeadFieldData)) {
-
             $existingLeads = $this->factory->getEntityManager()->getRepository('MauticLeadBundle:Lead')
                 ->getLeadsByUniqueFields($uniqueLeadFieldData);
 
@@ -1378,7 +1364,7 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
         // Update the social cache
         $leadSocialCache = $lead->getSocialCache();
         if (!isset($leadSocialCache[$this->getName()])) {
-            $leadSocialCache[$this->getName()] = array();
+            $leadSocialCache[$this->getName()] = [];
         }
 
         if (null !== $socialCache) {
@@ -1393,8 +1379,8 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
         $lead->setSocialCache($leadSocialCache);
 
         // Update the internal info integration object that has updated the record
-        if(isset($data['internal'])){
-            $internalInfo = $lead->getInternal();
+        if (isset($data['internal'])) {
+            $internalInfo                   = $lead->getInternal();
             $internalInfo[$this->getName()] = $data['internal'];
             $lead->setInternal($internalInfo);
         }
@@ -1414,13 +1400,13 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
     }
 
     /**
-     * Merges a config from integration_list with feature settings
+     * Merges a config from integration_list with feature settings.
      *
      * @param array $config
      *
      * @return array|mixed
      */
-    public function mergeConfigToFeatureSettings($config = array())
+    public function mergeConfigToFeatureSettings($config = [])
     {
         $featureSettings = $this->settings->getFeatureSettings();
 
@@ -1436,7 +1422,7 @@ public function mergeConfigToFeatureSettings($config = array())
     }
 
     /**
-     * Return key recognized by integration
+     * Return key recognized by integration.
      *
      * @param $key
      * @param $field
@@ -1449,7 +1435,7 @@ public function convertLeadFieldKey($key, $field)
     }
 
     /**
-     * Sets whether fields should be sorted alphabetically or by the order the integration feeds
+     * Sets whether fields should be sorted alphabetically or by the order the integration feeds.
      */
     public function sortFieldsAlphabetically()
     {
@@ -1457,7 +1443,7 @@ public function sortFieldsAlphabetically()
     }
 
     /**
-     * Used to match local field name with remote field name
+     * Used to match local field name with remote field name.
      *
      * @param string $field
      * @param string $subfield
@@ -1474,7 +1460,7 @@ public function matchFieldName($field, $subfield = '')
     }
 
     /**
-     * Convert and assign the data to assignable fields
+     * Convert and assign the data to assignable fields.
      *
      * @param mixed $data
      *
@@ -1482,7 +1468,7 @@ public function matchFieldName($field, $subfield = '')
      */
     protected function matchUpData($data)
     {
-        $info      = array();
+        $info      = [];
         $available = $this->getAvailableLeadFields();
 
         foreach ($available as $field => $fieldDetails) {
@@ -1518,7 +1504,7 @@ protected function matchUpData($data)
                     }
                     break;
                 case 'array_object':
-                    $objects = array();
+                    $objects = [];
                     if (!empty($values)) {
                         foreach ($values as $k => $v) {
                             $v = $v;
@@ -1527,7 +1513,7 @@ protected function matchUpData($data)
                             }
                         }
                     }
-                    $fn        = (isset($fieldDetails['fields'][0])) ? $this->matchFieldName(
+                    $fn = (isset($fieldDetails['fields'][0])) ? $this->matchFieldName(
                         $field,
                         $fieldDetails['fields'][0]
                     ) : $field;
@@ -1541,9 +1527,7 @@ protected function matchUpData($data)
     }
 
     /**
-     * Get the path to the profile templates for this integration
-     *
-     * @return null
+     * Get the path to the profile templates for this integration.
      */
     public function getSocialProfileTemplate()
     {
@@ -1551,7 +1535,7 @@ public function getSocialProfileTemplate()
     }
 
     /**
-     * Checks to ensure an image still exists before caching
+     * Checks to ensure an image still exists before caching.
      *
      * @param string $url
      *
@@ -1570,7 +1554,7 @@ public function checkImageExists($url)
         $retcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         curl_close($ch);
 
-        return ($retcode == 200);
+        return $retcode == 200;
     }
 
     /**
@@ -1587,7 +1571,7 @@ public function logIntegrationError(\Exception $e)
     }
 
     /**
-     * Returns notes specific to sections of the integration form (if applicable)
+     * Returns notes specific to sections of the integration form (if applicable).
      *
      * @param $section
      *
@@ -1596,9 +1580,9 @@ public function logIntegrationError(\Exception $e)
     public function getFormNotes($section)
     {
         if ($section == 'leadfield_match') {
-            return array('mautic.integration.form.field_match_notes', 'info');
+            return ['mautic.integration.form.field_match_notes', 'info'];
         } else {
-            return array('', 'info');
+            return ['', 'info'];
         }
     }
 
@@ -1615,11 +1599,10 @@ public function getFormNotes($section)
      */
     public function appendToForm(&$builder, $data, $formArea)
     {
-
     }
 
     /**
-     * Returns settings for the integration form
+     * Returns settings for the integration form.
      *
      * @return array
      */
@@ -1636,11 +1619,11 @@ public function getFormSettings()
                 break;
         }
 
-        return array(
+        return [
             'requires_callback'      => $callback,
             'requires_authorization' => $authorization,
-            'default_features'       => array()
-        );
+            'default_features'       => [],
+        ];
     }
 
     public function getFormDisplaySettings()
@@ -1655,19 +1638,19 @@ public function getFormDisplaySettings()
     }
 
     /**
-     * Get available fields for choices in the config UI
+     * Get available fields for choices in the config UI.
      *
      * @param array $settings
      *
      * @return array
      */
-    public function getFormLeadFields($settings = array())
+    public function getFormLeadFields($settings = [])
     {
-        return ($this->isAuthorized()) ? $this->getAvailableLeadFields($settings) : array();
+        return ($this->isAuthorized()) ? $this->getAvailableLeadFields($settings) : [];
     }
 
     /**
-     * returns template to render on popup window after trying to run OAuth
+     * returns template to render on popup window after trying to run OAuth.
      *
      *
      * @return null|string
@@ -1683,7 +1666,7 @@ public function getPostAuthTemplate()
      *
      * @return array
      */
-    protected function dispatchIntegrationKeyEvent($eventName, $keys = array())
+    protected function dispatchIntegrationKeyEvent($eventName, $keys = [])
     {
         /** @var PluginIntegrationKeyEvent $event */
         $event = $this->dispatcher->dispatch(
@@ -1695,7 +1678,7 @@ protected function dispatchIntegrationKeyEvent($eventName, $keys = array())
     }
 
     /**
-     * Cleans the identifier for api calls
+     * Cleans the identifier for api calls.
      *
      * @param mixed $identifier
      *
diff --git a/app/bundles/PluginBundle/Integration/AbstractSsoFormIntegration.php b/app/bundles/PluginBundle/Integration/AbstractSsoFormIntegration.php
index d23164f91cc..33ca665161d 100644
--- a/app/bundles/PluginBundle/Integration/AbstractSsoFormIntegration.php
+++ b/app/bundles/PluginBundle/Integration/AbstractSsoFormIntegration.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle\Integration;
 
 /**
- * Used by SSO auth plugins that use credentials from the login form to authenticate
+ * Used by SSO auth plugins that use credentials from the login form to authenticate.
  *
  * Class AbstractSsoFormIntegration
  */
@@ -21,21 +22,21 @@ abstract class AbstractSsoFormIntegration extends AbstractSsoServiceIntegration
      */
     public function getSupportedFeatures()
     {
-        return array(
-            'sso_form'
-        );
+        return [
+            'sso_form',
+        ];
     }
 
     /**
-     * Get form settings; authorization is not needed since it is done when a user logs in
+     * Get form settings; authorization is not needed since it is done when a user logs in.
      *
      * @return array
      */
     public function getFormSettings()
     {
-        return array(
+        return [
             'requires_callback'      => false,
-            'requires_authorization' => false
-        );
+            'requires_authorization' => false,
+        ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/Integration/AbstractSsoServiceIntegration.php b/app/bundles/PluginBundle/Integration/AbstractSsoServiceIntegration.php
index c7fa040c923..9ee26d01bed 100644
--- a/app/bundles/PluginBundle/Integration/AbstractSsoServiceIntegration.php
+++ b/app/bundles/PluginBundle/Integration/AbstractSsoServiceIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 
 /**
- * Used by SSO auth plugins that use OAuth2, etc means of logins
+ * Used by SSO auth plugins that use OAuth2, etc means of logins.
  *
  * Class AbstractSsoIntegration
  */
@@ -20,16 +21,16 @@ abstract class AbstractSsoServiceIntegration extends AbstractIntegration
 {
     /**
      * Called after the user is authenticated with the 3rd party service to obtain the users
-     * details
+     * details.
      *
      * @param $response mixed Typically the response from request to authenticating service
      *
      * @return mixed
      */
-    abstract function getUser($response);
+    abstract public function getUser($response);
 
     /**
-     * Get the user role for new users
+     * Get the user role for new users.
      *
      * @return bool|\Doctrine\Common\Proxy\Proxy|null|object
      *
@@ -42,7 +43,6 @@ public function getUserRole()
         $role = (isset($featureSettings['new_user_role'])) ? $featureSettings['new_user_role'] : false;
 
         if ($role) {
-
             return $this->factory->getEntityManager()->getReference('MauticUserBundle:Role', $role);
         }
 
@@ -50,7 +50,7 @@ public function getUserRole()
     }
 
     /**
-     * Returns if a new user should be created if authenticated and not found locally
+     * Returns if a new user should be created if authenticated and not found locally.
      *
      * @return bool
      */
@@ -62,13 +62,12 @@ public function shouldAutoCreateNewUser()
     }
 
     /**
-     * Set the callback URL to sso_login
+     * Set the callback URL to sso_login.
      */
     public function getAuthCallbackUrl()
     {
-
         return $this->factory->getRouter()->generate('mautic_sso_login_check',
-            array('integration' => $this->getName()),
+            ['integration' => $this->getName()],
             true //absolute
         );
     }
@@ -79,7 +78,7 @@ public function getAuthCallbackUrl()
      *
      * @return bool|string
      */
-    public function ssoAuthCallback($settings = array(), $parameters = array())
+    public function ssoAuthCallback($settings = [], $parameters = [])
     {
         $response = $this->authCallback($settings, $parameters);
 
@@ -88,7 +87,7 @@ public function ssoAuthCallback($settings = array(), $parameters = array())
     }
 
     /**
-     * Don't save the keys as they are only used to validate user login
+     * Don't save the keys as they are only used to validate user login.
      *
      * @param      $data
      * @param null $tokenOverride
@@ -103,13 +102,12 @@ public function extractAuthKeys($data, $tokenOverride = null)
         //parse the response
         $authTokenKey = ($tokenOverride) ? $tokenOverride : $this->getAuthTokenKey();
         if (is_array($data) && isset($data[$authTokenKey])) {
-
             return $data;
         }
 
         $error = $this->getErrorsFromResponse($data);
         if (empty($error)) {
-            $error = $this->factory->getTranslator()->trans("mautic.integration.error.genericerror", array(), "flashes");
+            $error = $this->factory->getTranslator()->trans('mautic.integration.error.genericerror', [], 'flashes');
         }
 
         throw new AuthenticationException($error);
@@ -120,22 +118,22 @@ public function extractAuthKeys($data, $tokenOverride = null)
      */
     public function getSupportedFeatures()
     {
-        return array(
-            'sso_service'
-        );
+        return [
+            'sso_service',
+        ];
     }
 
     /**
-     * Get form settings; authorization is not needed since it is done when a user logs in
+     * Get form settings; authorization is not needed since it is done when a user logs in.
      *
      * @return array
      */
     public function getFormSettings()
     {
-        return array(
+        return [
             'requires_callback'      => true,
-            'requires_authorization' => false
-        );
+            'requires_authorization' => false,
+        ];
     }
 
     /**
@@ -145,32 +143,32 @@ public function getFormSettings()
      * @param array                                    $data
      * @param string                                   $formArea
      */
-    public function appendToForm (&$builder, $data, $formArea)
+    public function appendToForm(&$builder, $data, $formArea)
     {
         if ($formArea == 'features') {
             $builder->add('auto_create_user',
                 'yesno_button_group',
-                array(
+                [
                     'label' => 'mautic.integration.sso.auto_create_user',
                     'data'  => (isset($data['auto_create_user'])) ? (bool) $data['auto_create_user'] : false,
-                    'attr' => array(
-                        'tooltip' => 'mautic.integration.sso.auto_create_user.tooltip'
-                    )
-                )
+                    'attr'  => [
+                        'tooltip' => 'mautic.integration.sso.auto_create_user.tooltip',
+                    ],
+                ]
             );
 
             $builder->add(
                 'new_user_role',
                 'role_list',
-                array(
-                    'label'         => 'mautic.integration.sso.new_user_role',
-                    'label_attr'    => array('class' => 'control-label'),
-                    'attr'          => array(
-                        'class' => 'form-control',
-                        'tooltip' => 'mautic.integration.sso.new_user_role.tooltip'
-                    )
-                )
+                [
+                    'label'      => 'mautic.integration.sso.new_user_role',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
+                        'class'   => 'form-control',
+                        'tooltip' => 'mautic.integration.sso.new_user_role.tooltip',
+                    ],
+                ]
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PluginBundle/MauticPluginBundle.php b/app/bundles/PluginBundle/MauticPluginBundle.php
index 82390b22d72..cddafcb952c 100644
--- a/app/bundles/PluginBundle/MauticPluginBundle.php
+++ b/app/bundles/PluginBundle/MauticPluginBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticPluginBundle
+ * Class MauticPluginBundle.
  */
 class MauticPluginBundle extends Bundle
 {
diff --git a/app/bundles/PluginBundle/Model/PluginModel.php b/app/bundles/PluginBundle/Model/PluginModel.php
index cbe670c446c..be8bef8a968 100644
--- a/app/bundles/PluginBundle/Model/PluginModel.php
+++ b/app/bundles/PluginBundle/Model/PluginModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Mautic\LeadBundle\Model\FieldModel;
 
 /**
- * Class PluginModel
+ * Class PluginModel.
  */
 class PluginModel extends FormModel
 {
@@ -51,7 +52,7 @@ public function getPermissionBase()
     }
 
     /**
-     * Get lead fields used in selects/matching
+     * Get lead fields used in selects/matching.
      */
     public function getLeadFields()
     {
diff --git a/app/bundles/PluginBundle/PluginEvents.php b/app/bundles/PluginBundle/PluginEvents.php
index 85eadcbf5f6..fac1d6ac7ac 100644
--- a/app/bundles/PluginBundle/PluginEvents.php
+++ b/app/bundles/PluginBundle/PluginEvents.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle;
 
 /**
- * Class PluginEvents
+ * Class PluginEvents.
  *
  * Events available for PluginEvents
  */
 final class PluginEvents
 {
     /**
-     * The mautic.plugin_on_integration_config_save event is dispatched when an integration's configuration is saved
+     * The mautic.plugin_on_integration_config_save event is dispatched when an integration's configuration is saved.
      *
      * The event listener receives a Mautic\PluginBundle\Event\PluginIntegrationEvent instance.
      *
@@ -71,7 +72,7 @@ final class PluginEvents
     const PLUGIN_ON_INTEGRATION_RESPONSE = 'mautic.plugin_on_integration_response';
 
     /**
-     * The mautic.plugin_on_integration_auth_redirect event is dispatched when an authorization URL is generated and before the user is redirected to it
+     * The mautic.plugin_on_integration_auth_redirect event is dispatched when an authorization URL is generated and before the user is redirected to it.
      *
      * The event listener receives a Mautic\PluginBundle\Event\PluginIntegrationAuthRedirectEvent instance.
      *
@@ -90,7 +91,7 @@ final class PluginEvents
     const ON_CAMPAIGN_TRIGGER_ACTION = 'mautic.plugin.on_campaign_trigger_action';
 
     /**
-     * The mautic.plugin_on_integration_get_auth_callback_url event is dispatched when generating the redirect/callback URL
+     * The mautic.plugin_on_integration_get_auth_callback_url event is dispatched when generating the redirect/callback URL.
      *
      * The event listener receives a Mautic\PluginBundle\Event\PluginIntegrationAuthCallbackUrlEvent instance.
      *
@@ -99,7 +100,7 @@ final class PluginEvents
     const PLUGIN_ON_INTEGRATION_GET_AUTH_CALLBACK_URL = 'mautic.plugin_on_integration_get_auth_callback_url';
 
     /**
-     * The mautic.plugin_on_integration_form_display event is dispatched when fetching display settings for the integration's config form
+     * The mautic.plugin_on_integration_form_display event is dispatched when fetching display settings for the integration's config form.
      *
      * The event listener receives a Mautic\PluginBundle\Event\PluginIntegrationFormDisplayEvent instance.
      *
diff --git a/app/bundles/PluginBundle/Security/Permissions/PluginPermissions.php b/app/bundles/PluginBundle/Security/Permissions/PluginPermissions.php
index a7f3cd919b5..7d59b61f85f 100644
--- a/app/bundles/PluginBundle/Security/Permissions/PluginPermissions.php
+++ b/app/bundles/PluginBundle/Security/Permissions/PluginPermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PluginBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PluginPermissions
+ * Class PluginPermissions.
  */
 class PluginPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/PluginBundle/Views/Auth/auth.html.php b/app/bundles/PluginBundle/Views/Auth/auth.html.php
index 0e7621d6510..caf83ad50ba 100644
--- a/app/bundles/PluginBundle/Views/Auth/auth.html.php
+++ b/app/bundles/PluginBundle/Views/Auth/auth.html.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:slim.html.php');
 $js = <<<JS
 Mautic.handleIntegrationCallback("$integration", "$csrfToken", "$code", "$callbackUrl", "$clientIdKey", "$clientSecretKey");
 JS;
-$view['assets']->addScriptDeclaration($js, 'bodyClose');
\ No newline at end of file
+$view['assets']->addScriptDeclaration($js, 'bodyClose');
diff --git a/app/bundles/PluginBundle/Views/Auth/postauth.html.php b/app/bundles/PluginBundle/Views/Auth/postauth.html.php
index 0a63955e508..8ec2498be57 100644
--- a/app/bundles/PluginBundle/Views/Auth/postauth.html.php
+++ b/app/bundles/PluginBundle/Views/Auth/postauth.html.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:slim.html.php');
 $view['slots']->set('mauticContent', 'social');
 $data = json_encode($data);
-$js = <<<JS
+$js   = <<<JS
 function postFormHandler() {
     var opener = window.opener;
     if(opener && typeof opener.postAuthCallback == 'function') {
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_leadFields_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_leadFields_row.html.php
index 6f2e6f4fbe2..75e831e8868 100644
--- a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_leadFields_row.html.php
+++ b/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_leadFields_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -18,16 +19,16 @@
         <?php echo $view['form']->errors($form); ?>
         <?php $rowCount = 1; ?>
         <?php foreach ($form->children as $child): ?>
-        <?php if ($rowCount++ % 2 == 1 ): ?>
+        <?php if ($rowCount++ % 2 == 1): ?>
         <div class="row">
         <?php endif; ?>
             <div class="col-sm-6">
                 <?php echo $view['form']->row($child); ?>
             </div>
-        <?php if ($rowCount++ % 2 == 1 ): ?>
+        <?php if ($rowCount++ % 2 == 1): ?>
         </div>
         <?php endif; ?>
-        <?php $rowCount++; ?>
+        <?php ++$rowCount; ?>
         <?php endforeach; ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_row.html.php
index b725ec2a3db..e56a59e4a37 100644
--- a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_row.html.php
+++ b/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_featureSettings_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_supportedFeatures_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_supportedFeatures_row.html.php
index 51f60e2307a..843b72351b2 100644
--- a/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_supportedFeatures_row.html.php
+++ b/app/bundles/PluginBundle/Views/FormTheme/Integration/_integration_details_supportedFeatures_row.html.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $attr      = $form->vars['attr'];
-$builtin   = (isset($formSettings['builtin_features'])) ? $formSettings['builtin_features'] : array();
+$builtin   = (isset($formSettings['builtin_features'])) ? $formSettings['builtin_features'] : [];
 $showLabel = (count($builtin) !== count($form->children));
 ?>
 
@@ -26,7 +26,7 @@
             <?php if (!in_array($child->vars['value'], $builtin)): ?>
             <div class="checkbox" >
                 <label>
-                    <?php echo $view['form']->widget($child, array('attr' => $attr)); ?>
+                    <?php echo $view['form']->widget($child, ['attr' => $attr]); ?>
                     <?php echo $view['translator']->trans($child->vars['label']); ?>
                 </label>
             </div>
diff --git a/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php b/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php
index 2b58bd6f6b4..ae3216d32e7 100644
--- a/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php
+++ b/app/bundles/PluginBundle/Views/FormTheme/Integration/integration_fields_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -19,16 +20,16 @@
         <?php echo $view['form']->errors($form); ?>
         <?php $rowCount = 1; ?>
         <?php foreach ($form->children as $child): ?>
-        <?php if ($rowCount++ % 2 == 1 ): ?>
+        <?php if ($rowCount++ % 2 == 1): ?>
         <div class="row">
         <?php endif; ?>
             <div class="col-sm-6">
                 <?php echo $view['form']->row($child); ?>
             </div>
-        <?php if ($rowCount++ % 2 == 1 ): ?>
+        <?php if ($rowCount++ % 2 == 1): ?>
         </div>
         <?php endif; ?>
-        <?php $rowCount++; ?>
+        <?php ++$rowCount; ?>
         <?php endforeach; ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/bundles/PluginBundle/Views/Integration/form.html.php b/app/bundles/PluginBundle/Views/Integration/form.html.php
index 6e40e87418c..7cb1d9b9d07 100644
--- a/app/bundles/PluginBundle/Views/Integration/form.html.php
+++ b/app/bundles/PluginBundle/Views/Integration/form.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if (!$hasSupportedFeatures = (isset($form['supportedFeatures']) && count($form['supportedFeatures']))) {
@@ -19,9 +20,9 @@
     }
 }
 
-$fieldHtml      = ($hasFields) ? $view['form']->row($form['featureSettings']['leadFields']) : '';
-$fieldLabel     = ($hasFields) ? $form['featureSettings']['leadFields']->vars['label'] : '';
-$fieldTabClass  = ($hasFields) ? '' : ' hide';
+$fieldHtml     = ($hasFields) ? $view['form']->row($form['featureSettings']['leadFields']) : '';
+$fieldLabel    = ($hasFields) ? $form['featureSettings']['leadFields']->vars['label'] : '';
+$fieldTabClass = ($hasFields) ? '' : ' hide';
 unset($form['featureSettings']['leadFields']);
 ?>
 
@@ -61,9 +62,9 @@
             <div class="row">
                 <div class="col-xs-12 text-center">
                     <?php
-                    $attr = $form['authButton']->vars['attr'];
+                    $attr          = $form['authButton']->vars['attr'];
                     $attr['class'] = 'btn btn-success btn-lg';
-                    echo $view['form']->widget($form['authButton'], array('attr' => $attr));
+                    echo $view['form']->widget($form['authButton'], ['attr' => $attr]);
                     ?>
                 </div>
             </div>
diff --git a/app/bundles/PluginBundle/Views/Integration/grid.html.php b/app/bundles/PluginBundle/Views/Integration/grid.html.php
index 2fff216e2f4..319527917a9 100644
--- a/app/bundles/PluginBundle/Views/Integration/grid.html.php
+++ b/app/bundles/PluginBundle/Views/Integration/grid.html.php
@@ -1,24 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticPluginBundle:Integration:index.html.php');
+}
 ?>
 <?php if (count($items)): ?>
 <div class="pa-md bg-auto">
     <div class="row shuffle-integrations">
             <?php foreach ($items as $item): ?>
-                <div class="shuffle shuffle-item grid ma-10 pull-left text-center integration plugin<?php echo $item['plugin']; ?> integration-<?php echo $item['name']; ?> <?php if (!$item['enabled']) echo  'integration-disabled'; ?>">
+                <div class="shuffle shuffle-item grid ma-10 pull-left text-center integration plugin<?php echo $item['plugin']; ?> integration-<?php echo $item['name']; ?> <?php if (!$item['enabled']) {
+    echo  'integration-disabled';
+} ?>">
                     <div class="panel ovf-h pa-10">
-                        <a href="<?php echo $view['router']->path(($item['isBundle'] ? 'mautic_plugin_info' : 'mautic_plugin_config'), array('name' => $item['name'])); ?>" data-toggle="ajaxmodal" data-target="#IntegrationEditModal" data-header="<?php echo $item['display']; ?>"<?php if ($item['isBundle']) echo ' data-footer="false"'; ?>>
+                        <a href="<?php echo $view['router']->path(($item['isBundle'] ? 'mautic_plugin_info' : 'mautic_plugin_config'), ['name' => $item['name']]); ?>" data-toggle="ajaxmodal" data-target="#IntegrationEditModal" data-header="<?php echo $item['display']; ?>"<?php if ($item['isBundle']) {
+    echo ' data-footer="false"';
+} ?>>
                             <p><img class="img img-responsive" src="<?php echo $view['assets']->getUrl($item['icon']); ?>" /></p>
                             <h5 class="mt-20">
-                                <span class="ellipsis" data-toggle="tooltip" title="<?php echo $plugins[$item['plugin']]['name'] . ' - ' . $item['display']; ?>"><?php echo $item['display']; ?>
+                                <span class="ellipsis" data-toggle="tooltip" title="<?php echo $plugins[$item['plugin']]['name'].' - '.$item['display']; ?>"><?php echo $item['display']; ?>
                                 </span>
                             </h5>
                         </a>
@@ -27,14 +33,14 @@
             <?php endforeach; ?>
     </div>
 </div>
-<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', array(
+<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
     'id'            => 'IntegrationEditModal',
-    'footerButtons' => true
-)); ?>
+    'footerButtons' => true,
+]); ?>
 
 <?php else: ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', array(
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', [
         'message' => 'mautic.integrations.noresults',
-        'tip'     => 'mautic.integration.noresults.tip'
-    )); ?>
+        'tip'     => 'mautic.integration.noresults.tip',
+    ]); ?>
 <?php endif; ?>
diff --git a/app/bundles/PluginBundle/Views/Integration/index.html.php b/app/bundles/PluginBundle/Views/Integration/index.html.php
index c1848f9722a..215d2219494 100644
--- a/app/bundles/PluginBundle/Views/Integration/index.html.php
+++ b/app/bundles/PluginBundle/Views/Integration/index.html.php
@@ -1,37 +1,37 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'integration');
 
 $header = $view['translator']->trans('mautic.plugin.manage.plugins');
 if ($pluginFilter) {
     $filterValue = $pluginFilter['id'];
-    $header     .= ' - ' . $pluginFilter['name'];
+    $header .= ' - '.$pluginFilter['name'];
 } else {
     $filterValue = '';
 }
 $view['slots']->set('headerTitle', $header);
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'customButtons' => array(
-        array(
-            'attr'      => array(
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'customButtons' => [
+        [
+            'attr' => [
                 'data-toggle' => 'ajax',
-                'href'        => $view['router']->path('mautic_plugin_reload')
-            ),
-            'btnText'   => $view["translator"]->trans('mautic.plugin.reload.plugins'),
+                'href'        => $view['router']->path('mautic_plugin_reload'),
+            ],
+            'btnText'   => $view['translator']->trans('mautic.plugin.reload.plugins'),
             'iconClass' => 'fa fa-cubes',
-            'tooltip'   => 'mautic.plugin.reload.plugins.tooltip'
-        )
-    )
-)));
+            'tooltip'   => 'mautic.plugin.reload.plugins.tooltip',
+        ],
+    ],
+]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
diff --git a/app/bundles/PluginBundle/Views/Integration/info.html.php b/app/bundles/PluginBundle/Views/Integration/info.html.php
index 77c9229f263..f3ffa641b94 100644
--- a/app/bundles/PluginBundle/Views/Integration/info.html.php
+++ b/app/bundles/PluginBundle/Views/Integration/info.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/PointBundle/Config/config.php b/app/bundles/PointBundle/Config/config.php
index 99cfed7f9e6..550e709d032 100644
--- a/app/bundles/PointBundle/Config/config.php
+++ b/app/bundles/PointBundle/Config/config.php
@@ -1,154 +1,155 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes'   => array(
-        'main' => array(
-            'mautic_pointtriggerevent_action' => array(
+return [
+    'routes' => [
+        'main' => [
+            'mautic_pointtriggerevent_action' => [
                 'path'       => '/points/triggers/events/{objectAction}/{objectId}',
-                'controller' => 'MauticPointBundle:TriggerEvent:execute'
-            ),
-            'mautic_pointtrigger_index'       => array(
+                'controller' => 'MauticPointBundle:TriggerEvent:execute',
+            ],
+            'mautic_pointtrigger_index' => [
                 'path'       => '/points/triggers/{page}',
-                'controller' => 'MauticPointBundle:Trigger:index'
-            ),
-            'mautic_pointtrigger_action'      => array(
+                'controller' => 'MauticPointBundle:Trigger:index',
+            ],
+            'mautic_pointtrigger_action' => [
                 'path'       => '/points/triggers/{objectAction}/{objectId}',
-                'controller' => 'MauticPointBundle:Trigger:execute'
-            ),
-            'mautic_point_index'              => array(
+                'controller' => 'MauticPointBundle:Trigger:execute',
+            ],
+            'mautic_point_index' => [
                 'path'       => '/points/{page}',
-                'controller' => 'MauticPointBundle:Point:index'
-            ),
-            'mautic_point_action'             => array(
+                'controller' => 'MauticPointBundle:Point:index',
+            ],
+            'mautic_point_action' => [
                 'path'       => '/points/{objectAction}/{objectId}',
-                'controller' => 'MauticPointBundle:Point:execute'
-            )
-        ),
-        'api'  => array(
-            'mautic_api_getpoints'   => array(
+                'controller' => 'MauticPointBundle:Point:execute',
+            ],
+        ],
+        'api' => [
+            'mautic_api_getpoints' => [
                 'path'       => '/points',
-                'controller' => 'MauticPointBundle:Api\PointApi:getEntities'
-            ),
-            'mautic_api_getpoint'    => array(
+                'controller' => 'MauticPointBundle:Api\PointApi:getEntities',
+            ],
+            'mautic_api_getpoint' => [
                 'path'       => '/points/{id}',
-                'controller' => 'MauticPointBundle:Api\PointApi:getEntity'
-            ),
-            'mautic_api_gettriggers' => array(
+                'controller' => 'MauticPointBundle:Api\PointApi:getEntity',
+            ],
+            'mautic_api_gettriggers' => [
                 'path'       => '/points/triggers',
-                'controller' => 'MauticPointBundle:Api\TriggerApi:getEntities'
-            ),
-            'mautic_api_gettrigger'  => array(
+                'controller' => 'MauticPointBundle:Api\TriggerApi:getEntities',
+            ],
+            'mautic_api_gettrigger' => [
                 'path'       => '/points/triggers/{id}',
-                'controller' => 'MauticPointBundle:Api\TriggerApi:getEntity'
-            )
-        )
-    ),
+                'controller' => 'MauticPointBundle:Api\TriggerApi:getEntity',
+            ],
+        ],
+    ],
 
-    'menu'     => array(
-        'main' => array(
-            'mautic.points.menu.root' => array(
+    'menu' => [
+        'main' => [
+            'mautic.points.menu.root' => [
                 'id'        => 'mautic_points_root',
                 'iconClass' => 'fa-calculator',
-                'access'    => array('point:points:view', 'point:triggers:view'),
+                'access'    => ['point:points:view', 'point:triggers:view'],
                 'priority'  => 30,
-                'children'  => array(
-                    'mautic.point.menu.index'         => array(
+                'children'  => [
+                    'mautic.point.menu.index' => [
                         'route'  => 'mautic_point_index',
-                        'access' => 'point:points:view'
-                    ),
-                    'mautic.point.trigger.menu.index' => array(
+                        'access' => 'point:points:view',
+                    ],
+                    'mautic.point.trigger.menu.index' => [
                         'route'  => 'mautic_pointtrigger_index',
-                        'access' => 'point:triggers:view'
-                    )
-                )
-            )
-        )
-    ),
+                        'access' => 'point:triggers:view',
+                    ],
+                ],
+            ],
+        ],
+    ],
 
-    'categories' => array(
-        'point' => null
-    ),
+    'categories' => [
+        'point' => null,
+    ],
 
-    'services' => array(
-        'events' => array(
-            'mautic.point.subscriber'            => array(
-                'class' => 'Mautic\PointBundle\EventListener\PointSubscriber',
+    'services' => [
+        'events' => [
+            'mautic.point.subscriber' => [
+                'class'     => 'Mautic\PointBundle\EventListener\PointSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
-            ),
-            'mautic.point.leadbundle.subscriber' => array(
-                'class' => 'Mautic\PointBundle\EventListener\LeadSubscriber',
+                    'mautic.core.model.auditlog',
+                ],
+            ],
+            'mautic.point.leadbundle.subscriber' => [
+                'class'     => 'Mautic\PointBundle\EventListener\LeadSubscriber',
                 'arguments' => [
-                    'mautic.point.model.trigger'
-                ]
-            ),
-            'mautic.point.search.subscriber'     => array(
-                'class' => 'Mautic\PointBundle\EventListener\SearchSubscriber',
+                    'mautic.point.model.trigger',
+                ],
+            ],
+            'mautic.point.search.subscriber' => [
+                'class'     => 'Mautic\PointBundle\EventListener\SearchSubscriber',
                 'arguments' => [
                     'mautic.point.model.point',
-                    'mautic.point.model.trigger'
-                ]
-            ),
-            'mautic.point.dashboard.subscriber'  => array(
-                'class' => 'Mautic\PointBundle\EventListener\DashboardSubscriber',
+                    'mautic.point.model.trigger',
+                ],
+            ],
+            'mautic.point.dashboard.subscriber' => [
+                'class'     => 'Mautic\PointBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
-                    'mautic.point.model.point'
-                ]
-            ),
-        ),
-        'forms'  => array(
-            'mautic.point.type.form'                  => array(
+                    'mautic.point.model.point',
+                ],
+            ],
+        ],
+        'forms' => [
+            'mautic.point.type.form' => [
                 'class'     => 'Mautic\PointBundle\Form\Type\PointType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'point'
-            ),
-            'mautic.point.type.action'                => array(
+                'alias'     => 'point',
+            ],
+            'mautic.point.type.action' => [
                 'class' => 'Mautic\PointBundle\Form\Type\PointActionType',
-                'alias' => 'pointaction'
-            ),
-            'mautic.pointtrigger.type.form'           => array(
+                'alias' => 'pointaction',
+            ],
+            'mautic.pointtrigger.type.form' => [
                 'class'     => 'Mautic\PointBundle\Form\Type\TriggerType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'pointtrigger'
-            ),
-            'mautic.pointtrigger.type.action'         => array(
+                'alias'     => 'pointtrigger',
+            ],
+            'mautic.pointtrigger.type.action' => [
                 'class' => 'Mautic\PointBundle\Form\Type\TriggerEventType',
-                'alias' => 'pointtriggerevent'
-            ),
-            'mautic.point.type.genericpoint_settings' => array(
+                'alias' => 'pointtriggerevent',
+            ],
+            'mautic.point.type.genericpoint_settings' => [
                 'class' => 'Mautic\PointBundle\Form\Type\GenericPointSettingsType',
-                'alias' => 'genericpoint_settings'
-            )
-        ),
-        'models' =>  array(
-            'mautic.point.model.point' => array(
-                'class' => 'Mautic\PointBundle\Model\PointModel',
-                'arguments' => array(
+                'alias' => 'genericpoint_settings',
+            ],
+        ],
+        'models' => [
+            'mautic.point.model.point' => [
+                'class'     => 'Mautic\PointBundle\Model\PointModel',
+                'arguments' => [
                     'session',
                     'mautic.helper.ip_lookup',
-                    'mautic.lead.model.lead'
-                )
-            ),
-            'mautic.point.model.triggerevent' => array(
-                'class' => 'Mautic\PointBundle\Model\TriggerEventModel'
-            ),
-            'mautic.point.model.trigger' => array(
-                'class' => 'Mautic\PointBundle\Model\TriggerModel',
-                'arguments' => array(
+                    'mautic.lead.model.lead',
+                ],
+            ],
+            'mautic.point.model.triggerevent' => [
+                'class' => 'Mautic\PointBundle\Model\TriggerEventModel',
+            ],
+            'mautic.point.model.trigger' => [
+                'class'     => 'Mautic\PointBundle\Model\TriggerModel',
+                'arguments' => [
                     'mautic.helper.ip_lookup',
                     'mautic.lead.model.lead',
-                    'mautic.point.model.triggerevent'
-                )
-            )
-        )
-    )
-);
+                    'mautic.point.model.triggerevent',
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/bundles/PointBundle/Controller/AjaxController.php b/app/bundles/PointBundle/Controller/AjaxController.php
index bdf7765cb71..b5121000b06 100644
--- a/app/bundles/PointBundle/Controller/AjaxController.php
+++ b/app/bundles/PointBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
-
     /**
      * @param Request $request
      *
@@ -26,7 +26,7 @@ class AjaxController extends CommonAjaxController
      */
     protected function reorderTriggerEventsAction(Request $request)
     {
-        $dataArray   = array('success' => 0);
+        $dataArray   = ['success' => 0];
         $session     = $this->get('session');
         $triggerId   = InputHelper::clean($request->request->get('triggerId'));
         $sessionName = 'mautic.point.'.$triggerId.'.triggerevents.modified';
@@ -48,11 +48,11 @@ protected function reorderTriggerEventsAction(Request $request)
      */
     protected function getActionFormAction(Request $request)
     {
-        $dataArray = array(
+        $dataArray = [
             'success' => 0,
-            'html'    => ''
-        );
-        $type      = InputHelper::clean($request->request->get('actionType'));
+            'html'    => '',
+        ];
+        $type = InputHelper::clean($request->request->get('actionType'));
 
         if (!empty($type)) {
             //get the HTML for the form
@@ -61,17 +61,17 @@ protected function getActionFormAction(Request $request)
             $actions = $model->getPointActions();
 
             if (isset($actions['actions'][$type])) {
-                $themes = array('MauticPointBundle:FormTheme\Action');
+                $themes = ['MauticPointBundle:FormTheme\Action'];
                 if (!empty($actions['actions'][$type]['formTheme'])) {
                     $themes[] = $actions['actions'][$type]['formTheme'];
                 }
 
                 $formType        = (!empty($actions['actions'][$type]['formType'])) ? $actions['actions'][$type]['formType'] : 'genericpoint_settings';
-                $formTypeOptions = (!empty($actions['actions'][$type]['formTypeOptions'])) ? $actions['actions'][$type]['formTypeOptions'] : array();
-                $form            = $this->get('form.factory')->create('pointaction', array(), array('formType' => $formType, 'formTypeOptions' => $formTypeOptions));
-                $html            = $this->renderView('MauticPointBundle:Point:actionform.html.php', array(
-                    'form' => $this->setFormTheme($form, 'MauticPointBundle:Point:actionform.html.php', $themes)
-                ));
+                $formTypeOptions = (!empty($actions['actions'][$type]['formTypeOptions'])) ? $actions['actions'][$type]['formTypeOptions'] : [];
+                $form            = $this->get('form.factory')->create('pointaction', [], ['formType' => $formType, 'formTypeOptions' => $formTypeOptions]);
+                $html            = $this->renderView('MauticPointBundle:Point:actionform.html.php', [
+                    'form' => $this->setFormTheme($form, 'MauticPointBundle:Point:actionform.html.php', $themes),
+                ]);
 
                 //replace pointaction with point
                 $html                 = str_replace('pointaction', 'point', $html);
diff --git a/app/bundles/PointBundle/Controller/Api/PointApiController.php b/app/bundles/PointBundle/Controller/Api/PointApiController.php
index 8ddb770543f..de7ca2b9e96 100644
--- a/app/bundles/PointBundle/Controller/Api/PointApiController.php
+++ b/app/bundles/PointBundle/Controller/Api/PointApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,14 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class PointApiController
+ * Class PointApiController.
  */
 class PointApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('point');
@@ -29,6 +29,6 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'point';
         $this->entityNameMulti  = 'points';
         $this->permissionBase   = 'point:points';
-        $this->serializerGroups = array('pointDetails', 'categoryList', 'publishDetails');
+        $this->serializerGroups = ['pointDetails', 'categoryList', 'publishDetails'];
     }
 }
diff --git a/app/bundles/PointBundle/Controller/Api/TriggerApiController.php b/app/bundles/PointBundle/Controller/Api/TriggerApiController.php
index 8c068d1a92a..62ed1628160 100644
--- a/app/bundles/PointBundle/Controller/Api/TriggerApiController.php
+++ b/app/bundles/PointBundle/Controller/Api/TriggerApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,14 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class TriggerApiController
+ * Class TriggerApiController.
  */
 class TriggerApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('point.trigger');
@@ -29,6 +29,6 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'trigger';
         $this->entityNameMulti  = 'triggers';
         $this->permissionBase   = 'point:triggers';
-        $this->serializerGroups = array('triggerDetails', 'categoryList', 'publishDetails');
+        $this->serializerGroups = ['triggerDetails', 'categoryList', 'publishDetails'];
     }
 }
diff --git a/app/bundles/PointBundle/Controller/PointController.php b/app/bundles/PointBundle/Controller/PointController.php
index f346989b187..a537ae62d15 100644
--- a/app/bundles/PointBundle/Controller/PointController.php
+++ b/app/bundles/PointBundle/Controller/PointController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class PointController
+ * Class PointController.
  */
 class PointController extends FormController
 {
@@ -27,13 +28,13 @@ class PointController extends FormController
     public function indexAction($page = 1)
     {
         //set some permissions
-        $permissions = $this->get('mautic.security')->isGranted(array(
+        $permissions = $this->get('mautic.security')->isGranted([
             'point:points:view',
             'point:points:create',
             'point:points:edit',
             'point:points:delete',
-            'point:points:publish'
-        ), "RETURN_ARRAY");
+            'point:points:publish',
+        ], 'RETURN_ARRAY');
 
         if (!$permissions['point:points:view']) {
             return $this->accessDenied();
@@ -53,33 +54,33 @@ public function indexAction($page = 1)
         $search = $this->request->get('search', $this->get('session')->get('mautic.point.filter', ''));
         $this->get('session')->set('mautic.point.filter', $search);
 
-        $filter     = array('string' => $search, 'force' => array());
+        $filter     = ['string' => $search, 'force' => []];
         $orderBy    = $this->get('session')->get('mautic.point.orderby', 'p.name');
         $orderByDir = $this->get('session')->get('mautic.point.orderbydir', 'ASC');
 
-        $points = $this->getModel('point')->getEntities(array(
+        $points = $this->getModel('point')->getEntities([
             'start'      => $start,
             'limit'      => $limit,
             'filter'     => $filter,
             'orderBy'    => $orderBy,
-            'orderByDir' => $orderByDir
-        ));
+            'orderByDir' => $orderByDir,
+        ]);
 
         $count = count($points);
         if ($count && $count < ($start + 1)) {
             $lastPage = ($count === 1) ? 1 : (ceil($count / $limit)) ?: 1;
             $this->get('session')->set('mautic.point.page', $lastPage);
-            $returnUrl   = $this->generateUrl('mautic_point_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl('mautic_point_index', ['page' => $lastPage]);
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $returnUrl,
-                'viewParameters'  => array('page' => $lastPage),
+                'viewParameters'  => ['page' => $lastPage],
                 'contentTemplate' => 'MauticPointBundle:Point:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_point_index',
-                    'mauticContent' => 'point'
-                )
-            ));
+                    'mauticContent' => 'point',
+                ],
+            ]);
         }
 
         //set what page currently on so that we can return here after form submission/cancellation
@@ -90,39 +91,39 @@ public function indexAction($page = 1)
         //get the list of actions
         $actions = $this->getModel('point')->getPointActions();
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'searchValue' => $search,
                 'items'       => $points,
                 'actions'     => $actions['actions'],
                 'page'        => $page,
                 'limit'       => $limit,
                 'permissions' => $permissions,
-                'tmpl'        => $tmpl
-            ),
+                'tmpl'        => $tmpl,
+            ],
             'contentTemplate' => 'MauticPointBundle:Point:list.html.php',
-            'passthroughVars' => array(
-                'activeLink'     => '#mautic_point_index',
-                'mauticContent'  => 'point',
-                'route'          => $this->generateUrl('mautic_point_index', array('page' => $page))
-            )
-        ));
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_point_index',
+                'mauticContent' => 'point',
+                'route'         => $this->generateUrl('mautic_point_index', ['page' => $page]),
+            ],
+        ]);
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
-     * @param  \Mautic\PointBundle\Entity\Point $entity
+     * @param \Mautic\PointBundle\Entity\Point $entity
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
     public function newAction($entity = null)
     {
-        $model   = $this->getModel('point');
+        $model = $this->getModel('point');
 
         if (!($entity instanceof Point)) {
             /** @var \Mautic\PointBundle\Entity\Point $entity */
-            $entity  = $model->getEntity();
+            $entity = $model->getEntity();
         }
 
         if (!$this->get('mautic.security')->isGranted('point:points:create')) {
@@ -134,13 +135,13 @@ public function newAction($entity = null)
 
         $actionType = ($this->request->getMethod() == 'POST') ? $this->request->request->get('point[type]', '', true) : '';
 
-        $action  = $this->generateUrl('mautic_point_action', array('objectAction' => 'new'));
+        $action  = $this->generateUrl('mautic_point_action', ['objectAction' => 'new']);
         $actions = $model->getPointActions();
-        $form    = $model->createForm($entity, $this->get('form.factory'), $action, array(
+        $form    = $model->createForm($entity, $this->get('form.factory'), $action, [
             'pointActions' => $actions,
-            'actionType'   => $actionType
-        ));
-        $viewParameters  = array('page' => $page);
+            'actionType'   => $actionType,
+        ]);
+        $viewParameters = ['page' => $page];
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -150,18 +151,18 @@ public function newAction($entity = null)
                     //form is valid so process the data
                     $model->saveEntity($entity);
 
-                    $this->addFlash('mautic.core.notice.created', array(
+                    $this->addFlash('mautic.core.notice.created', [
                         '%name%'      => $entity->getName(),
                         '%menu_link%' => 'mautic_point_index',
-                        '%url%'       => $this->generateUrl('mautic_point_action', array(
+                        '%url%'       => $this->generateUrl('mautic_point_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ))
-                    ));
+                            'objectId'     => $entity->getId(),
+                        ]),
+                    ]);
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
-                        $returnUrl      = $this->generateUrl('mautic_point_index', $viewParameters);
-                        $template       = 'MauticPointBundle:Point:index';
+                        $returnUrl = $this->generateUrl('mautic_point_index', $viewParameters);
+                        $template  = 'MauticPointBundle:Point:index';
                     } else {
                         //return edit view so that all the session stuff is loaded
                         return $this->editAction($entity->getId(), true);
@@ -173,45 +174,45 @@ public function newAction($entity = null)
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-                return $this->postActionRedirect(array(
+                return $this->postActionRedirect([
                     'returnUrl'       => $returnUrl,
                     'viewParameters'  => $viewParameters,
                     'contentTemplate' => $template,
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => '#mautic_point_index',
-                        'mauticContent' => 'point'
-                    )
-                ));
+                        'mauticContent' => 'point',
+                    ],
+                ]);
             }
         }
 
-        $themes = array('MauticPointBundle:FormTheme\Action');
+        $themes = ['MauticPointBundle:FormTheme\Action'];
         if ($actionType && !empty($actions['actions'][$actionType]['formTheme'])) {
             $themes[] = $actions['actions'][$actionType]['formTheme'];
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
-                'tmpl'           => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
-                'entity'         => $entity,
-                'form'           => $this->setFormTheme($form, 'MauticPointBundle:Point:form.html.php', $themes),
-                'actions'        => $actions['actions']
-            ),
+        return $this->delegateView([
+            'viewParameters' => [
+                'tmpl'    => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
+                'entity'  => $entity,
+                'form'    => $this->setFormTheme($form, 'MauticPointBundle:Point:form.html.php', $themes),
+                'actions' => $actions['actions'],
+            ],
             'contentTemplate' => 'MauticPointBundle:Point:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_point_index',
                 'mauticContent' => 'point',
-                'route'         => $this->generateUrl('mautic_point_action', array(
+                'route'         => $this->generateUrl('mautic_point_action', [
                         'objectAction' => (!empty($valid) ? 'edit' : 'new'), //valid means a new form was applied
-                        'objectId'     => $entity->getId()
-                    )
-                )
-            )
-        ));
+                        'objectId'     => $entity->getId(),
+                    ]
+                ),
+            ],
+        ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -226,33 +227,33 @@ public function editAction($objectId, $ignorePost = false)
         //set the page we came from
         $page = $this->get('session')->get('mautic.point.page', 1);
 
-        $viewParameters = array('page' => $page);
+        $viewParameters = ['page' => $page];
 
         //set the return URL
-        $returnUrl      = $this->generateUrl('mautic_point_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_point_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'viewParameters'  => $viewParameters,
             'contentTemplate' => 'MauticPointBundle:Point:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_point_index',
-                'mauticContent' => 'point'
-            )
-        );
+                'mauticContent' => 'point',
+            ],
+        ];
 
         //form not found
         if ($entity === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
-                            'type' => 'error',
-                            'msg'  => 'mautic.point.error.notfound',
-                            'msgVars' => array('%id%' => $objectId)
-                        )
-                    )
-                ))
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
+                            'type'    => 'error',
+                            'msg'     => 'mautic.point.error.notfound',
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ])
             );
         } elseif (!$this->get('mautic.security')->isGranted('point:points:edit')) {
             return $this->accessDenied();
@@ -263,12 +264,12 @@ public function editAction($objectId, $ignorePost = false)
 
         $actionType = ($this->request->getMethod() == 'POST') ? $this->request->request->get('point[type]', '', true) : $entity->getType();
 
-        $action  = $this->generateUrl('mautic_point_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action  = $this->generateUrl('mautic_point_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $actions = $model->getPointActions();
-        $form    = $model->createForm($entity, $this->get('form.factory'), $action, array(
+        $form    = $model->createForm($entity, $this->get('form.factory'), $action, [
             'pointActions' => $actions,
-            'actionType'   => $actionType
-        ));
+            'actionType'   => $actionType,
+        ]);
 
         ///Check for a submitted form and process it
         if (!$ignorePost && $this->request->getMethod() == 'POST') {
@@ -278,14 +279,14 @@ public function editAction($objectId, $ignorePost = false)
                     //form is valid so process the data
                     $model->saveEntity($entity, $form->get('buttons')->get('save')->isClicked());
 
-                    $this->addFlash('mautic.core.notice.updated', array(
+                    $this->addFlash('mautic.core.notice.updated', [
                         '%name%'      => $entity->getName(),
                         '%menu_link%' => 'mautic_point_index',
-                        '%url%'       => $this->generateUrl('mautic_point_action', array(
+                        '%url%'       => $this->generateUrl('mautic_point_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ))
-                    ));
+                            'objectId'     => $entity->getId(),
+                        ]),
+                    ]);
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
                         $returnUrl = $this->generateUrl('mautic_point_index', $viewParameters);
@@ -302,11 +303,11 @@ public function editAction($objectId, $ignorePost = false)
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 return $this->postActionRedirect(
-                    array_merge($postActionVars, array(
+                    array_merge($postActionVars, [
                         'returnUrl'       => $returnUrl,
                         'viewParameters'  => $viewParameters,
-                        'contentTemplate' => $template
-                    ))
+                        'contentTemplate' => $template,
+                    ])
                 );
             }
         } else {
@@ -314,32 +315,33 @@ public function editAction($objectId, $ignorePost = false)
             $model->lockEntity($entity);
         }
 
-        $themes = array('MauticPointBundle:FormTheme\Action');
+        $themes = ['MauticPointBundle:FormTheme\Action'];
         if (!empty($actions['actions'][$actionType]['formTheme'])) {
             $themes[] = $actions['actions'][$actionType]['formTheme'];
         }
-        return $this->delegateView(array(
-            'viewParameters'  => array(
-                'tmpl'           => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
-                'entity'         => $entity,
-                'form'           => $this->setFormTheme($form, 'MauticPointBundle:Point:form.html.php', $themes),
-                'actions'        => $actions['actions']
-            ),
+
+        return $this->delegateView([
+            'viewParameters' => [
+                'tmpl'    => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
+                'entity'  => $entity,
+                'form'    => $this->setFormTheme($form, 'MauticPointBundle:Point:form.html.php', $themes),
+                'actions' => $actions['actions'],
+            ],
             'contentTemplate' => 'MauticPointBundle:Point:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_point_index',
                 'mauticContent' => 'point',
-                'route'         => $this->generateUrl('mautic_point_action', array(
+                'route'         => $this->generateUrl('mautic_point_action', [
                         'objectAction' => 'edit',
-                        'objectId'     => $entity->getId()
-                    )
-                )
-            )
-        ));
+                        'objectId'     => $entity->getId(),
+                    ]
+                ),
+            ],
+        ]);
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -347,8 +349,8 @@ public function editAction($objectId, $ignorePost = false)
      */
     public function cloneAction($objectId)
     {
-        $model   = $this->getModel('point');
-        $entity  = $model->getEntity($objectId);
+        $model  = $this->getModel('point');
+        $entity = $model->getEntity($objectId);
 
         if ($entity != null) {
             if (!$this->get('mautic.security')->isGranted('point:points:create')) {
@@ -363,7 +365,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -372,29 +374,29 @@ public function cloneAction($objectId)
     public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.point.page', 1);
-        $returnUrl = $this->generateUrl('mautic_point_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_point_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPointBundle:Point:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_point_index',
-                'mauticContent' => 'point'
-            )
-        );
+                'mauticContent' => 'point',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model  = $this->getModel('point');
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.point.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->isGranted('point:points:delete')) {
                 return $this->accessDenied();
             } elseif ($model->isLocked($entity)) {
@@ -404,59 +406,59 @@ public function deleteAction($objectId)
             $model->deleteEntity($entity);
 
             $identifier = $this->get('translator')->trans($entity->getName());
-            $flashes[] = array(
-                'type' => 'notice',
-                'msg'  => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+            $flashes[]  = [
+                'type'    => 'notice',
+                'msg'     => 'mautic.core.notice.deleted',
+                'msgVars' => [
                     '%name%' => $identifier,
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function batchDeleteAction()
     {
         $page      = $this->get('session')->get('mautic.point.page', 1);
-        $returnUrl = $this->generateUrl('mautic_point_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_point_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPointBundle:Point:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_point_index',
-                'mauticContent' => 'point'
-            )
-        );
+                'mauticContent' => 'point',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model     = $this->getModel('point');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.point.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->isGranted('point:points:delete')) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
@@ -470,20 +472,20 @@ public function batchDeleteAction()
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
-                    'type' => 'notice',
-                    'msg'  => 'mautic.point.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.point.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 }
diff --git a/app/bundles/PointBundle/Controller/TriggerController.php b/app/bundles/PointBundle/Controller/TriggerController.php
index 0e44dccf388..52b72fa7a3f 100644
--- a/app/bundles/PointBundle/Controller/TriggerController.php
+++ b/app/bundles/PointBundle/Controller/TriggerController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class TriggerController
+ * Class TriggerController.
  */
 class TriggerController extends FormController
 {
@@ -28,14 +29,14 @@ class TriggerController extends FormController
     public function indexAction($page = 1)
     {
         //set some permissions
-        $permissions = $this->get('mautic.security')->isGranted(array(
+        $permissions = $this->get('mautic.security')->isGranted([
             'point:triggers:view',
             'point:triggers:create',
             'point:triggers:edit',
             'point:triggers:delete',
-            'point:triggers:publish'
+            'point:triggers:publish',
 
-        ), "RETURN_ARRAY");
+        ], 'RETURN_ARRAY');
 
         if (!$permissions['point:triggers:view']) {
             return $this->accessDenied();
@@ -55,34 +56,34 @@ public function indexAction($page = 1)
         $search = $this->request->get('search', $this->get('session')->get('mautic.point.trigger.filter', ''));
         $this->get('session')->set('mautic.point.trigger.filter', $search);
 
-        $filter = array('string' => $search, 'force' => array());
+        $filter     = ['string' => $search, 'force' => []];
         $orderBy    = $this->get('session')->get('mautic.point.trigger.orderby', 't.name');
         $orderByDir = $this->get('session')->get('mautic.point.trigger.orderbydir', 'ASC');
 
         $triggers = $this->getModel('point.trigger')->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
-            ));
+                'orderByDir' => $orderByDir,
+            ]);
 
         $count = count($triggers);
         if ($count && $count < ($start + 1)) {
             $lastPage = ($count === 1) ? 1 : (ceil($count / $limit)) ?: 1;
             $this->get('session')->set('mautic.point.trigger.page', $lastPage);
-            $returnUrl = $this->generateUrl('mautic_pointtrigger_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl('mautic_pointtrigger_index', ['page' => $lastPage]);
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $returnUrl,
-                'viewParameters'  => array('page' => $lastPage),
+                'viewParameters'  => ['page' => $lastPage],
                 'contentTemplate' => 'MauticPointBundle:Trigger:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_pointtrigger_index',
-                    'mauticContent' => 'pointTrigger'
-                )
-            ));
+                    'mauticContent' => 'pointTrigger',
+                ],
+            ]);
         }
 
         //set what page currently on so that we can return here after form submission/cancellation
@@ -90,26 +91,26 @@ public function indexAction($page = 1)
 
         $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'searchValue' => $search,
                 'items'       => $triggers,
                 'page'        => $page,
                 'limit'       => $limit,
                 'permissions' => $permissions,
-                'tmpl'        => $tmpl
-            ),
+                'tmpl'        => $tmpl,
+            ],
             'contentTemplate' => 'MauticPointBundle:Trigger:list.html.php',
-            'passthroughVars' => array(
-                'activeLink'     => '#mautic_pointtrigger_index',
-                'mauticContent'  => 'pointTrigger',
-                'route'          => $this->generateUrl('mautic_pointtrigger_index', array('page' => $page))
-            )
-        ));
+            'passthroughVars' => [
+                'activeLink'    => '#mautic_pointtrigger_index',
+                'mauticContent' => 'pointTrigger',
+                'route'         => $this->generateUrl('mautic_pointtrigger_index', ['page' => $page]),
+            ],
+        ]);
     }
 
     /**
-     * View a specific trigger
+     * View a specific trigger.
      *
      * @param int $objectId
      *
@@ -122,61 +123,60 @@ public function viewAction($objectId)
         //set the page we came from
         $page = $this->get('session')->get('mautic.point.trigger.page', 1);
 
-        $permissions = $this->get('mautic.security')->isGranted(array(
+        $permissions = $this->get('mautic.security')->isGranted([
             'point:triggers:view',
             'point:triggers:create',
             'point:triggers:edit',
             'point:triggers:delete',
-            'point:triggers:publish'
-        ), "RETURN_ARRAY");
-
+            'point:triggers:publish',
+        ], 'RETURN_ARRAY');
 
         if ($entity === null) {
             //set the return URL
-            $returnUrl = $this->generateUrl('mautic_pointtrigger_index', array('page' => $page));
+            $returnUrl = $this->generateUrl('mautic_pointtrigger_index', ['page' => $page]);
 
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $returnUrl,
-                'viewParameters'  => array('page' => $page),
+                'viewParameters'  => ['page' => $page],
                 'contentTemplate' => 'MauticPointBundle:Trigger:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_pointtrigger_index',
-                    'mauticContent' => 'pointTrigger'
-                ),
-                'flashes'         => array(
-                    array(
+                    'mauticContent' => 'pointTrigger',
+                ],
+                'flashes' => [
+                    [
                         'type'    => 'error',
                         'msg'     => 'mautic.point.trigger.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    )
-                )
-            ));
+                        'msgVars' => ['%id%' => $objectId],
+                    ],
+                ],
+            ]);
         } elseif (!$permissions['point:triggers:view']) {
             return $this->accessDenied();
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'entity'      => $entity,
                 'page'        => $page,
-                'permissions' => $permissions
-            ),
+                'permissions' => $permissions,
+            ],
             'contentTemplate' => 'MauticPointBundle:Trigger:details.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_pointtrigger_index',
                 'mauticContent' => 'pointTrigger',
-                'route'         => $this->generateUrl('mautic_pointtrigger_action', array(
+                'route'         => $this->generateUrl('mautic_pointtrigger_action', [
                         'objectAction' => 'view',
-                        'objectId'     => $entity->getId())
-                )
-            )
-        ));
+                        'objectId'     => $entity->getId(), ]
+                ),
+            ],
+        ]);
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
-     * @param  \Mautic\PointBundle\Entity\Trigger $entity
+     * @param \Mautic\PointBundle\Entity\Trigger $entity
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
@@ -187,7 +187,7 @@ public function newAction($entity = null)
 
         if (!($entity instanceof Trigger)) {
             /** @var \Mautic\PointBundle\Entity\Trigger $entity */
-            $entity  = $model->getEntity();
+            $entity = $model->getEntity();
         }
 
         $session   = $this->get('session');
@@ -201,10 +201,10 @@ public function newAction($entity = null)
         $page = $this->get('session')->get('mautic.point.trigger.page', 1);
 
         //set added/updated events
-        $addEvents     = $session->get('mautic.point.'.$sessionId.'.triggerevents.modified', array());
-        $deletedEvents = $session->get('mautic.point.'.$sessionId.'.triggerevents.deleted', array());
+        $addEvents     = $session->get('mautic.point.'.$sessionId.'.triggerevents.modified', []);
+        $deletedEvents = $session->get('mautic.point.'.$sessionId.'.triggerevents.deleted', []);
 
-        $action = $this->generateUrl('mautic_pointtrigger_action', array('objectAction' => 'new'));
+        $action = $this->generateUrl('mautic_pointtrigger_action', ['objectAction' => 'new']);
         $form   = $model->createForm($entity, $this->get('form.factory'), $action);
         $form->get('sessionId')->setData($sessionId);
 
@@ -220,7 +220,7 @@ public function newAction($entity = null)
                     if ('point.trigger' == 'point' && empty($events)) {
                         //set the error
                         $form->addError(new FormError(
-                            $this->get('translator')->trans('mautic.core.value.required', array(), 'validators')
+                            $this->get('translator')->trans('mautic.core.value.required', [], 'validators')
                         ));
                         $valid = false;
                     } else {
@@ -228,14 +228,14 @@ public function newAction($entity = null)
 
                         $model->saveEntity($entity);
 
-                        $this->addFlash('mautic.core.notice.created', array(
+                        $this->addFlash('mautic.core.notice.created', [
                             '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_pointtrigger_index',
-                            '%url%'       => $this->generateUrl('mautic_pointtrigger_action', array(
+                            '%url%'       => $this->generateUrl('mautic_pointtrigger_action', [
                                 'objectAction' => 'edit',
-                                'objectId'     => $entity->getId()
-                            ))
-                        ));
+                                'objectId'     => $entity->getId(),
+                            ]),
+                        ]);
 
                         if (!$form->get('buttons')->get('save')->isClicked()) {
                             //return edit view so that all the session stuff is loaded
@@ -246,55 +246,53 @@ public function newAction($entity = null)
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-
-                $viewParameters = array('page' => $page);
+                $viewParameters = ['page' => $page];
                 $returnUrl      = $this->generateUrl('mautic_pointtrigger_index', $viewParameters);
                 $template       = 'MauticPointBundle:Trigger:index';
 
-
                 //clear temporary fields
                 $this->clearSessionComponents($sessionId);
 
-                return $this->postActionRedirect(array(
+                return $this->postActionRedirect([
                     'returnUrl'       => $returnUrl,
                     'viewParameters'  => $viewParameters,
                     'contentTemplate' => $template,
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => '#mautic_pointtrigger_index',
-                        'mauticContent' => 'pointTrigger'
-                    )
-                ));
+                        'mauticContent' => 'pointTrigger',
+                    ],
+                ]);
             }
         } else {
             //clear out existing fields in case the form was refreshed, browser closed, etc
             $this->clearSessionComponents($sessionId);
-            $addEvents = $deletedEvents = array();
+            $addEvents = $deletedEvents = [];
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'events'        => $model->getEventGroups(),
                 'triggerEvents' => $addEvents,
                 'deletedEvents' => $deletedEvents,
                 'tmpl'          => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                 'entity'        => $entity,
                 'form'          => $form->createView(),
-                'sessionId'     => $sessionId
-            ),
+                'sessionId'     => $sessionId,
+            ],
             'contentTemplate' => 'MauticPointBundle:Trigger:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_pointtrigger_index',
                 'mauticContent' => 'pointTrigger',
-                'route'         => $this->generateUrl('mautic_pointtrigger_action', array(
+                'route'         => $this->generateUrl('mautic_pointtrigger_action', [
                         'objectAction' => (!empty($valid) ? 'edit' : 'new'), //valid means a new form was applied
-                        'objectId'     => $entity->getId())
-                )
-            )
-        ));
+                        'objectId'     => $entity->getId(), ]
+                ),
+            ],
+        ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -313,30 +311,30 @@ public function editAction($objectId, $ignorePost = false)
         $page = $this->get('session')->get('mautic.point.trigger.page', 1);
 
         //set the return URL
-        $returnUrl = $this->generateUrl('mautic_pointtrigger_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_pointtrigger_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPointBundle:Trigger:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_pointtrigger_index',
-                'mauticContent' => 'pointTrigger'
-            )
-        );
+                'mauticContent' => 'pointTrigger',
+            ],
+        ];
 
         //form not found
         if ($entity === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
                             'type'    => 'error',
                             'msg'     => 'mautic.point.trigger.error.notfound',
-                            'msgVars' => array('%id%' => $objectId)
-                        )
-                    )
-                ))
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ])
             );
         } elseif (!$this->get('mautic.security')->isGranted('point:triggers:edit')) {
             return $this->accessDenied();
@@ -345,7 +343,7 @@ public function editAction($objectId, $ignorePost = false)
             return $this->isLocked($postActionVars, $entity, 'point.trigger');
         }
 
-        $action = $this->generateUrl('mautic_pointtrigger_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action = $this->generateUrl('mautic_pointtrigger_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $form   = $model->createForm($entity, $this->get('form.factory'), $action);
         $form->get('sessionId')->setData($objectId);
 
@@ -354,8 +352,8 @@ public function editAction($objectId, $ignorePost = false)
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
                 //set added/updated events
-                $addEvents     = $session->get('mautic.point.'.$objectId.'.triggerevents.modified', array());
-                $deletedEvents = $session->get('mautic.point.'.$objectId.'.triggerevents.deleted', array());
+                $addEvents     = $session->get('mautic.point.'.$objectId.'.triggerevents.modified', []);
+                $deletedEvents = $session->get('mautic.point.'.$objectId.'.triggerevents.deleted', []);
                 $events        = array_diff_key($addEvents, array_flip($deletedEvents));
 
                 if ($valid = $this->isFormValid($form)) {
@@ -363,7 +361,7 @@ public function editAction($objectId, $ignorePost = false)
                     if ('point.trigger' == 'point' && empty($addEvents)) {
                         //set the error
                         $form->addError(new FormError(
-                            $this->get('translator')->trans('mautic.core.value.required', array(), 'validators')
+                            $this->get('translator')->trans('mautic.core.value.required', [], 'validators')
                         ));
                         $valid = false;
                     } else {
@@ -377,14 +375,14 @@ public function editAction($objectId, $ignorePost = false)
                             $this->getModel('point.triggerEvent')->deleteEntities($deletedEvents);
                         }
 
-                        $this->addFlash('mautic.core.notice.updated', array(
+                        $this->addFlash('mautic.core.notice.updated', [
                             '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_pointtrigger_index',
-                            '%url%'       => $this->generateUrl('mautic_pointtrigger_action', array(
+                            '%url%'       => $this->generateUrl('mautic_pointtrigger_action', [
                                 'objectAction' => 'edit',
-                                'objectId'     => $entity->getId()
-                            ))
-                        ));
+                                'objectId'     => $entity->getId(),
+                            ]),
+                        ]);
                     }
                 }
             } else {
@@ -393,8 +391,7 @@ public function editAction($objectId, $ignorePost = false)
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-
-                $viewParameters = array('page' => $page);
+                $viewParameters = ['page' => $page];
                 $returnUrl      = $this->generateUrl('mautic_pointtrigger_index', $viewParameters);
                 $template       = 'MauticPointBundle:Trigger:index';
 
@@ -402,11 +399,11 @@ public function editAction($objectId, $ignorePost = false)
                 $this->clearSessionComponents($objectId);
 
                 return $this->postActionRedirect(
-                    array_merge($postActionVars, array(
+                    array_merge($postActionVars, [
                         'returnUrl'       => $returnUrl,
                         'viewParameters'  => $viewParameters,
-                        'contentTemplate' => $template
-                    ))
+                        'contentTemplate' => $template,
+                    ])
                 );
             } elseif ($form->get('buttons')->get('apply')->isClicked()) {
                 //rebuild everything to include new ids
@@ -424,7 +421,7 @@ public function editAction($objectId, $ignorePost = false)
             $this->clearSessionComponents($objectId);
 
             //load existing events into session
-            $triggerEvents   = array();
+            $triggerEvents   = [];
             $existingActions = $entity->getEvents()->toArray();
             foreach ($existingActions as $a) {
                 $id     = $a->getId();
@@ -433,33 +430,33 @@ public function editAction($objectId, $ignorePost = false)
                 $triggerEvents[$id] = $action;
             }
             $session->set('mautic.point.'.$objectId.'.triggerevents.modified', $triggerEvents);
-            $deletedEvents = array();
+            $deletedEvents = [];
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'events'        => $model->getEventGroups(),
                 'triggerEvents' => $triggerEvents,
                 'deletedEvents' => $deletedEvents,
                 'tmpl'          => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                 'entity'        => $entity,
                 'form'          => $form->createView(),
-                'sessionId'     => $objectId
-            ),
+                'sessionId'     => $objectId,
+            ],
             'contentTemplate' => 'MauticPointBundle:Trigger:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_pointtrigger_index',
                 'mauticContent' => 'pointTrigger',
-                'route'         => $this->generateUrl('mautic_pointtrigger_action', array(
+                'route'         => $this->generateUrl('mautic_pointtrigger_action', [
                         'objectAction' => 'edit',
-                        'objectId'     => $entity->getId())
-                )
-            )
-        ));
+                        'objectId'     => $entity->getId(), ]
+                ),
+            ],
+        ]);
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -483,7 +480,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param $objectId
      *
@@ -492,29 +489,29 @@ public function cloneAction($objectId)
     public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.point.trigger.page', 1);
-        $returnUrl = $this->generateUrl('mautic_pointtrigger_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_pointtrigger_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPointBundle:Trigger:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_pointtrigger_index',
-                'mauticContent' => 'pointTrigger'
-            )
-        );
+                'mauticContent' => 'pointTrigger',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model  = $this->getModel('point.trigger');
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.point.trigger.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->isGranted('point:triggers:delete')) {
                 return $this->accessDenied();
             } elseif ($model->isLocked($entity)) {
@@ -524,59 +521,59 @@ public function deleteAction($objectId)
             $model->deleteEntity($entity);
 
             $identifier = $this->get('translator')->trans($entity->getName());
-            $flashes[]  = array(
+            $flashes[]  = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $identifier,
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function batchDeleteAction()
     {
         $page      = $this->get('session')->get('mautic.point.trigger.page', 1);
-        $returnUrl = $this->generateUrl('mautic_pointtrigger_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_pointtrigger_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticPointBundle:Trigger:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_pointtrigger_index',
-                'mauticContent' => 'pointTrigger'
-            )
-        );
+                'mauticContent' => 'pointTrigger',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model     = $this->getModel('point.trigger');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.point.trigger.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->isGranted('point:triggers:delete')) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
@@ -590,25 +587,25 @@ public function batchDeleteAction()
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
-                    'type' => 'notice',
-                    'msg'  => 'mautic.point.trigger.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.point.trigger.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Clear field and events from the session
+     * Clear field and events from the session.
      */
     public function clearSessionComponents($sessionId)
     {
diff --git a/app/bundles/PointBundle/Controller/TriggerEventController.php b/app/bundles/PointBundle/Controller/TriggerEventController.php
index 43a479e7e3f..7ca90b3ba8c 100644
--- a/app/bundles/PointBundle/Controller/TriggerEventController.php
+++ b/app/bundles/PointBundle/Controller/TriggerEventController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,20 +15,19 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Class TriggerEventController
+ * Class TriggerEventController.
  */
 class TriggerEventController extends CommonFormController
 {
-
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return JsonResponse
      */
-    public function newAction ()
+    public function newAction()
     {
         $success = 0;
-        $valid   = $cancelled = false;
+        $valid   = $cancelled   = false;
         $method  = $this->request->getMethod();
         $session = $this->get('session');
 
@@ -39,29 +39,29 @@ public function newAction ()
             $eventType = $this->request->query->get('type');
             $triggerId = $this->request->query->get('triggerId');
 
-            $triggerEvent = array(
+            $triggerEvent = [
                 'type'      => $eventType,
-                'triggerId' => $triggerId
-            );
+                'triggerId' => $triggerId,
+            ];
         }
 
         //ajax only for form fields
         if (!$eventType ||
             !$this->request->isXmlHttpRequest() ||
-            !$this->get('mautic.security')->isGranted(array(
+            !$this->get('mautic.security')->isGranted([
                 'point:triggers:edit',
-                'point:triggers:create'
-            ), 'MATCH_ONE')
+                'point:triggers:create',
+            ], 'MATCH_ONE')
         ) {
             return $this->modalAccessDenied();
         }
 
         //fire the builder event
         $events = $this->getModel('point.trigger')->getEvents();
-        $form   = $this->get('form.factory')->create('pointtriggerevent', $triggerEvent, array(
-            'action'   => $this->generateUrl('mautic_pointtriggerevent_action', array('objectAction' => 'new')),
-            'settings' => $events[$eventType]
-        ));
+        $form   = $this->get('form.factory')->create('pointtriggerevent', $triggerEvent, [
+            'action'   => $this->generateUrl('mautic_pointtriggerevent_action', ['objectAction' => 'new']),
+            'settings' => $events[$eventType],
+        ]);
         $form->get('triggerId')->setData($triggerId);
         $triggerEvent['settings'] = $events[$eventType];
 
@@ -72,10 +72,10 @@ public function newAction ()
                     $success = 1;
 
                     //form is valid so process the data
-                    $keyId = 'new' . hash('sha1', uniqid(mt_rand()));
+                    $keyId = 'new'.hash('sha1', uniqid(mt_rand()));
 
                     //save the properties to session
-                    $actions            = $session->get('mautic.point.' . $triggerId . '.triggerevents.modified');
+                    $actions            = $session->get('mautic.point.'.$triggerId.'.triggerevents.modified');
                     $formData           = $form->getData();
                     $triggerEvent       = array_merge($triggerEvent, $formData);
                     $triggerEvent['id'] = $keyId;
@@ -84,12 +84,12 @@ public function newAction ()
                         $triggerEvent['name'] = $this->get('translator')->trans($triggerEvent['settings']['label']);
                     }
                     $actions[$keyId] = $triggerEvent;
-                    $session->set('mautic.point.' . $triggerId . '.triggerevents.modified', $actions);
+                    $session->set('mautic.point.'.$triggerId.'.triggerevents.modified', $actions);
                 }
             }
         }
 
-        $viewParams = array('type' => $eventType);
+        $viewParams = ['type' => $eventType];
         if ($cancelled || $valid) {
             $closeModal = true;
         } else {
@@ -103,11 +103,11 @@ public function newAction ()
             $viewParams['eventHeader'] = $this->get('translator')->trans($header);
         }
 
-        $passthroughVars = array(
+        $passthroughVars = [
             'mauticContent' => 'pointTriggerEvent',
             'success'       => $success,
-            'route'         => false
-        );
+            'route'         => false,
+        ];
 
         if (!empty($keyId)) {
             //prevent undefined errors
@@ -118,13 +118,12 @@ public function newAction ()
             $template = (empty($triggerEvent['settings']['template'])) ? 'MauticPointBundle:Event:generic.html.php'
                 : $triggerEvent['settings']['template'];
 
-
             $passthroughVars['eventId']   = $keyId;
-            $passthroughVars['eventHtml'] = $this->renderView($template, array(
+            $passthroughVars['eventHtml'] = $this->renderView($template, [
                 'event'     => $triggerEvent,
                 'id'        => $keyId,
-                'sessionId' => $triggerId
-            ));
+                'sessionId' => $triggerId,
+            ]);
         }
 
         if ($closeModal) {
@@ -135,51 +134,51 @@ public function newAction ()
             return $response;
         }
 
-        return $this->ajaxAction(array(
+        return $this->ajaxAction([
             'contentTemplate' => 'MauticPointBundle:Event:form.html.php',
             'viewParameters'  => $viewParams,
-            'passthroughVars' => $passthroughVars
-        ));
+            'passthroughVars' => $passthroughVars,
+        ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int $objectId
      *
      * @return JsonResponse
      */
-    public function editAction ($objectId)
+    public function editAction($objectId)
     {
         $session      = $this->get('session');
         $method       = $this->request->getMethod();
-        $triggerId    = ($method == "POST") ? $this->request->request->get('pointtriggerevent[triggerId]', '', true) : $this->request->query->get('triggerId');
-        $events      = $session->get('mautic.point.' . $triggerId . '.triggerevents.modified', array());
+        $triggerId    = ($method == 'POST') ? $this->request->request->get('pointtriggerevent[triggerId]', '', true) : $this->request->query->get('triggerId');
+        $events       = $session->get('mautic.point.'.$triggerId.'.triggerevents.modified', []);
         $success      = 0;
-        $valid        = $cancelled = false;
+        $valid        = $cancelled        = false;
         $triggerEvent = (array_key_exists($objectId, $events)) ? $events[$objectId] : null;
 
         if ($triggerEvent !== null) {
             $eventType = $triggerEvent['type'];
 
-            $events = $this->getModel('point.trigger')->getEvents();
+            $events                   = $this->getModel('point.trigger')->getEvents();
             $triggerEvent['settings'] = $events[$eventType];
 
             //ajax only for form fields
             if (!$eventType ||
                 !$this->request->isXmlHttpRequest() ||
-                !$this->get('mautic.security')->isGranted(array(
+                !$this->get('mautic.security')->isGranted([
                     'point:triggers:edit',
-                    'point:triggers:create'
-                ), 'MATCH_ONE')
+                    'point:triggers:create',
+                ], 'MATCH_ONE')
             ) {
                 return $this->modalAccessDenied();
             }
 
-            $form = $this->get('form.factory')->create('pointtriggerevent', $triggerEvent, array(
-                'action'   => $this->generateUrl('mautic_pointtriggerevent_action', array('objectAction' => 'edit', 'objectId' => $objectId)),
-                'settings' => $triggerEvent['settings']
-            ));
+            $form = $this->get('form.factory')->create('pointtriggerevent', $triggerEvent, [
+                'action'   => $this->generateUrl('mautic_pointtriggerevent_action', ['objectAction' => 'edit', 'objectId' => $objectId]),
+                'settings' => $triggerEvent['settings'],
+            ]);
             $form->get('triggerId')->setData($triggerId);
             //Check for a submitted form and process it
             if ($method == 'POST') {
@@ -191,7 +190,7 @@ public function editAction ($objectId)
 
                         //save the properties to session
                         $session  = $this->get('session');
-                        $events  = $session->get('mautic.point.' . $triggerId . '.triggerevents.modified');
+                        $events   = $session->get('mautic.point.'.$triggerId.'.triggerevents.modified');
                         $formData = $form->getData();
                         //overwrite with updated data
                         $triggerEvent = array_merge($events[$objectId], $formData);
@@ -200,7 +199,7 @@ public function editAction ($objectId)
                             $triggerEvent['name'] = $this->get('translator')->trans($triggerEvent['settings']['label']);
                         }
                         $events[$objectId] = $triggerEvent;
-                        $session->set('mautic.point.' . $triggerId . '.triggerevents.modified', $events);
+                        $session->set('mautic.point.'.$triggerId.'.triggerevents.modified', $events);
 
                         //generate HTML for the field
                         $keyId = $objectId;
@@ -208,7 +207,7 @@ public function editAction ($objectId)
                 }
             }
 
-            $viewParams = array('type' => $eventType);
+            $viewParams = ['type' => $eventType];
             if ($cancelled || $valid) {
                 $closeModal = true;
             } else {
@@ -221,11 +220,11 @@ public function editAction ($objectId)
                 $viewParams['eventHeader'] = $this->get('translator')->trans($triggerEvent['settings']['label']);
             }
 
-            $passthroughVars = array(
+            $passthroughVars = [
                 'mauticContent' => 'pointTriggerEvent',
                 'success'       => $success,
-                'route'         => false
-            );
+                'route'         => false,
+            ];
 
             if (!empty($keyId)) {
                 $passthroughVars['eventId'] = $keyId;
@@ -238,14 +237,13 @@ public function editAction ($objectId)
                     : $triggerEvent['settings']['template'];
 
                 $passthroughVars['eventId']   = $keyId;
-                $passthroughVars['eventHtml'] = $this->renderView($template, array(
+                $passthroughVars['eventHtml'] = $this->renderView($template, [
                     'event'     => $triggerEvent,
                     'id'        => $keyId,
-                    'sessionId' => $triggerId
-                ));
+                    'sessionId' => $triggerId,
+                ]);
             }
 
-
             if ($closeModal) {
                 //just close the modal
                 $passthroughVars['closeModal'] = 1;
@@ -254,38 +252,38 @@ public function editAction ($objectId)
                 return $response;
             }
 
-            return $this->ajaxAction(array(
+            return $this->ajaxAction([
                 'contentTemplate' => 'MauticPointBundle:Event:form.html.php',
                 'viewParameters'  => $viewParams,
-                'passthroughVars' => $passthroughVars
-            ));
+                'passthroughVars' => $passthroughVars,
+            ]);
         }
 
-        $response = new JsonResponse(array('success' => 0));
+        $response = new JsonResponse(['success' => 0]);
 
         return $response;
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
      * @return JsonResponse
      */
-    public function deleteAction ($objectId)
+    public function deleteAction($objectId)
     {
         $session   = $this->get('session');
         $triggerId = $this->request->get('triggerId');
-        $events   = $session->get('mautic.point.' . $triggerId . '.triggerevents.modified', array());
-        $delete    = $session->get('mautic.point.' . $triggerId . '.triggerevents.deleted', array());
+        $events    = $session->get('mautic.point.'.$triggerId.'.triggerevents.modified', []);
+        $delete    = $session->get('mautic.point.'.$triggerId.'.triggerevents.deleted', []);
 
         //ajax only for form fields
         if (!$this->request->isXmlHttpRequest() ||
-            !$this->get('mautic.security')->isGranted(array(
+            !$this->get('mautic.security')->isGranted([
                 'point:triggers:edit',
-                'point:triggers:create'
-            ), 'MATCH_ONE')
+                'point:triggers:create',
+            ], 'MATCH_ONE')
         ) {
             return $this->accessDenied();
         }
@@ -296,7 +294,7 @@ public function deleteAction ($objectId)
             //add the field to the delete list
             if (!in_array($objectId, $delete)) {
                 $delete[] = $objectId;
-                $session->set('mautic.point.' . $triggerId . '.triggerevents.deleted', $delete);
+                $session->set('mautic.point.'.$triggerId.'.triggerevents.deleted', $delete);
             }
 
             $template = (empty($triggerEvent['settings']['template'])) ? 'MauticPointBundle:Event:generic.html.php'
@@ -307,21 +305,21 @@ public function deleteAction ($objectId)
             $blank        = $entity->convertToArray();
             $triggerEvent = array_merge($blank, $triggerEvent);
 
-            $dataArray = array(
+            $dataArray = [
                 'mauticContent' => 'pointTriggerEvent',
                 'success'       => 1,
-                'target'        => '#triggerEvent' . $objectId,
+                'target'        => '#triggerEvent'.$objectId,
                 'route'         => false,
                 'eventId'       => $objectId,
-                'eventHtml'     => $this->renderView($template, array(
+                'eventHtml'     => $this->renderView($template, [
                     'event'     => $triggerEvent,
                     'id'        => $objectId,
                     'deleted'   => true,
-                    'sessionId' => $triggerId
-                ))
-            );
+                    'sessionId' => $triggerId,
+                ]),
+            ];
         } else {
-            $dataArray = array('success' => 0);
+            $dataArray = ['success' => 0];
         }
 
         $response = new JsonResponse($dataArray);
@@ -330,25 +328,25 @@ public function deleteAction ($objectId)
     }
 
     /**
-     * Undeletes the entity
+     * Undeletes the entity.
      *
      * @param int $objectId
      *
      * @return JsonResponse
      */
-    public function undeleteAction ($objectId)
+    public function undeleteAction($objectId)
     {
         $session   = $this->get('session');
         $triggerId = $this->request->get('triggerId');
-        $events   = $session->get('mautic.point.' . $triggerId . '.triggerevents.modified', array());
-        $delete    = $session->get('mautic.point.' . $triggerId . '.triggerevents.deleted', array());
+        $events    = $session->get('mautic.point.'.$triggerId.'.triggerevents.modified', []);
+        $delete    = $session->get('mautic.point.'.$triggerId.'.triggerevents.deleted', []);
 
         //ajax only for form fields
         if (!$this->request->isXmlHttpRequest() ||
-            !$this->get('mautic.security')->isGranted(array(
+            !$this->get('mautic.security')->isGranted([
                 'point:triggers:edit',
-                'point:triggers:create'
-            ), 'MATCH_ONE')
+                'point:triggers:create',
+            ], 'MATCH_ONE')
         ) {
             return $this->accessDenied();
         }
@@ -361,7 +359,7 @@ public function undeleteAction ($objectId)
             if (in_array($objectId, $delete)) {
                 $key = array_search($objectId, $delete);
                 unset($delete[$key]);
-                $session->set('mautic.point.' . $triggerId . '.triggerevents.deleted', $delete);
+                $session->set('mautic.point.'.$triggerId.'.triggerevents.deleted', $delete);
             }
 
             $template = (empty($triggerEvent['settings']['template'])) ? 'MauticPointBundle:Event:generic.html.php'
@@ -372,21 +370,21 @@ public function undeleteAction ($objectId)
             $blank        = $entity->convertToArray();
             $triggerEvent = array_merge($blank, $triggerEvent);
 
-            $dataArray = array(
+            $dataArray = [
                 'mauticContent' => 'pointTriggerEvent',
                 'success'       => 1,
-                'target'        => '#triggerEvent' . $objectId,
+                'target'        => '#triggerEvent'.$objectId,
                 'route'         => false,
                 'eventId'       => $objectId,
-                'eventHtml'     => $this->renderView($template, array(
+                'eventHtml'     => $this->renderView($template, [
                     'event'     => $triggerEvent,
                     'id'        => $objectId,
                     'deleted'   => false,
-                    'triggerId' => $triggerId
-                ))
-            );
+                    'triggerId' => $triggerId,
+                ]),
+            ];
         } else {
-            $dataArray = array('success' => 0);
+            $dataArray = ['success' => 0];
         }
 
         $response = new JsonResponse($dataArray);
diff --git a/app/bundles/PointBundle/Entity/LeadPointLog.php b/app/bundles/PointBundle/Entity/LeadPointLog.php
index d77245d387e..2ab214b57a5 100644
--- a/app/bundles/PointBundle/Entity/LeadPointLog.php
+++ b/app/bundles/PointBundle/Entity/LeadPointLog.php
@@ -1,26 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class LeadPointLog
- *
- * @package Mautic\PointBundle\Entity
+ * Class LeadPointLog.
  */
 class LeadPointLog
 {
-
     /**
      * @var Point
      **/
@@ -44,7 +41,7 @@ class LeadPointLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -69,7 +66,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return mixed
      */
-    public function getDateFired ()
+    public function getDateFired()
     {
         return $this->dateFired;
     }
@@ -77,7 +74,7 @@ public function getDateFired ()
     /**
      * @param mixed $dateFired
      */
-    public function setDateFired ($dateFired)
+    public function setDateFired($dateFired)
     {
         $this->dateFired = $dateFired;
     }
@@ -85,7 +82,7 @@ public function setDateFired ($dateFired)
     /**
      * @return mixed
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
@@ -93,7 +90,7 @@ public function getIpAddress ()
     /**
      * @param mixed $ipAddress
      */
-    public function setIpAddress ($ipAddress)
+    public function setIpAddress($ipAddress)
     {
         $this->ipAddress = $ipAddress;
     }
@@ -101,7 +98,7 @@ public function setIpAddress ($ipAddress)
     /**
      * @return mixed
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -109,7 +106,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead ($lead)
+    public function setLead($lead)
     {
         $this->lead = $lead;
     }
@@ -117,7 +114,7 @@ public function setLead ($lead)
     /**
      * @return mixed
      */
-    public function getPoint ()
+    public function getPoint()
     {
         return $this->point;
     }
@@ -125,7 +122,7 @@ public function getPoint ()
     /**
      * @param mixed $point
      */
-    public function setPoint ($point)
+    public function setPoint($point)
     {
         $this->point = $point;
     }
diff --git a/app/bundles/PointBundle/Entity/LeadPointLogRepository.php b/app/bundles/PointBundle/Entity/LeadPointLogRepository.php
index 7375ff1e534..bf8704e5b4d 100644
--- a/app/bundles/PointBundle/Entity/LeadPointLogRepository.php
+++ b/app/bundles/PointBundle/Entity/LeadPointLogRepository.php
@@ -1,25 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class LeadPointLogRepository
+ * Class LeadPointLogRepository.
  */
 class LeadPointLogRepository extends CommonRepository
 {
-
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -33,7 +32,7 @@ public function updateLead($fromLeadId, $toLeadId)
             ->where('pl.lead_id = '.$toLeadId)
             ->execute()
             ->fetchAll();
-        $actions = array();
+        $actions = [];
         foreach ($results as $r) {
             $actions[] = $r['point_id'];
         }
@@ -57,4 +56,4 @@ public function updateLead($fromLeadId, $toLeadId)
             $q->execute();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PointBundle/Entity/LeadTriggerLog.php b/app/bundles/PointBundle/Entity/LeadTriggerLog.php
index 292fadca3e0..e1cdd1a44be 100644
--- a/app/bundles/PointBundle/Entity/LeadTriggerLog.php
+++ b/app/bundles/PointBundle/Entity/LeadTriggerLog.php
@@ -1,26 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class LeadTriggerLog
- *
- * @package Mautic\PointBundle\Entity
+ * Class LeadTriggerLog.
  */
 class LeadTriggerLog
 {
-
     /**
      * @var TriggerEvent
      **/
@@ -44,7 +41,7 @@ class LeadTriggerLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -69,7 +66,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return mixed
      */
-    public function getDateFired ()
+    public function getDateFired()
     {
         return $this->dateFired;
     }
@@ -77,7 +74,7 @@ public function getDateFired ()
     /**
      * @param mixed $dateFired
      */
-    public function setDateFired ($dateFired)
+    public function setDateFired($dateFired)
     {
         $this->dateFired = $dateFired;
     }
@@ -85,7 +82,7 @@ public function setDateFired ($dateFired)
     /**
      * @return mixed
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
@@ -93,7 +90,7 @@ public function getIpAddress ()
     /**
      * @param mixed $ipAddress
      */
-    public function setIpAddress ($ipAddress)
+    public function setIpAddress($ipAddress)
     {
         $this->ipAddress = $ipAddress;
     }
@@ -101,7 +98,7 @@ public function setIpAddress ($ipAddress)
     /**
      * @return mixed
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -109,7 +106,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead ($lead)
+    public function setLead($lead)
     {
         $this->lead = $lead;
     }
@@ -117,7 +114,7 @@ public function setLead ($lead)
     /**
      * @return mixed
      */
-    public function getEvent ()
+    public function getEvent()
     {
         return $this->event;
     }
@@ -125,7 +122,7 @@ public function getEvent ()
     /**
      * @param mixed $event
      */
-    public function setEvent ($event)
+    public function setEvent($event)
     {
         $this->event = $event;
     }
diff --git a/app/bundles/PointBundle/Entity/LeadTriggerLogRepository.php b/app/bundles/PointBundle/Entity/LeadTriggerLogRepository.php
index fca7b5677ee..90939493877 100644
--- a/app/bundles/PointBundle/Entity/LeadTriggerLogRepository.php
+++ b/app/bundles/PointBundle/Entity/LeadTriggerLogRepository.php
@@ -1,25 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class LeadTriggerLogRepository
+ * Class LeadTriggerLogRepository.
  */
 class LeadTriggerLogRepository extends CommonRepository
 {
-
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -33,7 +32,7 @@ public function updateLead($fromLeadId, $toLeadId)
             ->where('pl.lead_id = '.$toLeadId)
             ->execute()
             ->fetchAll();
-        $events  = array();
+        $events = [];
         foreach ($results as $r) {
             $events[] = $r['event_id'];
         }
@@ -57,4 +56,4 @@ public function updateLead($fromLeadId, $toLeadId)
             $q->execute();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PointBundle/Entity/Point.php b/app/bundles/PointBundle/Entity/Point.php
index 2bb7fa0140f..61f23730d69 100644
--- a/app/bundles/PointBundle/Entity/Point.php
+++ b/app/bundles/PointBundle/Entity/Point.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,13 +19,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Point
- *
- * @package Mautic\PointBundle\Entity
+ * Class Point.
  */
 class Point extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -63,7 +61,7 @@ class Point extends FormEntity
     /**
      * @var array
      */
-    private $properties = array();
+    private $properties = [];
 
     /**
      * @var ArrayCollection
@@ -83,7 +81,7 @@ public function __clone()
     }
 
     /**
-     * Construct
+     * Construct.
      */
     public function __construct()
     {
@@ -93,13 +91,13 @@ public function __construct()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('points')
             ->setCustomRepositoryClass('Mautic\PointBundle\Entity\PointRepository')
-            ->addIndex(array('type'), 'point_type_search');
+            ->addIndex(['type'], 'point_type_search');
 
         $builder->addIdColumns();
 
@@ -126,19 +124,19 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('name', new Assert\NotBlank(array(
-            'message' => 'mautic.core.name.required'
-        )));
+        $metadata->addPropertyConstraint('name', new Assert\NotBlank([
+            'message' => 'mautic.core.name.required',
+        ]));
 
-        $metadata->addPropertyConstraint('type', new Assert\NotBlank(array(
-            'message' => 'mautic.point.type.notblank'
-        )));
+        $metadata->addPropertyConstraint('type', new Assert\NotBlank([
+            'message' => 'mautic.point.type.notblank',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -146,43 +144,43 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('point')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'category',
                     'type',
-                    'description'
-                )
+                    'description',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'publishUp',
                     'publishDown',
                     'delta',
-                    'properties'
-                )
+                    'properties',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set properties
+     * Set properties.
      *
      * @param array $properties
      *
      * @return Action
      */
-    public function setProperties ($properties)
+    public function setProperties($properties)
     {
         $this->isChanged('properties', $properties);
 
@@ -192,23 +190,23 @@ public function setProperties ($properties)
     }
 
     /**
-     * Get properties
+     * Get properties.
      *
      * @return array
      */
-    public function getProperties ()
+    public function getProperties()
     {
         return $this->properties;
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
      * @return Action
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->isChanged('type', $type);
         $this->type = $type;
@@ -217,11 +215,11 @@ public function setType ($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
@@ -229,19 +227,19 @@ public function getType ()
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Action
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -250,23 +248,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Action
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -275,23 +273,23 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Add log
+     * Add log.
      *
      * @param LeadPointLog $log
      *
      * @return Log
      */
-    public function addLog (LeadPointLog $log)
+    public function addLog(LeadPointLog $log)
     {
         $this->log[] = $log;
 
@@ -299,33 +297,33 @@ public function addLog (LeadPointLog $log)
     }
 
     /**
-     * Remove log
+     * Remove log.
      *
      * @param LeadPointLog $log
      */
-    public function removeLog (LeadPointLog $log)
+    public function removeLog(LeadPointLog $log)
     {
         $this->log->removeElement($log);
     }
 
     /**
-     * Get log
+     * Get log.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getLog ()
+    public function getLog()
     {
         return $this->log;
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
      *
      * @return Point
      */
-    public function setPublishUp ($publishUp)
+    public function setPublishUp($publishUp)
     {
         $this->isChanged('publishUp', $publishUp);
         $this->publishUp = $publishUp;
@@ -334,23 +332,23 @@ public function setPublishUp ($publishUp)
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
-    public function getPublishUp ()
+    public function getPublishUp()
     {
         return $this->publishUp;
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
      *
      * @return Point
      */
-    public function setPublishDown ($publishDown)
+    public function setPublishDown($publishDown)
     {
         $this->isChanged('publishDown', $publishDown);
         $this->publishDown = $publishDown;
@@ -359,11 +357,11 @@ public function setPublishDown ($publishDown)
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
-    public function getPublishDown ()
+    public function getPublishDown()
     {
         return $this->publishDown;
     }
@@ -371,7 +369,7 @@ public function getPublishDown ()
     /**
      * @return mixed
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
@@ -379,7 +377,7 @@ public function getCategory ()
     /**
      * @param mixed $category
      */
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->category = $category;
     }
@@ -387,7 +385,7 @@ public function setCategory ($category)
     /**
      * @return mixed
      */
-    public function getDelta ()
+    public function getDelta()
     {
         return $this->delta;
     }
@@ -395,8 +393,8 @@ public function getDelta ()
     /**
      * @param mixed $delta
      */
-    public function setDelta ($delta)
+    public function setDelta($delta)
     {
-        $this->delta = (int)$delta;
+        $this->delta = (int) $delta;
     }
 }
diff --git a/app/bundles/PointBundle/Entity/PointRepository.php b/app/bundles/PointBundle/Entity/PointRepository.php
index 960f71b05db..7b7d2a18138 100644
--- a/app/bundles/PointBundle/Entity/PointRepository.php
+++ b/app/bundles/PointBundle/Entity/PointRepository.php
@@ -1,33 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Entity;
 
-use Doctrine\ORM\Query;
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * Class PointRepository
+ * Class PointRepository.
  */
 class PointRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this->_em
             ->createQueryBuilder()
-            ->select($this->getTableAlias() . ', cat')
+            ->select($this->getTableAlias().', cat')
             ->from('MauticPointBundle:Point', $this->getTableAlias())
             ->leftJoin($this->getTableAlias().'.category', 'cat');
 
@@ -45,7 +42,7 @@ public function getTableAlias()
     }
 
     /**
-     * Get array of published actions based on type
+     * Get array of published actions based on type.
      *
      * @param string $type
      *
@@ -76,8 +73,8 @@ public function getCompletedLeadActions($type, $leadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('p.*')
-            ->from(MAUTIC_TABLE_PREFIX . 'point_lead_action_log', 'x')
-            ->innerJoin('x', MAUTIC_TABLE_PREFIX . 'points', 'p', 'x.point_id = p.id');
+            ->from(MAUTIC_TABLE_PREFIX.'point_lead_action_log', 'x')
+            ->innerJoin('x', MAUTIC_TABLE_PREFIX.'points', 'p', 'x.point_id = p.id');
 
         //make sure the published up and down dates are good
         $q->where(
@@ -90,7 +87,7 @@ public function getCompletedLeadActions($type, $leadId)
 
         $results = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
 
         foreach ($results as $r) {
             $return[$r['id']] = $r;
@@ -99,7 +96,7 @@ public function getCompletedLeadActions($type, $leadId)
         return $return;
     }
     /**
-     * @param int    $leadId
+     * @param int $leadId
      *
      * @return array
      */
@@ -107,8 +104,8 @@ public function getCompletedLeadActionsByLeadId($leadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('p.*')
-            ->from(MAUTIC_TABLE_PREFIX . 'point_lead_action_log', 'x')
-            ->innerJoin('x', MAUTIC_TABLE_PREFIX . 'points', 'p', 'x.point_id = p.id');
+            ->from(MAUTIC_TABLE_PREFIX.'point_lead_action_log', 'x')
+            ->innerJoin('x', MAUTIC_TABLE_PREFIX.'points', 'p', 'x.point_id = p.id');
 
         //make sure the published up and down dates are good
         $q->where(
@@ -119,7 +116,7 @@ public function getCompletedLeadActionsByLeadId($leadId)
 
         $results = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
 
         foreach ($results as $r) {
             $return[$r['id']] = $r;
@@ -132,10 +129,10 @@ public function getCompletedLeadActionsByLeadId($leadId)
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        return $this->addStandardCatchAllWhereClause($q, $filter, array(
+        return $this->addStandardCatchAllWhereClause($q, $filter, [
             'p.name',
-            'p.description'
-        ));
+            'p.description',
+        ]);
     }
 
     /**
diff --git a/app/bundles/PointBundle/Entity/Trigger.php b/app/bundles/PointBundle/Entity/Trigger.php
index e78bd5d54b2..cbae4363f41 100644
--- a/app/bundles/PointBundle/Entity/Trigger.php
+++ b/app/bundles/PointBundle/Entity/Trigger.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,13 +19,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Trigger
- *
- * @package Mautic\PointBundle\Entity
+ * Class Trigger.
  */
 class Trigger extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -83,9 +81,9 @@ public function __clone()
     }
 
     /**
-     * Constructor
+     * Constructor.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->events = new ArrayCollection();
     }
@@ -93,7 +91,7 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -118,7 +116,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
 
         $builder->createOneToMany('events', 'TriggerEvent')
             ->setIndexBy('id')
-            ->setOrderBy(array('order' => 'ASC'))
+            ->setOrderBy(['order' => 'ASC'])
             ->mappedBy('trigger')
             ->cascadeAll()
             ->fetchExtraLazy()
@@ -128,15 +126,15 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('name', new Assert\NotBlank(array(
-            'message' => 'mautic.core.name.required'
-        )));
+        $metadata->addPropertyConstraint('name', new Assert\NotBlank([
+            'message' => 'mautic.core.name.required',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -144,21 +142,21 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('trigger')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'category',
-                    'description'
-                )
+                    'description',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'publishUp',
                     'publishDown',
                     'points',
                     'color',
-                    'events'
-                )
+                    'events',
+                ]
             )
             ->build();
     }
@@ -167,36 +165,36 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
      * @param string $prop
      * @param mixed  $val
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'events') {
             //changes are already computed so just add them
             $this->changes[$prop][$val[0]] = $val[1];
         } elseif ($current != $val) {
-            $this->changes[$prop] = array($current, $val);
+            $this->changes[$prop] = [$current, $val];
         }
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Trigger
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -205,23 +203,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Trigger
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -230,27 +228,27 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Add events
+     * Add events.
      *
      * @param              $key
      * @param TriggerEvent $event
      *
      * @return Point
      */
-    public function addTriggerEvent ($key, TriggerEvent $event)
+    public function addTriggerEvent($key, TriggerEvent $event)
     {
         if ($changes = $event->getChanges()) {
-            $this->isChanged('events', array($key, $changes));
+            $this->isChanged('events', [$key, $changes]);
         }
         $this->events[$key] = $event;
 
@@ -258,33 +256,33 @@ public function addTriggerEvent ($key, TriggerEvent $event)
     }
 
     /**
-     * Remove events
+     * Remove events.
      *
      * @param TriggerEvent $event
      */
-    public function removeTriggerEvent (TriggerEvent $event)
+    public function removeTriggerEvent(TriggerEvent $event)
     {
         $this->events->removeElement($event);
     }
 
     /**
-     * Get events
+     * Get events.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getEvents ()
+    public function getEvents()
     {
         return $this->events;
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
      *
      * @return Point
      */
-    public function setPublishUp ($publishUp)
+    public function setPublishUp($publishUp)
     {
         $this->isChanged('publishUp', $publishUp);
         $this->publishUp = $publishUp;
@@ -293,23 +291,23 @@ public function setPublishUp ($publishUp)
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
-    public function getPublishUp ()
+    public function getPublishUp()
     {
         return $this->publishUp;
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
      *
      * @return Point
      */
-    public function setPublishDown ($publishDown)
+    public function setPublishDown($publishDown)
     {
         $this->isChanged('publishDown', $publishDown);
         $this->publishDown = $publishDown;
@@ -318,11 +316,11 @@ public function setPublishDown ($publishDown)
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
-    public function getPublishDown ()
+    public function getPublishDown()
     {
         return $this->publishDown;
     }
@@ -330,7 +328,7 @@ public function getPublishDown ()
     /**
      * @return mixed
      */
-    public function getPoints ()
+    public function getPoints()
     {
         return $this->points;
     }
@@ -338,7 +336,7 @@ public function getPoints ()
     /**
      * @param mixed $points
      */
-    public function setPoints ($points)
+    public function setPoints($points)
     {
         $this->isChanged('points', $points);
         $this->points = $points;
@@ -347,7 +345,7 @@ public function setPoints ($points)
     /**
      * @return mixed
      */
-    public function getColor ()
+    public function getColor()
     {
         return $this->color;
     }
@@ -355,7 +353,7 @@ public function getColor ()
     /**
      * @param mixed $color
      */
-    public function setColor ($color)
+    public function setColor($color)
     {
         $this->color = $color;
     }
@@ -363,7 +361,7 @@ public function setColor ($color)
     /**
      * @return mixed
      */
-    public function getTriggerExistingLeads ()
+    public function getTriggerExistingLeads()
     {
         return $this->triggerExistingLeads;
     }
@@ -371,7 +369,7 @@ public function getTriggerExistingLeads ()
     /**
      * @param mixed $triggerExistingLeads
      */
-    public function setTriggerExistingLeads ($triggerExistingLeads)
+    public function setTriggerExistingLeads($triggerExistingLeads)
     {
         $this->triggerExistingLeads = $triggerExistingLeads;
     }
@@ -379,7 +377,7 @@ public function setTriggerExistingLeads ($triggerExistingLeads)
     /**
      * @return mixed
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
@@ -387,7 +385,7 @@ public function getCategory ()
     /**
      * @param mixed $category
      */
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->category = $category;
     }
diff --git a/app/bundles/PointBundle/Entity/TriggerEvent.php b/app/bundles/PointBundle/Entity/TriggerEvent.php
index fa0262f148e..58690114e9c 100644
--- a/app/bundles/PointBundle/Entity/TriggerEvent.php
+++ b/app/bundles/PointBundle/Entity/TriggerEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,16 +14,12 @@
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class TriggerEvent
- *
- * @package Mautic\PointBundle\Entity
+ * Class TriggerEvent.
  */
 class TriggerEvent
 {
-
     /**
      * @var int
      */
@@ -51,7 +48,7 @@ class TriggerEvent
     /**
      * @var array
      */
-    private $properties = array();
+    private $properties = [];
 
     /**
      * @var Trigger
@@ -69,9 +66,9 @@ class TriggerEvent
     private $changes;
 
     /**
-     * Construct
+     * Construct.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->log = new ArrayCollection();
     }
@@ -79,13 +76,13 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('point_trigger_events')
             ->setCustomRepositoryClass('Mautic\PointBundle\Entity\TriggerEventRepository')
-            ->addIndex(array('type'), 'trigger_type_search');
+            ->addIndex(['type'], 'trigger_type_search');
 
         $builder->addIdColumns();
 
@@ -110,12 +107,10 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->cascadeRemove()
             ->fetchExtraLazy()
             ->build();
-
-
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -123,14 +118,14 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('trigger')
             ->addProperties(
-                array(
+                [
                     'id',
                     'name',
                     'description',
                     'type',
                     'order',
-                    'properties'
-                )
+                    'properties',
+                ]
             )
             ->build();
     }
@@ -139,39 +134,39 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
      * @param $prop
      * @param $val
      */
-    private function isChanged ($prop, $val)
+    private function isChanged($prop, $val)
     {
         if ($this->$prop != $val) {
-            $this->changes[$prop] = array($this->$prop, $val);
+            $this->changes[$prop] = [$this->$prop, $val];
         }
     }
 
     /**
      * @return array
      */
-    public function getChanges ()
+    public function getChanges()
     {
         return $this->changes;
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set order
+     * Set order.
      *
-     * @param integer $order
+     * @param int $order
      *
      * @return TriggerEvent
      */
-    public function setOrder ($order)
+    public function setOrder($order)
     {
         $this->isChanged('order', $order);
 
@@ -181,23 +176,23 @@ public function setOrder ($order)
     }
 
     /**
-     * Get order
+     * Get order.
      *
-     * @return integer
+     * @return int
      */
-    public function getOrder ()
+    public function getOrder()
     {
         return $this->order;
     }
 
     /**
-     * Set properties
+     * Set properties.
      *
      * @param array $properties
      *
      * @return TriggerEvent
      */
-    public function setProperties ($properties)
+    public function setProperties($properties)
     {
         $this->isChanged('properties', $properties);
 
@@ -207,23 +202,23 @@ public function setProperties ($properties)
     }
 
     /**
-     * Get properties
+     * Get properties.
      *
      * @return array
      */
-    public function getProperties ()
+    public function getProperties()
     {
         return $this->properties;
     }
 
     /**
-     * Set trigger
+     * Set trigger.
      *
      * @param Trigger $trigger
      *
      * @return TriggerTriggerEvent
      */
-    public function setTrigger (Trigger $trigger)
+    public function setTrigger(Trigger $trigger)
     {
         $this->trigger = $trigger;
 
@@ -231,23 +226,23 @@ public function setTrigger (Trigger $trigger)
     }
 
     /**
-     * Get trigger
+     * Get trigger.
      *
      * @return Trigger
      */
-    public function getTrigger ()
+    public function getTrigger()
     {
         return $this->trigger;
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $type
      *
      * @return TriggerEvent
      */
-    public function setType ($type)
+    public function setType($type)
     {
         $this->isChanged('type', $type);
         $this->type = $type;
@@ -256,11 +251,11 @@ public function setType ($type)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
@@ -268,19 +263,19 @@ public function getType ()
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return TriggerEvent
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -289,23 +284,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return TriggerEvent
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -314,23 +309,23 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Add log
+     * Add log.
      *
      * @param LeadTriggerLog $log
      *
      * @return Log
      */
-    public function addLog (LeadTriggerLog $log)
+    public function addLog(LeadTriggerLog $log)
     {
         $this->log[] = $log;
 
@@ -338,22 +333,22 @@ public function addLog (LeadTriggerLog $log)
     }
 
     /**
-     * Remove log
+     * Remove log.
      *
      * @param LeadTriggerLog $log
      */
-    public function removeLog (LeadTriggerLog $log)
+    public function removeLog(LeadTriggerLog $log)
     {
         $this->log->removeElement($log);
     }
 
     /**
-     * Get log
+     * Get log.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getLog ()
+    public function getLog()
     {
         return $this->log;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PointBundle/Entity/TriggerEventRepository.php b/app/bundles/PointBundle/Entity/TriggerEventRepository.php
index 5f93962ff10..89aa69d974a 100644
--- a/app/bundles/PointBundle/Entity/TriggerEventRepository.php
+++ b/app/bundles/PointBundle/Entity/TriggerEventRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,15 +13,14 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * TriggerEventRepository
+ * TriggerEventRepository.
  */
 class TriggerEventRepository extends CommonRepository
 {
-
     /**
-     * Get array of published triggers based on point total
+     * Get array of published triggers based on point total.
      *
-     * @param int      $points
+     * @param int $points
      *
      * @return array
      */
@@ -44,7 +44,7 @@ public function getPublishedByPointTotal($points)
     }
 
     /**
-     * Get array of published actions based on type
+     * Get array of published actions based on type.
      *
      * @param string $type
      *
@@ -66,6 +66,7 @@ public function getPublishedByType($type)
             ->setParameter('type', $type);
 
         $results = $q->getQuery()->getResult();
+
         return $results;
     }
 
@@ -78,16 +79,16 @@ public function getLeadTriggeredEvents($leadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('e.*')
-            ->from(MAUTIC_TABLE_PREFIX . 'point_lead_event_log', 'x')
-            ->innerJoin('x', MAUTIC_TABLE_PREFIX . 'point_trigger_events', 'e', 'x.event_id = e.id')
-            ->innerJoin('e', MAUTIC_TABLE_PREFIX . 'point_triggers', 't', 'e.trigger_id = t.id');
+            ->from(MAUTIC_TABLE_PREFIX.'point_lead_event_log', 'x')
+            ->innerJoin('x', MAUTIC_TABLE_PREFIX.'point_trigger_events', 'e', 'x.event_id = e.id')
+            ->innerJoin('e', MAUTIC_TABLE_PREFIX.'point_triggers', 't', 'e.trigger_id = t.id');
 
         //make sure the published up and down dates are good
         $q->where($q->expr()->eq('x.lead_id', (int) $leadId));
 
         $results = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
 
         foreach ($results as $r) {
             $return[$r['id']] = $r;
@@ -96,7 +97,6 @@ public function getLeadTriggeredEvents($leadId)
         return $return;
     }
 
-
     /**
      * @param int $eventId
      *
@@ -107,11 +107,11 @@ public function getLeadsForEvent($eventId)
         $results = $this->_em->getConnection()->createQueryBuilder()
             ->select('e.lead_id')
             ->from(MAUTIC_TABLE_PREFIX.'point_lead_event_log', 'e')
-            ->where('e.event_id = ' . (int) $eventId)
+            ->where('e.event_id = '.(int) $eventId)
             ->execute()
             ->fetchAll();
 
-        $return = array();
+        $return = [];
 
         foreach ($results as $r) {
             $return[] = $r['lead_id'];
diff --git a/app/bundles/PointBundle/Entity/TriggerRepository.php b/app/bundles/PointBundle/Entity/TriggerRepository.php
index acea8ca3477..71aa987c0b5 100644
--- a/app/bundles/PointBundle/Entity/TriggerRepository.php
+++ b/app/bundles/PointBundle/Entity/TriggerRepository.php
@@ -1,32 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Entity;
 
-use Doctrine\ORM\Query;
-use Doctrine\ORM\Tools\Pagination\Paginator;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class TriggerRepository
+ * Class TriggerRepository.
  */
 class TriggerRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this->_em
             ->createQueryBuilder()
-            ->select($this->getTableAlias() . ', cat')
+            ->select($this->getTableAlias().', cat')
             ->from('MauticPointBundle:Trigger', $this->getTableAlias())
             ->leftJoin($this->getTableAlias().'.category', 'cat');
 
@@ -36,7 +34,7 @@ public function getEntities($args = array())
     }
 
     /**
-     * Get a list of published triggers with color and points
+     * Get a list of published triggers with color and points.
      *
      * @return array
      */
@@ -68,10 +66,10 @@ public function getTableAlias()
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        return $this->addStandardCatchAllWhereClause($q, $filter, array(
+        return $this->addStandardCatchAllWhereClause($q, $filter, [
             't.name',
-            't.description'
-        ));
+            't.description',
+        ]);
     }
 
     /**
diff --git a/app/bundles/PointBundle/Event/PointActionEvent.php b/app/bundles/PointBundle/Event/PointActionEvent.php
index d13550deb07..f6380ff4848 100644
--- a/app/bundles/PointBundle/Event/PointActionEvent.php
+++ b/app/bundles/PointBundle/Event/PointActionEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\PointBundle\Entity\Point;
 
 /**
- * Class PointActionEvent
+ * Class PointActionEvent.
  */
 class PointActionEvent extends CommonEvent
 {
@@ -30,7 +31,7 @@ class PointActionEvent extends CommonEvent
 
     /**
      * @param Point $point
-     * @param Lead $lead
+     * @param Lead  $lead
      */
     public function __construct(Point &$point, Lead &$lead)
     {
@@ -39,7 +40,7 @@ public function __construct(Point &$point, Lead &$lead)
     }
 
     /**
-     * Returns the Point entity
+     * Returns the Point entity.
      *
      * @return Point
      */
@@ -49,7 +50,7 @@ public function getPoint()
     }
 
     /**
-     * Sets the Point entity
+     * Sets the Point entity.
      *
      * @param Point $point
      */
@@ -59,7 +60,7 @@ public function setPoint(Point $point)
     }
 
     /**
-     * Returns the Lead entity
+     * Returns the Lead entity.
      *
      * @return Lead
      */
@@ -69,7 +70,7 @@ public function getLead()
     }
 
     /**
-     * Sets the Lead entity
+     * Sets the Lead entity.
      *
      * @param $lead
      */
diff --git a/app/bundles/PointBundle/Event/PointBuilderEvent.php b/app/bundles/PointBundle/Event/PointBuilderEvent.php
index 686dcde0336..23e09de7c51 100644
--- a/app/bundles/PointBundle/Event/PointBuilderEvent.php
+++ b/app/bundles/PointBundle/Event/PointBuilderEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,15 +15,14 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class PointBuilderEvent
+ * Class PointBuilderEvent.
  */
 class PointBuilderEvent extends Event
 {
-
     /**
      * @var array
      */
-    private $actions = array();
+    private $actions = [];
 
     /**
      * @var TranslatorInterface
@@ -42,26 +42,25 @@ public function __construct(TranslatorInterface $translator)
      *
      * @param string $key    - a unique identifier; it is recommended that it be namespaced i.e. lead.action
      * @param array  $action - can contain the following keys:
-     *  'label'           => (required) what to display in the list
-     *  'description'     => (optional) short description of event
-     *  'template'        => (optional) template to use for the action's HTML in the point builder
-     *      i.e AcmeMyBundle:PointAction:theaction.html.php
-     *  'formType'        => (optional) name of the form type SERVICE for the action; will use a default form with point change only
-     *  'formTypeOptions' => (optional) array of options to pass to formType
-     *  'callback'        => (optional) callback function that will be passed when the action is triggered; return true to
+     *                       'label'           => (required) what to display in the list
+     *                       'description'     => (optional) short description of event
+     *                       'template'        => (optional) template to use for the action's HTML in the point builder
+     *                       i.e AcmeMyBundle:PointAction:theaction.html.php
+     *                       'formType'        => (optional) name of the form type SERVICE for the action; will use a default form with point change only
+     *                       'formTypeOptions' => (optional) array of options to pass to formType
+     *                       'callback'        => (optional) callback function that will be passed when the action is triggered; return true to
      *                       change the configured points or false to ignore the action
-     *      The callback function can receive the following arguments by name (via ReflectionMethod::invokeArgs())
-     *          Mautic\CoreBundle\Factory\MauticFactory $factory
-     *          Mautic\LeadBundle\Entity\Lead $lead
-     *          $eventDetails - variable sent from firing function to call back function
-     *          array $action = array(
-     *              'id' => int
-     *              'type' => string
-     *              'name' => string
-     *              'properties' => array()
-     *         )
+     *                       The callback function can receive the following arguments by name (via ReflectionMethod::invokeArgs())
+     *                       Mautic\CoreBundle\Factory\MauticFactory $factory
+     *                       Mautic\LeadBundle\Entity\Lead $lead
+     *                       $eventDetails - variable sent from firing function to call back function
+     *                       array $action = array(
+     *                       'id' => int
+     *                       'type' => string
+     *                       'name' => string
+     *                       'properties' => array()
+     *                       )
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     public function addAction($key, array $action)
@@ -72,8 +71,8 @@ public function addAction($key, array $action)
 
         //check for required keys and that given functions are callable
         $this->verifyComponent(
-            array('group', 'label'),
-            array('callback'),
+            ['group', 'label'],
+            ['callback'],
             $action
         );
 
@@ -85,7 +84,7 @@ public function addAction($key, array $action)
     }
 
     /**
-     * Get actions
+     * Get actions.
      *
      * @return array
      */
@@ -95,31 +94,34 @@ public function getActions()
             return strnatcasecmp(
                 $a['label'], $b['label']);
         });
+
         return $this->actions;
     }
 
     /**
-     * Gets a list of actions supported by the choice form field
+     * Gets a list of actions supported by the choice form field.
      *
      * @return array
      */
     public function getActionList()
     {
-        $list = array();
+        $list    = [];
         $actions = $this->getActions();
         foreach ($actions as $k => $a) {
             $list[$k] = $a['label'];
         }
+
         return $list;
     }
 
     public function getActionChoices()
     {
-        $choices = array();
+        $choices = [];
         $actions = $this->getActions();
         foreach ($this->actions as $k => $c) {
             $choices[$c['group']][$k] = $c['label'];
         }
+
         return $choices;
     }
 
@@ -128,7 +130,6 @@ public function getActionChoices()
      * @param array $methods
      * @param array $component
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     private function verifyComponent(array $keys, array $methods, array $component)
@@ -141,7 +142,7 @@ private function verifyComponent(array $keys, array $methods, array $component)
 
         foreach ($methods as $m) {
             if (isset($component[$m]) && !is_callable($component[$m], true)) {
-                throw new InvalidArgumentException($component[$m] . ' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
+                throw new InvalidArgumentException($component[$m].' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
             }
         }
     }
diff --git a/app/bundles/PointBundle/Event/PointEvent.php b/app/bundles/PointBundle/Event/PointEvent.php
index 79b50d063b6..4b8065416d3 100644
--- a/app/bundles/PointBundle/Event/PointEvent.php
+++ b/app/bundles/PointBundle/Event/PointEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,22 @@
 use Mautic\PointBundle\Entity\Point;
 
 /**
- * Class PointEvent
+ * Class PointEvent.
  */
 class PointEvent extends CommonEvent
 {
-
     /**
      * @param Point $point
      * @param bool  $isNew
      */
     public function __construct(Point &$point, $isNew = false)
     {
-        $this->entity =& $point;
+        $this->entity = &$point;
         $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Point entity
+     * Returns the Point entity.
      *
      * @return Point
      */
@@ -39,7 +39,7 @@ public function getPoint()
     }
 
     /**
-     * Sets the Point entity
+     * Sets the Point entity.
      *
      * @param Point $point
      */
diff --git a/app/bundles/PointBundle/Event/TriggerBuilderEvent.php b/app/bundles/PointBundle/Event/TriggerBuilderEvent.php
index 6f3f5980c52..e38e39b92a5 100644
--- a/app/bundles/PointBundle/Event/TriggerBuilderEvent.php
+++ b/app/bundles/PointBundle/Event/TriggerBuilderEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,17 +15,14 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class TriggerBuilderEvent
- *
- * @package Mautic\PointBundle\Event
+ * Class TriggerBuilderEvent.
  */
 class TriggerBuilderEvent extends Event
 {
-
     /**
      * @var array
      */
-    private $events = array();
+    private $events = [];
 
     /**
      * @var TranslatorInterface
@@ -42,21 +40,20 @@ public function __construct(TranslatorInterface $translator)
     /**
      * Adds an action to the list of available .
      *
-     * @param string $key - a unique identifier; it is recommended that it be namespaced i.e. lead.action
-     * @param array $event - can contain the following keys:
-     *  'label'           => (required) what to display in the list
-     *  'description'     => (optional) short description of event
-     *  'template'        => (optional) template to use for the action's HTML in the point builder
-     *      i.e AcmeMyBundle:PointAction:theaction.html.php
-     *  'formType'        => (optional) name of the form type SERVICE for the action
-     *  'formTypeOptions' => (optional) array of options to pass to formType
-     *  'callback'        => (required) callback function that will be passed when the action is triggered
-     *      The callback function can receive the following arguments by name (via ReflectionMethod::invokeArgs())
-     *          Mautic\CoreBundle\Factory\MauticFactory $factory
-     *          Mautic\PointBundle\Entity\TriggerEvent  $event
-     *          Mautic\LeadBundle\Entity\Lead           $lead
+     * @param string $key   - a unique identifier; it is recommended that it be namespaced i.e. lead.action
+     * @param array  $event - can contain the following keys:
+     *                      'label'           => (required) what to display in the list
+     *                      'description'     => (optional) short description of event
+     *                      'template'        => (optional) template to use for the action's HTML in the point builder
+     *                      i.e AcmeMyBundle:PointAction:theaction.html.php
+     *                      'formType'        => (optional) name of the form type SERVICE for the action
+     *                      'formTypeOptions' => (optional) array of options to pass to formType
+     *                      'callback'        => (required) callback function that will be passed when the action is triggered
+     *                      The callback function can receive the following arguments by name (via ReflectionMethod::invokeArgs())
+     *                      Mautic\CoreBundle\Factory\MauticFactory $factory
+     *                      Mautic\PointBundle\Entity\TriggerEvent  $event
+     *                      Mautic\LeadBundle\Entity\Lead           $lead
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     public function addEvent($key, array $event)
@@ -67,8 +64,8 @@ public function addEvent($key, array $event)
 
         //check for required keys and that given functions are callable
         $this->verifyComponent(
-            array('group', 'label', 'callback'),
-            array('callback'),
+            ['group', 'label', 'callback'],
+            ['callback'],
             $event
         );
 
@@ -80,7 +77,7 @@ public function addEvent($key, array $event)
     }
 
     /**
-     * Get events
+     * Get events.
      *
      * @return array
      */
@@ -90,6 +87,7 @@ public function getEvents()
             return strnatcasecmp(
                 $a['label'], $b['label']);
         });
+
         return $this->events;
     }
 
@@ -98,7 +96,6 @@ public function getEvents()
      * @param array $methods
      * @param array $component
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     private function verifyComponent(array $keys, array $methods, array $component)
@@ -111,7 +108,7 @@ private function verifyComponent(array $keys, array $methods, array $component)
 
         foreach ($methods as $m) {
             if (isset($component[$m]) && !is_callable($component[$m], true)) {
-                throw new InvalidArgumentException($component[$m] . ' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
+                throw new InvalidArgumentException($component[$m].' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
             }
         }
     }
diff --git a/app/bundles/PointBundle/Event/TriggerEvent.php b/app/bundles/PointBundle/Event/TriggerEvent.php
index 3bee06d1ddb..5d2b0bb679a 100644
--- a/app/bundles/PointBundle/Event/TriggerEvent.php
+++ b/app/bundles/PointBundle/Event/TriggerEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\PointBundle\Entity\Trigger;
 
 /**
- * Class TriggerEvent
+ * Class TriggerEvent.
  */
 class TriggerEvent extends CommonEvent
 {
-
     /**
      * @var Trigger
      */
@@ -34,12 +34,12 @@ class TriggerEvent extends CommonEvent
      */
     public function __construct(Trigger &$trigger, $isNew = false)
     {
-        $this->entity =& $trigger;
+        $this->entity = &$trigger;
         $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Trigger entity
+     * Returns the Trigger entity.
      *
      * @return Trigger
      */
@@ -49,7 +49,7 @@ public function getTrigger()
     }
 
     /**
-     * Sets the Trigger entity
+     * Sets the Trigger entity.
      *
      * @param Trigger $trigger
      */
diff --git a/app/bundles/PointBundle/EventListener/DashboardSubscriber.php b/app/bundles/PointBundle/EventListener/DashboardSubscriber.php
index 7062caaff84..e60b94d5493 100644
--- a/app/bundles/PointBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/PointBundle/EventListener/DashboardSubscriber.php
@@ -1,51 +1,49 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\PointBundle\EventListener;
 
-use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\PointBundle\Model\PointModel;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\PointBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'point';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'points.in.time' => array()
-    );
+    protected $types = [
+        'points.in.time' => [],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'point:points:viewown',
-        'point:points:viewother'
-    );
+        'point:points:viewother',
+    ];
 
     /**
      * @var PointModel
@@ -63,23 +61,21 @@ public function __construct(PointModel $pointModel)
     }
 
     /**
-     * Set a widget detail when needed 
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
         $this->checkPermissions($event);
         $canViewOthers = $event->hasPermission('point:points:viewother');
-        
+
         if ($event->getType() == 'points.in.time') {
             $widget = $event->getWidget();
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->pointModel->getPointLineChartData(
@@ -87,10 +83,10 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateFrom'],
                         $params['dateTo'],
                         $params['dateFormat'],
-                        array(),
+                        [],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
diff --git a/app/bundles/PointBundle/EventListener/LeadSubscriber.php b/app/bundles/PointBundle/EventListener/LeadSubscriber.php
index c3cea6ff1c7..1c0e3058820 100644
--- a/app/bundles/PointBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/PointBundle/EventListener/LeadSubscriber.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\LeadBundle\Entity\PointsChangeLog;
 use Mautic\LeadBundle\Event\LeadEvent;
 use Mautic\LeadBundle\Event\LeadMergeEvent;
@@ -20,7 +20,7 @@
 use Mautic\PointBundle\Model\TriggerModel;
 
 /**
- * Class LeadSubscriber
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
@@ -32,7 +32,7 @@ class LeadSubscriber extends CommonSubscriber
     /**
      * LeadSubscriber constructor.
      *
-     * @param TriggerModel  $triggerModel
+     * @param TriggerModel $triggerModel
      */
     public function __construct(TriggerModel $triggerModel)
     {
@@ -42,7 +42,7 @@ public function __construct(TriggerModel $triggerModel)
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             LeadEvents::LEAD_POINTS_CHANGE   => ['onLeadPointsChange', 0],
@@ -53,7 +53,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Trigger applicable events for the lead
+     * Trigger applicable events for the lead.
      *
      * @param PointsChangeEvent $event
      */
@@ -63,7 +63,7 @@ public function onLeadPointsChange(PointsChangeEvent $event)
     }
 
     /**
-     * Handle point triggers for new leads (including 0 point triggers)
+     * Handle point triggers for new leads (including 0 point triggers).
      *
      * @param LeadEvent $event
      */
@@ -75,7 +75,7 @@ public function onLeadSave(LeadEvent $event)
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -87,7 +87,6 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
         $event->addEventType($eventTypeKey, $eventTypeName);
 
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
@@ -112,7 +111,7 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                         'extra'      => [
                             'log' => $log,
                         ],
-                        'icon'       => 'fa-calculator'
+                        'icon' => 'fa-calculator',
                     ]
                 );
             }
diff --git a/app/bundles/PointBundle/EventListener/PointSubscriber.php b/app/bundles/PointBundle/EventListener/PointSubscriber.php
index 8411cb2f203..34b201be078 100644
--- a/app/bundles/PointBundle/EventListener/PointSubscriber.php
+++ b/app/bundles/PointBundle/EventListener/PointSubscriber.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\PointBundle\Event as Events;
 use Mautic\PointBundle\PointEvents;
 
 /**
- * Class PointSubscriber
+ * Class PointSubscriber.
  */
 class PointSubscriber extends CommonSubscriber
 {
@@ -46,18 +46,18 @@ public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $audit
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PointEvents::POINT_POST_SAVE     => array('onPointPostSave', 0),
-            PointEvents::POINT_POST_DELETE   => array('onPointDelete', 0),
-            PointEvents::TRIGGER_POST_SAVE   => array('onTriggerPostSave', 0),
-            PointEvents::TRIGGER_POST_DELETE => array('onTriggerDelete', 0)
-        );
+        return [
+            PointEvents::POINT_POST_SAVE     => ['onPointPostSave', 0],
+            PointEvents::POINT_POST_DELETE   => ['onPointDelete', 0],
+            PointEvents::TRIGGER_POST_SAVE   => ['onTriggerPostSave', 0],
+            PointEvents::TRIGGER_POST_DELETE => ['onTriggerDelete', 0],
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\PointEvent $event
      */
@@ -65,39 +65,39 @@ public function onPointPostSave(Events\PointEvent $event)
     {
         $point = $event->getPoint();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "point",
-                "object"    => "point",
-                "objectId"  => $point->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'point',
+                'object'    => 'point',
+                'objectId'  => $point->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\PointEvent $event
      */
     public function onPointDelete(Events\PointEvent $event)
     {
         $point = $event->getPoint();
-        $log = array(
-            "bundle"     => "point",
-            "object"     => "point",
-            "objectId"   => $point->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $point->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log   = [
+            'bundle'    => 'point',
+            'object'    => 'point',
+            'objectId'  => $point->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $point->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\TriggerEvent $event
      */
@@ -105,34 +105,34 @@ public function onTriggerPostSave(Events\TriggerEvent $event)
     {
         $trigger = $event->getTrigger();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "point",
-                "object"    => "trigger",
-                "objectId"  => $trigger->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'point',
+                'object'    => 'trigger',
+                'objectId'  => $trigger->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\TriggerEvent $event
      */
     public function onTriggerDelete(Events\TriggerEvent $event)
     {
         $trigger = $event->getTrigger();
-        $log = array(
-            "bundle"     => "point",
-            "object"     => "trigger",
-            "objectId"   => $trigger->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $trigger->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log     = [
+            'bundle'    => 'point',
+            'object'    => 'trigger',
+            'objectId'  => $trigger->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $trigger->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 }
diff --git a/app/bundles/PointBundle/EventListener/SearchSubscriber.php b/app/bundles/PointBundle/EventListener/SearchSubscriber.php
index d1301ddeaa2..6dfa9965173 100644
--- a/app/bundles/PointBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/PointBundle/EventListener/SearchSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\PointBundle\Model\PointModel;
 use Mautic\PointBundle\Model\TriggerModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\PointBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -40,25 +39,25 @@ class SearchSubscriber extends CommonSubscriber
      */
     public function __construct(PointModel $pointModel, TriggerModel $pointTriggerModel)
     {
-        $this->pointModel = $pointModel;
+        $this->pointModel        = $pointModel;
         $this->pointTriggerModel = $pointTriggerModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH      => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
      * @param MauticEvents\GlobalSearchEvent $event
      */
-    public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
+    public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
     {
         if ($this->security->isGranted('point:points:view')) {
             $str = $event->getSearchString();
@@ -66,32 +65,32 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
                 return;
             }
 
-            $items      = $this->pointModel->getEntities(
-                array(
+            $items = $this->pointModel->getEntities(
+                [
                     'limit'  => 5,
-                    'filter' => $str
-                ));
+                    'filter' => $str,
+                ]);
             $pointCount = count($items);
             if ($pointCount > 0) {
-                $pointsResults = array();
+                $pointsResults = [];
                 $canEdit       = $this->security->isGranted('point:points:edit');
                 foreach ($items as $item) {
                     $pointsResults[] = $this->templating->renderResponse(
                         'MauticPointBundle:SubscribedEvents\Search:global_point.html.php',
-                        array(
+                        [
                             'item'    => $item,
-                            'canEdit' => $canEdit
-                        )
+                            'canEdit' => $canEdit,
+                        ]
                     )->getContent();
                 }
                 if ($pointCount > 5) {
                     $pointsResults[] = $this->templating->renderResponse(
                         'MauticPointBundle:SubscribedEvents\Search:global_point.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => ($pointCount - 5)
-                        )
+                            'remaining'    => ($pointCount - 5),
+                        ]
                     )->getContent();
                 }
                 $pointsResults['count'] = $pointCount;
@@ -106,31 +105,31 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
             }
 
             $items = $this->pointTriggerModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $str
-                ));
+                    'filter' => $str,
+                ]);
             $count = count($items);
             if ($count > 0) {
-                $results = array();
+                $results = [];
                 $canEdit = $this->security->isGranted('point:triggers:edit');
                 foreach ($items as $item) {
                     $results[] = $this->templating->renderResponse(
                         'MauticPointBundle:SubscribedEvents\Search:global_trigger.html.php',
-                        array(
+                        [
                             'item'    => $item,
-                            'canEdit' => $canEdit
-                        )
+                            'canEdit' => $canEdit,
+                        ]
                     )->getContent();
                 }
                 if ($count > 5) {
                     $results[] = $this->templating->renderResponse(
                         'MauticPointBundle:SubscribedEvents\Search:global_trigger.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => ($count - 5)
-                        )
+                            'remaining'    => ($count - 5),
+                        ]
                     )->getContent();
                 }
                 $results['count'] = $count;
@@ -142,7 +141,7 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
     /**
      * @param MauticEvents\CommandListEvent $event
      */
-    public function onBuildCommandList (MauticEvents\CommandListEvent $event)
+    public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
         $security = $this->security;
         if ($security->isGranted('point:points:view')) {
@@ -152,4 +151,4 @@ public function onBuildCommandList (MauticEvents\CommandListEvent $event)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PointBundle/Form/Type/GenericPointSettingsType.php b/app/bundles/PointBundle/Form/Type/GenericPointSettingsType.php
index 618f9afd2af..3c347172c1d 100644
--- a/app/bundles/PointBundle/Form/Type/GenericPointSettingsType.php
+++ b/app/bundles/PointBundle/Form/Type/GenericPointSettingsType.php
@@ -1,53 +1,48 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
-use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotEqualTo;
 
 /**
- * Class GenericPointSettingsType
+ * Class GenericPointSettingsType.
  */
 class GenericPointSettingsType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $default = (empty($options['data']['delta'])) ? 0 : (int) $options['data']['delta'];
-        $builder->add('delta', 'number', array(
+        $builder->add('delta', 'number', [
             'label'      => 'mautic.point.action.delta',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       =>
-                array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.point.action.delta.help'
-                ),
-            'precision'  => 0,
-            'data'       => $default,
+                    'tooltip' => 'mautic.point.action.delta.help',
+                ],
+            'precision'   => 0,
+            'data'        => $default,
             'constraints' => [
                 new NotEqualTo(
                     [
                         'value'   => '0',
-                        'message' => 'mautic.core.required.value'
+                        'message' => 'mautic.core.required.value',
                     ]
-                )
-            ]
-        ));
+                ),
+            ],
+        ]);
     }
 
     /**
@@ -55,6 +50,6 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "genericpoint_settings";
+        return 'genericpoint_settings';
     }
 }
diff --git a/app/bundles/PointBundle/Form/Type/PointActionType.php b/app/bundles/PointBundle/Form/Type/PointActionType.php
index b257456a9df..93012850999 100644
--- a/app/bundles/PointBundle/Form/Type/PointActionType.php
+++ b/app/bundles/PointBundle/Form/Type/PointActionType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,20 +16,19 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PointActionType
+ * Class PointActionType.
  */
 class PointActionType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $masks           = array();
-        $formTypeOptions = array(
-            'label' => false
-        );
+        $masks           = [];
+        $formTypeOptions = [
+            'label' => false,
+        ];
         if (!empty($options['formTypeOptions'])) {
             $formTypeOptions = array_merge($formTypeOptions, $options['formTypeOptions']);
         }
@@ -46,10 +46,10 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'formType'        => 'genericpoint_settings',
-            'formTypeOptions' => array()
-        ));
+            'formTypeOptions' => [],
+        ]);
     }
 
     /**
@@ -57,6 +57,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "pointaction";
+        return 'pointaction';
     }
 }
diff --git a/app/bundles/PointBundle/Form/Type/PointType.php b/app/bundles/PointBundle/Form/Type/PointType.php
index 5226a65816b..e26ed793337 100644
--- a/app/bundles/PointBundle/Form/Type/PointType.php
+++ b/app/bundles/PointBundle/Form/Type/PointType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,11 +19,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PointType
+ * Class PointType.
  */
 class PointType extends AbstractType
 {
-
     /**
      * @var \Mautic\CoreBundle\Security\Permissions\CorePermissions
      */
@@ -45,55 +45,54 @@ public function __construct(MauticFactory $factory)
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('description' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['description' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('point', $options));
 
-        $builder->add('name', 'text', array(
+        $builder->add('name', 'text', [
             'label'      => 'mautic.core.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control')
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('description', 'textarea', array(
+        $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control editor'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
 
-        $builder->add('type', 'choice', array(
-            'choices' => $options['pointActions']['choices'],
+        $builder->add('type', 'choice', [
+            'choices'     => $options['pointActions']['choices'],
             'empty_value' => '',
             'label'       => 'mautic.point.form.type',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
-                'class' => 'form-control',
-                'onchange' => 'Mautic.getPointActionPropertiesForm(this.value);'
-            ),
-        ));
-
-        $builder->add('delta', 'number', array(
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => [
+                'class'    => 'form-control',
+                'onchange' => 'Mautic.getPointActionPropertiesForm(this.value);',
+            ],
+        ]);
+
+        $builder->add('delta', 'number', [
             'label'      => 'mautic.point.action.delta',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       =>
-                array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.point.action.delta.help'
-                ),
-            'precision'  => 0
-        ));
+                    'tooltip' => 'mautic.point.action.delta.help',
+                ],
+            'precision' => 0,
+        ]);
 
         $type = (!empty($options['actionType'])) ? $options['actionType'] : $options['data']->getType();
         if ($type) {
-            $formType   =  (!empty($options['pointActions']['actions'][$type]['formType'])) ?
+            $formType = (!empty($options['pointActions']['actions'][$type]['formType'])) ?
                 $options['pointActions']['actions'][$type]['formType'] : 'genericpoint_settings';
-            $properties = ($options['data']) ? $options['data']->getProperties() : array();
-            $builder->add('properties', $formType, array(
+            $properties = ($options['data']) ? $options['data']->getProperties() : [];
+            $builder->add('properties', $formType, [
                 'label' => false,
-                'data'  => $properties
-            ));
+                'data'  => $properties,
+            ]);
         }
 
         if (!empty($options['data']) && $options['data'] instanceof Point) {
@@ -112,44 +111,44 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $data     = true;
         }
 
-        $builder->add('isPublished', 'yesno_button_group', array(
-            'read_only'     => $readonly,
-            'data'          => $data
-        ));
+        $builder->add('isPublished', 'yesno_button_group', [
+            'read_only' => $readonly,
+            'data'      => $data,
+        ]);
 
-        $builder->add('publishUp', 'datetime', array(
+        $builder->add('publishUp', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishup',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'  => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
-
-        $builder->add('publishDown', 'datetime', array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'       => 'form-control',
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
+
+        $builder->add('publishDown', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishdown',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'  => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'       => 'form-control',
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
         //add category
-        $builder->add('category', 'category', array(
-            'bundle' => 'point'
-        ));
+        $builder->add('category', 'category', [
+            'bundle' => 'point',
+        ]);
 
         $builder->add('buttons', 'form_buttons');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -158,13 +157,13 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Mautic\PointBundle\Entity\Point',
-        ));
+        ]);
 
-        $resolver->setRequired(array('pointActions'));
+        $resolver->setRequired(['pointActions']);
 
-        $resolver->setOptional(array('actionType'));
+        $resolver->setOptional(['actionType']);
     }
 
     /**
@@ -172,6 +171,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "point";
+        return 'point';
     }
 }
diff --git a/app/bundles/PointBundle/Form/Type/TriggerEventType.php b/app/bundles/PointBundle/Form/Type/TriggerEventType.php
index 2fa903c6602..45d37989061 100644
--- a/app/bundles/PointBundle/Form/Type/TriggerEventType.php
+++ b/app/bundles/PointBundle/Form/Type/TriggerEventType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,39 +16,38 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class TriggerEventType
+ * Class TriggerEventType.
  */
 class TriggerEventType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $masks = array('description' => 'html');
+        $masks = ['description' => 'html'];
 
-        $builder->add('name', 'text', array(
+        $builder->add('name', 'text', [
             'label'      => 'mautic.core.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+            'required'   => false,
+        ]);
 
-        $builder->add('description', 'textarea', array(
+        $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control editor'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
 
         if (!empty($options['settings']['formType'])) {
             $properties = (!empty($options['data']['properties'])) ? $options['data']['properties'] : null;
 
-            $formTypeOptions =  array(
+            $formTypeOptions = [
                 'label' => false,
-                'data'  => $properties
-            );
+                'data'  => $properties,
+            ];
             if (!empty($options['settings']['formTypeOptions'])) {
                 $formTypeOptions = array_merge($formTypeOptions, $options['settings']['formTypeOptions']);
             }
@@ -70,21 +70,21 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $btnIcon  = 'fa fa-plus';
         }
 
-        $builder->add('buttons', 'form_buttons', array(
-            'save_text' => $btnValue,
-            'save_icon' => $btnIcon,
-            'apply_text' => false,
-            'container_class' => 'bottom-form-buttons'
-        ));
+        $builder->add('buttons', 'form_buttons', [
+            'save_text'       => $btnValue,
+            'save_icon'       => $btnIcon,
+            'apply_text'      => false,
+            'container_class' => 'bottom-form-buttons',
+        ]);
 
-        $builder->add('triggerId', 'hidden', array(
-            'mapped' => false
-        ));
+        $builder->add('triggerId', 'hidden', [
+            'mapped' => false,
+        ]);
 
         $builder->addEventSubscriber(new CleanFormSubscriber($masks));
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -93,11 +93,11 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'settings' => false
-        ));
+        $resolver->setDefaults([
+            'settings' => false,
+        ]);
 
-        $resolver->setRequired(array('settings'));
+        $resolver->setRequired(['settings']);
     }
 
     /**
@@ -105,6 +105,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "pointtriggerevent";
+        return 'pointtriggerevent';
     }
 }
diff --git a/app/bundles/PointBundle/Form/Type/TriggerType.php b/app/bundles/PointBundle/Form/Type/TriggerType.php
index e937abbe893..f9af72b1c48 100644
--- a/app/bundles/PointBundle/Form/Type/TriggerType.php
+++ b/app/bundles/PointBundle/Form/Type/TriggerType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,16 +14,14 @@
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class TriggerType
+ * Class TriggerType.
  */
 class TriggerType extends AbstractType
 {
-
     /**
      * @var \Mautic\CoreBundle\Security\Permissions\CorePermissions
      */
@@ -47,51 +46,51 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('description' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['description' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('point', $options));
 
         $builder->add(
             'name',
             'text',
-            array(
+            [
                 'label'      => 'mautic.core.name',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control')
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
 
         $builder->add(
             'description',
             'textarea',
-            array(
+            [
                 'label'      => 'mautic.core.description',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control editor'),
-                'required'   => false
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control editor'],
+                'required'   => false,
+            ]
         );
 
         //add category
         $builder->add(
             'category',
             'category',
-            array(
-                'bundle' => 'point'
-            )
+            [
+                'bundle' => 'point',
+            ]
         );
 
         $builder->add(
             'points',
             'number',
-            array(
+            [
                 'label'      => 'mautic.point.trigger.form.points',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.point.trigger.form.points_descr'
-                ),
-                'required'   => false
-            )
+                    'tooltip' => 'mautic.point.trigger.form.points_descr',
+                ],
+                'required' => false,
+            ]
         );
 
         $color = $options['data']->getColor();
@@ -99,26 +98,26 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'color',
             'text',
-            array(
+            [
                 'label'      => 'mautic.point.trigger.form.color',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
                     'data-toggle' => 'color',
-                    'tooltip'     => 'mautic.point.trigger.form.color_descr'
-                ),
+                    'tooltip'     => 'mautic.point.trigger.form.color_descr',
+                ],
                 'required'   => false,
                 'data'       => (!empty($color)) ? $color : 'a0acb8',
-                'empty_data' => 'a0acb8'
-            )
+                'empty_data' => 'a0acb8',
+            ]
         );
 
         $builder->add(
             'triggerExistingLeads',
             'yesno_button_group',
-            array(
-                'label' => 'mautic.point.trigger.form.existingleads'
-            )
+            [
+                'label' => 'mautic.point.trigger.form.existingleads',
+            ]
         );
 
         if (!empty($options['data']) && $options['data']->getId()) {
@@ -135,56 +134,56 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'isPublished',
             'yesno_button_group',
-            array(
+            [
                 'read_only' => $readonly,
-                'data'      => $data
-            )
+                'data'      => $data,
+            ]
         );
 
         $builder->add(
             'publishUp',
             'datetime',
-            array(
+            [
                 'widget'     => 'single_text',
                 'label'      => 'mautic.core.form.publishup',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
-                    'data-toggle' => 'datetime'
-                ),
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false
-            )
+                    'data-toggle' => 'datetime',
+                ],
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'publishDown',
             'datetime',
-            array(
+            [
                 'widget'     => 'single_text',
                 'label'      => 'mautic.core.form.publishdown',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'       => 'form-control',
-                    'data-toggle' => 'datetime'
-                ),
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false
-            )
+                    'data-toggle' => 'datetime',
+                ],
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
+            ]
         );
 
         $builder->add(
             'sessionId',
             'hidden',
-            array(
-                'mapped' => false
-            )
+            [
+                'mapped' => false,
+            ]
         );
 
         $builder->add('buttons', 'form_buttons');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -194,9 +193,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(
-            array(
+            [
                 'data_class' => 'Mautic\PointBundle\Entity\Trigger',
-            )
+            ]
         );
     }
 
@@ -205,6 +204,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "pointtrigger";
+        return 'pointtrigger';
     }
 }
diff --git a/app/bundles/PointBundle/Helper/EventHelper.php b/app/bundles/PointBundle/Helper/EventHelper.php
index 5b9fb040c0e..110a4e8dfb1 100644
--- a/app/bundles/PointBundle/Helper/EventHelper.php
+++ b/app/bundles/PointBundle/Helper/EventHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class EventHelper
+ * Class EventHelper.
  */
 class EventHelper
 {
@@ -24,7 +25,7 @@ class EventHelper
      */
     public static function engagePointAction($lead, $action)
     {
-        static $initiated = array();
+        static $initiated = [];
 
         $pointsChange = 0;
 
diff --git a/app/bundles/PointBundle/MauticPointBundle.php b/app/bundles/PointBundle/MauticPointBundle.php
index ca462b615bb..c0e81f49866 100644
--- a/app/bundles/PointBundle/MauticPointBundle.php
+++ b/app/bundles/PointBundle/MauticPointBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticPointBundle
+ * Class MauticPointBundle.
  */
 class MauticPointBundle extends Bundle
 {
diff --git a/app/bundles/PointBundle/Model/PointModel.php b/app/bundles/PointBundle/Model/PointModel.php
index b84afac3a3d..65d872414eb 100644
--- a/app/bundles/PointBundle/Model/PointModel.php
+++ b/app/bundles/PointBundle/Model/PointModel.php
@@ -1,14 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Model;
 
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\FormModel as CommonFormModel;
 use Mautic\LeadBundle\Entity\Lead;
@@ -16,19 +19,16 @@
 use Mautic\PointBundle\Entity\Action;
 use Mautic\PointBundle\Entity\LeadPointLog;
 use Mautic\PointBundle\Entity\Point;
-use Mautic\PointBundle\Event\PointBuilderEvent;
 use Mautic\PointBundle\Event\PointActionEvent;
+use Mautic\PointBundle\Event\PointBuilderEvent;
 use Mautic\PointBundle\Event\PointEvent;
 use Mautic\PointBundle\PointEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class PointModel
+ * Class PointModel.
  */
 class PointModel extends CommonFormModel
 {
@@ -57,15 +57,15 @@ class PointModel extends CommonFormModel
     /**
      * PointModel constructor.
      *
-     * @param Session $session
+     * @param Session        $session
      * @param IpLookupHelper $ipLookupHelper
-     * @param LeadModel $leadModel
+     * @param LeadModel      $leadModel
      */
     public function __construct(Session $session, IpLookupHelper $ipLookupHelper, LeadModel $leadModel)
     {
-        $this->session = $session;
+        $this->session        = $session;
         $this->ipLookupHelper = $ipLookupHelper;
-        $this->leadModel = $leadModel;
+        $this->leadModel      = $leadModel;
     }
 
     /**
@@ -91,14 +91,15 @@ public function getPermissionBase()
      *
      * @throws MethodNotAllowedHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Point) {
-            throw new MethodNotAllowedHttpException(array('Point'));
+            throw new MethodNotAllowedHttpException(['Point']);
         }
         if (!empty($action)) {
             $options['action'] = $action;
         }
+
         return $formFactory->create('point', $entity, $options);
     }
 
@@ -124,20 +125,20 @@ public function getEntity($id = null)
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Point) {
-            throw new MethodNotAllowedHttpException(array('Point'));
+            throw new MethodNotAllowedHttpException(['Point']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = PointEvents::POINT_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = PointEvents::POINT_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = PointEvents::POINT_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = PointEvents::POINT_POST_DELETE;
                 break;
             default:
@@ -151,6 +152,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
             }
 
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         }
 
@@ -158,7 +160,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     }
 
     /**
-     * Gets array of custom actions from bundles subscribed PointEvents::POINT_ON_BUILD
+     * Gets array of custom actions from bundles subscribed PointEvents::POINT_ON_BUILD.
      *
      * @return mixed
      */
@@ -168,8 +170,8 @@ public function getPointActions()
 
         if (empty($actions)) {
             //build them
-            $actions = array();
-            $event = new PointBuilderEvent($this->translator);
+            $actions = [];
+            $event   = new PointBuilderEvent($this->translator);
             $this->dispatcher->dispatch(PointEvents::POINT_ON_BUILD, $event);
             $actions['actions'] = $event->getActions();
             $actions['list']    = $event->getActionList();
@@ -180,14 +182,13 @@ public function getPointActions()
     }
 
     /**
-     * Triggers a specific point change
+     * Triggers a specific point change.
      *
      * @param $type
      * @param mixed $eventDetails passthrough from function triggering action to the callback function
-     * @param mixed $typeId Something unique to the triggering event to prevent  unnecessary duplicate calls
+     * @param mixed $typeId       Something unique to the triggering event to prevent  unnecessary duplicate calls
      * @param Lead  $lead
      *25
-     * @return void
      */
     public function triggerAction($type, $eventDetails = null, $typeId = null, Lead $lead = null)
     {
@@ -198,7 +199,7 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
 
         if ($typeId !== null && MAUTIC_ENV === 'prod') {
             //let's prevent some unnecessary DB calls
-            $triggeredEvents = $this->session->get('mautic.triggered.point.actions', array());
+            $triggeredEvents = $this->session->get('mautic.triggered.point.actions', []);
             if (in_array($typeId, $triggeredEvents)) {
                 return;
             }
@@ -216,7 +217,6 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
             $lead = $this->leadModel->getCurrentLead();
 
             if (null === $lead || !$lead->getId()) {
-
                 return;
             }
         }
@@ -227,7 +227,7 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
         //get a list of actions that has already been performed on this lead
         $completedActions = $repo->getCompletedLeadActions($type, $lead->getId());
 
-        $persist = array();
+        $persist = [];
         foreach ($availablePoints as $action) {
             //if it's already been done, then skip it
             if (isset($completedActions[$action->getId()])) {
@@ -240,21 +240,21 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
             }
             $settings = $availableActions['actions'][$action->getType()];
 
-            $args = array(
-                'action'      => array(
+            $args = [
+                'action' => [
                     'id'         => $action->getId(),
                     'type'       => $action->getType(),
                     'name'       => $action->getName(),
                     'properties' => $action->getProperties(),
-                    'points'     => $action->getDelta()
-                ),
-                'lead'        => $lead,
-                'factory'     => $this->factory, // WHAT?
-                'eventDetails' => $eventDetails
-            );
+                    'points'     => $action->getDelta(),
+                ],
+                'lead'         => $lead,
+                'factory'      => $this->factory, // WHAT?
+                'eventDetails' => $eventDetails,
+            ];
 
             $callback = (isset($settings['callback'])) ? $settings['callback'] :
-                array('\\Mautic\\PointBundle\\Helper\\EventHelper', 'engagePointAction');
+                ['\\Mautic\\PointBundle\\Helper\\EventHelper', 'engagePointAction'];
 
             if (is_callable($callback)) {
                 if (is_array($callback)) {
@@ -266,7 +266,7 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
                     $reflection = new \ReflectionMethod(null, $callback);
                 }
 
-                $pass = array();
+                $pass = [];
                 foreach ($reflection->getParameters() as $param) {
                     if (isset($args[$param->getName()])) {
                         $pass[] = $args[$param->getName()];
@@ -282,7 +282,7 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
                     $parsed = explode('.', $action->getType());
                     $lead->addPointsChangeLogEntry(
                         $parsed[0],
-                        $action->getId() . ": " . $action->getName(),
+                        $action->getId().': '.$action->getName(),
                         $parsed[1],
                         $delta,
                         $ipAddress
@@ -312,22 +312,22 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
     }
 
     /**
-     * Get line chart data of points
+     * Get line chart data of points.
      *
-     * @param char      $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char      $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param \DateTime $dateFrom
      * @param \DateTime $dateTo
      * @param string    $dateFormat
      * @param array     $filter
-     * @param boolean   $canViewOthers
+     * @param bool      $canViewOthers
      *
      * @return array
      */
-    public function getPointLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getPointLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
-        $chart     = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
-        $query     = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
-        $q         = $query->prepareTimeDataQuery('lead_points_change_log', 'date_added', $filter);
+        $chart = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
+        $query = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
+        $q     = $query->prepareTimeDataQuery('lead_points_change_log', 'date_added', $filter);
 
         if (!$canViewOthers) {
             $q->join('t', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = t.lead_id')
diff --git a/app/bundles/PointBundle/Model/TriggerEventModel.php b/app/bundles/PointBundle/Model/TriggerEventModel.php
index da27cd72184..3041b1685b3 100644
--- a/app/bundles/PointBundle/Model/TriggerEventModel.php
+++ b/app/bundles/PointBundle/Model/TriggerEventModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\PointBundle\Entity\TriggerEvent;
 
 /**
- * Class TriggerEventModel
+ * Class TriggerEventModel.
  */
 class TriggerEventModel extends CommonFormModel
 {
-
     /**
      * {@inheritdoc}
      *
diff --git a/app/bundles/PointBundle/Model/TriggerModel.php b/app/bundles/PointBundle/Model/TriggerModel.php
index bc1dc1c4256..b32b545b74f 100644
--- a/app/bundles/PointBundle/Model/TriggerModel.php
+++ b/app/bundles/PointBundle/Model/TriggerModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -23,7 +24,7 @@
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class TriggerModel
+ * Class TriggerModel.
  */
 class TriggerModel extends CommonFormModel
 {
@@ -52,14 +53,14 @@ class TriggerModel extends CommonFormModel
     /**
      * EventModel constructor.
      *
-     * @param IpLookupHelper $ipLookupHelper
-     * @param LeadModel $leadModel
+     * @param IpLookupHelper    $ipLookupHelper
+     * @param LeadModel         $leadModel
      * @param TriggerEventModel $pointTriggerEventModel
      */
     public function __construct(IpLookupHelper $ipLookupHelper, LeadModel $leadModel, TriggerEventModel $pointTriggerEventModel)
     {
-        $this->ipLookupHelper = $ipLookupHelper;
-        $this->leadModel = $leadModel;
+        $this->ipLookupHelper         = $ipLookupHelper;
+        $this->leadModel              = $leadModel;
         $this->pointTriggerEventModel = $pointTriggerEventModel;
     }
 
@@ -74,7 +75,7 @@ public function getRepository()
     }
 
     /**
-     * Retrieves an instance of the TriggerEventRepository
+     * Retrieves an instance of the TriggerEventRepository.
      *
      * @return \Mautic\PointBundle\Entity\TriggerEventRepository
      */
@@ -96,20 +97,21 @@ public function getPermissionBase()
      *
      * @throws MethodNotAllowedHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Trigger) {
-            throw new MethodNotAllowedHttpException(array('Trigger'));
+            throw new MethodNotAllowedHttpException(['Trigger']);
         }
-        $params = (!empty($action)) ? array('action' => $action) : array();
+        $params = (!empty($action)) ? ['action' => $action] : [];
+
         return $formFactory->create('pointtrigger', $entity, $params);
     }
 
     /**
      * {@inheritdoc}
      *
-     * @param  \Mautic\PointBundle\Entity\Trigger $entity
-     * @param  bool                               $unlock
+     * @param \Mautic\PointBundle\Entity\Trigger $entity
+     * @param bool                               $unlock
      */
     public function saveEntity($entity, $unlock = true)
     {
@@ -121,39 +123,39 @@ public function saveEntity($entity, $unlock = true)
         if ($entity->getTriggerExistingLeads() && $entity->isPublished()) {
             $events    = $entity->getEvents();
             $repo      = $this->getEventRepository();
-            $persist   = array();
+            $persist   = [];
             $ipAddress = $this->ipLookupHelper->getIpAddress();
 
             foreach ($events as $event) {
-                $filter = array('force' => array(
-                    array(
+                $filter = ['force' => [
+                    [
                         'column' => 'l.date_added',
                         'expr'   => 'lte',
-                        'value'  => (new DateTimeHelper($entity->getDateAdded()))->toUtcString()
-                    ),
-                    array(
+                        'value'  => (new DateTimeHelper($entity->getDateAdded()))->toUtcString(),
+                    ],
+                    [
                         'column' => 'l.points',
                         'expr'   => 'gte',
-                        'value'  => $entity->getPoints()
-                    )
-                ));
+                        'value'  => $entity->getPoints(),
+                    ],
+                ]];
 
                 if (!$isNew) {
                     //get a list of leads that has already had this event applied
                     $leadIds = $repo->getLeadsForEvent($event->getId());
                     if (!empty($leadIds)) {
-                        $filter['force'][] = array(
+                        $filter['force'][] = [
                             'column' => 'l.id',
                             'expr'   => 'notIn',
-                            'value'  => $leadIds
-                        );
+                            'value'  => $leadIds,
+                        ];
                     }
                 }
 
                 //get a list of leads that are before the trigger's date_added and trigger if not already done so
-                $leads     = $this->leadModel->getEntities(array(
-                    'filter' => $filter
-                ));
+                $leads = $this->leadModel->getEntities([
+                    'filter' => $filter,
+                ]);
 
                 foreach ($leads as $l) {
                     if ($this->triggerEvent($event->convertToArray(), $l, true)) {
@@ -196,20 +198,20 @@ public function getEntity($id = null)
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Trigger) {
-            throw new MethodNotAllowedHttpException(array('Trigger'));
+            throw new MethodNotAllowedHttpException(['Trigger']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = PointEvents::TRIGGER_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = PointEvents::TRIGGER_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = PointEvents::TRIGGER_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = PointEvents::TRIGGER_POST_DELETE;
                 break;
             default:
@@ -222,6 +224,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
             }
 
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         }
 
@@ -231,12 +234,10 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     /**
      * @param Trigger $entity
      * @param array   $sessionEvents
-     *
-     * @return void
      */
     public function setEvents(Trigger $entity, $sessionEvents)
     {
-        $order   = 1;
+        $order           = 1;
         $existingActions = $entity->getEvents();
 
         foreach ($sessionEvents as $properties) {
@@ -244,17 +245,18 @@ public function setEvents(Trigger $entity, $sessionEvents)
             $event = !$isNew ? $existingActions[$properties['id']] : new TriggerEvent();
 
             foreach ($properties as $f => $v) {
-                if (in_array($f, array('id', 'order')))
+                if (in_array($f, ['id', 'order'])) {
                     continue;
+                }
 
-                $func = "set" .  ucfirst($f);
+                $func = 'set'.ucfirst($f);
                 if (method_exists($event, $func)) {
                     $event->$func($v);
                 }
             }
             $event->setTrigger($entity);
             $event->setOrder($order);
-            $order++;
+            ++$order;
             $entity->addTriggerEvent($properties['id'], $event);
         }
 
@@ -265,7 +267,7 @@ public function setEvents(Trigger $entity, $sessionEvents)
     }
 
     /**
-     * Gets array of custom events from bundles subscribed PointEvents::TRIGGER_ON_BUILD
+     * Gets array of custom events from bundles subscribed PointEvents::TRIGGER_ON_BUILD.
      *
      * @return mixed
      */
@@ -275,35 +277,37 @@ public function getEvents()
 
         if (empty($events)) {
             //build them
-            $events = array();
+            $events = [];
             $event  = new Events\TriggerBuilderEvent($this->translator);
             $this->dispatcher->dispatch(PointEvents::TRIGGER_ON_BUILD, $event);
             $events = $event->getEvents();
         }
+
         return $events;
     }
 
     /**
-     * Gets array of custom events from bundles inside groups
+     * Gets array of custom events from bundles inside groups.
      *
      * @return mixed
      */
     public function getEventGroups()
     {
         $events = $this->getEvents();
-        $groups = array();
+        $groups = [];
         foreach ($events as $key => $event) {
             $groups[$event['group']][$key] = $event;
         }
+
         return $groups;
     }
 
     /**
-     * Triggers a specific event
+     * Triggers a specific event.
      *
-     * @param array   $event
-     * @param Lead    $lead
-     * @param bool    $force
+     * @param array $event
+     * @param Lead  $lead
+     * @param bool  $force
      *
      * @return bool Was event triggered
      */
@@ -315,7 +319,7 @@ public function triggerEvent($event, Lead $lead = null,  $force = false)
         }
 
         if ($lead == null) {
-            $lead      = $this->leadModel->getCurrentLead();
+            $lead = $this->leadModel->getCurrentLead();
         }
 
         if (!$force) {
@@ -337,12 +341,12 @@ public function triggerEvent($event, Lead $lead = null,  $force = false)
         }
 
         $settings = $availableEvents[$eventType];
-        $args     = array(
-            'event'    => $event,
-            'lead'     => $lead,
-            'factory'  => $this->factory, // WHAT??
-            'config'   => $event['properties']
-        );
+        $args     = [
+            'event'   => $event,
+            'lead'    => $lead,
+            'factory' => $this->factory, // WHAT??
+            'config'  => $event['properties'],
+        ];
 
         if (is_callable($settings['callback'])) {
             if (is_array($settings['callback'])) {
@@ -354,7 +358,7 @@ public function triggerEvent($event, Lead $lead = null,  $force = false)
                 $reflection = new \ReflectionMethod(null, $settings['callback']);
             }
 
-            $pass = array();
+            $pass = [];
             foreach ($reflection->getParameters() as $param) {
                 if (isset($args[$param->getName()])) {
                     $pass[] = $args[$param->getName()];
@@ -370,7 +374,7 @@ public function triggerEvent($event, Lead $lead = null,  $force = false)
     }
 
     /**
-     * Trigger events for the current lead
+     * Trigger events for the current lead.
      *
      * @param Lead $lead
      */
@@ -387,7 +391,7 @@ public function triggerEvents(Lead $lead)
             //get a list of actions that has already been applied to this lead
             $appliedEvents = $repo->getLeadTriggeredEvents($lead->getId());
             $ipAddress     = $this->ipLookupHelper->getIpAddress();
-            $persist       = array();
+            $persist       = [];
             foreach ($events as $event) {
                 if (isset($appliedEvents[$event['id']])) {
                     //don't apply the event to the lead if it's already been done
@@ -414,7 +418,7 @@ public function triggerEvents(Lead $lead)
     }
 
     /**
-     * Returns configured color based on passed in $points
+     * Returns configured color based on passed in $points.
      *
      * @param $points
      *
diff --git a/app/bundles/PointBundle/PointEvents.php b/app/bundles/PointBundle/PointEvents.php
index 12bdde23407..dcd3571cb41 100644
--- a/app/bundles/PointBundle/PointEvents.php
+++ b/app/bundles/PointBundle/PointEvents.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle;
 
 /**
- * Class PointEvents
+ * Class PointEvents.
  *
  * Events available for PointBundle
  */
@@ -53,7 +54,7 @@ final class PointEvents
     const POINT_POST_DELETE = 'mautic.point_post_delete';
 
     /**
-     * The mautic.point_on_build event is thrown before displaying the point builder form to allow adding of custom actions
+     * The mautic.point_on_build event is thrown before displaying the point builder form to allow adding of custom actions.
      *
      * The event listener receives a Mautic\PointBundle\Event\PointBuilderEvent instance.
      *
@@ -62,7 +63,7 @@ final class PointEvents
     const POINT_ON_BUILD = 'mautic.point_on_build';
 
     /**
-     * The mautic.point_on_action event is thrown to execute a point action
+     * The mautic.point_on_action event is thrown to execute a point action.
      *
      * The event listener receives a Mautic\PointBundle\Event\PointActionEvent instance.
      *
@@ -107,7 +108,7 @@ final class PointEvents
     const TRIGGER_POST_DELETE = 'mautic.trigger_post_delete';
 
     /**
-     * The mautic.trigger_on_build event is thrown before displaying the trigger builder form to allow adding of custom actions
+     * The mautic.trigger_on_build event is thrown before displaying the trigger builder form to allow adding of custom actions.
      *
      * The event listener receives a Mautic\PointBundle\Event\TriggerBuilderEvent instance.
      *
@@ -116,7 +117,7 @@ final class PointEvents
     const TRIGGER_ON_BUILD = 'mautic.trigger_on_build';
 
     /**
-     * The mautic.trigger_on_event_execute event is thrown to execute a trigger event
+     * The mautic.trigger_on_event_execute event is thrown to execute a trigger event.
      *
      * The event listener receives a Mautic\PointBundle\Event\TriggerEvent instance.
      *
diff --git a/app/bundles/PointBundle/Security/Permissions/PointPermissions.php b/app/bundles/PointBundle/Security/Permissions/PointPermissions.php
index 5abec32c2d4..1b83c86e54f 100644
--- a/app/bundles/PointBundle/Security/Permissions/PointPermissions.php
+++ b/app/bundles/PointBundle/Security/Permissions/PointPermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\PointBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PointPermissions
+ * Class PointPermissions.
  */
 class PointPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/PointBundle/Views/Event/actions.html.php b/app/bundles/PointBundle/Views/Event/actions.html.php
index 03d695e1004..4b47de4a482 100644
--- a/app/bundles/PointBundle/Views/Event/actions.html.php
+++ b/app/bundles/PointBundle/Views/Event/actions.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!empty($deleted)):
     $action    = 'undelete';
     $iconClass = 'fa-undo';
@@ -17,15 +17,16 @@
     $btnClass  = 'btn-danger';
 endif;
 
-if (empty($route))
+if (empty($route)) {
     $route = 'mautic_pointtriggerevent_action';
+}
 ?>
 
 <div class="form-buttons hide">
-    <a data-toggle="ajaxmodal" data-target="#triggerEventModal" href="<?php echo $view['router']->path($route, array('objectAction' => 'edit', 'objectId' => $id, 'triggerId' => $sessionId)); ?>" class="btn btn-primary btn-xs btn-edit">
+    <a data-toggle="ajaxmodal" data-target="#triggerEventModal" href="<?php echo $view['router']->path($route, ['objectAction' => 'edit', 'objectId' => $id, 'triggerId' => $sessionId]); ?>" class="btn btn-primary btn-xs btn-edit">
         <i class="fa fa-pencil-square-o"></i>
     </a>
-    <a data-menu-link="mautic_point_index" data-toggle="ajax" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path($route, array('objectAction' => $action, 'objectId' => $id, 'triggerId' => $sessionId)); ?>"  class="btn <?php echo $btnClass; ?> btn-xs">
+    <a data-menu-link="mautic_point_index" data-toggle="ajax" data-ignore-formexit="true" data-method="POST" data-hide-loadingbar="true" href="<?php echo $view['router']->path($route, ['objectAction' => $action, 'objectId' => $id, 'triggerId' => $sessionId]); ?>"  class="btn <?php echo $btnClass; ?> btn-xs">
         <i class="fa <?php echo $iconClass; ?>"></i>
     </a>
     <i class="fa fa-fw fa-ellipsis-v reorder-handle"></i>
diff --git a/app/bundles/PointBundle/Views/Event/form.html.php b/app/bundles/PointBundle/Views/Event/form.html.php
index 9b40f001725..f50ffd0a899 100644
--- a/app/bundles/PointBundle/Views/Event/form.html.php
+++ b/app/bundles/PointBundle/Views/Event/form.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/PointBundle/Views/Event/generic.html.php b/app/bundles/PointBundle/Views/Event/generic.html.php
index 62591bd745c..1c9def83eea 100644
--- a/app/bundles/PointBundle/Views/Event/generic.html.php
+++ b/app/bundles/PointBundle/Views/Event/generic.html.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $containerClass = (!empty($deleted)) ? ' bg-danger' : '';
 ?>
 
 <div class="trigger-event-row <?php echo $containerClass; ?>" id="triggerEvent_<?php echo $id; ?>">
-    <?php echo $view->render('MauticPointBundle:Event:actions.html.php', array(
+    <?php echo $view->render('MauticPointBundle:Event:actions.html.php', [
         'deleted'   => (!empty($deleted)) ? $deleted : false,
         'id'        => $id,
         'route'     => 'mautic_pointtriggerevent_action',
-        'sessionId' => $sessionId
-    ));?>
+        'sessionId' => $sessionId,
+    ]); ?>
     <span class="trigger-event-label"><?php echo $event['name']; ?></span>
     <?php if (!empty($event['description'])): ?>
     <span class="trigger-event-descr"><?php echo $event['description']; ?></span>
diff --git a/app/bundles/PointBundle/Views/FormTheme/Action/_pointaction_properties_row.html.php b/app/bundles/PointBundle/Views/FormTheme/Action/_pointaction_properties_row.html.php
index 137fa2e79f5..da6e22852ae 100644
--- a/app/bundles/PointBundle/Views/FormTheme/Action/_pointaction_properties_row.html.php
+++ b/app/bundles/PointBundle/Views/FormTheme/Action/_pointaction_properties_row.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-echo $view['form']->widget($form);
\ No newline at end of file
+echo $view['form']->widget($form);
diff --git a/app/bundles/PointBundle/Views/Point/actionform.html.php b/app/bundles/PointBundle/Views/Point/actionform.html.php
index 52fe43ff2a6..74719c246d6 100644
--- a/app/bundles/PointBundle/Views/Point/actionform.html.php
+++ b/app/bundles/PointBundle/Views/Point/actionform.html.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 //we do not want the surrounding form since this will be embedded into the current form
 foreach ($form as $f) {
     echo $view['form']->row($f);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/PointBundle/Views/Point/form.html.php b/app/bundles/PointBundle/Views/Point/form.html.php
index cfe1dd9882f..6c6d947c6f9 100644
--- a/app/bundles/PointBundle/Views/Point/form.html.php
+++ b/app/bundles/PointBundle/Views/Point/form.html.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'point');
 
 $header = ($entity->getId()) ?
     $view['translator']->trans('mautic.point.menu.edit',
-        array('%name%' => $view['translator']->trans($entity->getName()))) :
+        ['%name%' => $view['translator']->trans($entity->getName())]) :
     $view['translator']->trans('mautic.point.menu.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 
 echo $view['form']->start($form);
 ?>
@@ -26,9 +26,9 @@
     		<div class="col-md-6">
 		        <div class="pa-md">
 				    <?php
-					echo $view['form']->row($form['name']);
-					echo $view['form']->row($form['description']);
-				    ?>
+                    echo $view['form']->row($form['name']);
+                    echo $view['form']->row($form['description']);
+                    ?>
 				</div>
 			</div>
 			<div class="col-md-6">
@@ -49,11 +49,11 @@
  	<div class="col-md-3 bg-white height-auto">
 		<div class="pr-lg pl-lg pt-md pb-md">
 			<?php
-				echo $view['form']->row($form['category']);
-				echo $view['form']->row($form['isPublished']);
-				echo $view['form']->row($form['publishUp']);
-				echo $view['form']->row($form['publishDown']);
-			?>
+                echo $view['form']->row($form['category']);
+                echo $view['form']->row($form['isPublished']);
+                echo $view['form']->row($form['publishUp']);
+                echo $view['form']->row($form['publishDown']);
+            ?>
 		</div>
 	</div>
 </div>
diff --git a/app/bundles/PointBundle/Views/Point/index.html.php b/app/bundles/PointBundle/Views/Point/index.html.php
index 6acbb4c5af6..9e473f9d89d 100644
--- a/app/bundles/PointBundle/Views/Point/index.html.php
+++ b/app/bundles/PointBundle/Views/Point/index.html.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'point');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.points.menu.root'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.points.menu.root'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['point:points:create']
-            ),
-            'routeBase'       => 'point'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['point:points:create'],
+            ],
+            'routeBase' => 'point',
+        ]
     )
 );
 ?>
@@ -28,15 +28,15 @@
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render(
         'MauticCoreBundle:Helper:list_toolbar.html.php',
-        array(
-            'searchValue' => $searchValue,
-            'searchHelp'  => 'mautic.core.help.searchcommands',
+        [
+            'searchValue'     => $searchValue,
+            'searchHelp'      => 'mautic.core.help.searchcommands',
             'action'          => $currentRoute,
             'routeBase'       => 'point',
-            'templateButtons' => array(
-                'delete' => $permissions['point:points:delete']
-            )
-        )
+            'templateButtons' => [
+                'delete' => $permissions['point:points:delete'],
+            ],
+        ]
     ); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/PointBundle/Views/Point/list.html.php b/app/bundles/PointBundle/Views/Point/list.html.php
index 8ad080492ca..b9e44f6ae32 100644
--- a/app/bundles/PointBundle/Views/Point/list.html.php
+++ b/app/bundles/PointBundle/Views/Point/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -19,53 +20,53 @@
                 <?php
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'checkall' => 'true',
-                        'target'   => '#pointTable'
-                    )
+                        'target'   => '#pointTable',
+                    ]
                 );
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'point',
                         'orderBy'    => 'p.name',
                         'text'       => 'mautic.core.name',
                         'class'      => 'col-point-name',
-                        'default'    => true
-                    )
+                        'default'    => true,
+                    ]
                 );
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'point',
                         'orderBy'    => 'cat.title',
                         'text'       => 'mautic.core.category',
-                        'class'      => 'visible-md visible-lg col-point-category'
-                    )
+                        'class'      => 'visible-md visible-lg col-point-category',
+                    ]
                 );
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'point',
                         'orderBy'    => 'p.delta',
                         'text'       => 'mautic.point.thead.delta',
-                        'class'      => 'visible-md visible-lg col-point-delta'
-                    )
+                        'class'      => 'visible-md visible-lg col-point-delta',
+                    ]
                 );
 
                 echo '<th class="col-point-action">'.$view['translator']->trans('mautic.point.thead.action').'</th>';
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'point',
                         'orderBy'    => 'p.id',
                         'text'       => 'mautic.core.id',
-                        'class'      => 'visible-md visible-lg col-point-id'
-                    )
+                        'class'      => 'visible-md visible-lg col-point-id',
+                    ]
                 );
                 ?>
             </tr>
@@ -77,15 +78,15 @@
                         <?php
                         echo $view->render(
                             'MauticCoreBundle:Helper:list_actions.html.php',
-                            array(
+                            [
                                 'item'            => $item,
-                                'templateButtons' => array(
+                                'templateButtons' => [
                                     'edit'   => $permissions['point:points:edit'],
                                     'clone'  => $permissions['point:points:create'],
                                     'delete' => $permissions['point:points:delete'],
-                                ),
-                                'routeBase'       => 'point'
-                            )
+                                ],
+                                'routeBase' => 'point',
+                            ]
                         );
                         ?>
                     </td>
@@ -94,11 +95,11 @@
 
                             <?php echo $view->render(
                                 'MauticCoreBundle:Helper:publishstatus_icon.html.php',
-                                array('item' => $item, 'model' => 'point')
+                                ['item' => $item, 'model' => 'point']
                             ); ?>
                             <a href="<?php echo $view['router']->path(
                                 'mautic_point_action',
-                                array("objectAction" => "edit", "objectId" => $item->getId())
+                                ['objectAction' => 'edit', 'objectId' => $item->getId()]
                             ); ?>" data-toggle="ajax">
                                 <?php echo $item->getName(); ?>
                             </a>
@@ -111,7 +112,7 @@
                     </td>
                     <td class="visible-md visible-lg">
                         <?php $category = $item->getCategory(); ?>
-                        <?php $catName = ($category)
+                        <?php $catName  = ($category)
                             ? $category->getTitle()
                             : $view['translator']->trans(
                                 'mautic.core.form.uncategorized'
@@ -135,19 +136,19 @@
     <div class="panel-footer">
         <?php echo $view->render(
             'MauticCoreBundle:Helper:pagination.html.php',
-            array(
-                "totalItems" => count($items),
-                "page"       => $page,
-                "limit"      => $limit,
-                "menuLinkId" => 'mautic_point_index',
-                "baseUrl"    => $view['router']->path('mautic_point_index'),
-                'sessionVar' => 'point'
-            )
+            [
+                'totalItems' => count($items),
+                'page'       => $page,
+                'limit'      => $limit,
+                'menuLinkId' => 'mautic_point_index',
+                'baseUrl'    => $view['router']->path('mautic_point_index'),
+                'sessionVar' => 'point',
+            ]
         ); ?>
     </div>
 <?php else: ?>
     <?php echo $view->render(
         'MauticCoreBundle:Helper:noresults.html.php',
-        array('tip' => 'mautic.point.action.noresults.tip')
+        ['tip' => 'mautic.point.action.noresults.tip']
     ); ?>
 <?php endif; ?>
diff --git a/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_point.html.php b/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_point.html.php
index e5bf10469c5..c6e3cf13fde 100644
--- a/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_point.html.php
+++ b/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_point.html.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_point_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-        <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+    <a href="<?php echo $this->container->get('router')->generate('mautic_point_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+        <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
     </a>
 </div>
 <?php else: ?>
 <?php if ($canEdit): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_point_action', array('objectAction' => 'edit', 'objectId' => $item->getId())); ?>" data-toggle="ajax">
-    <?php echo $item->getName();?>
+<a href="<?php echo $this->container->get('router')->generate('mautic_point_action', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
+    <?php echo $item->getName(); ?>
 </a>
 <?php else: ?>
 <span><?php echo $item->getName(); ?></span>
diff --git a/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_trigger.html.php b/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_trigger.html.php
index 5d221e1b0ae..3a47fb3a52c 100644
--- a/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_trigger.html.php
+++ b/app/bundles/PointBundle/Views/SubscribedEvents/Search/global_trigger.html.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_pointtrigger_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-        <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+    <a href="<?php echo $this->container->get('router')->generate('mautic_pointtrigger_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+        <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
     </a>
 </div>
 <?php else: ?>
 <?php if ($canEdit): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_pointtrigger_index', array('objectAction' => 'edit', 'objectId' => $item->getId())); ?>" data-toggle="ajax">
-    <?php echo $item->getName();?>
+<a href="<?php echo $this->container->get('router')->generate('mautic_pointtrigger_index', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
+    <?php echo $item->getName(); ?>
 </a>
 <?php else: ?>
 <span><?php echo $item->getName(); ?></span>
diff --git a/app/bundles/PointBundle/Views/Trigger/details.html.php b/app/bundles/PointBundle/Views/Trigger/details.html.php
index 7ef27b51c68..87a42b337a9 100644
--- a/app/bundles/PointBundle/Views/Trigger/details.html.php
+++ b/app/bundles/PointBundle/Views/Trigger/details.html.php
@@ -1,27 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'pointTrigger');
-$view['slots']->set("headerTitle", $entity->getName());
+$view['slots']->set('headerTitle', $entity->getName());
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'item' => $entity,
-    'templateButtons' => array(
-        'edit'    => $permissions['point:triggers:edit'],
-        'delete'  => $permissions['point:triggers:delete']
-    ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'item'            => $entity,
+    'templateButtons' => [
+        'edit'   => $permissions['point:triggers:edit'],
+        'delete' => $permissions['point:triggers:delete'],
+    ],
     'routeBase' => 'pointtrigger',
-    'langVar'   => 'point.trigger'
-)));
+    'langVar'   => 'point.trigger',
+]));
 ?>
 
 <div class="scrollable trigger-details">
-    <?php //@todo - output trigger details/actions ?>
+    <?php //@todo - output trigger details/actions?>
 </div>
\ No newline at end of file
diff --git a/app/bundles/PointBundle/Views/Trigger/form.html.php b/app/bundles/PointBundle/Views/Trigger/form.html.php
index 41a04cf3a1b..05532433bb7 100644
--- a/app/bundles/PointBundle/Views/Trigger/form.html.php
+++ b/app/bundles/PointBundle/Views/Trigger/form.html.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'pointTrigger');
 
 $header = ($entity->getId()) ?
     $view['translator']->trans('mautic.point.trigger.header.edit',
-        array('%name%' => $view['translator']->trans($entity->getName()))) :
+        ['%name%' => $view['translator']->trans($entity->getName())]) :
     $view['translator']->trans('mautic.point.trigger.header.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 ?>
 
 
@@ -38,7 +38,7 @@
                                 <div class="pa-md">
                                     <?php
                                     echo $view['form']->row($form['name']);
-                                    echo $view['form']->row($form['description'], array('attr' => array('class' => 'form-control editor')));
+                                    echo $view['form']->row($form['description'], ['attr' => ['class' => 'form-control editor']]);
                                     ?>
                                 </div>
                             </div>
@@ -70,7 +70,7 @@
                                             </li>
                                             <?php foreach ($event as $k => $e): ?>
                                                 <li id="event_<?php echo $k; ?>">
-                                                    <a data-toggle="ajaxmodal" data-target="#triggerEventModal" class="list-group-item" href="<?php echo $view['router']->path('mautic_pointtriggerevent_action', array('objectAction' => 'new', 'type' => $k, 'tmpl'=> 'event', 'triggerId' => $sessionId)); ?>">
+                                                    <a data-toggle="ajaxmodal" data-target="#triggerEventModal" class="list-group-item" href="<?php echo $view['router']->path('mautic_pointtriggerevent_action', ['objectAction' => 'new', 'type' => $k, 'tmpl' => 'event', 'triggerId' => $sessionId]); ?>">
                                                         <div data-toggle="tooltip" title="<?php echo $e['description']; ?>">
                                                             <span><?php echo $e['label']; ?></span>
                                                         </div>
@@ -85,12 +85,12 @@
                             foreach ($triggerEvents as $event):
                                 $template = (isset($event['settings']['template'])) ? $event['settings']['template'] :
                                     'MauticPointBundle:Event:generic.html.php';
-                                echo $view->render($template, array(
+                                echo $view->render($template, [
                                     'event'     => $event,
                                     'id'        => $event['id'],
                                     'deleted'   => in_array($event['id'], $deletedEvents),
-                                    'sessionId' => $sessionId
-                                ));
+                                    'sessionId' => $sessionId,
+                                ]);
                             endforeach;
                             ?>
                             <?php if (!count($triggerEvents)): ?>
@@ -118,9 +118,9 @@
 <?php echo $view['form']->end($form); ?>
 
  <?php
-    $view['slots']->append('modal', $this->render('MauticCoreBundle:Helper:modal.html.php', array(
+    $view['slots']->append('modal', $this->render('MauticCoreBundle:Helper:modal.html.php', [
         'id'            => 'triggerEventModal',
         'header'        => $view['translator']->trans('mautic.point.trigger.form.modalheader'),
-        'footerButtons' => true
-    )));
+        'footerButtons' => true,
+    ]));
 ?>
diff --git a/app/bundles/PointBundle/Views/Trigger/index.html.php b/app/bundles/PointBundle/Views/Trigger/index.html.php
index 975a733df60..ee00a7c6c18 100644
--- a/app/bundles/PointBundle/Views/Trigger/index.html.php
+++ b/app/bundles/PointBundle/Views/Trigger/index.html.php
@@ -1,27 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'pointTrigger');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.point.trigger.header.index'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.point.trigger.header.index'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['point:triggers:create']
-            ),
-            'routeBase'       => 'pointtrigger',
-            'langVar'         => 'point.trigger'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['point:triggers:create'],
+            ],
+            'routeBase' => 'pointtrigger',
+            'langVar'   => 'point.trigger',
+        ]
     )
 );
 ?>
@@ -29,16 +29,16 @@
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render(
         'MauticCoreBundle:Helper:list_toolbar.html.php',
-        array(
-            'searchValue' => $searchValue,
-            'searchHelp'  => 'mautic.core.help.searchcommands',
+        [
+            'searchValue'     => $searchValue,
+            'searchHelp'      => 'mautic.core.help.searchcommands',
             'action'          => $currentRoute,
             'langVar'         => 'point.trigger',
             'routeBase'       => 'pointtrigger',
-            'templateButtons' => array(
-                'delete' => $permissions['point:triggers:delete']
-            )
-        )
+            'templateButtons' => [
+                'delete' => $permissions['point:triggers:delete'],
+            ],
+        ]
     ); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/PointBundle/Views/Trigger/list.html.php b/app/bundles/PointBundle/Views/Trigger/list.html.php
index f2eddbd5ace..9386251606e 100644
--- a/app/bundles/PointBundle/Views/Trigger/list.html.php
+++ b/app/bundles/PointBundle/Views/Trigger/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
-$view->extend('MauticPointBundle:Trigger:index.html.php');
+if ($tmpl == 'index') {
+    $view->extend('MauticPointBundle:Trigger:index.html.php');
+}
 ?>
 
 <?php if (count($items)): ?>
@@ -16,41 +18,41 @@
         <thead>
         <tr>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'checkall' => 'true',
-                'target'   => '#triggerTable'
-            ));
+                'target'   => '#triggerTable',
+            ]);
 
             echo "<th class='col-pointtrigger-color'></th>";
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'pointtrigger',
                 'orderBy'    => 't.name',
                 'text'       => 'mautic.core.name',
                 'class'      => 'col-pointtrigger-name',
-                'default'    => true
-            ));
+                'default'    => true,
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'pointtrigger',
                 'orderBy'    => 'c.title',
                 'text'       => 'mautic.core.category',
-                'class'      => 'col-pointtrigger-category visible-md visible-lg'
-            ));
+                'class'      => 'col-pointtrigger-category visible-md visible-lg',
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'pointtrigger',
                 'orderBy'    => 't.points',
                 'text'       => 'mautic.point.trigger.thead.points',
-                'class'      => 'col-pointtrigger-points'
-            ));
+                'class'      => 'col-pointtrigger-points',
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'pointtrigger',
                 'orderBy'    => 't.id',
                 'text'       => 'mautic.core.id',
-                'class'      => 'col-pointtrigger-id visible-md visible-lg'
-            ));
+                'class'      => 'col-pointtrigger-id visible-md visible-lg',
+            ]);
             ?>
         </tr>
         </thead>
@@ -59,16 +61,16 @@
             <tr>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => $permissions['point:triggers:edit'],
-                            'clone'     => $permissions['point:triggers:create'],
-                            'delete'    => $permissions['point:triggers:delete'],
-                        ),
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => $permissions['point:triggers:edit'],
+                            'clone'  => $permissions['point:triggers:create'],
+                            'delete' => $permissions['point:triggers:delete'],
+                        ],
                         'routeBase' => 'pointtrigger',
-                        'langVar'   => 'point.trigger'
-                    ));
+                        'langVar'   => 'point.trigger',
+                    ]);
                     ?>
                 </td>
                 <td>
@@ -76,9 +78,9 @@
                 </td>
                 <td>
                     <div>
-                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array('item' => $item, 'model' => 'point.trigger')); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'point.trigger']); ?>
                         <?php if ($permissions['point:triggers:edit']): ?>
-                        <a href="<?php echo $view['router']->path('mautic_pointtrigger_action', array("objectAction" => "edit", "objectId" => $item->getId())); ?>" data-toggle="ajax">
+                        <a href="<?php echo $view['router']->path('mautic_pointtrigger_action', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                             <?php echo $item->getName(); ?>
                         </a>
                         <?php else: ?>
@@ -92,7 +94,7 @@
                 <td class="visible-md visible-lg">
                     <?php $category = $item->getCategory(); ?>
                     <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                    <?php $color    = ($category) ? '#' . $category->getColor() : 'inherit'; ?>
+                    <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                     <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                 </td>
                 <td><?php echo $item->getPoints(); ?></td>
@@ -103,15 +105,15 @@
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems"      => count($items),
-        "page"            => $page,
-        "limit"           => $limit,
-        "menuLinkId"      => 'mautic_pointtrigger_index',
-        "baseUrl"         => $view['router']->path('mautic_pointtrigger_index'),
-        'sessionVar'      => 'pointtrigger'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => count($items),
+        'page'       => $page,
+        'limit'      => $limit,
+        'menuLinkId' => 'mautic_pointtrigger_index',
+        'baseUrl'    => $view['router']->path('mautic_pointtrigger_index'),
+        'sessionVar' => 'pointtrigger',
+    ]); ?>
 </div>
 <?php else: ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', array('tip' => 'mautic.point.trigger.noresults.tip')); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', ['tip' => 'mautic.point.trigger.noresults.tip']); ?>
 <?php endif; ?>
diff --git a/app/bundles/ReportBundle/Builder/InvalidReportQueryException.php b/app/bundles/ReportBundle/Builder/InvalidReportQueryException.php
index 7878c19bf96..5f858ef63c7 100644
--- a/app/bundles/ReportBundle/Builder/InvalidReportQueryException.php
+++ b/app/bundles/ReportBundle/Builder/InvalidReportQueryException.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\Builder;
 
 /**
- * Class InvalidReportQueryException
+ * Class InvalidReportQueryException.
  */
 class InvalidReportQueryException extends \Exception
 {
diff --git a/app/bundles/ReportBundle/Builder/MauticReportBuilder.php b/app/bundles/ReportBundle/Builder/MauticReportBuilder.php
index 5a77d2dd58a..dc0d09d17e2 100644
--- a/app/bundles/ReportBundle/Builder/MauticReportBuilder.php
+++ b/app/bundles/ReportBundle/Builder/MauticReportBuilder.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,7 +20,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Mautic Report Builder class
+ * Mautic Report Builder class.
  */
 final class MauticReportBuilder implements ReportBuilderInterface
 {
@@ -27,7 +28,7 @@ final class MauticReportBuilder implements ReportBuilderInterface
      * @var array
      */
     const OPERATORS = [
-        'default'     => [
+        'default' => [
             'eq'       => 'mautic.core.operator.equals',
             'gt'       => 'mautic.core.operator.greaterthan',
             'gte'      => 'mautic.core.operator.greaterthanequals',
@@ -39,27 +40,27 @@ final class MauticReportBuilder implements ReportBuilderInterface
             'empty'    => 'mautic.core.operator.isempty',
             'notEmpty' => 'mautic.core.operator.isnotempty',
         ],
-        'bool'        => [
+        'bool' => [
             'eq'  => 'mautic.core.operator.equals',
             'neq' => 'mautic.core.operator.notequals',
         ],
         'int' => [
-            'eq'       => 'mautic.core.operator.equals',
-            'gt'       => 'mautic.core.operator.greaterthan',
-            'gte'      => 'mautic.core.operator.greaterthanequals',
-            'lt'       => 'mautic.core.operator.lessthan',
-            'lte'      => 'mautic.core.operator.lessthanequals',
-            'neq'      => 'mautic.core.operator.notequals'
+            'eq'  => 'mautic.core.operator.equals',
+            'gt'  => 'mautic.core.operator.greaterthan',
+            'gte' => 'mautic.core.operator.greaterthanequals',
+            'lt'  => 'mautic.core.operator.lessthan',
+            'lte' => 'mautic.core.operator.lessthanequals',
+            'neq' => 'mautic.core.operator.notequals',
         ],
         'multiselect' => [
             'in'    => 'mautic.core.operator.in',
-            'notIn' => 'mautic.core.operator.notin'
+            'notIn' => 'mautic.core.operator.notin',
         ],
-        'select'      => [
-            'eq'       => 'mautic.core.operator.equals',
-            'neq'      => 'mautic.core.operator.notequals',
+        'select' => [
+            'eq'  => 'mautic.core.operator.equals',
+            'neq' => 'mautic.core.operator.notequals',
         ],
-        'text'        => [
+        'text' => [
             'eq'       => 'mautic.core.operator.equals',
             'neq'      => 'mautic.core.operator.notequals',
             'empty'    => 'mautic.core.operator.isempty',
@@ -113,7 +114,6 @@ public function getQuery(array $options)
         $queryBuilder = $this->configureBuilder($options);
 
         if ($queryBuilder->getType() !== QueryBuilder::SELECT) {
-
             throw new InvalidReportQueryException('Only SELECT statements are valid');
         }
 
@@ -121,7 +121,7 @@ public function getQuery(array $options)
     }
 
     /**
-     * Gets the getContentTemplate path
+     * Gets the getContentTemplate path.
      *
      * @return string
      */
@@ -131,7 +131,7 @@ public function getContentTemplate()
     }
 
     /**
-     * Configures builder
+     * Configures builder.
      *
      * This method configures the ReportBuilder. It has to return a configured Doctrine DBAL QueryBuilder.
      *
@@ -155,7 +155,7 @@ protected function configureBuilder(array $options)
         $this->contentTemplate = $event->getContentTemplate();
 
         // Build WHERE clause
-        $filtersApplied =  false;
+        $filtersApplied = false;
         if (isset($options['dynamicFilters'])) {
             $filtersApplied = $this->applyFilters($options['dynamicFilters'], $queryBuilder, $options['filters']);
         }
@@ -237,7 +237,7 @@ protected function configureBuilder(array $options)
                     }
 
                     if (isset($options['columns'][$field]['alias'])) {
-                        $select .= " AS ".$options['columns'][$field]['alias'];
+                        $select .= ' AS '.$options['columns'][$field]['alias'];
                     }
 
                     $selectColumns[] = $select;
@@ -314,7 +314,6 @@ private function applyFilters(array $filters, QueryBuilder $queryBuilder, array
                                 $queryBuilder->setParameter($paramName, $filter['value']);
                         }
 
-
                         $filterExpr->add(
                             $expr->{$exprFunction}($filter['column'], $columnValue)
                         );
@@ -330,4 +329,4 @@ private function applyFilters(array $filters, QueryBuilder $queryBuilder, array
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/Builder/ReportBuilderInterface.php b/app/bundles/ReportBundle/Builder/ReportBuilderInterface.php
index ba98b5556d4..ad1fbd73d87 100644
--- a/app/bundles/ReportBundle/Builder/ReportBuilderInterface.php
+++ b/app/bundles/ReportBundle/Builder/ReportBuilderInterface.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\Builder;
 
 /**
- * Interface ReportBuilderInterface
+ * Interface ReportBuilderInterface.
  */
 interface ReportBuilderInterface
 {
     /**
-     * Gets the query instance with default parameters
+     * Gets the query instance with default parameters.
      *
      * @param array $options Options array
      *
diff --git a/app/bundles/ReportBundle/Config/config.php b/app/bundles/ReportBundle/Config/config.php
index 58ae5235131..c67e64eb0bc 100644
--- a/app/bundles/ReportBundle/Config/config.php
+++ b/app/bundles/ReportBundle/Config/config.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
     'routes' => [
         'main' => [
-            'mautic_report_index'  => [
+            'mautic_report_index' => [
                 'path'       => '/reports/{page}',
                 'controller' => 'MauticReportBundle:Report:index',
             ],
@@ -21,10 +22,10 @@
                     'format' => 'csv',
                 ],
             ],
-            'mautic_report_view'   => [
-                'path'         => '/reports/view/{objectId}/{reportPage}',
-                'controller'   => 'MauticReportBundle:Report:view',
-                'defaults'     => [
+            'mautic_report_view' => [
+                'path'       => '/reports/view/{objectId}/{reportPage}',
+                'controller' => 'MauticReportBundle:Report:view',
+                'defaults'   => [
                     'reportPage' => 1,
                 ],
                 'requirements' => [
@@ -36,12 +37,12 @@
                 'controller' => 'MauticReportBundle:Report:execute',
             ],
         ],
-        'api'  => [
+        'api' => [
             'mautic_api_getreports' => [
                 'path'       => '/reports',
                 'controller' => 'MauticReportBundle:Api\ReportApi:getEntities',
             ],
-            'mautic_api_getreport'  => [
+            'mautic_api_getreport' => [
                 'path'       => '/reports/{id}',
                 'controller' => 'MauticReportBundle:Api\ReportApi:getReport',
             ],
@@ -57,7 +58,7 @@
                     'report:reports:viewown',
                     'report:reports:viewother',
                 ],
-                'priority'  => 20,
+                'priority' => 20,
             ],
         ],
     ],
@@ -65,30 +66,30 @@
     'services' => [
         'events' => [
             'mautic.report.search.subscriber' => [
-                'class' => 'Mautic\ReportBundle\EventListener\SearchSubscriber',
+                'class'     => 'Mautic\ReportBundle\EventListener\SearchSubscriber',
                 'arguments' => [
                     'mautic.helper.user',
-                    'mautic.report.model.report'
-                ]
+                    'mautic.report.model.report',
+                ],
             ],
             'mautic.report.report.subscriber' => [
-                'class' => 'Mautic\ReportBundle\EventListener\ReportSubscriber',
+                'class'     => 'Mautic\ReportBundle\EventListener\ReportSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
+                    'mautic.core.model.auditlog',
+                ],
             ],
             'mautic.report.dashboard.subscriber' => [
                 'class'     => 'Mautic\ReportBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
                     'mautic.report.model.report',
-                    'mautic.security'
-                ]
+                    'mautic.security',
+                ],
 
             ],
         ],
-        'forms'  => [
-            'mautic.form.type.report'          => [
+        'forms' => [
+            'mautic.form.type.report' => [
                 'class'     => 'Mautic\ReportBundle\Form\Type\ReportType',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'report',
@@ -97,21 +98,21 @@
                 'class' => 'Mautic\ReportBundle\Form\Type\FilterSelectorType',
                 'alias' => 'filter_selector',
             ],
-            'mautic.form.type.table_order'     => [
+            'mautic.form.type.table_order' => [
                 'class'     => 'Mautic\ReportBundle\Form\Type\TableOrderType',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'table_order',
             ],
-            'mautic.form.type.report_filters'  => [
+            'mautic.form.type.report_filters' => [
                 'class'     => 'Mautic\ReportBundle\Form\Type\ReportFiltersType',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'report_filters',
             ],
-            'mautic.form.type.report_dynamic_filters'  => [
-                'class'     => 'Mautic\ReportBundle\Form\Type\DynamicFiltersType',
-                'alias'     => 'report_dynamicfilters',
+            'mautic.form.type.report_dynamic_filters' => [
+                'class' => 'Mautic\ReportBundle\Form\Type\DynamicFiltersType',
+                'alias' => 'report_dynamicfilters',
             ],
-            'mautic.form.type.report_widget'  => [
+            'mautic.form.type.report_widget' => [
                 'class'     => 'Mautic\ReportBundle\Form\Type\ReportWidgetType',
                 'alias'     => 'report_widget',
                 'arguments' => 'mautic.report.model.report',
diff --git a/app/bundles/ReportBundle/Controller/AjaxController.php b/app/bundles/ReportBundle/Controller/AjaxController.php
index 5b2aabbba2c..3f467920965 100644
--- a/app/bundles/ReportBundle/Controller/AjaxController.php
+++ b/app/bundles/ReportBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,16 +12,14 @@
 
 use Mautic\CoreBundle\Controller\AjaxController as CommonAjaxController;
 use Symfony\Component\HttpFoundation\Request;
-use Mautic\CoreBundle\Helper\InputHelper;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
-
     /**
-     * Get updated data for context
+     * Get updated data for context.
      *
      * @param Request $request
      *
diff --git a/app/bundles/ReportBundle/Controller/Api/ReportApiController.php b/app/bundles/ReportBundle/Controller/Api/ReportApiController.php
index e8dc75897e7..2a444373503 100644
--- a/app/bundles/ReportBundle/Controller/Api/ReportApiController.php
+++ b/app/bundles/ReportBundle/Controller/Api/ReportApiController.php
@@ -1,25 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\Controller\Api;
 
 use FOS\RestBundle\Util\Codes;
-use JMS\Serializer\SerializationContext;
 use Mautic\ApiBundle\Controller\CommonApiController;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class ReportApiController
+ * Class ReportApiController.
  */
 class ReportApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
@@ -31,29 +30,29 @@ public function initialize(FilterControllerEvent $event)
         $this->entityNameOne    = 'report';
         $this->entityNameMulti  = 'reports';
         $this->permissionBase   = 'report:reports';
-        $this->serializerGroups = array('reportList', 'reportDetails');
+        $this->serializerGroups = ['reportList', 'reportDetails'];
     }
 
     /**
-     * Obtains a list of reports
+     * Obtains a list of reports.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function getEntitiesAction()
     {
         if (!$this->security->isGranted('report:reports:viewother')) {
-            $this->listFilters = array(
+            $this->listFilters = [
                 'column' => 'r.createdBy',
                 'expr'   => 'eq',
-                'value'  => $this->user->getId()
-            );
+                'value'  => $this->user->getId(),
+            ];
         }
 
         return parent::getEntitiesAction();
     }
 
     /**
-     * Obtains a compiled report
+     * Obtains a compiled report.
      *
      * @param int $id Report ID
      *
@@ -67,10 +66,10 @@ public function getReportAction($id)
             return $this->notFound();
         }
 
-        $reportData = $this->model->getReportData($entity, $this->container->get('form.factory'), array('paginate' => false, 'ignoreGraphData' => true));
+        $reportData = $this->model->getReportData($entity, $this->container->get('form.factory'), ['paginate' => false, 'ignoreGraphData' => true]);
 
         // Unset keys that we don't need to send back
-        foreach (array('graphs', 'contentTemplate', 'columns', 'limit') as $key) {
+        foreach (['graphs', 'contentTemplate', 'columns', 'limit'] as $key) {
             unset($reportData[$key]);
         }
 
diff --git a/app/bundles/ReportBundle/Controller/ReportController.php b/app/bundles/ReportBundle/Controller/ReportController.php
index 623bb2530ad..b3b48e575c6 100644
--- a/app/bundles/ReportBundle/Controller/ReportController.php
+++ b/app/bundles/ReportBundle/Controller/ReportController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Symfony\Component\HttpFoundation;
 
 /**
- * Class ReportController
+ * Class ReportController.
  */
 class ReportController extends FormController
 {
-
     /**
      * @param int $page
      *
@@ -40,9 +40,9 @@ public function indexAction($page = 1)
                 'report:reports:deleteown',
                 'report:reports:deleteother',
                 'report:reports:publishown',
-                'report:reports:publishother'
+                'report:reports:publishother',
             ],
-            "RETURN_ARRAY"
+            'RETURN_ARRAY'
         );
 
         if (!$permissions['report:reports:viewown'] && !$permissions['report:reports:viewother']) {
@@ -78,7 +78,7 @@ public function indexAction($page = 1)
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
+                'orderByDir' => $orderByDir,
             ]
         );
 
@@ -96,8 +96,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticReportBundle:Report:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_report_index',
-                        'mauticContent' => 'report'
-                    ]
+                        'mauticContent' => 'report',
+                    ],
                 ]
             );
         }
@@ -109,7 +109,7 @@ public function indexAction($page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'searchValue' => $search,
                     'items'       => $reports,
                     'totalItems'  => $count,
@@ -118,20 +118,20 @@ public function indexAction($page = 1)
                     'permissions' => $permissions,
                     'model'       => $model,
                     'tmpl'        => $tmpl,
-                    'security'    => $this->container->get('mautic.security')
+                    'security'    => $this->container->get('mautic.security'),
                 ],
                 'contentTemplate' => 'MauticReportBundle:Report:list.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_report_index',
                     'mauticContent' => 'report',
-                    'route'         => $this->generateUrl('mautic_report_index', ['page' => $page])
-                ]
+                    'route'         => $this->generateUrl('mautic_report_index', ['page' => $page]),
+                ],
             ]
         );
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -162,7 +162,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param $objectId
      *
@@ -180,8 +180,8 @@ public function deleteAction($objectId)
             'contentTemplate' => 'MauticReportBundle:Report:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_report_index',
-                'mauticContent' => 'report'
-            ]
+                'mauticContent' => 'report',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -209,8 +209,8 @@ public function deleteAction($objectId)
                 'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $identifier,
-                    '%id%'   => $objectId
-                ]
+                    '%id%'   => $objectId,
+                ],
             ];
         } //else don't do anything
 
@@ -218,14 +218,14 @@ public function deleteAction($objectId)
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -241,8 +241,8 @@ public function batchDeleteAction()
             'contentTemplate' => 'MauticReportBundle:Report:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_report_index',
-                'mauticContent' => 'report'
-            ]
+                'mauticContent' => 'report',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -258,7 +258,7 @@ public function batchDeleteAction()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.report.report.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->container->get('mautic.security')->hasEntityAccess(
                     'report:reports:deleteown',
@@ -282,8 +282,8 @@ public function batchDeleteAction()
                     'type'    => 'notice',
                     'msg'     => 'mautic.report.report.notice.batch_deleted',
                     'msgVars' => [
-                        '%count%' => count($entities)
-                    ]
+                        '%count%' => count($entities),
+                    ],
                 ];
             }
         } //else don't do anything
@@ -292,14 +292,14 @@ public function batchDeleteAction()
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId   Item ID
      * @param bool $ignorePost Flag to ignore POST data
@@ -323,8 +323,8 @@ public function editAction($objectId, $ignorePost = false)
             'contentTemplate' => 'MauticReportBundle:Report:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_report_index',
-                'mauticContent' => 'report'
-            ]
+                'mauticContent' => 'report',
+            ],
         ];
 
         //not found
@@ -337,7 +337,6 @@ public function editAction($objectId, $ignorePost = false)
             'report'
         );
         if ($check !== true) {
-
             return $check;
         }
 
@@ -368,16 +367,16 @@ public function editAction($objectId, $ignorePost = false)
                                 'mautic_report_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
+                                    'objectId'     => $entity->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
 
-                    $returnUrl  = $this->generateUrl(
+                    $returnUrl = $this->generateUrl(
                         'mautic_report_view',
                         [
-                            'objectId' => $entity->getId()
+                            'objectId' => $entity->getId(),
                         ]
                     );
                     $viewParams = ['objectId' => $entity->getId()];
@@ -408,7 +407,7 @@ public function editAction($objectId, $ignorePost = false)
                         [
                             'returnUrl'       => $returnUrl,
                             'viewParameters'  => $viewParams,
-                            'contentTemplate' => $template
+                            'contentTemplate' => $template,
                         ]
                     )
                 );
@@ -423,7 +422,7 @@ public function editAction($objectId, $ignorePost = false)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'report' => $entity,
                     'form'   => $this->setFormTheme($form, 'MauticReportBundle:Report:form.html.php', 'MauticReportBundle:FormTheme\Report'),
                 ],
@@ -435,18 +434,18 @@ public function editAction($objectId, $ignorePost = false)
                         'mautic_report_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
-     * @param  \Mautic\ReportBundle\Entity\Report|null $entity
+     * @param \Mautic\ReportBundle\Entity\Report|null $entity
      *
      * @return HttpFoundation\JsonResponse|HttpFoundation\RedirectResponse|HttpFoundation\Response
      */
@@ -487,9 +486,9 @@ public function newAction($entity = null)
                                 'mautic_report_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
+                                    'objectId'     => $entity->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
 
@@ -499,10 +498,10 @@ public function newAction($entity = null)
                     }
 
                     $viewParameters = [
-                        'objectId' => $entity->getId()
+                        'objectId' => $entity->getId(),
                     ];
-                    $returnUrl      = $this->generateUrl('mautic_report_view', $viewParameters);
-                    $template       = 'MauticReportBundle:Report:view';
+                    $returnUrl = $this->generateUrl('mautic_report_view', $viewParameters);
+                    $template  = 'MauticReportBundle:Report:view';
                 }
             } else {
                 $viewParameters = ['page' => $page];
@@ -518,8 +517,8 @@ public function newAction($entity = null)
                         'contentTemplate' => $template,
                         'passthroughVars' => [
                             'activeLink'    => 'mautic_asset_index',
-                            'mauticContent' => 'asset'
-                        ]
+                            'mauticContent' => 'asset',
+                        ],
                     ]
                 );
             }
@@ -527,9 +526,9 @@ public function newAction($entity = null)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'report' => $entity,
-                    'form'   => $this->setFormTheme($form, 'MauticReportBundle:Report:form.html.php', 'MauticReportBundle:FormTheme\Report')
+                    'form'   => $this->setFormTheme($form, 'MauticReportBundle:Report:form.html.php', 'MauticReportBundle:FormTheme\Report'),
                 ],
                 'contentTemplate' => 'MauticReportBundle:Report:form.html.php',
                 'passthroughVars' => [
@@ -538,18 +537,18 @@ public function newAction($entity = null)
                     'route'         => $this->generateUrl(
                         'mautic_report_action',
                         [
-                            'objectAction' => 'new'
+                            'objectAction' => 'new',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Shows a report
+     * Shows a report.
      *
-     * @param int $objectId Report ID
+     * @param int $objectId   Report ID
      * @param int $reportPage
      *
      * @return HttpFoundation\JsonResponse|HttpFoundation\Response
@@ -571,15 +570,15 @@ public function viewAction($objectId, $reportPage = 1)
                     'contentTemplate' => 'MauticReportBundle:Report:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_report_index',
-                        'mauticContent' => 'report'
+                        'mauticContent' => 'report',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.report.report.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$security->hasEntityAccess('report:reports:viewown', 'report:reports:viewother', $entity->getCreatedBy())) {
@@ -653,24 +652,24 @@ public function viewAction($objectId, $reportPage = 1)
                 'paginate'       => true,
                 'reportPage'     => $reportPage,
                 'dateFrom'       => new \DateTime($dateRangeForm->get('date_from')->getData()),
-                'dateTo'         => new \DateTime($dateRangeForm->get('date_to')->getData())
+                'dateTo'         => new \DateTime($dateRangeForm->get('date_to')->getData()),
             ]
         );
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
-                    'data'              => $reportData['data'],
-                    'columns'           => $reportData['columns'],
-                    'dataColumns'       => $reportData['dataColumns'],
-                    'totalResults'      => $reportData['totalResults'],
-                    'debug'             => $reportData['debug'],
-                    'report'            => $entity,
-                    'reportPage'        => $reportPage,
-                    'graphs'            => $reportData['graphs'],
-                    'tmpl'              => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
-                    'limit'             => $reportData['limit'],
-                    'permissions'       => $security->isGranted(
+                'viewParameters' => [
+                    'data'         => $reportData['data'],
+                    'columns'      => $reportData['columns'],
+                    'dataColumns'  => $reportData['dataColumns'],
+                    'totalResults' => $reportData['totalResults'],
+                    'debug'        => $reportData['debug'],
+                    'report'       => $entity,
+                    'reportPage'   => $reportPage,
+                    'graphs'       => $reportData['graphs'],
+                    'tmpl'         => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
+                    'limit'        => $reportData['limit'],
+                    'permissions'  => $security->isGranted(
                         [
                             'report:reports:viewown',
                             'report:reports:viewother',
@@ -678,9 +677,9 @@ public function viewAction($objectId, $reportPage = 1)
                             'report:reports:editown',
                             'report:reports:editother',
                             'report:reports:deleteown',
-                            'report:reports:deleteother'
+                            'report:reports:deleteother',
                         ],
-                        "RETURN_ARRAY"
+                        'RETURN_ARRAY'
                     ),
                     'dateRangeForm'     => $dateRangeForm->createView(),
                     'dynamicFilterForm' => $dynamicFilterForm->createView(),
@@ -693,16 +692,16 @@ public function viewAction($objectId, $reportPage = 1)
                         'mautic_report_view',
                         [
                             'objectId'   => $entity->getId(),
-                            'reportPage' => $reportPage
+                            'reportPage' => $reportPage,
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Checks access to an entity
+     * Checks access to an entity.
      *
      * @param object                               $entity
      * @param int                                  $objectId
@@ -723,9 +722,9 @@ private function checkEntityAccess($postActionVars, $entity, $objectId, array $p
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.report.report.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -739,12 +738,12 @@ private function checkEntityAccess($postActionVars, $entity, $objectId, array $p
         return true;
     }
 
-
     /**
      * @param int    $objectId
      * @param string $format
      *
      * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     *
      * @throws \Exception
      */
     public function exportAction($objectId, $format = 'csv')
@@ -764,28 +763,28 @@ public function exportAction($objectId, $format = 'csv')
                     'contentTemplate' => 'MauticReportBundle:Report:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_report_index',
-                        'mauticContent' => 'report'
+                        'mauticContent' => 'report',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.report.report.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         } elseif (!$security->hasEntityAccess('report:reports:viewown', 'report:reports:viewother', $entity->getCreatedBy())) {
             return $this->accessDenied();
         }
 
-        $session    = $this->get('session');
-        $fromDate   = $session->get('mautic.report.date.from', (new \DateTime('-30 days'))->format('Y-m-d'));
-        $toDate     = $session->get('mautic.report.date.to', (new \DateTime())->format('Y-m-d'));
+        $session  = $this->get('session');
+        $fromDate = $session->get('mautic.report.date.from', (new \DateTime('-30 days'))->format('Y-m-d'));
+        $toDate   = $session->get('mautic.report.date.to', (new \DateTime())->format('Y-m-d'));
 
         $reportData = $model->getReportData($entity, null, [
             'dateFrom' => new \DateTime($fromDate),
-            'dateTo'   => new \DateTime($toDate)
+            'dateTo'   => new \DateTime($toDate),
         ]);
 
         return $model->exportResults($format, $entity, $reportData);
diff --git a/app/bundles/ReportBundle/DataFixtures/ORM/LoadReportData.php b/app/bundles/ReportBundle/DataFixtures/ORM/LoadReportData.php
index 66058d9b417..d2909ff4bb6 100644
--- a/app/bundles/ReportBundle/DataFixtures/ORM/LoadReportData.php
+++ b/app/bundles/ReportBundle/DataFixtures/ORM/LoadReportData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,11 +19,10 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class LoadReportData
+ * Class LoadReportData.
  */
 class LoadReportData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -41,14 +41,14 @@ public function setContainer(ContainerInterface $container = null)
      */
     public function load(ObjectManager $manager)
     {
-        $reports = CsvHelper::csv_to_array(__DIR__ . '/fakereportdata.csv');
+        $reports = CsvHelper::csv_to_array(__DIR__.'/fakereportdata.csv');
         foreach ($reports as $count => $rows) {
             $report = new Report();
             $key    = $count + 1;
             foreach ($rows as $col => $val) {
-                if ($val != "NULL") {
-                    $setter = "set" . ucfirst($col);
-                    if (in_array($col, array('columns', 'filters', 'graphs', 'tableOrder'))) {
+                if ($val != 'NULL') {
+                    $setter = 'set'.ucfirst($col);
+                    if (in_array($col, ['columns', 'filters', 'graphs', 'tableOrder'])) {
                         $val = unserialize(stripslashes($val));
                     }
                     $report->$setter($val);
@@ -57,7 +57,7 @@ public function load(ObjectManager $manager)
 
             $manager->persist($report);
 
-            $this->setReference('report-' . $key, $report);
+            $this->setReference('report-'.$key, $report);
         }
         $manager->flush();
     }
diff --git a/app/bundles/ReportBundle/Entity/Report.php b/app/bundles/ReportBundle/Entity/Report.php
index d1e68b47a4b..dd4e53cc69c 100644
--- a/app/bundles/ReportBundle/Entity/Report.php
+++ b/app/bundles/ReportBundle/Entity/Report.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,9 +18,7 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Report
- *
- * @package Mautic\ReportBundle\Entity
+ * Class Report.
  */
 class Report extends FormEntity
 {
@@ -51,22 +50,22 @@ class Report extends FormEntity
     /**
      * @var array
      */
-    private $columns = array();
+    private $columns = [];
 
     /**
      * @var array
      */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * @var array
      */
-    private $tableOrder = array();
+    private $tableOrder = [];
 
     /**
      * @var array
      */
-    private $graphs = array();
+    private $graphs = [];
 
     public function __clone()
     {
@@ -78,7 +77,7 @@ public function __clone()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -107,22 +106,20 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
         $builder->createField('graphs', 'array')
             ->nullable()
             ->build();
-
-
     }
 
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('name', new NotBlank(array(
-            'message' => 'mautic.core.name.required'
-        )));
+        $metadata->addPropertyConstraint('name', new NotBlank([
+            'message' => 'mautic.core.name.required',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -134,7 +131,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'id',
                     'name',
                     'description',
-                    'system'
+                    'system',
                 ]
             )
             ->addProperties(
@@ -143,30 +140,30 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'columns',
                     'filters',
                     'tableOrder',
-                    'graphs'
+                    'graphs',
                 ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Report
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -175,23 +172,23 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Set system
+     * Set system.
      *
      * @param string $system
      *
      * @return Report
      */
-    public function setSystem ($system)
+    public function setSystem($system)
     {
         $this->isChanged('system', $system);
         $this->system = $system;
@@ -200,23 +197,23 @@ public function setSystem ($system)
     }
 
     /**
-     * Get system
+     * Get system.
      *
-     * @return integer
+     * @return int
      */
-    public function getSystem ()
+    public function getSystem()
     {
         return $this->system;
     }
 
     /**
-     * Set source
+     * Set source.
      *
      * @param string $source
      *
      * @return Report
      */
-    public function setSource ($source)
+    public function setSource($source)
     {
         $this->isChanged('source', $source);
         $this->source = $source;
@@ -225,23 +222,23 @@ public function setSource ($source)
     }
 
     /**
-     * Get source
+     * Get source.
      *
      * @return string
      */
-    public function getSource ()
+    public function getSource()
     {
         return $this->source;
     }
 
     /**
-     * Set columns
+     * Set columns.
      *
      * @param string $columns
      *
      * @return Report
      */
-    public function setColumns ($columns)
+    public function setColumns($columns)
     {
         $this->isChanged('columns', $columns);
         $this->columns = $columns;
@@ -250,23 +247,23 @@ public function setColumns ($columns)
     }
 
     /**
-     * Get columns
+     * Get columns.
      *
      * @return string
      */
-    public function getColumns ()
+    public function getColumns()
     {
         return $this->columns;
     }
 
     /**
-     * Set filters
+     * Set filters.
      *
      * @param string $filters
      *
      * @return Report
      */
-    public function setFilters ($filters)
+    public function setFilters($filters)
     {
         $this->isChanged('filters', $filters);
         $this->filters = $filters;
@@ -275,11 +272,11 @@ public function setFilters ($filters)
     }
 
     /**
-     * Get filters
+     * Get filters.
      *
      * @return string
      */
-    public function getFilters ()
+    public function getFilters()
     {
         return $this->filters;
     }
@@ -287,7 +284,7 @@ public function getFilters ()
     /**
      * @return mixed
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
@@ -295,7 +292,7 @@ public function getDescription ()
     /**
      * @param mixed $description
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->description = $description;
     }
@@ -303,7 +300,7 @@ public function setDescription ($description)
     /**
      * @return mixed
      */
-    public function getTableOrder ()
+    public function getTableOrder()
     {
         return $this->tableOrder;
     }
@@ -311,7 +308,7 @@ public function getTableOrder ()
     /**
      * @param array $tableOrder
      */
-    public function setTableOrder (array $tableOrder)
+    public function setTableOrder(array $tableOrder)
     {
         $this->tableOrder = $tableOrder;
     }
@@ -319,7 +316,7 @@ public function setTableOrder (array $tableOrder)
     /**
      * @return mixed
      */
-    public function getGraphs ()
+    public function getGraphs()
     {
         return $this->graphs;
     }
@@ -327,8 +324,8 @@ public function getGraphs ()
     /**
      * @param array $graphs
      */
-    public function setGraphs (array $graphs)
+    public function setGraphs(array $graphs)
     {
         $this->graphs = $graphs;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/Entity/ReportRepository.php b/app/bundles/ReportBundle/Entity/ReportRepository.php
index a45d887d961..c56a2ad443b 100644
--- a/app/bundles/ReportBundle/Entity/ReportRepository.php
+++ b/app/bundles/ReportBundle/Entity/ReportRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,19 +14,18 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * ReportRepository
+ * ReportRepository.
  */
 class ReportRepository extends CommonRepository
 {
-
     /**
-     * Get a list of entities
+     * Get a list of entities.
      *
      * @param array $args
      *
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('r')
@@ -41,8 +41,8 @@ public function getEntities($args = array())
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('r.name',  ":$unique")
@@ -50,10 +50,11 @@ protected function addCatchAllWhereClause(&$q, $filter)
         if ($filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -67,17 +68,17 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr            = $q->expr()->eq("r.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('r.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
 
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr            = $q->expr()->eq("r.isPublished", ":$unique");
-                $forceParameters = array($unique => false);
+                $expr            = $q->expr()->eq('r.isPublished', ":$unique");
+                $forceParameters = [$unique => false];
 
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr            = $q->expr()->eq("IDENTITY(r.createdBy)", $this->currentUser->getId());
+                $expr            = $q->expr()->eq('IDENTITY(r.createdBy)', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
         }
@@ -89,13 +90,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif (!$returnParameter) {
-            $parameters = array();
+            $parameters = [];
         } else {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array($expr, $parameters);
+        return [$expr, $parameters];
     }
 
     /**
@@ -103,11 +104,11 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isunpublished',
-            'mautic.core.searchcommand.ismine'
-        );
+            'mautic.core.searchcommand.ismine',
+        ];
     }
 
     /**
@@ -115,9 +116,9 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('r.name', 'ASC')
-        );
+        return [
+            ['r.name', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/ReportBundle/Event/AbstractReportEvent.php b/app/bundles/ReportBundle/Event/AbstractReportEvent.php
index a483fdff7a1..966498ba8e0 100644
--- a/app/bundles/ReportBundle/Event/AbstractReportEvent.php
+++ b/app/bundles/ReportBundle/Event/AbstractReportEvent.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-namespace Mautic\ReportBundle\Event;
 
+namespace Mautic\ReportBundle\Event;
 
 use Symfony\Component\EventDispatcher\Event;
 
@@ -19,7 +20,7 @@ class AbstractReportEvent extends Event
     protected $context = '';
 
     /**
-     * Report entity
+     * Report entity.
      *
      * @var Report
      */
@@ -34,7 +35,7 @@ public function getReport()
     }
 
     /**
-     * Get the context
+     * Get the context.
      *
      * @return string
      */
@@ -51,19 +52,15 @@ public function getContext()
     public function checkContext($context)
     {
         if (empty($this->context)) {
-
             return true;
         }
 
         if (is_array($context)) {
-
             return in_array($this->context, $context);
-        } else if ($this->context == $context) {
-
+        } elseif ($this->context == $context) {
             return true;
         } else {
-
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/Event/ReportBuilderEvent.php b/app/bundles/ReportBundle/Event/ReportBuilderEvent.php
index cd3337c6806..95d8272aaf7 100644
--- a/app/bundles/ReportBundle/Event/ReportBuilderEvent.php
+++ b/app/bundles/ReportBundle/Event/ReportBuilderEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,19 +13,19 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class ReportBuilderEvent
+ * Class ReportBuilderEvent.
  */
 class ReportBuilderEvent extends AbstractReportEvent
 {
     /**
-     * Container with registered tables and columns
+     * Container with registered tables and columns.
      *
      * @var array
      */
     private $tableArray = [];
 
     /**
-     * Supported graphs
+     * Supported graphs.
      *
      * @var array
      */
@@ -32,11 +33,11 @@ class ReportBuilderEvent extends AbstractReportEvent
         'table',
         'bar',
         'pie',
-        'line'
+        'line',
     ];
 
     /**
-     * Container with registered graphs
+     * Container with registered graphs.
      *
      * @var array
      */
@@ -111,11 +112,12 @@ function ($a, $b) {
         if ($this->context == $context) {
             $this->stopPropagation();
         }
+
         return $this;
     }
 
     /**
-     * Fetch the tables in the lookup array
+     * Fetch the tables in the lookup array.
      *
      * @return array
      */
@@ -125,67 +127,67 @@ public function getTables()
     }
 
     /**
-     * Returns standard form fields such as id, name, publish_up, etc
+     * Returns standard form fields such as id, name, publish_up, etc.
      *
-     * @param        $prefix
+     * @param   $prefix
      *
      * @return array
      */
     public function getStandardColumns($prefix, $removeColumns = [], $idLink = null)
     {
         $aliasPrefix = str_replace('.', '_', $prefix);
-        $columns = [
-            $prefix.'id'               => [
+        $columns     = [
+            $prefix.'id' => [
                 'label' => 'mautic.core.id',
                 'type'  => 'int',
                 'link'  => $idLink,
-                'alias' => "{$aliasPrefix}id"
+                'alias' => "{$aliasPrefix}id",
             ],
-            $prefix.'name'             => [
+            $prefix.'name' => [
                 'label' => 'mautic.core.name',
                 'type'  => 'string',
-                'alias' => "{$aliasPrefix}name"
+                'alias' => "{$aliasPrefix}name",
             ],
-            $prefix.'created_by_user'  => [
+            $prefix.'created_by_user' => [
                 'label' => 'mautic.core.createdby',
                 'type'  => 'string',
-                'alias' => "{$aliasPrefix}created_by_user"
+                'alias' => "{$aliasPrefix}created_by_user",
             ],
-            $prefix.'date_added'       => [
+            $prefix.'date_added' => [
                 'label' => 'mautic.report.field.date_added',
                 'type'  => 'datetime',
-                'alias' => "{$aliasPrefix}date_added"
+                'alias' => "{$aliasPrefix}date_added",
             ],
             $prefix.'modified_by_user' => [
                 'label' => 'mautic.report.field.modified_by_user',
                 'type'  => 'string',
-                'alias' => "{$aliasPrefix}modified_by_user"
+                'alias' => "{$aliasPrefix}modified_by_user",
             ],
-            $prefix.'date_modified'    => [
+            $prefix.'date_modified' => [
                 'label' => 'mautic.report.field.date_modified',
                 'type'  => 'datetime',
-                'alias' => "{$aliasPrefix}date_modified"
+                'alias' => "{$aliasPrefix}date_modified",
             ],
-            $prefix.'description'      => [
+            $prefix.'description' => [
                 'label' => 'mautic.core.description',
                 'type'  => 'string',
-                'alias' => "{$aliasPrefix}description"
+                'alias' => "{$aliasPrefix}description",
             ],
-            $prefix.'publish_up'       => [
+            $prefix.'publish_up' => [
                 'label' => 'mautic.report.field.publish_up',
                 'type'  => 'datetime',
-                'alias' => "{$aliasPrefix}publish_up"
+                'alias' => "{$aliasPrefix}publish_up",
             ],
-            $prefix.'publish_down'     => [
+            $prefix.'publish_down' => [
                 'label' => 'mautic.report.field.publish_down',
                 'type'  => 'datetime',
-                'alias' => "{$aliasPrefix}publish_down"
+                'alias' => "{$aliasPrefix}publish_down",
             ],
-            $prefix.'is_published'     => [
+            $prefix.'is_published' => [
                 'label' => 'mautic.report.field.is_published',
                 'type'  => 'bool',
-                'alias' => "{$aliasPrefix}is_published"
-            ]
+                'alias' => "{$aliasPrefix}is_published",
+            ],
         ];
 
         if (empty($idLink)) {
@@ -204,78 +206,78 @@ public function getStandardColumns($prefix, $removeColumns = [], $idLink = null)
     }
 
     /**
-     * Returns lead columns
+     * Returns lead columns.
      *
-     * @param        $prefix
+     * @param   $prefix
      *
      * @return array
      */
     public function getLeadColumns($prefix = 'l.')
     {
         return [
-            $prefix.'id'        => [
+            $prefix.'id' => [
                 'label' => 'mautic.report.field.lead.id',
                 'type'  => 'int',
-                'alias' => 'contact_id'
+                'alias' => 'contact_id',
             ],
-            $prefix.'title'     => [
+            $prefix.'title' => [
                 'label' => 'mautic.report.field.lead.title',
                 'type'  => 'string',
-                'alias' => 'contact_title'
+                'alias' => 'contact_title',
             ],
             $prefix.'firstname' => [
                 'label' => 'mautic.report.field.lead.firstname',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'lastname'  => [
+            $prefix.'lastname' => [
                 'label' => 'mautic.report.field.lead.lastname',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'email'     => [
+            $prefix.'email' => [
                 'label' => 'mautic.report.field.lead.email',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'company'   => [
+            $prefix.'company' => [
                 'label' => 'mautic.report.field.lead.company',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'position'  => [
+            $prefix.'position' => [
                 'label' => 'mautic.report.field.lead.position',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'phone'     => [
+            $prefix.'phone' => [
                 'label' => 'mautic.report.field.lead.phone',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'mobile'    => [
+            $prefix.'mobile' => [
                 'label' => 'mautic.report.field.lead.mobile',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'address1'  => [
+            $prefix.'address1' => [
                 'label' => 'mautic.report.field.lead.address1',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'address2'  => [
+            $prefix.'address2' => [
                 'label' => 'mautic.report.field.lead.address2',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'country'   => [
+            $prefix.'country' => [
                 'label' => 'mautic.report.field.lead.country',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'city'      => [
+            $prefix.'city' => [
                 'label' => 'mautic.report.field.lead.city',
-                'type'  => 'string'
+                'type'  => 'string',
             ],
-            $prefix.'state'     => [
+            $prefix.'state' => [
                 'label' => 'mautic.report.field.lead.zipcode',
-                'type'  => 'string'
-            ]
+                'type'  => 'string',
+            ],
         ];
     }
 
     /**
-     * Get IP Address column
+     * Get IP Address column.
      *
      * @param string $prefix
      *
@@ -286,13 +288,13 @@ public function getIpColumn($prefix = 'i.')
         return [
             $prefix.'ip_address' => [
                 'label' => 'mautic.core.ipaddress',
-                'type'  => 'string'
-            ]
+                'type'  => 'string',
+            ],
         ];
     }
 
     /**
-     * Add category columns
+     * Add category columns.
      *
      * @param string $prefix
      *
@@ -301,15 +303,15 @@ public function getIpColumn($prefix = 'i.')
     public function getCategoryColumns($prefix = 'c.')
     {
         return [
-            $prefix.'id'    => [
+            $prefix.'id' => [
                 'label' => 'mautic.report.field.category_id',
                 'type'  => 'int',
-                'alias' => 'category_id'
+                'alias' => 'category_id',
             ],
             $prefix.'title' => [
                 'label' => 'mautic.report.field.category_name',
                 'type'  => 'string',
-                'alias' => 'category_title'
+                'alias' => 'category_title',
             ],
         ];
     }
@@ -327,7 +329,7 @@ public function addGraph($context, $type, $graphId, $options = [])
         if (in_array($type, $this->supportedGraphs)) {
             $this->graphArray[$context][$graphId] = [
                 'options' => $options,
-                'type'    => $type
+                'type'    => $type,
             ];
         }
 
@@ -335,7 +337,7 @@ public function addGraph($context, $type, $graphId, $options = [])
     }
 
     /**
-     * Get graphs
+     * Get graphs.
      *
      * @return array
      */
diff --git a/app/bundles/ReportBundle/Event/ReportDataEvent.php b/app/bundles/ReportBundle/Event/ReportDataEvent.php
index 2ee93809a3a..2ab5924fcab 100644
--- a/app/bundles/ReportBundle/Event/ReportDataEvent.php
+++ b/app/bundles/ReportBundle/Event/ReportDataEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\ReportBundle\Entity\Report;
 
 /**
- * Class ReportDataEvent
+ * Class ReportDataEvent.
  */
 class ReportDataEvent extends AbstractReportEvent
 {
diff --git a/app/bundles/ReportBundle/Event/ReportEvent.php b/app/bundles/ReportBundle/Event/ReportEvent.php
index c80bef949c5..3849fe17b09 100644
--- a/app/bundles/ReportBundle/Event/ReportEvent.php
+++ b/app/bundles/ReportBundle/Event/ReportEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,22 @@
 use Mautic\ReportBundle\Entity\Report;
 
 /**
- * Class ReportEvent
+ * Class ReportEvent.
  */
 class ReportEvent extends CommonEvent
 {
-
     /**
      * @param Report $report
      * @param bool   $isNew
      */
     public function __construct(Report &$report, $isNew = false)
     {
-        $this->entity  =& $report;
-        $this->isNew   = $isNew;
+        $this->entity = &$report;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Report entity
+     * Returns the Report entity.
      *
      * @return Report
      */
@@ -39,7 +39,7 @@ public function getReport()
     }
 
     /**
-     * Sets the Report entity
+     * Sets the Report entity.
      *
      * @param Report $report
      */
diff --git a/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php b/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php
index 06f28865fe1..f48d6208eba 100644
--- a/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php
+++ b/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\ReportBundle\Entity\Report;
 
 /**
- * Class ReportGeneratorEvent
+ * Class ReportGeneratorEvent.
  */
 class ReportGeneratorEvent extends AbstractReportEvent
 {
@@ -24,14 +25,14 @@ class ReportGeneratorEvent extends AbstractReportEvent
     private $selectColumns = [];
 
     /**
-     * QueryBuilder object
+     * QueryBuilder object.
      *
      * @var QueryBuilder
      */
     private $queryBuilder;
 
     /**
-     * contentTemplate
+     * contentTemplate.
      *
      * @var string
      */
@@ -48,7 +49,7 @@ class ReportGeneratorEvent extends AbstractReportEvent
     private $filterExpression = null;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param string $context Event context
      */
@@ -61,15 +62,15 @@ public function __construct(Report $report, array $options, QueryBuilder $qb)
     }
 
     /**
-     * Fetch the QueryBuilder object
+     * Fetch the QueryBuilder object.
      *
      * @return QueryBuilder
+     *
      * @throws \RuntimeException
      */
     public function getQueryBuilder()
     {
         if ($this->queryBuilder instanceof QueryBuilder) {
-
             return $this->queryBuilder;
         }
 
@@ -77,11 +78,9 @@ public function getQueryBuilder()
     }
 
     /**
-     * Set the QueryBuilder object
+     * Set the QueryBuilder object.
      *
      * @param QueryBuilder $queryBuilder
-     *
-     * @return void
      */
     public function setQueryBuilder(QueryBuilder $queryBuilder)
     {
@@ -89,9 +88,10 @@ public function setQueryBuilder(QueryBuilder $queryBuilder)
     }
 
     /**
-     * Fetch the ContentTemplate path
+     * Fetch the ContentTemplate path.
      *
      * @return QueryBuilder
+     *
      * @throws \RuntimeException
      */
     public function getContentTemplate()
@@ -105,11 +105,9 @@ public function getContentTemplate()
     }
 
     /**
-     * Set the ContentTemplate path
+     * Set the ContentTemplate path.
      *
      * @param string $contentTemplate
-     *
-     * @return void
      */
     public function setContentTemplate($contentTemplate)
     {
@@ -125,7 +123,7 @@ public function getSelectColumns()
     }
 
     /**
-     * Set custom select columns with aliases based on report settings
+     * Set custom select columns with aliases based on report settings.
      *
      * @param array $selectColumns
      *
@@ -173,18 +171,18 @@ public function setFilterExpression(ExpressionBuilder $filterExpression)
     }
 
     /**
-     * Add category left join
+     * Add category left join.
      *
      * @param QueryBuilder $queryBuilder
      * @param              $prefix
      */
     public function addCategoryLeftJoin(QueryBuilder $queryBuilder, $prefix, $categoryPrefix = 'c')
     {
-        $queryBuilder->leftJoin($prefix, MAUTIC_TABLE_PREFIX . 'categories', $categoryPrefix, 'c.id = ' . $prefix . '.category_id');
+        $queryBuilder->leftJoin($prefix, MAUTIC_TABLE_PREFIX.'categories', $categoryPrefix, 'c.id = '.$prefix.'.category_id');
     }
 
     /**
-     * Add lead left join
+     * Add lead left join.
      *
      * @param QueryBuilder $queryBuilder
      * @param              $prefix
@@ -192,11 +190,11 @@ public function addCategoryLeftJoin(QueryBuilder $queryBuilder, $prefix, $catego
      */
     public function addLeadLeftJoin(QueryBuilder $queryBuilder, $prefix, $leadPrefix = 'l')
     {
-        $queryBuilder->leftJoin($prefix, MAUTIC_TABLE_PREFIX . 'leads', $leadPrefix, 'l.id = ' . $prefix . '.lead_id');
+        $queryBuilder->leftJoin($prefix, MAUTIC_TABLE_PREFIX.'leads', $leadPrefix, 'l.id = '.$prefix.'.lead_id');
     }
 
     /**
-     * Add IP left join
+     * Add IP left join.
      *
      * @param QueryBuilder $queryBuilder
      * @param              $prefix
@@ -204,20 +202,20 @@ public function addLeadLeftJoin(QueryBuilder $queryBuilder, $prefix, $leadPrefix
      */
     public function addIpAddressLeftJoin(QueryBuilder $queryBuilder, $prefix, $ipPrefix = 'i')
     {
-        $queryBuilder->leftJoin($prefix, MAUTIC_TABLE_PREFIX . 'ip_addresses', $ipPrefix, 'i.id = ' . $prefix . '.ip_id');
+        $queryBuilder->leftJoin($prefix, MAUTIC_TABLE_PREFIX.'ip_addresses', $ipPrefix, 'i.id = '.$prefix.'.ip_id');
     }
 
     /**
-     * Apply date filters to the query
+     * Apply date filters to the query.
      *
-     * @param  QueryBuilder $query
-     * @param  string       $dateColumn
-     * @param  string       $tablePrefix
+     * @param QueryBuilder $query
+     * @param string       $dateColumn
+     * @param string       $tablePrefix
      */
     public function applyDateFilters(QueryBuilder $queryBuilder, $dateColumn, $tablePrefix = 't', $dateOnly = false)
     {
         if ($tablePrefix) {
-            $tablePrefix  .= ".";
+            $tablePrefix .= '.';
         }
 
         if (empty($this->options['dateFrom'])) {
@@ -241,7 +239,7 @@ public function applyDateFilters(QueryBuilder $queryBuilder, $dateColumn, $table
     }
 
     /**
-     * Check if the report has a specific column
+     * Check if the report has a specific column.
      *
      * @param $column
      *
@@ -262,10 +260,10 @@ public function hasColumn($column)
         if (is_array($column)) {
             foreach ($column as $checkMe) {
                 if (isset($sorted[$checkMe])) {
-
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -273,7 +271,7 @@ public function hasColumn($column)
     }
 
     /**
-     * Check if the report has a specific filter
+     * Check if the report has a specific filter.
      *
      * @param $column
      *
@@ -294,10 +292,10 @@ public function hasFilter($column)
         if (is_array($column)) {
             foreach ($column as $checkMe) {
                 if (isset($sorted[$checkMe])) {
-
                     return true;
                 }
             }
+
             return false;
         }
 
diff --git a/app/bundles/ReportBundle/Event/ReportGraphEvent.php b/app/bundles/ReportBundle/Event/ReportGraphEvent.php
index 866110d2d94..c1474ba58ee 100644
--- a/app/bundles/ReportBundle/Event/ReportGraphEvent.php
+++ b/app/bundles/ReportBundle/Event/ReportGraphEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,14 +14,14 @@
 use Mautic\ReportBundle\Entity\Report;
 
 /**
- * Class ReportGeneratorEvent
+ * Class ReportGeneratorEvent.
  */
 class ReportGraphEvent extends AbstractReportEvent
 {
     /**
      * @var array
      */
-    private $requestedGraphs = array();
+    private $requestedGraphs = [];
 
     /**
      * @var QueryBuilder
@@ -28,7 +29,7 @@ class ReportGraphEvent extends AbstractReportEvent
     private $queryBuilder;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param Report $report
      * @param array  $graphs
@@ -42,7 +43,7 @@ public function __construct(Report $report, array $graphs, QueryBuilder $queryBu
     }
 
     /**
-     * Fetch the graphs
+     * Fetch the graphs.
      *
      * @return array
      */
@@ -52,23 +53,21 @@ public function getGraphs()
     }
 
     /**
-     * Set the graph array
+     * Set the graph array.
      *
      * @param string $graph
-     * @param array $data prepared for this chart
-     *
-     * @return void
+     * @param array  $data  prepared for this chart
      */
     public function setGraph($graph, $data)
     {
         if (!isset($this->requestedGraphs[$graph]['data'])) {
-            $this->requestedGraphs[$graph]['data'] = array();
+            $this->requestedGraphs[$graph]['data'] = [];
         }
         $this->requestedGraphs[$graph]['data'] = $data;
     }
 
     /**
-     * Fetch the options array for the graph
+     * Fetch the options array for the graph.
      *
      * @return array
      */
@@ -77,33 +76,30 @@ public function getOptions($graph)
         if (isset($this->requestedGraphs[$graph]['options'])) {
             return $this->requestedGraphs[$graph]['options'];
         }
-        return array();
+
+        return [];
     }
 
     /**
-     * Set an option for the graph
+     * Set an option for the graph.
      *
      * @param string $graph
      * @param string $key
      * @param string $value
-     *
-     * @return void
      */
     public function setOption($graph, $key, $value)
     {
         if (!isset($this->requestedGraphs[$graph]['options'])) {
-            $this->requestedGraphs[$graph]['options'] = array();
+            $this->requestedGraphs[$graph]['options'] = [];
         }
         $this->requestedGraphs[$graph]['options'][$key] = $value;
     }
 
     /**
-     * Set the options for a graph
+     * Set the options for a graph.
      *
      * @param string $graph
      * @param array  $options
-     *
-     * @return void
      */
     public function setOptions($graph, $options)
     {
@@ -111,11 +107,11 @@ public function setOptions($graph, $options)
     }
 
     /**
-     * Get graphs that are requested
+     * Get graphs that are requested.
      *
      * @return array
      */
-    public function getRequestedGraphs ()
+    public function getRequestedGraphs()
     {
         return array_keys($this->requestedGraphs);
     }
@@ -123,7 +119,7 @@ public function getRequestedGraphs ()
     /**
      * @return QueryBuilder
      */
-    public function getQueryBuilder ()
+    public function getQueryBuilder()
     {
         return $this->queryBuilder;
     }
diff --git a/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php b/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php
index 5d255673064..881f3d2c579 100644
--- a/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/ReportBundle/EventListener/DashboardSubscriber.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\ReportBundle\EventListener;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
 use Mautic\ReportBundle\Model\ReportModel;
 
 /**
- * Class DashboardSubscriber
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
@@ -30,32 +31,32 @@ class DashboardSubscriber extends MainDashboardSubscriber
     protected $security;
 
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'report';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'report' => array(
-            'formAlias' => 'report_widget'
-        ),
-    );
+    protected $types = [
+        'report' => [
+            'formAlias' => 'report_widget',
+        ],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'report:reports:viewown',
-        'report:reports:viewother'
-    );
+        'report:reports:viewother',
+    ];
 
     public function __construct(ReportModel $reportModel, CorePermissions $security)
     {
@@ -64,11 +65,9 @@ public function __construct(ReportModel $reportModel, CorePermissions $security)
     }
 
     /**
-     * Set a widget detail when needed
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
@@ -79,7 +78,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
             if (!$event->isCached()) {
                 list($reportId, $graph) = explode(':', $params['graph']);
-                $report = $this->reportModel->getEntity($reportId);
+                $report                 = $this->reportModel->getEntity($reportId);
 
                 if ($report && $this->security->hasEntityAccess('report:reports:viewown', 'report:reports:viewother', $report->getCreatedBy())) {
                     $reportData = $this->reportModel->getReportData(
@@ -89,7 +88,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                             'ignoreTableData' => true,
                             'graphName'       => $graph,
                             'dateFrom'        => $params['dateFrom'],
-                            'dateTo'          => $params['dateTo']
+                            'dateTo'          => $params['dateTo'],
                         ]
                     );
 
@@ -102,7 +101,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                                 'chartHeight' => $widget->getHeight() - 90,
                                 'reportId'    => $report->getId(),
                                 'dateFrom'    => $params['dateFrom'],
-                                'dateTo'      => $params['dateTo']
+                                'dateTo'      => $params['dateTo'],
                             ]
                         );
                     }
diff --git a/app/bundles/ReportBundle/EventListener/ReportSubscriber.php b/app/bundles/ReportBundle/EventListener/ReportSubscriber.php
index 21abbaa7796..9af4ea00bea 100644
--- a/app/bundles/ReportBundle/EventListener/ReportSubscriber.php
+++ b/app/bundles/ReportBundle/EventListener/ReportSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use Mautic\ReportBundle\ReportEvents;
 
 /**
- * Class ReportSubscriber
+ * Class ReportSubscriber.
  */
 class ReportSubscriber extends CommonSubscriber
 {
@@ -47,14 +48,14 @@ public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $audit
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            ReportEvents::REPORT_POST_SAVE   => array('onReportPostSave', 0),
-            ReportEvents::REPORT_POST_DELETE => array('onReportDelete', 0)
-        );
+        return [
+            ReportEvents::REPORT_POST_SAVE   => ['onReportPostSave', 0],
+            ReportEvents::REPORT_POST_DELETE => ['onReportDelete', 0],
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param ReportEvent $event
      */
@@ -62,34 +63,34 @@ public function onReportPostSave(ReportEvent $event)
     {
         $report = $event->getReport();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "report",
-                "object"    => "report",
-                "objectId"  => $report->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'report',
+                'object'    => 'report',
+                'objectId'  => $report->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param ReportEvent $event
      */
     public function onReportDelete(ReportEvent $event)
     {
         $report = $event->getReport();
-        $log = array(
-            "bundle"     => "report",
-            "object"     => "report",
-            "objectId"   => $report->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $report->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log    = [
+            'bundle'    => 'report',
+            'object'    => 'report',
+            'objectId'  => $report->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $report->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 }
diff --git a/app/bundles/ReportBundle/EventListener/SearchSubscriber.php b/app/bundles/ReportBundle/EventListener/SearchSubscriber.php
index ab29378f2c8..5830631da77 100644
--- a/app/bundles/ReportBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/ReportBundle/EventListener/SearchSubscriber.php
@@ -1,24 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Helper\UserHelper;
 use Mautic\ReportBundle\Model\ReportModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\ReportBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -47,12 +46,12 @@ public function __construct(UserHelper $userHelper, ReportModel $reportModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
@@ -65,45 +64,45 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
             return;
         }
 
-        $filter     = array("string" => $str, "force" => array());
+        $filter = ['string' => $str, 'force' => []];
 
         $permissions = $this->security->isGranted(
-            array('report:reports:viewown', 'report:reports:viewother'),
+            ['report:reports:viewown', 'report:reports:viewother'],
             'RETURN_ARRAY'
         );
         if ($permissions['report:reports:viewown'] || $permissions['report:reports:viewother']) {
             if (!$permissions['report:reports:viewother']) {
-                $filter['force'][] = array(
+                $filter['force'][] = [
                     'column' => 'IDENTITY(r.createdBy)',
                     'expr'   => 'eq',
-                    'value'  => $this->userHelper->getUser()->getId()
-                );
+                    'value'  => $this->userHelper->getUser()->getId(),
+                ];
             }
 
             $items = $this->reportModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $filter
-                ));
+                    'filter' => $filter,
+                ]);
 
             $count = count($items);
             if ($count > 0) {
-                $results = array();
+                $results = [];
 
                 foreach ($items as $item) {
                     $results[] = $this->templating->renderResponse(
                         'MauticReportBundle:SubscribedEvents\Search:global.html.php',
-                        array('item' => $item)
+                        ['item' => $item]
                     )->getContent();
                 }
                 if ($count > 5) {
                     $results[] = $this->templating->renderResponse(
                         'MauticReportBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => ($count - 5)
-                        )
+                            'remaining'    => ($count - 5),
+                        ]
                     )->getContent();
                 }
                 $results['count'] = $count;
@@ -117,11 +116,11 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
      */
     public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
-        if ($this->security->isGranted(array('report:reports:viewown', 'report:reports:viewother'), "MATCH_ONE")) {
+        if ($this->security->isGranted(['report:reports:viewown', 'report:reports:viewother'], 'MATCH_ONE')) {
             $event->addCommands(
                 'mautic.report.reports',
                 $this->reportModel->getCommandList()
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php b/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php
index e096b10e696..6be6321e2b1 100644
--- a/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php
+++ b/app/bundles/ReportBundle/Form/DataTransformer/ReportFilterDataTransformer.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -35,7 +36,7 @@ public function __construct($columns)
     public function transform($filters)
     {
         if (!is_array($filters)) {
-            return array();
+            return [];
         }
 
         foreach ($filters as &$f) {
@@ -44,8 +45,8 @@ public function transform($filters)
                 return $filters;
             }
             $type = $this->columns[$f['column']]['type'];
-            if (in_array($type, array('datetime', 'date', 'time'))) {
-                $dt = new DateTimeHelper($f['value'], '', 'utc');
+            if (in_array($type, ['datetime', 'date', 'time'])) {
+                $dt         = new DateTimeHelper($f['value'], '', 'utc');
                 $f['value'] = $dt->toLocalString();
             }
         }
@@ -61,7 +62,7 @@ public function transform($filters)
     public function reverseTransform($filters)
     {
         if (!is_array($filters)) {
-            return array();
+            return [];
         }
 
         foreach ($filters as &$f) {
@@ -70,12 +71,12 @@ public function reverseTransform($filters)
                 return $filters;
             }
             $type = $this->columns[$f['column']]['type'];
-            if (in_array($type, array('datetime', 'date', 'time'))) {
-                $dt = new DateTimeHelper($f['value'], '', 'local');
+            if (in_array($type, ['datetime', 'date', 'time'])) {
+                $dt         = new DateTimeHelper($f['value'], '', 'local');
                 $f['value'] = $dt->toUtcString();
             }
         }
 
         return $filters;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php b/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php
index 342b1a27401..57fadabb6ec 100644
--- a/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php
+++ b/app/bundles/ReportBundle/Form/Type/DynamicFiltersType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,12 +12,11 @@
 
 use Mautic\ReportBundle\Entity\Report;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class DynamicFiltersType
+ * Class DynamicFiltersType.
  */
 class DynamicFiltersType extends AbstractType
 {
@@ -34,22 +34,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'    => 'form-control',
-                    'onchange' => "Mautic.filterTableData('report.".$options['report']->getId()."','".$column."',this.value,'list','.report-content');"
+                    'onchange' => "Mautic.filterTableData('report.".$options['report']->getId()."','".$column."',this.value,'list','.report-content');",
                 ],
-                'required'   => false
+                'required' => false,
             ];
 
             switch ($definition['type']) {
                 case 'bool':
                 case 'boolean':
-                    $type = 'button_group';
+                    $type                      = 'button_group';
                     $args['choices_as_values'] = true;
-                    $args['choices'] = [
+                    $args['choices']           = [
                         [
                             'mautic.core.form.no'    => false,
                             'mautic.core.form.yes'   => true,
-                            'mautic.core.form.reset' => ''
-                        ]
+                            'mautic.core.form.reset' => '',
+                        ],
                     ];
 
                     if (isset($options['data'][$definition['alias']])) {
@@ -61,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     break;
                 case 'multiselect':
                 case 'select':
-                    $type = 'choice';
+                    $type            = 'choice';
                     $args['choices'] = $definition['list'];
                     break;
                 default:
@@ -89,7 +89,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(
             [
                 'filterDefinitions' => [],
-                'report'            => new Report()
+                'report'            => new Report(),
             ]
         );
     }
diff --git a/app/bundles/ReportBundle/Form/Type/FilterSelectorType.php b/app/bundles/ReportBundle/Form/Type/FilterSelectorType.php
index 3fe6e2770a7..1c4526185ea 100644
--- a/app/bundles/ReportBundle/Form/Type/FilterSelectorType.php
+++ b/app/bundles/ReportBundle/Form/Type/FilterSelectorType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,7 +19,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FilterSelectorType
+ * Class FilterSelectorType.
  */
 class FilterSelectorType extends AbstractType
 {
@@ -40,8 +41,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'empty_value' => false,
                 'required'    => false,
                 'attr'        => [
-                    'class' => 'form-control filter-columns'
-                ]
+                    'class' => 'form-control filter-columns',
+                ],
             ]
         );
 
@@ -65,8 +66,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'empty_value' => false,
                     'required'    => false,
                     'attr'        => [
-                        'class' => 'form-control not-chosen'
-                    ]
+                        'class' => 'form-control not-chosen',
+                    ],
                 ]
             );
         };
@@ -94,7 +95,7 @@ function (FormEvent $event) use ($formModifier) {
                 'label'      => 'mautic.report.report.label.filtervalue',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control filter-value'],
-                'required'   => false
+                'required'   => false,
             ]
         );
 
@@ -106,10 +107,10 @@ function (FormEvent $event) use ($formModifier) {
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.report.report.label.filterdynamic_tooltip'
+                    'tooltip' => 'mautic.report.report.label.filterdynamic_tooltip',
                 ],
-                'required'   => false,
-                'data'       => (!isset($options['data']['dynamic']) || !empty($options['data']['dynamic']))
+                'required' => false,
+                'data'     => (!isset($options['data']['dynamic']) || !empty($options['data']['dynamic'])),
             ]
         );
     }
@@ -122,7 +123,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars = array_replace(
             $view->vars,
             [
-                'filterList' => $options['filterList']
+                'filterList' => $options['filterList'],
             ]
         );
     }
@@ -144,7 +145,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             [
                 'filterList'    => [],
                 'operatorList'  => [],
-                'operatorGroup' => 'default'
+                'operatorGroup' => 'default',
             ]
         );
     }
diff --git a/app/bundles/ReportBundle/Form/Type/ReportFiltersType.php b/app/bundles/ReportBundle/Form/Type/ReportFiltersType.php
index e3796a3c933..42ec2c1e9ab 100644
--- a/app/bundles/ReportBundle/Form/Type/ReportFiltersType.php
+++ b/app/bundles/ReportBundle/Form/Type/ReportFiltersType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ReportFiltersType
+ * Class ReportFiltersType.
  */
 class ReportFiltersType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -54,7 +54,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(
             [
                 'filters' => [],
-                'report'  => null
+                'report'  => null,
             ]
         );
     }
diff --git a/app/bundles/ReportBundle/Form/Type/ReportType.php b/app/bundles/ReportBundle/Form/Type/ReportType.php
index 1eb3b04ed94..394b2fd4b6e 100644
--- a/app/bundles/ReportBundle/Form/Type/ReportType.php
+++ b/app/bundles/ReportBundle/Form/Type/ReportType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,30 +13,29 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
-use Mautic\ReportBundle\Builder\MauticReportBuilder;
+use Mautic\ReportBundle\Entity\Report;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
-use Mautic\ReportBundle\Entity\Report;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ReportType
+ * Class ReportType.
  */
 class ReportType extends AbstractType
 {
     /**
-     * Factory object
+     * Factory object.
      *
      * @var \Mautic\CoreBundle\Factory\MauticFactory
      */
     private $factory;
 
     /**
-     * Translator object
+     * Translator object.
      *
      * @var \Symfony\Bundle\FrameworkBundle\Translation\Translator
      */
@@ -60,7 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         // Only add these fields if we're in edit mode
         if (!$options['read_only']) {
-
             $builder->add(
                 'name',
                 'text',
@@ -68,7 +67,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.core.name',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => ['class' => 'form-control'],
-                    'required'   => true
+                    'required'   => true,
                 ]
             );
 
@@ -79,7 +78,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label'      => 'mautic.core.description',
                     'label_attr' => ['class' => 'control-label'],
                     'attr'       => ['class' => 'form-control editor'],
-                    'required'   => false
+                    'required'   => false,
                 ]
             );
 
@@ -93,8 +92,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label' => 'mautic.report.report.form.issystem',
                     'data'  => $data,
                     'attr'  => [
-                        'tooltip' => 'mautic.report.report.form.issystem.tooltip'
-                    ]
+                        'tooltip' => 'mautic.report.report.form.issystem.tooltip',
+                    ],
                 ]
             );
 
@@ -116,8 +115,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'attr'        => [
                         'class'    => 'form-control',
                         'tooltip'  => 'mautic.report.report.form.source.help',
-                        'onchange' => 'Mautic.updateReportSourceData(this.value)'
-                    ]
+                        'onchange' => 'Mautic.updateReportSourceData(this.value)',
+                    ],
                 ]
             );
 
@@ -132,10 +131,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $source = key($tables[$firstGroup]);
                 }
 
-                $columns               = $model->getColumnList($source);
-                $filters               = $model->getFilterList($source);
-                $filterDefinitions     = htmlspecialchars(json_encode($filters->definitions), ENT_QUOTES, 'UTF-8');
-                $operatorHtml          = htmlspecialchars(json_encode($filters->operatorHtml), ENT_QUOTES, 'UTF-8');
+                $columns           = $model->getColumnList($source);
+                $filters           = $model->getFilterList($source);
+                $filterDefinitions = htmlspecialchars(json_encode($filters->definitions), ENT_QUOTES, 'UTF-8');
+                $operatorHtml      = htmlspecialchars(json_encode($filters->operatorHtml), ENT_QUOTES, 'UTF-8');
 
                 if (is_array($currentColumns)) {
                     $orderColumns = array_values($currentColumns);
@@ -158,8 +157,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'attr'       => [
                             'class'         => 'form-control multiselect',
                             'data-order'    => $order,
-                            'data-sortable' => 'true'
-                        ]
+                            'data-sortable' => 'true',
+                        ],
                     ]
                 );
 
@@ -168,12 +167,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'filters',
                     'report_filters',
                     [
-                        'type'         => 'filter_selector',
-                        'label'        => false,
-                        'options'      => [
+                        'type'    => 'filter_selector',
+                        'label'   => false,
+                        'options' => [
                             'filterList'   => $filters->choices,
                             'operatorList' => $filters->operatorChoices,
-                            'required'     => false
+                            'required'     => false,
                         ],
                         'allow_add'    => true,
                         'allow_delete' => true,
@@ -183,8 +182,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                             'data-filter-definitions' => $filterDefinitions,
                             'data-filter-operators'   => $operatorHtml,
                         ],
-                        'filters'      => $filters->definitions,
-                        'report'       => $formData
+                        'filters' => $filters->definitions,
+                        'report'  => $formData,
                     ]
                 );
 
@@ -192,16 +191,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'tableOrder',
                     'collection',
                     [
-                        'type'         => 'table_order',
-                        'label'        => false,
-                        'options'      => [
+                        'type'    => 'table_order',
+                        'label'   => false,
+                        'options' => [
                             'columnList' => $columns->choices,
-                            'required'   => false
+                            'required'   => false,
                         ],
                         'allow_add'    => true,
                         'allow_delete' => true,
                         'prototype'    => true,
-                        'required'     => false
+                        'required'     => false,
                     ]
                 );
 
@@ -210,10 +209,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'value_template_yesno',
                     'yesno_button_group',
                     [
-                        'label'       => false,
-                        'mapped'      => false,
-                        'attr'        => [
-                            'class' => 'filter-value'
+                        'label'  => false,
+                        'mapped' => false,
+                        'attr'   => [
+                            'class' => 'filter-value',
                         ],
                         'data'        => 1,
                         'choice_list' => new ChoiceList(
@@ -244,8 +243,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'attr'       => [
                             'class'         => 'form-control multiselect',
                             'data-order'    => $order,
-                            'data-sortable' => 'true'
-                        ]
+                            'data-sortable' => 'true',
+                        ],
                     ]
                 );
             };
@@ -261,8 +260,8 @@ function (FormEvent $event) use ($formModifier) {
             $builder->addEventListener(
                 FormEvents::PRE_SUBMIT,
                 function (FormEvent $event) use ($formModifier) {
-                    $data    = $event->getData();
-                    $graphs  = (isset($data['graphs'])) ? $data['graphs'] : [];
+                    $data = $event->getData();
+                    $graphs = (isset($data['graphs'])) ? $data['graphs'] : [];
                     $columns = (isset($data['columns'])) ? $data['columns'] : [];
                     $formModifier($event->getForm(), $data['source'], $columns, $graphs, $data);
                 }
@@ -271,8 +270,8 @@ function (FormEvent $event) use ($formModifier) {
             $builder->add('buttons', 'form_buttons');
         }
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -284,7 +283,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setDefaults(
             [
                 'data_class' => 'Mautic\ReportBundle\Entity\Report',
-                'table_list' => []
+                'table_list' => [],
             ]
         );
     }
@@ -294,11 +293,11 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "report";
+        return 'report';
     }
 
     /**
-     * Extracts the keys from the table_list option and builds an array of tables for the select list
+     * Extracts the keys from the table_list option and builds an array of tables for the select list.
      *
      * @param array $tables Array with the table list and columns
      *
@@ -317,4 +316,4 @@ private function buildTableSourceList($tables)
 
         return $list;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php b/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php
index ce569a318cc..9dbd986a842 100644
--- a/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php
+++ b/app/bundles/ReportBundle/Form/Type/ReportWidgetType.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\Form\Type;
 
+use Mautic\ReportBundle\Entity\Report;
 use Mautic\ReportBundle\Model\ReportModel;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Mautic\ReportBundle\Entity\Report;
 
 /**
- * Class ReportWidgetType
+ * Class ReportWidgetType.
  */
 class ReportWidgetType extends AbstractType
 {
@@ -49,7 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $graphs = unserialize($report['graphs']);
 
                 foreach ($graphs as $graph) {
-                    $graphValue                            = $report['id'].":".$graph;
+                    $graphValue                            = $report['id'].':'.$graph;
                     $choices[$report['name']][$graphValue] = $graph;
                 }
             }
@@ -68,13 +68,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'empty_value' => false,
                 'required'    => false,
                 'attr'        => [
-                    'class' => 'form-control'
-                ]
+                    'class' => 'form-control',
+                ],
             ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -83,6 +83,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "report_widget";
+        return 'report_widget';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/Form/Type/TableOrderType.php b/app/bundles/ReportBundle/Form/Type/TableOrderType.php
index 44a89581345..76135d43a25 100644
--- a/app/bundles/ReportBundle/Form/Type/TableOrderType.php
+++ b/app/bundles/ReportBundle/Form/Type/TableOrderType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FilterSelectorType
+ * Class FilterSelectorType.
  */
 class TableOrderType extends AbstractType
 {
@@ -37,35 +38,35 @@ public function __construct(MauticFactory $factory)
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // Build a list of columns
-        $builder->add('column', 'choice', array(
+        $builder->add('column', 'choice', [
             'choices'     => $options['columnList'],
             'expanded'    => false,
             'multiple'    => false,
             'label'       => 'mautic.report.report.label.filtercolumn',
-            'label_attr'  => array('class' => 'control-label'),
+            'label_attr'  => ['class' => 'control-label'],
             'empty_value' => false,
             'required'    => false,
-            'attr'        => array(
-                'class' => 'form-control filter-columns'
-            )
-        ));
+            'attr'        => [
+                'class' => 'form-control filter-columns',
+            ],
+        ]);
 
         // Direction
-        $builder->add('direction', 'choice', array(
-            'choices'     => array(
+        $builder->add('direction', 'choice', [
+            'choices' => [
                 'ASC'  => $this->translator->trans('mautic.report.report.label.tableorder_dir.asc'),
-                'DESC' => $this->translator->trans('mautic.report.report.label.tableorder_dir.desc')
-            ),
+                'DESC' => $this->translator->trans('mautic.report.report.label.tableorder_dir.desc'),
+            ],
             'expanded'    => false,
             'multiple'    => false,
             'label'       => 'mautic.core.order',
-            'label_attr'  => array('class' => 'control-label'),
+            'label_attr'  => ['class' => 'control-label'],
             'empty_value' => false,
             'required'    => false,
-            'attr'        => array(
-                'class' => 'form-control not-chosen'
-            )
-        ));
+            'attr'        => [
+                'class' => 'form-control not-chosen',
+            ],
+        ]);
     }
 
     /**
@@ -73,9 +74,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace($view->vars, array(
-            'columnList' => $options['columnList']
-        ));
+        $view->vars = array_replace($view->vars, [
+            'columnList' => $options['columnList'],
+        ]);
     }
 
     /**
@@ -91,8 +92,8 @@ public function getName()
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'columnList' => array()
-        ));
+        $resolver->setDefaults([
+            'columnList' => [],
+        ]);
     }
 }
diff --git a/app/bundles/ReportBundle/Generator/ReportGenerator.php b/app/bundles/ReportBundle/Generator/ReportGenerator.php
index a958e21bd48..0581311b32d 100644
--- a/app/bundles/ReportBundle/Generator/ReportGenerator.php
+++ b/app/bundles/ReportBundle/Generator/ReportGenerator.php
@@ -1,26 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\Generator;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\ORM\EntityManager;
 use Mautic\ReportBundle\Entity\Report;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\Security\Core\SecurityContextInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Report generator
+ * Report generator.
  */
 class ReportGenerator
 {
@@ -47,7 +45,7 @@ class ReportGenerator
     /**
      * @var string
      */
-    private $validInterface = "Mautic\\ReportBundle\\Builder\\ReportBuilderInterface";
+    private $validInterface = 'Mautic\\ReportBundle\\Builder\\ReportBuilderInterface';
 
     /**
      * @var string
@@ -72,7 +70,7 @@ public function __construct(EventDispatcherInterface $dispatcher, Connection $db
     }
 
     /**
-     * Gets query
+     * Gets query.
      *
      * @param array $options Optional options array for the query
      *
@@ -90,7 +88,7 @@ public function getQuery(array $options = [])
     }
 
     /**
-     * Gets form
+     * Gets form.
      *
      * @param \Mautic\ReportBundle\Entity\Report $entity  Report Entity
      * @param array                              $options Parameters set by the caller
@@ -103,7 +101,7 @@ public function getForm(Report $entity, $options)
     }
 
     /**
-     * Gets the getContentTemplate path
+     * Gets the getContentTemplate path.
      *
      * @return string
      */
@@ -113,9 +111,10 @@ public function getContentTemplate()
     }
 
     /**
-     * Gets report builder
+     * Gets report builder.
      *
      * @return \Mautic\ReportBundle\Builder\ReportBuilderInterface
+     *
      * @throws \Symfony\Component\DependencyInjection\Exception\RuntimeException
      */
     protected function getBuilder()
@@ -123,7 +122,7 @@ protected function getBuilder()
         $className = '\\Mautic\\ReportBundle\\Builder\\MauticReportBuilder';
 
         if (!class_exists($className)) {
-            throw new RuntimeException("The MauticReportBuilder does not exist.");
+            throw new RuntimeException('The MauticReportBuilder does not exist.');
         }
 
         $reflection = new \ReflectionClass($className);
diff --git a/app/bundles/ReportBundle/MauticReportBundle.php b/app/bundles/ReportBundle/MauticReportBundle.php
index 2063aeb4cf6..d1031285bf0 100644
--- a/app/bundles/ReportBundle/MauticReportBundle.php
+++ b/app/bundles/ReportBundle/MauticReportBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticReportBundle
+ * Class MauticReportBundle.
  */
 class MauticReportBundle extends Bundle
 {
diff --git a/app/bundles/ReportBundle/Model/ReportModel.php b/app/bundles/ReportBundle/Model/ReportModel.php
index 95f9d44014f..ffd1b3e3485 100644
--- a/app/bundles/ReportBundle/Model/ReportModel.php
+++ b/app/bundles/ReportBundle/Model/ReportModel.php
@@ -1,14 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\Model;
 
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\CoreBundle\Helper\InputHelper;
@@ -23,16 +25,14 @@
 use Mautic\ReportBundle\Event\ReportGraphEvent;
 use Mautic\ReportBundle\Generator\ReportGenerator;
 use Mautic\ReportBundle\ReportEvents;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Symfony\Component\Security\Core\SecurityContext;
 
 /**
- * Class ReportModel
+ * Class ReportModel.
  */
 class ReportModel extends FormModel
 {
@@ -141,16 +141,16 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = ReportEvents::REPORT_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = ReportEvents::REPORT_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = ReportEvents::REPORT_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = ReportEvents::REPORT_POST_DELETE;
                 break;
             default:
@@ -172,7 +172,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     }
 
     /**
-     * Build the table and graph data
+     * Build the table and graph data.
      *
      * @param $context
      *
@@ -185,8 +185,8 @@ public function buildAvailableReports($context)
         if (empty($data[$context])) {
             // Check to see if all has been obtained
             if (isset($data['all'])) {
-                $data[$context]['tables'] =& $data['all']['tables'][$context];
-                $data[$context]['graphs'] =& $data['all']['graphs'][$context];
+                $data[$context]['tables'] = &$data['all']['tables'][$context];
+                $data[$context]['graphs'] = &$data['all']['graphs'][$context];
             } else {
                 //build them
                 $eventContext = ($context == 'all') ? '' : $context;
@@ -219,7 +219,7 @@ public function buildAvailableReports($context)
     }
 
     /**
-     * Builds the table lookup data for the report forms
+     * Builds the table lookup data for the report forms.
      *
      * @param string $context
      *
@@ -281,8 +281,8 @@ public function getFilterList($context = 'all')
     {
         $tableData = $this->getTableData($context);
 
-        $return                  = new \stdClass();
-        $filters                 = (isset($tableData['filters'])) ? $tableData['filters']
+        $return  = new \stdClass();
+        $filters = (isset($tableData['filters'])) ? $tableData['filters']
             : (isset($tableData['columns']) ? $tableData['columns'] : []);
         $return->choices         = [];
         $return->choiceHtml      = '';
@@ -322,7 +322,7 @@ public function getGraphList($context = 'all')
 
         // First sort
         foreach ($graphData as $key => $details) {
-            $return->choices[$key] = $this->translator->trans($key)." (".$this->translator->trans('mautic.report.graph.'.$details['type']).")";
+            $return->choices[$key] = $this->translator->trans($key).' ('.$this->translator->trans('mautic.report.graph.'.$details['type']).')';
         }
         natsort($return->choices);
 
@@ -334,19 +334,20 @@ public function getGraphList($context = 'all')
     }
 
     /**
-     * Export report
+     * Export report.
      *
      * @param $format
      * @param $report
      * @param $reportData
      *
      * @return StreamedResponse|Response
+     *
      * @throws \Exception
      */
     public function exportResults($format, $report, $reportData)
     {
         $formatter = $this->formatterHelper;
-        $date      = (new DateTimeHelper)->toLocalString();
+        $date      = (new DateTimeHelper())->toLocalString();
         $name      = str_replace(' ', '_', $date).'_'.InputHelper::alphanum($report->getName(), false, '-');
 
         switch ($format) {
@@ -439,7 +440,6 @@ function () use ($formatter, $reportData, $report, $name) {
                                 unset($row, $reportData['data'][$count]);
                             }
 
-
                             $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
                             $objWriter->setPreCalculateFormulas(false);
 
@@ -463,7 +463,7 @@ function () use ($formatter, $reportData, $report, $name) {
     }
 
     /**
-     * Get report data for view rendering
+     * Get report data for view rendering.
      *
      * @param       $entity
      * @param       $formFactory
@@ -505,11 +505,11 @@ public function getReportData($entity, $formFactory = null, $options = [])
 
         $paginate        = !empty($options['paginate']);
         $reportPage      = (isset($options['reportPage'])) ? $options['reportPage'] : 1;
-        $data            = $graphs = [];
+        $data            = $graphs            = [];
         $reportGenerator = new ReportGenerator($this->dispatcher, $this->em->getConnection(), $entity, $formFactory);
 
         $selectedColumns = $entity->getColumns();
-        $totalResults    = $limit = 0;
+        $totalResults    = $limit    = 0;
 
         // Prepare the query builder
         $tableDetails = $this->getTableData($entity->getSource());
@@ -529,7 +529,7 @@ public function getReportData($entity, $formFactory = null, $options = [])
             'filters'        => (isset($tableDetails['filters'])) ? $tableDetails['filters'] : $tableDetails['columns'],
             'dateFrom'       => (isset($options['dateFrom'])) ? $options['dateFrom'] : null,
             'dateTo'         => (isset($options['dateTo'])) ? $options['dateTo'] : null,
-            'dynamicFilters' => (isset($options['dynamicFilters'])) ? $options['dynamicFilters'] : []
+            'dynamicFilters' => (isset($options['dynamicFilters'])) ? $options['dynamicFilters'] : [],
         ];
 
         /** @var \Doctrine\DBAL\Query\QueryBuilder $query */
@@ -569,7 +569,7 @@ public function getReportData($entity, $formFactory = null, $options = [])
                         $graphOptions    = array_merge($defaultGraphOptions, $graphOptions);
                         $eventGraphs[$g] = [
                             'options' => $graphOptions,
-                            'type'    => $availableGraphs[$g]['type']
+                            'type'    => $availableGraphs[$g]['type'],
                         ];
                     }
                 }
@@ -617,9 +617,9 @@ public function getReportData($entity, $formFactory = null, $options = [])
             if ($queryTime >= 1000) {
                 $queryTime *= 1000;
 
-                $queryTime .= "s";
+                $queryTime .= 's';
             } else {
-                $queryTime .= "ms";
+                $queryTime .= 'ms';
             }
 
             if (!$paginate) {
@@ -640,7 +640,7 @@ public function getReportData($entity, $formFactory = null, $options = [])
                 $debugData['query'] = str_replace(":$name", "'$param'", $debugData['query']);
             }
 
-            $debugData['query_time'] = (isset($queryTime)) ? $queryTime : "N/A";
+            $debugData['query_time'] = (isset($queryTime)) ? $queryTime : 'N/A';
         }
 
         return [
@@ -653,7 +653,7 @@ public function getReportData($entity, $formFactory = null, $options = [])
             'limit'           => ($paginate) ? $limit : 0,
             'dateFrom'        => $dataOptions['dateFrom'],
             'dateTo'          => $dataOptions['dateTo'],
-            'debug'           => $debugData
+            'debug'           => $debugData,
         ];
     }
 
@@ -668,7 +668,7 @@ public function getReportsWithGraphs()
     }
 
     /**
-     * Determine what operators should be used for the filter type
+     * Determine what operators should be used for the filter type.
      *
      * @param array $data
      *
@@ -695,4 +695,4 @@ private function getOperatorOptions(array $data)
 
         return $options;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/ReportBundle/ReportEvents.php b/app/bundles/ReportBundle/ReportEvents.php
index aea5222894e..b5c6316dbd7 100644
--- a/app/bundles/ReportBundle/ReportEvents.php
+++ b/app/bundles/ReportBundle/ReportEvents.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle;
 
 /**
- * Class ReportEvents
+ * Class ReportEvents.
  *
  * Events available for ReportBundle
  */
 final class ReportEvents
 {
-
     /**
      * The mautic.report_pre_save event is dispatched right before a report is persisted.
      *
@@ -55,7 +55,7 @@ final class ReportEvents
 
     /**
      * The mautic.report_on_build event is dispatched before displaying the report builder form to allow
-     * bundles to specify report sources and columns
+     * bundles to specify report sources and columns.
      *
      * The event listener receives a Mautic\ReportBundle\Event\ReportBuilderEvent instance.
      *
@@ -64,7 +64,7 @@ final class ReportEvents
     const REPORT_ON_BUILD = 'mautic.report_on_build';
 
     /**
-     * The mautic.report_on_generate event is dispatched when generating a report to build the base query
+     * The mautic.report_on_generate event is dispatched when generating a report to build the base query.
      *
      * The event listener receives a Mautic\ReportBundle\Event\ReportGeneratorEvent instance.
      *
@@ -73,7 +73,7 @@ final class ReportEvents
     const REPORT_ON_GENERATE = 'mautic.report_on_generate';
 
     /**
-     * The mautic.report_on_display event is dispatched when displaying a report
+     * The mautic.report_on_display event is dispatched when displaying a report.
      *
      * The event listener receives a Mautic\ReportBundle\Event\ReportDataEvent instance.
      *
@@ -82,7 +82,7 @@ final class ReportEvents
     const REPORT_ON_DISPLAY = 'mautic.report_on_display';
 
     /**
-     * The mautic.report_on_graph_generate event is dispatched to generate a graph data
+     * The mautic.report_on_graph_generate event is dispatched to generate a graph data.
      *
      * The event listener receives a Mautic\ReportBundle\Event\ReportGraphEvent instance.
      *
diff --git a/app/bundles/ReportBundle/Security/Permissions/ReportPermissions.php b/app/bundles/ReportBundle/Security/Permissions/ReportPermissions.php
index 47e319807e6..952acbc463e 100644
--- a/app/bundles/ReportBundle/Security/Permissions/ReportPermissions.php
+++ b/app/bundles/ReportBundle/Security/Permissions/ReportPermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\ReportBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class ReportPermissions
+ * Class ReportPermissions.
  */
 class ReportPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_condition_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_condition_row.html.php
index b8aa039c577..50a8ff4e6cf 100644
--- a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_condition_row.html.php
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_condition_row.html.php
@@ -1,6 +1,8 @@
 <label class="<?php echo $form->vars['label_attr']['class']; ?>" for="<?php echo $form->vars['id']; ?>"><?php echo $view['translator']->trans($form->vars['label']); ?></label>
 <select id="<?php echo $form->vars['id']; ?>" name="<?php echo $form->vars['full_name']; ?>" class="<?php echo $form->vars['attr']['class']; ?>" onchange="Mautic.checkReportCondition('<?php echo $form->vars['id']; ?>')">
-    <?php foreach ($form->vars['choices'] as $condition) { ?>
+    <?php foreach ($form->vars['choices'] as $condition) {
+    ?>
     <option value="<?php echo $condition->value; ?>"<?php echo ($condition->value == $form->vars['data']) ? ' selected' : '' ?>><?php echo $condition->label; ?></option>
-    <?php } ?>
+    <?php 
+} ?>
 </select>
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_value_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_value_row.html.php
index 5550d4d43d3..1ccc7572185 100644
--- a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_value_row.html.php
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_entry_value_row.html.php
@@ -1,5 +1,5 @@
 <?php $condition = $form->parent->children['condition']->vars['value']; ?>
 <div class="form-group mb-0">
     <label class="<?php echo $form->vars['label_attr']['class']; ?>" for="<?php echo $form->vars['id']; ?>"><?php echo $view['translator']->trans($form->vars['label']); ?></label>
-    <input type="text" id="<?php echo $form->vars['id']; ?>" name="<?php echo $form->vars['full_name']; ?>" class="<?php echo $form->vars['attr']['class']; ?>" value="<?php echo $form->vars['data']; ?>"<?php echo (in_array($condition, array('empty', 'notEmpty'))) ? ' disabled' : ''; ?> />
+    <input type="text" id="<?php echo $form->vars['id']; ?>" name="<?php echo $form->vars['full_name']; ?>" class="<?php echo $form->vars['attr']['class']; ?>" value="<?php echo $form->vars['data']; ?>"<?php echo (in_array($condition, ['empty', 'notEmpty'])) ? ' disabled' : ''; ?> />
 </div>
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_row.html.php
index a1e7826dc5d..b9a2c36749a 100644
--- a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_row.html.php
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_filters_row.html.php
@@ -1,6 +1,6 @@
 <?php
-$hasErrors = count($form->vars['errors']);
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : "";
+$hasErrors     = count($form->vars['errors']);
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
 ?>
 <div id="filterSelectorContainer" class="row">
     <div class="form-group col-md-12<?php echo $feedbackClass; ?>">
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_column_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_column_row.html.php
index 49731d9842f..03c39743fbe 100644
--- a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_column_row.html.php
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_column_row.html.php
@@ -1,8 +1,10 @@
 <div class="choice-wrapper col-xs-6">
     <label class="<?php echo $form->vars['label_attr']['class']; ?>" for="<?php echo $form->vars['id']; ?>"><?php echo $view['translator']->trans($form->vars['label']); ?></label>
     <select id="<?php echo $form->vars['id']; ?>" name="<?php echo $form->vars['full_name']; ?>" class="<?php echo $form->vars['attr']['class']; ?>">
-        <?php foreach ($form->vars['choices'] as $column) { ?>
+        <?php foreach ($form->vars['choices'] as $column) {
+    ?>
         <option value="<?php echo $column->value; ?>"<?php echo ($column->value == $form->vars['data']) ? ' selected' : ''; ?>><?php echo $column->label; ?></option>
-        <?php } ?>
+        <?php 
+} ?>
     </select>
 </div>
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_direction_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_direction_row.html.php
index 036d9466d35..8bafa4c3082 100644
--- a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_direction_row.html.php
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_entry_direction_row.html.php
@@ -1,8 +1,10 @@
 <div class="choice-wrapper col-xs-4">
     <label class="<?php echo $form->vars['label_attr']['class']; ?>" for="<?php echo $form->vars['id']; ?>"><?php echo $view['translator']->trans($form->vars['label']); ?></label>
     <select id="<?php echo $form->vars['id']; ?>" name="<?php echo $form->vars['full_name']; ?>" class="<?php echo $form->vars['attr']['class']; ?>">
-        <?php foreach ($form->vars['choices'] as $direction) { ?>
+        <?php foreach ($form->vars['choices'] as $direction) {
+    ?>
         <option value="<?php echo $direction->value; ?>"<?php echo ($direction->value == $form->vars['data']) ? ' selected' : '' ?>><?php echo $direction->label; ?></option>
-        <?php } ?>
+        <?php 
+} ?>
     </select>
 </div>
diff --git a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_row.html.php b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_row.html.php
index 0662370ed71..fdbbb018acd 100644
--- a/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_row.html.php
+++ b/app/bundles/ReportBundle/Views/FormTheme/Report/_report_tableOrder_row.html.php
@@ -1,6 +1,6 @@
 <?php
-$hasErrors = count($form->vars['errors']);
-$feedbackClass = (!empty($hasErrors)) ? " has-error" : "";
+$hasErrors     = count($form->vars['errors']);
+$feedbackClass = (!empty($hasErrors)) ? ' has-error' : '';
 ?>
 <div id="tableOrderContainer" class="row">
     <div class="form-group col-md-12<?php echo $feedbackClass; ?>">
diff --git a/app/bundles/ReportBundle/Views/Graph/Line.html.php b/app/bundles/ReportBundle/Views/Graph/Line.html.php
index f726bbf2fdd..31c1667e08e 100644
--- a/app/bundles/ReportBundle/Views/Graph/Line.html.php
+++ b/app/bundles/ReportBundle/Views/Graph/Line.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <div class="col-sm-12">
     <div class="panel">
@@ -19,7 +19,7 @@
             </div>
         </div>
 
-        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', array('chartData' => $graph, 'chartType' => 'line', 'chartHeight' => 300)); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $graph, 'chartType' => 'line', 'chartHeight' => 300]); ?>
     </div>
 </div>
 
diff --git a/app/bundles/ReportBundle/Views/Graph/Pie.html.php b/app/bundles/ReportBundle/Views/Graph/Pie.html.php
index fe0d18883be..99a36bbce31 100644
--- a/app/bundles/ReportBundle/Views/Graph/Pie.html.php
+++ b/app/bundles/ReportBundle/Views/Graph/Pie.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 
 <div class="col-md-4">
@@ -21,6 +21,6 @@
                 <h3 class="text-white dark-sm"><span class="fa <?php echo isset($graph['iconClass']) ? $graph['iconClass'] : ''; ?>"></span></h3>
             </div>
         </div>
-        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', array('chartData' => $graph['data'], 'chartType' => 'pie', 'chartHeight' => 210)); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $graph['data'], 'chartType' => 'pie', 'chartHeight' => 210]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/bundles/ReportBundle/Views/Graph/Table.html.php b/app/bundles/ReportBundle/Views/Graph/Table.html.php
index efeaa2c05d1..4f82a9f80d2 100644
--- a/app/bundles/ReportBundle/Views/Graph/Table.html.php
+++ b/app/bundles/ReportBundle/Views/Graph/Table.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -20,7 +21,7 @@
         </div>
         <?php if (count($graph['data']) > 0) : ?>
             <div class="table-responsive panel-collapse pull out">
-                <?php // We need to dynamically create the table headers based on the result set ?>
+                <?php // We need to dynamically create the table headers based on the result set?>
                 <table class="table table-hover table-striped table-bordered report-list" id="reportTable">
                     <thead>
                         <tr>
@@ -37,7 +38,7 @@
                             <?php foreach ($row as $cellName => $cell) : ?>
                                 <?php if (array_key_exists('id', $graph['data'][0]) && $cellName == 'title' && isset($graph['link'])) : ?>
                                     <td>
-                                        <a href="<?php echo $view['router']->path($graph['link'], array("objectAction" => "view", "objectId" => $row['id'])); ?>" data-toggle="ajax">
+                                        <a href="<?php echo $view['router']->path($graph['link'], ['objectAction' => 'view', 'objectId' => $row['id']]); ?>" data-toggle="ajax">
                                             <?php echo $cell; ?>
                                         </a>
                                     </td>
diff --git a/app/bundles/ReportBundle/Views/Report/details.html.php b/app/bundles/ReportBundle/Views/Report/details.html.php
index f33fb25f023..f075538b934 100644
--- a/app/bundles/ReportBundle/Views/Report/details.html.php
+++ b/app/bundles/ReportBundle/Views/Report/details.html.php
@@ -1,66 +1,66 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $header = $view['translator']->trans(
     'mautic.report.report.header.view',
-    array('%name%' => $view['translator']->trans($report->getName()))
+    ['%name%' => $view['translator']->trans($report->getName())]
 );
 
 if ($tmpl == 'index') {
     $view->extend('MauticCoreBundle:Default:content.html.php');
     $view['slots']->set('mauticContent', 'report');
 
-    $view['slots']->set("headerTitle", $header);
+    $view['slots']->set('headerTitle', $header);
 
-    $buttons = array();
+    $buttons = [];
     if (!empty($data) || !empty($graphs)) {
-        $buttons[] = array(
-            'attr'      => array(
+        $buttons[] = [
+            'attr' => [
                 'target'      => '_new',
                 'data-toggle' => '',
                 'class'       => 'btn btn-default btn-nospin',
                 'href'        => $view['router']->path(
                     'mautic_report_export',
-                    array('objectId' => $report->getId(), 'format' => 'html')
-                )
-            ),
+                    ['objectId' => $report->getId(), 'format' => 'html']
+                ),
+            ],
             'btnText'   => $view['translator']->trans('mautic.form.result.export.html'),
-            'iconClass' => 'fa fa-file-code-o'
-        );
+            'iconClass' => 'fa fa-file-code-o',
+        ];
 
         if (!empty($data)) {
-            $buttons[] = array(
-                'attr'      => array(
+            $buttons[] = [
+                'attr' => [
                     'data-toggle' => 'download',
                     'class'       => 'btn btn-default btn-nospin',
                     'href'        => $view['router']->path(
                         'mautic_report_export',
-                        array('objectId' => $report->getId(), 'format' => 'csv')
-                    )
-                ),
+                        ['objectId' => $report->getId(), 'format' => 'csv']
+                    ),
+                ],
                 'btnText'   => $view['translator']->trans('mautic.form.result.export.csv'),
-                'iconClass' => 'fa fa-file-text-o'
-            );
+                'iconClass' => 'fa fa-file-text-o',
+            ];
 
             if (class_exists('PHPExcel')) {
-                $buttons[] = array(
-                    'attr'      => array(
+                $buttons[] = [
+                    'attr' => [
                         'data-toggle' => 'download',
                         'class'       => 'btn btn-default btn-nospin',
                         'href'        => $view['router']->path(
                             'mautic_report_export',
-                            array('objectId' => $report->getId(), 'format' => 'xlsx')
-                        )
-                    ),
+                            ['objectId' => $report->getId(), 'format' => 'xlsx']
+                        ),
+                    ],
                     'btnText'   => $view['translator']->trans('mautic.form.result.export.xlsx'),
-                    'iconClass' => 'fa fa-file-excel-o'
-                );
+                    'iconClass' => 'fa fa-file-excel-o',
+                ];
             }
         }
     }
@@ -69,10 +69,10 @@
         'actions',
         $view->render(
             'MauticCoreBundle:Helper:page_actions.html.php',
-            array(
-                'item'              => $report,
-                'templateButtons'   => array(
-                    'edit'   => $view['security']->hasEntityAccess(
+            [
+                'item'            => $report,
+                'templateButtons' => [
+                    'edit' => $view['security']->hasEntityAccess(
                         $permissions['report:reports:editown'],
                         $permissions['report:reports:editother'],
                         $report->getCreatedBy()
@@ -82,22 +82,22 @@
                         $permissions['report:reports:deleteother'],
                         $report->getCreatedBy()
                     ),
-                    'close'  => $view['security']->hasEntityAccess(
+                    'close' => $view['security']->hasEntityAccess(
                         $permissions['report:reports:viewown'],
                         $permissions['report:reports:viewother'],
                         $report->getCreatedBy()
-                    )
-                ),
+                    ),
+                ],
                 'routeBase'         => 'report',
                 'langVar'           => 'report.report',
-                'postCustomButtons' => $buttons
-            )
+                'postCustomButtons' => $buttons,
+            ]
         )
     );
 
     $view['slots']->set(
         'publishStatus',
-        $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', array('entity' => $report))
+        $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', ['entity' => $report])
     );
 }
 ?>
@@ -118,7 +118,7 @@
                     <tbody>
                     <?php echo $view->render(
                         'MauticCoreBundle:Helper:details.html.php',
-                        array('entity' => $report)
+                        ['entity' => $report]
                     ); ?>
                     </tbody>
                 </table>
@@ -130,11 +130,13 @@
             <div class="panel shd-none mb-0 pa-lg">
                 <div class="row">
                     <div class="col-sm-12 mb-10">
-                        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', array('dateRangeForm' => $dateRangeForm)); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['dateRangeForm' => $dateRangeForm]); ?>
                     </div>
                     <?php $view['form']->start($dynamicFilterForm); ?>
                     <?php foreach ($dynamicFilterForm->children as $filter): ?>
-                    <?php if ($filter->vars['block_prefixes'][1] == 'hidden') continue; ?>
+                    <?php if ($filter->vars['block_prefixes'][1] == 'hidden') {
+                        continue;
+                    } ?>
                     <div class="col-sm-4">
                         <?php echo $view['form']->row($filter); ?>
                     </div>
diff --git a/app/bundles/ReportBundle/Views/Report/details_data.html.php b/app/bundles/ReportBundle/Views/Report/details_data.html.php
index acf1698d933..887fc318026 100644
--- a/app/bundles/ReportBundle/Views/Report/details_data.html.php
+++ b/app/bundles/ReportBundle/Views/Report/details_data.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticReportBundle:Report:details.html.php');
+}
 
 $dataCount   = count($data);
 $columnOrder = $report->getColumns();
@@ -27,14 +29,14 @@
                     <?php foreach ($columnOrder as $key): ?>
                         <?php
                         if (isset($columns[$key])):
-                            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
-                                'sessionVar' => 'report.' . $report->getId(),
+                            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
+                                'sessionVar' => 'report.'.$report->getId(),
                                 'orderBy'    => $key,
                                 'text'       => $columns[$key]['label'],
-                                'class'      => 'col-report-' . $columns[$key]['type'],
-                                'dataToggle' => in_array($columns[$key]['type'], array('date', 'datetime')) ? 'date' : '',
-                                'target'     => '.report-content'
-                            ));
+                                'class'      => 'col-report-'.$columns[$key]['type'],
+                                'dataToggle' => in_array($columns[$key]['type'], ['date', 'datetime']) ? 'date' : '',
+                                'target'     => '.report-content',
+                            ]);
                         else:
                             unset($columnOrder[$key]);
                         endif;
@@ -53,14 +55,14 @@
                                     <?php if (isset($columns[$key]['link']) && !empty($row[$columns[$key]['alias']])): ?>
                                     <?php $closeLink = true; ?>
                                     <a href="<?php echo $view['router']->path($columns[$key]['link'], ['objectAction' => 'view', 'objectId' => $row[$columns[$key]['alias']]]); ?>" class="label label-success">
-                                    <?php endif;?>
+                                    <?php endif; ?>
                                     <?php echo $view['formatter']->_($row[$columns[$key]['alias']], $columns[$key]['type']); ?>
                                     <?php if ($closeLink): ?></a><?php endif; ?>
                                 </td>
 
                             <?php endforeach; ?>
                         </tr>
-                        <?php $startCount++; ?>
+                        <?php ++$startCount; ?>
                     <?php endforeach; ?>
                 <?php else: ?>
                     <tr>
@@ -74,16 +76,16 @@
             </table>
         </div>
         <div class="panel-footer">
-            <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-                'totalItems'      => $totalResults,
-                'page'            => $reportPage,
-                'limit'           => $limit,
-                'baseUrl'         => $view['router']->path('mautic_report_view', array(
-                    'objectId' => $report->getId()
-                )),
-                'sessionVar'      => 'report.' . $report->getId(),
-                'target'          => '.report-content'
-            )); ?>
+            <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+                'totalItems' => $totalResults,
+                'page'       => $reportPage,
+                'limit'      => $limit,
+                'baseUrl'    => $view['router']->path('mautic_report_view', [
+                    'objectId' => $report->getId(),
+                ]),
+                'sessionVar' => 'report.'.$report->getId(),
+                'target'     => '.report-content',
+            ]); ?>
         </div>
     </div>
 </div>
@@ -96,14 +98,15 @@
     <?php
     $rowCount = 0;
     foreach ($graphOrder as $key):
-        $details =  $graphs[$key];
-        if (!isset($details['data']))
+        $details = $graphs[$key];
+        if (!isset($details['data'])) {
             continue;
+        }
         if ($rowCount >= 12):
             echo '</div><div class="row equal">';
             $rowCount = 0;
         endif;
-        echo $view->render('MauticReportBundle:Graph:'.ucfirst($details['type']).'.html.php', array('graph' => $details['data'], 'options' => $details['options'], 'report' => $report));
+        echo $view->render('MauticReportBundle:Graph:'.ucfirst($details['type']).'.html.php', ['graph' => $details['data'], 'options' => $details['options'], 'report' => $report]);
         $rowCount += ($details['type'] == 'line') ? 12 : 4;
     endforeach;
     ?>
diff --git a/app/bundles/ReportBundle/Views/Report/export.html.php b/app/bundles/ReportBundle/Views/Report/export.html.php
index 7b73386f91b..83ceb9f1d0b 100644
--- a/app/bundles/ReportBundle/Views/Report/export.html.php
+++ b/app/bundles/ReportBundle/Views/Report/export.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:slim.html.php');
 $view['slots']->set('pageTitle', $pageTitle);
-$view['slots']->set("headerTitle", $report->getName());
+$view['slots']->set('headerTitle', $report->getName());
 $view['slots']->set('mauticContent', 'report');
 
 $dataCount   = count($data);
@@ -20,15 +21,15 @@
 <div class="pa-md">
     <h3><?php echo $report->getName(); ?></h3>
     <div class="small">
-        <?php echo $view['date']->toDate($dateFrom, 'UTC') . " - " . $view['date']->toDate($dateTo, 'UTC'); ?>
+        <?php echo $view['date']->toDate($dateFrom, 'UTC').' - '.$view['date']->toDate($dateTo, 'UTC'); ?>
     </div>
 </div>
 <?php if (!empty($graphOrder) && !empty($graphs)): ?>
     <div class="row">
         <div class="pa-md">
             <?php foreach ($graphOrder as $key): ?>
-                <?php $details =  $graphs[$key]; ?>
-                <?php echo $view->render('MauticReportBundle:Graph:'.ucfirst($details['type']).'.html.php', array('graph' => $details['data'], 'report' => $report)); ?>
+                <?php $details = $graphs[$key]; ?>
+                <?php echo $view->render('MauticReportBundle:Graph:'.ucfirst($details['type']).'.html.php', ['graph' => $details['data'], 'report' => $report]); ?>
             <?php endforeach; ?>
         </div>
     </div>
@@ -40,7 +41,7 @@
     <tr>
         <th class="col-report-count"></th>
         <?php foreach ($columnOrder as $key): ?>
-            <th class="col-report-<?php echo $columns[$key]['type']; ?>"><?php echo $columns[$key]['label'];?></th>
+            <th class="col-report-<?php echo $columns[$key]['type']; ?>"><?php echo $columns[$key]['label']; ?></th>
         <?php endforeach; ?>
     </tr>
     </thead>
@@ -53,7 +54,7 @@
                     <td><?php echo $view['formatter']->_($row[$columns[$key]['alias']], $columns[$key]['type']); ?></td>
                 <?php endforeach; ?>
             </tr>
-            <?php $startCount++; ?>
+            <?php ++$startCount; ?>
         <?php endforeach; ?>
     <?php else: ?>
         <tr>
diff --git a/app/bundles/ReportBundle/Views/Report/form.html.php b/app/bundles/ReportBundle/Views/Report/form.html.php
index 0a4f76b2ead..f006bbe2e63 100644
--- a/app/bundles/ReportBundle/Views/Report/form.html.php
+++ b/app/bundles/ReportBundle/Views/Report/form.html.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'report');
 
 $header = ($report->getId()) ?
     $view['translator']->trans('mautic.report.report.header.edit',
-        array('%name%' => $view['translator']->trans($report->getName()))) :
+        ['%name%' => $view['translator']->trans($report->getName())]) :
     $view['translator']->trans('mautic.report.report.header.new');
 
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 $showGraphTab = count($form['graphs']->vars['choices']);
 ?>
 
@@ -33,7 +33,9 @@
                     <li class="">
                         <a href="#data-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.report.tab.data'); ?></a>
                     </li>
-                    <li class="<?php if (!$showGraphTab) echo "hide"; ?>" id="graphs-tab">
+                    <li class="<?php if (!$showGraphTab) {
+    echo 'hide';
+} ?>" id="graphs-tab">
                         <a href="#graphs-container" role="tab" data-toggle="tab"><?php echo $view['translator']->trans('mautic.report.tab.graphs'); ?></a>
                     </li>
                 </ul>
@@ -92,7 +94,9 @@
                         </div>
                     </div>
 
-                    <div class="tab-pane fade bdr-w-0<?php if (!$showGraphTab) echo "hide"; ?>" id="graphs-container">
+                    <div class="tab-pane fade bdr-w-0<?php if (!$showGraphTab) {
+    echo 'hide';
+} ?>" id="graphs-container">
                         <div class="row">
                             <div class="col-md-6">
                                 <div class="pa-md">
diff --git a/app/bundles/ReportBundle/Views/Report/index.html.php b/app/bundles/ReportBundle/Views/Report/index.html.php
index a1f1f89c66a..cdea2379c68 100644
--- a/app/bundles/ReportBundle/Views/Report/index.html.php
+++ b/app/bundles/ReportBundle/Views/Report/index.html.php
@@ -1,27 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'report');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.report.reports'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.report.reports'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['report:reports:create']
-            ),
-            'routeBase'       => 'report',
-            'langVar'         => 'report.report'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['report:reports:create'],
+            ],
+            'routeBase' => 'report',
+            'langVar'   => 'report.report',
+        ]
     )
 );
 ?>
@@ -29,16 +29,16 @@
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render(
         'MauticCoreBundle:Helper:list_toolbar.html.php',
-        array(
-            'searchValue' => $searchValue,
-            'searchHelp'  => 'mautic.report.report.help.searchcommands',
+        [
+            'searchValue'     => $searchValue,
+            'searchHelp'      => 'mautic.report.report.help.searchcommands',
             'action'          => $currentRoute,
             'langVar'         => 'report.report',
             'routeBase'       => 'report',
-            'templateButtons' => array(
-                'delete' => $permissions['report:reports:deleteown'] || $permissions['report:reports:deleteother']
-            )
-        )
+            'templateButtons' => [
+                'delete' => $permissions['report:reports:deleteown'] || $permissions['report:reports:deleteother'],
+            ],
+        ]
     ); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/ReportBundle/Views/Report/list.html.php b/app/bundles/ReportBundle/Views/Report/list.html.php
index f1912029e9e..0d733556ba4 100644
--- a/app/bundles/ReportBundle/Views/Report/list.html.php
+++ b/app/bundles/ReportBundle/Views/Report/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticReportBundle:Report:index.html.php');
+}
 ?>
 <?php if (count($items)): ?>
     <div class="table-responsive panel-collapse pull out page-list">
@@ -15,25 +17,25 @@
             <thead>
                 <tr>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'checkall' => 'true',
-                        'target'   => '#reportTable'
-                    ));
+                        'target'   => '#reportTable',
+                    ]);
 
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'report',
                         'orderBy'    => 'r.name',
                         'text'       => 'mautic.core.name',
                         'class'      => 'col-report-name',
-                        'default'    => true
-                    ));
+                        'default'    => true,
+                    ]);
 
-                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                    echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'report',
                         'orderBy'    => 'r.id',
                         'text'       => 'mautic.core.id',
-                        'class'      => 'col-report-id visible-md visible-lg'
-                    ));
+                        'class'      => 'col-report-id visible-md visible-lg',
+                    ]);
                     ?>
                 </tr>
             </thead>
@@ -42,22 +44,22 @@
                 <tr>
                     <td>
                         <?php
-                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                            'item'      => $item,
-                            'templateButtons' => array(
-                                'edit'      => $security->hasEntityAccess($permissions['report:reports:editown'], $permissions['report:reports:editother'], $item->getCreatedBy()),
-                                'clone'     => $permissions['report:reports:create'],
-                                'delete'    => $security->hasEntityAccess($permissions['report:reports:deleteown'], $permissions['report:reports:deleteother'], $item->getCreatedBy()),
-                            ),
-                            'routeBase'  => 'report',
-                            'langVar'    => 'report.report'
-                        ));
+                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                            'item'            => $item,
+                            'templateButtons' => [
+                                'edit'   => $security->hasEntityAccess($permissions['report:reports:editown'], $permissions['report:reports:editother'], $item->getCreatedBy()),
+                                'clone'  => $permissions['report:reports:create'],
+                                'delete' => $security->hasEntityAccess($permissions['report:reports:deleteown'], $permissions['report:reports:deleteother'], $item->getCreatedBy()),
+                            ],
+                            'routeBase' => 'report',
+                            'langVar'   => 'report.report',
+                        ]);
                         ?>
                     </td>
                     <td>
                         <div>
-                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array('item'=> $item, 'model' => 'report.report')); ?>
-                            <a href="<?php echo $view['router']->path('mautic_report_view', array("objectId" => $item->getId())); ?>" data-toggle="ajax">
+                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'report.report']); ?>
+                            <a href="<?php echo $view['router']->path('mautic_report_view', ['objectId' => $item->getId()]); ?>" data-toggle="ajax">
                                 <?php echo $item->getName(); ?>
                             </a>
                         </div>
@@ -71,14 +73,14 @@
             </tbody>
         </table>
         <div class="panel-footer">
-        <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-            "totalItems"      => $totalItems,
-            "page"            => $page,
-            "limit"           => $limit,
-            "menuLinkId"      => 'mautic_report_index',
-            "baseUrl"         => $view['router']->path('mautic_report_index'),
-            'sessionVar'      => 'report'
-        )); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+            'totalItems' => $totalItems,
+            'page'       => $page,
+            'limit'      => $limit,
+            'menuLinkId' => 'mautic_report_index',
+            'baseUrl'    => $view['router']->path('mautic_report_index'),
+            'sessionVar' => 'report',
+        ]); ?>
         </div>
     </div>
 <?php else: ?>
diff --git a/app/bundles/ReportBundle/Views/SubscribedEvents/Dashboard/widget.html.php b/app/bundles/ReportBundle/Views/SubscribedEvents/Dashboard/widget.html.php
index db954334880..069365c3444 100644
--- a/app/bundles/ReportBundle/Views/SubscribedEvents/Dashboard/widget.html.php
+++ b/app/bundles/ReportBundle/Views/SubscribedEvents/Dashboard/widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (isset($chartData['data'])) {
     $chartData = $chartData['data'];
 }
@@ -15,8 +15,8 @@
     echo $view->render(
         'MauticCoreBundle:Helper:table.html.php',
         [
-            'headItems'   => isset($chartData[0]) ? array_keys($chartData[0]) : [],
-            'bodyItems'   => $chartData
+            'headItems' => isset($chartData[0]) ? array_keys($chartData[0]) : [],
+            'bodyItems' => $chartData,
         ]
     );
 } else {
@@ -25,7 +25,7 @@
         [
             'chartData'   => $chartData,
             'chartType'   => $chartType,
-            'chartHeight' => $chartHeight
+            'chartHeight' => $chartHeight,
         ]
     );
 }
diff --git a/app/bundles/ReportBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/ReportBundle/Views/SubscribedEvents/Search/global.html.php
index a5b8e4ee479..a58bd9f52cc 100644
--- a/app/bundles/ReportBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/ReportBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,18 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_report_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_report_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
 </a>
 <?php else: ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_report_view', array('objectId' => $item->getId())); ?>" data-toggle="ajax">
+<a href="<?php echo $this->container->get('router')->generate('mautic_report_view', ['objectId' => $item->getId()]); ?>" data-toggle="ajax">
     <?php echo $item->getName(); ?>
 </a>
 <?php endif; ?>
\ No newline at end of file
diff --git a/app/bundles/SmsBundle/Api/AbstractSmsApi.php b/app/bundles/SmsBundle/Api/AbstractSmsApi.php
index 2142d56c0b4..0e84d0b4b46 100644
--- a/app/bundles/SmsBundle/Api/AbstractSmsApi.php
+++ b/app/bundles/SmsBundle/Api/AbstractSmsApi.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Api;
 
 use Joomla\Http\Http;
diff --git a/app/bundles/SmsBundle/Api/TwilioApi.php b/app/bundles/SmsBundle/Api/TwilioApi.php
index 4d8499a6d4c..6ae2d3a50e0 100644
--- a/app/bundles/SmsBundle/Api/TwilioApi.php
+++ b/app/bundles/SmsBundle/Api/TwilioApi.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Api;
 
 use libphonenumber\NumberParseException;
@@ -71,12 +72,11 @@ protected function sanitizeNumber($number)
      * @param string $number
      * @param string $content
      *
-     * @return boolean
+     * @return bool
      */
     public function sendSms($number, $content)
     {
         if ($number === null) {
-
             return false;
         }
 
diff --git a/app/bundles/SmsBundle/Config/config.php b/app/bundles/SmsBundle/Config/config.php
index 5b88dcff78c..27ae05d5bbd 100644
--- a/app/bundles/SmsBundle/Config/config.php
+++ b/app/bundles/SmsBundle/Config/config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -12,20 +12,20 @@
     'services' => [
         'events' => [
             'mautic.sms.campaignbundle.subscriber' => [
-                'class' => 'Mautic\SmsBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\SmsBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.helper.core_parameters',
                     'mautic.lead.model.lead',
                     'mautic.sms.model.sms',
                     'mautic.sms.api',
-                    'mautic.helper.sms'
-                ]
+                    'mautic.helper.sms',
+                ],
             ],
             'mautic.sms.configbundle.subscriber' => [
                 'class' => 'Mautic\SmsBundle\EventListener\ConfigSubscriber',
             ],
             'mautic.sms.smsbundle.subscriber' => [
-                'class' => 'Mautic\SmsBundle\EventListener\SmsSubscriber',
+                'class'     => 'Mautic\SmsBundle\EventListener\SmsSubscriber',
                 'arguments' => [
                     'mautic.core.model.auditlog',
                     'mautic.page.model.trackable',
@@ -36,41 +36,41 @@
         ],
         'forms' => [
             'mautic.form.type.sms' => [
-                'class' => 'Mautic\SmsBundle\Form\Type\SmsType',
+                'class'     => 'Mautic\SmsBundle\Form\Type\SmsType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'sms',
+                'alias'     => 'sms',
             ],
             'mautic.form.type.smsconfig' => [
                 'class' => 'Mautic\SmsBundle\Form\Type\ConfigType',
                 'alias' => 'smsconfig',
             ],
             'mautic.form.type.smssend_list' => [
-                'class' => 'Mautic\SmsBundle\Form\Type\SmsSendType',
+                'class'     => 'Mautic\SmsBundle\Form\Type\SmsSendType',
                 'arguments' => 'router',
-                'alias' => 'smssend_list',
+                'alias'     => 'smssend_list',
             ],
             'mautic.form.type.sms_list' => [
-                'class' => 'Mautic\SmsBundle\Form\Type\SmsListType',
+                'class'     => 'Mautic\SmsBundle\Form\Type\SmsListType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'sms_list',
+                'alias'     => 'sms_list',
             ],
         ],
         'helpers' => [
             'mautic.helper.sms' => [
-                'class' => 'Mautic\SmsBundle\Helper\SmsHelper',
+                'class'     => 'Mautic\SmsBundle\Helper\SmsHelper',
                 'arguments' => [
                     'doctrine.orm.entity_manager',
                     'mautic.lead.model.lead',
                     'mautic.helper.phone_number',
                     'mautic.sms.model.sms',
-                    '%mautic.sms_frequency_number%'
+                    '%mautic.sms_frequency_number%',
                 ],
                 'alias' => 'sms_helper',
             ],
         ],
         'other' => [
             'mautic.sms.api' => [
-                'class' => 'Mautic\SmsBundle\Api\TwilioApi',
+                'class'     => 'Mautic\SmsBundle\Api\TwilioApi',
                 'arguments' => [
                     'mautic.page.model.trackable',
                     'mautic.twilio.service',
@@ -81,7 +81,7 @@
                 'alias' => 'sms_api',
             ],
             'mautic.twilio.service' => [
-                'class' => 'Services_Twilio',
+                'class'     => 'Services_Twilio',
                 'arguments' => [
                     '%mautic.sms_username%',
                     '%mautic.sms_password%',
@@ -91,7 +91,7 @@
         ],
         'models' => [
             'mautic.sms.model.sms' => [
-                'class' => 'Mautic\SmsBundle\Model\SmsModel',
+                'class'     => 'Mautic\SmsBundle\Model\SmsModel',
                 'arguments' => [
                     'mautic.page.model.trackable',
                 ],
@@ -101,21 +101,21 @@
     'routes' => [
         'main' => [
             'mautic_sms_index' => [
-                'path' => '/sms/{page}',
+                'path'       => '/sms/{page}',
                 'controller' => 'MauticSmsBundle:Sms:index',
             ],
             'mautic_sms_action' => [
-                'path' => '/sms/{objectAction}/{objectId}',
+                'path'       => '/sms/{objectAction}/{objectId}',
                 'controller' => 'MauticSmsBundle:Sms:execute',
             ],
             'mautic_sms_contacts' => [
-                'path' => '/sms/view/{objectId}/contact/{page}',
+                'path'       => '/sms/view/{objectId}/contact/{page}',
                 'controller' => 'MauticSmsBundle:Sms:contacts',
             ],
         ],
         'public' => [
             'mautic_receive_sms' => [
-                'path' => '/sms/receive',
+                'path'       => '/sms/receive',
                 'controller' => 'MauticSmsBundle:Api\SmsApi:receive',
             ],
         ],
@@ -124,7 +124,7 @@
         'main' => [
             'items' => [
                 'mautic.sms.smses' => [
-                    'route' => 'mautic_sms_index',
+                    'route'  => 'mautic_sms_index',
                     'access' => ['sms:smses:viewown', 'sms:smses:viewother'],
                     'parent' => 'mautic.core.channels',
                     'checks' => [
@@ -137,11 +137,11 @@
         ],
     ],
     'parameters' => [
-        'sms_enabled' => false,
-        'sms_username' => null,
-        'sms_password' => null,
+        'sms_enabled'              => false,
+        'sms_username'             => null,
+        'sms_password'             => null,
         'sms_sending_phone_number' => null,
-        'sms_frequency_number' => null,
-        'sms_frequency_time' => null
-    ]
+        'sms_frequency_number'     => null,
+        'sms_frequency_time'       => null,
+    ],
 ];
diff --git a/app/bundles/SmsBundle/Controller/Api/SmsApiController.php b/app/bundles/SmsBundle/Controller/Api/SmsApiController.php
index d6b2f3c4d69..a8f5ed78736 100644
--- a/app/bundles/SmsBundle/Controller/Api/SmsApiController.php
+++ b/app/bundles/SmsBundle/Controller/Api/SmsApiController.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Controller\Api;
 
 use Mautic\ApiBundle\Controller\CommonApiController;
diff --git a/app/bundles/SmsBundle/Controller/SmsController.php b/app/bundles/SmsBundle/Controller/SmsController.php
index 6e31d76bf84..413b5a5230c 100644
--- a/app/bundles/SmsBundle/Controller/SmsController.php
+++ b/app/bundles/SmsBundle/Controller/SmsController.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Controller;
 
 use Mautic\CoreBundle\Controller\FormController;
 use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\LeadBundle\Controller\EntityContactsTrait;
-use Mautic\SmsBundle\Entity\StatRepository;
 use Mautic\SmsBundle\Entity\Sms;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -86,19 +86,19 @@ public function indexAction($page = 1)
         //retrieve a list of categories
         $listFilters['filters']['groups']['mautic.core.filter.categories'] = [
             'options' => $this->getModel('category')->getLookupResults('email', '', 0),
-            'prefix' => 'category',
+            'prefix'  => 'category',
         ];
 
         //retrieve a list of Lead Lists
         $listFilters['filters']['groups']['mautic.core.filter.lists'] = [
             'options' => $this->getModel('lead.list')->getUserLists(),
-            'prefix' => 'list',
+            'prefix'  => 'list',
         ];
 
         //retrieve a list of themes
         $listFilters['filters']['groups']['mautic.core.filter.themes'] = [
             'options' => $this->factory->getInstalledThemes('email'),
-            'prefix' => 'theme',
+            'prefix'  => 'theme',
         ];
 
         $currentFilters = $session->get('mautic.sms.list_filters', []);
@@ -108,7 +108,7 @@ public function indexAction($page = 1)
             // Filters have been updated
 
             // Parse the selected values
-            $newFilters = [];
+            $newFilters     = [];
             $updatedFilters = json_decode($updatedFilters, true);
 
             if ($updatedFilters) {
@@ -160,14 +160,14 @@ public function indexAction($page = 1)
             }
         }
 
-        $orderBy = $session->get('mautic.sms.orderby', 'e.name');
+        $orderBy    = $session->get('mautic.sms.orderby', 'e.name');
         $orderByDir = $session->get('mautic.sms.orderbydir', 'DESC');
 
         $smss = $model->getEntities([
-            'start' => $start,
-            'limit' => $limit,
-            'filter' => $filter,
-            'orderBy' => $orderBy,
+            'start'      => $start,
+            'limit'      => $limit,
+            'filter'     => $filter,
+            'orderBy'    => $orderBy,
             'orderByDir' => $orderByDir,
         ]);
 
@@ -184,11 +184,11 @@ public function indexAction($page = 1)
             $returnUrl = $this->generateUrl('mautic_sms_index', ['page' => $lastPage]);
 
             return $this->postActionRedirect([
-                'returnUrl' => $returnUrl,
-                'viewParameters' => ['page' => $lastPage],
+                'returnUrl'       => $returnUrl,
+                'viewParameters'  => ['page' => $lastPage],
                 'contentTemplate' => 'MauticSmsBundle:Sms:index',
                 'passthroughVars' => [
-                    'activeLink' => '#mautic_sms_index',
+                    'activeLink'    => '#mautic_sms_index',
                     'mauticContent' => 'sms',
                 ],
             ]);
@@ -198,22 +198,22 @@ public function indexAction($page = 1)
         return $this->delegateView([
             'viewParameters' => [
                 'searchValue' => $search,
-                'filters' => $listFilters,
-                'items' => $smss,
-                'totalItems' => $count,
-                'page' => $page,
-                'limit' => $limit,
-                'tmpl' => $this->request->get('tmpl', 'index'),
+                'filters'     => $listFilters,
+                'items'       => $smss,
+                'totalItems'  => $count,
+                'page'        => $page,
+                'limit'       => $limit,
+                'tmpl'        => $this->request->get('tmpl', 'index'),
                 'permissions' => $permissions,
-                'model' => $model,
-                'security' => $this->get('mautic.security'),
-                'configured' => $this->coreParametersHelper->getParameter('sms_enabled'),
+                'model'       => $model,
+                'security'    => $this->get('mautic.security'),
+                'configured'  => $this->coreParametersHelper->getParameter('sms_enabled'),
             ],
             'contentTemplate' => 'MauticSmsBundle:Sms:list.html.php',
             'passthroughVars' => [
-                'activeLink' => '#mautic_sms_index',
+                'activeLink'    => '#mautic_sms_index',
                 'mauticContent' => 'sms',
-                'route' => $this->generateUrl('mautic_sms_index', ['page' => $page]),
+                'route'         => $this->generateUrl('mautic_sms_index', ['page' => $page]),
             ],
         ]);
     }
@@ -228,7 +228,7 @@ public function indexAction($page = 1)
     public function viewAction($objectId)
     {
         /** @var \Mautic\SmsBundle\Model\SmsModel $model */
-        $model = $this->getModel('sms');
+        $model    = $this->getModel('sms');
         $security = $this->get('mautic.security');
 
         /** @var \Mautic\SmsBundle\Entity\Sms $sms */
@@ -241,17 +241,17 @@ public function viewAction($objectId)
             $returnUrl = $this->generateUrl('mautic_sms_index', ['page' => $page]);
 
             return $this->postActionRedirect([
-                'returnUrl' => $returnUrl,
-                'viewParameters' => ['page' => $page],
+                'returnUrl'       => $returnUrl,
+                'viewParameters'  => ['page' => $page],
                 'contentTemplate' => 'MauticSmsBundle:Sms:index',
                 'passthroughVars' => [
-                    'activeLink' => '#mautic_sms_index',
+                    'activeLink'    => '#mautic_sms_index',
                     'mauticContent' => 'sms',
                 ],
                 'flashes' => [
                     [
-                        'type' => 'error',
-                        'msg' => 'mautic.sms.error.notfound',
+                        'type'    => 'error',
+                        'msg'     => 'mautic.sms.error.notfound',
                         'msgVars' => ['%id%' => $objectId],
                     ],
                 ],
@@ -270,9 +270,9 @@ public function viewAction($objectId)
 
         // Init the date range filter form
         $dateRangeValues = $this->request->get('daterange', []);
-        $action = $this->generateUrl('mautic_sms_action', ['objectAction' => 'view', 'objectId' => $objectId]);
-        $dateRangeForm = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
-        $entityViews = $model->getHitsLineChartData(
+        $action          = $this->generateUrl('mautic_sms_action', ['objectAction' => 'view', 'objectId' => $objectId]);
+        $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
+        $entityViews     = $model->getHitsLineChartData(
             null,
             new \DateTime($dateRangeForm->get('date_from')->getData()),
             new \DateTime($dateRangeForm->get('date_to')->getData()),
@@ -284,11 +284,11 @@ public function viewAction($objectId)
         $trackableLinks = $model->getSmsClickStats($sms->getId());
 
         return $this->delegateView([
-            'returnUrl' => $this->generateUrl('mautic_sms_action', ['objectAction' => 'view', 'objectId' => $sms->getId()]),
+            'returnUrl'      => $this->generateUrl('mautic_sms_action', ['objectAction' => 'view', 'objectId' => $sms->getId()]),
             'viewParameters' => [
-                'sms' => $sms,
-                'trackables' => $trackableLinks,
-                'logs' => $logs,
+                'sms'         => $sms,
+                'trackables'  => $trackableLinks,
+                'logs'        => $logs,
                 'permissions' => $security->isGranted([
                     'sms:smses:viewown',
                     'sms:smses:viewother',
@@ -300,13 +300,13 @@ public function viewAction($objectId)
                     'sms:smses:publishown',
                     'sms:smses:publishother',
                 ], 'RETURN_ARRAY'),
-                'security' => $security,
+                'security'    => $security,
                 'entityViews' => $entityViews,
-                'contacts' => $this->forward(
+                'contacts'    => $this->forward(
                     'MauticSmsBundle:Sms:contacts',
                     [
-                        'objectId' => $sms->getId(),
-                        'page' => $this->get('session')->get('mautic.sms.contact.page', 1),
+                        'objectId'   => $sms->getId(),
+                        'page'       => $this->get('session')->get('mautic.sms.contact.page', 1),
                         'ignoreAjax' => true,
                     ]
                 )->getContent(),
@@ -314,7 +314,7 @@ public function viewAction($objectId)
             ],
             'contentTemplate' => 'MauticSmsBundle:Sms:details.html.php',
             'passthroughVars' => [
-                'activeLink' => '#mautic_sms_index',
+                'activeLink'    => '#mautic_sms_index',
                 'mauticContent' => 'sms',
             ],
         ]);
@@ -337,7 +337,7 @@ public function newAction($entity = null)
             $entity = $model->getEntity();
         }
 
-        $method = $this->request->getMethod();
+        $method  = $this->request->getMethod();
         $session = $this->get('session');
 
         if (!$this->get('mautic.security')->isGranted('sms:smses:create')) {
@@ -345,7 +345,7 @@ public function newAction($entity = null)
         }
 
         //set the page we came from
-        $page = $session->get('mautic.sms.page', 1);
+        $page   = $session->get('mautic.sms.page', 1);
         $action = $this->generateUrl('mautic_sms_action', ['objectAction' => 'new']);
 
         $updateSelect = ($method == 'POST')
@@ -370,13 +370,13 @@ public function newAction($entity = null)
                     $this->addFlash(
                         'mautic.core.notice.created',
                         [
-                            '%name%' => $entity->getName(),
+                            '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_sms_index',
-                            '%url%' => $this->generateUrl(
+                            '%url%'       => $this->generateUrl(
                                 'mautic_sms_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId' => $entity->getId(),
+                                    'objectId'     => $entity->getId(),
                                 ]
                             ),
                         ]
@@ -385,10 +385,10 @@ public function newAction($entity = null)
                     if ($form->get('buttons')->get('save')->isClicked()) {
                         $viewParameters = [
                             'objectAction' => 'view',
-                            'objectId' => $entity->getId(),
+                            'objectId'     => $entity->getId(),
                         ];
                         $returnUrl = $this->generateUrl('mautic_sms_action', $viewParameters);
-                        $template = 'MauticSmsBundle:Sms:view';
+                        $template  = 'MauticSmsBundle:Sms:view';
                     } else {
                         //return edit view so that all the session stuff is loaded
                         return $this->editAction($entity->getId(), true);
@@ -396,27 +396,27 @@ public function newAction($entity = null)
                 }
             } else {
                 $viewParameters = ['page' => $page];
-                $returnUrl = $this->generateUrl('mautic_sms_index', $viewParameters);
-                $template = 'MauticSmsBundle:Sms:index';
+                $returnUrl      = $this->generateUrl('mautic_sms_index', $viewParameters);
+                $template       = 'MauticSmsBundle:Sms:index';
                 //clear any modified content
                 $session->remove('mautic.sms.'.$entity->getSessionId().'.content');
             }
 
             $passthrough = [
-                'activeLink' => 'mautic_sms_index',
+                'activeLink'    => 'mautic_sms_index',
                 'mauticContent' => 'sms',
             ];
 
             // Check to see if this is a popup
             if (isset($form['updateSelect'])) {
-                $template = false;
+                $template    = false;
                 $passthrough = array_merge(
                     $passthrough,
                     [
                         'updateSelect' => $form['updateSelect']->getData(),
-                        'smsId' => $entity->getId(),
-                        'smsName' => $entity->getName(),
-                        'smsLang' => $entity->getLanguage(),
+                        'smsId'        => $entity->getId(),
+                        'smsName'      => $entity->getName(),
+                        'smsLang'      => $entity->getLanguage(),
                     ]
                 );
             }
@@ -424,8 +424,8 @@ public function newAction($entity = null)
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 return $this->postActionRedirect(
                     [
-                        'returnUrl' => $returnUrl,
-                        'viewParameters' => $viewParameters,
+                        'returnUrl'       => $returnUrl,
+                        'viewParameters'  => $viewParameters,
                         'contentTemplate' => $template,
                         'passthroughVars' => $passthrough,
                     ]
@@ -437,14 +437,14 @@ public function newAction($entity = null)
             [
                 'viewParameters' => [
                     'form' => $this->setFormTheme($form, 'MauticSmsBundle:Sms:form.html.php', 'MauticSmsBundle:FormTheme\Sms'),
-                    'sms' => $entity,
+                    'sms'  => $entity,
                 ],
                 'contentTemplate' => 'MauticSmsBundle:Sms:form.html.php',
                 'passthroughVars' => [
-                    'activeLink' => '#mautic_sms_index',
+                    'activeLink'    => '#mautic_sms_index',
                     'mauticContent' => 'sms',
-                    'updateSelect' => InputHelper::clean($this->request->query->get('updateSelect')),
-                    'route' => $this->generateUrl(
+                    'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
+                    'route'         => $this->generateUrl(
                         'mautic_sms_action',
                         [
                             'objectAction' => 'new',
@@ -465,21 +465,21 @@ public function newAction($entity = null)
     public function editAction($objectId, $ignorePost = false, $forceTypeSelection = false)
     {
         /** @var \Mautic\SmsBundle\Model\SmsModel $model */
-        $model = $this->getModel('sms');
-        $method = $this->request->getMethod();
-        $entity = $model->getEntity($objectId);
+        $model   = $this->getModel('sms');
+        $method  = $this->request->getMethod();
+        $entity  = $model->getEntity($objectId);
         $session = $this->get('session');
-        $page = $session->get('mautic.sms.page', 1);
+        $page    = $session->get('mautic.sms.page', 1);
 
         //set the return URL
         $returnUrl = $this->generateUrl('mautic_sms_index', ['page' => $page]);
 
         $postActionVars = [
-            'returnUrl' => $returnUrl,
-            'viewParameters' => ['page' => $page],
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticSmsBundle:Sms:index',
             'passthroughVars' => [
-                'activeLink' => 'mautic_sms_index',
+                'activeLink'    => 'mautic_sms_index',
                 'mauticContent' => 'sms',
             ],
         ];
@@ -492,8 +492,8 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                     [
                         'flashes' => [
                             [
-                                'type' => 'error',
-                                'msg' => 'mautic.sms.error.notfound',
+                                'type'    => 'error',
+                                'msg'     => 'mautic.sms.error.notfound',
                                 'msgVars' => ['%id%' => $objectId],
                             ],
                         ],
@@ -532,13 +532,13 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
                     $this->addFlash(
                         'mautic.core.notice.updated',
                         [
-                            '%name%' => $entity->getName(),
+                            '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_sms_index',
-                            '%url%' => $this->generateUrl(
+                            '%url%'       => $this->generateUrl(
                                 'mautic_sms_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId' => $entity->getId(),
+                                    'objectId'     => $entity->getId(),
                                 ]
                             ),
                         ],
@@ -553,7 +553,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             }
 
             $passthrough = [
-                'activeLink' => 'mautic_sms_index',
+                'activeLink'    => 'mautic_sms_index',
                 'mauticContent' => 'sms',
             ];
 
@@ -561,14 +561,14 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
 
             // Check to see if this is a popup
             if (isset($form['updateSelect'])) {
-                $template = false;
+                $template    = false;
                 $passthrough = array_merge(
                     $passthrough,
                     [
                         'updateSelect' => $form['updateSelect']->getData(),
-                        'smsId' => $entity->getId(),
-                        'smsName' => $entity->getName(),
-                        'smsLang' => $entity->getLanguage(),
+                        'smsId'        => $entity->getId(),
+                        'smsName'      => $entity->getName(),
+                        'smsLang'      => $entity->getLanguage(),
                     ]
                 );
             }
@@ -576,15 +576,15 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId' => $entity->getId(),
+                    'objectId'     => $entity->getId(),
                 ];
 
                 return $this->postActionRedirect(
                     array_merge(
                         $postActionVars,
                         [
-                            'returnUrl' => $this->generateUrl('mautic_sms_action', $viewParameters),
-                            'viewParameters' => $viewParameters,
+                            'returnUrl'       => $this->generateUrl('mautic_sms_action', $viewParameters),
+                            'viewParameters'  => $viewParameters,
                             'contentTemplate' => $template,
                             'passthroughVars' => $passthrough,
                         ]
@@ -599,20 +599,20 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
         return $this->delegateView(
             [
                 'viewParameters' => [
-                    'form' => $this->setFormTheme($form, 'MauticSmsBundle:Sms:form.html.php', 'MauticSmsBundle:FormTheme\Sms'),
-                    'sms' => $entity,
+                    'form'               => $this->setFormTheme($form, 'MauticSmsBundle:Sms:form.html.php', 'MauticSmsBundle:FormTheme\Sms'),
+                    'sms'                => $entity,
                     'forceTypeSelection' => $forceTypeSelection,
                 ],
                 'contentTemplate' => 'MauticSmsBundle:Sms:form.html.php',
                 'passthroughVars' => [
-                    'activeLink' => '#mautic_sms_index',
+                    'activeLink'    => '#mautic_sms_index',
                     'mauticContent' => 'sms',
-                    'updateSelect' => InputHelper::clean($this->request->query->get('updateSelect')),
-                    'route' => $this->generateUrl(
+                    'updateSelect'  => InputHelper::clean($this->request->query->get('updateSelect')),
+                    'route'         => $this->generateUrl(
                         'mautic_sms_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId' => $entity->getId(),
+                            'objectId'     => $entity->getId(),
                         ]
                     ),
                 ],
@@ -629,7 +629,7 @@ public function editAction($objectId, $ignorePost = false, $forceTypeSelection =
      */
     public function cloneAction($objectId)
     {
-        $model = $this->getModel('sms');
+        $model  = $this->getModel('sms');
         $entity = $model->getEntity($objectId);
 
         if ($entity != null) {
@@ -643,8 +643,8 @@ public function cloneAction($objectId)
                 return $this->accessDenied();
             }
 
-            $entity = clone $entity;
-            $session = $this->get('session');
+            $entity      = clone $entity;
+            $session     = $this->get('session');
             $contentName = 'mautic.sms.'.$entity->getSessionId().'.content';
 
             $session->set($contentName, $entity->getContent());
@@ -662,28 +662,28 @@ public function cloneAction($objectId)
      */
     public function deleteAction($objectId)
     {
-        $page = $this->get('session')->get('mautic.sms.page', 1);
+        $page      = $this->get('session')->get('mautic.sms.page', 1);
         $returnUrl = $this->generateUrl('mautic_sms_index', ['page' => $page]);
-        $flashes = [];
+        $flashes   = [];
 
         $postActionVars = [
-            'returnUrl' => $returnUrl,
-            'viewParameters' => ['page' => $page],
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticSmsBundle:Sms:index',
             'passthroughVars' => [
-                'activeLink' => 'mautic_sms_index',
+                'activeLink'    => 'mautic_sms_index',
                 'mauticContent' => 'sms',
             ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
-            $model = $this->getModel('sms');
+            $model  = $this->getModel('sms');
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
                 $flashes[] = [
-                    'type' => 'error',
-                    'msg' => 'mautic.sms.error.notfound',
+                    'type'    => 'error',
+                    'msg'     => 'mautic.sms.error.notfound',
                     'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -700,11 +700,11 @@ public function deleteAction($objectId)
             $model->deleteEntity($entity);
 
             $flashes[] = [
-                'type' => 'notice',
-                'msg' => 'mautic.core.notice.deleted',
+                'type'    => 'notice',
+                'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $entity->getTitle(),
-                    '%id%' => $objectId,
+                    '%id%'   => $objectId,
                 ],
             ];
         } //else don't do anything
@@ -724,23 +724,23 @@ public function deleteAction($objectId)
      */
     public function batchDeleteAction()
     {
-        $page = $this->get('session')->get('mautic.sms.page', 1);
+        $page      = $this->get('session')->get('mautic.sms.page', 1);
         $returnUrl = $this->generateUrl('mautic_sms_index', ['page' => $page]);
-        $flashes = [];
+        $flashes   = [];
 
         $postActionVars = [
-            'returnUrl' => $returnUrl,
-            'viewParameters' => ['page' => $page],
+            'returnUrl'       => $returnUrl,
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticSmsBundle:Sms:index',
             'passthroughVars' => [
-                'activeLink' => '#mautic_sms_index',
+                'activeLink'    => '#mautic_sms_index',
                 'mauticContent' => 'sms',
             ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
             $model = $this->getModel('sms');
-            $ids = json_decode($this->request->query->get('ids', '{}'));
+            $ids   = json_decode($this->request->query->get('ids', '{}'));
 
             $deleteIds = [];
 
@@ -750,8 +750,8 @@ public function batchDeleteAction()
 
                 if ($entity === null) {
                     $flashes[] = [
-                        'type' => 'error',
-                        'msg' => 'mautic.sms.error.notfound',
+                        'type'    => 'error',
+                        'msg'     => 'mautic.sms.error.notfound',
                         'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif (!$this->get('mautic.security')->hasEntityAccess(
@@ -773,8 +773,8 @@ public function batchDeleteAction()
                 $entities = $model->deleteEntities($deleteIds);
 
                 $flashes[] = [
-                    'type' => 'notice',
-                    'msg' => 'mautic.sms.notice.batch_deleted',
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.sms.notice.batch_deleted',
                     'msgVars' => [
                         '%count%' => count($entities),
                     ],
@@ -798,8 +798,8 @@ public function batchDeleteAction()
     public function previewAction($objectId)
     {
         /** @var \Mautic\SmsBundle\Model\SmsModel $model */
-        $model = $this->getModel('sms');
-        $sms = $model->getEntity($objectId);
+        $model    = $this->getModel('sms');
+        $sms      = $model->getEntity($objectId);
         $security = $this->get('mautic.security');
 
         if ($sms !== null && $security->hasEntityAccess('sms:smses:viewown', 'sms:smses:viewother')) {
@@ -822,7 +822,6 @@ public function previewAction($objectId)
      */
     public function contactsAction($objectId, $page = 1)
     {
-
         return $this->generateContactsGrid(
             $objectId,
             $page,
diff --git a/app/bundles/SmsBundle/Entity/Sms.php b/app/bundles/SmsBundle/Entity/Sms.php
index eb30be980ae..6e96d6176c8 100644
--- a/app/bundles/SmsBundle/Entity/Sms.php
+++ b/app/bundles/SmsBundle/Entity/Sms.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -88,8 +89,8 @@ class Sms extends FormEntity
 
     public function __clone()
     {
-        $this->id = null;
-        $this->stats = new ArrayCollection();
+        $this->id        = null;
+        $this->stats     = new ArrayCollection();
         $this->sentCount = 0;
         $this->readCount = 0;
 
@@ -237,12 +238,12 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
      */
     protected function isChanged($prop, $val)
     {
-        $getter = 'get'.ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
 
         if ($prop == 'category' || $prop == 'list') {
             $currentId = ($current) ? $current->getId() : '';
-            $newId = ($val) ? $val->getId() : null;
+            $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
                 $this->changes[$prop] = [$currentId, $newId];
             }
diff --git a/app/bundles/SmsBundle/Entity/SmsRepository.php b/app/bundles/SmsBundle/Entity/SmsRepository.php
index 20ac86d7b82..dc115081668 100644
--- a/app/bundles/SmsBundle/Entity/SmsRepository.php
+++ b/app/bundles/SmsBundle/Entity/SmsRepository.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Entity;
 
 use Doctrine\ORM\Query;
@@ -67,17 +68,17 @@ public function getSentCount()
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
     {
-        $command = $filter->command;
-        $unique = $this->generateRandomParameterName();
+        $command         = $filter->command;
+        $unique          = $this->generateRandomParameterName();
         $returnParameter = true; //returning a parameter that is not used will lead to a Doctrine error
-        $expr = false;
+        $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr = $q->expr()->eq('e.isPublished', ":$unique");
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
                 $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr = $q->expr()->eq('e.isPublished', ":$unique");
+                $expr            = $q->expr()->eq('e.isPublished', ":$unique");
                 $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isuncategorized'):
@@ -88,19 +89,19 @@ protected function addSearchCommandWhereClause(&$q, $filter)
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.ismine'):
-                $expr = $q->expr()->eq('IDENTITY(e.createdBy)', $this->currentUser->getId());
+                $expr            = $q->expr()->eq('IDENTITY(e.createdBy)', $this->currentUser->getId());
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.category'):
-                $expr = $q->expr()->like('e.alias', ":$unique");
+                $expr           = $q->expr()->like('e.alias', ":$unique");
                 $filter->strict = true;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.lang'):
-                $langUnique = $this->generateRandomParameterName();
-                $langValue = $filter->string.'_%';
+                $langUnique      = $this->generateRandomParameterName();
+                $langValue       = $filter->string.'_%';
                 $forceParameters = [
                     $langUnique => $langValue,
-                    $unique => $filter->string,
+                    $unique     => $filter->string,
                 ];
                 $expr = $q->expr()->orX(
                     $q->expr()->eq('e.language', ":$unique"),
@@ -118,7 +119,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         } elseif (!$returnParameter) {
             $parameters = [];
         } else {
-            $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+            $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
             $parameters = ["$unique" => $string];
         }
 
diff --git a/app/bundles/SmsBundle/Entity/Stat.php b/app/bundles/SmsBundle/Entity/Stat.php
index 2b1c4a30fc6..a5d324a05b3 100644
--- a/app/bundles/SmsBundle/Entity/Stat.php
+++ b/app/bundles/SmsBundle/Entity/Stat.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\IpAddress;
 use Mautic\LeadBundle\Entity\Lead;
-use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\LeadBundle\Entity\LeadList;
 
 /**
diff --git a/app/bundles/SmsBundle/Entity/StatRepository.php b/app/bundles/SmsBundle/Entity/StatRepository.php
index 0d536365215..7b7d4ddb68c 100644
--- a/app/bundles/SmsBundle/Entity/StatRepository.php
+++ b/app/bundles/SmsBundle/Entity/StatRepository.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Entity;
 
 use Mautic\CoreBundle\Entity\CommonRepository;
@@ -51,7 +52,7 @@ public function getSentStats($smsId, $listId = null)
     {
         $q = $this->_em->getConnection()->createQueryBuilder();
         $q->select('s.lead_id')
-            ->from(MAUTIC_TABLE_PREFIX . 'sms_messages_stats', 's')
+            ->from(MAUTIC_TABLE_PREFIX.'sms_messages_stats', 's')
             ->where('s.sms_id = :sms')
             ->setParameter('sms', $smsId);
 
@@ -63,7 +64,7 @@ public function getSentStats($smsId, $listId = null)
         $result = $q->execute()->fetchAll();
 
         //index by lead
-        $stats = array();
+        $stats = [];
         foreach ($result as $r) {
             $stats[$r['lead_id']] = $r['lead_id'];
         }
@@ -84,11 +85,11 @@ public function getSentCount($smsIds = null, $listId = null)
         $q = $this->_em->getConnection()->createQueryBuilder();
 
         $q->select('count(s.id) as sent_count')
-            ->from(MAUTIC_TABLE_PREFIX . 'sms_message_stats', 's');
+            ->from(MAUTIC_TABLE_PREFIX.'sms_message_stats', 's');
 
         if ($smsIds) {
             if (!is_array($smsIds)) {
-                $smsIds = array((int) $smsIds);
+                $smsIds = [(int) $smsIds];
             }
             $q->where(
                 $q->expr()->in('s.sms_id', $smsIds)
@@ -96,7 +97,7 @@ public function getSentCount($smsIds = null, $listId = null)
         }
 
         if ($listId) {
-            $q->andWhere('s.list_id = ' . (int) $listId);
+            $q->andWhere('s.list_id = '.(int) $listId);
         }
 
         $q->andWhere('s.is_failed = :false')
@@ -108,16 +109,17 @@ public function getSentCount($smsIds = null, $listId = null)
     }
 
     /**
-     * Get a lead's email stat
+     * Get a lead's email stat.
      *
-     * @param integer $leadId
-     * @param array   $options
+     * @param int   $leadId
+     * @param array $options
      *
      * @return array
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getLeadStats($leadId, array $options = array())
+    public function getLeadStats($leadId, array $options = [])
     {
         $query = $this->createQueryBuilder('s');
 
@@ -130,12 +132,12 @@ public function getLeadStats($leadId, array $options = array())
 
         if (isset($options['search']) && $options['search']) {
             $query->andWhere(
-                $query->expr()->like('e.title', $query->expr()->literal('%' . $options['search'] . '%'))
+                $query->expr()->like('e.title', $query->expr()->literal('%'.$options['search'].'%'))
             );
         }
 
         if (isset($options['order'])) {
-            list ($orderBy, $orderByDir) = $options['order'];
+            list($orderBy, $orderByDir) = $options['order'];
 
             switch ($orderBy) {
                 case 'eventLabel':
@@ -171,7 +173,7 @@ public function getLeadStats($leadId, array $options = array())
     }
 
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
diff --git a/app/bundles/SmsBundle/Event/SmsClickEvent.php b/app/bundles/SmsBundle/Event/SmsClickEvent.php
index 516e0d0d82f..66ec2027455 100644
--- a/app/bundles/SmsBundle/Event/SmsClickEvent.php
+++ b/app/bundles/SmsBundle/Event/SmsClickEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
@@ -28,8 +29,8 @@ class SmsClickEvent extends CommonEvent
      */
     public function __construct(Stat $stat, $request)
     {
-        $this->entity = $stat;
-        $this->sms = $stat->getSms();
+        $this->entity  = $stat;
+        $this->sms     = $stat->getSms();
         $this->request = $request;
     }
 
diff --git a/app/bundles/SmsBundle/Event/SmsEvent.php b/app/bundles/SmsBundle/Event/SmsEvent.php
index b623304a437..dce79569118 100644
--- a/app/bundles/SmsBundle/Event/SmsEvent.php
+++ b/app/bundles/SmsBundle/Event/SmsEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
@@ -24,7 +25,7 @@ class SmsEvent extends CommonEvent
     public function __construct(Sms $sms, $isNew = false)
     {
         $this->entity = $sms;
-        $this->isNew = $isNew;
+        $this->isNew  = $isNew;
     }
 
     /**
diff --git a/app/bundles/SmsBundle/Event/SmsSendEvent.php b/app/bundles/SmsBundle/Event/SmsSendEvent.php
index b2c2062503d..beae8bb5662 100644
--- a/app/bundles/SmsBundle/Event/SmsSendEvent.php
+++ b/app/bundles/SmsBundle/Event/SmsSendEvent.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Event;
 
 use Mautic\CoreBundle\Event\CommonEvent;
@@ -39,7 +40,7 @@ class SmsSendEvent extends CommonEvent
     public function __construct($content, Lead $lead)
     {
         $this->content = $content;
-        $this->lead = $lead;
+        $this->lead    = $lead;
     }
 
     /**
diff --git a/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php b/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php
index cba1937ae58..36f5c472a92 100644
--- a/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/SmsBundle/EventListener/CampaignSubscriber.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\EventListener;
 
+use Mautic\CampaignBundle\CampaignEvents;
+use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\Event\TokenReplacementEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
-use Mautic\CampaignBundle\CampaignEvents;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\LeadBundle\Entity\DoNotContact;
 use Mautic\LeadBundle\Model\LeadModel;
@@ -69,8 +69,7 @@ public function __construct(
         SmsModel $smsModel,
         AbstractSmsApi $smsApi,
         SmsHelper $smsHelper
-    )
-    {
+    ) {
         $this->coreParametersHelper = $coreParametersHelper;
         $this->leadModel            = $leadModel;
         $this->smsModel             = $smsModel;
@@ -85,7 +84,7 @@ public static function getSubscribedEvents()
     {
         return [
             CampaignEvents::CAMPAIGN_ON_BUILD     => ['onCampaignBuild', 0],
-            SmsEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerAction', 0]
+            SmsEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerAction', 0],
         ];
     }
 
@@ -118,7 +117,6 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         $lead = $event->getLead();
 
         if ($this->leadModel->isContactable($lead, 'sms') !== DoNotContact::IS_CONTACTABLE) {
-
             return $event->setFailed('mautic.sms.campaign.failed.not_contactable');
         }
 
@@ -129,7 +127,6 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         }
 
         if (empty($leadPhoneNumber)) {
-
             return $event->setFailed('mautic.sms.campaign.failed.missing_number');
         }
 
@@ -137,7 +134,6 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         $sms   = $this->smsModel->getEntity($smsId);
 
         if ($sms->getId() !== $smsId) {
-
             return $event->setFailed('mautic.sms.campaign.failed.missing_entity');
         }
 
@@ -157,7 +153,7 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
         $metadata = $this->smsApi->sendSms($leadPhoneNumber, $tokenEvent->getContent());
 
         $defaultFrequencyNumber = $this->coreParametersHelper->getParameter('sms_frequency_number');
-        $defaultFrequencyTime = $this->coreParametersHelper->getParameter('sms_frequency_time');
+        $defaultFrequencyTime   = $this->coreParametersHelper->getParameter('sms_frequency_time');
 
         /** @var \Mautic\LeadBundle\Entity\FrequencyRuleRepository $frequencyRulesRepo */
         $frequencyRulesRepo = $this->leadModel->getFrequencyRuleRepository();
@@ -166,14 +162,12 @@ public function onCampaignTriggerAction(CampaignExecutionEvent $event)
 
         $dontSendTo = $frequencyRulesRepo->getAppliedFrequencyRules('sms', $leadIds, null, $defaultFrequencyNumber, $defaultFrequencyTime);
 
-
         if (!empty($dontSendTo) and $dontSendTo[0]['lead_id'] != $lead->getId()) {
             $metadata = $this->smsApi->sendSms($leadPhoneNumber, $smsEvent->getContent());
         }
 
         // If there was a problem sending at this point, it's an API problem and should be requeued
         if ($metadata === false) {
-
             return $event->setResult(false);
         }
 
diff --git a/app/bundles/SmsBundle/EventListener/ConfigSubscriber.php b/app/bundles/SmsBundle/EventListener/ConfigSubscriber.php
index c7039d67ffc..70fca78a8cb 100644
--- a/app/bundles/SmsBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/SmsBundle/EventListener/ConfigSubscriber.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
  * Class ConfigSubscriber.
@@ -31,9 +32,9 @@ public static function getSubscribedEvents()
     public function onConfigGenerate(ConfigBuilderEvent $event)
     {
         $event->addForm([
-            'bundle' => 'SmsBundle',
-            'formAlias' => 'smsconfig',
-            'formTheme' => 'MauticSmsBundle:FormTheme\Config',
+            'bundle'     => 'SmsBundle',
+            'formAlias'  => 'smsconfig',
+            'formTheme'  => 'MauticSmsBundle:FormTheme\Config',
             'parameters' => $event->getParametersFromConfig('MauticSmsBundle'),
         ]);
     }
diff --git a/app/bundles/SmsBundle/EventListener/SmsSubscriber.php b/app/bundles/SmsBundle/EventListener/SmsSubscriber.php
index 0d1a79105d7..dd31a32bc22 100644
--- a/app/bundles/SmsBundle/EventListener/SmsSubscriber.php
+++ b/app/bundles/SmsBundle/EventListener/SmsSubscriber.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\EventListener;
 
 use Mautic\AssetBundle\Helper\TokenHelper as AssetTokenHelper;
-use Mautic\CoreBundle\Model\AuditLogModel;
-use Mautic\PageBundle\Entity\Trackable;
-use Mautic\PageBundle\Helper\TokenHelper as PageTokenHelper;
 use Mautic\CoreBundle\Event\TokenReplacementEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Helper\TokenHelper;
+use Mautic\PageBundle\Entity\Trackable;
+use Mautic\PageBundle\Helper\TokenHelper as PageTokenHelper;
 use Mautic\PageBundle\Model\TrackableModel;
 use Mautic\SmsBundle\Event\SmsEvent;
 use Mautic\SmsBundle\SmsEvents;
diff --git a/app/bundles/SmsBundle/Exception/MissingPasswordException.php b/app/bundles/SmsBundle/Exception/MissingPasswordException.php
index 31579df25fa..fdc791e2d40 100644
--- a/app/bundles/SmsBundle/Exception/MissingPasswordException.php
+++ b/app/bundles/SmsBundle/Exception/MissingPasswordException.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Exception;
 
 class MissingPasswordException extends \Exception
diff --git a/app/bundles/SmsBundle/Exception/MissingUsernameException.php b/app/bundles/SmsBundle/Exception/MissingUsernameException.php
index 33800fab000..7a034c87d8b 100644
--- a/app/bundles/SmsBundle/Exception/MissingUsernameException.php
+++ b/app/bundles/SmsBundle/Exception/MissingUsernameException.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Exception;
 
 class MissingUsernameException extends \Exception
diff --git a/app/bundles/SmsBundle/Form/Type/ConfigType.php b/app/bundles/SmsBundle/Form/Type/ConfigType.php
index f0af6aa0229..5f69d9e870f 100644
--- a/app/bundles/SmsBundle/Form/Type/ConfigType.php
+++ b/app/bundles/SmsBundle/Form/Type/ConfigType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
@@ -31,8 +32,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'yesno_button_group',
             [
                 'label' => 'mautic.sms.config.form.sms.enabled',
-                'data' => (bool) $options['data']['sms_enabled'],
-                'attr' => [
+                'data'  => (bool) $options['data']['sms_enabled'],
+                'attr'  => [
                     'tooltip' => 'mautic.sms.config.form.sms.enabled.tooltip',
                 ],
             ]
@@ -58,9 +59,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'text',
                 [
                     'label' => 'mautic.sms.config.form.sms.username',
-                    'attr' => [
-                        'tooltip' => 'mautic.sms.config.form.sms.username.tooltip',
-                        'class' => 'form-control',
+                    'attr'  => [
+                        'tooltip'      => 'mautic.sms.config.form.sms.username.tooltip',
+                        'class'        => 'form-control',
                         'data-show-on' => '{"config_smsconfig_sms_enabled_1":"checked"}',
                     ],
                     'constraints' => $constraints,
@@ -72,9 +73,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'text',
                 [
                     'label' => 'mautic.sms.config.form.sms.password',
-                    'attr' => [
-                        'tooltip' => 'mautic.sms.config.form.sms.password.tooltip',
-                        'class' => 'form-control',
+                    'attr'  => [
+                        'tooltip'      => 'mautic.sms.config.form.sms.password.tooltip',
+                        'class'        => 'form-control',
                         'data-show-on' => '{"config_smsconfig_sms_enabled_1":"checked"}',
                     ],
                     'constraints' => $constraints,
@@ -86,40 +87,40 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'text',
                 [
                     'label' => 'mautic.sms.config.form.sms.sending_phone_number',
-                    'attr' => [
-                        'tooltip' => 'mautic.sms.config.form.sms.sending_phone_number.tooltip',
-                        'class' => 'form-control',
+                    'attr'  => [
+                        'tooltip'      => 'mautic.sms.config.form.sms.sending_phone_number.tooltip',
+                        'class'        => 'form-control',
                         'data-show-on' => '{"config_smsconfig_sms_enabled_1":"checked"}',
                     ],
                     'constraints' => $constraints,
                 ]
             );
         };
-        $builder->add('sms_frequency_number','number',
-            array(
+        $builder->add('sms_frequency_number', 'number',
+            [
                 'precision'  => 0,
                 'label'      => 'mautic.sms.list.frequency.number',
-                'label_attr' => array('class' => 'control-label'),
+                'label_attr' => ['class' => 'control-label'],
                 'required'   => false,
-                'attr'       => array(
-                    'class' => 'form-control frequency'
-                )
-            ));
-        $builder->add('sms_frequency_time','choice',
-            array(
-                'choices'    => array(
-                    'DAY' => 'day',
-                    'WEEK' => 'week',
-                    'MONTH' => 'month'
-                ),
+                'attr'       => [
+                    'class' => 'form-control frequency',
+                ],
+            ]);
+        $builder->add('sms_frequency_time', 'choice',
+            [
+                'choices' => [
+                    'DAY'   => 'day',
+                    'WEEK'  => 'week',
+                    'MONTH' => 'month',
+                ],
                 'label'      => 'mautic.lead.list.frequency.times',
-                'label_attr' => array('class' => 'control-label'),
+                'label_attr' => ['class' => 'control-label'],
                 'required'   => false,
                 'multiple'   => false,
-                'attr'       => array(
-                    'class' => 'form-control frequency'
-                )
-            ));
+                'attr'       => [
+                    'class' => 'form-control frequency',
+                ],
+            ]);
 
         // Before submit
         $builder->addEventListener(
diff --git a/app/bundles/SmsBundle/Form/Type/SmsListType.php b/app/bundles/SmsBundle/Form/Type/SmsListType.php
index 9779ccb869d..817e5029dc9 100644
--- a/app/bundles/SmsBundle/Form/Type/SmsListType.php
+++ b/app/bundles/SmsBundle/Form/Type/SmsListType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
@@ -28,7 +29,7 @@ class SmsListType extends AbstractType
     public function __construct(MauticFactory $factory)
     {
         $this->viewOther = $factory->getSecurity()->isGranted('sms:smses:viewother');
-        $this->repo = $factory->getModel('sms')->getRepository();
+        $this->repo      = $factory->getModel('sms')->getRepository();
 
         $this->repo->setCurrentUser($factory->getUser());
     }
@@ -39,7 +40,7 @@ public function __construct(MauticFactory $factory)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $viewOther = $this->viewOther;
-        $repo = $this->repo;
+        $repo      = $this->repo;
 
         $resolver->setDefaults(
             [
@@ -62,9 +63,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
                     return $choices;
                 },
-                'expanded' => false,
-                'multiple' => true,
-                'required' => false,
+                'expanded'    => false,
+                'multiple'    => true,
+                'required'    => false,
                 'empty_value' => function (Options $options) {
                     return (empty($options['choices'])) ? 'mautic.sms.no.smses.note' : 'mautic.core.form.chooseone';
                 },
diff --git a/app/bundles/SmsBundle/Form/Type/SmsSendType.php b/app/bundles/SmsBundle/Form/Type/SmsSendType.php
index dc2916569f7..8c7d41fc7b1 100644
--- a/app/bundles/SmsBundle/Form/Type/SmsSendType.php
+++ b/app/bundles/SmsBundle/Form/Type/SmsSendType.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Form\Type;
 
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
  * Class SmsSendType.
@@ -43,9 +44,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'sms',
             'sms_list',
             [
-                'label'       => 'mautic.sms.send.selectsmss',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.sms.send.selectsmss',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
                     'tooltip'  => 'mautic.sms.choose.smss',
                     'onchange' => 'Mautic.disabledSmsAction()',
@@ -55,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'constraints' => [
                     new NotBlank(
                         ['message' => 'mautic.sms.choosesms.notblank']
-                    )
+                    ),
                 ],
             ]
         );
@@ -74,12 +75,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'newSmsButton',
                 'button',
                 [
-                    'attr'  => [
+                    'attr' => [
                         'class'   => 'btn btn-primary btn-nospin',
                         'onclick' => 'Mautic.loadNewSmsWindow({
                         "windowUrl": "'.$windowUrl.'"
                     })',
-                        'icon'    => 'fa fa-plus',
+                        'icon' => 'fa fa-plus',
                     ],
                     'label' => 'mautic.sms.send.new.sms',
                 ]
@@ -102,7 +103,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'editSmsButton',
                 'button',
                 [
-                    'attr'  => [
+                    'attr' => [
                         'class'    => 'btn btn-primary btn-nospin',
                         'onclick'  => 'Mautic.loadNewSmsWindow(Mautic.standardSmsUrl({"windowUrl": "'.$windowUrlEdit.'"}))',
                         'disabled' => !isset($sms),
diff --git a/app/bundles/SmsBundle/Form/Type/SmsType.php b/app/bundles/SmsBundle/Form/Type/SmsType.php
index fa17807736a..de781701970 100644
--- a/app/bundles/SmsBundle/Form/Type/SmsType.php
+++ b/app/bundles/SmsBundle/Form/Type/SmsType.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
@@ -31,8 +32,8 @@ class SmsType extends AbstractType
     public function __construct(MauticFactory $factory)
     {
         $this->translator = $factory->getTranslator();
-        $this->em = $factory->getEntityManager();
-        $this->request = $factory->getRequest();
+        $this->em         = $factory->getEntityManager();
+        $this->request    = $factory->getRequest();
     }
 
     /**
@@ -48,9 +49,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'name',
             'text',
             [
-                'label' => 'mautic.sms.form.internal.name',
+                'label'      => 'mautic.sms.form.internal.name',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => ['class' => 'form-control'],
+                'attr'       => ['class' => 'form-control'],
             ]
         );
 
@@ -58,10 +59,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'description',
             'textarea',
             [
-                'label' => 'mautic.sms.form.internal.description',
+                'label'      => 'mautic.sms.form.internal.description',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => ['class' => 'form-control'],
-                'required' => false,
+                'attr'       => ['class' => 'form-control'],
+                'required'   => false,
             ]
         );
 
@@ -69,11 +70,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'message',
             'textarea',
             [
-                'label' => 'mautic.sms.form.message',
+                'label'      => 'mautic.sms.form.message',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
+                'attr'       => [
                     'class' => 'form-control',
-                    'rows' => 6,
+                    'rows'  => 6,
                 ],
             ]
         );
@@ -84,14 +85,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'publishUp',
             'datetime',
             [
-                'widget' => 'single_text',
-                'label' => 'mautic.core.form.publishup',
+                'widget'     => 'single_text',
+                'label'      => 'mautic.core.form.publishup',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
-                    'class' => 'form-control',
+                'attr'       => [
+                    'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format' => 'yyyy-MM-dd HH:mm',
+                'format'   => 'yyyy-MM-dd HH:mm',
                 'required' => false,
             ]
         );
@@ -100,14 +101,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'publishDown',
             'datetime',
             [
-                'widget' => 'single_text',
-                'label' => 'mautic.core.form.publishdown',
+                'widget'     => 'single_text',
+                'label'      => 'mautic.core.form.publishdown',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
-                    'class' => 'form-control',
+                'attr'       => [
+                    'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format' => 'yyyy-MM-dd HH:mm',
+                'format'   => 'yyyy-MM-dd HH:mm',
                 'required' => false,
             ]
         );
@@ -116,18 +117,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
              'category',
              'category',
-             array(
-                 'bundle' => 'sms'
-             )
+             [
+                 'bundle' => 'sms',
+             ]
          );
 
         $builder->add(
             'language',
             'locale',
             [
-                'label' => 'mautic.core.language',
+                'label'      => 'mautic.core.language',
                 'label_attr' => ['class' => 'control-label'],
-                'attr' => [
+                'attr'       => [
                     'class' => 'form-control',
                 ],
                 'required' => false,
@@ -148,7 +149,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'updateSelect',
                 'hidden',
                 [
-                    'data' => $options['update_select'],
+                    'data'   => $options['update_select'],
                     'mapped' => false,
                 ]
             );
diff --git a/app/bundles/SmsBundle/Helper/SmsHelper.php b/app/bundles/SmsBundle/Helper/SmsHelper.php
index 2391911bd8e..f3030c06315 100644
--- a/app/bundles/SmsBundle/Helper/SmsHelper.php
+++ b/app/bundles/SmsBundle/Helper/SmsHelper.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Helper;
 
 use Doctrine\ORM\EntityManager;
@@ -55,12 +56,11 @@ class SmsHelper
      */
     public function __construct(EntityManager $em, LeadModel $leadModel, PhoneNumberHelper $phoneNumberHelper, SmsModel $smsModel, $smsFrequencyNumber)
     {
-        $this->em = $em;
-        $this->leadModel = $leadModel;
-        $this->phoneNumberHelper = $phoneNumberHelper;
-        $this->smsModel = $smsModel;
+        $this->em                 = $em;
+        $this->leadModel          = $leadModel;
+        $this->phoneNumberHelper  = $phoneNumberHelper;
+        $this->smsModel           = $smsModel;
         $this->smsFrequencyNumber = $smsFrequencyNumber;
-
     }
 
     public function unsubscribe($number)
@@ -75,8 +75,8 @@ public function unsubscribe($number)
                 'force' => [
                     [
                         'column' => 'mobile',
-                        'expr' => 'eq',
-                        'value' => $number,
+                        'expr'   => 'eq',
+                        'value'  => $number,
                     ],
                 ],
             ],
@@ -105,22 +105,22 @@ public function unsubscribe($number)
     public function applyFrequencyRules(Lead $lead)
     {
         $frequencyRule = $lead->getFrequencyRules();
-        $statRepo = $this->smsModel->getStatRepository();
-        $now = new \DateTime();
-        $channels = $frequencyRule['channels'];
+        $statRepo      = $this->smsModel->getStatRepository();
+        $now           = new \DateTime();
+        $channels      = $frequencyRule['channels'];
 
         $frequencyTime = $frequencyNumber = null;
 
         if (!empty($frequencyRule) && in_array('sms', $channels, true)) {
-            $frequencyTime = new \DateInterval('P'.$frequencyRule['frequency_time']);
+            $frequencyTime   = new \DateInterval('P'.$frequencyRule['frequency_time']);
             $frequencyNumber = $frequencyRule['frequency_number'];
-        } elseif($this->smsFrequencyNumber > 0) {
-            $frequencyTime = new \DateInterval('P'.$frequencyRule['sms_frequency_time']);
+        } elseif ($this->smsFrequencyNumber > 0) {
+            $frequencyTime   = new \DateInterval('P'.$frequencyRule['sms_frequency_time']);
             $frequencyNumber = $this->smsFrequencyNumber;
         }
 
         $now->sub($frequencyTime);
-        $sentQuery = $statRepo->getLeadStats($lead->getId(), array('fromDate' => $now));
+        $sentQuery = $statRepo->getLeadStats($lead->getId(), ['fromDate' => $now]);
 
         if (!empty($sentQuery) && count($sentQuery) < $frequencyNumber) {
             return true;
diff --git a/app/bundles/SmsBundle/MauticSmsBundle.php b/app/bundles/SmsBundle/MauticSmsBundle.php
index 4a19edb9c63..f5b9de38b54 100644
--- a/app/bundles/SmsBundle/MauticSmsBundle.php
+++ b/app/bundles/SmsBundle/MauticSmsBundle.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle;
 
 use Mautic\PluginBundle\Bundle\PluginBundleBase;
diff --git a/app/bundles/SmsBundle/Model/SmsModel.php b/app/bundles/SmsBundle/Model/SmsModel.php
index 50768e5a331..ed8e51e3cfa 100644
--- a/app/bundles/SmsBundle/Model/SmsModel.php
+++ b/app/bundles/SmsBundle/Model/SmsModel.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Model;
 
 use Doctrine\DBAL\Query\QueryBuilder;
@@ -35,7 +36,7 @@ class SmsModel extends FormModel
 
     /**
      * SmsModel constructor.
-     * 
+     *
      * @param TrackableModel $pageTrackableModel
      */
     public function __construct(TrackableModel $pageTrackableModel)
@@ -282,7 +283,7 @@ public function getSmsStatByLeadId($smsId, $leadId)
     {
         return $this->getStatRepository()->findBy(
             [
-                'sms' => (int) $smsId,
+                'sms'  => (int) $smsId,
                 'lead' => (int) $leadId,
             ],
             ['dateSent' => 'DESC']
diff --git a/app/bundles/SmsBundle/Security/Permissions/SmsPermissions.php b/app/bundles/SmsBundle/Security/Permissions/SmsPermissions.php
index 8691892342f..0c09729a5b5 100644
--- a/app/bundles/SmsBundle/Security/Permissions/SmsPermissions.php
+++ b/app/bundles/SmsBundle/Security/Permissions/SmsPermissions.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Class SmsPermissions.
diff --git a/app/bundles/SmsBundle/SmsEvents.php b/app/bundles/SmsBundle/SmsEvents.php
index 1edb69e2164..3d1593f3616 100644
--- a/app/bundles/SmsBundle/SmsEvents.php
+++ b/app/bundles/SmsBundle/SmsEvents.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\SmsBundle;
 
 /**
diff --git a/app/bundles/SmsBundle/Views/FormTheme/Config/_config_smsconfig_widget.html.php b/app/bundles/SmsBundle/Views/FormTheme/Config/_config_smsconfig_widget.html.php
index f402302d5c3..3de4b0dbb5b 100644
--- a/app/bundles/SmsBundle/Views/FormTheme/Config/_config_smsconfig_widget.html.php
+++ b/app/bundles/SmsBundle/Views/FormTheme/Config/_config_smsconfig_widget.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -15,7 +15,9 @@
     </div>
     <div class="panel-body">
         <?php foreach ($form->children as $key => $f): ?>
-        <?php if (in_array($key, ['sms_frequency_number', 'sms_frequency_time'])) continue; ?>
+        <?php if (in_array($key, ['sms_frequency_number', 'sms_frequency_time'])) {
+    continue;
+} ?>
         <div class="row">
             <div class="col-md-6">
                 <?php echo $view['form']->row($f); ?>
diff --git a/app/bundles/SmsBundle/Views/FormTheme/SmsSendList/smssend_list_row.html.php b/app/bundles/SmsBundle/Views/FormTheme/SmsSendList/smssend_list_row.html.php
index cb960ff826f..92c4ccc92f7 100644
--- a/app/bundles/SmsBundle/Views/FormTheme/SmsSendList/smssend_list_row.html.php
+++ b/app/bundles/SmsBundle/Views/FormTheme/SmsSendList/smssend_list_row.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/SmsBundle/Views/Sms/details.html.php b/app/bundles/SmsBundle/Views/Sms/details.html.php
index a8e4eb4af11..3a0543fa333 100644
--- a/app/bundles/SmsBundle/Views/Sms/details.html.php
+++ b/app/bundles/SmsBundle/Views/Sms/details.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -23,8 +23,8 @@
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
         [
-            'item' => $sms,
-            'customButtons' => (isset($customButtons)) ? $customButtons : [],
+            'item'            => $sms,
+            'customButtons'   => (isset($customButtons)) ? $customButtons : [],
             'templateButtons' => [
                 'edit' => $view['security']->hasEntityAccess(
                     $permissions['sms:smses:editown'],
@@ -32,7 +32,7 @@
                     $sms->getCreatedBy()
                 ),
                 'delete' => $permissions['sms:smses:create'],
-                'close' => $view['security']->hasEntityAccess(
+                'close'  => $view['security']->hasEntityAccess(
                     $permissions['sms:smses:viewown'],
                     $permissions['sms:smses:viewother'],
                     $sms->getCreatedBy()
diff --git a/app/bundles/SmsBundle/Views/Sms/form.html.php b/app/bundles/SmsBundle/Views/Sms/form.html.php
index 3edd1254a3d..17e7fb7bf3a 100644
--- a/app/bundles/SmsBundle/Views/Sms/form.html.php
+++ b/app/bundles/SmsBundle/Views/Sms/form.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/SmsBundle/Views/Sms/index.html.php b/app/bundles/SmsBundle/Views/Sms/index.html.php
index 4ee03de3755..5b10906a414 100644
--- a/app/bundles/SmsBundle/Views/Sms/index.html.php
+++ b/app/bundles/SmsBundle/Views/Sms/index.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -15,12 +15,12 @@
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['sms:smses:create']
-            ),
-            'routeBase'       => 'sms'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['sms:smses:create'],
+            ],
+            'routeBase' => 'sms',
+        ]
     )
 );
 
@@ -28,11 +28,11 @@
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
-        'searchValue' => $searchValue,
-        'searchHelp' => 'mautic.sms.help.searchcommands',
-        'searchId' => 'sms-search',
-        'action' => $currentRoute,
-        'routeBase' => 'sms',
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.sms.help.searchcommands',
+        'searchId'        => 'sms-search',
+        'action'          => $currentRoute,
+        'routeBase'       => 'sms',
         'templateButtons' => [
             'delete' => $permissions['sms:smses:deleteown'] || $permissions['sms:smses:deleteother'],
         ],
diff --git a/app/bundles/SmsBundle/Views/Sms/list.html.php b/app/bundles/SmsBundle/Views/Sms/list.html.php
index b0a1f5d6b45..b692a760670 100644
--- a/app/bundles/SmsBundle/Views/Sms/list.html.php
+++ b/app/bundles/SmsBundle/Views/Sms/list.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
@@ -25,17 +25,17 @@
 
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'sms',
-                'orderBy' => 'e.name',
-                'text' => 'mautic.core.name',
-                'class' => 'col-sms-name',
-                'default' => true,
+                'orderBy'    => 'e.name',
+                'text'       => 'mautic.core.name',
+                'class'      => 'col-sms-name',
+                'default'    => true,
             ]);
 
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'sms',
-                'orderBy' => 'c.title',
-                'text' => 'mautic.core.category',
-                'class' => 'visible-md visible-lg col-sms-category',
+                'orderBy'    => 'c.title',
+                'text'       => 'mautic.core.category',
+                'class'      => 'visible-md visible-lg col-sms-category',
             ]);
             ?>
 
@@ -44,9 +44,9 @@
             <?php
             echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'sms',
-                'orderBy' => 'e.id',
-                'text' => 'mautic.core.id',
-                'class' => 'visible-md visible-lg col-sms-id',
+                'orderBy'    => 'e.id',
+                'text'       => 'mautic.core.id',
+                'class'      => 'visible-md visible-lg col-sms-id',
             ]);
             ?>
         </tr>
@@ -60,7 +60,7 @@
             <tr>
                 <td>
                     <?php
-                    $edit = $view['security']->hasEntityAccess($permissions['sms:smses:editown'], $permissions['sms:smses:editother'], $item->getCreatedBy());
+                    $edit          = $view['security']->hasEntityAccess($permissions['sms:smses:editown'], $permissions['sms:smses:editother'], $item->getCreatedBy());
                     $customButtons = [
                         [
                             'attr' => [
@@ -68,18 +68,18 @@
                                 'data-target' => '#MauticSharedModal',
                                 'data-header' => $view['translator']->trans('mautic.sms.smses.header.preview'),
                                 'data-footer' => 'false',
-                                'href' => $view['router']->path('mautic_sms_action', ['objectId' => $item->getId(), 'objectAction' => 'preview']),
+                                'href'        => $view['router']->path('mautic_sms_action', ['objectId' => $item->getId(), 'objectAction' => 'preview']),
                             ],
-                            'btnText' => $view['translator']->trans('mautic.sms.preview'),
+                            'btnText'   => $view['translator']->trans('mautic.sms.preview'),
                             'iconClass' => 'fa fa-share',
                         ],
                     ];
                     echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
-                        'item' => $item,
+                        'item'            => $item,
                         'templateButtons' => [
                             'delete' => $view['security']->hasEntityAccess($permissions['sms:smses:deleteown'], $permissions['sms:smses:deleteother'], $item->getCreatedBy()),
                         ],
-                        'routeBase' => 'sms',
+                        'routeBase'     => 'sms',
                         'customButtons' => $customButtons,
                     ]);
                     ?>
@@ -101,8 +101,8 @@
                 </td>
                 <td class="visible-md visible-lg">
                     <?php $category = $item->getCategory(); ?>
-                    <?php $catName = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                    <?php $color = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
+                    <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
+                    <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                     <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                 </td>
                 <td class="visible-sm visible-md visible-lg col-stats">
@@ -117,9 +117,9 @@
 <div class="panel-footer">
     <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
         'totalItems' => $totalItems,
-        'page' => $page,
-        'limit' => $limit,
-        'baseUrl' => $view['router']->path('mautic_sms_index'),
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_sms_index'),
         'sessionVar' => 'sms',
     ]); ?>
 </div>
diff --git a/app/bundles/SmsBundle/Views/Sms/list_graph.html.php b/app/bundles/SmsBundle/Views/Sms/list_graph.html.php
index 06131c7960c..50b637c450c 100644
--- a/app/bundles/SmsBundle/Views/Sms/list_graph.html.php
+++ b/app/bundles/SmsBundle/Views/Sms/list_graph.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/SmsBundle/Views/Sms/preview.html.php b/app/bundles/SmsBundle/Views/Sms/preview.html.php
index 8017b7878b8..4a27f0bb68e 100644
--- a/app/bundles/SmsBundle/Views/Sms/preview.html.php
+++ b/app/bundles/SmsBundle/Views/Sms/preview.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/SmsBundle/Views/Sms/template_graph.html.php b/app/bundles/SmsBundle/Views/Sms/template_graph.html.php
index 4e175460655..d0622c7e9b4 100644
--- a/app/bundles/SmsBundle/Views/Sms/template_graph.html.php
+++ b/app/bundles/SmsBundle/Views/Sms/template_graph.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/SmsBundle/Views/SubscribedEvents/Timeline/index.html.php b/app/bundles/SmsBundle/Views/SubscribedEvents/Timeline/index.html.php
index f0e84a2b0b3..26912244442 100644
--- a/app/bundles/SmsBundle/Views/SubscribedEvents/Timeline/index.html.php
+++ b/app/bundles/SmsBundle/Views/SubscribedEvents/Timeline/index.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
diff --git a/app/bundles/StageBundle/Config/config.php b/app/bundles/StageBundle/Config/config.php
index 25bc5330ca0..1fb719a4e8f 100644
--- a/app/bundles/StageBundle/Config/config.php
+++ b/app/bundles/StageBundle/Config/config.php
@@ -1,122 +1,123 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 return [
-    'routes'   => [
+    'routes' => [
         'main' => [
-            'mautic_stage_index'              => [
+            'mautic_stage_index' => [
                 'path'       => '/stages/{page}',
-                'controller' => 'MauticStageBundle:Stage:index'
+                'controller' => 'MauticStageBundle:Stage:index',
             ],
-            'mautic_stage_action'             => [
+            'mautic_stage_action' => [
                 'path'       => '/stages/{objectAction}/{objectId}',
-                'controller' => 'MauticStageBundle:Stage:execute'
-            ]
+                'controller' => 'MauticStageBundle:Stage:execute',
+            ],
         ],
-        'api'  => [
-            'mautic_api_getstages'   => [
+        'api' => [
+            'mautic_api_getstages' => [
                 'path'       => '/stages',
-                'controller' => 'MauticStageBundle:Api\StageApi:getEntities'
+                'controller' => 'MauticStageBundle:Api\StageApi:getEntities',
             ],
-            'mautic_api_getstage'    => [
+            'mautic_api_getstage' => [
                 'path'       => '/stages/{id}',
-                'controller' => 'MauticStageBundle:Api\StageApi:getEntity'
-            ]
-        ]
+                'controller' => 'MauticStageBundle:Api\StageApi:getEntity',
+            ],
+        ],
     ],
 
-    'menu'     => [
+    'menu' => [
         'main' => [
             'mautic.stages.menu.index' => [
-                'route'  => 'mautic_stage_index',
+                'route'     => 'mautic_stage_index',
                 'iconClass' => 'fa-tachometer',
                 'access'    => ['stage:stages:view'],
-                'priority'  => 25
-            ]
-        ]
+                'priority'  => 25,
+            ],
+        ],
     ],
 
     'categories' => [
-        'stage' => null
+        'stage' => null,
     ],
 
     'services' => [
         'events' => [
             'mautic.stage.campaignbundle.subscriber' => [
-                'class' => 'Mautic\StageBundle\EventListener\CampaignSubscriber',
+                'class'     => 'Mautic\StageBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.lead.model.lead',
-                    'mautic.stage.model.stage'
-                ]
+                    'mautic.stage.model.stage',
+                ],
             ],
-            'mautic.stage.subscriber'            => [
-                'class' => 'Mautic\StageBundle\EventListener\StageSubscriber',
+            'mautic.stage.subscriber' => [
+                'class'     => 'Mautic\StageBundle\EventListener\StageSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
+                    'mautic.core.model.auditlog',
+                ],
             ],
             'mautic.stage.leadbundle.subscriber' => [
-                'class' => 'Mautic\StageBundle\EventListener\LeadSubscriber'
+                'class' => 'Mautic\StageBundle\EventListener\LeadSubscriber',
             ],
-            'mautic.stage.search.subscriber'     => [
-                'class' => 'Mautic\StageBundle\EventListener\SearchSubscriber',
+            'mautic.stage.search.subscriber' => [
+                'class'     => 'Mautic\StageBundle\EventListener\SearchSubscriber',
                 'arguments' => [
-                    'mautic.stage.model.stage'
-                ]
+                    'mautic.stage.model.stage',
+                ],
             ],
-            'mautic.stage.dashboard.subscriber'  => [
-                'class' => 'Mautic\StageBundle\EventListener\DashboardSubscriber',
+            'mautic.stage.dashboard.subscriber' => [
+                'class'     => 'Mautic\StageBundle\EventListener\DashboardSubscriber',
                 'arguments' => [
-                    'mautic.stage.model.stage'
-                ]
+                    'mautic.stage.model.stage',
+                ],
             ],
         ],
-        'forms'  => [
-            'mautic.stage.type.form'                  => [
+        'forms' => [
+            'mautic.stage.type.form' => [
                 'class'     => 'Mautic\StageBundle\Form\Type\StageType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'stage'
+                'alias'     => 'stage',
             ],
-            'mautic.stage.type.action'                => [
-                'class' => 'Mautic\StageBundle\Form\Type\StageActionType',
+            'mautic.stage.type.action' => [
+                'class'     => 'Mautic\StageBundle\Form\Type\StageActionType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'stageaction'
+                'alias'     => 'stageaction',
             ],
-            'mautic.stage.type.action_list'                => [
-                'class' => 'Mautic\StageBundle\Form\Type\StageActionListType',
+            'mautic.stage.type.action_list' => [
+                'class'     => 'Mautic\StageBundle\Form\Type\StageActionListType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'stageaction_list'
+                'alias'     => 'stageaction_list',
             ],
-            'mautic.stage.type.action_change'                => [
-                'class' => 'Mautic\StageBundle\Form\Type\StageActionChangeType',
+            'mautic.stage.type.action_change' => [
+                'class'     => 'Mautic\StageBundle\Form\Type\StageActionChangeType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'stageaction_change'
+                'alias'     => 'stageaction_change',
             ],
-            'mautic.stage.type.stage_list'                => [
-                'class' => 'Mautic\StageBundle\Form\Type\StageListType',
+            'mautic.stage.type.stage_list' => [
+                'class'     => 'Mautic\StageBundle\Form\Type\StageListType',
                 'arguments' => 'mautic.factory',
-                'alias' => 'stage_list'
+                'alias'     => 'stage_list',
             ],
-            'mautic.point.type.genericstage_settings' => array(
+            'mautic.point.type.genericstage_settings' => [
                 'class' => 'Mautic\StageBundle\Form\Type\GenericStageSettingsType',
-                'alias' => 'genericstage_settings'
-            )
+                'alias' => 'genericstage_settings',
+            ],
         ],
-        'models' =>  [
+        'models' => [
             'mautic.stage.model.stage' => [
-                'class' => 'Mautic\StageBundle\Model\StageModel',
+                'class'     => 'Mautic\StageBundle\Model\StageModel',
                 'arguments' => [
                     'mautic.lead.model.lead',
-                    'session'
-        ]
-    ]
-]
-    ]
+                    'session',
+        ],
+    ],
+],
+    ],
 ];
diff --git a/app/bundles/StageBundle/Controller/AjaxController.php b/app/bundles/StageBundle/Controller/AjaxController.php
index a316bcf6b38..cb2a304781e 100644
--- a/app/bundles/StageBundle/Controller/AjaxController.php
+++ b/app/bundles/StageBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
@@ -25,11 +26,11 @@ class AjaxController extends CommonAjaxController
      */
     protected function getActionFormAction(Request $request)
     {
-        $dataArray = array(
+        $dataArray = [
             'success' => 0,
-            'html'    => ''
-        );
-        $type      = InputHelper::clean($request->request->get('actionType'));
+            'html'    => '',
+        ];
+        $type = InputHelper::clean($request->request->get('actionType'));
 
         if (!empty($type)) {
             //get the HTML for the form
@@ -38,17 +39,17 @@ protected function getActionFormAction(Request $request)
             $actions = $model->getStageActions();
 
             if (isset($actions['actions'][$type])) {
-                $themes = array('MauticStageBundle:FormTheme\Action');
+                $themes = ['MauticStageBundle:FormTheme\Action'];
                 if (!empty($actions['actions'][$type]['formTheme'])) {
                     $themes[] = $actions['actions'][$type]['formTheme'];
                 }
                 $formType        = (!empty($actions['actions'][$type]['formType'])) ? $actions['actions'][$type]['formType'] : 'genericstage_settings';
-                $formTypeOptions = (!empty($actions['actions'][$type]['formTypeOptions'])) ? $actions['actions'][$type]['formTypeOptions'] : array();
+                $formTypeOptions = (!empty($actions['actions'][$type]['formTypeOptions'])) ? $actions['actions'][$type]['formTypeOptions'] : [];
 
-                $form            = $this->get('form.factory')->create('stageaction', array(), array('formType' => $formType, 'formTypeOptions' => $formTypeOptions));
-                $html            = $this->renderView('MauticStageBundle:Stage:actionform.html.php', array(
-                    'form' => $this->setFormTheme($form, 'MauticStageBundle:Stage:actionform.html.php', $themes)
-                ));
+                $form = $this->get('form.factory')->create('stageaction', [], ['formType' => $formType, 'formTypeOptions' => $formTypeOptions]);
+                $html = $this->renderView('MauticStageBundle:Stage:actionform.html.php', [
+                    'form' => $this->setFormTheme($form, 'MauticStageBundle:Stage:actionform.html.php', $themes),
+                ]);
 
                 $html                 = str_replace('stageaction', 'stage', $html);
                 $dataArray['html']    = $html;
diff --git a/app/bundles/StageBundle/Controller/Api/StageApiController.php b/app/bundles/StageBundle/Controller/Api/StageApiController.php
index 541c99a4d07..0e008995558 100644
--- a/app/bundles/StageBundle/Controller/Api/StageApiController.php
+++ b/app/bundles/StageBundle/Controller/Api/StageApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,14 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class PointApiController
+ * Class PointApiController.
  */
 class StageApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('stage');
@@ -29,6 +29,6 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'stage';
         $this->entityNameMulti  = 'stages';
         $this->permissionBase   = 'stage:stages';
-        $this->serializerGroups = array('stageDetails', 'categoryList', 'publishDetails');
+        $this->serializerGroups = ['stageDetails', 'categoryList', 'publishDetails'];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/StageBundle/Controller/StageController.php b/app/bundles/StageBundle/Controller/StageController.php
index 0945ad7f0bd..2f20301221f 100644
--- a/app/bundles/StageBundle/Controller/StageController.php
+++ b/app/bundles/StageBundle/Controller/StageController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class StageController
+ * Class StageController.
  */
 class StageController extends FormController
 {
@@ -28,14 +29,14 @@ public function indexAction($page = 1)
     {
         //set some permissions
         $permissions = $this->get('mautic.security')->isGranted(
-            array(
+            [
                 'stage:stages:view',
                 'stage:stages:create',
                 'stage:stages:edit',
                 'stage:stages:delete',
-                'stage:stages:publish'
-            ),
-            "RETURN_ARRAY"
+                'stage:stages:publish',
+            ],
+            'RETURN_ARRAY'
         );
 
         if (!$permissions['stage:stages:view']) {
@@ -59,36 +60,36 @@ public function indexAction($page = 1)
         $search = $this->request->get('search', $this->get('session')->get('mautic.stage.filter', ''));
         $this->get('session')->set('mautic.stage.filter', $search);
 
-        $filter     = array('string' => $search, 'force' => array());
+        $filter     = ['string' => $search, 'force' => []];
         $orderBy    = $this->get('session')->get('mautic.stage.orderby', 's.name');
         $orderByDir = $this->get('session')->get('mautic.stage.orderbydir', 'ASC');
 
         $stages = $this->getModel('stage')->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
-            )
+                'orderByDir' => $orderByDir,
+            ]
         );
 
         $count = count($stages);
         if ($count && $count < ($start + 1)) {
             $lastPage = ($count === 1) ? 1 : (ceil($count / $limit)) ?: 1;
             $this->get('session')->set('mautic.stage.page', $lastPage);
-            $returnUrl = $this->generateUrl('mautic_stage_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl('mautic_stage_index', ['page' => $lastPage]);
 
             return $this->postActionRedirect(
-                array(
+                [
                     'returnUrl'       => $returnUrl,
-                    'viewParameters'  => array('page' => $lastPage),
+                    'viewParameters'  => ['page' => $lastPage],
                     'contentTemplate' => 'MauticStageBundle:Stage:index',
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => '#mautic_stage_index',
-                        'mauticContent' => 'stage'
-                    )
-                )
+                        'mauticContent' => 'stage',
+                    ],
+                ]
             );
         }
 
@@ -101,30 +102,30 @@ public function indexAction($page = 1)
         $actions = $this->getModel('stage')->getStageActions();
 
         return $this->delegateView(
-            array(
-                'viewParameters'  => array(
+            [
+                'viewParameters' => [
                     'searchValue' => $search,
                     'items'       => $stages,
                     'actions'     => $actions['actions'],
                     'page'        => $page,
                     'limit'       => $limit,
                     'permissions' => $permissions,
-                    'tmpl'        => $tmpl
-                ),
+                    'tmpl'        => $tmpl,
+                ],
                 'contentTemplate' => 'MauticStageBundle:Stage:list.html.php',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_stage_index',
                     'mauticContent' => 'stage',
-                    'route'         => $this->generateUrl('mautic_stage_index', array('page' => $page))
-                )
-            )
+                    'route'         => $this->generateUrl('mautic_stage_index', ['page' => $page]),
+                ],
+            ]
         );
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
-     * @param  \Mautic\StageBundle\Entity\Stage $entity
+     * @param \Mautic\StageBundle\Entity\Stage $entity
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
@@ -147,18 +148,18 @@ public function newAction($entity = null)
         $actionType = ($this->request->getMethod() == 'POST') ? $this->request->request->get('stage[type]', '', true)
             : '';
 
-        $action         = $this->generateUrl('mautic_stage_action', array('objectAction' => 'new'));
-        $actions        = $model->getStageActions();
-        $form           = $model->createForm(
+        $action  = $this->generateUrl('mautic_stage_action', ['objectAction' => 'new']);
+        $actions = $model->getStageActions();
+        $form    = $model->createForm(
             $entity,
             $this->get('form.factory'),
             $action,
-            array(
+            [
                 'stageActions' => $actions,
-                'actionType'   => $actionType
-            )
+                'actionType'   => $actionType,
+            ]
         );
-        $viewParameters = array('page' => $page);
+        $viewParameters = ['page' => $page];
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -170,17 +171,17 @@ public function newAction($entity = null)
 
                     $this->addFlash(
                         'mautic.core.notice.created',
-                        array(
+                        [
                             '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_stage_index',
                             '%url%'       => $this->generateUrl(
                                 'mautic_stage_action',
-                                array(
+                                [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
-                                )
-                            )
-                        )
+                                    'objectId'     => $entity->getId(),
+                                ]
+                            ),
+                        ]
                     );
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
@@ -198,50 +199,50 @@ public function newAction($entity = null)
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 return $this->postActionRedirect(
-                    array(
+                    [
                         'returnUrl'       => $returnUrl,
                         'viewParameters'  => $viewParameters,
                         'contentTemplate' => $template,
-                        'passthroughVars' => array(
+                        'passthroughVars' => [
                             'activeLink'    => '#mautic_stage_index',
-                            'mauticContent' => 'stage'
-                        )
-                    )
+                            'mauticContent' => 'stage',
+                        ],
+                    ]
                 );
             }
         }
 
-        $themes = array('MauticStageBundle:FormTheme\Action');
+        $themes = ['MauticStageBundle:FormTheme\Action'];
         if ($actionType && !empty($actions['actions'][$actionType]['formTheme'])) {
             $themes[] = $actions['actions'][$actionType]['formTheme'];
         }
 
         return $this->delegateView(
-            array(
-                'viewParameters'  => array(
+            [
+                'viewParameters' => [
                     'tmpl'    => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                     'entity'  => $entity,
                     'form'    => $this->setFormTheme($form, 'MauticStageBundle:Stage:form.html.php', $themes),
-                    'actions' => $actions['actions']
-                ),
+                    'actions' => $actions['actions'],
+                ],
                 'contentTemplate' => 'MauticStageBundle:Stage:form.html.php',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_stage_index',
                     'mauticContent' => 'stage',
                     'route'         => $this->generateUrl(
                         'mautic_stage_action',
-                        array(
+                        [
                             'objectAction' => (!empty($valid) ? 'edit' : 'new'), //valid means a new form was applied
-                            'objectId'     => $entity->getId()
-                        )
-                    )
-                )
-            )
+                            'objectId'     => $entity->getId(),
+                        ]
+                    ),
+                ],
+            ]
         );
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -256,35 +257,35 @@ public function editAction($objectId, $ignorePost = false)
         //set the page we came from
         $page = $this->get('session')->get('mautic.stage.page', 1);
 
-        $viewParameters = array('page' => $page);
+        $viewParameters = ['page' => $page];
 
         //set the return URL
-        $returnUrl = $this->generateUrl('mautic_stage_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_stage_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
             'viewParameters'  => $viewParameters,
             'contentTemplate' => 'MauticStageBundle:Stage:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_stage_index',
-                'mauticContent' => 'stage'
-            )
-        );
+                'mauticContent' => 'stage',
+            ],
+        ];
 
         //form not found
         if ($entity === null) {
             return $this->postActionRedirect(
                 array_merge(
                     $postActionVars,
-                    array(
-                        'flashes' => array(
-                            array(
+                    [
+                        'flashes' => [
+                            [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.stage.error.notfound',
-                                'msgVars' => array('%id%' => $objectId)
-                            )
-                        )
-                    )
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
+                    ]
                 )
             );
         } elseif (!$this->get('mautic.security')->isGranted('stage:stages:edit')) {
@@ -296,16 +297,16 @@ public function editAction($objectId, $ignorePost = false)
 
         $actionType = 'moved to stage';
 
-        $action  = $this->generateUrl('mautic_stage_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action  = $this->generateUrl('mautic_stage_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $actions = $model->getStageActions();
         $form    = $model->createForm(
             $entity,
             $this->get('form.factory'),
             $action,
-            array(
+            [
                 'stageActions' => $actions,
-                'actionType'   => $actionType
-            )
+                'actionType'   => $actionType,
+            ]
         );
 
         ///Check for a submitted form and process it
@@ -318,17 +319,17 @@ public function editAction($objectId, $ignorePost = false)
 
                     $this->addFlash(
                         'mautic.core.notice.updated',
-                        array(
+                        [
                             '%name%'      => $entity->getName(),
                             '%menu_link%' => 'mautic_stage_index',
                             '%url%'       => $this->generateUrl(
                                 'mautic_stage_action',
-                                array(
+                                [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
-                                )
-                            )
-                        )
+                                    'objectId'     => $entity->getId(),
+                                ]
+                            ),
+                        ]
                     );
 
                     if ($form->get('buttons')->get('save')->isClicked()) {
@@ -348,11 +349,11 @@ public function editAction($objectId, $ignorePost = false)
                 return $this->postActionRedirect(
                     array_merge(
                         $postActionVars,
-                        array(
+                        [
                             'returnUrl'       => $returnUrl,
                             'viewParameters'  => $viewParameters,
-                            'contentTemplate' => $template
-                        )
+                            'contentTemplate' => $template,
+                        ]
                     )
                 );
             }
@@ -361,37 +362,37 @@ public function editAction($objectId, $ignorePost = false)
             $model->lockEntity($entity);
         }
 
-        $themes = array('MauticStageBundle:FormTheme\Action');
+        $themes = ['MauticStageBundle:FormTheme\Action'];
         if (!empty($actions['actions'][$actionType]['formTheme'])) {
             $themes[] = $actions['actions'][$actionType]['formTheme'];
         }
 
         return $this->delegateView(
-            array(
-                'viewParameters'  => array(
+            [
+                'viewParameters' => [
                     'tmpl'    => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                     'entity'  => $entity,
                     'form'    => $this->setFormTheme($form, 'MauticStageBundle:Stage:form.html.php', $themes),
-                    'actions' => $actions['actions']
-                ),
+                    'actions' => $actions['actions'],
+                ],
                 'contentTemplate' => 'MauticStageBundle:Stage:form.html.php',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_stage_index',
                     'mauticContent' => 'stage',
                     'route'         => $this->generateUrl(
                         'mautic_stage_action',
-                        array(
+                        [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        )
-                    )
-                )
-            )
+                            'objectId'     => $entity->getId(),
+                        ]
+                    ),
+                ],
+            ]
         );
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -415,7 +416,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -424,29 +425,29 @@ public function cloneAction($objectId)
     public function deleteAction($objectId)
     {
         $page      = $this->get('session')->get('mautic.stage.page', 1);
-        $returnUrl = $this->generateUrl('mautic_stage_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_stage_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticStageBundle:Stage:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_stage_index',
-                'mauticContent' => 'stage'
-            )
-        );
+                'mauticContent' => 'stage',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model  = $this->getModel('stage');
             $entity = $model->getEntity($objectId);
 
             if ($entity === null) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.stage.error.notfound',
-                    'msgVars' => array('%id%' => $objectId)
-                );
+                    'msgVars' => ['%id%' => $objectId],
+                ];
             } elseif (!$this->get('mautic.security')->isGranted('stage:stages:delete')) {
                 return $this->accessDenied();
             } elseif ($model->isLocked($entity)) {
@@ -456,62 +457,62 @@ public function deleteAction($objectId)
             $model->deleteEntity($entity);
 
             $identifier = $this->get('translator')->trans($entity->getName());
-            $flashes[]  = array(
+            $flashes[]  = [
                 'type'    => 'notice',
                 'msg'     => 'mautic.core.notice.deleted',
-                'msgVars' => array(
+                'msgVars' => [
                     '%name%' => $identifier,
-                    '%id%'   => $objectId
-                )
-            );
+                    '%id%'   => $objectId,
+                ],
+            ];
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => $flashes
-                )
+                [
+                    'flashes' => $flashes,
+                ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function batchDeleteAction()
     {
         $page      = $this->get('session')->get('mautic.stage.page', 1);
-        $returnUrl = $this->generateUrl('mautic_stage_index', array('page' => $page));
-        $flashes   = array();
+        $returnUrl = $this->generateUrl('mautic_stage_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticStageBundle:Stage:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_stage_index',
-                'mauticContent' => 'stage'
-            )
-        );
+                'mauticContent' => 'stage',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             $model     = $this->getModel('stage');
             $ids       = json_decode($this->request->query->get('ids', '{}'));
-            $deleteIds = array();
+            $deleteIds = [];
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.stage.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->isGranted('stage:stages:delete')) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
@@ -525,22 +526,22 @@ public function batchDeleteAction()
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
+                $flashes[] = [
                     'type'    => 'notice',
                     'msg'     => 'mautic.stage.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
             array_merge(
                 $postActionVars,
-                array(
-                    'flashes' => $flashes
-                )
+                [
+                    'flashes' => $flashes,
+                ]
             )
         );
     }
diff --git a/app/bundles/StageBundle/Entity/LeadStageLog.php b/app/bundles/StageBundle/Entity/LeadStageLog.php
index 71cfe46ce35..70c7692cca6 100644
--- a/app/bundles/StageBundle/Entity/LeadStageLog.php
+++ b/app/bundles/StageBundle/Entity/LeadStageLog.php
@@ -1,26 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class LeadStageLog
- *
- * @package Mautic\StageBundle\Entity
+ * Class LeadStageLog.
  */
 class LeadStageLog
 {
-
     /**
      * @var Stage
      **/
@@ -44,7 +41,7 @@ class LeadStageLog
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -69,7 +66,7 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @return mixed
      */
-    public function getDateFired ()
+    public function getDateFired()
     {
         return $this->dateFired;
     }
@@ -77,7 +74,7 @@ public function getDateFired ()
     /**
      * @param mixed $dateFired
      */
-    public function setDateFired ($dateFired)
+    public function setDateFired($dateFired)
     {
         $this->dateFired = $dateFired;
     }
@@ -85,7 +82,7 @@ public function setDateFired ($dateFired)
     /**
      * @return mixed
      */
-    public function getIpAddress ()
+    public function getIpAddress()
     {
         return $this->ipAddress;
     }
@@ -93,7 +90,7 @@ public function getIpAddress ()
     /**
      * @param mixed $ipAddress
      */
-    public function setIpAddress ($ipAddress)
+    public function setIpAddress($ipAddress)
     {
         $this->ipAddress = $ipAddress;
     }
@@ -101,7 +98,7 @@ public function setIpAddress ($ipAddress)
     /**
      * @return mixed
      */
-    public function getLead ()
+    public function getLead()
     {
         return $this->lead;
     }
@@ -109,7 +106,7 @@ public function getLead ()
     /**
      * @param mixed $lead
      */
-    public function setLead ($lead)
+    public function setLead($lead)
     {
         $this->lead = $lead;
     }
@@ -117,7 +114,7 @@ public function setLead ($lead)
     /**
      * @return mixed
      */
-    public function getStage ()
+    public function getStage()
     {
         return $this->stage;
     }
@@ -125,7 +122,7 @@ public function getStage ()
     /**
      * @param mixed $stage
      */
-    public function setStage ($stage)
+    public function setStage($stage)
     {
         $this->stage = $stage;
     }
diff --git a/app/bundles/StageBundle/Entity/LeadStageLogRepository.php b/app/bundles/StageBundle/Entity/LeadStageLogRepository.php
index 4a1fafc82dd..a95b48994e0 100644
--- a/app/bundles/StageBundle/Entity/LeadStageLogRepository.php
+++ b/app/bundles/StageBundle/Entity/LeadStageLogRepository.php
@@ -1,25 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class LeadStageLogRepository
+ * Class LeadStageLogRepository.
  */
 class LeadStageLogRepository extends CommonRepository
 {
-
     /**
-     * Updates lead ID (e.g. after a lead merge)
+     * Updates lead ID (e.g. after a lead merge).
      *
      * @param $fromLeadId
      * @param $toLeadId
@@ -33,7 +32,7 @@ public function updateLead($fromLeadId, $toLeadId)
             ->where('pl.lead_id = '.$toLeadId)
             ->execute()
             ->fetchAll();
-        $actions = array();
+        $actions = [];
         foreach ($results as $r) {
             $actions[] = $r['stage_id'];
         }
@@ -57,4 +56,4 @@ public function updateLead($fromLeadId, $toLeadId)
             $q->execute();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/StageBundle/Entity/Stage.php b/app/bundles/StageBundle/Entity/Stage.php
index c859911243c..6be77731ba8 100644
--- a/app/bundles/StageBundle/Entity/Stage.php
+++ b/app/bundles/StageBundle/Entity/Stage.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,13 +19,10 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Stage
- *
- * @package Mautic\StageBundle\Entity
+ * Class Stage.
  */
 class Stage extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -73,7 +71,7 @@ public function __clone()
     }
 
     /**
-     * Construct
+     * Construct.
      */
     public function __construct()
     {
@@ -83,12 +81,12 @@ public function __construct()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
         $builder->setTable('stages')
             ->setCustomRepositoryClass('Mautic\StageBundle\Entity\StageRepository');
-        
+
         $builder->addIdColumns();
 
         $builder->createField('weight', 'integer')
@@ -109,15 +107,15 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('name', new Assert\NotBlank(array(
-            'message' => 'mautic.core.name.required'
-        )));
+        $metadata->addPropertyConstraint('name', new Assert\NotBlank([
+            'message' => 'mautic.core.name.required',
+        ]));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -125,53 +123,53 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('stage')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'category',
                     'weight',
-                    'description'
-                )
+                    'description',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'publishUp',
-                    'publishDown'
-                )
+                    'publishDown',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set weight
+     * Set weight.
      *
-     * @param integer $weight
+     * @param int $weight
      *
-     * @return integer
+     * @return int
      */
-    public function setWeight ($type)
+    public function setWeight($type)
     {
-        $this->weight = (int)$type;
+        $this->weight = (int) $type;
 
         return $this;
     }
 
     /**
-     * Get weight
+     * Get weight.
      *
-     * @return integer
+     * @return int
      */
-    public function getWeight ()
+    public function getWeight()
     {
         return $this->weight;
     }
@@ -179,19 +177,19 @@ public function getWeight ()
     /**
      * @return array
      */
-    public function convertToArray ()
+    public function convertToArray()
     {
         return get_object_vars($this);
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return string
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -200,23 +198,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return string
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -225,23 +223,23 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Add log
+     * Add log.
      *
      * @param LeadStageLog $log
      *
      * @return Log
      */
-    public function addLog (LeadStageLog $log)
+    public function addLog(LeadStageLog $log)
     {
         $this->log[] = $log;
 
@@ -249,33 +247,33 @@ public function addLog (LeadStageLog $log)
     }
 
     /**
-     * Remove log
+     * Remove log.
      *
      * @param LeadStageLog $log
      */
-    public function removeLog (LeadStageLog $log)
+    public function removeLog(LeadStageLog $log)
     {
         $this->log->removeElement($log);
     }
 
     /**
-     * Get log
+     * Get log.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getLog ()
+    public function getLog()
     {
         return $this->log;
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
      *
      * @return Stage
      */
-    public function setPublishUp ($publishUp)
+    public function setPublishUp($publishUp)
     {
         $this->isChanged('publishUp', $publishUp);
         $this->publishUp = $publishUp;
@@ -284,23 +282,23 @@ public function setPublishUp ($publishUp)
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
-    public function getPublishUp ()
+    public function getPublishUp()
     {
         return $this->publishUp;
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
      *
      * @return Stage
      */
-    public function setPublishDown ($publishDown)
+    public function setPublishDown($publishDown)
     {
         $this->isChanged('publishDown', $publishDown);
         $this->publishDown = $publishDown;
@@ -309,11 +307,11 @@ public function setPublishDown ($publishDown)
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
-    public function getPublishDown ()
+    public function getPublishDown()
     {
         return $this->publishDown;
     }
@@ -321,7 +319,7 @@ public function getPublishDown ()
     /**
      * @return mixed
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
@@ -329,7 +327,7 @@ public function getCategory ()
     /**
      * @param mixed $category
      */
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->category = $category;
     }
diff --git a/app/bundles/StageBundle/Entity/StageRepository.php b/app/bundles/StageBundle/Entity/StageRepository.php
index 873b4b3405d..cb6ff20812e 100644
--- a/app/bundles/StageBundle/Entity/StageRepository.php
+++ b/app/bundles/StageBundle/Entity/StageRepository.php
@@ -1,27 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\Entity;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class StageRepository
+ * Class StageRepository.
  */
 class StageRepository extends CommonRepository
 {
-
     /**
      * {@inheritdoc}
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder($this->getTableAlias())
@@ -41,7 +40,7 @@ public function getTableAlias()
     }
 
     /**
-     * Get array of published actions based on type
+     * Get array of published actions based on type.
      *
      * @param string $type
      *
@@ -71,8 +70,8 @@ public function getCompletedLeadActions($type, $leadId)
     {
         $q = $this->_em->getConnection()->createQueryBuilder()
             ->select('s.*')
-            ->from(MAUTIC_TABLE_PREFIX . 'stage_lead_action_log', 'x')
-            ->innerJoin('x', MAUTIC_TABLE_PREFIX . 'stages', 's', 'x.stage_id = s.id');
+            ->from(MAUTIC_TABLE_PREFIX.'stage_lead_action_log', 'x')
+            ->innerJoin('x', MAUTIC_TABLE_PREFIX.'stages', 's', 'x.stage_id = s.id');
 
         //make sure the published up and down dates are good
         $q->where(
@@ -83,7 +82,7 @@ public function getCompletedLeadActions($type, $leadId)
 
         $results = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
 
         foreach ($results as $r) {
             $return[$r['id']] = $r;
@@ -97,10 +96,10 @@ public function getCompletedLeadActions($type, $leadId)
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        return $this->addStandardCatchAllWhereClause($q, $filter, array(
+        return $this->addStandardCatchAllWhereClause($q, $filter, [
             's.name',
-            's.description'
-        ));
+            's.description',
+        ]);
     }
 
     /**
@@ -120,7 +119,7 @@ public function getSearchCommands()
     }
 
     /**
-     * Get a list of lists
+     * Get a list of lists.
      *
      * @param bool   $user
      * @param string $alias
@@ -130,7 +129,7 @@ public function getSearchCommands()
      */
     public function getStages($user = false, $id = '')
     {
-        static $stages = array();
+        static $stages = [];
 
         if (is_object($user)) {
             $user = $user->getId();
@@ -169,7 +168,7 @@ public function getStages($user = false, $id = '')
     }
 
     /**
-     * Get a list of stages
+     * Get a list of stages.
      *
      * @param string $name
      *
@@ -194,6 +193,7 @@ public function getStageByName($stageName)
 
         if ($result) {
             $key = array_keys($result);
+
             return $result[$key[0]];
         }
 
diff --git a/app/bundles/StageBundle/Event/StageBuilderEvent.php b/app/bundles/StageBundle/Event/StageBuilderEvent.php
index bdbd0d4ea6b..b8a570d783b 100644
--- a/app/bundles/StageBundle/Event/StageBuilderEvent.php
+++ b/app/bundles/StageBundle/Event/StageBuilderEvent.php
@@ -1,28 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\Event;
 
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class StageBuilderEvent
+ * Class StageBuilderEvent.
  */
 class StageBuilderEvent extends Event
 {
-
     /**
      * @var array
      */
-    private $actions = array();
+    private $actions = [];
 
     /**
      * @var Translator
@@ -42,26 +42,25 @@ public function __construct(TranslatorInterface $translator)
      *
      * @param string $key    - a unique identifier; it is recommended that it be namespaced i.e. lead.action
      * @param array  $action - can contain the following keys:
-     *  'label'           => (required) what to display in the list
-     *  'description'     => (optional) short description of event
-     *  'template'        => (optional) template to use for the action's HTML in the stage builder
-     *      i.e AcmeMyBundle:StageAction:theaction.html.php
-     *  'formType'        => (optional) name of the form type SERVICE for the action; will use a default form with stage change only
-     *  'formTypeOptions' => (optional) array of options to pass to formType
-     *  'callback'        => (optional) callback function that will be passed when the action is triggered; return true to
+     *                       'label'           => (required) what to display in the list
+     *                       'description'     => (optional) short description of event
+     *                       'template'        => (optional) template to use for the action's HTML in the stage builder
+     *                       i.e AcmeMyBundle:StageAction:theaction.html.php
+     *                       'formType'        => (optional) name of the form type SERVICE for the action; will use a default form with stage change only
+     *                       'formTypeOptions' => (optional) array of options to pass to formType
+     *                       'callback'        => (optional) callback function that will be passed when the action is triggered; return true to
      *                       change the configured stages or false to ignore the action
-     *      The callback function can receive the following arguments by name (via ReflectionMethod::invokeArgs())
-     *          Mautic\CoreBundle\Factory\MauticFactory $factory
-     *          Mautic\LeadBundle\Entity\Lead $lead
-     *          $eventDetails - variable sent from firing function to call back function
-     *          array $action = array(
-     *              'id' => int
-     *              'type' => string
-     *              'name' => string
-     *              'properties' => array()
-     *         )
+     *                       The callback function can receive the following arguments by name (via ReflectionMethod::invokeArgs())
+     *                       Mautic\CoreBundle\Factory\MauticFactory $factory
+     *                       Mautic\LeadBundle\Entity\Lead $lead
+     *                       $eventDetails - variable sent from firing function to call back function
+     *                       array $action = array(
+     *                       'id' => int
+     *                       'type' => string
+     *                       'name' => string
+     *                       'properties' => array()
+     *                       )
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     public function addAction($key, array $action)
@@ -72,8 +71,8 @@ public function addAction($key, array $action)
 
         //check for required keys and that given functions are callable
         $this->verifyComponent(
-            array('group', 'label'),
-            array('callback'),
+            ['group', 'label'],
+            ['callback'],
             $action
         );
 
@@ -85,7 +84,7 @@ public function addAction($key, array $action)
     }
 
     /**
-     * Get actions
+     * Get actions.
      *
      * @return array
      */
@@ -95,31 +94,34 @@ public function getActions()
             return strnatcasecmp(
                 $a['label'], $b['label']);
         });
+
         return $this->actions;
     }
 
     /**
-     * Gets a list of actions supported by the choice form field
+     * Gets a list of actions supported by the choice form field.
      *
      * @return array
      */
     public function getActionList()
     {
-        $list = array();
+        $list    = [];
         $actions = $this->getActions();
         foreach ($actions as $k => $a) {
             $list[$k] = $a['label'];
         }
+
         return $list;
     }
 
     public function getActionChoices()
     {
-        $choices = array();
+        $choices = [];
         $actions = $this->getActions();
         foreach ($this->actions as $k => $c) {
             $choices[$c['group']][$k] = $c['label'];
         }
+
         return $choices;
     }
 
@@ -128,7 +130,6 @@ public function getActionChoices()
      * @param array $methods
      * @param array $component
      *
-     * @return void
      * @throws InvalidArgumentException
      */
     private function verifyComponent(array $keys, array $methods, array $component)
@@ -141,7 +142,7 @@ private function verifyComponent(array $keys, array $methods, array $component)
 
         foreach ($methods as $m) {
             if (isset($component[$m]) && !is_callable($component[$m], true)) {
-                throw new InvalidArgumentException($component[$m] . ' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
+                throw new InvalidArgumentException($component[$m].' is not callable.  Please ensure that it exists and that it is a fully qualified namespace.');
             }
         }
     }
diff --git a/app/bundles/StageBundle/Event/StageEvent.php b/app/bundles/StageBundle/Event/StageEvent.php
index 455c1516441..c90fc72be84 100644
--- a/app/bundles/StageBundle/Event/StageEvent.php
+++ b/app/bundles/StageBundle/Event/StageEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,22 @@
 use Mautic\StageBundle\Entity\Stage;
 
 /**
- * Class StageEvent
+ * Class StageEvent.
  */
 class StageEvent extends CommonEvent
 {
-
     /**
      * @param Stage $stage
      * @param bool  $isNew
      */
     public function __construct(Stage &$stage, $isNew = false)
     {
-        $this->entity =& $stage;
+        $this->entity = &$stage;
         $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Stage entity
+     * Returns the Stage entity.
      *
      * @return Stage
      */
@@ -39,7 +39,7 @@ public function getStage()
     }
 
     /**
-     * Sets the Stage entity
+     * Sets the Stage entity.
      *
      * @param Stage $stage
      */
diff --git a/app/bundles/StageBundle/EventListener/CampaignSubscriber.php b/app/bundles/StageBundle/EventListener/CampaignSubscriber.php
index 258628ef256..6ead8ae8e1c 100644
--- a/app/bundles/StageBundle/EventListener/CampaignSubscriber.php
+++ b/app/bundles/StageBundle/EventListener/CampaignSubscriber.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\StageBundle\EventListener;
 
 use Mautic\CampaignBundle\CampaignEvents;
-use Mautic\StageBundle\Model\StageModel;
-use Mautic\LeadBundle\Entity\Lead;
 use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\StageBundle\StageEvents;
+use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Model\LeadModel;
+use Mautic\StageBundle\Model\StageModel;
+use Mautic\StageBundle\StageEvents;
 
 /**
- * Class CampaignSubscriber
- *
- * @package Mautic\StageBundle\EventListener
+ * Class CampaignSubscriber.
  */
 class CampaignSubscriber extends CommonSubscriber
 {
@@ -37,24 +37,24 @@ class CampaignSubscriber extends CommonSubscriber
     /**
      * CampaignSubscriber constructor.
      *
-     * @param LeadModel $leadModel
+     * @param LeadModel  $leadModel
      * @param StageModel $stageModel
      */
     public function __construct(LeadModel $leadModel, StageModel $stageModel)
     {
-        $this->leadModel = $leadModel;
+        $this->leadModel  = $leadModel;
         $this->stageModel = $stageModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CampaignEvents::CAMPAIGN_ON_BUILD => ['onCampaignBuild', 0],
-            StageEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerActionChangeStage', 0]
-        );
+        return [
+            CampaignEvents::CAMPAIGN_ON_BUILD       => ['onCampaignBuild', 0],
+            StageEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignTriggerActionChangeStage', 0],
+        ];
     }
 
     /**
@@ -62,13 +62,13 @@ static public function getSubscribedEvents()
      */
     public function onCampaignBuild(CampaignBuilderEvent $event)
     {
-        $action = array(
-            'label'           => 'mautic.stage.campaign.event.change',
-            'description'     => 'mautic.stage.campaign.event.change_descr',
-            'eventName'       => StageEvents::ON_CAMPAIGN_TRIGGER_ACTION,
-            'formType'        => 'stageaction_change',
-            'formTheme'       => 'MauticStageBundle:FormTheme\StageActionChange'
-        );
+        $action = [
+            'label'       => 'mautic.stage.campaign.event.change',
+            'description' => 'mautic.stage.campaign.event.change_descr',
+            'eventName'   => StageEvents::ON_CAMPAIGN_TRIGGER_ACTION,
+            'formType'    => 'stageaction_change',
+            'formTheme'   => 'MauticStageBundle:FormTheme\StageActionChange',
+        ];
         $event->addAction('stage.change', $action);
     }
 
@@ -78,31 +78,29 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
     public function onCampaignTriggerActionChangeStage(CampaignExecutionEvent $event)
     {
         $stageChange = false;
-        $lead = $event->getLead();
-        $leadStage = null;
+        $lead        = $event->getLead();
+        $leadStage   = null;
 
         if ($lead instanceof Lead) {
             $leadStage = $lead->getStage();
         }
 
-        $stageId = (int) $event->getConfig()['stage'];
+        $stageId         = (int) $event->getConfig()['stage'];
         $stageToChangeTo = $this->stageModel->getEntity($stageId);
 
         if ($stageToChangeTo != null && $stageToChangeTo->isPublished()) {
-            if($leadStage && $leadStage->getWeight() <= $stageToChangeTo->getWeight()){
+            if ($leadStage && $leadStage->getWeight() <= $stageToChangeTo->getWeight()) {
                 $stageChange = true;
-            }
-            elseif(!$leadStage){
-
+            } elseif (!$leadStage) {
                 $stageChange = true;
             }
         }
 
-        if ($stageChange){
+        if ($stageChange) {
             $parsed = explode('.', $stageToChangeTo->getName());
             $lead->stageChangeLogEntry(
                 $parsed[0],
-                $stageToChangeTo->getId() . ": " . $stageToChangeTo->getName(),
+                $stageToChangeTo->getId().': '.$stageToChangeTo->getName(),
                 $event->getName()
             );
             $lead->setStage($stageToChangeTo);
@@ -112,4 +110,4 @@ public function onCampaignTriggerActionChangeStage(CampaignExecutionEvent $event
 
         return $event->setResult($stageChange);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/StageBundle/EventListener/DashboardSubscriber.php b/app/bundles/StageBundle/EventListener/DashboardSubscriber.php
index a3620ffc217..2ec3a60c907 100644
--- a/app/bundles/StageBundle/EventListener/DashboardSubscriber.php
+++ b/app/bundles/StageBundle/EventListener/DashboardSubscriber.php
@@ -1,51 +1,49 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\StageBundle\EventListener;
 
-use Mautic\DashboardBundle\DashboardEvents;
 use Mautic\DashboardBundle\Event\WidgetDetailEvent;
 use Mautic\DashboardBundle\EventListener\DashboardSubscriber as MainDashboardSubscriber;
-use Mautic\CoreBundle\Helper\DateTimeHelper;
 use Mautic\StageBundle\Model\StageModel;
 
 /**
- * Class DashboardSubscriber
- *
- * @package Mautic\StageBundle\EventListener
+ * Class DashboardSubscriber.
  */
 class DashboardSubscriber extends MainDashboardSubscriber
 {
     /**
-     * Define the name of the bundle/category of the widget(s)
+     * Define the name of the bundle/category of the widget(s).
      *
      * @var string
      */
     protected $bundle = 'stage';
 
     /**
-     * Define the widget(s)
+     * Define the widget(s).
      *
      * @var string
      */
-    protected $types = array(
-        'stages.in.time' => array()
-    );
+    protected $types = [
+        'stages.in.time' => [],
+    ];
 
     /**
-     * Define permissions to see those widgets
+     * Define permissions to see those widgets.
      *
      * @var array
      */
-    protected $permissions = array(
+    protected $permissions = [
         'stage:stages:viewown',
-        'stage:stages:viewother'
-    );
+        'stage:stages:viewother',
+    ];
 
     /**
      * @var StageModel
@@ -63,11 +61,9 @@ public function __construct(StageModel $stageModel)
     }
 
     /**
-     * Set a widget detail when needed
+     * Set a widget detail when needed.
      *
      * @param WidgetDetailEvent $event
-     *
-     * @return void
      */
     public function onWidgetDetailGenerate(WidgetDetailEvent $event)
     {
@@ -79,7 +75,7 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
             $params = $widget->getParams();
 
             if (!$event->isCached()) {
-                $event->setTemplateData(array(
+                $event->setTemplateData([
                     'chartType'   => 'line',
                     'chartHeight' => $widget->getHeight() - 80,
                     'chartData'   => $this->stageModel->getStageLineChartData(
@@ -87,10 +83,10 @@ public function onWidgetDetailGenerate(WidgetDetailEvent $event)
                         $params['dateFrom'],
                         $params['dateTo'],
                         $params['dateFormat'],
-                        array(),
+                        [],
                         $canViewOthers
-                    )
-                ));
+                    ),
+                ]);
             }
 
             $event->setTemplate('MauticCoreBundle:Helper:chart.html.php');
diff --git a/app/bundles/StageBundle/EventListener/LeadSubscriber.php b/app/bundles/StageBundle/EventListener/LeadSubscriber.php
index 0ac1b4fda08..aba203dacbe 100644
--- a/app/bundles/StageBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/StageBundle/EventListener/LeadSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,29 +16,27 @@
 use Mautic\LeadBundle\Event\LeadEvent;
 use Mautic\LeadBundle\Event\LeadMergeEvent;
 use Mautic\LeadBundle\Event\LeadTimelineEvent;
-use Mautic\LeadBundle\Event\StagesChangeEvent;
 use Mautic\LeadBundle\LeadEvents;
 
 /**
- * Class LeadSubscriber
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends CommonSubscriber
 {
-
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            LeadEvents::TIMELINE_ON_GENERATE => array('onTimelineGenerate', 0),
-            LeadEvents::LEAD_POST_MERGE      => array('onLeadMerge', 0),
-            LeadEvents::LEAD_POST_SAVE       => array('onLeadSave', -1),
-        );
+        return [
+            LeadEvents::TIMELINE_ON_GENERATE => ['onTimelineGenerate', 0],
+            LeadEvents::LEAD_POST_MERGE      => ['onLeadMerge', 0],
+            LeadEvents::LEAD_POST_SAVE       => ['onLeadSave', -1],
+        ];
     }
 
     /**
-     * Compile events for the lead timeline
+     * Compile events for the lead timeline.
      *
      * @param LeadTimelineEvent $event
      */
@@ -49,7 +48,6 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
         $event->addEventType($eventTypeKey, $eventTypeName);
 
         if (!$event->isApplicable($eventTypeKey)) {
-
             return;
         }
 
@@ -74,7 +72,7 @@ public function onTimelineGenerate(LeadTimelineEvent $event)
                         'extra'      => [
                             'log' => $log,
                         ],
-                        'icon'       => 'fa-tachometer',
+                        'icon' => 'fa-tachometer',
                     ]
                 );
             }
@@ -94,12 +92,11 @@ public function onLeadMerge(LeadMergeEvent $event)
     }
 
     /**
-     * Handle for new leads
+     * Handle for new leads.
      *
      * @param LeadEvent $event
      */
     public function onLeadSave(LeadEvent $event)
     {
-
     }
 }
diff --git a/app/bundles/StageBundle/EventListener/SearchSubscriber.php b/app/bundles/StageBundle/EventListener/SearchSubscriber.php
index 0d05ae6d0f6..76debf15980 100644
--- a/app/bundles/StageBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/StageBundle/EventListener/SearchSubscriber.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\CoreEvents;
 use Mautic\CoreBundle\Event as MauticEvents;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\StageBundle\Model\StageModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\StageBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -39,18 +38,18 @@ public function __construct(StageModel $stageModel)
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH      => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     /**
      * @param MauticEvents\GlobalSearchEvent $event
      */
-    public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
+    public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
     {
         if ($this->security->isGranted('stage:stages:view')) {
             $str = $event->getSearchString();
@@ -58,32 +57,32 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
                 return;
             }
 
-            $items      = $this->stageModel->getEntities(
-                array(
+            $items = $this->stageModel->getEntities(
+                [
                     'limit'  => 5,
-                    'filter' => $str
-                ));
+                    'filter' => $str,
+                ]);
             $stageCount = count($items);
             if ($stageCount > 0) {
-                $stagesResults = array();
+                $stagesResults = [];
                 $canEdit       = $this->security->isGranted('stage:stages:edit');
                 foreach ($items as $item) {
                     $stagesResults[] = $this->templating->renderResponse(
                         'MauticStageBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'item'    => $item,
-                            'canEdit' => $canEdit
-                        )
+                            'canEdit' => $canEdit,
+                        ]
                     )->getContent();
                 }
                 if ($stageCount > 5) {
                     $stagesResults[] = $this->templating->renderResponse(
                         'MauticStageBundle:SubscribedEvents\Search:global.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => ($stageCount - 5)
-                        )
+                            'remaining'    => ($stageCount - 5),
+                        ]
                     )->getContent();
                 }
                 $stagesResults['count'] = $stageCount;
@@ -95,7 +94,7 @@ public function onGlobalSearch (MauticEvents\GlobalSearchEvent $event)
     /**
      * @param MauticEvents\CommandListEvent $event
      */
-    public function onBuildCommandList (MauticEvents\CommandListEvent $event)
+    public function onBuildCommandList(MauticEvents\CommandListEvent $event)
     {
         if ($this->security->isGranted('stage:stages:view')) {
             $event->addCommands(
@@ -104,4 +103,4 @@ public function onBuildCommandList (MauticEvents\CommandListEvent $event)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/StageBundle/EventListener/StageSubscriber.php b/app/bundles/StageBundle/EventListener/StageSubscriber.php
index ad2b5d3c0bb..6ea9f80246a 100644
--- a/app/bundles/StageBundle/EventListener/StageSubscriber.php
+++ b/app/bundles/StageBundle/EventListener/StageSubscriber.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\StageBundle\Event as Events;
 use Mautic\StageBundle\StageEvents;
 
 /**
- * Class StageSubscriber
+ * Class StageSubscriber.
  */
 class StageSubscriber extends CommonSubscriber
 {
@@ -46,16 +46,16 @@ public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $audit
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            StageEvents::STAGE_POST_SAVE     => array('onStagePostSave', 0),
-            StageEvents::STAGE_POST_DELETE   => array('onStageDelete', 0)
-        );
+        return [
+            StageEvents::STAGE_POST_SAVE   => ['onStagePostSave', 0],
+            StageEvents::STAGE_POST_DELETE => ['onStageDelete', 0],
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\StageEvent $event
      */
@@ -63,35 +63,34 @@ public function onStagePostSave(Events\StageEvent $event)
     {
         $stage = $event->getStage();
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "stage",
-                "object"    => "stage",
-                "objectId"  => $stage->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'stage',
+                'object'    => 'stage',
+                'objectId'  => $stage->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\StageEvent $event
      */
     public function onStageDelete(Events\StageEvent $event)
     {
         $stage = $event->getStage();
-        $log = array(
-            "bundle"     => "stage",
-            "object"     => "stage",
-            "objectId"   => $stage->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $stage->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log   = [
+            'bundle'    => 'stage',
+            'object'    => 'stage',
+            'objectId'  => $stage->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $stage->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
-
 }
diff --git a/app/bundles/StageBundle/Form/Type/GenericStageActionType.php b/app/bundles/StageBundle/Form/Type/GenericStageActionType.php
index cba56119d16..9fbb7959662 100644
--- a/app/bundles/StageBundle/Form/Type/GenericStageActionType.php
+++ b/app/bundles/StageBundle/Form/Type/GenericStageActionType.php
@@ -1,44 +1,39 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
-use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class GenericStageSettingsType
+ * Class GenericStageSettingsType.
  */
-class GenericStageSettingsType extends AbstractType
+class GenericStageActionType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $default = (empty($options['data']['weight'])) ? 0 : (int) $options['data']['weight'];
-        $builder->add('weight', 'number', array(
+        $builder->add('weight', 'number', [
             'label'      => 'mautic.stage.action.weight',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       =>
-                array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.stage.action.weight.help'
-                ),
-            'precision'  => 0,
-            'data'       => $default
-        ));
+                    'tooltip' => 'mautic.stage.action.weight.help',
+                ],
+            'precision' => 0,
+            'data'      => $default,
+        ]);
     }
 
     /**
@@ -46,6 +41,6 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "genericstage_settings";
+        return 'genericstage_settings';
     }
 }
diff --git a/app/bundles/StageBundle/Form/Type/StageActionChangeType.php b/app/bundles/StageBundle/Form/Type/StageActionChangeType.php
index 00dfbc9335b..e9d6bff9bac 100644
--- a/app/bundles/StageBundle/Form/Type/StageActionChangeType.php
+++ b/app/bundles/StageBundle/Form/Type/StageActionChangeType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,9 +17,7 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class EmailSendType
- *
- * @package Mautic\EmailBundle\Form\Type
+ * Class EmailSendType.
  */
 class StageActionChangeType extends AbstractType
 {
@@ -27,7 +26,8 @@ class StageActionChangeType extends AbstractType
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->factory = $factory;
     }
 
@@ -35,34 +35,35 @@ public function __construct(MauticFactory $factory) {
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('stage', 'stageaction_list', array(
-            'label'       => 'mautic.stage.selectstage',
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
+        $builder->add('stage', 'stageaction_list', [
+            'label'      => 'mautic.stage.selectstage',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'   => 'form-control',
                 'tooltip' => 'mautic.stage.choose.stage_descr',
-            ),
+            ],
             'multiple'    => false,
             'required'    => true,
-            'constraints' => array(
+            'constraints' => [
                 new NotBlank(
-                    array('message' => 'mautic.core.value.required')
-                )
-            )
-        ));
+                    ['message' => 'mautic.core.value.required']
+                ),
+            ],
+        ]);
     }
 
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(array('update_select'));
+        $resolver->setOptional(['update_select']);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "stageaction_change";
+    public function getName()
+    {
+        return 'stageaction_change';
     }
 }
diff --git a/app/bundles/StageBundle/Form/Type/StageActionListType.php b/app/bundles/StageBundle/Form/Type/StageActionListType.php
index 16075cb2023..2ebea0e13af 100644
--- a/app/bundles/StageBundle/Form/Type/StageActionListType.php
+++ b/app/bundles/StageBundle/Form/Type/StageActionListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,22 +12,21 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class StageActionType
+ * Class StageActionType.
  */
 class StageActionListType extends AbstractType
 {
-
     private $model;
 
     /**
-     * @param MauticFactory       $factory
+     * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
+    public function __construct(MauticFactory $factory)
+    {
         $this->model = $factory->getModel('stage');
     }
 
@@ -37,19 +37,19 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         /** @var \Mautic\StageBundle\Model\StageModel $model */
         $model = $this->model;
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'choices' => function (Options $options) use ($model) {
                 $stages = $model->getUserStages();
 
-                $choices = array();
+                $choices = [];
                 foreach ($stages as $s) {
                     $choices[$s['id']] = $s['name'];
                 }
 
                 return $choices;
             },
-            'required'    => false
-        ));
+            'required' => false,
+        ]);
     }
 
     /**
@@ -60,12 +60,11 @@ public function getParent()
         return 'choice';
     }
 
-
     /**
      * {@inheritdoc}
      */
     public function getName()
     {
-        return "stageaction_list";
+        return 'stageaction_list';
     }
 }
diff --git a/app/bundles/StageBundle/Form/Type/StageActionType.php b/app/bundles/StageBundle/Form/Type/StageActionType.php
index 958db0cd631..81612311e82 100644
--- a/app/bundles/StageBundle/Form/Type/StageActionType.php
+++ b/app/bundles/StageBundle/Form/Type/StageActionType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,20 +16,19 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class StageActionType
+ * Class StageActionType.
  */
 class StageActionType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $masks           = array();
-        $formTypeOptions = array(
-            'label' => false
-        );
+        $masks           = [];
+        $formTypeOptions = [
+            'label' => false,
+        ];
         if (!empty($options['formTypeOptions'])) {
             $formTypeOptions = array_merge($formTypeOptions, $options['formTypeOptions']);
         }
@@ -46,18 +46,17 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'formType'        => 'genericstage_settings',
-            'formTypeOptions' => array()
-        ));
+            'formTypeOptions' => [],
+        ]);
     }
 
-
     /**
      * {@inheritdoc}
      */
     public function getName()
     {
-        return "stageaction";
+        return 'stageaction';
     }
 }
diff --git a/app/bundles/StageBundle/Form/Type/StageListType.php b/app/bundles/StageBundle/Form/Type/StageListType.php
index 481618cba71..c2eca28952f 100644
--- a/app/bundles/StageBundle/Form/Type/StageListType.php
+++ b/app/bundles/StageBundle/Form/Type/StageListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,30 +15,28 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class UserListType
- *
- * @package Mautic\UserBundle\Form\Type
+ * Class UserListType.
  */
 class StageListType extends AbstractType
 {
-
-    private $choices = array();
+    private $choices = [];
 
     /**
      * @param MauticFactory $factory
      */
-    public function __construct(MauticFactory $factory) {
-        $choices = $factory->getModel('stage')->getRepository()->getEntities(array(
-            'filter' => array(
-                'force' => array(
-                    array(
+    public function __construct(MauticFactory $factory)
+    {
+        $choices = $factory->getModel('stage')->getRepository()->getEntities([
+            'filter' => [
+                'force' => [
+                    [
                         'column' => 's.isPublished',
                         'expr'   => 'eq',
-                        'value'  => true
-                    )
-                )
-            )
-        ));
+                        'value'  => true,
+                    ],
+                ],
+            ],
+        ]);
 
         foreach ($choices as $choice) {
             $this->choices[$choice->getId()] = $choice->getName(true);
@@ -52,25 +51,26 @@ public function __construct(MauticFactory $factory) {
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
-            'choices'       => $this->choices,
-            'empty_value'   => false,
-            'expanded'      => false,
-            'multiple'      => true,
-            'required'      => false,
-            'empty_value'   => 'mautic.core.form.chooseone'
-        ));
+        $resolver->setDefaults([
+            'choices'     => $this->choices,
+            'empty_value' => false,
+            'expanded'    => false,
+            'multiple'    => true,
+            'required'    => false,
+            'empty_value' => 'mautic.core.form.chooseone',
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "stage_list";
+    public function getName()
+    {
+        return 'stage_list';
     }
 
     public function getParent()
     {
         return 'choice';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/StageBundle/Form/Type/StageType.php b/app/bundles/StageBundle/Form/Type/StageType.php
index 71cfc0fb33b..5b8f5c699b5 100644
--- a/app/bundles/StageBundle/Form/Type/StageType.php
+++ b/app/bundles/StageBundle/Form/Type/StageType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,7 +19,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class StageType
+ * Class StageType.
  */
 class StageType extends AbstractType
 {
@@ -38,7 +39,7 @@ class StageType extends AbstractType
     public function __construct(MauticFactory $factory)
     {
         $this->translator = $factory->getTranslator();
-        $this->security = $factory->getSecurity();
+        $this->security   = $factory->getSecurity();
     }
 
     /**
@@ -46,34 +47,32 @@ public function __construct(MauticFactory $factory)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('description' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['description' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('stage', $options));
 
-        $builder->add('description', 'textarea', array(
-            'label' => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr' => array('class' => 'form-control editor'),
-            'required' => false
-        ));
-        $builder->add('name', 'text', array(
-            'label' => 'mautic.core.name',
-            'label_attr' => array(
-                'class' => 'control-label'
-            ), 'attr' => array(
-                'class' => 'form-control'
-            )));
-        $builder->add('weight', 'number', array(
-            'label' => 'mautic.stage.action.weight',
-            'label_attr' => array('class' => 'control-label'),
-            'attr' =>
-                array(
-                    'class' => 'form-control',
-                    'tooltip' => 'mautic.stage.action.weight.help'
-                ),
+        $builder->add('description', 'textarea', [
+            'label'      => 'mautic.core.description',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
+        $builder->add('name', 'text', [
+            'label'      => 'mautic.core.name',
+            'label_attr' => [
+                'class' => 'control-label',
+            ], 'attr' => [
+                'class' => 'form-control',
+            ], ]);
+        $builder->add('weight', 'number', [
+            'label'      => 'mautic.stage.action.weight',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                    'class'   => 'form-control',
+                    'tooltip' => 'mautic.stage.action.weight.help',
+                ],
             'precision' => 0,
-            'required' => false
-        ));
-
+            'required'  => false,
+        ]);
 
         if (!empty($options['data']) && $options['data'] instanceof Stage) {
             $readonly = !$this->security->hasEntityAccess(
@@ -85,50 +84,50 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $data = $options['data']->isPublished(false);
         } elseif (!$this->security->isGranted('stage:stages:publishown')) {
             $readonly = true;
-            $data = false;
+            $data     = false;
         } else {
             $readonly = false;
-            $data = true;
+            $data     = true;
         }
 
-        $builder->add('isPublished', 'yesno_button_group', array(
+        $builder->add('isPublished', 'yesno_button_group', [
             'read_only' => $readonly,
-            'data' => $data
-        ));
-
-        $builder->add('publishUp', 'datetime', array(
-            'widget' => 'single_text',
-            'label' => 'mautic.core.form.publishup',
-            'label_attr' => array('class' => 'control-label'),
-            'attr' => array(
-                'class' => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format' => 'yyyy-MM-dd HH:mm',
-            'required' => false
-        ));
-
-        $builder->add('publishDown', 'datetime', array(
-            'widget' => 'single_text',
-            'label' => 'mautic.core.form.publishdown',
-            'label_attr' => array('class' => 'control-label'),
-            'attr' => array(
-                'class' => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format' => 'yyyy-MM-dd HH:mm',
-            'required' => false
-        ));
+            'data'      => $data,
+        ]);
+
+        $builder->add('publishUp', 'datetime', [
+            'widget'     => 'single_text',
+            'label'      => 'mautic.core.form.publishup',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'       => 'form-control',
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
+
+        $builder->add('publishDown', 'datetime', [
+            'widget'     => 'single_text',
+            'label'      => 'mautic.core.form.publishdown',
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'       => 'form-control',
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
         //add category
-        $builder->add('category', 'category', array(
-            'bundle' => 'stage'
-        ));
+        $builder->add('category', 'category', [
+            'bundle' => 'stage',
+        ]);
 
         $builder->add('buttons', 'form_buttons');
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -137,13 +136,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Mautic\StageBundle\Entity\Stage',
-        ));
+        ]);
 
-        $resolver->setRequired(array('stageActions'));
+        $resolver->setRequired(['stageActions']);
 
-        $resolver->setOptional(array('actionType'));
+        $resolver->setOptional(['actionType']);
     }
 
     /**
@@ -151,6 +150,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "stage";
+        return 'stage';
     }
 }
diff --git a/app/bundles/StageBundle/Helper/EventHelper.php b/app/bundles/StageBundle/Helper/EventHelper.php
index 083d54bd1de..49d6a920b41 100644
--- a/app/bundles/StageBundle/Helper/EventHelper.php
+++ b/app/bundles/StageBundle/Helper/EventHelper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Mautic\LeadBundle\Entity\Lead;
 
 /**
- * Class EventHelper
+ * Class EventHelper.
  */
 class EventHelper
 {
@@ -24,7 +25,7 @@ class EventHelper
      */
     public static function engageStageAction($lead, $action)
     {
-        static $initiated = array();
+        static $initiated = [];
 
         $stagesChange = 0;
 
diff --git a/app/bundles/StageBundle/MauticStageBundle.php b/app/bundles/StageBundle/MauticStageBundle.php
index 874f1e12e0b..994527ce74f 100644
--- a/app/bundles/StageBundle/MauticStageBundle.php
+++ b/app/bundles/StageBundle/MauticStageBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticPointBundle
+ * Class MauticPointBundle.
  */
 class MauticStageBundle extends Bundle
 {
diff --git a/app/bundles/StageBundle/Model/StageModel.php b/app/bundles/StageBundle/Model/StageModel.php
index 337b5e60cb1..7c5cb889c1e 100644
--- a/app/bundles/StageBundle/Model/StageModel.php
+++ b/app/bundles/StageBundle/Model/StageModel.php
@@ -1,32 +1,32 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\Model;
 
+use Mautic\CoreBundle\Helper\Chart\ChartQuery;
+use Mautic\CoreBundle\Helper\Chart\LineChart;
 use Mautic\CoreBundle\Model\FormModel as CommonFormModel;
-use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\LeadBundle\Entity\Lead;
+use Mautic\LeadBundle\Model\LeadModel;
 use Mautic\StageBundle\Entity\Action;
 use Mautic\StageBundle\Entity\LeadStageLog;
 use Mautic\StageBundle\Entity\Stage;
 use Mautic\StageBundle\Event\StageBuilderEvent;
 use Mautic\StageBundle\Event\StageEvent;
 use Mautic\StageBundle\StageEvents;
-use Mautic\CoreBundle\Helper\Chart\LineChart;
-use Mautic\CoreBundle\Helper\Chart\PieChart;
-use Mautic\CoreBundle\Helper\Chart\ChartQuery;
 use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class StageModel
+ * Class StageModel.
  */
 class StageModel extends CommonFormModel
 {
@@ -48,12 +48,12 @@ class StageModel extends CommonFormModel
     /**
      * PointModel constructor.
      *
-     * @param Session $session
+     * @param Session   $session
      * @param LeadModel $leadModel
      */
     public function __construct(LeadModel $leadModel, Session $session)
     {
-        $this->session = $session;
+        $this->session   = $session;
         $this->leadModel = $leadModel;
     }
     /**
@@ -79,14 +79,15 @@ public function getPermissionBase()
      *
      * @throws MethodNotAllowedHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Stage) {
-            throw new MethodNotAllowedHttpException(array('Stage'));
+            throw new MethodNotAllowedHttpException(['Stage']);
         }
         if (!empty($action)) {
             $options['action'] = $action;
         }
+
         return $formFactory->create('stage', $entity, $options);
     }
 
@@ -112,20 +113,20 @@ public function getEntity($id = null)
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Stage) {
-            throw new MethodNotAllowedHttpException(array('Stage'));
+            throw new MethodNotAllowedHttpException(['Stage']);
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = StageEvents::STAGE_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = StageEvents::STAGE_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = StageEvents::STAGE_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = StageEvents::STAGE_POST_DELETE;
                 break;
             default:
@@ -139,6 +140,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
             }
 
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         }
 
@@ -146,7 +148,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     }
 
     /**
-     * Gets array of custom actions from bundles subscribed StageEvents::STAGE_ON_BUILD
+     * Gets array of custom actions from bundles subscribed StageEvents::STAGE_ON_BUILD.
      *
      * @return mixed
      */
@@ -156,8 +158,8 @@ public function getStageActions()
 
         if (empty($actions)) {
             //build them
-            $actions = array();
-            $event = new StageBuilderEvent($this->translator);
+            $actions = [];
+            $event   = new StageBuilderEvent($this->translator);
             $this->dispatcher->dispatch(StageEvents::STAGE_ON_BUILD, $event);
             $actions['actions'] = $event->getActions();
             $actions['list']    = $event->getActionList();
@@ -168,22 +170,22 @@ public function getStageActions()
     }
 
     /**
-     * Get line chart data of stages
+     * Get line chart data of stages.
      *
-     * @param char     $unit   {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
+     * @param char     $unit          {@link php.net/manual/en/function.date.php#refsect1-function.date-parameters}
      * @param DateTime $dateFrom
      * @param DateTime $dateTo
      * @param string   $dateFormat
      * @param array    $filter
-     * @param boolean  $canViewOthers
+     * @param bool     $canViewOthers
      *
      * @return array
      */
-    public function getStageLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = array(), $canViewOthers = true)
+    public function getStageLineChartData($unit, \DateTime $dateFrom, \DateTime $dateTo, $dateFormat = null, $filter = [], $canViewOthers = true)
     {
-        $chart     = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
-        $query     = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
-        $q         = $query->prepareTimeDataQuery('lead_stages_change_log', 'date_added', $filter);
+        $chart = new LineChart($unit, $dateFrom, $dateTo, $dateFormat);
+        $query = new ChartQuery($this->em->getConnection(), $dateFrom, $dateTo);
+        $q     = $query->prepareTimeDataQuery('lead_stages_change_log', 'date_added', $filter);
 
         if (!$canViewOthers) {
             $q->join('t', MAUTIC_TABLE_PREFIX.'leads', 'l', 'l.id = t.lead_id')
@@ -193,16 +195,16 @@ public function getStageLineChartData($unit, \DateTime $dateFrom, \DateTime $dat
 
         $data = $query->loadAndBuildTimeData($q);
         $chart->setDataset($this->factory->getTranslator()->trans('mautic.stage.changes'), $data);
+
         return $chart->render();
     }
 
     /**
-     *
      * @return mixed
      */
     public function getUserStages()
     {
-        $user  = (!$this->security->isGranted('stage:stages:viewother')) ?
+        $user = (!$this->security->isGranted('stage:stages:viewother')) ?
             $this->factory->getUser() : false;
         $stages = $this->em->getRepository('MauticStageBundle:Stage')->getStages($user);
 
@@ -210,14 +212,12 @@ public function getUserStages()
     }
 
     /**
-     * Triggers a specific stage change (this function is not being used any more but leaving it in case we do want to move stages through different actions)
+     * Triggers a specific stage change (this function is not being used any more but leaving it in case we do want to move stages through different actions).
      *
      * @param $type
      * @param mixed $eventDetails passthrough from function triggering action to the callback function
-     * @param mixed $typeId Something unique to the triggering event to prevent  unnecessary duplicate calls
+     * @param mixed $typeId       Something unique to the triggering event to prevent  unnecessary duplicate calls
      * @param Lead  $lead
-     *
-     * @return void
      */
     public function triggerAction($type, $eventDetails = null, $typeId = null, Lead $lead = null)
     {
@@ -227,7 +227,7 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
         }
 
         if ($typeId !== null && MAUTIC_ENV === 'prod') {
-            $triggeredEvents = $this->session->get('mautic.triggered.stage.actions', array());
+            $triggeredEvents = $this->session->get('mautic.triggered.stage.actions', []);
             if (in_array($typeId, $triggeredEvents)) {
                 return;
             }
@@ -244,7 +244,6 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
             $lead = $this->leadModel->getCurrentLead();
 
             if (null === $lead || !$lead->getId()) {
-
                 return;
             }
         }
@@ -255,7 +254,7 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
         //get a list of actions that has already been performed on this lead
         $completedActions = $repo->getCompletedLeadActions($type, $lead->getId());
 
-        $persist = array();
+        $persist = [];
         foreach ($availableStages as $action) {
 
             //if it's already been done, then skip it
@@ -267,11 +266,11 @@ public function triggerAction($type, $eventDetails = null, $typeId = null, Lead
             if (!isset($availableActions['actions'][$action->getName()])) {
                 continue;
             }
-            
+
             $parsed = explode('.', $action->getName());
             $lead->stageChangeLogEntry(
                 $parsed[0],
-                $action->getId() . ": " . $action->getName(),
+                $action->getId().': '.$action->getName(),
                 'Moved by an action'
             );
             $lead->setStage($action);
diff --git a/app/bundles/StageBundle/Security/Permissions/StagePermissions.php b/app/bundles/StageBundle/Security/Permissions/StagePermissions.php
index 61845c79f38..26a5e8eea3a 100644
--- a/app/bundles/StageBundle/Security/Permissions/StagePermissions.php
+++ b/app/bundles/StageBundle/Security/Permissions/StagePermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class StagePermissions
+ * Class StagePermissions.
  */
 class StagePermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/bundles/StageBundle/StageEvents.php b/app/bundles/StageBundle/StageEvents.php
index d96caf761df..4bcfcd1ac8e 100644
--- a/app/bundles/StageBundle/StageEvents.php
+++ b/app/bundles/StageBundle/StageEvents.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\StageBundle;
 
 /**
- * Class StageEvents
+ * Class StageEvents.
  *
  * Events available for StageBundle
  */
@@ -53,7 +54,7 @@ final class StageEvents
     const STAGE_POST_DELETE = 'mautic.stage_post_delete';
 
     /**
-     * The mautic.stage_on_build event is thrown before displaying the stage builder form to allow adding of custom actions
+     * The mautic.stage_on_build event is thrown before displaying the stage builder form to allow adding of custom actions.
      *
      * The event listener receives a Mautic\StageBundle\Event\StageBuilderEvent instance.
      *
@@ -62,7 +63,7 @@ final class StageEvents
     const STAGE_ON_BUILD = 'mautic.stage_on_build';
 
     /**
-     * The mautic.stage_on_action event is thrown to execute a stage action
+     * The mautic.stage_on_action event is thrown to execute a stage action.
      *
      * The event listener receives a Mautic\StageBundle\Event\StageActionEvent instance.
      *
diff --git a/app/bundles/StageBundle/Views/FormTheme/Action/_stageaction_properties_row.html.php b/app/bundles/StageBundle/Views/FormTheme/Action/_stageaction_properties_row.html.php
index 137fa2e79f5..da6e22852ae 100644
--- a/app/bundles/StageBundle/Views/FormTheme/Action/_stageaction_properties_row.html.php
+++ b/app/bundles/StageBundle/Views/FormTheme/Action/_stageaction_properties_row.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-echo $view['form']->widget($form);
\ No newline at end of file
+echo $view['form']->widget($form);
diff --git a/app/bundles/StageBundle/Views/Stage/actionform.html.php b/app/bundles/StageBundle/Views/Stage/actionform.html.php
index 52fe43ff2a6..74719c246d6 100644
--- a/app/bundles/StageBundle/Views/Stage/actionform.html.php
+++ b/app/bundles/StageBundle/Views/Stage/actionform.html.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 //we do not want the surrounding form since this will be embedded into the current form
 foreach ($form as $f) {
     echo $view['form']->row($f);
-}
\ No newline at end of file
+}
diff --git a/app/bundles/StageBundle/Views/Stage/form.html.php b/app/bundles/StageBundle/Views/Stage/form.html.php
index 4d0fb8e5100..26c78ca0d18 100644
--- a/app/bundles/StageBundle/Views/Stage/form.html.php
+++ b/app/bundles/StageBundle/Views/Stage/form.html.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'stage');
 
 $header = ($entity->getId()) ?
     $view['translator']->trans('mautic.stage.menu.edit',
-        array('%name%' => $view['translator']->trans($entity->getName()))) :
+        ['%name%' => $view['translator']->trans($entity->getName())]) :
     $view['translator']->trans('mautic.stage.menu.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 
 echo $view['form']->start($form);
 ?>
diff --git a/app/bundles/StageBundle/Views/Stage/index.html.php b/app/bundles/StageBundle/Views/Stage/index.html.php
index 35cb909274c..e75a5ffca53 100644
--- a/app/bundles/StageBundle/Views/Stage/index.html.php
+++ b/app/bundles/StageBundle/Views/Stage/index.html.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'stage');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.stages.menu.root'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.stages.menu.root'));
 
 $view['slots']->set(
     'actions',
     $view->render(
         'MauticCoreBundle:Helper:page_actions.html.php',
-        array(
-            'templateButtons' => array(
-                'new' => $permissions['stage:stages:create']
-            ),
-            'routeBase'       => 'stage'
-        )
+        [
+            'templateButtons' => [
+                'new' => $permissions['stage:stages:create'],
+            ],
+            'routeBase' => 'stage',
+        ]
     )
 );
 ?>
@@ -28,15 +28,15 @@
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
     <?php echo $view->render(
         'MauticCoreBundle:Helper:list_toolbar.html.php',
-        array(
-            'searchValue' => $searchValue,
-            'searchHelp'  => 'mautic.core.help.searchcommands',
+        [
+            'searchValue'     => $searchValue,
+            'searchHelp'      => 'mautic.core.help.searchcommands',
             'action'          => $currentRoute,
             'routeBase'       => 'stage',
-            'templateButtons' => array(
-                'delete' => $permissions['stage:stages:delete']
-            )
-        )
+            'templateButtons' => [
+                'delete' => $permissions['stage:stages:delete'],
+            ],
+        ]
     ); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/StageBundle/Views/Stage/list.html.php b/app/bundles/StageBundle/Views/Stage/list.html.php
index 686c9856be4..f64ebafc8d1 100644
--- a/app/bundles/StageBundle/Views/Stage/list.html.php
+++ b/app/bundles/StageBundle/Views/Stage/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if ($tmpl == 'index') {
@@ -19,41 +20,41 @@
                 <?php
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'checkall' => 'true',
-                        'target'   => '#stageTable'
-                    )
+                        'target'   => '#stageTable',
+                    ]
                 );
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'stage',
                         'orderBy'    => 's.name',
                         'text'       => 'mautic.core.name',
                         'class'      => 'col-stage-name',
-                        'default'    => true
-                    )
+                        'default'    => true,
+                    ]
                 );
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'stage',
                         'orderBy'    => 'c.title',
                         'text'       => 'mautic.core.category',
-                        'class'      => 'visible-md visible-lg col-stage-category'
-                    )
+                        'class'      => 'visible-md visible-lg col-stage-category',
+                    ]
                 );
 
                 echo $view->render(
                     'MauticCoreBundle:Helper:tableheader.html.php',
-                    array(
+                    [
                         'sessionVar' => 'stage',
                         'orderBy'    => 's.id',
                         'text'       => 'mautic.core.id',
-                        'class'      => 'visible-md visible-lg col-stage-id'
-                    )
+                        'class'      => 'visible-md visible-lg col-stage-id',
+                    ]
                 );
                 ?>
             </tr>
@@ -65,15 +66,15 @@
                         <?php
                         echo $view->render(
                             'MauticCoreBundle:Helper:list_actions.html.php',
-                            array(
+                            [
                                 'item'            => $item,
-                                'templateButtons' => array(
+                                'templateButtons' => [
                                     'edit'   => $permissions['stage:stages:edit'],
                                     'clone'  => $permissions['stage:stages:create'],
                                     'delete' => $permissions['stage:stages:delete'],
-                                ),
-                                'routeBase'       => 'stage'
-                            )
+                                ],
+                                'routeBase' => 'stage',
+                            ]
                         );
                         ?>
                     </td>
@@ -82,11 +83,11 @@
 
                             <?php echo $view->render(
                                 'MauticCoreBundle:Helper:publishstatus_icon.html.php',
-                                array('item' => $item, 'model' => 'stage')
+                                ['item' => $item, 'model' => 'stage']
                             ); ?>
                             <a href="<?php echo $view['router']->generate(
                                 'mautic_stage_action',
-                                array("objectAction" => "edit", "objectId" => $item->getId())
+                                ['objectAction' => 'edit', 'objectId' => $item->getId()]
                             ); ?>" data-toggle="ajax">
                                 <?php echo $item->getName(); ?>
                             </a>
@@ -99,7 +100,7 @@
                     </td>
                     <td class="visible-md visible-lg">
                         <?php $category = $item->getCategory(); ?>
-                        <?php $catName = ($category)
+                        <?php $catName  = ($category)
                             ? $category->getTitle()
                             : $view['translator']->trans(
                                 'mautic.core.form.uncategorized'
@@ -117,19 +118,19 @@
     <div class="panel-footer">
         <?php echo $view->render(
             'MauticCoreBundle:Helper:pagination.html.php',
-            array(
-                "totalItems" => count($items),
-                "page"       => $page,
-                "limit"      => $limit,
-                "menuLinkId" => 'mautic_stage_index',
-                "baseUrl"    => $view['router']->generate('mautic_stage_index'),
-                'sessionVar' => 'stage'
-            )
+            [
+                'totalItems' => count($items),
+                'page'       => $page,
+                'limit'      => $limit,
+                'menuLinkId' => 'mautic_stage_index',
+                'baseUrl'    => $view['router']->generate('mautic_stage_index'),
+                'sessionVar' => 'stage',
+            ]
         ); ?>
     </div>
 <?php else: ?>
     <?php echo $view->render(
         'MauticCoreBundle:Helper:noresults.html.php',
-        array('tip' => 'mautic.stage.action.noresults.tip')
+        ['tip' => 'mautic.stage.action.noresults.tip']
     ); ?>
 <?php endif; ?>
diff --git a/app/bundles/StageBundle/Views/SubscribedEvents/Search/global.html.php b/app/bundles/StageBundle/Views/SubscribedEvents/Search/global.html.php
index 9e701fdb86b..3ae92304d71 100644
--- a/app/bundles/StageBundle/Views/SubscribedEvents/Search/global.html.php
+++ b/app/bundles/StageBundle/Views/SubscribedEvents/Search/global.html.php
@@ -1,22 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_stage_index', array('search' => $searchString)); ?>" data-toggle="ajax">
-        <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+    <a href="<?php echo $this->container->get('router')->generate('mautic_stage_index', ['search' => $searchString]); ?>" data-toggle="ajax">
+        <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
     </a>
 </div>
 <?php else: ?>
 <?php if ($canEdit): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_stage_action', array('objectAction' => 'edit', 'objectId' => $item->getId())); ?>" data-toggle="ajax">
-    <?php echo $item->getName();?>
+<a href="<?php echo $this->container->get('router')->generate('mautic_stage_action', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
+    <?php echo $item->getName(); ?>
 </a>
 <?php else: ?>
 <span><?php echo $item->getName(); ?></span>
diff --git a/app/bundles/UserBundle/Config/config.php b/app/bundles/UserBundle/Config/config.php
index b67412ecb25..50c72083ded 100644
--- a/app/bundles/UserBundle/Config/config.php
+++ b/app/bundles/UserBundle/Config/config.php
@@ -1,132 +1,133 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'menu'     => array(
-        'admin' => array(
-            'mautic.user.users' => array(
+return [
+    'menu' => [
+        'admin' => [
+            'mautic.user.users' => [
                 'access'    => 'user:users:view',
                 'route'     => 'mautic_user_index',
                 'iconClass' => 'fa-users',
-            ),
-            'mautic.user.roles' => array(
+            ],
+            'mautic.user.roles' => [
                 'access'    => 'user:roles:view',
                 'route'     => 'mautic_role_index',
-                'iconClass' => 'fa-lock'
-            )
-        )
-    ),
+                'iconClass' => 'fa-lock',
+            ],
+        ],
+    ],
 
-    'routes'   => array(
-        'main' => array(
-            'login'                     => array(
+    'routes' => [
+        'main' => [
+            'login' => [
                 'path'       => '/login',
                 'controller' => 'MauticUserBundle:Security:login',
-            ),
-            'mautic_user_logincheck'    => array(
-                'path' => '/login_check',
+            ],
+            'mautic_user_logincheck' => [
+                'path'       => '/login_check',
                 'controller' => 'MauticUserBundle:Security:loginCheck',
-            ),
-            'mautic_user_logout'        => array(
-                'path' => '/logout'
-            ),
-            'mautic_sso_login'    => array(
+            ],
+            'mautic_user_logout' => [
+                'path' => '/logout',
+            ],
+            'mautic_sso_login' => [
                 'path'       => '/sso_login/{integration}',
-                'controller' => 'MauticUserBundle:Security:ssoLogin'
-            ),
-            'mautic_sso_login_check'    => array(
+                'controller' => 'MauticUserBundle:Security:ssoLogin',
+            ],
+            'mautic_sso_login_check' => [
                 'path'       => '/sso_login_check/{integration}',
                 'controller' => 'MauticUserBundle:Security:ssoLoginCheck',
-            ),
-            'mautic_user_index'         => array(
+            ],
+            'mautic_user_index' => [
                 'path'       => '/users/{page}',
-                'controller' => 'MauticUserBundle:User:index'
-            ),
-            'mautic_user_action'        => array(
+                'controller' => 'MauticUserBundle:User:index',
+            ],
+            'mautic_user_action' => [
                 'path'       => '/users/{objectAction}/{objectId}',
-                'controller' => 'MauticUserBundle:User:execute'
-            ),
-            'mautic_role_index'         => array(
+                'controller' => 'MauticUserBundle:User:execute',
+            ],
+            'mautic_role_index' => [
                 'path'       => '/roles/{page}',
-                'controller' => 'MauticUserBundle:Role:index'
-            ),
-            'mautic_role_action'        => array(
+                'controller' => 'MauticUserBundle:Role:index',
+            ],
+            'mautic_role_action' => [
                 'path'       => '/roles/{objectAction}/{objectId}',
-                'controller' => 'MauticUserBundle:Role:execute'
-            ),
-            'mautic_user_account'       => array(
+                'controller' => 'MauticUserBundle:Role:execute',
+            ],
+            'mautic_user_account' => [
                 'path'       => '/account',
-                'controller' => 'MauticUserBundle:Profile:index'
-            ),
-        ),
-        'api'  => array(
-            'mautic_api_getusers'        => array(
+                'controller' => 'MauticUserBundle:Profile:index',
+            ],
+        ],
+        'api' => [
+            'mautic_api_getusers' => [
                 'path'       => '/users',
                 'controller' => 'MauticUserBundle:Api\UserApi:getEntities',
-            ),
-            'mautic_api_getuser'         => array(
-                'path'         => '/users/{id}',
-                'controller'   => 'MauticUserBundle:Api\UserApi:getEntity'
-            ),
-            'mautic_api_getself'         => array(
+            ],
+            'mautic_api_getuser' => [
+                'path'       => '/users/{id}',
+                'controller' => 'MauticUserBundle:Api\UserApi:getEntity',
+            ],
+            'mautic_api_getself' => [
                 'path'       => '/users/self',
                 'controller' => 'MauticUserBundle:Api\UserApi:getSelf',
-            ),
-            'mautic_api_checkpermission' => array(
-                'path'         => '/users/{id}/permissioncheck',
-                'controller'   => 'MauticUserBundle:Api\UserApi:isGranted',
-                'method'       => 'POST'
-            ),
-            'mautic_api_getuserroles'    => array(
+            ],
+            'mautic_api_checkpermission' => [
+                'path'       => '/users/{id}/permissioncheck',
+                'controller' => 'MauticUserBundle:Api\UserApi:isGranted',
+                'method'     => 'POST',
+            ],
+            'mautic_api_getuserroles' => [
                 'path'       => '/users/list/roles',
                 'controller' => 'MauticUserBundle:Api\UserApi:getRoles',
-            ),
-            'mautic_api_getroles'        => array(
+            ],
+            'mautic_api_getroles' => [
                 'path'       => '/roles',
                 'controller' => 'MauticUserBundle:Api\RoleApi:getEntities',
-            ),
-            'mautic_api_getrole'         => array(
-                'path'         => '/roles/{id}',
-                'controller'   => 'MauticUserBundle:Api\RoleApi:getEntity'
-            )
-        ),
-        'public' => array(
-            'mautic_user_passwordreset' => array(
+            ],
+            'mautic_api_getrole' => [
+                'path'       => '/roles/{id}',
+                'controller' => 'MauticUserBundle:Api\RoleApi:getEntity',
+            ],
+        ],
+        'public' => [
+            'mautic_user_passwordreset' => [
                 'path'       => '/passwordreset',
-                'controller' => 'MauticUserBundle:Public:passwordReset'
-            ),
-            'mautic_user_passwordresetconfirm' => array(
+                'controller' => 'MauticUserBundle:Public:passwordReset',
+            ],
+            'mautic_user_passwordresetconfirm' => [
                 'path'       => '/passwordresetconfirm',
-                'controller' => 'MauticUserBundle:Public:passwordResetConfirm'
-            )
-        )
-    ),
+                'controller' => 'MauticUserBundle:Public:passwordResetConfirm',
+            ],
+        ],
+    ],
 
-    'services' => array(
-        'events' => array(
-            'mautic.user.subscriber'        => array(
+    'services' => [
+        'events' => [
+            'mautic.user.subscriber' => [
                 'class'     => 'Mautic\UserBundle\EventListener\UserSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
-            ),
-            'mautic.user.search.subscriber' => array(
+                    'mautic.core.model.auditlog',
+                ],
+            ],
+            'mautic.user.search.subscriber' => [
                 'class'     => 'Mautic\UserBundle\EventListener\SearchSubscriber',
                 'arguments' => [
                     'mautic.user.model.user',
-                    'mautic.user.model.role'
-                ]
-            )
-        ),
-        'forms'  => array(
-            'mautic.form.type.user'           => array(
+                    'mautic.user.model.role',
+                ],
+            ],
+        ],
+        'forms' => [
+            'mautic.form.type.user' => [
                 'class'     => 'Mautic\UserBundle\Form\Type\UserType',
                 'arguments' => [
                     'translator',
@@ -135,129 +136,129 @@
                     'mautic.helper.language',
                     'mautic.helper.core_parameters',
                 ],
-                'alias'     => 'user'
-            ),
-            'mautic.form.type.role'           => array(
+                'alias' => 'user',
+            ],
+            'mautic.form.type.role' => [
                 'class' => 'Mautic\UserBundle\Form\Type\RoleType',
-                'alias' => 'role'
-            ),
-            'mautic.form.type.permissions'    => array(
+                'alias' => 'role',
+            ],
+            'mautic.form.type.permissions' => [
                 'class' => 'Mautic\UserBundle\Form\Type\PermissionsType',
-                'alias' => 'permissions'
-            ),
-            'mautic.form.type.permissionlist' => array(
+                'alias' => 'permissions',
+            ],
+            'mautic.form.type.permissionlist' => [
                 'class' => 'Mautic\UserBundle\Form\Type\PermissionListType',
-                'alias' => 'permissionlist'
-            ),
-            'mautic.form.type.passwordreset'  => array(
+                'alias' => 'permissionlist',
+            ],
+            'mautic.form.type.passwordreset' => [
                 'class' => 'Mautic\UserBundle\Form\Type\PasswordResetType',
-                'alias' => 'passwordreset'
-            ),
-            'mautic.form.type.passwordresetconfirm'  => array(
+                'alias' => 'passwordreset',
+            ],
+            'mautic.form.type.passwordresetconfirm' => [
                 'class' => 'Mautic\UserBundle\Form\Type\PasswordResetConfirmType',
-                'alias' => 'passwordresetconfirm'
-            ),
-            'mautic.form.type.user_list'      => array(
+                'alias' => 'passwordresetconfirm',
+            ],
+            'mautic.form.type.user_list' => [
                 'class'     => 'Mautic\UserBundle\Form\Type\UserListType',
                 'arguments' => 'mautic.user.model.user',
-                'alias'     => 'user_list'
-            ),
-            'mautic.form.type.role_list'      => array(
+                'alias'     => 'user_list',
+            ],
+            'mautic.form.type.role_list' => [
                 'class'     => 'Mautic\UserBundle\Form\Type\RoleListType',
                 'arguments' => 'mautic.user.model.role',
-                'alias'     => 'role_list'
-            )
-        ),
-        'other'  => array(
+                'alias'     => 'role_list',
+            ],
+        ],
+        'other' => [
             // Authentication
-            'mautic.user.manager'                    => array(
+            'mautic.user.manager' => [
                 'class'     => 'Doctrine\ORM\EntityManager',
                 'arguments' => 'Mautic\UserBundle\Entity\User',
-                'factory'   => array('@doctrine', 'getManagerForClass')
-            ),
-            'mautic.user.repository'                 => array(
+                'factory'   => ['@doctrine', 'getManagerForClass'],
+            ],
+            'mautic.user.repository' => [
                 'class'     => 'Mautic\UserBundle\Entity\UserRepository',
                 'arguments' => 'Mautic\UserBundle\Entity\User',
-                'factory'   => array('@mautic.user.manager', 'getRepository')
-            ),
-            'mautic.permission.manager'              => array(
+                'factory'   => ['@mautic.user.manager', 'getRepository'],
+            ],
+            'mautic.permission.manager' => [
                 'class'     => 'Doctrine\ORM\EntityManager',
                 'arguments' => 'Mautic\UserBundle\Entity\Permission',
-                'factory'   => array('@doctrine', 'getManagerForClass')
-            ),
-            'mautic.permission.repository'           => array(
+                'factory'   => ['@doctrine', 'getManagerForClass'],
+            ],
+            'mautic.permission.repository' => [
                 'class'     => 'Mautic\UserBundle\Entity\PermissionRepository',
                 'arguments' => 'Mautic\UserBundle\Entity\Permission',
-                'factory'   => array('@mautic.permission.manager', 'getRepository')
-            ),
-            'mautic.user.form_authenticator' => array(
-                'class'  => 'Mautic\UserBundle\Security\Authenticator\FormAuthenticator',
-                'arguments' => array(
+                'factory'   => ['@mautic.permission.manager', 'getRepository'],
+            ],
+            'mautic.user.form_authenticator' => [
+                'class'     => 'Mautic\UserBundle\Security\Authenticator\FormAuthenticator',
+                'arguments' => [
                     'mautic.helper.integration',
                     'security.password_encoder',
                     'event_dispatcher',
-                    'request_stack'
-                )
-            ),
-            'mautic.user.preauth_authenticator' => array(
+                    'request_stack',
+                ],
+            ],
+            'mautic.user.preauth_authenticator' => [
                 'class'     => 'Mautic\UserBundle\Security\Authenticator\PreAuthAuthenticator',
-                'arguments' => array(
+                'arguments' => [
                     'mautic.helper.integration',
                     'event_dispatcher',
                     'request_stack',
                     '', // providerKey
-                    '' // User provider
-                ),
-                'public'    => false
-            ),
-            'mautic.user.provider'                   => array(
+                    '', // User provider
+                ],
+                'public' => false,
+            ],
+            'mautic.user.provider' => [
                 'class'     => 'Mautic\UserBundle\Security\Provider\UserProvider',
-                'arguments' => array(
+                'arguments' => [
                     'mautic.user.repository',
                     'mautic.permission.repository',
                     'session',
                     'event_dispatcher',
-                    'security.encoder_factory'
-                )
-            ),
-            'mautic.security.authentication_listener' => array(
-                'class' => 'Mautic\UserBundle\Security\Firewall\AuthenticationListener',
-                'arguments' => array(
+                    'security.encoder_factory',
+                ],
+            ],
+            'mautic.security.authentication_listener' => [
+                'class'     => 'Mautic\UserBundle\Security\Firewall\AuthenticationListener',
+                'arguments' => [
                     'mautic.security.authentication_handler',
                     'security.token_storage',
                     'security.authentication.manager',
                     'monolog.logger',
                     'event_dispatcher',
-                    '' // providerKey
-                ),
-                'public' => false
-            ),
-            'mautic.security.authentication_handler' => array(
+                    '', // providerKey
+                ],
+                'public' => false,
+            ],
+            'mautic.security.authentication_handler' => [
                 'class'     => 'Mautic\UserBundle\Security\Authentication\AuthenticationHandler',
-                'arguments' => array(
+                'arguments' => [
                     'router',
-                    'session'
-                )
-            ),
-            'mautic.security.logout_handler'         => array(
+                    'session',
+                ],
+            ],
+            'mautic.security.logout_handler' => [
                 'class'     => 'Mautic\UserBundle\Security\Authentication\LogoutHandler',
                 'arguments' => [
                     'mautic.user.model.user',
                     'event_dispatcher',
-                    'mautic.helper.user'
-                ]
-            )
-        ),
-        'models' =>  array(
-            'mautic.user.model.role' => array(
-                'class' => 'Mautic\UserBundle\Model\RoleModel'
-            ),
-            'mautic.user.model.user' => array(
-                'class' => 'Mautic\UserBundle\Model\UserModel',
-                'arguments' => array(
-                    'mautic.helper.mailer'
-                )
-            )
-        )
-    )
-);
+                    'mautic.helper.user',
+                ],
+            ],
+        ],
+        'models' => [
+            'mautic.user.model.role' => [
+                'class' => 'Mautic\UserBundle\Model\RoleModel',
+            ],
+            'mautic.user.model.user' => [
+                'class'     => 'Mautic\UserBundle\Model\UserModel',
+                'arguments' => [
+                    'mautic.helper.mailer',
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/bundles/UserBundle/Controller/Api/RoleApiController.php b/app/bundles/UserBundle/Controller/Api/RoleApiController.php
index ede63ce18f7..d3578a8f48d 100644
--- a/app/bundles/UserBundle/Controller/Api/RoleApiController.php
+++ b/app/bundles/UserBundle/Controller/Api/RoleApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,14 @@
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class RoleApiController
+ * Class RoleApiController.
  */
 class RoleApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('user.role');
@@ -29,29 +29,30 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'role';
         $this->entityNameMulti  = 'roles';
         $this->permissionBase   = 'user:roles';
-        $this->serializerGroups = array('roleDetails', 'publishDetails');
+        $this->serializerGroups = ['roleDetails', 'publishDetails'];
     }
 
     /**
-     * Obtains a list of roles
+     * Obtains a list of roles.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function getEntitiesAction ()
+    public function getEntitiesAction()
     {
         return parent::getEntitiesAction();
     }
 
     /**
-     * Obtains a specific role
+     * Obtains a specific role.
      *
      * @param int $id Role ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function getEntityAction ($id)
+    public function getEntityAction($id)
     {
         return parent::getEntityAction($id);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Controller/Api/UserApiController.php b/app/bundles/UserBundle/Controller/Api/UserApiController.php
index 6e286920ce2..9b9f56fcb78 100644
--- a/app/bundles/UserBundle/Controller/Api/UserApiController.php
+++ b/app/bundles/UserBundle/Controller/Api/UserApiController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,15 +17,14 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Class UserApiController
+ * Class UserApiController.
  */
 class UserApiController extends CommonApiController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         parent::initialize($event);
         $this->model            = $this->getModel('user.user');
@@ -32,16 +32,17 @@ public function initialize (FilterControllerEvent $event)
         $this->entityNameOne    = 'user';
         $this->entityNameMulti  = 'users';
         $this->permissionBase   = 'user:users';
-        $this->serializerGroups = array('userDetails', 'roleList', 'publishDetails');
+        $this->serializerGroups = ['userDetails', 'roleList', 'publishDetails'];
     }
 
     /**
-     * Obtains the logged in user's data
+     * Obtains the logged in user's data.
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function getSelfAction ()
+    public function getSelfAction()
     {
         $currentUser = $this->get('security.context')->getToken()->getUser();
         $view        = $this->view($currentUser, Codes::HTTP_OK);
@@ -50,13 +51,13 @@ public function getSelfAction ()
     }
 
     /**
-     * Deletes a user
+     * Deletes a user.
      *
      * @param int $id User ID
      *
      * @return Response
      */
-    public function deleteEntityAction ($id)
+    public function deleteEntityAction($id)
     {
         if (!$this->get('mautic.security')->isGranted('user:users:delete')) {
             return $this->accessDenied();
@@ -66,9 +67,9 @@ public function deleteEntityAction ($id)
     }
 
     /**
-     * Creates a new user
+     * Creates a new user.
      */
-    public function newEntityAction ()
+    public function newEntityAction()
     {
         $entity = $this->model->getEntity();
 
@@ -87,16 +88,16 @@ public function newEntityAction ()
         return $this->processForm($entity, $parameters, 'POST');
     }
 
-
     /**
-     * Edits an existing user or creates a new one on PUT if not found
+     * Edits an existing user or creates a new one on PUT if not found.
      *
      * @param int $id User ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws NotFoundHttpException
      */
-    public function editEntityAction ($id)
+    public function editEntityAction($id)
     {
         $entity     = $this->model->getEntity($id);
         $parameters = $this->request->request->all();
@@ -107,8 +108,8 @@ public function editEntityAction ($id)
         }
 
         if ($entity === null) {
-            if ($method === "PATCH" ||
-                ($method === "PUT" && !$this->get('mautic.security')->isGranted('user:users:create'))
+            if ($method === 'PATCH' ||
+                ($method === 'PUT' && !$this->get('mautic.security')->isGranted('user:users:create'))
             ) {
                 //PATCH requires that an entity exists or must have create access for PUT
                 return $this->notFound();
@@ -125,7 +126,7 @@ public function editEntityAction ($id)
             if (!empty($parameters['plainPassword'])) {
                 unset($parameters['plainPassword']);
             }
-            if ($method == "PATCH") {
+            if ($method == 'PATCH') {
                 //PATCH will accept a diff so just remove the entities
 
                 //Changing username via API is forbidden
@@ -137,7 +138,6 @@ public function editEntityAction ($id)
                 if (!empty($parameters['role'])) {
                     unset($parameters['role']);
                 }
-
             } else {
                 //PUT requires the entire entity so overwrite the username with the original
                 $parameters['username'] = $entity->getUsername();
@@ -149,15 +149,16 @@ public function editEntityAction ($id)
     }
 
     /**
-     * Verifies if a user has permission(s) to a action
+     * Verifies if a user has permission(s) to a action.
      *
      * @param int $id User ID
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
      */
-    public function isGrantedAction ($id)
+    public function isGrantedAction($id)
     {
         $entity = $this->model->getEntity($id);
         if (!$entity instanceof $this->entityClass) {
@@ -169,24 +170,24 @@ public function isGrantedAction ($id)
         if (empty($permissions)) {
             return $this->badRequest('mautic.api.call.permissionempty');
         } elseif (!is_array($permissions)) {
-            $permissions = array($permissions);
+            $permissions = [$permissions];
         }
 
-        $return = $this->get('mautic.security')->isGranted($permissions, "RETURN_ARRAY", $entity);
+        $return = $this->get('mautic.security')->isGranted($permissions, 'RETURN_ARRAY', $entity);
         $view   = $this->view($return, Codes::HTTP_OK);
 
         return $this->handleView($view);
     }
 
     /**
-     * Obtains a list of roles for user edits
+     * Obtains a list of roles for user edits.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function getRolesAction ()
+    public function getRolesAction()
     {
         if (!$this->get('mautic.security')->isGranted(
-            array('user:users:create', 'user:users:edit'),
+            ['user:users:create', 'user:users:edit'],
             'MATCH_ONE'
         )
         ) {
@@ -198,9 +199,9 @@ public function getRolesAction ()
         $roles  = $this->getModel('user')->getLookupResults('role', $filter, $limit);
 
         $view    = $this->view($roles, Codes::HTTP_OK);
-        $context = SerializationContext::create()->setGroups(array('roleList'));
+        $context = SerializationContext::create()->setGroups(['roleList']);
         $view->setSerializationContext($context);
 
         return $this->handleView($view);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Controller/ProfileController.php b/app/bundles/UserBundle/Controller/ProfileController.php
index 44f82f936c9..1b2e3f8eeae 100644
--- a/app/bundles/UserBundle/Controller/ProfileController.php
+++ b/app/bundles/UserBundle/Controller/ProfileController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,13 +13,12 @@
 use Mautic\CoreBundle\Controller\FormController;
 
 /**
- * Class ProfileController
+ * Class ProfileController.
  */
 class ProfileController extends FormController
 {
-
     /**
-     * Generate's account profile
+     * Generate's account profile.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -30,13 +30,13 @@ public function indexAction()
 
         //set some permissions
         $permissions = [
-            'apiAccess'    => ($this->get('mautic.helper.core_parameters')->getParameter('api_enabled')) ?
+            'apiAccess' => ($this->get('mautic.helper.core_parameters')->getParameter('api_enabled')) ?
                 $this->get('mautic.security')->isGranted('api:access:full')
                 : 0,
             'editName'     => $this->get('mautic.security')->isGranted('user:profile:editname'),
             'editUsername' => $this->get('mautic.security')->isGranted('user:profile:editusername'),
             'editPosition' => $this->get('mautic.security')->isGranted('user:profile:editposition'),
-            'editEmail'    => $this->get('mautic.security')->isGranted('user:profile:editemail')
+            'editEmail'    => $this->get('mautic.security')->isGranted('user:profile:editemail'),
         ];
 
         $action = $this->generateUrl('mautic_user_account');
@@ -67,7 +67,7 @@ public function indexAction()
                                 'mapped'     => false,
                                 'disabled'   => true,
                                 'data'       => $me->getFirstName(),
-                                'required'   => false
+                                'required'   => false,
                             ]
                         );
 
@@ -82,7 +82,7 @@ public function indexAction()
                                 'mapped'     => false,
                                 'disabled'   => true,
                                 'data'       => $me->getLastName(),
-                                'required'   => false
+                                'required'   => false,
                             ]
                         );
                         break;
@@ -100,7 +100,7 @@ public function indexAction()
                                 'mapped'     => false,
                                 'disabled'   => true,
                                 'data'       => $me->getUsername(),
-                                'required'   => false
+                                'required'   => false,
                             ]
                         );
                         break;
@@ -117,7 +117,7 @@ public function indexAction()
                                 'mapped'     => false,
                                 'disabled'   => true,
                                 'data'       => $me->getPosition(),
-                                'required'   => false
+                                'required'   => false,
                             ]
                         );
                         break;
@@ -134,7 +134,7 @@ public function indexAction()
                                 'mapped'     => false,
                                 'disabled'   => true,
                                 'data'       => $me->getEmail(),
-                                'required'   => false
+                                'required'   => false,
                             ]
                         );
                         break;
@@ -210,14 +210,14 @@ public function indexAction()
                             'returnUrl'       => $returnUrl,
                             'contentTemplate' => 'MauticUserBundle:Profile:index',
                             'passthroughVars' => [
-                                'mauticContent' => 'user'
+                                'mauticContent' => 'user',
                             ],
-                            'flashes'         => [ //success
+                            'flashes' => [ //success
                                 [
                                     'type' => 'notice',
-                                    'msg'  => 'mautic.user.account.notice.updated'
-                                ]
-                            ]
+                                    'msg'  => 'mautic.user.account.notice.updated',
+                                ],
+                            ],
                         ]
                     );
                 }
@@ -231,7 +231,7 @@ public function indexAction()
             'permissions'       => $permissions,
             'me'                => $me,
             'userForm'          => $form->createView(),
-            'authorizedClients' => $this->forward('MauticApiBundle:Client:authorizedClients')->getContent()
+            'authorizedClients' => $this->forward('MauticApiBundle:Client:authorizedClients')->getContent(),
         ];
 
         return $this->delegateView(
@@ -240,8 +240,8 @@ public function indexAction()
                 'contentTemplate' => 'MauticUserBundle:Profile:index.html.php',
                 'passthroughVars' => [
                     'route'         => $this->generateUrl('mautic_user_account'),
-                    'mauticContent' => 'user'
-                ]
+                    'mauticContent' => 'user',
+                ],
             ]
         );
     }
diff --git a/app/bundles/UserBundle/Controller/PublicController.php b/app/bundles/UserBundle/Controller/PublicController.php
index 611808073ad..bff15a3d7bf 100644
--- a/app/bundles/UserBundle/Controller/PublicController.php
+++ b/app/bundles/UserBundle/Controller/PublicController.php
@@ -1,31 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Controller;
 
-
 use Mautic\CoreBundle\Controller\FormController;
 use Symfony\Component\Form\FormError;
 
 class PublicController extends FormController
 {
     /**
-     * Generates a new password for the user and emails it to them
+     * Generates a new password for the user and emails it to them.
      */
-    public function passwordResetAction ()
+    public function passwordResetAction()
     {
         /** @var \Mautic\UserBundle\Model\UserModel $model */
         $model = $this->getModel('user');
 
-        $data   = array('identifier' => '');
+        $data   = ['identifier' => ''];
         $action = $this->generateUrl('mautic_user_passwordreset');
-        $form   = $this->get('form.factory')->create('passwordreset', $data, array('action' => $action));
+        $form   = $this->get('form.factory')->create('passwordreset', $data, ['action' => $action]);
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -35,26 +35,26 @@ public function passwordResetAction ()
                 $user = $model->getRepository()->findByIdentifier($data['identifier']);
 
                 if ($user == null) {
-                    $form['identifier']->addError(new FormError($this->translator->trans('mautic.user.user.passwordreset.nouserfound', array(), 'validators')));
+                    $form['identifier']->addError(new FormError($this->translator->trans('mautic.user.user.passwordreset.nouserfound', [], 'validators')));
                 } else {
                     $model->sendResetEmail($user);
 
-                    $this->addFlash('mautic.user.user.notice.passwordreset', array(), 'notice', null, false);
+                    $this->addFlash('mautic.user.user.notice.passwordreset', [], 'notice', null, false);
 
                     return $this->redirect($this->generateUrl('login'));
                 }
             }
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
-                'form' => $form->createView()
-            ),
+        return $this->delegateView([
+            'viewParameters' => [
+                'form' => $form->createView(),
+            ],
             'contentTemplate' => 'MauticUserBundle:Security:reset.html.php',
-            'passthroughVars' => array(
-                'route' => $action
-            )
-        ));
+            'passthroughVars' => [
+                'route' => $action,
+            ],
+        ]);
     }
 
     public function passwordResetConfirmAction()
@@ -62,9 +62,9 @@ public function passwordResetConfirmAction()
         /** @var \Mautic\UserBundle\Model\UserModel $model */
         $model = $this->getModel('user');
 
-        $data   = array('identifier' => '', 'password' => '', 'password_confirm' => '');
+        $data   = ['identifier' => '', 'password' => '', 'password_confirm' => ''];
         $action = $this->generateUrl('mautic_user_passwordresetconfirm');
-        $form   = $this->get('form.factory')->create('passwordresetconfirm', array(), array('action' => $action));
+        $form   = $this->get('form.factory')->create('passwordresetconfirm', [], ['action' => $action]);
         $token  = $this->request->query->get('token');
 
         if ($token) {
@@ -80,37 +80,35 @@ public function passwordResetConfirmAction()
                 $user = $model->getRepository()->findByIdentifier($data['identifier']);
 
                 if ($user == null) {
-                    $form['identifier']->addError(new FormError($this->translator->trans('mautic.user.user.passwordreset.nouserfound', array(), 'validators')));
+                    $form['identifier']->addError(new FormError($this->translator->trans('mautic.user.user.passwordreset.nouserfound', [], 'validators')));
                 } else {
-
                     if ($this->request->getSession()->has('resetToken')) {
                         $resetToken = $this->request->getSession()->get('resetToken');
-                        $encoder = $this->get('security.encoder_factory')->getEncoder($user);
+                        $encoder    = $this->get('security.encoder_factory')->getEncoder($user);
 
                         if ($model->confirmResetToken($user, $resetToken)) {
                             $encodedPassword = $model->checkNewPassword($user, $encoder, $data['plainPassword']);
                             $user->setPassword($encodedPassword);
                             $model->saveEntity($user);
 
-                            $this->addFlash('mautic.user.user.notice.passwordreset.success', array(), 'notice', null, false);
+                            $this->addFlash('mautic.user.user.notice.passwordreset.success', [], 'notice', null, false);
 
                             $this->request->getSession()->remove('resetToken');
 
                             return $this->redirect($this->generateUrl('login'));
                         }
 
-                        return $this->delegateView(array(
-                            'viewParameters' => array(
-                                'form' => $form->createView()
-                            ),
+                        return $this->delegateView([
+                            'viewParameters' => [
+                                'form' => $form->createView(),
+                            ],
                             'contentTemplate' => 'MauticUserBundle:Security:resetconfirm.html.php',
-                            'passthroughVars' => array(
-                                'route' => $action
-                            )
-                        ));
-
+                            'passthroughVars' => [
+                                'route' => $action,
+                            ],
+                        ]);
                     } else {
-                        $this->addFlash('mautic.user.user.notice.passwordreset.missingtoken', array(), 'notice', null, false);
+                        $this->addFlash('mautic.user.user.notice.passwordreset.missingtoken', [], 'notice', null, false);
 
                         return $this->redirect($this->generateUrl('mautic_user_passwordresetconfirm'));
                     }
@@ -118,14 +116,14 @@ public function passwordResetConfirmAction()
             }
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
-                'form' => $form->createView()
-            ),
+        return $this->delegateView([
+            'viewParameters' => [
+                'form' => $form->createView(),
+            ],
             'contentTemplate' => 'MauticUserBundle:Security:resetconfirm.html.php',
-            'passthroughVars' => array(
-                'route' => $action
-            )
-        ));
+            'passthroughVars' => [
+                'route' => $action,
+            ],
+        ]);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Controller/RoleController.php b/app/bundles/UserBundle/Controller/RoleController.php
index 7dac280c967..b09dcc852aa 100644
--- a/app/bundles/UserBundle/Controller/RoleController.php
+++ b/app/bundles/UserBundle/Controller/RoleController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,18 +15,18 @@
 use Symfony\Component\HttpKernel\Exception\PreconditionRequiredHttpException;
 
 /**
- * Class RoleController
+ * Class RoleController.
  */
 class RoleController extends FormController
 {
     /**
-     * Generate's default role list view
+     * Generate's default role list view.
      *
      * @param int $page
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function indexAction ($page = 1)
+    public function indexAction($page = 1)
     {
         if (!$this->get('mautic.security')->isGranted('user:roles:view')) {
             return $this->accessDenied();
@@ -46,85 +47,84 @@ public function indexAction ($page = 1)
         $orderByDir = $this->get('session')->get('mautic.role.orderbydir', 'ASC');
         $filter     = $this->request->get('search', $this->get('session')->get('mautic.role.filter', ''));
         $this->get('session')->set('mautic.role.filter', $filter);
-        $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
+        $tmpl  = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
         $model = $this->getModel('user.role');
 
         $items = $model->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
-            )
+                'orderByDir' => $orderByDir,
+            ]
         );
 
-
         $count = count($items);
         if ($count && $count < ($start + 1)) {
             //the number of entities are now less then the current page so redirect to the last page
             $lastPage = ($count === 1) ? 1 : (ceil($count / $limit)) ?: 1;
             $this->get('session')->set('mautic.role.page', $lastPage);
-            $returnUrl = $this->generateUrl('mautic_role_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl('mautic_role_index', ['page' => $lastPage]);
 
-            return $this->postActionRedirect(array(
-                'returnUrl'       => $returnUrl,
-                'viewParameters'  => array(
+            return $this->postActionRedirect([
+                'returnUrl'      => $returnUrl,
+                'viewParameters' => [
                     'page' => $lastPage,
-                    'tmpl' => $tmpl
-                ),
+                    'tmpl' => $tmpl,
+                ],
                 'contentTemplate' => 'MauticUserBundle:Role:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_role_index',
-                    'mauticContent' => 'role'
-                )
-            ));
+                    'mauticContent' => 'role',
+                ],
+            ]);
         }
 
-        $roleIds = array();
+        $roleIds = [];
 
         foreach ($items as $role) {
             $roleIds[] = $role->getId();
         }
 
-        $userCounts = (!empty($roleIds)) ? $model->getRepository()->getUserCount($roleIds) : array();
+        $userCounts = (!empty($roleIds)) ? $model->getRepository()->getUserCount($roleIds) : [];
 
         //set what page currently on so that we can return here after form submission/cancellation
         $this->get('session')->set('mautic.role.page', $page);
 
         //set some permissions
-        $permissions = array(
+        $permissions = [
             'create' => $this->get('mautic.security')->isGranted('user:roles:create'),
             'edit'   => $this->get('mautic.security')->isGranted('user:roles:edit'),
             'delete' => $this->get('mautic.security')->isGranted('user:roles:delete'),
-        );
+        ];
 
-        $parameters = array(
+        $parameters = [
             'items'       => $items,
             'userCounts'  => $userCounts,
             'searchValue' => $filter,
             'page'        => $page,
             'limit'       => $limit,
             'permissions' => $permissions,
-            'tmpl'        => $tmpl
-        );
+            'tmpl'        => $tmpl,
+        ];
 
-        return $this->delegateView(array(
+        return $this->delegateView([
             'viewParameters'  => $parameters,
             'contentTemplate' => 'MauticUserBundle:Role:list.html.php',
-            'passthroughVars' => array(
-                'route'         => $this->generateUrl('mautic_role_index', array('page' => $page)),
-                'mauticContent' => 'role'
-            )
-        ));
+            'passthroughVars' => [
+                'route'         => $this->generateUrl('mautic_role_index', ['page' => $page]),
+                'mauticContent' => 'role',
+            ],
+        ]);
     }
 
     /**
-     * Generate's new role form and processes post data
+     * Generate's new role form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function newAction ()
+    public function newAction()
     {
         if (!$this->get('mautic.security')->isGranted('user:roles:create')) {
             return $this->accessDenied();
@@ -139,11 +139,11 @@ public function newAction ()
 
         //set the page we came from
         $page   = $this->get('session')->get('mautic.role.page', 1);
-        $action = $this->generateUrl('mautic_role_action', array('objectAction' => 'new'));
+        $action = $this->generateUrl('mautic_role_action', ['objectAction' => 'new']);
 
         //get the user form factory
         $permissionsConfig = $this->getPermissionsConfig($entity);
-        $form              = $model->createForm($entity, $this->get('form.factory'), $action, array('permissionsConfig' => $permissionsConfig['config']));
+        $form              = $model->createForm($entity, $this->get('form.factory'), $action, ['permissionsConfig' => $permissionsConfig['config']]);
 
         ///Check for a submitted form and process it
         if ($this->request->getMethod() == 'POST') {
@@ -157,56 +157,56 @@ public function newAction ()
                     //form is valid so process the data
                     $model->saveEntity($entity);
 
-                    $this->addFlash('mautic.core.notice.created', array(
+                    $this->addFlash('mautic.core.notice.created', [
                         '%name%'      => $entity->getName(),
                         '%menu_link%' => 'mautic_role_index',
-                        '%url%'       => $this->generateUrl('mautic_role_action', array(
+                        '%url%'       => $this->generateUrl('mautic_role_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ))
-                    ));
+                            'objectId'     => $entity->getId(),
+                        ]),
+                    ]);
                 }
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-                return $this->postActionRedirect(array(
+                return $this->postActionRedirect([
                     'returnUrl'       => $returnUrl,
-                    'viewParameters'  => array('page' => $page),
+                    'viewParameters'  => ['page' => $page],
                     'contentTemplate' => 'MauticUserBundle:Role:index',
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => '#mautic_role_index',
-                        'mauticContent' => 'role'
-                    )
-                ));
+                        'mauticContent' => 'role',
+                    ],
+                ]);
             } else {
                 return $this->editAction($entity->getId(), true);
             }
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'form'              => $this->setFormTheme($form, 'MauticUserBundle:Role:form.html.php', 'MauticUserBundle:FormTheme\Role'),
-                'permissionsConfig' => $permissionsConfig
-            ),
+                'permissionsConfig' => $permissionsConfig,
+            ],
             'contentTemplate' => 'MauticUserBundle:Role:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'     => '#mautic_role_new',
-                'route'          => $this->generateUrl('mautic_role_action', array('objectAction' => 'new')),
+                'route'          => $this->generateUrl('mautic_role_action', ['objectAction' => 'new']),
                 'mauticContent'  => 'role',
-                'permissionList' => $permissionsConfig['list']
-            )
-        ));
+                'permissionList' => $permissionsConfig['list'],
+            ],
+        ]);
     }
 
     /**
-     * Generate's role edit form and processes post data
+     * Generate's role edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function editAction ($objectId, $ignorePost = true)
+    public function editAction($objectId, $ignorePost = true)
     {
         if (!$this->get('mautic.security')->isGranted('user:roles:edit')) {
             return $this->accessDenied();
@@ -220,30 +220,30 @@ public function editAction ($objectId, $ignorePost = true)
         $page = $this->get('session')->get('mautic.role.page', 1);
 
         //set the return URL
-        $returnUrl = $this->generateUrl('mautic_role_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_role_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticUserBundle:Role:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_role_index',
-                'mauticContent' => 'role'
-            )
-        );
+                'mauticContent' => 'role',
+            ],
+        ];
 
         //user not found
         if ($entity === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
                             'type'    => 'error',
                             'msg'     => 'mautic.user.role.error.notfound',
-                            'msgVars' => array('%id' => $objectId)
-                        )
-                    )
-                ))
+                            'msgVars' => ['%id' => $objectId],
+                        ],
+                    ],
+                ])
             );
         } elseif ($model->isLocked($entity)) {
             //deny access if the entity is locked
@@ -251,8 +251,8 @@ public function editAction ($objectId, $ignorePost = true)
         }
 
         $permissionsConfig = $this->getPermissionsConfig($entity);
-        $action            = $this->generateUrl('mautic_role_action', array('objectAction' => 'edit', 'objectId' => $objectId));
-        $form              = $model->createForm($entity, $this->get('form.factory'), $action, array('permissionsConfig' => $permissionsConfig['config']));
+        $action            = $this->generateUrl('mautic_role_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
+        $form              = $model->createForm($entity, $this->get('form.factory'), $action, ['permissionsConfig' => $permissionsConfig['config']]);
 
         ///Check for a submitted form and process it
         if (!$ignorePost && $this->request->getMethod() == 'POST') {
@@ -266,14 +266,14 @@ public function editAction ($objectId, $ignorePost = true)
                     //form is valid so process the data
                     $model->saveEntity($entity, $form->get('buttons')->get('save')->isClicked());
 
-                    $this->addFlash('mautic.core.notice.updated', array(
+                    $this->addFlash('mautic.core.notice.updated', [
                         '%name%'      => $entity->getName(),
                         '%menu_link%' => 'mautic_role_index',
-                        '%url%'       => $this->generateUrl('mautic_role_action', array(
+                        '%url%'       => $this->generateUrl('mautic_role_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
-                        ))
-                    ));
+                            'objectId'     => $entity->getId(),
+                        ]),
+                    ]);
                 }
             } else {
                 //unlock the entity
@@ -285,26 +285,26 @@ public function editAction ($objectId, $ignorePost = true)
             } else {
                 //the form has to be rebuilt because the permissions were updated
                 $permissionsConfig = $this->getPermissionsConfig($entity);
-                $form              = $model->createForm($entity, $this->get('form.factory'), $action, array('permissionsConfig' => $permissionsConfig['config']));
+                $form              = $model->createForm($entity, $this->get('form.factory'), $action, ['permissionsConfig' => $permissionsConfig['config']]);
             }
         } else {
             //lock the entity
             $model->lockEntity($entity);
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'form'              => $this->setFormTheme($form, 'MauticUserBundle:Role:form.html.php', 'MauticUserBundle:FormTheme\Role'),
-                'permissionsConfig' => $permissionsConfig
-            ),
+                'permissionsConfig' => $permissionsConfig,
+            ],
             'contentTemplate' => 'MauticUserBundle:Role:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'     => '#mautic_role_index',
                 'route'          => $action,
                 'mauticContent'  => 'role',
-                'permissionList' => $permissionsConfig['list']
-            )
-        ));
+                'permissionList' => $permissionsConfig['list'],
+            ],
+        ]);
     }
 
     /**
@@ -312,17 +312,17 @@ public function editAction ($objectId, $ignorePost = true)
      *
      * @return array
      */
-    private function getPermissionsConfig (Entity\Role $role)
+    private function getPermissionsConfig(Entity\Role $role)
     {
         $permissionObjects = $this->get('mautic.security')->getPermissionObjects();
         $translator        = $this->translator;
 
         $permissionsArray = ($role->getId()) ?
             $this->get('doctrine.orm.entity_manager')->getRepository('MauticUserBundle:Permission')->getPermissionsByRole($role, true) :
-            array();
+            [];
 
-        $permissions     = array();
-        $permissionsList = array();
+        $permissions     = [];
+        $permissionsList = [];
         /** @var \Mautic\CoreBundle\Security\Permissions\AbstractPermissions $object */
         foreach ($permissionObjects as $object) {
             if (!is_object($object)) {
@@ -339,12 +339,12 @@ private function getPermissionsConfig (Entity\Role $role)
                 //get the ratio of granted/total
                 list($granted, $total) = $object->getPermissionRatio($data);
 
-                $permissions[$bundle] = array(
+                $permissions[$bundle] = [
                     'label'            => $label,
                     'permissionObject' => $object,
-                    'ratio'            => array($granted, $total),
-                    'data'             => $data
-                );
+                    'ratio'            => [$granted, $total],
+                    'data'             => $data,
+                ];
 
                 $perms = $object->getPermissions();
                 foreach ($perms as $level => $perm) {
@@ -360,36 +360,36 @@ private function getPermissionsConfig (Entity\Role $role)
             return strnatcmp($a['label'], $b['label']);
         });
 
-        return array('config' => $permissions, 'list' => $permissionsList);
+        return ['config' => $permissions, 'list' => $permissionsList];
     }
 
     /**
-     * Delete's a role
+     * Delete's a role.
      *
      * @param int $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteAction ($objectId)
+    public function deleteAction($objectId)
     {
         if (!$this->get('mautic.security')->isGranted('user:roles:delete')) {
             return $this->accessDenied();
         }
 
         $page           = $this->get('session')->get('mautic.role.page', 1);
-        $returnUrl      = $this->generateUrl('mautic_role_index', array('page' => $page));
+        $returnUrl      = $this->generateUrl('mautic_role_index', ['page' => $page]);
         $success        = 0;
-        $flashes        = array();
-        $postActionVars = array(
+        $flashes        = [];
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticUserBundle:Role:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_role_index',
                 'success'       => $success,
-                'mauticContent' => 'role'
-            )
-        );
+                'mauticContent' => 'role',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
             try {
@@ -397,66 +397,66 @@ public function deleteAction ($objectId)
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.user.role.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif ($model->isLocked($entity)) {
                     return $this->isLocked($postActionVars, $entity, 'user.role');
                 } else {
                     $model->deleteEntity($entity);
                     $name      = $entity->getName();
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'notice',
                         'msg'     => 'mautic.core.notice.deleted',
-                        'msgVars' => array(
+                        'msgVars' => [
                             '%name%' => $name,
-                            '%id%'   => $objectId
-                        )
-                    );
+                            '%id%'   => $objectId,
+                        ],
+                    ];
                 }
             } catch (PreconditionRequiredHttpException $e) {
-                $flashes[] = array(
+                $flashes[] = [
                     'type' => 'error',
-                    'msg'  => $e->getMessage()
-                );
+                    'msg'  => $e->getMessage(),
+                ];
             }
-
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function batchDeleteAction() {
-        $page        = $this->get('session')->get('mautic.role.page', 1);
-        $returnUrl   = $this->generateUrl('mautic_role_index', array('page' => $page));
-        $flashes     = array();
+    public function batchDeleteAction()
+    {
+        $page      = $this->get('session')->get('mautic.role.page', 1);
+        $returnUrl = $this->generateUrl('mautic_role_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticUserBundle:Role:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_role_index',
-                'mauticContent' => 'role'
-            )
-        );
+                'mauticContent' => 'role',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
-            $model     = $this->getModel('user.role');
-            $ids       = json_decode($this->request->query->get('ids', ''));
-            $deleteIds = array();
-            $currentUser    = $this->user;
+            $model       = $this->getModel('user.role');
+            $ids         = json_decode($this->request->query->get('ids', ''));
+            $deleteIds   = [];
+            $currentUser = $this->user;
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
@@ -464,18 +464,18 @@ public function batchDeleteAction() {
                 $users  = $this->get('doctrine.orm.entity_manager')->getRepository('MauticUserBundle:User')->findByRole($entity);
 
                 if ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.user.role.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (count($users)) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.user.role.error.deletenotallowed',
-                        'msgVars' => array('%name%' => $entity->getName())
-                    );
-                } elseif(!$this->get('mautic.security')->isGranted('user:roles:delete')) {
+                        'msgVars' => ['%name%' => $entity->getName()],
+                    ];
+                } elseif (!$this->get('mautic.security')->isGranted('user:roles:delete')) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
                     $flashes[] = $this->isLocked($postActionVars, $entity, 'user.role', true);
@@ -488,20 +488,20 @@ public function batchDeleteAction() {
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
-                    'type' => 'notice',
-                    'msg'  => 'mautic.user.role.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.user.role.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 }
diff --git a/app/bundles/UserBundle/Controller/SecurityController.php b/app/bundles/UserBundle/Controller/SecurityController.php
index 3c71c50b568..417d040c9d4 100644
--- a/app/bundles/UserBundle/Controller/SecurityController.php
+++ b/app/bundles/UserBundle/Controller/SecurityController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,22 +12,20 @@
 
 use Mautic\CoreBundle\Controller\CommonController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\Security\Core\Exception as Exception;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\SecurityContext;
-use Symfony\Component\Security\Core\Exception as Exception;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
- * Class DefaultController
+ * Class DefaultController.
  */
 class SecurityController extends CommonController
 {
-
     /**
      * {@inheritdoc}
      */
-    public function initialize (FilterControllerEvent $event)
+    public function initialize(FilterControllerEvent $event)
     {
         /** @var \Symfony\Component\Security\Core\Authorization\AuthorizationChecker $authChecker */
         $authChecker = $this->get('security.authorization_checker');
@@ -35,7 +34,6 @@ public function initialize (FilterControllerEvent $event)
         if ($authChecker->isGranted('IS_AUTHENTICATED_FULLY') ||
             $authChecker->isGranted('IS_AUTHENTICATED_REMEMBERED')
         ) {
-
             $redirectUrl = $this->generateUrl('mautic_dashboard_index');
             $event->setController(function () use ($redirectUrl) {
                 return new RedirectResponse($redirectUrl);
@@ -44,11 +42,11 @@ public function initialize (FilterControllerEvent $event)
     }
 
     /**
-     * Generates login form and processes login
+     * Generates login form and processes login.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
-    public function loginAction ()
+    public function loginAction()
     {
         // A way to keep the upgrade from failing if the session is lost after
         // the cache is cleared by upgrade.php
@@ -57,17 +55,18 @@ public function loginAction ()
             if ($step == 'clearCache') {
                 // Run migrations
                 $this->request->query->set('finalize', 1);
+
                 return $this->forward('MauticCoreBundle:Ajax:updateDatabaseMigration',
-                    array(
-                        'request'  => $this->request
-                    )
+                    [
+                        'request' => $this->request,
+                    ]
                 );
             } elseif ($step == 'schemaMigration') {
                 // Done so finalize
                 return $this->forward('MauticCoreBundle:Ajax:updateFinalization',
-                    array(
-                        'request'  => $this->request
-                    )
+                    [
+                        'request' => $this->request,
+                    ]
                 );
             }
 
@@ -95,39 +94,38 @@ public function loginAction ()
                 $msg = $error->getMessage();
             }
 
-            $this->addFlash($msg, array(), 'error', null, false);
+            $this->addFlash($msg, [], 'error', null, false);
         }
         $this->request->query->set('tmpl', 'login');
 
         // Get a list of SSO integrations
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
         $integrationHelper = $this->factory->getHelper('integration');
-        $integrations = $integrationHelper->getIntegrationObjects(null, array('sso_service'), true, null, true);
+        $integrations      = $integrationHelper->getIntegrationObjects(null, ['sso_service'], true, null, true);
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'last_username' => $session->get(Security::LAST_USERNAME),
-                'integrations'  => $integrations
-            ),
+                'integrations'  => $integrations,
+            ],
             'contentTemplate' => 'MauticUserBundle:Security:login.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'route'          => $this->generateUrl('login'),
                 'mauticContent'  => 'user',
-                'sessionExpired' => true
-            )
-        ));
+                'sessionExpired' => true,
+            ],
+        ]);
     }
 
     /**
-     * Do nothing
+     * Do nothing.
      */
     public function loginCheckAction()
     {
-
     }
 
     /**
-     * The plugin should be handling this in it's listener
+     * The plugin should be handling this in it's listener.
      *
      * @param $integration
      *
@@ -135,12 +133,11 @@ public function loginCheckAction()
      */
     public function ssoLoginAction($integration)
     {
-
         return new RedirectResponse($this->generateUrl('login'));
     }
 
     /**
-     * The plugin should be handling this in it's listener
+     * The plugin should be handling this in it's listener.
      *
      * @param $integration
      *
diff --git a/app/bundles/UserBundle/Controller/UserController.php b/app/bundles/UserBundle/Controller/UserController.php
index bfe6c29355b..b45ffaa8f16 100644
--- a/app/bundles/UserBundle/Controller/UserController.php
+++ b/app/bundles/UserBundle/Controller/UserController.php
@@ -1,27 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Controller;
 
-use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\CoreBundle\Controller\FormController;
+use Mautic\CoreBundle\Helper\InputHelper;
 use Mautic\UserBundle\Form\Type as FormType;
-use Symfony\Component\Form\FormError;
 
 /**
- * Class UserController
+ * Class UserController.
  */
 class UserController extends FormController
 {
-
     /**
-     * Generate's default user list
+     * Generate's default user list.
      *
      * @param int $page
      *
@@ -51,17 +50,17 @@ public function indexAction($page = 1)
         $this->get('session')->set('mautic.user.filter', $search);
 
         //do some default filtering
-        $filter = array('string' => $search, 'force' => '');
+        $filter = ['string' => $search, 'force' => ''];
 
         $tmpl  = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
         $users = $this->getModel('user.user')->getEntities(
-            array(
+            [
                 'start'      => $start,
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
-            ));
+                'orderByDir' => $orderByDir,
+            ]);
 
         //Check to see if the number of pages match the number of users
         $count = count($users);
@@ -69,53 +68,53 @@ public function indexAction($page = 1)
             //the number of entities are now less then the current page so redirect to the last page
             $lastPage = ($count === 1) ? 1 : (ceil($count / $limit)) ?: 1;
             $this->get('session')->set('mautic.user.page', $lastPage);
-            $returnUrl = $this->generateUrl('mautic_user_index', array('page' => $lastPage));
+            $returnUrl = $this->generateUrl('mautic_user_index', ['page' => $lastPage]);
 
-            return $this->postActionRedirect(array(
-                'returnUrl'       => $returnUrl,
-                'viewParameters'  => array(
+            return $this->postActionRedirect([
+                'returnUrl'      => $returnUrl,
+                'viewParameters' => [
                     'page' => $lastPage,
-                    'tmpl' => $tmpl
-                ),
+                    'tmpl' => $tmpl,
+                ],
                 'contentTemplate' => 'MauticUserBundle:User:index',
-                'passthroughVars' => array(
+                'passthroughVars' => [
                     'activeLink'    => '#mautic_user_index',
-                    'mauticContent' => 'user'
-                )
-            ));
+                    'mauticContent' => 'user',
+                ],
+            ]);
         }
 
         //set what page currently on so that we can return here after form submission/cancellation
         $this->get('session')->set('mautic.user.page', $page);
 
         //set some permissions
-        $permissions = array(
+        $permissions = [
             'create' => $this->get('mautic.security')->isGranted('user:users:create'),
             'edit'   => $this->get('mautic.security')->isGranted('user:users:editother'),
             'delete' => $this->get('mautic.security')->isGranted('user:users:deleteother'),
-        );
+        ];
 
-        $parameters = array(
+        $parameters = [
             'items'       => $users,
             'searchValue' => $search,
             'page'        => $page,
             'limit'       => $limit,
             'permissions' => $permissions,
-            'tmpl'        => $tmpl
-        );
+            'tmpl'        => $tmpl,
+        ];
 
-        return $this->delegateView(array(
+        return $this->delegateView([
             'viewParameters'  => $parameters,
             'contentTemplate' => 'MauticUserBundle:User:list.html.php',
-            'passthroughVars' => array(
-                'route'          => $this->generateUrl('mautic_user_index', array('page' => $page)),
-                'mauticContent'  => 'user'
-            )
-        ));
+            'passthroughVars' => [
+                'route'         => $this->generateUrl('mautic_user_index', ['page' => $page]),
+                'mauticContent' => 'user',
+            ],
+        ]);
     }
 
     /**
-     * Generate's form and processes new post data
+     * Generate's form and processes new post data.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -138,7 +137,7 @@ public function newAction()
         $page = $this->get('session')->get('mautic.user.page', 1);
 
         //get the user form factory
-        $action = $this->generateUrl('mautic_user_action', array('objectAction' => 'new'));
+        $action = $this->generateUrl('mautic_user_action', ['objectAction' => 'new']);
         $form   = $model->createForm($user, $this->get('form.factory'), $action);
 
         //Check for a submitted form and process it
@@ -146,9 +145,9 @@ public function newAction()
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
                 //check to see if the password needs to be rehashed
-                $submittedPassword  = $this->request->request->get('user[plainPassword][password]', null, true);
-                $encoder            = $this->get('security.encoder_factory')->getEncoder($user);
-                $password           = $model->checkNewPassword($user, $encoder, $submittedPassword);
+                $submittedPassword = $this->request->request->get('user[plainPassword][password]', null, true);
+                $encoder           = $this->get('security.encoder_factory')->getEncoder($user);
+                $password          = $model->checkNewPassword($user, $encoder, $submittedPassword);
 
                 if ($valid = $this->isFormValid($form)) {
                     //form is valid so process the data
@@ -168,8 +167,8 @@ public function newAction()
                         if ($fetchLanguage['error']) {
                             $user->setLocale(null);
                             $model->saveEntity($user);
-                            $message = 'mautic.core.could.not.set.language';
-                            $messageVars = array();
+                            $message     = 'mautic.core.could.not.set.language';
+                            $messageVars = [];
 
                             if (isset($fetchLanguage['message'])) {
                                 $message = $fetchLanguage['message'];
@@ -183,45 +182,45 @@ public function newAction()
                         }
                     }
 
-                    $this->addFlash('mautic.core.notice.created',  array(
+                    $this->addFlash('mautic.core.notice.created',  [
                         '%name%'      => $user->getName(),
                         '%menu_link%' => 'mautic_user_index',
-                        '%url%'       => $this->generateUrl('mautic_user_action', array(
+                        '%url%'       => $this->generateUrl('mautic_user_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $user->getId()
-                        ))
-                    ));
+                            'objectId'     => $user->getId(),
+                        ]),
+                    ]);
                 }
             }
 
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
-                return $this->postActionRedirect(array(
+                return $this->postActionRedirect([
                     'returnUrl'       => $returnUrl,
-                    'viewParameters'  => array('page' => $page),
+                    'viewParameters'  => ['page' => $page],
                     'contentTemplate' => 'MauticUserBundle:User:index',
-                    'passthroughVars' => array(
+                    'passthroughVars' => [
                         'activeLink'    => '#mautic_user_index',
-                        'mauticContent' => 'user'
-                    )
-                ));
+                        'mauticContent' => 'user',
+                    ],
+                ]);
             } elseif ($valid && !$cancelled) {
                 return $this->editAction($user->getId(), true);
             }
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array('form' => $form->createView()),
+        return $this->delegateView([
+            'viewParameters'  => ['form' => $form->createView()],
             'contentTemplate' => 'MauticUserBundle:User:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_user_new',
                 'route'         => $action,
-                'mauticContent' => 'user'
-            )
-        ));
+                'mauticContent' => 'user',
+            ],
+        ]);
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -240,37 +239,37 @@ public function editAction($objectId, $ignorePost = false)
         $page = $this->get('session')->get('mautic.user.page', 1);
 
         //set the return URL
-        $returnUrl = $this->generateUrl('mautic_user_index', array('page' => $page));
+        $returnUrl = $this->generateUrl('mautic_user_index', ['page' => $page]);
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticUserBundle:User:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_user_index',
-                'mauticContent' => 'user'
-            )
-        );
+                'mauticContent' => 'user',
+            ],
+        ];
 
         //user not found
         if ($user === null) {
             return $this->postActionRedirect(
-                array_merge($postActionVars, array(
-                    'flashes' => array(
-                        array(
+                array_merge($postActionVars, [
+                    'flashes' => [
+                        [
                             'type'    => 'error',
                             'msg'     => 'mautic.user.user.error.notfound',
-                            'msgVars' => array('%id%' => $objectId)
-                        )
-                    )
-                ))
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
+                ])
             );
         } elseif ($model->isLocked($user)) {
             //deny access if the entity is locked
             return $this->isLocked($postActionVars, $user, 'user.user');
         }
 
-        $action = $this->generateUrl('mautic_user_action', array('objectAction' => 'edit', 'objectId' => $objectId));
+        $action = $this->generateUrl('mautic_user_action', ['objectAction' => 'edit', 'objectId' => $objectId]);
         $form   = $model->createForm($user, $this->get('form.factory'), $action);
 
         ///Check for a submitted form and process it
@@ -278,9 +277,9 @@ public function editAction($objectId, $ignorePost = false)
             $valid = false;
             if (!$cancelled = $this->isFormCancelled($form)) {
                 //check to see if the password needs to be rehashed
-                $submittedPassword  = $this->request->request->get('user[plainPassword][password]', null, true);
-                $encoder            = $this->get('security.encoder_factory')->getEncoder($user);
-                $password           = $model->checkNewPassword($user, $encoder, $submittedPassword);
+                $submittedPassword = $this->request->request->get('user[plainPassword][password]', null, true);
+                $encoder           = $this->get('security.encoder_factory')->getEncoder($user);
+                $password          = $model->checkNewPassword($user, $encoder, $submittedPassword);
 
                 if ($valid = $this->isFormValid($form)) {
                     //form is valid so process the data
@@ -300,8 +299,8 @@ public function editAction($objectId, $ignorePost = false)
                         if ($fetchLanguage['error']) {
                             $user->setLocale(null);
                             $model->saveEntity($user);
-                            $message = 'mautic.core.could.not.set.language';
-                            $messageVars = array();
+                            $message     = 'mautic.core.could.not.set.language';
+                            $messageVars = [];
 
                             if (isset($fetchLanguage['message'])) {
                                 $message = $fetchLanguage['message'];
@@ -315,14 +314,14 @@ public function editAction($objectId, $ignorePost = false)
                         }
                     }
 
-                    $this->addFlash('mautic.core.notice.updated',  array(
+                    $this->addFlash('mautic.core.notice.updated',  [
                         '%name%'      => $user->getName(),
                         '%menu_link%' => 'mautic_user_index',
-                        '%url%'       => $this->generateUrl('mautic_user_action', array(
+                        '%url%'       => $this->generateUrl('mautic_user_action', [
                             'objectAction' => 'edit',
-                            'objectId'     => $user->getId()
-                        ))
-                    ));
+                            'objectId'     => $user->getId(),
+                        ]),
+                    ]);
                 }
             } else {
                 //unlock the entity
@@ -337,88 +336,89 @@ public function editAction($objectId, $ignorePost = false)
             $model->lockEntity($user);
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array('form' => $form->createView()),
+        return $this->delegateView([
+            'viewParameters'  => ['form' => $form->createView()],
             'contentTemplate' => 'MauticUserBundle:User:form.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_user_index',
                 'route'         => $action,
-                'mauticContent' => 'user'
-            )
-        ));
+                'mauticContent' => 'user',
+            ],
+        ]);
     }
 
     /**
-     * Deletes a user object
+     * Deletes a user object.
      *
      * @param int $objectId
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteAction($objectId) {
+    public function deleteAction($objectId)
+    {
         if (!$this->get('mautic.security')->isGranted('user:users:delete')) {
             return $this->accessDenied();
         }
 
         $currentUser    = $this->user;
         $page           = $this->get('session')->get('mautic.user.page', 1);
-        $returnUrl      = $this->generateUrl('mautic_user_index', array('page' => $page));
+        $returnUrl      = $this->generateUrl('mautic_user_index', ['page' => $page]);
         $success        = 0;
-        $flashes        = array();
-        $postActionVars = array(
+        $flashes        = [];
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticUserBundle:User:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_user_index',
                 'route'         => $returnUrl,
                 'success'       => $success,
-                'mauticContent' => 'user'
-            )
-        );
+                'mauticContent' => 'user',
+            ],
+        ];
         if ($this->request->getMethod() == 'POST') {
             //ensure the user logged in is not getting deleted
             if ((int) $currentUser->getId() !== (int) $objectId) {
-                $model = $this->getModel('user.user');
+                $model  = $this->getModel('user.user');
                 $entity = $model->getEntity($objectId);
 
                 if ($entity === null) {
-                    $flashes[] = array(
-                        'type' => 'error',
-                        'msg'  => 'mautic.user.user.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                    $flashes[] = [
+                        'type'    => 'error',
+                        'msg'     => 'mautic.user.user.error.notfound',
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif ($model->isLocked($entity)) {
                     return $this->isLocked($postActionVars, $entity, 'user.user');
                 } else {
                     $model->deleteEntity($entity);
-                    $name = $entity->getName();
-                    $flashes[] = array(
-                        'type' => 'notice',
-                        'msg'  => 'mautic.core.notice.deleted',
-                        'msgVars' => array(
+                    $name      = $entity->getName();
+                    $flashes[] = [
+                        'type'    => 'notice',
+                        'msg'     => 'mautic.core.notice.deleted',
+                        'msgVars' => [
                             '%name%' => $name,
-                            '%id%'   => $objectId
-                        )
-                    );
+                            '%id%'   => $objectId,
+                        ],
+                    ];
                 }
             } else {
-                $flashes[] = array(
+                $flashes[] = [
                     'type' => 'error',
-                    'msg'  => 'mautic.user.user.error.cannotdeleteself'
-                );
+                    'msg'  => 'mautic.user.user.error.cannotdeleteself',
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 
     /**
-     * Contacts a user
+     * Contacts a user.
      *
      * @param int $objectId
      *
@@ -426,26 +426,26 @@ public function deleteAction($objectId) {
      */
     public function contactAction($objectId)
     {
-        $model   = $this->getModel('user.user');
-        $user    = $model->getEntity($objectId);
+        $model = $this->getModel('user.user');
+        $user  = $model->getEntity($objectId);
 
         //user not found
         if ($user === null) {
-            return $this->postActionRedirect(array(
+            return $this->postActionRedirect([
                 'returnUrl'       => $this->generateUrl('mautic_dashboard_index'),
                 'contentTemplate' => 'MauticUserBundle:User:contact',
-                'flashes'         => array(
-                    array(
+                'flashes'         => [
+                    [
                         'type'    => 'error',
                         'msg'     => 'mautic.user.user.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    )
-                )
-            ));
+                        'msgVars' => ['%id%' => $objectId],
+                    ],
+                ],
+            ]);
         }
 
-        $action = $this->generateUrl('mautic_user_action', array('objectAction' => 'contact', 'objectId' => $objectId));
-        $form   = $this->createForm(new FormType\ContactType(), array(), array('action' => $action));
+        $action = $this->generateUrl('mautic_user_action', ['objectAction' => 'contact', 'objectId' => $objectId]);
+        $form   = $this->createForm(new FormType\ContactType(), [], ['action' => $action]);
 
         $currentUser = $this->user;
 
@@ -466,7 +466,7 @@ public function contactAction($objectId)
 
                     $reEntity = $form->get('entity')->getData();
                     if (empty($reEntity)) {
-                        $bundle   = $object = 'user';
+                        $bundle   = $object   = 'user';
                         $entityId = $user->getId();
                     } else {
                         $bundle = $object = $reEntity;
@@ -477,24 +477,24 @@ public function contactAction($objectId)
                     }
 
                     $serializer = $this->get('jms_serializer');
-                    $details    = $serializer->serialize(array(
+                    $details    = $serializer->serialize([
                         'from'    => $currentUser->getName(),
                         'to'      => $user->getName(),
                         'subject' => $subject,
-                        'message' => $body
-                    ), 'json');
+                        'message' => $body,
+                    ], 'json');
 
-                    $log = array(
+                    $log = [
                         'bundle'    => $bundle,
                         'object'    => $object,
                         'objectId'  => $entityId,
                         'action'    => 'communication',
                         'details'   => $details,
-                        'ipAddress' => $this->factory->getIpAddressFromRequest()
-                    );
+                        'ipAddress' => $this->factory->getIpAddressFromRequest(),
+                    ];
                     $this->getModel('core.auditLog')->writeToLog($log);
 
-                    $this->addFlash('mautic.user.user.notice.messagesent', array('%name%' => $user->getName()));
+                    $this->addFlash('mautic.user.user.notice.messagesent', ['%name%' => $user->getName()]);
                 }
             }
             if ($cancelled || $valid) {
@@ -521,60 +521,61 @@ public function contactAction($objectId)
             }
         }
 
-        return $this->delegateView(array(
-            'viewParameters'  => array(
+        return $this->delegateView([
+            'viewParameters' => [
                 'form' => $form->createView(),
-                'user' => $user
-            ),
+                'user' => $user,
+            ],
             'contentTemplate' => 'MauticUserBundle:User:contact.html.php',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'route'         => $action,
-                'mauticContent' => 'user'
-            )
-        ));
+                'mauticContent' => 'user',
+            ],
+        ]);
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function batchDeleteAction() {
-        $page        = $this->get('session')->get('mautic.user.page', 1);
-        $returnUrl   = $this->generateUrl('mautic_user_index', array('page' => $page));
-        $flashes     = array();
+    public function batchDeleteAction()
+    {
+        $page      = $this->get('session')->get('mautic.user.page', 1);
+        $returnUrl = $this->generateUrl('mautic_user_index', ['page' => $page]);
+        $flashes   = [];
 
-        $postActionVars = array(
+        $postActionVars = [
             'returnUrl'       => $returnUrl,
-            'viewParameters'  => array('page' => $page),
+            'viewParameters'  => ['page' => $page],
             'contentTemplate' => 'MauticUserBundle:User:index',
-            'passthroughVars' => array(
+            'passthroughVars' => [
                 'activeLink'    => '#mautic_user_index',
-                'mauticContent' => 'user'
-            )
-        );
+                'mauticContent' => 'user',
+            ],
+        ];
 
         if ($this->request->getMethod() == 'POST') {
-            $model     = $this->getModel('user');
-            $ids       = json_decode($this->request->query->get('ids', ''));
-            $deleteIds = array();
-            $currentUser    = $this->user;
+            $model       = $this->getModel('user');
+            $ids         = json_decode($this->request->query->get('ids', ''));
+            $deleteIds   = [];
+            $currentUser = $this->user;
 
             // Loop over the IDs to perform access checks pre-delete
             foreach ($ids as $objectId) {
                 $entity = $model->getEntity($objectId);
 
-                if ((int)$currentUser->getId() === (int)$objectId) {
-                    $flashes[] = array(
+                if ((int) $currentUser->getId() === (int) $objectId) {
+                    $flashes[] = [
                         'type' => 'error',
-                        'msg'  => 'mautic.user.user.error.cannotdeleteself'
-                    );
+                        'msg'  => 'mautic.user.user.error.cannotdeleteself',
+                    ];
                 } elseif ($entity === null) {
-                    $flashes[] = array(
+                    $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.user.user.error.notfound',
-                        'msgVars' => array('%id%' => $objectId)
-                    );
+                        'msgVars' => ['%id%' => $objectId],
+                    ];
                 } elseif (!$this->get('mautic.security')->isGranted('user:users:delete')) {
                     $flashes[] = $this->accessDenied(true);
                 } elseif ($model->isLocked($entity)) {
@@ -588,20 +589,20 @@ public function batchDeleteAction() {
             if (!empty($deleteIds)) {
                 $entities = $model->deleteEntities($deleteIds);
 
-                $flashes[] = array(
-                    'type' => 'notice',
-                    'msg'  => 'mautic.user.user.notice.batch_deleted',
-                    'msgVars' => array(
-                        '%count%' => count($entities)
-                    )
-                );
+                $flashes[] = [
+                    'type'    => 'notice',
+                    'msg'     => 'mautic.user.user.notice.batch_deleted',
+                    'msgVars' => [
+                        '%count%' => count($entities),
+                    ],
+                ];
             }
         } //else don't do anything
 
         return $this->postActionRedirect(
-            array_merge($postActionVars, array(
-                'flashes' => $flashes
-            ))
+            array_merge($postActionVars, [
+                'flashes' => $flashes,
+            ])
         );
     }
 }
diff --git a/app/bundles/UserBundle/DataFixtures/ORM/LoadRoleData.php b/app/bundles/UserBundle/DataFixtures/ORM/LoadRoleData.php
index 519c93e76d3..b3e7d110499 100644
--- a/app/bundles/UserBundle/DataFixtures/ORM/LoadRoleData.php
+++ b/app/bundles/UserBundle/DataFixtures/ORM/LoadRoleData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,16 +13,15 @@
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
+use Mautic\UserBundle\Entity\Role;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Mautic\UserBundle\Entity\Role;
 
 /**
- * Class LoadRoleData
+ * Class LoadRoleData.
  */
 class LoadRoleData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
@@ -54,10 +54,10 @@ public function load(ObjectManager $manager)
         $role->setDescription('Has access to sales');
         $role->setIsAdmin(0);
 
-        $permissions = array(
-            'user:profile' => array('editname'),
-            'lead:leads'   => array('full')
-        );
+        $permissions = [
+            'user:profile' => ['editname'],
+            'lead:leads'   => ['full'],
+        ];
         $this->container->get('mautic.factory')->getModel('user.role')->setRolePermissions($role, $permissions);
 
         $manager->persist($role);
diff --git a/app/bundles/UserBundle/DataFixtures/ORM/LoadUserData.php b/app/bundles/UserBundle/DataFixtures/ORM/LoadUserData.php
index 3c7e2fc9aef..ac5c5b5ebf9 100644
--- a/app/bundles/UserBundle/DataFixtures/ORM/LoadUserData.php
+++ b/app/bundles/UserBundle/DataFixtures/ORM/LoadUserData.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,16 +13,15 @@
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
+use Mautic\UserBundle\Entity\User;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Mautic\UserBundle\Entity\User;
 
 /**
- * Class LoadUserData
+ * Class LoadUserData.
  */
 class LoadUserData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     /**
      * @var ContainerInterface
      */
diff --git a/app/bundles/UserBundle/DependencyInjection/Firewall/Factory/PluginFactory.php b/app/bundles/UserBundle/DependencyInjection/Firewall/Factory/PluginFactory.php
index 9fe834a0db9..bd1e43bba4d 100644
--- a/app/bundles/UserBundle/DependencyInjection/Firewall/Factory/PluginFactory.php
+++ b/app/bundles/UserBundle/DependencyInjection/Firewall/Factory/PluginFactory.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\DependencyInjection\Firewall\Factory;
 
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
+use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
+use Symfony\Component\DependencyInjection\Reference;
 
 class PluginFactory implements SecurityFactoryInterface
 {
@@ -33,12 +34,11 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
             ->replaceArgument(3, new Reference($userProvider))
             ->replaceArgument(4, $id);
 
-
         $listenerId = 'security.authentication.listener.mautic.'.$id;
         $container->setDefinition($listenerId, new DefinitionDecorator('mautic.security.authentication_listener'))
             ->replaceArgument(5, $id);
 
-        return array($providerId, $listenerId, $defaultEntryPoint);
+        return [$providerId, $listenerId, $defaultEntryPoint];
     }
 
     /**
@@ -63,4 +63,4 @@ public function getKey()
     public function addConfiguration(NodeDefinition $node)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Entity/Permission.php b/app/bundles/UserBundle/Entity/Permission.php
index b9c2c83324b..584b685ca64 100644
--- a/app/bundles/UserBundle/Entity/Permission.php
+++ b/app/bundles/UserBundle/Entity/Permission.php
@@ -1,26 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class Permission
- *
- * @package Mautic\UserBundle\Entity
+ * Class Permission.
  */
 class Permission
 {
-
     /**
      * @var int
      */
@@ -49,13 +46,13 @@ class Permission
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
         $builder->setTable('permissions')
             ->setCustomRepositoryClass('Mautic\UserBundle\Entity\PermissionRepository')
-            ->addUniqueConstraint(array('bundle', 'name', 'role_id'), 'unique_perm');
+            ->addUniqueConstraint(['bundle', 'name', 'role_id'], 'unique_perm');
 
         $builder->addId();
 
@@ -76,23 +73,23 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set bundle
+     * Set bundle.
      *
      * @param string $bundle
      *
      * @return Permission
      */
-    public function setBundle ($bundle)
+    public function setBundle($bundle)
     {
         $this->bundle = $bundle;
 
@@ -100,23 +97,23 @@ public function setBundle ($bundle)
     }
 
     /**
-     * Get bundle
+     * Get bundle.
      *
      * @return string
      */
-    public function getBundle ()
+    public function getBundle()
     {
         return $this->bundle;
     }
 
     /**
-     * Set bitwise
+     * Set bitwise.
      *
-     * @param integer $bitwise
+     * @param int $bitwise
      *
      * @return Permission
      */
-    public function setBitwise ($bitwise)
+    public function setBitwise($bitwise)
     {
         $this->bitwise = $bitwise;
 
@@ -124,23 +121,23 @@ public function setBitwise ($bitwise)
     }
 
     /**
-     * Get bitwise
+     * Get bitwise.
      *
-     * @return integer
+     * @return int
      */
-    public function getBitwise ()
+    public function getBitwise()
     {
         return $this->bitwise;
     }
 
     /**
-     * Set role
+     * Set role.
      *
      * @param Role $role
      *
      * @return Permission
      */
-    public function setRole (Role $role = null)
+    public function setRole(Role $role = null)
     {
         $this->role = $role;
 
@@ -148,23 +145,23 @@ public function setRole (Role $role = null)
     }
 
     /**
-     * Get role
+     * Get role.
      *
      * @return Role
      */
-    public function getRole ()
+    public function getRole()
     {
         return $this->role;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Permission
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->name = $name;
 
@@ -172,12 +169,12 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Entity/PermissionRepository.php b/app/bundles/UserBundle/Entity/PermissionRepository.php
index 404211ac1fa..d0c759c4f80 100644
--- a/app/bundles/UserBundle/Entity/PermissionRepository.php
+++ b/app/bundles/UserBundle/Entity/PermissionRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,17 +14,17 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * PermissionRepository
+ * PermissionRepository.
  */
 class PermissionRepository extends CommonRepository
 {
-
     /**
-     * Delete all permissions for a specific role
+     * Delete all permissions for a specific role.
      *
      * @param Role $role
      */
-    public function purgeRolePermissions(Role $role) {
+    public function purgeRolePermissions(Role $role)
+    {
         $query = $this
             ->createQueryBuilder('p')
             ->delete('MauticUserBundle:Permission', 'p')
@@ -34,14 +35,15 @@ public function purgeRolePermissions(Role $role) {
     }
 
     /**
-     * Retrieves array of permissions for a set role.  If $forForm, then the array will contain
+     * Retrieves array of permissions for a set role.  If $forForm, then the array will contain.
      *
      * @param Role $role
      * @param bool $forForm
      *
      * @return array
      */
-    public function getPermissionsByRole(Role $role, $forForm = false) {
+    public function getPermissionsByRole(Role $role, $forForm = false)
+    {
         $results = $this
             ->createQueryBuilder('p')
             ->where('p.role = :role')
@@ -52,13 +54,13 @@ public function getPermissionsByRole(Role $role, $forForm = false) {
             ->getResult(Query::HYDRATE_ARRAY);
 
         //rearrange the array to meet needs
-        $permissions = array();
+        $permissions = [];
         foreach ($results as $r) {
             if ($forForm) {
-                $permissions[$r['bundle']][$r['id']] = array(
-                    "name"      => $r['name'],
-                    "bitwise"   => $r['bitwise']
-                );
+                $permissions[$r['bundle']][$r['id']] = [
+                    'name'    => $r['name'],
+                    'bitwise' => $r['bitwise'],
+                ];
             } else {
                 $permissions[$r['bundle']][$r['name']] = $r['bitwise'];
             }
diff --git a/app/bundles/UserBundle/Entity/Role.php b/app/bundles/UserBundle/Entity/Role.php
index afd77d97cc2..85c7089f0e0 100644
--- a/app/bundles/UserBundle/Entity/Role.php
+++ b/app/bundles/UserBundle/Entity/Role.php
@@ -1,30 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\ApiBundle\Serializer\Driver\ApiMetadataDriver;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Constraints as Assert;
-use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Role
- *
- * @package Mautic\UserBundle\Entity
+ * Class Role.
  */
 class Role extends FormEntity
 {
-
     /**
      * @var int
      */
@@ -61,9 +59,9 @@ class Role extends FormEntity
     private $users;
 
     /**
-     * Constructor
+     * Constructor.
      */
-    public function __construct ()
+    public function __construct()
     {
         $this->permissions = new ArrayCollection();
         $this->users       = new ArrayCollection();
@@ -72,7 +70,7 @@ public function __construct ()
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -101,22 +99,20 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->mappedBy('role')
             ->fetchExtraLazy()
             ->build();
-
-
     }
 
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('name', new Assert\NotBlank(
-            array('message' => 'mautic.core.name.required')
+            ['message' => 'mautic.core.name.required']
         ));
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -124,34 +120,34 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('role')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'name',
                     'description',
-                    'isAdmin'
-                )
+                    'isAdmin',
+                ]
             )
             ->build();
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
      * @return Role
      */
-    public function setName ($name)
+    public function setName($name)
     {
         $this->isChanged('name', $name);
         $this->name = $name;
@@ -160,23 +156,23 @@ public function setName ($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
 
     /**
-     * Add permissions
+     * Add permissions.
      *
      * @param Permission $permissions
      *
      * @return Role
      */
-    public function addPermission (Permission $permissions)
+    public function addPermission(Permission $permissions)
     {
         $permissions->setRole($this);
 
@@ -186,33 +182,33 @@ public function addPermission (Permission $permissions)
     }
 
     /**
-     * Remove permissions
+     * Remove permissions.
      *
      * @param Permission $permissions
      */
-    public function removePermission (Permission $permissions)
+    public function removePermission(Permission $permissions)
     {
         $this->permissions->removeElement($permissions);
     }
 
     /**
-     * Get permissions
+     * Get permissions.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getPermissions ()
+    public function getPermissions()
     {
         return $this->permissions;
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
      * @return Role
      */
-    public function setDescription ($description)
+    public function setDescription($description)
     {
         $this->isChanged('description', $description);
         $this->description = $description;
@@ -221,23 +217,23 @@ public function setDescription ($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
-    public function getDescription ()
+    public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * Set isAdmin
+     * Set isAdmin.
      *
-     * @param boolean $isAdmin
+     * @param bool $isAdmin
      *
      * @return Role
      */
-    public function setIsAdmin ($isAdmin)
+    public function setIsAdmin($isAdmin)
     {
         $this->isChanged('isAdmin', $isAdmin);
         $this->isAdmin = $isAdmin;
@@ -246,54 +242,54 @@ public function setIsAdmin ($isAdmin)
     }
 
     /**
-     * Get isAdmin
+     * Get isAdmin.
      *
-     * @return boolean
+     * @return bool
      */
-    public function getIsAdmin ()
+    public function getIsAdmin()
     {
         return $this->isAdmin;
     }
 
     /**
-     * Get isAdmin
+     * Get isAdmin.
      *
-     * @return boolean
+     * @return bool
      */
-    public function isAdmin ()
+    public function isAdmin()
     {
         return $this->getIsAdmin();
     }
 
     /**
-     * Simply used to store a readable format of permissions for the changelog
+     * Simply used to store a readable format of permissions for the changelog.
      *
      * @param array $permissions
      */
-    public function setRawPermissions (array $permissions)
+    public function setRawPermissions(array $permissions)
     {
         $this->isChanged('rawPermissions', $permissions);
         $this->rawPermissions = $permissions;
     }
 
     /**
-     * Get rawPermissions
+     * Get rawPermissions.
      *
      * @return array
      */
-    public function getRawPermissions ()
+    public function getRawPermissions()
     {
         return $this->rawPermissions;
     }
 
     /**
-     * Add users
+     * Add users.
      *
      * @param User $users
      *
      * @return Role
      */
-    public function addUser (User $users)
+    public function addUser(User $users)
     {
         $this->users[] = $users;
 
@@ -301,21 +297,21 @@ public function addUser (User $users)
     }
 
     /**
-     * Remove users
+     * Remove users.
      *
      * @param User $users
      */
-    public function removeUser (User $users)
+    public function removeUser(User $users)
     {
         $this->users->removeElement($users);
     }
 
     /**
-     * Get users
+     * Get users.
      *
      * @return \Doctrine\Common\Collections\Collection
      */
-    public function getUsers ()
+    public function getUsers()
     {
         return $this->users;
     }
diff --git a/app/bundles/UserBundle/Entity/RoleRepository.php b/app/bundles/UserBundle/Entity/RoleRepository.php
index 8bd63cef2f5..30e4bdceb30 100644
--- a/app/bundles/UserBundle/Entity/RoleRepository.php
+++ b/app/bundles/UserBundle/Entity/RoleRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,19 +14,18 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * RoleRepository
+ * RoleRepository.
  */
 class RoleRepository extends CommonRepository
 {
-
     /**
-     * Get a list of roles
+     * Get a list of roles.
      *
      * @param array $args
      *
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this->createQueryBuilder('r');
 
@@ -35,7 +35,7 @@ public function getEntities($args = array())
     }
 
     /**
-     * Get a list of roles
+     * Get a list of roles.
      *
      * @param string $search
      * @param int    $limit
@@ -70,8 +70,8 @@ public function getRoleList($search = '', $limit = 10, $start = 0)
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('r.name',  ':'.$unique),
@@ -82,10 +82,10 @@ protected function addCatchAllWhereClause(&$q, $filter)
             $q->expr()->not($expr);
         }
 
-        return array(
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -98,27 +98,28 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         $returnParameter = true; //returning a parameter that is not used will lead to a Doctrine error
         $expr            = false;
         switch ($command) {
-            case $this->translator->trans('mautic.user.user.searchcommand.isadmin');
-                $expr = $q->expr()->eq("r.isAdmin", 1);
+            case $this->translator->trans('mautic.user.user.searchcommand.isadmin'):
+                $expr            = $q->expr()->eq('r.isAdmin', 1);
                 $returnParameter = false;
                 break;
             case $this->translator->trans('mautic.core.searchcommand.name'):
-                $expr = $q->expr()->like("r.name", ':'.$unique);
+                $expr = $q->expr()->like('r.name', ':'.$unique);
                 break;
         }
 
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
         if ($filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            ($returnParameter) ? array("$unique" => $string) : array()
-        );
+            ($returnParameter) ? ["$unique" => $string] : [],
+        ];
     }
 
     /**
-     * Get a count of users that belong to the role
+     * Get a count of users that belong to the role.
      *
      * @param $roleIds
      *
@@ -134,7 +135,7 @@ public function getUserCount($roleIds)
         $returnArray = (is_array($roleIds));
 
         if (!$returnArray) {
-            $roleIds = array($roleIds);
+            $roleIds = [$roleIds];
         }
 
         $q->where(
@@ -144,7 +145,7 @@ public function getUserCount($roleIds)
 
         $result = $q->execute()->fetchAll();
 
-        $return = array();
+        $return = [];
         foreach ($result as $r) {
             $return[$r['role_id']] = $r['thecount'];
         }
@@ -164,10 +165,10 @@ public function getUserCount($roleIds)
      */
     public function getSearchCommands()
     {
-        return array(
+        return [
             'mautic.user.user.searchcommand.isadmin',
-            'mautic.core.searchcommand.name'
-        );
+            'mautic.core.searchcommand.name',
+        ];
     }
 
     /**
@@ -175,9 +176,9 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('r.name', 'ASC')
-        );
+        return [
+            ['r.name', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/UserBundle/Entity/User.php b/app/bundles/UserBundle/Entity/User.php
index e2544bad8c0..4b9cd025ec1 100644
--- a/app/bundles/UserBundle/Entity/User.php
+++ b/app/bundles/UserBundle/Entity/User.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,20 +15,16 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Security\Core\Validator\Constraints as SecurityAssert;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class User
- *
- * @package Mautic\UserBundle\Entity
+ * Class User.
  */
 class User extends FormEntity implements AdvancedUserInterface, \Serializable
 {
-
     /**
      * @var int
      */
@@ -44,14 +41,14 @@ class User extends FormEntity implements AdvancedUserInterface, \Serializable
     protected $password;
 
     /**
-     * Used for when updating the password
+     * Used for when updating the password.
      *
      * @var string
      */
     private $plainPassword;
 
     /**
-     * Used for updating account
+     * Used for updating account.
      *
      * @var string
      */
@@ -108,14 +105,14 @@ class User extends FormEntity implements AdvancedUserInterface, \Serializable
     private $onlineStatus = 'offline';
 
     /**
-     * Notes if user is guest or not
+     * Notes if user is guest or not.
      *
      * @var bool
      */
     public $isGuest = false;
 
     /**
-     * Stores active role permissions
+     * Stores active role permissions.
      *
      * @var
      */
@@ -124,7 +121,7 @@ class User extends FormEntity implements AdvancedUserInterface, \Serializable
     /**
      * @var array
      */
-    private $preferences = array();
+    private $preferences = [];
 
     /**
      * @var string
@@ -134,7 +131,7 @@ class User extends FormEntity implements AdvancedUserInterface, \Serializable
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
 
@@ -207,73 +204,72 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
         $builder->createField('signature', 'text')
             ->nullable()
             ->build();
-
     }
 
     /**
      * @param ClassMetadata $metadata
      */
-    public static function loadValidatorMetadata (ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $metadata->addPropertyConstraint('username', new Assert\NotBlank(
-            array('message' => 'mautic.user.user.username.notblank')
+            ['message' => 'mautic.user.user.username.notblank']
         ));
 
         $metadata->addConstraint(new UniqueEntity(
-            array(
-                'fields'           => array('username'),
+            [
+                'fields'           => ['username'],
                 'message'          => 'mautic.user.user.username.unique',
-                'repositoryMethod' => 'checkUniqueUsernameEmail'
-            )
+                'repositoryMethod' => 'checkUniqueUsernameEmail',
+            ]
         ));
 
         $metadata->addPropertyConstraint('firstName', new Assert\NotBlank(
-            array('message' => 'mautic.user.user.firstname.notblank')
+            ['message' => 'mautic.user.user.firstname.notblank']
         ));
 
         $metadata->addPropertyConstraint('lastName', new Assert\NotBlank(
-            array('message' => 'mautic.user.user.lastname.notblank')
+            ['message' => 'mautic.user.user.lastname.notblank']
         ));
 
         $metadata->addPropertyConstraint('email', new Assert\NotBlank(
-            array('message' => 'mautic.user.user.email.valid')
+            ['message' => 'mautic.user.user.email.valid']
         ));
 
         $metadata->addPropertyConstraint('email', new Assert\Email(
-            array(
+            [
                 'message' => 'mautic.user.user.email.valid',
-                'groups'  => array('SecondPass')
-            )
+                'groups'  => ['SecondPass'],
+            ]
         ));
 
         $metadata->addConstraint(new UniqueEntity(
-            array(
-                'fields'           => array('email'),
+            [
+                'fields'           => ['email'],
                 'message'          => 'mautic.user.user.email.unique',
-                'repositoryMethod' => 'checkUniqueUsernameEmail'
-            )
+                'repositoryMethod' => 'checkUniqueUsernameEmail',
+            ]
         ));
 
         $metadata->addPropertyConstraint('role', new Assert\NotBlank(
-            array('message' => 'mautic.user.user.role.notblank')
+            ['message' => 'mautic.user.user.role.notblank']
         ));
 
         $metadata->addPropertyConstraint('plainPassword', new Assert\NotBlank(
-            array(
+            [
                 'message' => 'mautic.user.user.password.notblank',
-                'groups'  => array('CheckPassword')
-            )
+                'groups'  => ['CheckPassword'],
+            ]
         ));
 
         $metadata->addPropertyConstraint('plainPassword', new Assert\Length(
-            array(
+            [
                 'min'        => 6,
                 'minMessage' => 'mautic.user.user.password.minlength',
-                'groups'     => array('CheckPassword')
-            )
+                'groups'     => ['CheckPassword'],
+            ]
         ));
 
-        $metadata->setGroupSequence(array('User', 'SecondPass', 'CheckPassword'));
+        $metadata->setGroupSequence(['User', 'SecondPass', 'CheckPassword']);
     }
 
     /**
@@ -281,10 +277,10 @@ public static function loadValidatorMetadata (ClassMetadata $metadata)
      *
      * @return array
      */
-    public static function determineValidationGroups (Form $form)
+    public static function determineValidationGroups(Form $form)
     {
         $data   = $form->getData();
-        $groups = array('User', 'SecondPass');
+        $groups = ['User', 'SecondPass'];
 
         //check if creating a new user or editing an existing user and the password has been updated
         if (!$data->getId() || ($data->getId() && $data->getPlainPassword())) {
@@ -295,7 +291,7 @@ public static function determineValidationGroups (Form $form)
     }
 
     /**
-     * Prepares the metadata for API usage
+     * Prepares the metadata for API usage.
      *
      * @param $metadata
      */
@@ -303,15 +299,15 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     {
         $metadata->setGroupPrefix('user')
             ->addListProperties(
-                array(
+                [
                     'id',
                     'username',
                     'firstName',
-                    'lastName'
-                )
+                    'lastName',
+                ]
             )
             ->addProperties(
-                array(
+                [
                     'email',
                     'position',
                     'role',
@@ -320,8 +316,8 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
                     'lastLogin',
                     'lastActive',
                     'onlineStatus',
-                    'signature'
-                )
+                    'signature',
+                ]
             )
             ->build();
     }
@@ -329,30 +325,30 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
     /**
      * {@inheritdoc}
      */
-    protected function isChanged ($prop, $val)
+    protected function isChanged($prop, $val)
     {
-        $getter  = "get" . ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'role') {
             if ($current && !$val) {
-                $this->changes['role'] = array($current->getName() . ' (' . $current->getId() . ')', $val);
+                $this->changes['role'] = [$current->getName().' ('.$current->getId().')', $val];
             } elseif (!$this->role && $val) {
-                $this->changes['role'] = array($current, $val->getName() . ' (' . $val->getId() . ')');
+                $this->changes['role'] = [$current, $val->getName().' ('.$val->getId().')'];
             } elseif ($current && $val && $current->getId() != $val->getId()) {
-                $this->changes['role'] = array(
-                    $current->getName() . '(' . $current->getId() . ')',
-                    $val->getName() . '(' . $val->getId() . ')'
-                );
+                $this->changes['role'] = [
+                    $current->getName().'('.$current->getId().')',
+                    $val->getName().'('.$val->getId().')',
+                ];
             }
         } elseif ($current != $val) {
-            $this->changes[$prop] = array($current, $val);
+            $this->changes[$prop] = [$current, $val];
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getUsername ()
+    public function getUsername()
     {
         return $this->username;
     }
@@ -360,7 +356,7 @@ public function getUsername ()
     /**
      * {@inheritdoc}
      */
-    public function getSalt ()
+    public function getSalt()
     {
         //bcrypt generates its own salt
         return null;
@@ -369,27 +365,27 @@ public function getSalt ()
     /**
      * {@inheritdoc}
      */
-    public function getPassword ()
+    public function getPassword()
     {
         return $this->password;
     }
 
     /**
-     * Get plain password
+     * Get plain password.
      *
      * @return string
      */
-    public function getPlainPassword ()
+    public function getPlainPassword()
     {
         return $this->plainPassword;
     }
 
     /**
-     * Get current password (that a user has typed into a form)
+     * Get current password (that a user has typed into a form).
      *
      * @return string
      */
-    public function getCurrentPassword ()
+    public function getCurrentPassword()
     {
         return $this->currentPassword;
     }
@@ -397,17 +393,17 @@ public function getCurrentPassword ()
     /**
      * {@inheritdoc}
      */
-    public function getRoles ()
+    public function getRoles()
     {
-        $roles = array();
+        $roles = [];
 
         if ($this->username) {
-            $roles = array(
-                (($this->isAdmin()) ? "ROLE_ADMIN" : "ROLE_USER")
-            );
+            $roles = [
+                (($this->isAdmin()) ? 'ROLE_ADMIN' : 'ROLE_USER'),
+            ];
 
             if (defined('MAUTIC_API_REQUEST') && MAUTIC_API_REQUEST) {
-                $roles[] = "ROLE_API";
+                $roles[] = 'ROLE_API';
             }
         }
 
@@ -417,30 +413,29 @@ public function getRoles ()
     /**
      * {@inheritdoc}
      */
-    public function eraseCredentials ()
+    public function eraseCredentials()
     {
-
     }
 
     /**
      * {@inheritdoc}
      */
-    public function serialize ()
+    public function serialize()
     {
-        return serialize(array(
+        return serialize([
             $this->id,
             $this->username,
             $this->password,
-            $this->isPublished()
-        ));
+            $this->isPublished(),
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function unserialize ($serialized)
+    public function unserialize($serialized)
     {
-        list (
+        list(
             $this->id,
             $this->username,
             $this->password,
@@ -450,23 +445,23 @@ public function unserialize ($serialized)
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * Set username
+     * Set username.
      *
      * @param string $username
      *
      * @return User
      */
-    public function setUsername ($username)
+    public function setUsername($username)
     {
         $this->isChanged('username', $username);
         $this->username = $username;
@@ -475,13 +470,13 @@ public function setUsername ($username)
     }
 
     /**
-     * Set password
+     * Set password.
      *
      * @param string $password
      *
      * @return User
      */
-    public function setPassword ($password)
+    public function setPassword($password)
     {
         $this->password = $password;
 
@@ -489,13 +484,13 @@ public function setPassword ($password)
     }
 
     /**
-     * Set plain password
+     * Set plain password.
      *
      * @param $plainPassword
      *
      * @return User
      */
-    public function setPlainPassword ($plainPassword)
+    public function setPlainPassword($plainPassword)
     {
         $this->plainPassword = $plainPassword;
 
@@ -503,28 +498,27 @@ public function setPlainPassword ($plainPassword)
     }
 
     /**
-     * Set current password
+     * Set current password.
      *
      * @param $currentPassword
      *
      * @return User
      */
-    public function setCurrentPassword ($currentPassword)
+    public function setCurrentPassword($currentPassword)
     {
         $this->currentPassword = $currentPassword;
 
         return $this;
     }
 
-
     /**
-     * Set firstName
+     * Set firstName.
      *
      * @param string $firstName
      *
      * @return User
      */
-    public function setFirstName ($firstName)
+    public function setFirstName($firstName)
     {
         $this->isChanged('firstName', $firstName);
         $this->firstName = $firstName;
@@ -533,23 +527,23 @@ public function setFirstName ($firstName)
     }
 
     /**
-     * Get firstName
+     * Get firstName.
      *
      * @return string
      */
-    public function getFirstName ()
+    public function getFirstName()
     {
         return $this->firstName;
     }
 
     /**
-     * Set lastName
+     * Set lastName.
      *
      * @param string $lastName
      *
      * @return User
      */
-    public function setLastName ($lastName)
+    public function setLastName($lastName)
     {
         $this->isChanged('lastName', $lastName);
         $this->lastName = $lastName;
@@ -558,35 +552,35 @@ public function setLastName ($lastName)
     }
 
     /**
-     * Get lastName
+     * Get lastName.
      *
      * @return string
      */
-    public function getLastName ()
+    public function getLastName()
     {
         return $this->lastName;
     }
 
     /**
-     * Get full name
+     * Get full name.
      *
      * @param bool $lastFirst
      *
      * @return string
      */
-    public function getName ($lastFirst = false)
+    public function getName($lastFirst = false)
     {
-        return ($lastFirst) ? $this->lastName . ", " . $this->firstName : $this->firstName . " " . $this->lastName;
+        return ($lastFirst) ? $this->lastName.', '.$this->firstName : $this->firstName.' '.$this->lastName;
     }
 
     /**
-     * Set email
+     * Set email.
      *
      * @param string $email
      *
      * @return User
      */
-    public function setEmail ($email)
+    public function setEmail($email)
     {
         $this->isChanged('email', $email);
         $this->email = $email;
@@ -595,11 +589,11 @@ public function setEmail ($email)
     }
 
     /**
-     * Get email
+     * Get email.
      *
      * @return string
      */
-    public function getEmail ()
+    public function getEmail()
     {
         return $this->email;
     }
@@ -607,7 +601,7 @@ public function getEmail ()
     /**
      * {@inheritdoc}
      */
-    public function isAccountNonExpired ()
+    public function isAccountNonExpired()
     {
         return true;
     }
@@ -615,7 +609,7 @@ public function isAccountNonExpired ()
     /**
      * {@inheritdoc}
      */
-    public function isAccountNonLocked ()
+    public function isAccountNonLocked()
     {
         return true;
     }
@@ -623,7 +617,7 @@ public function isAccountNonLocked ()
     /**
      * {@inheritdoc}
      */
-    public function isCredentialsNonExpired ()
+    public function isCredentialsNonExpired()
     {
         return true;
     }
@@ -631,19 +625,19 @@ public function isCredentialsNonExpired ()
     /**
      * {@inheritdoc}
      */
-    public function isEnabled ()
+    public function isEnabled()
     {
         return $this->isPublished();
     }
 
     /**
-     * Set role
+     * Set role.
      *
      * @param Role $role
      *
      * @return User
      */
-    public function setRole (Role $role = null)
+    public function setRole(Role $role = null)
     {
         $this->isChanged('role', $role);
         $this->role = $role;
@@ -652,23 +646,23 @@ public function setRole (Role $role = null)
     }
 
     /**
-     * Get role
+     * Get role.
      *
      * @return Role
      */
-    public function getRole ()
+    public function getRole()
     {
         return $this->role;
     }
 
     /**
-     * Set active permissions
+     * Set active permissions.
      *
      * @param array $permissions
      *
      * @return User
      */
-    public function setActivePermissions (array $permissions)
+    public function setActivePermissions(array $permissions)
     {
         $this->activePermissions = $permissions;
 
@@ -676,23 +670,23 @@ public function setActivePermissions (array $permissions)
     }
 
     /**
-     * Get active permissions
+     * Get active permissions.
      *
      * @return mixed
      */
-    public function getActivePermissions ()
+    public function getActivePermissions()
     {
         return $this->activePermissions;
     }
 
     /**
-     * Set position
+     * Set position.
      *
      * @param string $position
      *
      * @return User
      */
-    public function setPosition ($position)
+    public function setPosition($position)
     {
         $this->isChanged('position', $position);
         $this->position = $position;
@@ -701,23 +695,23 @@ public function setPosition ($position)
     }
 
     /**
-     * Get position
+     * Get position.
      *
      * @return string
      */
-    public function getPosition ()
+    public function getPosition()
     {
         return $this->position;
     }
 
     /**
-     * Set timezone
+     * Set timezone.
      *
      * @param string $timezone
      *
      * @return User
      */
-    public function setTimezone ($timezone)
+    public function setTimezone($timezone)
     {
         $this->isChanged('timezone', $timezone);
         $this->timezone = $timezone;
@@ -726,23 +720,23 @@ public function setTimezone ($timezone)
     }
 
     /**
-     * Get timezone
+     * Get timezone.
      *
      * @return string
      */
-    public function getTimezone ()
+    public function getTimezone()
     {
         return $this->timezone;
     }
 
     /**
-     * Set locale
+     * Set locale.
      *
      * @param string $locale
      *
      * @return User
      */
-    public function setLocale ($locale)
+    public function setLocale($locale)
     {
         $this->isChanged('locale', $locale);
         $this->locale = $locale;
@@ -751,21 +745,21 @@ public function setLocale ($locale)
     }
 
     /**
-     * Get locale
+     * Get locale.
      *
      * @return string
      */
-    public function getLocale ()
+    public function getLocale()
     {
         return $this->locale;
     }
 
     /**
-     * Determines if user is admin
+     * Determines if user is admin.
      *
      * @return bool
      */
-    public function isAdmin ()
+    public function isAdmin()
     {
         if ($this->role !== null) {
             return $this->role->isAdmin();
@@ -777,7 +771,7 @@ public function isAdmin ()
     /**
      * @return mixed
      */
-    public function getLastLogin ()
+    public function getLastLogin()
     {
         return $this->lastLogin;
     }
@@ -785,7 +779,7 @@ public function getLastLogin ()
     /**
      * @param mixed $lastLogin
      */
-    public function setLastLogin ($lastLogin = null)
+    public function setLastLogin($lastLogin = null)
     {
         if (empty($lastLogin)) {
             $lastLogin = new \DateTime();
@@ -796,7 +790,7 @@ public function setLastLogin ($lastLogin = null)
     /**
      * @return mixed
      */
-    public function getLastActive ()
+    public function getLastActive()
     {
         return $this->lastActive;
     }
@@ -804,7 +798,7 @@ public function getLastActive ()
     /**
      * @param mixed $lastActive
      */
-    public function setLastActive ($lastActive = null)
+    public function setLastActive($lastActive = null)
     {
         if (empty($lastActive)) {
             $lastActive = new \DateTime();
@@ -815,7 +809,7 @@ public function setLastActive ($lastActive = null)
     /**
      * @return mixed
      */
-    public function getOnlineStatus ()
+    public function getOnlineStatus()
     {
         return $this->onlineStatus;
     }
@@ -823,7 +817,7 @@ public function getOnlineStatus ()
     /**
      * @param mixed $status
      */
-    public function setOnlineStatus ($status)
+    public function setOnlineStatus($status)
     {
         $this->onlineStatus = $status;
     }
@@ -831,7 +825,7 @@ public function setOnlineStatus ($status)
     /**
      * @return mixed
      */
-    public function getPreferences ()
+    public function getPreferences()
     {
         return $this->preferences;
     }
@@ -839,13 +833,13 @@ public function getPreferences ()
     /**
      * @param mixed $preferences
      */
-    public function setPreferences (array $preferences)
+    public function setPreferences(array $preferences)
     {
         $this->preferences = $preferences;
     }
 
     /**
-     * Set signature
+     * Set signature.
      *
      * @param string $signature
      *
@@ -860,7 +854,7 @@ public function setSignature($signature)
     }
 
     /**
-     * Get signature
+     * Get signature.
      *
      * @return string
      */
diff --git a/app/bundles/UserBundle/Entity/UserRepository.php b/app/bundles/UserBundle/Entity/UserRepository.php
index 8d20de40ce2..5ef3d40e3b4 100644
--- a/app/bundles/UserBundle/Entity/UserRepository.php
+++ b/app/bundles/UserBundle/Entity/UserRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,12 @@
 use Mautic\CoreBundle\Helper\DateTimeHelper;
 
 /**
- * UserRepository
+ * UserRepository.
  */
 class UserRepository extends CommonRepository
 {
-
     /**
-     * Find user by username or email
+     * Find user by username or email.
      *
      * @param $identifier
      *
@@ -45,10 +45,10 @@ public function setLastLogin($user)
         $now      = new DateTimeHelper();
         $datetime = $now->toUtcString();
         $conn     = $this->_em->getConnection();
-        $conn->update(MAUTIC_TABLE_PREFIX . 'users', array(
+        $conn->update(MAUTIC_TABLE_PREFIX.'users', [
             'last_login'  => $datetime,
-            'last_active' => $datetime
-        ), array('id' => (int) $user->getId()));
+            'last_active' => $datetime,
+        ], ['id' => (int) $user->getId()]);
     }
 
     /**
@@ -56,9 +56,9 @@ public function setLastLogin($user)
      */
     public function setLastActive($user)
     {
-        $now = new DateTimeHelper();
+        $now  = new DateTimeHelper();
         $conn = $this->_em->getConnection();
-        $conn->update(MAUTIC_TABLE_PREFIX . 'users', array('last_active' => $now->toUtcString()), array('id' => (int) $user->getId()));
+        $conn->update(MAUTIC_TABLE_PREFIX.'users', ['last_active' => $now->toUtcString()], ['id' => (int) $user->getId()]);
     }
 
     /**
@@ -68,17 +68,16 @@ public function setLastActive($user)
     public function setOnlineStatus($userId, $status)
     {
         $conn = $this->_em->getConnection();
-        $conn->update(MAUTIC_TABLE_PREFIX . 'users', array('online_status' => $status), array('id' => (int) $userId));
+        $conn->update(MAUTIC_TABLE_PREFIX.'users', ['online_status' => $status], ['id' => (int) $userId]);
     }
 
     /**
      * Last active updates every 2 minutes. If it didn't get updated, it means the user closed their browser and are thus
-     * now offline
-     *
+     * now offline.
      */
     public function updateOnlineStatuses()
     {
-        $dt    = new DateTimeHelper();
+        $dt           = new DateTimeHelper();
         $offlineDelay = $dt->getUtcDateTime();
         $offlineDelay->setTimestamp(strtotime('15 minutes ago'));
 
@@ -92,36 +91,37 @@ public function updateOnlineStatuses()
     }
 
     /**
-     * Checks to ensure that a username and/or email is unique
+     * Checks to ensure that a username and/or email is unique.
      *
      * @param $params
      *
      * @return array
      */
-    public function checkUniqueUsernameEmail($params) {
+    public function checkUniqueUsernameEmail($params)
+    {
         $q = $this->createQueryBuilder('u');
 
         if (isset($params['email'])) {
             $q->where('u.username = :email OR u.email = :email')
-                ->setParameter("email", $params['email']);
+                ->setParameter('email', $params['email']);
         }
 
         if (isset($params['username'])) {
             $q->orWhere('u.username = :username OR u.email = :username')
-                ->setParameter("username", $params['username']);
+                ->setParameter('username', $params['username']);
         }
 
         return $q->getQuery()->getResult();
     }
 
     /**
-     * Get a list of users
+     * Get a list of users.
      *
      * @param array $args
      *
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         $q = $this
             ->createQueryBuilder('u')
@@ -134,7 +134,7 @@ public function getEntities($args = array())
     }
 
     /**
-     * Get a list of users for an autocomplete input
+     * Get a list of users for an autocomplete input.
      *
      * @param string $search
      * @param int    $limit
@@ -143,7 +143,7 @@ public function getEntities($args = array())
      *
      * @return array
      */
-    public function getUserList($search = '', $limit = 10, $start = 0, $permissionLimiter = array())
+    public function getUserList($search = '', $limit = 10, $start = 0, $permissionLimiter = [])
     {
         $q = $this->_em->createQueryBuilder();
 
@@ -215,7 +215,7 @@ public function getPositionList($search = '', $limit = 10, $start = 0)
             ->distinct()
             ->from('MauticUserBundle:User', 'u')
             ->where("u.position != ''")
-            ->andWhere("u.position IS NOT NULL");
+            ->andWhere('u.position IS NOT NULL');
         if (!empty($search)) {
             $q->andWhere('u.position LIKE :search')
                 ->setParameter('search', "{$search}%");
@@ -236,8 +236,8 @@ public function getPositionList($search = '', $limit = 10, $start = 0)
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        $unique  = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
-        $string  = ($filter->strict) ? $filter->string : "%{$filter->string}%";
+        $unique = $this->generateRandomParameterName(); //ensure that the string has a unique parameter identifier
+        $string = ($filter->strict) ? $filter->string : "%{$filter->string}%";
 
         $expr = $q->expr()->orX(
             $q->expr()->like('u.username',  ':'.$unique),
@@ -251,10 +251,11 @@ protected function addCatchAllWhereClause(&$q, $filter)
         if ($filter->not) {
             $expr = $q->expr()->not($expr);
         }
-        return array(
+
+        return [
             $expr,
-            array("$unique" => $string)
-        );
+            ["$unique" => $string],
+        ];
     }
 
     /**
@@ -268,35 +269,35 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         $expr            = false;
         switch ($command) {
             case $this->translator->trans('mautic.core.searchcommand.ispublished'):
-                $expr            = $q->expr()->eq("u.isPublished", ":$unique");
-                $forceParameters = array($unique => true);
+                $expr            = $q->expr()->eq('u.isPublished', ":$unique");
+                $forceParameters = [$unique => true];
 
                 break;
             case $this->translator->trans('mautic.core.searchcommand.isunpublished'):
-                $expr            = $q->expr()->eq("u.isPublished", ":$unique");
-                $forceParameters = array($unique => false);
+                $expr            = $q->expr()->eq('u.isPublished', ":$unique");
+                $forceParameters = [$unique => false];
 
                 break;
-            case $this->translator->trans('mautic.user.user.searchcommand.isadmin');
-                $expr            = $q->expr()->eq("r.isAdmin", ":$unique");
-                $forceParameters = array($unique => true);
+            case $this->translator->trans('mautic.user.user.searchcommand.isadmin'):
+                $expr            = $q->expr()->eq('r.isAdmin', ":$unique");
+                $forceParameters = [$unique => true];
                 break;
             case $this->translator->trans('mautic.core.searchcommand.email'):
-                $expr = $q->expr()->like("u.email", ':' . $unique);
+                $expr = $q->expr()->like('u.email', ':'.$unique);
                 break;
             case $this->translator->trans('mautic.user.user.searchcommand.position'):
-                $expr = $q->expr()->like("u.position", ':' . $unique);
+                $expr = $q->expr()->like('u.position', ':'.$unique);
                 break;
             case $this->translator->trans('mautic.user.user.searchcommand.username'):
-                $expr = $q->expr()->like("u.username", ':' . $unique);
+                $expr = $q->expr()->like('u.username', ':'.$unique);
                 break;
             case $this->translator->trans('mautic.user.user.searchcommand.role'):
-                $expr = $q->expr()->like("r.name", ':' . $unique);
+                $expr = $q->expr()->like('r.name', ':'.$unique);
                 break;
             case $this->translator->trans('mautic.core.searchcommand.name'):
                 $expr = $q->expr()->orX(
-                    $q->expr()->like('u.firstName', ':' . $unique),
-                    $q->expr()->like('u.lastName', ':' . $unique)
+                    $q->expr()->like('u.firstName', ':'.$unique),
+                    $q->expr()->like('u.lastName', ':'.$unique)
                 );
                 break;
         }
@@ -304,13 +305,13 @@ protected function addSearchCommandWhereClause(&$q, $filter)
         if (!empty($forceParameters)) {
             $parameters = $forceParameters;
         } elseif (!$returnParameter) {
-            $parameters = array();
+            $parameters = [];
         } else {
             $string     = ($filter->strict) ? $filter->string : "%{$filter->string}%";
-            $parameters = array("$unique" => $string);
+            $parameters = ["$unique" => $string];
         }
 
-        return array($expr, $parameters);
+        return [$expr, $parameters];
     }
 
     /**
@@ -318,7 +319,7 @@ protected function addSearchCommandWhereClause(&$q, $filter)
      */
     public function getSearchCommands()
     {
-         return array(
+        return [
             'mautic.core.searchcommand.email',
             'mautic.core.searchcommand.ispublished',
             'mautic.core.searchcommand.isunpublished',
@@ -326,8 +327,8 @@ public function getSearchCommands()
             'mautic.core.searchcommand.name',
             'mautic.user.user.searchcommand.position',
             'mautic.user.user.searchcommand.role',
-            'mautic.user.user.searchcommand.username'
-        );
+            'mautic.user.user.searchcommand.username',
+        ];
     }
 
     /**
@@ -335,11 +336,11 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array('u.lastName', 'ASC'),
-            array('u.firstName', 'ASC'),
-            array('u.username', 'ASC')
-        );
+        return [
+            ['u.lastName', 'ASC'],
+            ['u.firstName', 'ASC'],
+            ['u.username', 'ASC'],
+        ];
     }
 
     /**
diff --git a/app/bundles/UserBundle/Event/AuthenticationContentEvent.php b/app/bundles/UserBundle/Event/AuthenticationContentEvent.php
index bfba132b82c..e87c1b2bd23 100644
--- a/app/bundles/UserBundle/Event/AuthenticationContentEvent.php
+++ b/app/bundles/UserBundle/Event/AuthenticationContentEvent.php
@@ -1,26 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Event;
 
-use Mautic\UserBundle\Entity\User;
-use Mautic\UserBundle\Security\Authentication\Token\PluginToken;
-use Mautic\UserBundle\Security\Provider\UserProvider;
-use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
 /**
- * Class AuthenticationContentEvent
+ * Class AuthenticationContentEvent.
  */
 class AuthenticationContentEvent extends Event
 {
@@ -32,7 +26,7 @@ class AuthenticationContentEvent extends Event
     /**
      * @var array
      */
-    protected $content = array();
+    protected $content = [];
 
     /**
      * @var bool
@@ -44,8 +38,9 @@ class AuthenticationContentEvent extends Event
      *
      * @param Request $request
      */
-    public function __construct(Request $request) {
-        $this->request               = $request;
+    public function __construct(Request $request)
+    {
+        $this->request    = $request;
         $this->postLogout = $request->getSession()->get('post_logout', false);
     }
 
@@ -80,4 +75,4 @@ public function getContent()
     {
         return implode("\n\n", $this->content);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Event/AuthenticationEvent.php b/app/bundles/UserBundle/Event/AuthenticationEvent.php
index 067402e9bd8..95e02e157d6 100644
--- a/app/bundles/UserBundle/Event/AuthenticationEvent.php
+++ b/app/bundles/UserBundle/Event/AuthenticationEvent.php
@@ -1,18 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Event;
 
+use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Mautic\UserBundle\Entity\User;
 use Mautic\UserBundle\Security\Authentication\Token\PluginToken;
 use Mautic\UserBundle\Security\Provider\UserProvider;
-use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -22,11 +23,10 @@
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 /**
- * Class AuthenticationEvent
+ * Class AuthenticationEvent.
  */
 class AuthenticationEvent extends Event
 {
-
     /**
      * @var Response
      */
@@ -83,7 +83,7 @@ class AuthenticationEvent extends Event
     protected $request;
 
     /**
-     * Message to display to user if there is a failed authentication
+     * Message to display to user if there is a failed authentication.
      *
      * @var string
      */
@@ -107,8 +107,8 @@ public function __construct(
         $authenticatingService = null,
         $integrations = null
     ) {
-        $this->token                 = $token;
-        $this->user                  = $user;
+        $this->token = $token;
+        $this->user  = $user;
 
         $this->isFormLogin           = ($token instanceof UsernamePasswordToken);
         $this->integrations          = $integrations;
@@ -132,7 +132,7 @@ public function __construct(
     }
 
     /**
-     * Get user returned by username search
+     * Get user returned by username search.
      *
      * @return string|User
      */
@@ -142,7 +142,7 @@ public function getUser()
     }
 
     /**
-     * Set the user to be used after authentication
+     * Set the user to be used after authentication.
      *
      * @param User      $user
      * @param bool|true $saveUser
@@ -158,7 +158,7 @@ public function setUser(User $user, $saveUser = true, $createIfNotExists = true)
     }
 
     /**
-     * Get the token that has credentials, etc used to login
+     * Get the token that has credentials, etc used to login.
      *
      * @return PluginToken
      */
@@ -173,7 +173,7 @@ public function getToken()
      */
     public function setToken($service, TokenInterface $token)
     {
-        $this->token = $token;
+        $this->token                 = $token;
         $this->authenticatingService = $service;
         $this->isAuthenticated       = $token->isAuthenticated();
 
@@ -181,7 +181,7 @@ public function setToken($service, TokenInterface $token)
     }
 
     /**
-     * Get the username used
+     * Get the username used.
      *
      * @return string
      */
@@ -191,7 +191,7 @@ public function getUsername()
     }
 
     /**
-     * Get user provider to find and/or create new users
+     * Get user provider to find and/or create new users.
      *
      * @return UserProvider
      */
@@ -201,9 +201,9 @@ public function getUserProvider()
     }
 
     /**
-     * Set if this user is successfully authenticated
+     * Set if this user is successfully authenticated.
      *
-     * @param string    $service Service that authenticated the user; if using a Integration, it should match that of AbstractIntegration::getName();
+     * @param string    $service           Service that authenticated the user; if using a Integration, it should match that of AbstractIntegration::getName();
      * @param User|null $user
      * @param bool|true $createIfNotExists
      */
@@ -221,7 +221,7 @@ public function setIsAuthenticated($service, User $user = null, $createIfNotExis
     }
 
     /**
-     * Check if the user has been authenticated
+     * Check if the user has been authenticated.
      *
      * @return bool
      */
@@ -232,7 +232,7 @@ public function isAuthenticated()
 
     /**
      * Prevent any other authentication method from authorizing the user.
-     * Mainly used to prevent a form login from trying to auth with the given password for a local user (think two-factor requirements)
+     * Mainly used to prevent a form login from trying to auth with the given password for a local user (think two-factor requirements).
      */
     public function setIsFailedAuthentication()
     {
@@ -243,7 +243,7 @@ public function setIsFailedAuthentication()
     }
 
     /**
-     * Set the message to display to the user for failing auth
+     * Set the message to display to the user for failing auth.
      *
      * @param $message
      */
@@ -253,7 +253,7 @@ public function setFailedAuthenticationMessage($message)
     }
 
     /**
-     * Returns message to display to user for failing auth
+     * Returns message to display to user for failing auth.
      *
      * @return string
      */
@@ -263,7 +263,7 @@ public function getFailedAuthenticationMessage()
     }
 
     /**
-     * Returns true if a plugin has forcefully failed authentication
+     * Returns true if a plugin has forcefully failed authentication.
      *
      * @return bool
      */
@@ -273,7 +273,7 @@ public function isFailed()
     }
 
     /**
-     * Get the service that authenticated the user
+     * Get the service that authenticated the user.
      *
      * @return string
      */
@@ -283,7 +283,7 @@ public function getAuthenticatingService()
     }
 
     /**
-     * Set a response such as a redirect
+     * Set a response such as a redirect.
      *
      * @param Response $response
      */
@@ -296,7 +296,7 @@ public function setResponse(Response $response)
     }
 
     /**
-     * Get the response if set by the listener
+     * Get the response if set by the listener.
      *
      * @return Response|null
      */
@@ -306,7 +306,7 @@ public function getResponse()
     }
 
     /**
-     * Get the request
+     * Get the request.
      *
      * @return Request
      */
@@ -316,7 +316,7 @@ public function getRequest()
     }
 
     /**
-     * Check if this is a form login authentication request or pre-auth
+     * Check if this is a form login authentication request or pre-auth.
      *
      * @return bool
      */
@@ -326,7 +326,7 @@ public function isFormLogin()
     }
 
     /**
-     * Check if the event is executed as the result of accessing mautic_sso_login_check
+     * Check if the event is executed as the result of accessing mautic_sso_login_check.
      *
      * @return bool
      */
@@ -344,4 +344,4 @@ public function getIntegration($integrationName)
     {
         return (isset($this->integrations[$integrationName])) ? $this->integrations[$integrationName] : false;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Event/LoginEvent.php b/app/bundles/UserBundle/Event/LoginEvent.php
index 3edf1e57d39..9e505d220e2 100644
--- a/app/bundles/UserBundle/Event/LoginEvent.php
+++ b/app/bundles/UserBundle/Event/LoginEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,9 +14,7 @@
 use Mautic\UserBundle\Entity\User;
 
 /**
- * Class LoginEvent
- *
- * @package Mautic\UserBundle\Event
+ * Class LoginEvent.
  */
 class LoginEvent extends Event
 {
@@ -38,4 +37,4 @@ public function getUser()
     {
         return $this->user;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Event/LogoutEvent.php b/app/bundles/UserBundle/Event/LogoutEvent.php
index 63c3389274d..f691b616c50 100644
--- a/app/bundles/UserBundle/Event/LogoutEvent.php
+++ b/app/bundles/UserBundle/Event/LogoutEvent.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
 use Mautic\UserBundle\Entity\User;
+use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class LogoutEvent
+ * Class LogoutEvent.
  */
 class LogoutEvent extends Event
 {
@@ -26,7 +27,7 @@ class LogoutEvent extends Event
     /**
      * @var array
      */
-    private $session = array();
+    private $session = [];
 
     /**
      * @var Request
@@ -54,7 +55,7 @@ public function getUser()
     }
 
     /**
-     * Add value to session after it's been cleared
+     * Add value to session after it's been cleared.
      *
      * @param $key
      * @param $value
@@ -65,7 +66,7 @@ public function setPostSessionItem($key, $value)
     }
 
     /**
-     * Get session items to be added after session has been cleared
+     * Get session items to be added after session has been cleared.
      *
      * @return array
      */
@@ -81,4 +82,4 @@ public function getRequest()
     {
         return $this->request;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Event/RoleEvent.php b/app/bundles/UserBundle/Event/RoleEvent.php
index 1292b433ddf..299e4713082 100644
--- a/app/bundles/UserBundle/Event/RoleEvent.php
+++ b/app/bundles/UserBundle/Event/RoleEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,22 @@
 use Mautic\UserBundle\Entity\Role;
 
 /**
- * Class RoleEvent
+ * Class RoleEvent.
  */
 class RoleEvent extends CommonEvent
 {
-
     /**
      * @param Role $role
      * @param bool $isNew
      */
     public function __construct(Role &$role, $isNew = false)
     {
-        $this->entity =& $role;
+        $this->entity = &$role;
         $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Role entity
+     * Returns the Role entity.
      *
      * @return Role
      */
@@ -39,7 +39,7 @@ public function getRole()
     }
 
     /**
-     * Sets the Role entity
+     * Sets the Role entity.
      *
      * @param Role $role
      */
diff --git a/app/bundles/UserBundle/Event/StatusChangeEvent.php b/app/bundles/UserBundle/Event/StatusChangeEvent.php
index 0d09a2faee9..659d90e4548 100644
--- a/app/bundles/UserBundle/Event/StatusChangeEvent.php
+++ b/app/bundles/UserBundle/Event/StatusChangeEvent.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Event;
 
 use Mautic\CampaignBundle\Entity\Event;
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Mautic\CoreBundle\Helper\UserHelper;
 use Mautic\UserBundle\Entity\User;
 
 /**
- * Class StatusChangeEvent
- *
- * @package Mautic\UserBundle\Event
+ * Class StatusChangeEvent.
  */
 class StatusChangeEvent extends Event
 {
@@ -28,13 +25,13 @@ class StatusChangeEvent extends Event
 
     /**
      * StatusChangeEvent constructor.
-     * 
+     *
      * @param User $user
      */
     public function __construct(User $user)
     {
         $this->user = $user;
-        
+
         parent::__construct();
     }
 
@@ -45,4 +42,4 @@ public function getUser()
     {
         return $this->user;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Event/UserEvent.php b/app/bundles/UserBundle/Event/UserEvent.php
index efc741b5cc0..4af7141979c 100644
--- a/app/bundles/UserBundle/Event/UserEvent.php
+++ b/app/bundles/UserBundle/Event/UserEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,22 @@
 use Mautic\UserBundle\Entity\User;
 
 /**
- * Class UserEvent
+ * Class UserEvent.
  */
 class UserEvent extends CommonEvent
 {
-
     /**
      * @param User $user
      * @param bool $isNew
      */
     public function __construct(User &$user, $isNew = false)
     {
-        $this->entity =& $user;
+        $this->entity = &$user;
         $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the User entity
+     * Returns the User entity.
      *
      * @return User
      */
@@ -39,7 +39,7 @@ public function getUser()
     }
 
     /**
-     * Sets the User entity
+     * Sets the User entity.
      *
      * @param User $user
      */
diff --git a/app/bundles/UserBundle/EventListener/SearchSubscriber.php b/app/bundles/UserBundle/EventListener/SearchSubscriber.php
index 559912c1478..7babe644a8a 100644
--- a/app/bundles/UserBundle/EventListener/SearchSubscriber.php
+++ b/app/bundles/UserBundle/EventListener/SearchSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,9 +17,7 @@
 use Mautic\UserBundle\Model\UserModel;
 
 /**
- * Class SearchSubscriber
- *
- * @package Mautic\UserBundle\EventListener
+ * Class SearchSubscriber.
  */
 class SearchSubscriber extends CommonSubscriber
 {
@@ -40,19 +39,19 @@ class SearchSubscriber extends CommonSubscriber
      */
     public function __construct(UserModel $userModel, RoleModel $roleModel)
     {
-        $this->userModel = $userModel;
+        $this->userModel     = $userModel;
         $this->userRoleModel = $roleModel;
     }
 
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            CoreEvents::GLOBAL_SEARCH        => array('onGlobalSearch', 0),
-            CoreEvents::BUILD_COMMAND_LIST   => array('onBuildCommandList', 0)
-        );
+        return [
+            CoreEvents::GLOBAL_SEARCH      => ['onGlobalSearch', 0],
+            CoreEvents::BUILD_COMMAND_LIST => ['onBuildCommandList', 0],
+        ];
     }
 
     public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
@@ -64,31 +63,31 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
 
         if ($this->security->isGranted('user:users:view')) {
             $users = $this->userModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $str
-                ));
+                    'filter' => $str,
+                ]);
 
             if (count($users) > 0) {
-                $userResults = array();
+                $userResults = [];
                 $canEdit     = $this->security->isGranted('user:users:edit');
                 foreach ($users as $user) {
                     $userResults[] = $this->templating->renderResponse(
                         'MauticUserBundle:SubscribedEvents\Search:global_user.html.php',
-                        array(
+                        [
                             'user'    => $user,
-                            'canEdit' => $canEdit
-                        )
+                            'canEdit' => $canEdit,
+                        ]
                     )->getContent();
                 }
                 if (count($users) > 5) {
                     $userResults[] = $this->templating->renderResponse(
                         'MauticUserBundle:SubscribedEvents\Search:global_user.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($users) - 5)
-                        )
+                            'remaining'    => (count($users) - 5),
+                        ]
                     )->getContent();
                 }
                 $userResults['count'] = count($users);
@@ -98,31 +97,31 @@ public function onGlobalSearch(MauticEvents\GlobalSearchEvent $event)
 
         if ($this->security->isGranted('user:roles:view')) {
             $roles = $this->userRoleModel->getEntities(
-                array(
+                [
                     'limit'  => 5,
-                    'filter' => $str
-                ));
+                    'filter' => $str,
+                ]);
             if (count($roles)) {
-                $roleResults = array();
+                $roleResults = [];
                 $canEdit     = $this->security->isGranted('user:roles:edit');
 
                 foreach ($roles as $role) {
                     $roleResults[] = $this->templating->renderResponse(
                         'MauticUserBundle:SubscribedEvents\Search:global_role.html.php',
-                        array(
+                        [
                             'role'    => $role,
-                            'canEdit' => $canEdit
-                        )
+                            'canEdit' => $canEdit,
+                        ]
                     )->getContent();
                 }
                 if (count($roles) > 5) {
                     $roleResults[] = $this->templating->renderResponse(
                         'MauticUserBundle:SubscribedEvents\Search:global_role.html.php',
-                        array(
+                        [
                             'showMore'     => true,
                             'searchString' => $str,
-                            'remaining'    => (count($roles) - 5)
-                        )
+                            'remaining'    => (count($roles) - 5),
+                        ]
                     )->getContent();
                 }
                 $roleResults['count'] = count($roles);
@@ -149,5 +148,4 @@ public function onBuildCommandList(MauticEvents\CommandListEvent $event)
             );
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/EventListener/UserSubscriber.php b/app/bundles/UserBundle/EventListener/UserSubscriber.php
index e8a9fe6041e..44a4cd0a78a 100644
--- a/app/bundles/UserBundle/EventListener/UserSubscriber.php
+++ b/app/bundles/UserBundle/EventListener/UserSubscriber.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
 use Mautic\UserBundle\Event as Events;
 use Mautic\UserBundle\UserEvents;
 
 /**
- * Class UserSubscriber
+ * Class UserSubscriber.
  */
 class UserSubscriber extends CommonSubscriber
 {
@@ -46,18 +46,18 @@ public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $audit
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            UserEvents::USER_POST_SAVE      => array('onUserPostSave', 0),
-            UserEvents::USER_POST_DELETE    => array('onUserDelete', 0),
-            UserEvents::ROLE_POST_SAVE      => array('onRolePostSave', 0),
-            UserEvents::ROLE_POST_DELETE    => array('onRoleDelete', 0)
-        );
+        return [
+            UserEvents::USER_POST_SAVE   => ['onUserPostSave', 0],
+            UserEvents::USER_POST_DELETE => ['onUserDelete', 0],
+            UserEvents::ROLE_POST_SAVE   => ['onRolePostSave', 0],
+            UserEvents::ROLE_POST_DELETE => ['onRoleDelete', 0],
+        ];
     }
 
     /**
-     * Add a user entry to the audit log
+     * Add a user entry to the audit log.
      *
      * @param Events\UserEvent $event
      */
@@ -66,39 +66,39 @@ public function onUserPostSave(Events\UserEvent $event)
         $user = $event->getUser();
 
         if ($details = $event->getChanges()) {
-            $log        = array(
-                "bundle"    => "user",
-                "object"    => "user",
-                "objectId"  => $user->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'user',
+                'object'    => 'user',
+                'objectId'  => $user->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a user delete entry to the audit log
+     * Add a user delete entry to the audit log.
      *
      * @param Events\UserEvent $event
      */
     public function onUserDelete(Events\UserEvent $event)
     {
         $user = $event->getUser();
-        $log = array(
-            "bundle"     => "user",
-            "object"     => "user",
-            "objectId"   => $user->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $user->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log  = [
+            'bundle'    => 'user',
+            'object'    => 'user',
+            'objectId'  => $user->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $user->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 
     /**
-     * Add a role entry to the audit log
+     * Add a role entry to the audit log.
      *
      * @param Events\RoleEvent $event
      */
@@ -106,34 +106,34 @@ public function onRolePostSave(Events\RoleEvent $event)
     {
         $role = $event->getRole();
         if ($details = $event->getChanges()) {
-            $log        = array(
-                "bundle"    => "user",
-                "object"    => "role",
-                "objectId"  => $role->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'user',
+                'object'    => 'role',
+                'objectId'  => $role->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a role delete entry to the audit log
+     * Add a role delete entry to the audit log.
      *
      * @param Events\RoleEvent $event
      */
     public function onRoleDelete(Events\RoleEvent $event)
     {
         $role = $event->getRole();
-        $log = array(
-            "bundle"     => "user",
-            "object"     => "role",
-            "objectId"   => $role->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $role->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log  = [
+            'bundle'    => 'user',
+            'object'    => 'role',
+            'objectId'  => $role->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $role->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
 }
diff --git a/app/bundles/UserBundle/Form/Type/ContactType.php b/app/bundles/UserBundle/Form/Type/ContactType.php
index 9e0b729995e..69ac14d86aa 100644
--- a/app/bundles/UserBundle/Form/Type/ContactType.php
+++ b/app/bundles/UserBundle/Form/Type/ContactType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,64 +14,62 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\Collection;
 
 /**
- * Class ContactType
+ * Class ContactType.
  */
 class ContactType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('msg_subject', 'text', array(
-                'label'      => 'mautic.email.subject',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control'),
-                'constraints' => array(
-                    new NotBlank(array('message' => 'Subject should not be blank.')),
-                    new Length(array('min' => 3))
-                )
-            ))
-            ->add('msg_body', 'textarea', array(
+            ->add('msg_subject', 'text', [
+                'label'       => 'mautic.email.subject',
+                'label_attr'  => ['class' => 'control-label'],
+                'attr'        => ['class' => 'form-control'],
+                'constraints' => [
+                    new NotBlank(['message' => 'Subject should not be blank.']),
+                    new Length(['min' => 3]),
+                ],
+            ])
+            ->add('msg_body', 'textarea', [
                 'label'      => 'mautic.user.user.contact.message',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class' => 'form-control',
-                    'rows'  => 10
-                ),
-                'constraints' => array(
-                    new NotBlank(array('message' => 'Message should not be blank.')),
-                    new Length(array('min' => 5))
-                )
-            ))
-            ->add('entity', 'hidden', array(
-                'attr' => array(
-                    'autocomplete' => 'off'
-                )
-            ))
-            ->add('id', 'hidden', array(
-                'attr' => array(
-                    'autocomplete' => 'off'
-                )
-            ))
-            ->add('returnUrl', 'hidden', array(
-                'attr' => array(
-                    'autocomplete' => 'off'
-                )
-            ))
-            ->add('buttons', 'form_buttons', array(
+                    'rows'  => 10,
+                ],
+                'constraints' => [
+                    new NotBlank(['message' => 'Message should not be blank.']),
+                    new Length(['min' => 5]),
+                ],
+            ])
+            ->add('entity', 'hidden', [
+                'attr' => [
+                    'autocomplete' => 'off',
+                ],
+            ])
+            ->add('id', 'hidden', [
+                'attr' => [
+                    'autocomplete' => 'off',
+                ],
+            ])
+            ->add('returnUrl', 'hidden', [
+                'attr' => [
+                    'autocomplete' => 'off',
+                ],
+            ])
+            ->add('buttons', 'form_buttons', [
                 'save_text'  => 'mautic.user.user.contact.send',
                 'save_icon'  => 'fa fa-send',
-                'apply_text' => false
-            ));
+                'apply_text' => false,
+            ]);
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
diff --git a/app/bundles/UserBundle/Form/Type/PasswordResetConfirmType.php b/app/bundles/UserBundle/Form/Type/PasswordResetConfirmType.php
index 5fa090be8fe..3f59aba8e89 100644
--- a/app/bundles/UserBundle/Form/Type/PasswordResetConfirmType.php
+++ b/app/bundles/UserBundle/Form/Type/PasswordResetConfirmType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class PasswordResetType
+ * Class PasswordResetType.
  */
 class PasswordResetConfirmType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -27,74 +27,74 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addEventSubscriber(new CleanFormSubscriber());
 
-        $builder->add('identifier', 'text', array(
+        $builder->add('identifier', 'text', [
             'label'      => 'mautic.user.auth.form.loginusername',
-            'label_attr' => array('class' => 'sr-only'),
-            'attr'       => array(
-                'class'    => 'form-control',
+            'label_attr' => ['class' => 'sr-only'],
+            'attr'       => [
+                'class'       => 'form-control',
                 'preaddon'    => 'fa fa-user',
-                'placeholder' => 'mautic.user.auth.form.loginusername'
-            ),
-            'required' => true,
-            'constraints' => array(
-                new Assert\NotBlank(array('message' => 'mautic.user.user.passwordreset.notblank'))
-            )
-        ));
+                'placeholder' => 'mautic.user.auth.form.loginusername',
+            ],
+            'required'    => true,
+            'constraints' => [
+                new Assert\NotBlank(['message' => 'mautic.user.user.passwordreset.notblank']),
+            ],
+        ]);
 
-        $builder->add('plainPassword', 'repeated', array(
-            'first_name'        => 'password',
-            'first_options'     => array(
+        $builder->add('plainPassword', 'repeated', [
+            'first_name'    => 'password',
+            'first_options' => [
                 'label'      => 'mautic.core.password',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'placeholder'  => 'mautic.user.user.passwordreset.password.placeholder',
                     'tooltip'      => 'mautic.user.user.form.help.passwordrequirements',
                     'preaddon'     => 'fa fa-lock',
-                    'autocomplete' => 'off'
-                ),
-                'required'   => true,
-                'error_bubbling'    => false,
-                'constraints' => array(
-                    new Assert\NotBlank(array('message' => 'mautic.user.user.passwordreset.notblank')),
-                    new Assert\Length(array(
-                        'min' => 6,
-                        'minMessage' => 'mautic.user.user.password.minlength'
-                    ))
-                )
-            ),
-            'second_name'       => 'confirm',
-            'second_options'    => array(
+                    'autocomplete' => 'off',
+                ],
+                'required'       => true,
+                'error_bubbling' => false,
+                'constraints'    => [
+                    new Assert\NotBlank(['message' => 'mautic.user.user.passwordreset.notblank']),
+                    new Assert\Length([
+                        'min'        => 6,
+                        'minMessage' => 'mautic.user.user.password.minlength',
+                    ]),
+                ],
+            ],
+            'second_name'    => 'confirm',
+            'second_options' => [
                 'label'      => 'mautic.user.user.form.passwordconfirm',
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array(
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'        => 'form-control',
                     'placeholder'  => 'mautic.user.user.passwordreset.confirm.placeholder',
                     'tooltip'      => 'mautic.user.user.form.help.passwordrequirements',
                     'preaddon'     => 'fa fa-lock',
-                    'autocomplete' => 'off'
-                ),
-                'required'   => true,
-                'error_bubbling'    => false,
-                'constraints' => array(
-                    new Assert\NotBlank(array('message' => 'mautic.user.user.passwordreset.notblank'))
-                )
-            ),
-            'type'              => 'password',
-            'invalid_message'   => 'mautic.user.user.password.mismatch',
-            'required'          => true,
-            'error_bubbling'    => false
-        ));
+                    'autocomplete' => 'off',
+                ],
+                'required'       => true,
+                'error_bubbling' => false,
+                'constraints'    => [
+                    new Assert\NotBlank(['message' => 'mautic.user.user.passwordreset.notblank']),
+                ],
+            ],
+            'type'            => 'password',
+            'invalid_message' => 'mautic.user.user.password.mismatch',
+            'required'        => true,
+            'error_bubbling'  => false,
+        ]);
 
-        $builder->add('submit', 'submit', array(
-            'attr'     => array(
-                'class'   => 'btn btn-lg btn-primary btn-block',
-            ),
-            'label'    => 'mautic.user.user.passwordreset.reset'
-        ));
+        $builder->add('submit', 'submit', [
+            'attr' => [
+                'class' => 'btn btn-lg btn-primary btn-block',
+            ],
+            'label' => 'mautic.user.user.passwordreset.reset',
+        ]);
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -103,6 +103,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "passwordresetconfirm";
+        return 'passwordresetconfirm';
     }
 }
diff --git a/app/bundles/UserBundle/Form/Type/PasswordResetType.php b/app/bundles/UserBundle/Form/Type/PasswordResetType.php
index a05255e7f74..8242379e22d 100644
--- a/app/bundles/UserBundle/Form/Type/PasswordResetType.php
+++ b/app/bundles/UserBundle/Form/Type/PasswordResetType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class PasswordResetType
+ * Class PasswordResetType.
  */
 class PasswordResetType extends AbstractType
 {
-
     /**
      * {@inheritdoc}
      */
@@ -27,28 +27,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addEventSubscriber(new CleanFormSubscriber());
 
-        $builder->add('identifier', 'text', array(
+        $builder->add('identifier', 'text', [
             'label'      => 'mautic.user.auth.form.loginusername',
-            'label_attr' => array('class' => 'sr-only'),
-            'attr'       => array(
-                'class'    => 'form-control',
+            'label_attr' => ['class' => 'sr-only'],
+            'attr'       => [
+                'class'       => 'form-control',
                 'preaddon'    => 'fa fa-user',
-                'placeholder' => 'mautic.user.auth.form.loginusername'
-            ),
-            'constraints' => array(
-                new Assert\NotBlank(array('message' => 'mautic.user.user.passwordreset.notblank'))
-            )
-        ));
-
-        $builder->add('submit', 'submit', array(
-            'attr'     => array(
-                'class'   => 'btn btn-lg btn-primary btn-block',
-            ),
-            'label'    => 'mautic.user.user.passwordreset.reset'
-        ));
-
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+                'placeholder' => 'mautic.user.auth.form.loginusername',
+            ],
+            'constraints' => [
+                new Assert\NotBlank(['message' => 'mautic.user.user.passwordreset.notblank']),
+            ],
+        ]);
+
+        $builder->add('submit', 'submit', [
+            'attr' => [
+                'class' => 'btn btn-lg btn-primary btn-block',
+            ],
+            'label' => 'mautic.user.user.passwordreset.reset',
+        ]);
+
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -57,6 +57,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "passwordreset";
+        return 'passwordreset';
     }
 }
diff --git a/app/bundles/UserBundle/Form/Type/PermissionListType.php b/app/bundles/UserBundle/Form/Type/PermissionListType.php
index ce979dfbb34..05960580b97 100644
--- a/app/bundles/UserBundle/Form/Type/PermissionListType.php
+++ b/app/bundles/UserBundle/Form/Type/PermissionListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,34 +15,34 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class PermissionListType
+ * Class PermissionListType.
  */
 class PermissionListType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(array('bundle', 'level'));
+        $resolver->setRequired(['bundle', 'level']);
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'multiple'   => true,
             'expanded'   => true,
-            'label_attr' => array('class' => 'control-label'),
+            'label_attr' => ['class' => 'control-label'],
             'attr'       => function (Options $options) {
-                return array(
-                    'data-permission' => $options['bundle'] . ':' . $options['level'],
-                    'onchange'        => 'Mautic.onPermissionChange(this, \'' . $options['bundle'] . '\')'
-                );
-            }
-        ));
+                return [
+                    'data-permission' => $options['bundle'].':'.$options['level'],
+                    'onchange'        => 'Mautic.onPermissionChange(this, \''.$options['bundle'].'\')',
+                ];
+            },
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getParent ()
+    public function getParent()
     {
         return 'choice';
     }
@@ -49,7 +50,7 @@ public function getParent ()
     /**
      * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
         return 'permissionlist';
     }
diff --git a/app/bundles/UserBundle/Form/Type/PermissionsType.php b/app/bundles/UserBundle/Form/Type/PermissionsType.php
index 95f93c3fce1..e6405998a5e 100644
--- a/app/bundles/UserBundle/Form/Type/PermissionsType.php
+++ b/app/bundles/UserBundle/Form/Type/PermissionsType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,10 +13,9 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class PermissionsType
+ * Class PermissionsType.
  */
 class PermissionsType extends AbstractType
 {
@@ -25,16 +25,16 @@ class PermissionsType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         foreach ($options['permissionsConfig'] as $bundle => $config) {
-            $builder->add($bundle, 'hidden', array(
+            $builder->add($bundle, 'hidden', [
                 'data'   => 'newbundle',
                 'label'  => false,
-                'mapped' => false
-            ));
+                'mapped' => false,
+            ]);
             $config['permissionObject']->buildForm($builder, $options, $config['data']);
         }
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -43,7 +43,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "permissions";
+        return 'permissions';
     }
 
     /**
@@ -51,9 +51,9 @@ public function getName()
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'cascade_validation' => true,
-            'permissionsConfig'  => array()
-        ));
+            'permissionsConfig'  => [],
+        ]);
     }
 }
diff --git a/app/bundles/UserBundle/Form/Type/RoleListType.php b/app/bundles/UserBundle/Form/Type/RoleListType.php
index 432a9f4bee0..fdd09c445ee 100644
--- a/app/bundles/UserBundle/Form/Type/RoleListType.php
+++ b/app/bundles/UserBundle/Form/Type/RoleListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class RoleListType
+ * Class RoleListType.
  */
 class RoleListType extends AbstractType
 {
@@ -37,10 +38,10 @@ public function __construct(RoleModel $model)
                         [
                             'column' => 'r.isPublished',
                             'expr'   => 'eq',
-                            'value'  => true
-                        ]
-                    ]
-                ]
+                            'value'  => true,
+                        ],
+                    ],
+                ],
             ]
         );
 
@@ -63,7 +64,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'expanded'    => false,
                 'multiple'    => false,
                 'required'    => false,
-                'empty_value' => 'mautic.core.form.chooseone'
+                'empty_value' => 'mautic.core.form.chooseone',
             ]
         );
     }
@@ -73,7 +74,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "role_list";
+        return 'role_list';
     }
 
     /**
@@ -83,4 +84,4 @@ public function getParent()
     {
         return 'choice';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Form/Type/RoleType.php b/app/bundles/UserBundle/Form/Type/RoleType.php
index 30f31afe0c0..0da0926c470 100644
--- a/app/bundles/UserBundle/Form/Type/RoleType.php
+++ b/app/bundles/UserBundle/Form/Type/RoleType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,55 +15,54 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class RoleType
+ * Class RoleType.
  */
 class RoleType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventSubscriber(new CleanFormSubscriber(array('description' => 'html')));
+        $builder->addEventSubscriber(new CleanFormSubscriber(['description' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('user.role', $options));
 
-        $builder->add('name', 'text', array(
+        $builder->add('name', 'text', [
             'label'      => 'mautic.core.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control')
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('description', 'textarea', array(
+        $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control editor'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
 
-        $builder->add('isAdmin', 'yesno_button_group', array(
-            'label'       => 'mautic.user.role.form.isadmin',
-            'attr'        => array(
+        $builder->add('isAdmin', 'yesno_button_group', [
+            'label' => 'mautic.user.role.form.isadmin',
+            'attr'  => [
                 'onchange' => 'Mautic.togglePermissionVisibility();',
-                'tooltip'  => 'mautic.user.role.form.isadmin.tooltip'
-            )
-        ));
+                'tooltip'  => 'mautic.user.role.form.isadmin.tooltip',
+            ],
+        ]);
 
         // add a normal text field, but add your transformer to it
         $hidden = ($options['data']->isAdmin()) ? ' hide' : '';
 
         $builder->add(
-            'permissions', 'permissions', array(
-                'label'             => 'mautic.user.role.permissions',
-                'mapped'            => false, //we'll have to manually build the permissions for persisting
-                'required'          => false,
-                'attr'              => array(
-                    'class' => $hidden
-                ),
-                'permissionsConfig' => $options['permissionsConfig']
-            )
+            'permissions', 'permissions', [
+                'label'    => 'mautic.user.role.permissions',
+                'mapped'   => false, //we'll have to manually build the permissions for persisting
+                'required' => false,
+                'attr'     => [
+                    'class' => $hidden,
+                ],
+                'permissionsConfig' => $options['permissionsConfig'],
+            ]
         );
 
         $builder->add('buttons', 'form_buttons');
@@ -75,20 +75,20 @@ public function buildForm (FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class'         => 'Mautic\UserBundle\Entity\Role',
             'cascade_validation' => true,
-            'permissionsConfig'  => array()
-        ));
+            'permissionsConfig'  => [],
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
-        return "role";
+        return 'role';
     }
 }
diff --git a/app/bundles/UserBundle/Form/Type/UserListType.php b/app/bundles/UserBundle/Form/Type/UserListType.php
index e465af0b694..957393d60bf 100644
--- a/app/bundles/UserBundle/Form/Type/UserListType.php
+++ b/app/bundles/UserBundle/Form/Type/UserListType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,13 +15,10 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class UserListType
- *
- * @package Mautic\UserBundle\Form\Type
+ * Class UserListType.
  */
 class UserListType extends AbstractType
 {
-
     private $choices = [];
 
     /**
@@ -37,10 +35,10 @@ public function __construct(UserModel $model)
                         [
                             'column' => 'u.isPublished',
                             'expr'   => 'eq',
-                            'value'  => true
-                        ]
-                    ]
-                ]
+                            'value'  => true,
+                        ],
+                    ],
+                ],
             ]
         );
 
@@ -63,7 +61,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'expanded'    => false,
                 'multiple'    => true,
                 'required'    => false,
-                'empty_value' => 'mautic.core.form.chooseone'
+                'empty_value' => 'mautic.core.form.chooseone',
             ]
         );
     }
@@ -73,7 +71,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "user_list";
+        return 'user_list';
     }
 
     /**
@@ -83,4 +81,4 @@ public function getParent()
     {
         return 'choice';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Form/Type/UserType.php b/app/bundles/UserBundle/Form/Type/UserType.php
index c1d67a09837..bcae869ca8d 100644
--- a/app/bundles/UserBundle/Form/Type/UserType.php
+++ b/app/bundles/UserBundle/Form/Type/UserType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,14 +21,12 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class UserType
+ * Class UserType.
  */
 class UserType extends AbstractType
 {
-
     /**
      * @var \Symfony\Bundle\FrameworkBundle\Translation\Translator
      */
@@ -101,8 +100,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr'       => [
                     'class'        => 'form-control',
                     'preaddon'     => 'fa fa-user',
-                    'autocomplete' => 'off'
-                ]
+                    'autocomplete' => 'off',
+                ],
             ]
         );
 
@@ -112,7 +111,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'      => 'mautic.core.firstname',
                 'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control']
+                'attr'       => ['class' => 'form-control'],
             ]
         );
 
@@ -122,7 +121,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'      => 'mautic.core.lastname',
                 'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control']
+                'attr'       => ['class' => 'form-control'],
             ]
         );
 
@@ -135,9 +134,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'        => 'form-control',
-                    'data-options' => json_encode($positions)
+                    'data-options' => json_encode($positions),
                 ],
-                'required'   => false
+                'required' => false,
             ]
         );
 
@@ -149,51 +148,51 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => [
                     'class'    => 'form-control',
-                    'preaddon' => 'fa fa-envelope'
-                ]
+                    'preaddon' => 'fa fa-envelope',
+                ],
             ]
         );
 
         $existing    = (!empty($options['data']) && $options['data']->getId());
         $placeholder = ($existing) ?
             $this->translator->trans('mautic.user.user.form.passwordplaceholder') : '';
-        $required    = ($existing) ? false : true;
+        $required = ($existing) ? false : true;
         $builder->add(
             'plainPassword',
             'repeated',
             [
-                'first_name'      => 'password',
-                'first_options'   => [
-                    'label'          => 'mautic.core.password',
-                    'label_attr'     => ['class' => 'control-label'],
-                    'attr'           => [
+                'first_name'    => 'password',
+                'first_options' => [
+                    'label'      => 'mautic.core.password',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'        => 'form-control',
                         'placeholder'  => $placeholder,
                         'tooltip'      => 'mautic.user.user.form.help.passwordrequirements',
                         'preaddon'     => 'fa fa-lock',
-                        'autocomplete' => 'off'
+                        'autocomplete' => 'off',
                     ],
                     'required'       => $required,
-                    'error_bubbling' => false
+                    'error_bubbling' => false,
                 ],
-                'second_name'     => 'confirm',
-                'second_options'  => [
-                    'label'          => 'mautic.user.user.form.passwordconfirm',
-                    'label_attr'     => ['class' => 'control-label'],
-                    'attr'           => [
+                'second_name'    => 'confirm',
+                'second_options' => [
+                    'label'      => 'mautic.user.user.form.passwordconfirm',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'        => 'form-control',
                         'placeholder'  => $placeholder,
                         'tooltip'      => 'mautic.user.user.form.help.passwordrequirements',
                         'preaddon'     => 'fa fa-lock',
-                        'autocomplete' => 'off'
+                        'autocomplete' => 'off',
                     ],
                     'required'       => $required,
-                    'error_bubbling' => false
+                    'error_bubbling' => false,
                 ],
                 'type'            => 'password',
                 'invalid_message' => 'mautic.user.user.password.mismatch',
                 'required'        => $required,
-                'error_bubbling'  => false
+                'error_bubbling'  => false,
             ]
         );
 
@@ -201,13 +200,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'timezone',
             'timezone',
             [
-                'label'       => 'mautic.core.timezone',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                    'class' => 'form-control'
+                'label'      => 'mautic.core.timezone',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class' => 'form-control',
                 ],
                 'multiple'    => false,
-                'empty_value' => 'mautic.user.user.form.defaulttimezone'
+                'empty_value' => 'mautic.user.user.form.defaulttimezone',
             ]
         );
 
@@ -215,14 +214,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'locale',
             'choice',
             [
-                'choices'     => $this->supportedLanguages,
-                'label'       => 'mautic.core.language',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
-                    'class' => 'form-control'
+                'choices'    => $this->supportedLanguages,
+                'label'      => 'mautic.core.language',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
+                    'class' => 'form-control',
                 ],
                 'multiple'    => false,
-                'empty_value' => 'mautic.user.user.form.defaultlocale'
+                'empty_value' => 'mautic.user.user.form.defaultlocale',
             ]
         );
 
@@ -241,9 +240,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label_attr' => ['class' => 'control-label'],
                 'required'   => false,
                 'attr'       => [
-                    'class' => 'form-control'
+                    'class' => 'form-control',
                 ],
-                'data'       => $defaultSignature
+                'data' => $defaultSignature,
             ]
         );
 
@@ -253,10 +252,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'role',
                     'entity',
                     [
-                        'label'         => 'mautic.user.role',
-                        'label_attr'    => ['class' => 'control-label'],
-                        'attr'          => [
-                            'class' => 'form-control'
+                        'label'      => 'mautic.user.role',
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
+                            'class' => 'form-control',
                         ],
                         'class'         => 'MauticUserBundle:Role',
                         'property'      => 'name',
@@ -264,7 +263,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                             return $er->createQueryBuilder('r')
                                 ->where('r.isPublished = true')
                                 ->orderBy('r.name', 'ASC');
-                        }
+                        },
                     ]
                 )
             );
@@ -272,21 +271,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add('isPublished', 'yesno_button_group');
 
             $builder->add('buttons', 'form_buttons');
-
         } else {
-
             $builder->add(
                 'buttons',
                 'form_buttons',
                 [
                     'save_text'  => 'mautic.core.form.apply',
-                    'apply_text' => false
+                    'apply_text' => false,
                 ]
             );
         }
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
     }
 
@@ -302,8 +299,8 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                     'Mautic\UserBundle\Entity\User',
                     'determineValidationGroups',
                 ],
-                'ignore_formexit'   => false,
-                'in_profile'        => false
+                'ignore_formexit' => false,
+                'in_profile'      => false,
             ]
         );
     }
@@ -313,6 +310,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function getName()
     {
-        return "user";
+        return 'user';
     }
 }
diff --git a/app/bundles/UserBundle/MauticUserBundle.php b/app/bundles/UserBundle/MauticUserBundle.php
index e4ea415062c..5af56c12103 100644
--- a/app/bundles/UserBundle/MauticUserBundle.php
+++ b/app/bundles/UserBundle/MauticUserBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticUserBundle
+ * Class MauticUserBundle.
  */
 class MauticUserBundle extends Bundle
 {
diff --git a/app/bundles/UserBundle/Model/RoleModel.php b/app/bundles/UserBundle/Model/RoleModel.php
index 01731ad24a0..2fef6d86a87 100644
--- a/app/bundles/UserBundle/Model/RoleModel.php
+++ b/app/bundles/UserBundle/Model/RoleModel.php
@@ -1,28 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Model;
 
 use Mautic\CoreBundle\Model\FormModel;
-use Mautic\UserBundle\Event\RoleEvent;
 use Mautic\UserBundle\Entity\Role;
+use Mautic\UserBundle\Event\RoleEvent;
 use Mautic\UserBundle\UserEvents;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\PreconditionRequiredHttpException;
 
 /**
- * Class RoleModel
+ * Class RoleModel.
  */
 class RoleModel extends FormModel
 {
-
     /**
      * {@inheritdoc}
      */
@@ -47,7 +47,7 @@ public function getPermissionBase()
     public function saveEntity($entity, $unlock = true)
     {
         if (!$entity instanceof Role) {
-            throw new MethodNotAllowedHttpException(array('Role'), 'Entity must be of class Role()');
+            throw new MethodNotAllowedHttpException(['Role'], 'Entity must be of class Role()');
         }
 
         $isNew = ($entity->getId()) ? 0 : 1;
@@ -61,9 +61,9 @@ public function saveEntity($entity, $unlock = true)
     }
 
     /**
-     * Generate the role's permissions
+     * Generate the role's permissions.
      *
-     * @param Role $entity
+     * @param Role  $entity
      * @param array $rawPermissions (i.e. from request)
      */
     public function setRolePermissions(Role &$entity, $rawPermissions)
@@ -75,7 +75,7 @@ public function setRolePermissions(Role &$entity, $rawPermissions)
         //set permissions if applicable and if the user is not an admin
         $permissions = (!$entity->isAdmin() && !empty($rawPermissions)) ?
             $this->security->generatePermissions($rawPermissions) :
-            array();
+            [];
 
         foreach ($permissions as $permissionEntity) {
             $entity->addPermission($permissionEntity);
@@ -92,13 +92,13 @@ public function setRolePermissions(Role &$entity, $rawPermissions)
     public function deleteEntity($entity)
     {
         if (!$entity instanceof Role) {
-            throw new MethodNotAllowedHttpException(array('Role'), 'Entity must be of class Role()');
+            throw new MethodNotAllowedHttpException(['Role'], 'Entity must be of class Role()');
         }
 
         $users = $this->em->getRepository('MauticUserBundle:User')->findByRole($entity);
         if (count($users)) {
             throw new PreconditionRequiredHttpException(
-                $this->translator->trans('mautic.user.role.error.deletenotallowed', array('%name%' => $entity->getName()), 'flashes')
+                $this->translator->trans('mautic.user.role.error.deletenotallowed', ['%name%' => $entity->getName()], 'flashes')
             );
         }
 
@@ -110,13 +110,13 @@ public function deleteEntity($entity)
      *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Role) {
-            throw new MethodNotAllowedHttpException(array('Role'));
+            throw new MethodNotAllowedHttpException(['Role']);
         }
 
-        if(!empty($action)) {
+        if (!empty($action)) {
             $options['action'] = $action;
         }
 
@@ -143,20 +143,20 @@ public function getEntity($id = null)
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof Role) {
-            throw new MethodNotAllowedHttpException(array('Role'), 'Entity must be of class Role()');
+            throw new MethodNotAllowedHttpException(['Role'], 'Entity must be of class Role()');
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = UserEvents::ROLE_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = UserEvents::ROLE_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = UserEvents::ROLE_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = UserEvents::ROLE_POST_DELETE;
                 break;
             default:
@@ -169,6 +169,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
                 $event->setEntityManager($this->em);
             }
             $this->dispatcher->dispatch($name, $event);
+
             return $event;
         }
 
diff --git a/app/bundles/UserBundle/Model/UserModel.php b/app/bundles/UserBundle/Model/UserModel.php
index 836f8ad9902..5ac38a2a25b 100644
--- a/app/bundles/UserBundle/Model/UserModel.php
+++ b/app/bundles/UserBundle/Model/UserModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,16 +12,16 @@
 
 use Mautic\CoreBundle\Model\FormModel;
 use Mautic\EmailBundle\Helper\MailHelper;
+use Mautic\UserBundle\Entity\User;
 use Mautic\UserBundle\Event\StatusChangeEvent;
 use Mautic\UserBundle\Event\UserEvent;
 use Mautic\UserBundle\UserEvents;
-use Mautic\UserBundle\Entity\User;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
 
 /**
- * Class UserModel
+ * Class UserModel.
  */
 class UserModel extends FormModel
 {
@@ -35,23 +36,23 @@ public function __construct(MailHelper $mailHelper)
     }
 
     /**
-     * Define statuses that are supported
+     * Define statuses that are supported.
      *
      * @var array
      */
-    private $supportedOnlineStatuses = array(
+    private $supportedOnlineStatuses = [
         'online',
         'idle',
         'away',
         'manualaway',
         'dnd',
-        'offline'
-    );
+        'offline',
+    ];
 
     /**
      * {@inheritdoc}
      */
-    public function getRepository ()
+    public function getRepository()
     {
         return $this->em->getRepository('MauticUserBundle:User');
     }
@@ -59,7 +60,7 @@ public function getRepository ()
     /**
      * {@inheritdoc}
      */
-    public function getPermissionBase ()
+    public function getPermissionBase()
     {
         return 'user:users';
     }
@@ -69,17 +70,17 @@ public function getPermissionBase ()
      *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
-    public function saveEntity ($entity, $unlock = true)
+    public function saveEntity($entity, $unlock = true)
     {
         if (!$entity instanceof User) {
-            throw new MethodNotAllowedHttpException(array('User'), 'Entity must be of class User()');
+            throw new MethodNotAllowedHttpException(['User'], 'Entity must be of class User()');
         }
 
         parent::saveEntity($entity, $unlock);
     }
 
     /**
-     * Checks for a new password and rehashes if necessary
+     * Checks for a new password and rehashes if necessary.
      *
      * @param User                     $entity
      * @param PasswordEncoderInterface $encoder
@@ -87,7 +88,7 @@ public function saveEntity ($entity, $unlock = true)
      *
      * @return string
      */
-    public function checkNewPassword (User $entity, PasswordEncoderInterface $encoder, $submittedPassword)
+    public function checkNewPassword(User $entity, PasswordEncoderInterface $encoder, $submittedPassword)
     {
         if (!empty($submittedPassword)) {
             //hash the clear password submitted via the form
@@ -97,16 +98,15 @@ public function checkNewPassword (User $entity, PasswordEncoderInterface $encode
         return $entity->getPassword();
     }
 
-
     /**
      * {@inheritdoc}
      *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function createForm ($entity, $formFactory, $action = null, $options = array())
+    public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof User) {
-            throw new MethodNotAllowedHttpException(array('User'), 'Entity must be of class User()');
+            throw new MethodNotAllowedHttpException(['User'], 'Entity must be of class User()');
         }
         if (!empty($action)) {
             $options['action'] = $action;
@@ -118,7 +118,7 @@ public function createForm ($entity, $formFactory, $action = null, $options = ar
     /**
      * {@inheritdoc}
      */
-    public function getEntity ($id = null)
+    public function getEntity($id = null)
     {
         if ($id === null) {
             return new User();
@@ -141,23 +141,23 @@ public function getEntity ($id = null)
      *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
-    protected function dispatchEvent ($action, &$entity, $isNew = false, Event $event = null)
+    protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
     {
         if (!$entity instanceof User) {
-            throw new MethodNotAllowedHttpException(array('User'), 'Entity must be of class User()');
+            throw new MethodNotAllowedHttpException(['User'], 'Entity must be of class User()');
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = UserEvents::USER_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = UserEvents::USER_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = UserEvents::USER_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = UserEvents::USER_POST_DELETE;
                 break;
             default:
@@ -178,7 +178,7 @@ protected function dispatchEvent ($action, &$entity, $isNew = false, Event $even
     }
 
     /**
-     * Get list of entities for autopopulate fields
+     * Get list of entities for autopopulate fields.
      *
      * @param string $type
      * @param string $filter
@@ -186,9 +186,9 @@ protected function dispatchEvent ($action, &$entity, $isNew = false, Event $even
      *
      * @return array
      */
-    public function getLookupResults ($type, $filter = '', $limit = 10)
+    public function getLookupResults($type, $filter = '', $limit = 10)
     {
-        $results = array();
+        $results = [];
         switch ($type) {
             case 'role':
                 $results = $this->em->getRepository('MauticUserBundle:Role')->getRoleList($filter, $limit);
@@ -205,11 +205,11 @@ public function getLookupResults ($type, $filter = '', $limit = 10)
     }
 
     /**
-     * Resets the user password and emails it
+     * Resets the user password and emails it.
      *
-     * @param User $user
+     * @param User                     $user
      * @param PasswordEncoderInterface $encoder
-     * @param string $newPassword
+     * @param string                   $newPassword
      */
     public function resetPassword(User $user, PasswordEncoderInterface $encoder, $newPassword)
     {
@@ -231,14 +231,14 @@ protected function getResetToken(User $user)
 
         $dateTime = ($lastLogin instanceof \DateTime) ? $lastLogin->format('Y-m-d H:i:s') : null;
 
-        return hash('sha256', $user->getUsername() . $user->getEmail() . $dateTime);
+        return hash('sha256', $user->getUsername().$user->getEmail().$dateTime);
     }
 
     /**
-     * @param User $user
+     * @param User   $user
      * @param string $token
      *
-     * @return boolean
+     * @return bool
      */
     public function confirmResetToken(User $user, $token)
     {
@@ -273,13 +273,13 @@ public function sendResetEmail(User $user)
     }
 
     /**
-     * Set user preference
+     * Set user preference.
      *
      * @param      $key
      * @param null $value
      * @param User $user
      */
-    public function setPreference ($key, $value = null, User $user = null)
+    public function setPreference($key, $value = null, User $user = null)
     {
         if ($user == null) {
             $user = $this->user;
@@ -294,15 +294,13 @@ public function setPreference ($key, $value = null, User $user = null)
     }
 
     /**
-     * Get user preference
+     * Get user preference.
      *
      * @param      $key
      * @param null $default
      * @param User $user
-     *
-     * @return null
      */
-    public function getPreference ($key, $default = null, User $user = null)
+    public function getPreference($key, $default = null, User $user = null)
     {
         if ($user == null) {
             $user = $this->user;
@@ -331,4 +329,4 @@ public function setOnlineStatus($status)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Security/Authentication/AuthenticationHandler.php b/app/bundles/UserBundle/Security/Authentication/AuthenticationHandler.php
index dfe8f6d7d76..0a2e5b1ddfa 100644
--- a/app/bundles/UserBundle/Security/Authentication/AuthenticationHandler.php
+++ b/app/bundles/UserBundle/Security/Authentication/AuthenticationHandler.php
@@ -1,24 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Security\Authentication;
 
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
+use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 
 class AuthenticationHandler implements AuthenticationSuccessHandlerInterface, AuthenticationFailureHandlerInterface
 {
@@ -26,12 +27,12 @@ class AuthenticationHandler implements AuthenticationSuccessHandlerInterface, Au
     private $session;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @author    Joe Sexton <joe@webtipblog.com>
      *
-     * @param    RouterInterface $router
-     * @param    Session         $session
+     * @param RouterInterface $router
+     * @param Session         $session
      */
     public function __construct(RouterInterface $router, Session $session)
     {
@@ -40,14 +41,14 @@ public function __construct(RouterInterface $router, Session $session)
     }
 
     /**
-     * onAuthenticationSuccess
+     * onAuthenticationSuccess.
      *
      * @author    Joe Sexton <joe@webtipblog.com>
      *
-     * @param    Request        $request
-     * @param    TokenInterface $token
+     * @param Request        $request
+     * @param TokenInterface $token
      *
-     * @return    Response
+     * @return Response
      */
     public function onAuthenticationSuccess(Request $request, TokenInterface $token)
     {
@@ -70,14 +71,14 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token)
     }
 
     /**
-     * onAuthenticationFailure
+     * onAuthenticationFailure.
      *
      * @author    Joe Sexton <joe@webtipblog.com>
      *
-     * @param    Request                 $request
-     * @param    AuthenticationException $exception
+     * @param Request                 $request
+     * @param AuthenticationException $exception
      *
-     * @return    Response
+     * @return Response
      */
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
     {
@@ -93,10 +94,9 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
 
             return $response;
         } else {
-
             $request->getSession()->set(Security::AUTHENTICATION_ERROR, $exception);
 
             return new RedirectResponse($this->router->generate('login'));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Security/Authentication/LogoutHandler.php b/app/bundles/UserBundle/Security/Authentication/LogoutHandler.php
index 6db8c9f342c..935881215e7 100644
--- a/app/bundles/UserBundle/Security/Authentication/LogoutHandler.php
+++ b/app/bundles/UserBundle/Security/Authentication/LogoutHandler.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -79,4 +80,4 @@ public function logout(Request $request, Response $response, TokenInterface $tok
         // Note that a logout occurred
         $session->set('post_logout', true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Security/Authentication/Token/PluginToken.php b/app/bundles/UserBundle/Security/Authentication/Token/PluginToken.php
index ad64b066f10..75dd59c0f67 100644
--- a/app/bundles/UserBundle/Security/Authentication/Token/PluginToken.php
+++ b/app/bundles/UserBundle/Security/Authentication/Token/PluginToken.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
 
 /**
- * Class PluginToken
+ * Class PluginToken.
  */
 class PluginToken extends AbstractToken
 {
@@ -84,9 +85,6 @@ public function getProviderKey()
         return $this->providerKey;
     }
 
-    /**
-     * @return null
-     */
     public function getAuthenticatingService()
     {
         return $this->authenticatingService;
@@ -116,4 +114,4 @@ public function unserialize($serialized)
         list($this->authenticatingService, $this->credentials, $this->providerKey, $parentStr) = unserialize($serialized);
         parent::unserialize($parentStr);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Security/Authenticator/FormAuthenticator.php b/app/bundles/UserBundle/Security/Authenticator/FormAuthenticator.php
index f53d0bbfe6e..f29f6ca27c4 100644
--- a/app/bundles/UserBundle/Security/Authenticator/FormAuthenticator.php
+++ b/app/bundles/UserBundle/Security/Authenticator/FormAuthenticator.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -117,7 +118,6 @@ public function authenticateToken(TokenInterface $token, UserProviderInterface $
         }
 
         if ($authenticated) {
-
             return new PluginToken(
                 $providerKey,
                 $authenticatingService,
@@ -127,7 +127,6 @@ public function authenticateToken(TokenInterface $token, UserProviderInterface $
                 $response
             );
         } elseif ($response) {
-
             return new PluginToken(
                 $providerKey,
                 $authenticatingService,
@@ -153,7 +152,6 @@ public function authenticateToken(TokenInterface $token, UserProviderInterface $
      */
     public function supportsToken(TokenInterface $token, $providerKey)
     {
-
         return ($token instanceof PluginToken || $token instanceof UsernamePasswordToken) && $token->getProviderKey() === $providerKey;
     }
 
@@ -167,7 +165,6 @@ public function supportsToken(TokenInterface $token, $providerKey)
      */
     public function createToken(Request $request, $username, $password, $providerKey)
     {
-
         return new PluginToken(
             $providerKey,
             null,
@@ -175,4 +172,4 @@ public function createToken(Request $request, $username, $password, $providerKey
             $password
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Security/Authenticator/PreAuthAuthenticator.php b/app/bundles/UserBundle/Security/Authenticator/PreAuthAuthenticator.php
index a8f8af8464c..37b74341f80 100644
--- a/app/bundles/UserBundle/Security/Authenticator/PreAuthAuthenticator.php
+++ b/app/bundles/UserBundle/Security/Authenticator/PreAuthAuthenticator.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -80,7 +81,6 @@ public function __construct(
     public function authenticate(TokenInterface $token)
     {
         if (!$this->supports($token)) {
-
             return null;
         }
 
@@ -128,7 +128,6 @@ public function authenticate(TokenInterface $token)
             }
 
             if (!$authenticated && empty($response)) {
-
                 throw new AuthenticationException('mautic.user.auth.error.invalidlogin');
             }
         }
@@ -152,4 +151,4 @@ public function supports(TokenInterface $token)
     {
         return $token instanceof PluginToken && $token->getProviderKey() === $this->providerKey;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Security/Firewall/AuthenticationListener.php b/app/bundles/UserBundle/Security/Firewall/AuthenticationListener.php
index b6a1819c6bb..ca7dd5c57f7 100644
--- a/app/bundles/UserBundle/Security/Firewall/AuthenticationListener.php
+++ b/app/bundles/UserBundle/Security/Firewall/AuthenticationListener.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -87,7 +88,6 @@ public function __construct(
     public function handle(GetResponseEvent $event)
     {
         if (null !== $this->tokenStorage->getToken()) {
-
             return;
         }
 
@@ -107,10 +107,8 @@ public function handle(GetResponseEvent $event)
                         $response = $this->onSuccess($request, $authToken, $response);
                     }
                 } elseif (empty($response)) {
-
                     throw new AuthenticationException('mautic.user.auth.error.invalidlogin');
                 }
-
             }
         } catch (AuthenticationException $exception) {
             if ('api' != $this->providerKey) {
@@ -175,4 +173,4 @@ private function onSuccess(Request $request, TokenInterface $token, Response $re
 
         return $response;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/Security/Permissions/UserPermissions.php b/app/bundles/UserBundle/Security/Permissions/UserPermissions.php
index a3e8182dccd..85b03de8caa 100644
--- a/app/bundles/UserBundle/Security/Permissions/UserPermissions.php
+++ b/app/bundles/UserBundle/Security/Permissions/UserPermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class UserPermissions
+ * Class UserPermissions.
  */
 class UserPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
@@ -35,7 +35,6 @@ public function __construct($params)
         ];
         $this->addStandardPermissions('users', false);
         $this->addStandardPermissions('roles', false);
-
     }
 
     /**
@@ -65,10 +64,10 @@ public function buildForm(FormBuilderInterface &$builder, array $options, array
                     'editposition' => 'mautic.user.account.permissions.editposition',
                     'full'         => 'mautic.user.account.permissions.editall',
                 ],
-                'label'   => 'mautic.user.permissions.profile',
-                'data'    => (!empty($data['profile']) ? $data['profile'] : []),
-                'bundle'  => 'user',
-                'level'   => 'profile',
+                'label'  => 'mautic.user.permissions.profile',
+                'data'   => (!empty($data['profile']) ? $data['profile'] : []),
+                'bundle' => 'user',
+                'level'  => 'profile',
             ]
         );
     }
diff --git a/app/bundles/UserBundle/Security/Provider/UserProvider.php b/app/bundles/UserBundle/Security/Provider/UserProvider.php
index 01a8f8e5aa0..6a4a9cf04a1 100644
--- a/app/bundles/UserBundle/Security/Provider/UserProvider.php
+++ b/app/bundles/UserBundle/Security/Provider/UserProvider.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle\Security\Provider;
 
-use Doctrine\ORM\Query;
 use Mautic\CoreBundle\Helper\EncryptionHelper;
 use Mautic\UserBundle\Entity\PermissionRepository;
 use Mautic\UserBundle\Entity\User;
@@ -21,13 +21,13 @@
 use Symfony\Component\Security\Core\Encoder\EncoderFactory;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 
 /**
- * Class UserProvider
+ * Class UserProvider.
  */
 class UserProvider implements UserProviderInterface
 {
@@ -81,6 +81,7 @@ public function __construct(
      * @param string $username
      *
      * @return User
+     *
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function loadUserByUsername($username)
@@ -147,7 +148,7 @@ public function supportsClass($class)
     }
 
     /**
-     * Create/update user from authentication plugins
+     * Create/update user from authentication plugins.
      *
      * @param User      $user
      * @param bool|true $createIfNotExists
@@ -171,22 +172,18 @@ public function saveUser(User $user, $createIfNotExists = true)
 
         // Validation for User objects returned by a plugin
         if (!$user->getRole()) {
-
             throw new AuthenticationException('mautic.integration.sso.error.no_role');
         }
 
         if (!$user->getUsername()) {
-
             throw new AuthenticationException('mautic.integration.sso.error.no_username');
         }
 
         if (!$user->getEmail()) {
-
             throw new AuthenticationException('mautic.integration.sso.error.no_email');
         }
 
         if (!$user->getFirstName() || !$user->getLastName()) {
-
             throw new AuthenticationException('mautic.integration.sso.error.no_name');
         }
 
@@ -218,4 +215,4 @@ public function saveUser(User $user, $createIfNotExists = true)
 
         return $user;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/UserBundle/UserEvents.php b/app/bundles/UserBundle/UserEvents.php
index 7f9cc3c50bd..f2c19ea32c4 100644
--- a/app/bundles/UserBundle/UserEvents.php
+++ b/app/bundles/UserBundle/UserEvents.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\UserBundle;
 
 /**
- * Class UserEvents
+ * Class UserEvents.
  *
  * Events available for UserBundle
  */
 final class UserEvents
 {
-
     /**
      * The mautic.user_pre_save event is dispatched right before a user is persisted.
      *
@@ -91,7 +91,7 @@ final class UserEvents
 
     /**
      * The mautic.user_logout event is dispatched during the logout routine giving a chance to carry out tasks before
-     * the session is lost
+     * the session is lost.
      *
      * The event listener receives a Mautic\UserBundle\Event\LogoutEvent instance.
      *
@@ -100,7 +100,7 @@ final class UserEvents
     const USER_LOGOUT = 'mautic.user_logout';
 
     /**
-     * The mautic.user_login event is dispatched right after a user logs in
+     * The mautic.user_login event is dispatched right after a user logs in.
      *
      * The event listener receives a Mautic\UserBundle\Event\LoginEvent instance.
      *
@@ -109,7 +109,7 @@ final class UserEvents
     const USER_LOGIN = 'mautic.user_login';
 
     /**
-     * The mautic.user_form_authentication event is dispatched when a user logs in so that listeners can authenticate a user, i.e. via a 3rd party service
+     * The mautic.user_form_authentication event is dispatched when a user logs in so that listeners can authenticate a user, i.e. via a 3rd party service.
      *
      * The event listener receives a Mautic\UserBundle\Event\AuthenticationEvent instance.
      *
@@ -119,7 +119,7 @@ final class UserEvents
 
     /**
      * The mautic.user_pre_authentication event is dispatched when a user browses a page under /s/ except for /login. This allows support for
-     * 3rd party authentication providers outside the login form
+     * 3rd party authentication providers outside the login form.
      *
      * The event listener receives a Mautic\UserBundle\Event\AuthenticationEvent instance.
      *
@@ -129,7 +129,7 @@ final class UserEvents
 
     /**
      * The mautic.user_authentication_content event is dispatched to collect HTML from plugins to be injected into the UI to assist with
-     * authentication
+     * authentication.
      *
      * The event listener receives a Mautic\UserBundle\Event\AuthenticationContentEvent instance.
      *
@@ -138,7 +138,7 @@ final class UserEvents
     const USER_AUTHENTICATION_CONTENT = 'mautic.user_authentication_content';
 
     /**
-     * The mautic.user_status_change event is dispatched when a user's online status is changed
+     * The mautic.user_status_change event is dispatched when a user's online status is changed.
      *
      * The event listener receives a Mautic\UserBundle\Event\StatusChangeEvent instance.
      *
diff --git a/app/bundles/UserBundle/Views/FormTheme/Role/choice_row.html.php b/app/bundles/UserBundle/Views/FormTheme/Role/choice_row.html.php
index f61db225d6a..3c5c3125d89 100644
--- a/app/bundles/UserBundle/Views/FormTheme/Role/choice_row.html.php
+++ b/app/bundles/UserBundle/Views/FormTheme/Role/choice_row.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $attr = $form->vars['attr'];
 ?>
 
@@ -18,8 +18,8 @@
                 <div class="checkbox">
                     <label>
                         <?php
-                        $attr['data-permission'] = $form->vars['name'] . ':' . $child->vars['value'];
-                        echo $view['form']->widget($child, array('attr' => $attr));
+                        $attr['data-permission'] = $form->vars['name'].':'.$child->vars['value'];
+                        echo $view['form']->widget($child, ['attr' => $attr]);
                         echo $view['translator']->trans($child->vars['label']);
                         ?>
                     </label>
diff --git a/app/bundles/UserBundle/Views/Profile/index.html.php b/app/bundles/UserBundle/Views/Profile/index.html.php
index b2b31263694..8fd0beab3f8 100644
--- a/app/bundles/UserBundle/Views/Profile/index.html.php
+++ b/app/bundles/UserBundle/Views/Profile/index.html.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 /** @var \Mautic\UserBundle\Entity\User $me */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'user');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.user.account.settings'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.user.account.settings'));
 ?>
 <!-- start: box layout -->
 <div class="box-layout">
diff --git a/app/bundles/UserBundle/Views/Role/form.html.php b/app/bundles/UserBundle/Views/Role/form.html.php
index 25f08f4832d..82919744277 100644
--- a/app/bundles/UserBundle/Views/Role/form.html.php
+++ b/app/bundles/UserBundle/Views/Role/form.html.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'role');
 
-$view['assets']->addScriptDeclaration("MauticVars.permissionList = " . json_encode($permissionsConfig['list']), 'bodyClose');
+$view['assets']->addScriptDeclaration('MauticVars.permissionList = '.json_encode($permissionsConfig['list']), 'bodyClose');
 
 $objectId = $form->vars['data']->getId();
 if (!empty($objectId)) {
     $name   = $form->vars['data']->getName();
-    $header = $view['translator']->trans('mautic.user.role.header.edit', array("%name%" => $name));
+    $header = $view['translator']->trans('mautic.user.role.header.edit', ['%name%' => $name]);
 } else {
     $header = $view['translator']->trans('mautic.user.role.header.new');
 }
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 ?>
 
 <?php echo $view['form']->start($form); ?>
@@ -55,7 +55,9 @@
 
 			<?php $hidePerms = $form['isAdmin']->vars['data']; ?>
 			<div class="tab-pane fade bdr-w-0" id="permissions-container">
-				<div id="rolePermissions"<?php if ($hidePerms) echo ' class="hide"'; ?>>
+				<div id="rolePermissions"<?php if ($hidePerms) {
+    echo ' class="hide"';
+} ?>>
 					<!-- start: box layout -->
 					<div class="box-layout">
 						<!-- step container -->
@@ -72,7 +74,7 @@
 												<span class="permission-ratio"> (<span class="<?php echo $bundle; ?>_granted"><?php echo $config['ratio'][0]; ?></span> / <span class="<?php echo $bundle; ?>_total"><?php echo $config['ratio'][1]; ?></span>)</span>
 											</a>
 										</li>
-										<?php $i++; ?>
+										<?php ++$i; ?>
 									<?php endforeach; ?>
 								</ul>
 							</div>
@@ -82,30 +84,32 @@
 						<div class="col-md-7 bg-auto height-auto bdr-l">
 							<div class="tab-content">
 								<?php
-								$permissions = $form['permissions']->children;
-								$i = 0;
-								foreach ($permissions as $child):
-									if ($child->vars['value'] == 'newbundle'):
-										if ($i > 0): // Close tab panel
-											echo "</div>\n</div>\n";
-										endif;
-										echo '<div role="tabpanel" class="tab-pane fade' . ($i === 0 ? ' in active' : '') .' bdr-w-0" id="' . $child->vars['name'] . 'PermissionTab">' . "\n";
-										echo '<div class="pt-md pr-md pl-md pb-md">' . "\n";
-										$child->setRendered();
-									else:
-										echo $view['form']->row($child);
-									endif;
-									$i++;
-								endforeach;
-								//close last tab
-								echo "</div>\n</div>\n";
-								$form['permissions']->setRendered();
-								?>
+                                $permissions = $form['permissions']->children;
+                                $i           = 0;
+                                foreach ($permissions as $child):
+                                    if ($child->vars['value'] == 'newbundle'):
+                                        if ($i > 0): // Close tab panel
+                                            echo "</div>\n</div>\n";
+                                        endif;
+                                        echo '<div role="tabpanel" class="tab-pane fade'.($i === 0 ? ' in active' : '').' bdr-w-0" id="'.$child->vars['name'].'PermissionTab">'."\n";
+                                        echo '<div class="pt-md pr-md pl-md pb-md">'."\n";
+                                        $child->setRendered();
+                                    else:
+                                        echo $view['form']->row($child);
+                                    endif;
+                                    ++$i;
+                                endforeach;
+                                //close last tab
+                                echo "</div>\n</div>\n";
+                                $form['permissions']->setRendered();
+                                ?>
 							</div>
 						</div>
 					</div>
 				</div>
-				<div id="isAdminMessage"<?php if (!$hidePerms) echo ' class="hide"'; ?>>
+				<div id="isAdminMessage"<?php if (!$hidePerms) {
+                                    echo ' class="hide"';
+                                } ?>>
 					<div class="alert alert-warning">
 						<h4><?php echo $view['translator']->trans('mautic.user.role.permission.isadmin.header'); ?></h4>
 						<p><?php echo $view['translator']->trans('mautic.user.role.permission.isadmin.message'); ?></p>
diff --git a/app/bundles/UserBundle/Views/Role/index.html.php b/app/bundles/UserBundle/Views/Role/index.html.php
index 1fe2891ad87..a910c89ab55 100644
--- a/app/bundles/UserBundle/Views/Role/index.html.php
+++ b/app/bundles/UserBundle/Views/Role/index.html.php
@@ -1,34 +1,34 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'role');
 $view['slots']->set('headerTitle', $view['translator']->trans('mautic.user.roles'));
 
 $view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
     'templateButtons' => [
-        'new' => $permissions['create']
+        'new' => $permissions['create'],
     ],
     'routeBase' => 'role',
-    'langVar'   => 'user.role'
+    'langVar'   => 'user.role',
 ]));
 ?>
 
 <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
-    'searchValue' => $searchValue,
-    'searchHelp'  => 'mautic.user.role.help.searchcommands',
-    'action'      => $currentRoute,
-    'langVar'     => 'user.role',
-    'routeBase'   => 'role',
+    'searchValue'     => $searchValue,
+    'searchHelp'      => 'mautic.user.role.help.searchcommands',
+    'action'          => $currentRoute,
+    'langVar'         => 'user.role',
+    'routeBase'       => 'role',
     'templateButtons' => [
-        'delete' => $permissions['delete']
-    ]
+        'delete' => $permissions['delete'],
+    ],
 ]); ?>
 
 <div class="page-list">
diff --git a/app/bundles/UserBundle/Views/Role/list.html.php b/app/bundles/UserBundle/Views/Role/list.html.php
index 25a904ef6c1..938d779f130 100644
--- a/app/bundles/UserBundle/Views/Role/list.html.php
+++ b/app/bundles/UserBundle/Views/Role/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 //Check to see if the entire page should be displayed or just main content
@@ -17,35 +18,35 @@
         <thead>
         <tr>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'checkall' => 'true',
-                'target'   => '#roleTable'
-            ));
+                'target'   => '#roleTable',
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'role',
                 'orderBy'    => 'r.name',
                 'text'       => 'mautic.core.name',
                 'class'      => 'col-role-name',
-                'default'    => true
-            ));
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                'default'    => true,
+            ]);
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'role',
                 'orderBy'    => 'r.description',
                 'text'       => 'mautic.core.description',
-                'class'      => 'visible-md visible-lg col-role-desc'
-            ));
+                'class'      => 'visible-md visible-lg col-role-desc',
+            ]);
             ?>
             <th class="visible-md visible-lg col-rolelist-usercount">
                 <?php echo $view['translator']->trans('mautic.user.role.list.thead.usercount'); ?>
             </th>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'role',
                 'orderBy'    => 'r.id',
                 'text'       => 'mautic.core.id',
-                'class'      => 'visible-md visible-lg col-role-id'
-            ));
+                'class'      => 'visible-md visible-lg col-role-id',
+            ]);
             ?>
         </tr>
         </thead>
@@ -54,21 +55,21 @@
             <tr>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => $permissions['edit'],
-                            'delete'    => $permissions['delete'],
-                        ),
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => $permissions['edit'],
+                            'delete' => $permissions['delete'],
+                        ],
                         'routeBase' => 'role',
                         'langVar'   => 'user.role',
-                        'pull'      => 'left'
-                    ));
+                        'pull'      => 'left',
+                    ]);
                     ?>
                 </td>
                 <td>
                     <?php if ($permissions['edit']) : ?>
-                    <a href="<?php echo $view['router']->path('mautic_role_action', array('objectAction' => 'edit', 'objectId' => $item->getId())); ?>" data-toggle="ajax">
+                    <a href="<?php echo $view['router']->path('mautic_role_action', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                         <?php echo $item->getName(); ?>
                     </a>
                     <?php else : ?>
@@ -79,8 +80,8 @@
                     <?php echo $item->getDescription(); ?>
                 </td>
                 <td class="visible-md visible-lg">
-                    <a class="label label-primary" href="<?php echo $view['router']->path('mautic_user_index', array("search" => $view['translator']->trans('mautic.user.user.searchcommand.role') . ':&quot;' .  $item->getName() . '&quot;')); ?>" data-toggle="ajax"<?php echo ($userCounts[$item->getId()] == 0) ? "disabled=disabled" : ""; ?>>
-                        <?php echo $view['translator']->transChoice('mautic.user.role.list.viewusers_count', $userCounts[$item->getId()], array('%count%' => $userCounts[$item->getId()])); ?>
+                    <a class="label label-primary" href="<?php echo $view['router']->path('mautic_user_index', ['search' => $view['translator']->trans('mautic.user.user.searchcommand.role').':&quot;'.$item->getName().'&quot;']); ?>" data-toggle="ajax"<?php echo ($userCounts[$item->getId()] == 0) ? 'disabled=disabled' : ''; ?>>
+                        <?php echo $view['translator']->transChoice('mautic.user.role.list.viewusers_count', $userCounts[$item->getId()], ['%count%' => $userCounts[$item->getId()]]); ?>
                     </a>
                 </td>
                 <td class="visible-md visible-lg">
@@ -92,12 +93,12 @@
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems" => count($items),
-        "page"       => $page,
-        "limit"      => $limit,
-        "baseUrl"    =>  $view['router']->path('mautic_role_index'),
-        'sessionVar' => 'role'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => count($items),
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_role_index'),
+        'sessionVar' => 'role',
+    ]); ?>
 </div>
 
diff --git a/app/bundles/UserBundle/Views/Security/ajax.html.php b/app/bundles/UserBundle/Views/Security/ajax.html.php
index 63ed3df9834..26b0d13c799 100644
--- a/app/bundles/UserBundle/Views/Security/ajax.html.php
+++ b/app/bundles/UserBundle/Views/Security/ajax.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $view->extend('MauticCoreBundle:Default:content.html.php');
diff --git a/app/bundles/UserBundle/Views/Security/base.html.php b/app/bundles/UserBundle/Views/Security/base.html.php
index 505e327699d..8333cd40a96 100644
--- a/app/bundles/UserBundle/Views/Security/base.html.php
+++ b/app/bundles/UserBundle/Views/Security/base.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -50,7 +51,7 @@
         </div>
          <div class="row">
             <div class="col-lg-4 col-lg-offset-4 text-center text-muted">
-                <?php echo $view['translator']->trans('mautic.core.copyright', array('%date%' => date('Y'))); ?>
+                <?php echo $view['translator']->trans('mautic.core.copyright', ['%date%' => date('Y')]); ?>
             </div>
         </div>
     </div>
diff --git a/app/bundles/UserBundle/Views/Security/login.html.php b/app/bundles/UserBundle/Views/Security/login.html.php
index e0c4de6f1ee..d7624263ce6 100644
--- a/app/bundles/UserBundle/Views/Security/login.html.php
+++ b/app/bundles/UserBundle/Views/Security/login.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!$app->getRequest()->isXmlHttpRequest()):
     //load base template
     $view->extend('MauticUserBundle:Security:base.html.php');
@@ -51,9 +51,9 @@ class="form-control input-lg" required
 <?php if (!empty($integrations)): ?>
 <ul class="list-group">
 <?php foreach ($integrations as $sso): ?>
-    <a href="<?php echo $view['router']->path('mautic_sso_login', array('integration' => $sso->getName())); ?>" class="list-group-item">
+    <a href="<?php echo $view['router']->path('mautic_sso_login', ['integration' => $sso->getName()]); ?>" class="list-group-item">
         <img class="pull-left mr-xs" style="height: 16px;" src="<?php echo $view['assets']->getUrl($sso->getIcon()); ?>" >
-        <p class="list-group-item-text"><?php echo $view['translator']->trans('mautic.integration.sso.' . $sso->getName()); ?></p>
+        <p class="list-group-item-text"><?php echo $view['translator']->trans('mautic.integration.sso.'.$sso->getName()); ?></p>
     </a>
 <?php endforeach; ?>
 </ul>
diff --git a/app/bundles/UserBundle/Views/Security/reset.html.php b/app/bundles/UserBundle/Views/Security/reset.html.php
index b2655dec1bd..efa6253166f 100644
--- a/app/bundles/UserBundle/Views/Security/reset.html.php
+++ b/app/bundles/UserBundle/Views/Security/reset.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!$app->getRequest()->isXmlHttpRequest()) {
     $view->extend('MauticUserBundle:Security:base.html.php');
 } else {
diff --git a/app/bundles/UserBundle/Views/Security/resetconfirm.html.php b/app/bundles/UserBundle/Views/Security/resetconfirm.html.php
index 38a514af97b..3827a1002ce 100644
--- a/app/bundles/UserBundle/Views/Security/resetconfirm.html.php
+++ b/app/bundles/UserBundle/Views/Security/resetconfirm.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if (!$app->getRequest()->isXmlHttpRequest()) {
     $view->extend('MauticUserBundle:Security:base.html.php');
 } else {
diff --git a/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_role.html.php b/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_role.html.php
index cb55e4d0e2f..12024b3ea1e 100644
--- a/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_role.html.php
+++ b/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_role.html.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_role_index', array('filter-user' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_role_index', ['filter-user' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
 </a>
 <?php else: ?>
 <?php if ($canEdit): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_role_action', array('objectAction' => 'edit', 'objectId' => $role->getId())); ?>" data-toggle="ajax">
+<a href="<?php echo $this->container->get('router')->generate('mautic_role_action', ['objectAction' => 'edit', 'objectId' => $role->getId()]); ?>" data-toggle="ajax">
     <?php echo $role->getName(true); ?>
 </a>
 <?php else: ?>
diff --git a/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_user.html.php b/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_user.html.php
index bec49df36c6..988c7848bc4 100644
--- a/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_user.html.php
+++ b/app/bundles/UserBundle/Views/SubscribedEvents/Search/global_user.html.php
@@ -1,24 +1,25 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <?php if (!empty($showMore)): ?>
-<a href="<?php echo $this->container->get('router')->generate('mautic_user_index', array('filter-user' => $searchString)); ?>" data-toggle="ajax">
-    <span><?php echo $view['translator']->trans('mautic.core.search.more', array("%count%" => $remaining)); ?></span>
+<a href="<?php echo $this->container->get('router')->generate('mautic_user_index', ['filter-user' => $searchString]); ?>" data-toggle="ajax">
+    <span><?php echo $view['translator']->trans('mautic.core.search.more', ['%count%' => $remaining]); ?></span>
 </a>
 <?php else: ?>
 <div>
     <span class="pull-left pr-xs pt-xs" style="width:36px">
-        <span class="img-wrapper img-rounded"><img src="<?php echo $view['gravatar']->getImage($user->getEmail(), '100');; ?>" /></span>
+        <span class="img-wrapper img-rounded"><img src="<?php echo $view['gravatar']->getImage($user->getEmail(), '100'); ?>" /></span>
     </span>
     <?php if ($canEdit): ?>
-    <a href="<?php echo $this->container->get('router')->generate('mautic_user_action', array('objectAction' => 'edit', 'objectId' => $user->getId())); ?>" data-toggle="ajax">
+    <a href="<?php echo $this->container->get('router')->generate('mautic_user_action', ['objectAction' => 'edit', 'objectId' => $user->getId()]); ?>" data-toggle="ajax">
         <?php echo $user->getName(true); ?>
     </a>
     <?php else: ?>
diff --git a/app/bundles/UserBundle/Views/User/contact.html.php b/app/bundles/UserBundle/Views/User/contact.html.php
index 5eb0d277a4b..4646c2235a2 100644
--- a/app/bundles/UserBundle/Views/User/contact.html.php
+++ b/app/bundles/UserBundle/Views/User/contact.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'user');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.user.user.header.contact', array('%name%' => $user->getName())));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.user.user.header.contact', ['%name%' => $user->getName()]));
 ?>
 
 <div class="panel">
diff --git a/app/bundles/UserBundle/Views/User/form.html.php b/app/bundles/UserBundle/Views/User/form.html.php
index a9cbaa76996..d7af7623d44 100644
--- a/app/bundles/UserBundle/Views/User/form.html.php
+++ b/app/bundles/UserBundle/Views/User/form.html.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'user');
 $userId = $form->vars['data']->getId();
 if (!empty($userId)) {
     $user   = $form->vars['data']->getName();
-    $header = $view['translator']->trans('mautic.user.user.header.edit', array("%name%" => $user));
+    $header = $view['translator']->trans('mautic.user.user.header.edit', ['%name%' => $user]);
 } else {
     $header = $view['translator']->trans('mautic.user.user.header.new');
 }
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 ?>
 <!-- start: box layout -->
 <div class="box-layout">
@@ -28,12 +28,12 @@
 			    <div class="row">
                     <div class="col-sm-6<?php echo (count($form['firstName']->vars['errors'])) ? ' has-error' : ''; ?>">
                     	<label class="control-label mb-xs"><?php echo $view['form']->label($form['firstName']); ?></label>
-			            <?php echo $view['form']->widget($form['firstName'], array('attr' => array('placeholder' => $form['firstName']->vars['label']))); ?>
+			            <?php echo $view['form']->widget($form['firstName'], ['attr' => ['placeholder' => $form['firstName']->vars['label']]]); ?>
                         <?php echo $view['form']->errors($form['firstName']); ?>
 			        </div>
                     <div class="col-sm-6<?php echo (count($form['lastName']->vars['errors'])) ? ' has-error' : ''; ?>">
                         <label class="control-label mb-xs"><?php echo $view['form']->label($form['lastName']); ?></label>
-			            <?php echo $view['form']->widget($form['lastName'], array('attr' => array('placeholder' => $form['lastName']->vars['label']))); ?>
+			            <?php echo $view['form']->widget($form['lastName'], ['attr' => ['placeholder' => $form['lastName']->vars['label']]]); ?>
                         <?php echo $view['form']->errors($form['lastName']); ?>
 			        </div>
 			    </div>
@@ -44,12 +44,12 @@
 			    <div class="row">
 			        <div class="col-sm-6<?php echo (count($form['role']->vars['errors'])) ? ' has-error' : ''; ?>">
 			        	<label class="control-label mb-xs"><?php echo $view['form']->label($form['role']); ?></label>
-			            <?php echo $view['form']->widget($form['role'], array('attr' => array('placeholder' => $form['role']->vars['label']))); ?>
+			            <?php echo $view['form']->widget($form['role'], ['attr' => ['placeholder' => $form['role']->vars['label']]]); ?>
                         <?php echo $view['form']->errors($form['role']); ?>
 			        </div>
 			        <div class="col-sm-6<?php echo (count($form['position']->vars['errors'])) ? ' has-error' : ''; ?>">
 				    	<label class="control-label mb-xs"><?php echo $view['form']->label($form['position']); ?></label>
-			            <?php echo $view['form']->widget($form['position'], array('attr' => array('placeholder' => $form['position']->vars['label']))); ?>
+			            <?php echo $view['form']->widget($form['position'], ['attr' => ['placeholder' => $form['position']->vars['label']]]); ?>
                         <?php echo $view['form']->errors($form['position']); ?>
 			        </div>
 			    </div>
@@ -60,7 +60,7 @@
                 <div class="row">
                     <div class="col-sm-6<?php echo (count($form['signature']->vars['errors'])) ? ' has-error' : ''; ?>">
                         <label class="control-label mb-xs"><?php echo $view['form']->label($form['signature']); ?></label>
-                        <?php echo $view['form']->widget($form['signature'], array('attr' => array('placeholder' => $form['signature']->vars['label']))); ?>
+                        <?php echo $view['form']->widget($form['signature'], ['attr' => ['placeholder' => $form['signature']->vars['label']]]); ?>
                         <?php echo $view['form']->errors($form['signature']); ?>
                     </div>
                 </div>
@@ -73,17 +73,17 @@
 				        <div class="col-sm-6">
 				        	<div class="form-group col-xs-12<?php echo (count($form['username']->vars['errors'])) ? ' has-error' : ''; ?>">
 				        		<label class="control-label mb-xs"><?php echo $view['form']->label($form['username']); ?></label>
-				            	<?php echo $view['form']->widget($form['username'], array('attr' => array('placeholder' => $form['username']->vars['label']))); ?>
+				            	<?php echo $view['form']->widget($form['username'], ['attr' => ['placeholder' => $form['username']->vars['label']]]); ?>
                                 <?php echo $view['form']->errors($form['username']); ?>
 				            </div>
 							<div class="form-group col-xs-12<?php echo (count($form['email']->vars['errors'])) ? ' has-error' : ''; ?>">
 					    		<label class="control-label mb-xs"><?php echo $view['form']->label($form['email']); ?></label>
-				            	<?php echo $view['form']->widget($form['email'], array('attr' => array('placeholder' => $form['email']->vars['label']))); ?>
+				            	<?php echo $view['form']->widget($form['email'], ['attr' => ['placeholder' => $form['email']->vars['label']]]); ?>
                                 <?php echo $view['form']->errors($form['email']); ?>
 				            </div>
 				        </div>
 				        <div class="col-sm-6">
-				            <?php echo $view['form']->widget($form['plainPassword'], array('attr' => array('placeholder' => $form['plainPassword']->vars['label']))); ?>
+				            <?php echo $view['form']->widget($form['plainPassword'], ['attr' => ['placeholder' => $form['plainPassword']->vars['label']]]); ?>
 				        </div>
 				    </div>
 				</div>
diff --git a/app/bundles/UserBundle/Views/User/index.html.php b/app/bundles/UserBundle/Views/User/index.html.php
index 8ba83e8019b..144b54435cc 100644
--- a/app/bundles/UserBundle/Views/User/index.html.php
+++ b/app/bundles/UserBundle/Views/User/index.html.php
@@ -1,35 +1,35 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'user');
 $view['slots']->set('headerTitle', $view['translator']->trans('mautic.user.users'));
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'templateButtons' => array(
-        'new' => $permissions['create']
-    ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'templateButtons' => [
+        'new' => $permissions['create'],
+    ],
     'routeBase' => 'user',
-    'langVar'   => 'user.user'
-)));
+    'langVar'   => 'user.user',
+]));
 ?>
 
-<?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-    'searchValue' => $searchValue,
-    'searchHelp'  => 'mautic.user.user.help.searchcommands',
-    'action'      => $currentRoute,
-    'langVar'     => 'user.user',
-    'routeBase'   => 'user',
-    'templateButtons' => array(
-        'delete' => $permissions['delete']
-    )
-)); ?>
+<?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+    'searchValue'     => $searchValue,
+    'searchHelp'      => 'mautic.user.user.help.searchcommands',
+    'action'          => $currentRoute,
+    'langVar'         => 'user.user',
+    'routeBase'       => 'user',
+    'templateButtons' => [
+        'delete' => $permissions['delete'],
+    ],
+]); ?>
 
 <div class="page-list">
 	<?php $view['slots']->output('_content'); ?>
diff --git a/app/bundles/UserBundle/Views/User/list.html.php b/app/bundles/UserBundle/Views/User/list.html.php
index 57c712404a4..d346ec19e59 100644
--- a/app/bundles/UserBundle/Views/User/list.html.php
+++ b/app/bundles/UserBundle/Views/User/list.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,48 +18,48 @@
         <thead>
         <tr>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'checkall' => 'true',
-                'target'   => '#userTable'
-            ));
+                'target'   => '#userTable',
+            ]);
             ?>
             <th class="visible-md visible-lg col-user-avatar"></th>
             <?php
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'user',
                 'orderBy'    => 'u.lastName, u.firstName, u.username',
                 'text'       => 'mautic.core.name',
                 'class'      => 'col-user-name',
-                'default'    => true
-            ));
+                'default'    => true,
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'user',
                 'orderBy'    => 'u.username',
                 'text'       => 'mautic.core.username',
                 'class'      => 'col-user-username',
-            ));
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'user',
                 'orderBy'    => 'u.email',
                 'text'       => 'mautic.core.type.email',
-                'class'      => 'visible-md visible-lg col-user-email'
-            ));
+                'class'      => 'visible-md visible-lg col-user-email',
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'user',
                 'orderBy'    => 'r.name',
                 'text'       => 'mautic.user.role',
-                'class'      => 'visible-md visible-lg col-user-role'
-            ));
+                'class'      => 'visible-md visible-lg col-user-role',
+            ]);
 
-            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+            echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                 'sessionVar' => 'user',
                 'orderBy'    => 'u.id',
                 'text'       => 'mautic.core.id',
-                'class'      => 'visible-md visible-lg col-user-id'
-            ));
+                'class'      => 'visible-md visible-lg col-user-id',
+            ]);
             ?>
         </tr>
         </thead>
@@ -67,16 +68,16 @@
             <tr>
                 <td>
                     <?php
-                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                        'item'      => $item,
-                        'templateButtons' => array(
-                            'edit'      => $permissions['edit'],
-                            'delete'    => $permissions['delete'],
-                        ),
+                    echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                        'item'            => $item,
+                        'templateButtons' => [
+                            'edit'   => $permissions['edit'],
+                            'delete' => $permissions['delete'],
+                        ],
                         'routeBase' => 'user',
                         'langVar'   => 'user.user',
-                        'pull'      => 'left'
-                    ));
+                        'pull'      => 'left',
+                    ]);
                     ?>
                 </td>
                 <td class="visible-md visible-lg">
@@ -85,7 +86,7 @@
                 <td>
                     <div>
                         <?php if ($permissions['edit']) : ?>
-                            <a href="<?php echo $view['router']->path('mautic_user_action', array('objectAction' => 'edit', 'objectId' => $item->getId())); ?>" data-toggle="ajax">
+                            <a href="<?php echo $view['router']->path('mautic_user_action', ['objectAction' => 'edit', 'objectId' => $item->getId()]); ?>" data-toggle="ajax">
                                 <?php echo $item->getName(true); ?>
                             </a>
                         <?php else : ?>
@@ -105,12 +106,12 @@
         </tbody>
     </table>
     <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-        "totalItems" => count($items),
-        "page"       => $page,
-        "limit"      => $limit,
-        "baseUrl"    =>  $view['router']->path('mautic_user_index'),
-        'sessionVar' => 'user'
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+        'totalItems' => count($items),
+        'page'       => $page,
+        'limit'      => $limit,
+        'baseUrl'    => $view['router']->path('mautic_user_index'),
+        'sessionVar' => 'user',
+    ]); ?>
     </div>
 </div>
diff --git a/app/bundles/WebhookBundle/Command/ProcessWebhookQueuesCommand.php b/app/bundles/WebhookBundle/Command/ProcessWebhookQueuesCommand.php
index 7fc5eb8825d..ded476938ae 100644
--- a/app/bundles/WebhookBundle/Command/ProcessWebhookQueuesCommand.php
+++ b/app/bundles/WebhookBundle/Command/ProcessWebhookQueuesCommand.php
@@ -1,30 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Process\Exception\RuntimeException;
-use Mautic\WebhookBundle\Model\WebhookModel;
 
 /**
- * CLI Command to process queued webhook payloads
+ * CLI Command to process queued webhook payloads.
  */
 class ProcessWebhookQueuesCommand extends ContainerAwareCommand
 {
-    /** @var \Mautic\CoreBundle\Factory\MauticFactory  $factory */
+    /** @var \Mautic\CoreBundle\Factory\MauticFactory $factory */
     protected $factory;
 
     /**
@@ -55,6 +51,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // check to make sure we are in queue mode
         if ($queueMode != 'command_process') {
             $output->writeLn('Webhook Bundle is in immediate process mode. To use the command function change to command mode.');
+
             return 0;
         }
 
@@ -65,26 +62,27 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($id) {
             $webhook  = $model->getEntity($id);
-            $webhooks = ($webhook !== null && $webhook->isPublished()) ? array($id => $webhook) : array();
+            $webhooks = ($webhook !== null && $webhook->isPublished()) ? [$id => $webhook] : [];
         } else {
             // make sure we only get published webhook entities
             $webhooks = $model->getEntities(
-                array(
-                    'filter' => array(
-                        'force' => array(
-                            array(
+                [
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'e.isPublished',
                                 'expr'   => 'eq',
-                                'value'  => 1
-                            )
-                        )
-                    )
-                )
+                                'value'  => 1,
+                            ],
+                        ],
+                    ],
+                ]
             );
         }
 
-        if (!count ($webhooks)) {
+        if (!count($webhooks)) {
             $output->writeln('<error>No published webhooks found. Try again later.</error>');
+
             return;
         }
 
@@ -93,8 +91,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $model->processWebhooks($webhooks);
         } catch (\Exception $e) {
-            $output->writeLn('<error>' . $e->getMessage() . '</error>');
+            $output->writeLn('<error>'.$e->getMessage().'</error>');
         }
         $output->writeLn('<info>Webhook Processing Complete</info>');
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Config/config.php b/app/bundles/WebhookBundle/Config/config.php
index 31c8cb2cc3d..fe72c1aa44f 100644
--- a/app/bundles/WebhookBundle/Config/config.php
+++ b/app/bundles/WebhookBundle/Config/config.php
@@ -1,90 +1,91 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
-    'routes'   => array(
-        'main'   => array(
-            'mautic_webhook_index'           => array(
+return [
+    'routes' => [
+        'main' => [
+            'mautic_webhook_index' => [
                 'path'       => '/webhooks/{page}',
-                'controller' => 'MauticWebhookBundle:Webhook:index'
-            ),
-            'mautic_webhook_action'             => array(
+                'controller' => 'MauticWebhookBundle:Webhook:index',
+            ],
+            'mautic_webhook_action' => [
                 'path'       => '/webhooks/{objectAction}/{objectId}',
-                'controller' => 'MauticWebhookBundle:Webhook:execute'
-            ),
-        ),
-    ),
+                'controller' => 'MauticWebhookBundle:Webhook:execute',
+            ],
+        ],
+    ],
 
-    'menu'     => array(
-        'admin' => array(
-            'items'    => array(
-                'mautic.webhook.webhooks' => array(
+    'menu' => [
+        'admin' => [
+            'items' => [
+                'mautic.webhook.webhooks' => [
                     'id'        => 'mautic_webhook_root',
                     'iconClass' => 'fa-exchange',
-                    'access'    => array('webhook:webhooks:viewown', 'webhook:webhooks:viewother'),
-                    'route' => 'mautic_webhook_index'
-                )
-            )
-        )
-    ),
+                    'access'    => ['webhook:webhooks:viewown', 'webhook:webhooks:viewother'],
+                    'route'     => 'mautic_webhook_index',
+                ],
+            ],
+        ],
+    ],
 
-    'services' => array(
-        'forms'  => array(
-            'mautic.form.type.webhook'                      => array(
+    'services' => [
+        'forms' => [
+            'mautic.form.type.webhook' => [
                 'class'     => 'Mautic\WebhookBundle\Form\Type\WebhookType',
                 'arguments' => 'translator',
-                'alias'     => 'webhook'
-            ),
-            'mautic.form.type.webhookconfig'  => array(
+                'alias'     => 'webhook',
+            ],
+            'mautic.form.type.webhookconfig' => [
                 'class' => 'Mautic\WebhookBundle\Form\Type\ConfigType',
-                'alias' => 'webhookconfig'
-            )
-        ),
-        'events' => array(
-            'mautic.webhook.lead.subscriber'                => array(
-                'class' => 'Mautic\WebhookBundle\EventListener\LeadSubscriber'
-            ),
-            'mautic.webhook.form.subscriber'                => array(
-                'class' => 'Mautic\WebhookBundle\EventListener\FormSubscriber'
-            ),
-            'mautic.webhook.email.subscriber'                => array(
-                'class' => 'Mautic\WebhookBundle\EventListener\EmailSubscriber'
-            ),
-            'mautic.webhook.page.hit.subscriber'                => array(
-                'class' => 'Mautic\WebhookBundle\EventListener\PageSubscriber'
-            ),
-            'mautic.webhook.config.subscriber' => array(
-                'class' => 'Mautic\WebhookBundle\EventListener\ConfigSubscriber'
-            ),
-            'mautic.webhook.audit.subscriber' => array(
-                'class' => 'Mautic\WebhookBundle\EventListener\WebhookSubscriber',
+                'alias' => 'webhookconfig',
+            ],
+        ],
+        'events' => [
+            'mautic.webhook.lead.subscriber' => [
+                'class' => 'Mautic\WebhookBundle\EventListener\LeadSubscriber',
+            ],
+            'mautic.webhook.form.subscriber' => [
+                'class' => 'Mautic\WebhookBundle\EventListener\FormSubscriber',
+            ],
+            'mautic.webhook.email.subscriber' => [
+                'class' => 'Mautic\WebhookBundle\EventListener\EmailSubscriber',
+            ],
+            'mautic.webhook.page.hit.subscriber' => [
+                'class' => 'Mautic\WebhookBundle\EventListener\PageSubscriber',
+            ],
+            'mautic.webhook.config.subscriber' => [
+                'class' => 'Mautic\WebhookBundle\EventListener\ConfigSubscriber',
+            ],
+            'mautic.webhook.audit.subscriber' => [
+                'class'     => 'Mautic\WebhookBundle\EventListener\WebhookSubscriber',
                 'arguments' => [
                     'mautic.helper.ip_lookup',
-                    'mautic.core.model.auditlog'
-                ]
-            ),
-        ),
-        'models' =>  array(
-            'mautic.webhook.model.webhook' => array(
-                'class' => 'Mautic\WebhookBundle\Model\WebhookModel',
-                'arguments' => array(
+                    'mautic.core.model.auditlog',
+                ],
+            ],
+        ],
+        'models' => [
+            'mautic.webhook.model.webhook' => [
+                'class'     => 'Mautic\WebhookBundle\Model\WebhookModel',
+                'arguments' => [
                     'mautic.helper.core_parameters',
-                    'jms_serializer'
-                )
-            )
-        )
-    ),
+                    'jms_serializer',
+                ],
+            ],
+        ],
+    ],
 
-    'parameters' => array(
-        'webhook_start' => 0,
-        'webhook_limit' => 1000,
+    'parameters' => [
+        'webhook_start'   => 0,
+        'webhook_limit'   => 1000,
         'webhook_log_max' => 10,
-        'queue_mode' => 'immediate_process'
-    )
-);
\ No newline at end of file
+        'queue_mode'      => 'immediate_process',
+    ],
+];
diff --git a/app/bundles/WebhookBundle/Controller/AjaxController.php b/app/bundles/WebhookBundle/Controller/AjaxController.php
index 0b13cbe9988..e6d4c2807c3 100644
--- a/app/bundles/WebhookBundle/Controller/AjaxController.php
+++ b/app/bundles/WebhookBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -21,15 +22,14 @@ protected function sendHookTestAction(Request $request)
         $url = InputHelper::url($request->request->get('url'));
 
         // validate the URL
-        if ($url == '' || ! $url) {
+        if ($url == '' || !$url) {
             // default to an error message
-            $dataArray = array(
+            $dataArray = [
                 'success' => 1,
-                'html' =>
-                    '<div class="has-error"><span class="help-block">'
-                    . $this->translator->trans('mautic.webhook.label.no.url')
-                    . '</span></div>',
-            );
+                'html'    => '<div class="has-error"><span class="help-block">'
+                    .$this->translator->trans('mautic.webhook.label.no.url')
+                    .'</span></div>',
+            ];
 
             return $this->sendJsonResponse($dataArray);
         }
@@ -38,9 +38,9 @@ protected function sendHookTestAction(Request $request)
         $selectedTypes = InputHelper::cleanArray($request->request->get('types'));
 
         $payloadPaths = $this->getPayloadPaths($selectedTypes);
-        $payloads = $this->loadPayloads($payloadPaths);
+        $payloads     = $this->loadPayloads($payloadPaths);
 
-        $now = new \DateTime;
+        $now = new \DateTime();
 
         $payloads['timestamp'] = $now->format('c');
 
@@ -54,20 +54,19 @@ protected function sendHookTestAction(Request $request)
         $response = $http->post($url, json_encode($payloads), $headers);
 
         // default to an error message
-        $dataArray = array(
+        $dataArray = [
             'success' => 1,
-            'html' =>
-                '<div class="has-error"><span class="help-block">'
-                . $this->translator->trans('mautic.webhook.label.warning')
-                . '</span></div>',
-        );
+            'html'    => '<div class="has-error"><span class="help-block">'
+                .$this->translator->trans('mautic.webhook.label.warning')
+                .'</span></div>',
+        ];
 
         // if we get a 200 response convert to success message
         if ($response->code == 200) {
             $dataArray['html'] =
                 '<div class="has-success"><span class="help-block">'
-                . $this->translator->trans('mautic.webhook.label.success')
-                . '</span></div>';
+                .$this->translator->trans('mautic.webhook.label.success')
+                .'</span></div>';
         }
 
         return $this->sendJsonResponse($dataArray);
@@ -81,10 +80,9 @@ protected function sendHookTestAction(Request $request)
      */
     public function getPayloadPaths($types)
     {
-        $payloadPaths = array();
+        $payloadPaths = [];
 
-        foreach ($types as $type)
-        {
+        foreach ($types as $type) {
             // takes an input like mautic.lead_on_something
             // converts to array pieces using _
             $typePath = explode('_', $type);
@@ -111,7 +109,7 @@ public function getPayloadPaths($types)
 
             $bundleName = (array_pop($prefixParts));
 
-            $payloadPath .= '/' . ucfirst($bundleName) . 'Bundle/Assets/WebhookPayload/' . $bundleName . '_' . $eventName . '.json';
+            $payloadPath .= '/'.ucfirst($bundleName).'Bundle/Assets/WebhookPayload/'.$bundleName.'_'.$eventName.'.json';
 
             $payloadPaths[$type] = $payloadPath;
         }
@@ -127,10 +125,9 @@ public function getPayloadPaths($types)
      */
     public function loadPayloads($paths)
     {
-        $payloads = array();
+        $payloads = [];
 
-        foreach ($paths as $key => $path)
-        {
+        foreach ($paths as $key => $path) {
             if (file_exists($path)) {
                 $payloads[$key] = json_decode(file_get_contents($path), true);
             }
@@ -138,4 +135,4 @@ public function loadPayloads($paths)
 
         return $payloads;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Controller/WebhookController.php b/app/bundles/WebhookBundle/Controller/WebhookController.php
index 03a9bc51227..9aed7bde4ca 100644
--- a/app/bundles/WebhookBundle/Controller/WebhookController.php
+++ b/app/bundles/WebhookBundle/Controller/WebhookController.php
@@ -1,21 +1,19 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Controller;
 
 use Mautic\CoreBundle\Controller\FormController;
-use Mautic\CoreBundle\Helper\InputHelper;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation;
 
 /**
- * Class WebhookController
+ * Class WebhookController.
  */
 class WebhookController extends FormController
 {
@@ -44,7 +42,7 @@ public function indexAction($page = 1)
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|Response
      */
@@ -54,7 +52,7 @@ public function newAction()
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -67,7 +65,7 @@ public function editAction($objectId, $ignorePost = false)
     }
 
     /**
-     * Displays details on a Focus
+     * Displays details on a Focus.
      *
      * @param $objectId
      *
@@ -79,7 +77,7 @@ public function viewAction($objectId)
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -91,7 +89,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -103,7 +101,7 @@ public function deleteAction($objectId)
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -111,5 +109,4 @@ public function batchDeleteAction()
     {
         return parent::batchDeleteStandard();
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/Event.php b/app/bundles/WebhookBundle/Entity/Event.php
index 5e777e26ca0..172265e83c9 100644
--- a/app/bundles/WebhookBundle/Entity/Event.php
+++ b/app/bundles/WebhookBundle/Entity/Event.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\WebhookBundle\Entity;
+
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
-use Symfony\Component\Validator\Constraints as Assert;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
+
 /**
- * Class Event
- *
- * @package Mautic\Webhook\Entity
+ * Class Event.
  */
 class Event
 {
@@ -37,12 +37,12 @@ class Event
     private $event_type;
     public function __construct()
     {
-        $this->queues  = new ArrayCollection();
+        $this->queues = new ArrayCollection();
     }
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
         $builder->setTable('webhook_events')
@@ -77,6 +77,7 @@ public function getId()
     public function setId($id)
     {
         $this->id = $id;
+
         return $this;
     }
     /**
@@ -92,6 +93,7 @@ public function getWebhook()
     public function setWebhook($webhook)
     {
         $this->webhook = $webhook;
+
         return $this;
     }
     /**
@@ -107,6 +109,7 @@ public function getEventType()
     public function setEventType($event_type)
     {
         $this->event_type = $event_type;
+
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/EventRepository.php b/app/bundles/WebhookBundle/Entity/EventRepository.php
index 5d7debcaca4..24fc5c5f7be 100644
--- a/app/bundles/WebhookBundle/Entity/EventRepository.php
+++ b/app/bundles/WebhookBundle/Entity/EventRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   Mautic, Inc
  * @author      Mautic, Inc
+ *
  * @link        http://mautic.com
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 class EventRepository extends CommonRepository
 {
     /**
-     * Get a list of events with the webhook
+     * Get a list of events with the webhook.
      *
      * @param array $args
      *
@@ -23,11 +24,11 @@ class EventRepository extends CommonRepository
     public function getEntitiesByEventType($type)
     {
         $alias = $this->getTableAlias();
-        $q = $this->createQueryBuilder($alias)
+        $q     = $this->createQueryBuilder($alias)
             ->leftJoin($alias.'.webhook', 'u');
 
         $q->where(
-            $q->expr()->eq($alias . '.event_type', ':type')
+            $q->expr()->eq($alias.'.event_type', ':type')
         )->setParameter('type', $type);
 
         // only find published webhooks
@@ -36,4 +37,4 @@ public function getEntitiesByEventType($type)
 
         return $q->getQuery()->getResult();
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/Log.php b/app/bundles/WebhookBundle/Entity/Log.php
index ac2feafe6e5..0e077ce76c0 100644
--- a/app/bundles/WebhookBundle/Entity/Log.php
+++ b/app/bundles/WebhookBundle/Entity/Log.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\WebhookBundle\Entity;
+
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
+
 /**
- * Class Log
- *
- * @package Mautic\WebhookBundle\Entity
+ * Class Log.
  */
 class Log
 {
@@ -37,7 +37,7 @@ class Log
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
         $builder->setTable('webhook_logs')
@@ -73,6 +73,7 @@ public function getId()
     public function setId($id)
     {
         $this->id = $id;
+
         return $this;
     }
     /**
@@ -88,6 +89,7 @@ public function getWebhook()
     public function setWebhook($webhook)
     {
         $this->webhook = $webhook;
+
         return $this;
     }
     /**
@@ -103,6 +105,7 @@ public function getStatusCode()
     public function setStatusCode($statusCode)
     {
         $this->statusCode = $statusCode;
+
         return $this;
     }
     /**
@@ -118,6 +121,7 @@ public function getDateAdded()
     public function setDateAdded($dateAdded)
     {
         $this->dateAdded = $dateAdded;
+
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/LogRepository.php b/app/bundles/WebhookBundle/Entity/LogRepository.php
index e2ce6d83052..70776055250 100644
--- a/app/bundles/WebhookBundle/Entity/LogRepository.php
+++ b/app/bundles/WebhookBundle/Entity/LogRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   Mautic, Inc
  * @author      Mautic, Inc
+ *
  * @link        http://mautic.com
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -23,32 +24,31 @@ class LogRepository extends CommonRepository
     public function removeOldLogs($webhook_id, $logMax)
     {
         // if no idea was sent (the hook was deleted) then return a count of 0
-        if (! $webhook_id) {
+        if (!$webhook_id) {
             return false;
         }
 
         $qb = $this->_em->getConnection()->createQueryBuilder();
 
         $count = $qb->select('count(id) as log_count')
-            ->from(MAUTIC_TABLE_PREFIX . 'webhook_logs', $this->getTableAlias())
-            ->where('webhook_id = ' . $webhook_id)
+            ->from(MAUTIC_TABLE_PREFIX.'webhook_logs', $this->getTableAlias())
+            ->where('webhook_id = '.$webhook_id)
             ->execute()->fetch();
 
         if ((int) $count['log_count'] >= (int) $logMax) {
-
             $qb = $this->_em->getConnection()->createQueryBuilder();
 
             $id = $qb->select('id')
-                ->from(MAUTIC_TABLE_PREFIX . 'webhook_logs', $this->getTableAlias())
-                ->where('webhook_id = ' . $webhook_id)
+                ->from(MAUTIC_TABLE_PREFIX.'webhook_logs', $this->getTableAlias())
+                ->where('webhook_id = '.$webhook_id)
                 ->orderBy('date_added', 'ASC')->setMaxResults(1)
                 ->execute()->fetch();
 
             $qb = $this->_em->getConnection()->createQueryBuilder();
 
-            $qb->delete(MAUTIC_TABLE_PREFIX . 'webhook_logs')
+            $qb->delete(MAUTIC_TABLE_PREFIX.'webhook_logs')
                 ->where($qb->expr()->in('id', $id))
                 ->execute();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/Webhook.php b/app/bundles/WebhookBundle/Entity/Webhook.php
index f7a77465aee..b99e9d03d16 100644
--- a/app/bundles/WebhookBundle/Entity/Webhook.php
+++ b/app/bundles/WebhookBundle/Entity/Webhook.php
@@ -1,27 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\WebhookBundle\Entity;
+
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CategoryBundle\Entity\Category;
-use Mautic\CoreBundle\Entity\FormEntity;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Symfony\Component\Form\Form;
+use Mautic\CoreBundle\Entity\FormEntity;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Mautic\WebhookBundle\Entity\Event;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+
 /**
- * Class Webhook
- *
- * @package Mautic\WebhookBundle\Entity
+ * Class Webhook.
  */
 class Webhook extends FormEntity
 {
@@ -68,7 +67,7 @@ class Webhook extends FormEntity
     /**
      * @var array
      */
-    private $removedEvents = array();
+    private $removedEvents = [];
 
     /*
      * Constructor
@@ -106,7 +105,7 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
             ->cascadePersist()
             ->build();
         // 1:M for logs
-        $builder->createOneToMany('logs', 'Log')->setOrderBy(array('dateAdded' => 'DESC'))
+        $builder->createOneToMany('logs', 'Log')->setOrderBy(['dateAdded' => 'DESC'])
             ->fetchExtraLazy()
             ->mappedBy('webhook')
             ->cascadePersist()
@@ -127,35 +126,35 @@ public static function loadValidatorMetadata(ClassMetadata $metadata)
         $metadata->addPropertyConstraint(
             'name',
             new NotBlank(
-                array(
-                    'message' => 'mautic.core.name.required'
-                )
+                [
+                    'message' => 'mautic.core.name.required',
+                ]
             )
         );
 
         $metadata->addPropertyConstraint(
             'webhookUrl',
             new Assert\Url(
-                array(
-                    'message' => 'mautic.core.valid_url_required'
-                )
+                [
+                    'message' => 'mautic.core.valid_url_required',
+                ]
             )
         );
 
         $metadata->addPropertyConstraint(
             'webhookUrl',
             new Assert\NotBlank(
-                array(
-                    'message' => 'mautic.core.valid_url_required'
-                )
+                [
+                    'message' => 'mautic.core.valid_url_required',
+                ]
             )
         );
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -163,7 +162,7 @@ public function getId()
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $name
      *
@@ -178,7 +177,7 @@ public function setName($name)
     }
 
     /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
@@ -188,7 +187,7 @@ public function getName()
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
      *
@@ -203,7 +202,7 @@ public function setDescription($description)
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
@@ -213,7 +212,7 @@ public function getDescription()
     }
 
     /**
-     * Set webhookUrl
+     * Set webhookUrl.
      *
      * @param string $webhookUrl
      *
@@ -228,7 +227,7 @@ public function setWebhookUrl($webhookUrl)
     }
 
     /**
-     * Get webhookUrl
+     * Get webhookUrl.
      *
      * @return string
      */
@@ -238,7 +237,7 @@ public function getWebhookUrl()
     }
 
     /**
-     * Set category
+     * Set category.
      *
      * @param Category $category
      *
@@ -253,7 +252,7 @@ public function setCategory(Category $category = null)
     }
 
     /**
-     * Get category
+     * Get category.
      *
      * @return Category
      */
@@ -280,7 +279,7 @@ public function setEvents($events)
         $this->isChanged('events', $events);
 
         $this->events = $events;
-        /**  @var \Mautic\WebhookBundle\Entity\Event $event */
+        /** @var \Mautic\WebhookBundle\Entity\Event $event */
         foreach ($events as $event) {
             $event->setWebhook($this);
         }
@@ -333,7 +332,7 @@ public function addQueues($queues)
     {
         $this->queues = $queues;
 
-        /**  @var \Mautic\WebhookBundle\Entity\WebhookQueue $queue */
+        /** @var \Mautic\WebhookBundle\Entity\WebhookQueue $queue */
         foreach ($queues as $queue) {
             $queue->setWebhook($this);
         }
@@ -366,7 +365,7 @@ public function removeQueue(WebhookQueue $queue)
     }
 
     /**
-     * Get log entities
+     * Get log entities.
      *
      * @return ArrayCollection
      */
@@ -384,7 +383,7 @@ public function addLogs($logs)
     {
         $this->logs = $logs;
 
-        /**  @var \Mautic\WebhookBundle\Entity\Log $log */
+        /** @var \Mautic\WebhookBundle\Entity\Log $log */
         foreach ($logs as $log) {
             $log->setWebhook($this);
         }
@@ -422,18 +421,18 @@ public function removeLog(Log $log)
      */
     protected function isChanged($prop, $val)
     {
-        $getter  = "get".ucfirst($prop);
+        $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();
         if ($prop == 'category') {
             $currentId = ($current) ? $current->getId() : '';
             $newId     = ($val) ? $val->getId() : null;
             if ($currentId != $newId) {
-                $this->changes[$prop] = array($currentId, $newId);
+                $this->changes[$prop] = [$currentId, $newId];
             }
         } elseif ($prop == 'events') {
-            $this->changes[$prop] = array();
+            $this->changes[$prop] = [];
         } elseif ($current != $val) {
-            $this->changes[$prop] = array($current, $val);
+            $this->changes[$prop] = [$current, $val];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/WebhookQueue.php b/app/bundles/WebhookBundle/Entity/WebhookQueue.php
index 0ff048b717f..38211f3e7d3 100644
--- a/app/bundles/WebhookBundle/Entity/WebhookQueue.php
+++ b/app/bundles/WebhookBundle/Entity/WebhookQueue.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,10 +12,9 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
+
 /**
- * Class WebhookQueue
- *
- * @package Mautic\WebhookQueue\Entity
+ * Class WebhookQueue.
  */
 class WebhookQueue
 {
@@ -41,7 +41,7 @@ class WebhookQueue
     /**
      * @param ORM\ClassMetadata $metadata
      */
-    public static function loadMetadata (ORM\ClassMetadata $metadata)
+    public static function loadMetadata(ORM\ClassMetadata $metadata)
     {
         $builder = new ClassMetadataBuilder($metadata);
         $builder->setTable('webhook_queue')
@@ -68,9 +68,9 @@ public static function loadMetadata (ORM\ClassMetadata $metadata)
             ->build();
     }
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -89,6 +89,7 @@ public function getWebhook()
     public function setWebhook($webhook)
     {
         $this->webhook = $webhook;
+
         return $this;
     }
     /**
@@ -104,6 +105,7 @@ public function getDateAdded()
     public function setDateAdded($dateAdded)
     {
         $this->dateAdded = $dateAdded;
+
         return $this;
     }
     /**
@@ -119,6 +121,7 @@ public function getPayload()
     public function setPayload($payload)
     {
         $this->payload = $payload;
+
         return $this;
     }
     /**
@@ -134,6 +137,7 @@ public function getEvent()
     public function setEvent($event)
     {
         $this->event = $event;
+
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/WebhookQueueRepository.php b/app/bundles/WebhookBundle/Entity/WebhookQueueRepository.php
index a6ed636b6f9..b405efdf23b 100644
--- a/app/bundles/WebhookBundle/Entity/WebhookQueueRepository.php
+++ b/app/bundles/WebhookBundle/Entity/WebhookQueueRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   Mautic, Inc
  * @author      Mautic, Inc
+ *
  * @link        http://mautic.com
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -25,7 +26,7 @@ public function deleteQueuesById(array $idList)
             return;
         }
         $qb = $this->_em->getConnection()->createQueryBuilder();
-        $qb->delete(MAUTIC_TABLE_PREFIX . 'webhook_queue')
+        $qb->delete(MAUTIC_TABLE_PREFIX.'webhook_queue')
             ->where(
                 $qb->expr()->in('id', $idList)
             )
@@ -42,15 +43,15 @@ public function deleteQueuesById(array $idList)
     public function getQueueCountByWebhookId($id)
     {
         // if no idea was sent (the hook was deleted) then return a count of 0
-        if (! $id) {
+        if (!$id) {
             return 0;
         }
-        $qb = $this->_em->getConnection()->createQueryBuilder();
+        $qb    = $this->_em->getConnection()->createQueryBuilder();
         $count = $qb->select('count(id) as webhook_count')
-                 ->from(MAUTIC_TABLE_PREFIX . 'webhook_queue', $this->getTableAlias())
-                 ->where('webhook_id = ' . $id)
+                 ->from(MAUTIC_TABLE_PREFIX.'webhook_queue', $this->getTableAlias())
+                 ->where('webhook_id = '.$id)
                  ->execute()->fetch();
 
         return $count['webhook_count'];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Entity/WebhookRepository.php b/app/bundles/WebhookBundle/Entity/WebhookRepository.php
index 04eab3d671a..5754f2c43ad 100644
--- a/app/bundles/WebhookBundle/Entity/WebhookRepository.php
+++ b/app/bundles/WebhookBundle/Entity/WebhookRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,18 +13,18 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class WebhookRepository
+ * Class WebhookRepository.
  */
 class WebhookRepository extends CommonRepository
 {
     /**
-     * Get a list of entities
+     * Get a list of entities.
      *
      * @param array $args
      *
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         return parent::getEntities($args);
     }
@@ -35,12 +36,13 @@ public function getEntities($args = array())
      */
     protected function addCatchAllWhereClause(&$q, $filter)
     {
-        return $this->addStandardCatchAllWhereClause($q, $filter, array('e.name'));
+        return $this->addStandardCatchAllWhereClause($q, $filter, ['e.name']);
     }
 
     /**
      * @param QueryBuilder $q
      * @param              $filter
+     *
      * @return array
      */
     protected function addSearchCommandWhereClause(&$q, $filter)
@@ -61,8 +63,8 @@ public function getSearchCommands()
      */
     protected function getDefaultOrder()
     {
-        return array(
-            array($this->getTableAlias() . '.name', 'ASC')
-        );
+        return [
+            [$this->getTableAlias().'.name', 'ASC'],
+        ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Event/WebhookBuilderEvent.php b/app/bundles/WebhookBundle/Event/WebhookBuilderEvent.php
index 93403f14387..f7e516245d5 100644
--- a/app/bundles/WebhookBundle/Event/WebhookBuilderEvent.php
+++ b/app/bundles/WebhookBundle/Event/WebhookBuilderEvent.php
@@ -1,60 +1,59 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Event;
 
-use Symfony\Component\Process\Exception\InvalidArgumentException;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\Process\Exception\InvalidArgumentException;
 
 /**
- * Class WebhookBuilderEvent
- *
- * @package Mautic\WebhookBundle\Event
+ * Class WebhookBuilderEvent.
  */
 class WebhookBuilderEvent extends Event
 {
-    private $events = array();
+    private $events = [];
 
     /**
      * @param \Symfony\Bundle\FrameworkBundle\Translation\Translator $translator
      */
-    public function __construct ($translator)
+    public function __construct($translator)
     {
         $this->translator = $translator;
     }
 
     /**
-     * Add an event for the event list
+     * Add an event for the event list.
      *
-     * @param string $key     - a unique identifier; it is recommended that it be namespaced i.e. lead.mytrigger
+     * @param string $key   - a unique identifier; it is recommended that it be namespaced i.e. lead.mytrigger
      * @param array  $event - can contain the following keys:
-     *                 'label'       => (required) what to display in the list
-     *                 'description' => (optional) short description of event
+     *                      'label'       => (required) what to display in the list
+     *                      'description' => (optional) short description of event
      */
-    public function addEvent ($key, array $event)
+    public function addEvent($key, array $event)
     {
         if (array_key_exists($key, $this->events)) {
             throw new InvalidArgumentException("The key, '$key' is already used by another webhook event. Please use a different key.");
         }
 
         $event['label']       = $this->translator->trans($event['label']);
-        $event['description'] =  (isset($event['description'])) ? $this->translator->trans($event['description']) : '';
+        $event['description'] = (isset($event['description'])) ? $this->translator->trans($event['description']) : '';
 
         $this->events[$key] = $event;
     }
 
     /**
-     * Get webhook events
+     * Get webhook events.
      *
      * @return array
      */
-    public function getEvents ()
+    public function getEvents()
     {
         static $sorted = false;
 
@@ -68,4 +67,4 @@ public function getEvents ()
 
         return $this->events;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Event/WebhookEvent.php b/app/bundles/WebhookBundle/Event/WebhookEvent.php
index a1394797515..80d9398a7c6 100644
--- a/app/bundles/WebhookBundle/Event/WebhookEvent.php
+++ b/app/bundles/WebhookBundle/Event/WebhookEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,24 +14,22 @@
 use Mautic\WebhookBundle\Entity\Webhook;
 
 /**
- * Class WebhookEvent
- *
- * @package Mautic\WebhookBundle\Event
+ * Class WebhookEvent.
  */
 class WebhookEvent extends CommonEvent
 {
     /**
      * @param Webhook $webhook
-     * @param bool $isNew
+     * @param bool    $isNew
      */
     public function __construct(Webhook &$webhook, $isNew = false)
     {
-        $this->entity  =& $webhook;
-        $this->isNew = $isNew;
+        $this->entity = &$webhook;
+        $this->isNew  = $isNew;
     }
 
     /**
-     * Returns the Webhook entity
+     * Returns the Webhook entity.
      *
      * @return Webhook
      */
@@ -40,7 +39,7 @@ public function getWebhook()
     }
 
     /**
-     * Sets the Webhook entity
+     * Sets the Webhook entity.
      *
      * @param Webhook $webhook
      */
@@ -48,4 +47,4 @@ public function setWebhook(Webhook $webhook)
     {
         $this->entity = $webhook;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Event/WebhookQueueEvent.php b/app/bundles/WebhookBundle/Event/WebhookQueueEvent.php
index b42fd190a3d..a890f9fd684 100644
--- a/app/bundles/WebhookBundle/Event/WebhookQueueEvent.php
+++ b/app/bundles/WebhookBundle/Event/WebhookQueueEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,26 +15,24 @@
 use Mautic\WebhookBundle\Entity\WebhookQueue;
 
 /**
- * Class WebhookQueueEvent
- *
- * @package Mautic\LeadBundle\Event
+ * Class WebhookQueueEvent.
  */
 class WebhookQueueEvent extends CommonEvent
 {
     /**
      * @param WebhookQueue $webhookQueue
      * @param Webhook      $webhook
-     * @param bool $isNew
+     * @param bool         $isNew
      */
     public function __construct(WebhookQueue &$webhookQueue, Webhook $webhook,  $isNew = false)
     {
-        $this->entity  =& $webhookQueue;
-        $this->webhook =& $webhook;
-        $this->isNew = $isNew;
+        $this->entity  = &$webhookQueue;
+        $this->webhook = &$webhook;
+        $this->isNew   = $isNew;
     }
 
     /**
-     * Returns the WebhookQueue entity
+     * Returns the WebhookQueue entity.
      *
      * @return WebhookQueue
      */
@@ -43,7 +42,7 @@ public function getWebhookQueue()
     }
 
     /**
-     * Sets the WebhookQueue entity
+     * Sets the WebhookQueue entity.
      *
      * @param WebhookQueue $webhookQueue
      */
@@ -53,7 +52,7 @@ public function setWebhookQueue(WebhookQueue $webhookQueue)
     }
 
     /**
-     * Returns the Webhook entity
+     * Returns the Webhook entity.
      *
      * @return Webhook
      */
@@ -63,7 +62,7 @@ public function getWebhook()
     }
 
     /**
-     * Sets the Webhook entity
+     * Sets the Webhook entity.
      *
      * @param Webhook $webhook
      */
@@ -71,4 +70,4 @@ public function setWebhook(Webhook $webhook)
     {
         $this->webhook = $webhook;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/EventListener/ConfigSubscriber.php b/app/bundles/WebhookBundle/EventListener/ConfigSubscriber.php
index 70b9efeca35..ea687b8723a 100644
--- a/app/bundles/WebhookBundle/EventListener/ConfigSubscriber.php
+++ b/app/bundles/WebhookBundle/EventListener/ConfigSubscriber.php
@@ -1,42 +1,41 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class ConfigSubscriber
- *
- * @package Mautic\WebhookBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE => array('onConfigGenerate', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+        ];
     }
 
-    public function onConfigGenerate (ConfigBuilderEvent $event)
+    public function onConfigGenerate(ConfigBuilderEvent $event)
     {
-        $event->addForm(array(
+        $event->addForm([
             'bundle'     => 'WebhookBundle',
             'formAlias'  => 'webhookconfig',
             'formTheme'  => 'MauticWebhookBundle:FormTheme\Config',
-            'parameters' => $event->getParametersFromConfig('MauticWebhookBundle')
-        ));
+            'parameters' => $event->getParametersFromConfig('MauticWebhookBundle'),
+        ]);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/EventListener/EmailSubscriber.php b/app/bundles/WebhookBundle/EventListener/EmailSubscriber.php
index e2053a20288..aadfbabd3fb 100644
--- a/app/bundles/WebhookBundle/EventListener/EmailSubscriber.php
+++ b/app/bundles/WebhookBundle/EventListener/EmailSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,32 +14,32 @@
 use Mautic\EmailBundle\Event\EmailOpenEvent;
 
 /**
- * Class EmailSubscriber
+ * Class EmailSubscriber.
  */
 class EmailSubscriber extends WebhookSubscriberBase
 {
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            EmailEvents::EMAIL_ON_OPEN   => array('onEmailOpen', 0),
-        );
+        return [
+            EmailEvents::EMAIL_ON_OPEN => ['onEmailOpen', 0],
+        ];
     }
 
     public function onEmailOpen(EmailOpenEvent $event)
     {
-        $types    = array(EmailEvents::EMAIL_ON_OPEN);
+        $types = [EmailEvents::EMAIL_ON_OPEN];
 
-        $groups = array('statDetails', 'leadList', 'emailDetails');
-        $stat = ($event->getStat());
+        $groups = ['statDetails', 'leadList', 'emailDetails'];
+        $stat   = ($event->getStat());
 
-        $payload = array(
-            'stat'  => $stat,
-        );
+        $payload = [
+            'stat' => $stat,
+        ];
 
         $webhooks = $this->getEventWebooksByType($types);
         $this->webhookModel->QueueWebhooks($webhooks, $payload, $groups, true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/EventListener/FormSubscriber.php b/app/bundles/WebhookBundle/EventListener/FormSubscriber.php
index ab4c78daf9c..0294fb5dccd 100644
--- a/app/bundles/WebhookBundle/EventListener/FormSubscriber.php
+++ b/app/bundles/WebhookBundle/EventListener/FormSubscriber.php
@@ -1,33 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
-use Mautic\FormBundle\Event as Events;
-use Mautic\FormBundle\FormEvents;
 use Mautic\FormBundle\Event\SubmissionEvent;
+use Mautic\FormBundle\FormEvents;
 
 /**
- * Class FormSubscriber
+ * Class FormSubscriber.
  */
 class FormSubscriber extends WebhookSubscriberBase
 {
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            FormEvents::FORM_ON_SUBMIT   => array('onFormSubmit', 0),
-        );
+        return [
+            FormEvents::FORM_ON_SUBMIT => ['onFormSubmit', 0],
+        ];
     }
 
     /*
@@ -37,17 +35,17 @@ static public function getSubscribedEvents ()
      */
     public function onFormSubmit(SubmissionEvent $event)
     {
-        $types    = array(FormEvents::FORM_ON_SUBMIT);
+        $types = [FormEvents::FORM_ON_SUBMIT];
 
-        $groups = array('submissionDetails', 'ipAddress', 'leadList', 'pageList', 'formList');
+        $groups = ['submissionDetails', 'ipAddress', 'leadList', 'pageList', 'formList'];
 
         $form = $event->getSubmission();
 
-        $payload = array(
-            'submission'  => $form,
-        );
+        $payload = [
+            'submission' => $form,
+        ];
 
         $webhooks = $this->getEventWebooksByType($types);
         $this->webhookModel->QueueWebhooks($webhooks, $payload, $groups, true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/EventListener/LeadSubscriber.php b/app/bundles/WebhookBundle/EventListener/LeadSubscriber.php
index 35de07ebd3e..00697da2afe 100644
--- a/app/bundles/WebhookBundle/EventListener/LeadSubscriber.php
+++ b/app/bundles/WebhookBundle/EventListener/LeadSubscriber.php
@@ -1,46 +1,38 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\EventListener;
 
-use JMS\Serializer\Serializer;
-use Mautic\WebhookBundle\EventListener\WebhookSubscriberBase;
-use Mautic\CoreBundle\Factory\MauticFactory;
-use Doctrine\ORM\NoResultException;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\LeadBundle\LeadEvents;
 use Mautic\LeadBundle\Event\LeadEvent;
 use Mautic\LeadBundle\Event\PointsChangeEvent;
-use Mautic\ApiBundle\Serializer\Exclusion\PublishDetailsExclusionStrategy;
-
+use Mautic\LeadBundle\LeadEvents;
 
 /**
- * Class LeadSubscriber
- *
- * @package Mautic\Webhook\EventListener
+ * Class LeadSubscriber.
  */
 class LeadSubscriber extends WebhookSubscriberBase
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            LeadEvents::LEAD_POST_SAVE            => array('onLeadNewUpdate', 0),
-            LeadEvents::LEAD_POINTS_CHANGE        => array('onLeadPointChange', 0),
-            LeadEvents::LEAD_POST_DELETE          => array('onLeadDelete', 0),
+        return [
+            LeadEvents::LEAD_POST_SAVE     => ['onLeadNewUpdate', 0],
+            LeadEvents::LEAD_POINTS_CHANGE => ['onLeadPointChange', 0],
+            LeadEvents::LEAD_POST_DELETE   => ['onLeadDelete', 0],
             //LeadEvents::LEAD_LIST_BATCH_CHANGE  => array('onLeadEvent', 0),
             //LeadEvents::LEAD_POST_MERGE         => array('onLeadEvent', 0),
             //LeadEvents::LEAD_IDENTIFIED         => array('onLeadEvent', 0),
             //LeadEvents::CURRENT_LEAD_CHANGED    => array('onLeadEvent', 0)
-        );
+        ];
     }
 
     /*
@@ -48,24 +40,24 @@ static public function getSubscribedEvents ()
      */
     public function onLeadNewUpdate(LeadEvent $event)
     {
-        $serializerGroups = array("leadDetails", "userList", "publishDetails", "ipAddress");
+        $serializerGroups = ['leadDetails', 'userList', 'publishDetails', 'ipAddress'];
 
         $entity = $event->getLead();
 
-        $payload = array(
-            'lead'      => $entity,
-        );
+        $payload = [
+            'lead' => $entity,
+        ];
 
         // get the leads
         if ($event->isNew()) {
             // get our new lead webhook events first
-            $webhookEvents = $this->getEventWebooksByType(LeadEvents::LEAD_POST_SAVE . '_new');
+            $webhookEvents = $this->getEventWebooksByType(LeadEvents::LEAD_POST_SAVE.'_new');
             $this->webhookModel->QueueWebhooks($webhookEvents, $payload, $serializerGroups, true);
         }
 
         // now deal with webhooks for the update event
-        if (! $event->isNew()) {
-            $webhookEvents = $this->getEventWebooksByType(LeadEvents::LEAD_POST_SAVE . '_update');
+        if (!$event->isNew()) {
+            $webhookEvents = $this->getEventWebooksByType(LeadEvents::LEAD_POST_SAVE.'_update');
             $this->webhookModel->QueueWebhooks($webhookEvents, $payload, $serializerGroups, true);
         }
     }
@@ -79,17 +71,17 @@ public function onLeadPointChange(PointsChangeEvent $event)
         /** @var \Mautic\LeadBundle\Entity\Lead $lead */
         $lead = $event->getLead();
 
-        $serializerGroups = array("leadDetails", "userList", "publishDetails", "ipAddress");
+        $serializerGroups = ['leadDetails', 'userList', 'publishDetails', 'ipAddress'];
 
-        $payload = array(
-            'lead'      => $lead,
-            'points' => array(
+        $payload = [
+            'lead'   => $lead,
+            'points' => [
                 'old_points' => $event->getOldPoints(),
-                'new_points' => $event->getNewPoints()
-            )
-        );
+                'new_points' => $event->getNewPoints(),
+            ],
+        ];
 
-        $types    = array(LeadEvents::LEAD_POINTS_CHANGE);
+        $types    = [LeadEvents::LEAD_POINTS_CHANGE];
         $webhooks = $this->getEventWebooksByType($types);
         $this->webhookModel->QueueWebhooks($webhooks, $payload, $serializerGroups, true);
     }
@@ -102,14 +94,14 @@ public function onLeadDelete(LeadEvent $event)
         /** @var \Mautic\LeadBundle\Entity\Lead $lead */
         $lead = $event->getLead();
 
-        $serializerGroups = array("leadDetails", "userList", "publishDetails", "ipAddress");
+        $serializerGroups = ['leadDetails', 'userList', 'publishDetails', 'ipAddress'];
 
-        $payload = array(
-            'lead'      => $lead,
-        );
+        $payload = [
+            'lead' => $lead,
+        ];
 
-        $types    = array(LeadEvents::LEAD_POST_DELETE);
+        $types    = [LeadEvents::LEAD_POST_DELETE];
         $webhooks = $this->getEventWebooksByType($types);
         $this->webhookModel->QueueWebhooks($webhooks, $payload, $serializerGroups, true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/EventListener/PageSubscriber.php b/app/bundles/WebhookBundle/EventListener/PageSubscriber.php
index 16a2095f680..6e468019851 100644
--- a/app/bundles/WebhookBundle/EventListener/PageSubscriber.php
+++ b/app/bundles/WebhookBundle/EventListener/PageSubscriber.php
@@ -1,45 +1,46 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\EventListener;
 
-use Mautic\PageBundle\PageEvents;
 use Mautic\PageBundle\Event\PageHitEvent;
+use Mautic\PageBundle\PageEvents;
 
 /**
- * Class EmailSubscriber
+ * Class EmailSubscriber.
  */
 class PageSubscriber extends WebhookSubscriberBase
 {
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            PageEvents::PAGE_ON_HIT   => array('onPageHit', 0),
-        );
+        return [
+            PageEvents::PAGE_ON_HIT => ['onPageHit', 0],
+        ];
     }
 
     public function onPageHit(PageHitEvent $event)
     {
-        $types    = array(PageEvents::PAGE_ON_HIT);
+        $types = [PageEvents::PAGE_ON_HIT];
 
-        $groups = array('hitDetails', 'emailDetails', 'pageList', 'leadList');
+        $groups = ['hitDetails', 'emailDetails', 'pageList', 'leadList'];
 
         $hit = $event->getHit();
 
-        $payload = array(
-            'hit'  => $hit,
-        );
+        $payload = [
+            'hit' => $hit,
+        ];
 
         $webhooks = $this->getEventWebooksByType($types);
         $this->webhookModel->QueueWebhooks($webhooks, $payload, $groups, true);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/EventListener/WebhookSubscriber.php b/app/bundles/WebhookBundle/EventListener/WebhookSubscriber.php
index 7dc13c2eab4..651817d542c 100644
--- a/app/bundles/WebhookBundle/EventListener/WebhookSubscriber.php
+++ b/app/bundles/WebhookBundle/EventListener/WebhookSubscriber.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\EventListener;
 
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Event as MauticEvents;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\CoreBundle\Model\AuditLogModel;
-use Mautic\WebhookBundle\WebhookEvents as WebhookEvents;
 use Mautic\WebhookBundle\Event\WebhookEvent;
+use Mautic\WebhookBundle\WebhookEvents as WebhookEvents;
 
 /**
- * Class WebhookSubscriber
+ * Class WebhookSubscriber.
  */
 class WebhookSubscriber extends CommonSubscriber
 {
@@ -47,14 +47,14 @@ public function __construct(IpLookupHelper $ipLookupHelper, AuditLogModel $audit
      */
     public static function getSubscribedEvents()
     {
-        return array(
-            WebhookEvents::WEBHOOK_POST_SAVE       => array('onWebhookSave', 0),
-            WebhookEvents::WEBHOOK_POST_DELETE     => array('onWebhookDelete', 0)
-        );
+        return [
+            WebhookEvents::WEBHOOK_POST_SAVE   => ['onWebhookSave', 0],
+            WebhookEvents::WEBHOOK_POST_DELETE => ['onWebhookDelete', 0],
+        ];
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param WebhookEvent $event
      */
@@ -63,34 +63,34 @@ public function onWebhookSave(WebhookEvent $event)
         $webhook = $event->getWebhook();
 
         if ($details = $event->getChanges()) {
-            $log = array(
-                "bundle"    => "webhook",
-                "object"    => "webhook",
-                "objectId"  => $webhook->getId(),
-                "action"    => ($event->isNew()) ? "create" : "update",
-                "details"   => $details,
-                "ipAddress" => $this->ipLookupHelper->getIpAddressFromRequest()
-            );
+            $log = [
+                'bundle'    => 'webhook',
+                'object'    => 'webhook',
+                'objectId'  => $webhook->getId(),
+                'action'    => ($event->isNew()) ? 'create' : 'update',
+                'details'   => $details,
+                'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+            ];
             $this->auditLogModel->writeToLog($log);
         }
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param WebhookEvent $event
      */
     public function onWebhookDelete(WebhookEvent $event)
     {
         $webhook = $event->getWebhook();
-        $log = array(
-            "bundle"     => "webhook",
-            "object"     => "webhook",
-            "objectId"   => $event->getWebhook()->deletedId,
-            "action"     => "delete",
-            "details"    => array('name' => $webhook->getName()),
-            "ipAddress"  => $this->ipLookupHelper->getIpAddressFromRequest()
-        );
+        $log     = [
+            'bundle'    => 'webhook',
+            'object'    => 'webhook',
+            'objectId'  => $event->getWebhook()->deletedId,
+            'action'    => 'delete',
+            'details'   => ['name' => $webhook->getName()],
+            'ipAddress' => $this->ipLookupHelper->getIpAddressFromRequest(),
+        ];
         $this->auditLogModel->writeToLog($log);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php b/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php
index 9a6ac5fec54..93bce674688 100644
--- a/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php
+++ b/app/bundles/WebhookBundle/EventListener/WebhookSubscriberBase.php
@@ -1,23 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\EventListener;
 
-use Doctrine\ORM\NoResultException;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\WebhookBundle\Model\WebhookModel;
 
 /**
- * Class WebhookSubscriberBase
- *
- * @package Mautic\Webhook\EventListener
+ * Class WebhookSubscriberBase.
  */
 class WebhookSubscriberBase extends CommonSubscriber
 {
@@ -33,7 +30,7 @@ public function setWebhookModel(WebhookModel $webhookModel)
     }
 
     /**
-     * Look up list of webhooks using the event type as an identifer
+     * Look up list of webhooks using the event type as an identifer.
      *
      * @param $type string
      *
@@ -45,4 +42,4 @@ public function getEventWebooksByType($type)
 
         return $eventWebhooks;
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Form/DataTransformer/EventsToArrayTransformer.php b/app/bundles/WebhookBundle/Form/DataTransformer/EventsToArrayTransformer.php
index 6e0f33dbb19..d9d95b32a3b 100644
--- a/app/bundles/WebhookBundle/Form/DataTransformer/EventsToArrayTransformer.php
+++ b/app/bundles/WebhookBundle/Form/DataTransformer/EventsToArrayTransformer.php
@@ -1,21 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Form\DataTransformer;
 
 use Doctrine\ORM\PersistentCollection;
-use Symfony\Component\Form\DataTransformerInterface;
-use Mautic\WebhookBundle\Entity\Webhook;
 use Mautic\WebhookBundle\Entity\Event;
+use Mautic\WebhookBundle\Entity\Webhook;
+use Symfony\Component\Form\DataTransformerInterface;
 
 /**
- * Class EventsToArrayTransformer
+ * Class EventsToArrayTransformer.
  */
 class EventsToArrayTransformer implements DataTransformerInterface
 {
@@ -27,21 +28,22 @@ public function __construct(Webhook $webhook)
     }
 
     /**
-     * Convert from the PersistentCollection of Event entities to a simple array
+     * Convert from the PersistentCollection of Event entities to a simple array.
      *
      * @return array
      */
     public function transform($events)
     {
-        $eventArray = array();
+        $eventArray = [];
         foreach ($events as $event) {
             $eventArray[] = $event->getEventType();
         }
+
         return $eventArray;
     }
 
     /**
-     * Convert a simple array into a PersistentCollection of Event entities
+     * Convert a simple array into a PersistentCollection of Event entities.
      *
      * @return PersistentCollection
      */
diff --git a/app/bundles/WebhookBundle/Form/Type/ConfigType.php b/app/bundles/WebhookBundle/Form/Type/ConfigType.php
index f7a77ed9556..7611cf1c677 100644
--- a/app/bundles/WebhookBundle/Form/Type/ConfigType.php
+++ b/app/bundles/WebhookBundle/Form/Type/ConfigType.php
@@ -1,23 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class ConfigType
- *
- * @package Mautic\WebhookBundle\Form\Type
+ * Class ConfigType.
  */
 class ConfigType extends AbstractType
 {
@@ -25,27 +23,27 @@ class ConfigType extends AbstractType
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('queue_mode', 'choice', array(
-            'choices'  => array(
+        $builder->add('queue_mode', 'choice', [
+            'choices' => [
                 'immediate_process' => 'mautic.webhook.config.immediate_process',
-                'command_process'   => 'mautic.webhook.config.cron_process'
-            ),
-            'label'    => 'mautic.webhook.config.form.queue.mode',
-            'attr'     => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.webhook.config.form.queue.mode.tooltip'
-            ),
+                'command_process'   => 'mautic.webhook.config.cron_process',
+            ],
+            'label' => 'mautic.webhook.config.form.queue.mode',
+            'attr'  => [
+                'class'   => 'form-control',
+                'tooltip' => 'mautic.webhook.config.form.queue.mode.tooltip',
+            ],
             'empty_value' => false,
-            'constraints' => array(
+            'constraints' => [
                 new NotBlank(
-                    array(
-                        'message' => 'mautic.core.value.required'
-                    )
-                )
-            )
-        ));
+                    [
+                        'message' => 'mautic.core.value.required',
+                    ]
+                ),
+            ],
+        ]);
     }
 
     /**
@@ -55,4 +53,4 @@ public function getName()
     {
         return 'webhookconfig';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Form/Type/WebhookType.php b/app/bundles/WebhookBundle/Form/Type/WebhookType.php
index 31ba444c973..fa9984d99f9 100644
--- a/app/bundles/WebhookBundle/Form/Type/WebhookType.php
+++ b/app/bundles/WebhookBundle/Form/Type/WebhookType.php
@@ -1,27 +1,28 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Form\Type;
 
+use Mautic\WebhookBundle\Form\DataTransformer\EventsToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Mautic\WebhookBundle\Form\DataTransformer\EventsToArrayTransformer;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class ReportType
+ * Class ReportType.
  */
 class WebhookType extends AbstractType
 {
     /**
-     * Translator object
+     * Translator object.
      *
      * @var \Symfony\Bundle\FrameworkBundle\Translation\Translator
      */
@@ -49,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label'      => 'mautic.core.name',
                 'label_attr' => ['class' => 'control-label'],
                 'attr'       => ['class' => 'form-control'],
-                'required'   => true
+                'required'   => true,
             ]
         );
 
@@ -61,7 +62,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false,
                 'attr'     => [
                     'class' => 'form-control',
-                ]
+                ],
             ]
         );
 
@@ -69,10 +70,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'webhookUrl',
             'url',
             [
-                'label'       => 'mautic.webhook.form.webhook_url',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => ['class' => 'form-control'],
-                'required'    => true,
+                'label'      => 'mautic.webhook.form.webhook_url',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+                'required'   => true,
             ]
         );
 
@@ -115,7 +116,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'category',
             'category',
             [
-                'bundle' => 'Webhook'
+                'bundle' => 'Webhook',
             ]
         );
 
@@ -141,6 +142,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getName()
     {
-        return "webhook";
+        return 'webhook';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/MauticWebhookBundle.php b/app/bundles/WebhookBundle/MauticWebhookBundle.php
index 14a376a341c..69319a60028 100644
--- a/app/bundles/WebhookBundle/MauticWebhookBundle.php
+++ b/app/bundles/WebhookBundle/MauticWebhookBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class MauticFormBundle
- *
- * @package Mautic\FormBundle
+ * Class MauticFormBundle.
  */
 class MauticWebhookBundle extends Bundle
 {
-
 }
diff --git a/app/bundles/WebhookBundle/Model/WebhookModel.php b/app/bundles/WebhookBundle/Model/WebhookModel.php
index 4f1a8a12125..81b26896915 100644
--- a/app/bundles/WebhookBundle/Model/WebhookModel.php
+++ b/app/bundles/WebhookBundle/Model/WebhookModel.php
@@ -1,33 +1,33 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Model;
 
+use JMS\Serializer\SerializationContext;
 use JMS\Serializer\Serializer;
+use Joomla\Http\Http;
+use Joomla\Http\Response;
 use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Model\FormModel;
 use Mautic\WebhookBundle\Entity\Log;
 use Mautic\WebhookBundle\Entity\Webhook;
-use Joomla\Http\Http;
-use Joomla\Http\Response;
 use Mautic\WebhookBundle\Entity\WebhookQueue;
 use Mautic\WebhookBundle\Event as Events;
+use Mautic\WebhookBundle\Event\WebhookEvent;
 use Mautic\WebhookBundle\WebhookEvents;
-Use Mautic\WebhookBundle\Event\WebhookEvent;
 use Symfony\Component\Config\Definition\Exception\Exception;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\EventDispatcher\Event as SymfonyEvent;
-use JMS\Serializer\SerializationContext;
-use Mautic\CoreBundle\Factory\MauticFactory;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
- * Class ReportModel
+ * Class ReportModel.
  */
 class WebhookModel extends FormModel
 {
@@ -66,12 +66,13 @@ public function __construct(CoreParametersHelper $coreParametersHelper, Serializ
      * @param array $options
      *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
     public function createForm($entity, $formFactory, $action = null, $params = [])
     {
         if (!$entity instanceof Webhook) {
-            throw new MethodNotAllowedHttpException (['Webhook']);
+            throw new MethodNotAllowedHttpException(['Webhook']);
         }
 
         if (!empty($action)) {
@@ -106,7 +107,7 @@ public function getRepository()
     }
 
     /**
-     * Gets array of custom events from bundles subscribed MauticWehbhookBundle::WEBHOOK_ON_BUILD
+     * Gets array of custom events from bundles subscribed MauticWehbhookBundle::WEBHOOK_ON_BUILD.
      *
      * @return mixed
      */
@@ -243,7 +244,7 @@ public function processWebhook(Webhook $webhook)
         // Set up custom headers
         $headers = ['Content-Type' => 'application/json'];
 
-        /** @var \Mautic\WebhookBundle\Entity\Webhook $webhook */
+        /* @var \Mautic\WebhookBundle\Entity\Webhook $webhook */
         try {
             /** @var \Joomla\Http\Http $http */
             $response = $http->post($webhook->getWebhookUrl(), json_encode($payload), $headers);
@@ -324,7 +325,7 @@ public function getWebhookPayload($webhook)
         $queuesArray = $this->getWebhookQueues($webhook);
         $payload     = [];
 
-        /** @var \Mautic\WebhookBundle\Entity\WebhookQueue $queue */
+        /* @var \Mautic\WebhookBundle\Entity\WebhookQueue $queue */
         foreach ($queuesArray as $queues) {
             foreach ($queues as $queue) {
 
@@ -372,10 +373,10 @@ public function getWebhookQueues(Webhook $webhook)
                         [
                             'column' => 'IDENTITY(e.webhook)',
                             'expr'   => 'eq',
-                            'value'  => $webhook->getId()
-                        ]
-                    ]
-                ]
+                            'value'  => $webhook->getId(),
+                        ],
+                    ],
+                ],
             ]
         );
 
@@ -399,16 +400,16 @@ protected function dispatchEvent($action, &$entity, $isNew = false, SymfonyEvent
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = WebhookEvents::WEBHOOK_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = WebhookEvents::WEBHOOK_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = WebhookEvents::WEBHOOK_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = WebhookEvents::WEBHOOK_POST_DELETE;
                 break;
             default:
@@ -429,7 +430,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, SymfonyEvent
     }
 
     /**
-     * Serialize Data
+     * Serialize Data.
      */
     public function serializeData($payload, $groups = [])
     {
@@ -458,4 +459,4 @@ public function getPermissionBase()
     {
         return 'webhook:webhooks';
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Security/Permissions/WebhookPermissions.php b/app/bundles/WebhookBundle/Security/Permissions/WebhookPermissions.php
index 4a6d5d85677..6ea41bcf220 100644
--- a/app/bundles/WebhookBundle/Security/Permissions/WebhookPermissions.php
+++ b/app/bundles/WebhookBundle/Security/Permissions/WebhookPermissions.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\WebhookBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class PagePermissions
+ * Class PagePermissions.
  */
 class WebhookPermissions extends AbstractPermissions
 {
-
     /**
      * {@inheritdoc}
      */
@@ -33,7 +33,8 @@ public function __construct($params)
      *
      * @return string|void
      */
-    public function getName() {
+    public function getName()
+    {
         return 'webhook';
     }
 
@@ -45,4 +46,4 @@ public function buildForm(FormBuilderInterface &$builder, array $options, array
         $this->addStandardFormFields('webhook', 'categories', $builder, $data);
         $this->addExtendedFormFields('webhook', 'webhooks', $builder, $data);
     }
-}
\ No newline at end of file
+}
diff --git a/app/bundles/WebhookBundle/Views/FormTheme/Config/_config_webhookconfig_widget.html.php b/app/bundles/WebhookBundle/Views/FormTheme/Config/_config_webhookconfig_widget.html.php
index e690b60f349..01336ead341 100644
--- a/app/bundles/WebhookBundle/Views/FormTheme/Config/_config_webhookconfig_widget.html.php
+++ b/app/bundles/WebhookBundle/Views/FormTheme/Config/_config_webhookconfig_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/app/bundles/WebhookBundle/Views/Helper/labelcode.html.php b/app/bundles/WebhookBundle/Views/Helper/labelcode.html.php
index 068c7a36e0c..7d7d6fdb946 100644
--- a/app/bundles/WebhookBundle/Views/Helper/labelcode.html.php
+++ b/app/bundles/WebhookBundle/Views/Helper/labelcode.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($code == '200'): ?>
     <span class="label label-success">
          <?php echo $code; ?>
diff --git a/app/bundles/WebhookBundle/Views/Webhook/details.html.php b/app/bundles/WebhookBundle/Views/Webhook/details.html.php
index 28aaaf0eac0..f5879d85cee 100644
--- a/app/bundles/WebhookBundle/Views/Webhook/details.html.php
+++ b/app/bundles/WebhookBundle/Views/Webhook/details.html.php
@@ -1,28 +1,27 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'mauticWebhook');
 
-/** @var \Mautic\WebhookBundle\Entity\Webhook $item */
-$view['slots']->set("headerTitle", $item->getName());
+/* @var \Mautic\WebhookBundle\Entity\Webhook $item */
+$view['slots']->set('headerTitle', $item->getName());
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
     'item'            => $item,
-    'templateButtons' => array(
+    'templateButtons' => [
         'edit'   => $view['security']->hasEntityAccess($permissions['webhook:webhooks:editown'], $permissions['webhook:webhooks:editother'], $item->getCreatedBy()),
         'clone'  => $permissions['webhook:webhooks:create'],
         'delete' => $view['security']->hasEntityAccess($permissions['webhook:webhooks:deleteown'], $permissions['webhook:webhooks:deleteown'], $item->getCreatedBy()),
-    ),
-    'routeBase' => 'webhook'
-)));
+    ],
+    'routeBase' => 'webhook',
+]));
 ?>
 
 <!-- start: box layout -->
@@ -37,7 +36,7 @@
                         <div class="text-muted"><?php echo $item->getDescription(); ?></div>
                     </div>
                     <div class="col-xs-2 text-right">
-                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', array('entity' => $item)); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', ['entity' => $item]); ?>
                     </div>
                 </div>
             </div>
@@ -47,7 +46,7 @@
             <div class="row">
                 <div class="col-md-12">
                     <?php $hookLog = $item->getLogs(); ?>
-                    <?php if (! count($hookLog)): ?>
+                    <?php if (!count($hookLog)): ?>
                         <div class="alert alert-warning col-md-6 col-md-offset-3 mt-md" style="white-space: normal;">
                             <h4>
                                 <?php echo $view['translator']->trans('mautic.webhook.no.logs'); ?>
@@ -76,9 +75,9 @@
                                     <tr>
                                         <td><?php echo $log->getId(); ?></td>
                                         <td><?php
-                                            echo $view->render('MauticWebhookBundle:Helper:labelcode.html.php', array(
+                                            echo $view->render('MauticWebhookBundle:Helper:labelcode.html.php', [
                                                 'code' => $log->getStatusCode(),
-                                            ));
+                                            ]);
                                             ?>
                                         </td>
                                         <td><?php echo $view['date']->toFull($log->getDateAdded()); ?></td>
@@ -122,7 +121,7 @@
             <hr class="hr-w-2" style="width:50%">
 
             <!-- recent activity -->
-            <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', array('logs' => $logs)); ?>
+            <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', ['logs' => $logs]); ?>
         </div>
     </div>
     <!--/ right section -->
diff --git a/app/bundles/WebhookBundle/Views/Webhook/form.html.php b/app/bundles/WebhookBundle/Views/Webhook/form.html.php
index 6cd876cf240..61ebbb430e3 100644
--- a/app/bundles/WebhookBundle/Views/Webhook/form.html.php
+++ b/app/bundles/WebhookBundle/Views/Webhook/form.html.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'mauticWebhook');
 
 $header = ($entity->getId()) ?
     $view['translator']->trans('mautic.webhook.webhook.header.edit',
-        array('%name%' => $view['translator']->trans($entity->getName()))) :
+        ['%name%' => $view['translator']->trans($entity->getName())]) :
     $view['translator']->trans('mautic.webhook.webhook.header.new');
 
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 
 ?>
 
diff --git a/app/bundles/WebhookBundle/Views/Webhook/index.html.php b/app/bundles/WebhookBundle/Views/Webhook/index.html.php
index 599da2cbae7..8629f631adf 100644
--- a/app/bundles/WebhookBundle/Views/Webhook/index.html.php
+++ b/app/bundles/WebhookBundle/Views/Webhook/index.html.php
@@ -1,34 +1,34 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'mauticWebhook');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.webhook.webhooks'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.webhook.webhooks'));
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-    'templateButtons' => array(
-        'new'=> $permissions['webhook:webhooks:create']
-    ),
-    'routeBase' => 'webhook'
-)));
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+    'templateButtons' => [
+        'new' => $permissions['webhook:webhooks:create'],
+    ],
+    'routeBase' => 'webhook',
+]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-        'searchValue' => $searchValue,
-        'searchHelp'  => 'mautic.page.help.searchcommands',
-        'action'      => $currentRoute,
-        'routeBase'   => 'webhook',
-        'templateButtons' => array(
-            'delete' => $permissions['webhook:webhooks:deleteown'] || $permissions['webhook:webhooks:deleteother']
-        )
-    )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+        'searchValue'     => $searchValue,
+        'searchHelp'      => 'mautic.page.help.searchcommands',
+        'action'          => $currentRoute,
+        'routeBase'       => 'webhook',
+        'templateButtons' => [
+            'delete' => $permissions['webhook:webhooks:deleteown'] || $permissions['webhook:webhooks:deleteother'],
+        ],
+    ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
     </div>
diff --git a/app/bundles/WebhookBundle/Views/Webhook/list.html.php b/app/bundles/WebhookBundle/Views/Webhook/list.html.php
index e6a1eb4d91a..7c5f582490d 100644
--- a/app/bundles/WebhookBundle/Views/Webhook/list.html.php
+++ b/app/bundles/WebhookBundle/Views/Webhook/list.html.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticWebhookBundle:Webhook:index.html.php');
+}
 ?>
 
 <?php if (count($items)): ?>
@@ -16,32 +18,32 @@
             <thead>
                 <tr>
                     <?php
-                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                             'checkall' => 'true',
-                            'target'   => '#webhookTable'
-                        ));
+                            'target'   => '#webhookTable',
+                        ]);
 
-                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                             'sessionVar' => 'mautic_webhook',
                             'orderBy'    => 'e.name',
                             'text'       => 'mautic.core.name',
                             'class'      => 'col-webhook-name',
-                            'default'    => true
-                        ));
+                            'default'    => true,
+                        ]);
 
-                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                             'sessionVar' => 'mautic_webhook',
                             'orderBy'    => 'e.webhookUrl',
                             'text'       => 'mautic.webhook.webhook_url',
-                            'class'      => 'col-webhook-id visible-md visible-lg'
-                        ));
+                            'class'      => 'col-webhook-id visible-md visible-lg',
+                        ]);
 
-                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                        echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                             'sessionVar' => 'mautic_webhook',
                             'orderBy'    => 'e.id',
                             'text'       => 'mautic.core.id',
-                            'class'      => 'col-webhook-id visible-md visible-lg'
-                        ));
+                            'class'      => 'col-webhook-id visible-md visible-lg',
+                        ]);
                     ?>
                 </tr>
             </thead>
@@ -51,21 +53,21 @@
                     <tr>
                         <td>
                             <?php
-                                echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                                    'item'      => $item,
-                                    'templateButtons' => array(
-                                        'edit'      => $view['security']->hasEntityAccess($permissions['webhook:webhooks:editown'], $permissions['webhook:webhooks:editother'], $item->getCreatedBy()),
-                                        'clone'     => $permissions['webhook:webhooks:create'],
-                                        'delete'    => $view['security']->hasEntityAccess($permissions['webhook:webhooks:deleteown'], $permissions['webhook:webhooks:deleteother'], $item->getCreatedBy()),
-                                    ),
-                                    'routeBase'  => 'webhook',
-                                ));
+                                echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                                    'item'            => $item,
+                                    'templateButtons' => [
+                                        'edit'   => $view['security']->hasEntityAccess($permissions['webhook:webhooks:editown'], $permissions['webhook:webhooks:editother'], $item->getCreatedBy()),
+                                        'clone'  => $permissions['webhook:webhooks:create'],
+                                        'delete' => $view['security']->hasEntityAccess($permissions['webhook:webhooks:deleteown'], $permissions['webhook:webhooks:deleteother'], $item->getCreatedBy()),
+                                    ],
+                                    'routeBase' => 'webhook',
+                                ]);
                             ?>
                         </td>
                         <td>
                             <div>
-                                <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array('item'=> $item, 'model' => 'webhook')); ?>
-                                <a data-toggle="ajax" href="<?php echo $view['router']->path('mautic_webhook_action', array('objectId' => $item->getId(), 'objectAction' => 'view')); ?>">
+                                <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', ['item' => $item, 'model' => 'webhook']); ?>
+                                <a data-toggle="ajax" href="<?php echo $view['router']->path('mautic_webhook_action', ['objectId' => $item->getId(), 'objectAction' => 'view']); ?>">
                                     <?php echo $item->getName(); ?>
                                 </a>
                                 <?php if ($description = $item->getDescription()): ?>
@@ -82,14 +84,14 @@
     </div>
 
     <div class="panel-footer">
-        <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-            "totalItems"      => count($items),
-            "page"            => $page,
-            "limit"           => $limit,
-            "menuLinkId"      => 'mautic_webhook_index',
-            "baseUrl"         => $view['router']->path('mautic_webhook_index'),
-            'sessionVar'      => 'mautic_webhook'
-        )); ?>
+        <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+            'totalItems' => count($items),
+            'page'       => $page,
+            'limit'      => $limit,
+            'menuLinkId' => 'mautic_webhook_index',
+            'baseUrl'    => $view['router']->path('mautic_webhook_index'),
+            'sessionVar' => 'mautic_webhook',
+        ]); ?>
     </div>
 <?php else: ?>
     <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php'); ?>
diff --git a/app/bundles/WebhookBundle/WebhookEvents.php b/app/bundles/WebhookBundle/WebhookEvents.php
index 80223ae8397..242749a463a 100644
--- a/app/bundles/WebhookBundle/WebhookEvents.php
+++ b/app/bundles/WebhookBundle/WebhookEvents.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   Mautic, Inc
  * @author      Mautic, Inc
+ *
  * @link        http://mautic.com
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,9 +12,7 @@
 
 /**
  * Class MauticWebhookEvents
- * Events available for MauticWebhookBundle
- *
- * @package WebhookBundle
+ * Events available for MauticWebhookBundle.
  */
 final class WebhookEvents
 {
@@ -24,7 +23,7 @@ final class WebhookEvents
      *
      * @var string
      */
-    const WEBHOOK_PRE_SAVE   = 'mautic.webhook_pre_save';
+    const WEBHOOK_PRE_SAVE = 'mautic.webhook_pre_save';
 
     /**
      * The mautic.webhook_post_save event is thrown right after a form is persisted.
@@ -33,7 +32,7 @@ final class WebhookEvents
      *
      * @var string
      */
-    const WEBHOOK_POST_SAVE   = 'mautic.webhook_post_save';
+    const WEBHOOK_POST_SAVE = 'mautic.webhook_post_save';
 
     /**
      * The mautic.webhook_pre_delete event is thrown before a form is deleted.
@@ -42,7 +41,7 @@ final class WebhookEvents
      *
      * @var string
      */
-    const WEBHOOK_PRE_DELETE   = 'mautic.webhook_pre_delete';
+    const WEBHOOK_PRE_DELETE = 'mautic.webhook_pre_delete';
 
     /**
      * The mautic.webhook_post_delete event is thrown after a form is deleted.
@@ -51,17 +50,16 @@ final class WebhookEvents
      *
      * @var string
      */
-    const WEBHOOK_POST_DELETE   = 'mautic.webhook_post_delete';
+    const WEBHOOK_POST_DELETE = 'mautic.webhook_post_delete';
 
     /**
-    * The mautic.webhook_queue_on_add event is thrown as the queue entity is created, before it is persisted to the database
-    *
-    * The event listener receives a Mautic\WebhookBundle\Event\WebhookQueueEvent instance.
-    *
-    * @var string
-    */
-    const WEBHOOK_QUEUE_ON_ADD  = 'mautic.webhook_queue_on_add';
-
+     * The mautic.webhook_queue_on_add event is thrown as the queue entity is created, before it is persisted to the database.
+     *
+     * The event listener receives a Mautic\WebhookBundle\Event\WebhookQueueEvent instance.
+     *
+     * @var string
+     */
+    const WEBHOOK_QUEUE_ON_ADD = 'mautic.webhook_queue_on_add';
 
     /**
      * The mautic.webhook_pre_execute event is thrown right before a webhook URL is executed.
@@ -70,7 +68,7 @@ final class WebhookEvents
      *
      * @var string
      */
-    const WEBHOOK_PRE_EXECUTE   = 'mautic.webhook_pre_execute';
+    const WEBHOOK_PRE_EXECUTE = 'mautic.webhook_pre_execute';
 
     /**
      * The mautic.webhook_post_execute event is thrown right after a webhook URL is executed.
@@ -79,7 +77,7 @@ final class WebhookEvents
      *
      * @var string
      */
-    const WEBHOOK_POST_EXECUTE   = 'mautic.webhook_post_execute';
+    const WEBHOOK_POST_EXECUTE = 'mautic.webhook_post_execute';
 
     /**
      * The mautic.webhook_on_build event is as the webhook form is built.
@@ -88,5 +86,5 @@ final class WebhookEvents
      *
      * @var string
      */
-    const WEBHOOK_ON_BUILD   = 'mautic.webhook_on_build';
-}
\ No newline at end of file
+    const WEBHOOK_ON_BUILD = 'mautic.webhook_on_build';
+}
diff --git a/app/config/config.php b/app/config/config.php
index 9f09c0e1b9c..86946746d2a 100644
--- a/app/config/config.php
+++ b/app/config/config.php
@@ -1,12 +1,13 @@
 <?php
-include __DIR__ . '/paths_helper.php';
 
-$ormMappings =
+include __DIR__.'/paths_helper.php';
+
+$ormMappings        =
 $serializerMappings =
-$ipLookupServices = array();
+$ipLookupServices   = [];
 
 //Note Mautic specific bundles so they can be applied as needed without having to specify them individually
-$buildBundles = function($namespace, $bundle) use ($container, $paths, $root, &$ormMappings, &$serializerMappings, &$ipLookupServices) {
+$buildBundles = function ($namespace, $bundle) use ($container, $paths, $root, &$ormMappings, &$serializerMappings, &$ipLookupServices) {
     $isPlugin = $isMautic = false;
 
     if (strpos($namespace, 'MauticPlugin\\') !== false) {
@@ -16,7 +17,7 @@
     } elseif (strpos($namespace, 'Mautic\\') !== false) {
         $isMautic   = true;
         $bundleBase = str_replace('Mautic', '', $bundle);
-        $relative   = $paths['bundles'] . '/' . $bundleBase;
+        $relative   = $paths['bundles'].'/'.$bundleBase;
     }
 
     if ($isMautic || $isPlugin) {
@@ -24,7 +25,7 @@
         $directory     = $paths['root'].'/'.$relative;
 
         // Check for a single config file
-        $config = (file_exists($directory.'/Config/config.php')) ? include $directory.'/Config/config.php' : array();
+        $config = (file_exists($directory.'/Config/config.php')) ? include $directory.'/Config/config.php' : [];
 
         // Services need to have percent signs escaped to prevent ParameterCircularReferenceException
         if (isset($config['services'])) {
@@ -50,25 +51,25 @@ function (&$v, $k) {
                 $subFolder = $file->getRelativePath();
 
                 // Just check first file for the loadMetadata function
-                $reflectionClass = new \ReflectionClass('\\' . $baseNamespace  . '\\Entity\\' . (!empty($subFolder) ? $subFolder . '\\': '') . basename($file->getFilename(), '.php'));
+                $reflectionClass = new \ReflectionClass('\\'.$baseNamespace.'\\Entity\\'.(!empty($subFolder) ? $subFolder.'\\' : '').basename($file->getFilename(), '.php'));
 
                 // Register API metadata
                 if ($reflectionClass->hasMethod('loadApiMetadata')) {
-                    $serializerMappings[$bundle] = array(
-                        'namespace_prefix' => $baseNamespace . '\\Entity',
-                        'path'             => "@$bundle/Entity"
-                    );
+                    $serializerMappings[$bundle] = [
+                        'namespace_prefix' => $baseNamespace.'\\Entity',
+                        'path'             => "@$bundle/Entity",
+                    ];
                 }
 
                 // Register entities
                 if ($reflectionClass->hasMethod('loadMetadata')) {
-                    $ormMappings[$bundle] = array(
+                    $ormMappings[$bundle] = [
                         'dir'       => 'Entity',
                         'type'      => 'staticphp',
-                        'prefix'    => $baseNamespace . '\\Entity',
+                        'prefix'    => $baseNamespace.'\\Entity',
                         'mapping'   => true,
-                        'is_bundle' => true
-                    );
+                        'is_bundle' => true,
+                    ];
                 }
             }
         }
@@ -80,8 +81,8 @@ function (&$v, $k) {
             $finder = \Symfony\Component\Finder\Finder::create()->files('*Permissions.php')->in($directory.'/Security/Permissions');
 
             foreach ($finder as $file) {
-                $className = basename($file->getFilename(), '.php');
-                $permissionClass    = '\\'.$baseNamespace.'\\Security\\Permissions\\'.$className;
+                $className       = basename($file->getFilename(), '.php');
+                $permissionClass = '\\'.$baseNamespace.'\\Security\\Permissions\\'.$className;
                 // Skip CorePermissions and AbstractPermissions
                 if ('CoreBundle' === $bundleBase && in_array($className, ['CorePermissions', 'AbstractPermissions'])) {
                     continue;
@@ -94,7 +95,7 @@ function (&$v, $k) {
             }
         }
 
-        return array(
+        return [
             'isPlugin'          => $isPlugin,
             'base'              => str_replace('Bundle', '', $bundleBase),
             'bundle'            => $bundleBase,
@@ -104,8 +105,8 @@ function (&$v, $k) {
             'permissionClasses' => $permissionClasses,
             'relative'          => $relative,
             'directory'         => $directory,
-            'config'            => $config
-        );
+            'config'            => $config,
+        ];
     }
 
     return false;
@@ -115,12 +116,14 @@ function (&$v, $k) {
 $symfonyBundles = $container->getParameter('kernel.bundles');
 $mauticBundles  = array_filter(
     array_map($buildBundles, $symfonyBundles, array_keys($symfonyBundles)),
-    function ($v) { return (!empty($v)); }
+    function ($v) {
+        return !empty($v);
+    }
 );
 unset($buildBundles);
 
 // Sort Mautic's bundles into Core and Plugins
-$setBundles = $setPluginBundles = array();
+$setBundles = $setPluginBundles = [];
 foreach ($mauticBundles as $bundle) {
     if ($bundle['isPlugin']) {
         $setPluginBundles[$bundle['symfonyBundleName']] = $bundle;
@@ -132,7 +135,7 @@ function ($v) { return (!empty($v)); }
 // Make Core the first in the list
 $coreBundle = $setBundles['MauticCoreBundle'];
 unset($setBundles['MauticCoreBundle']);
-$setBundles = array_merge(array('MauticCoreBundle' => $coreBundle), $setBundles);
+$setBundles = array_merge(['MauticCoreBundle' => $coreBundle], $setBundles);
 
 $container->setParameter('mautic.bundles', $setBundles);
 $container->setParameter('mautic.plugin.bundles', $setPluginBundles);
@@ -146,57 +149,57 @@ function ($v) { return (!empty($v)); }
 $container->loadFromExtension('mautic_core');
 
 // Set template engines
-$engines = array('php', 'twig');
+$engines = ['php', 'twig'];
 
 // Generate session name
 if (isset($_COOKIE['mautic_session_name'])) {
     // Attempt to keep from losing sessions if cache is cleared through UI
     $sessionName = $_COOKIE['mautic_session_name'];
 } else {
-    $key = $container->hasParameter('mautic.secret_key') ? $container->getParameter('mautic.secret_key') : uniqid();
+    $key         = $container->hasParameter('mautic.secret_key') ? $container->getParameter('mautic.secret_key') : uniqid();
     $sessionName = md5(md5($paths['local_config']).$key);
 }
 
-$container->loadFromExtension('framework', array(
-    'secret'               => '%mautic.secret_key%',
-    'router'               => array(
+$container->loadFromExtension('framework', [
+    'secret' => '%mautic.secret_key%',
+    'router' => [
         'resource'            => '%kernel.root_dir%/config/routing.php',
         'strict_requirements' => null,
-    ),
-    'form'                 => null,
-    'csrf_protection'      => true,
-    'validation'           => array(
-        'enable_annotations' => false
-    ),
-    'templating'           => array(
+    ],
+    'form'            => null,
+    'csrf_protection' => true,
+    'validation'      => [
+        'enable_annotations' => false,
+    ],
+    'templating' => [
         'engines' => $engines,
-        'form' => array(
-            'resources' => array(
+        'form'    => [
+            'resources' => [
                 'MauticCoreBundle:FormTheme\\Custom',
-            ),
-        ),
-    ),
-    'default_locale'       => '%mautic.locale%',
-    'translator'           => array(
+            ],
+        ],
+    ],
+    'default_locale' => '%mautic.locale%',
+    'translator'     => [
         'enabled'  => true,
-        'fallback' => 'en_US'
-    ),
-    'trusted_hosts'        => '%mautic.trusted_hosts%',
-    'trusted_proxies'      => '%mautic.trusted_proxies%',
-    'session'              => array( //handler_id set to null will use default session handler from php.ini
+        'fallback' => 'en_US',
+    ],
+    'trusted_hosts'   => '%mautic.trusted_hosts%',
+    'trusted_proxies' => '%mautic.trusted_proxies%',
+    'session'         => [ //handler_id set to null will use default session handler from php.ini
         'handler_id' => null,
         'name'       => $sessionName,
-    ),
+    ],
     'fragments'            => null,
     'http_method_override' => true,
 
     /*'validation'           => array(
         'static_method' => array('loadValidatorMetadata')
     )*/
-));
+]);
 
 //Doctrine Configuration
-$dbalSettings = array(
+$dbalSettings = [
     'driver'   => '%mautic.db_driver%',
     'host'     => '%mautic.db_host%',
     'port'     => '%mautic.db_port%',
@@ -204,18 +207,18 @@ function ($v) { return (!empty($v)); }
     'user'     => '%mautic.db_user%',
     'password' => '%mautic.db_password%',
     'charset'  => 'UTF8',
-    'types'    => array(
+    'types'    => [
         'array'    => 'Mautic\CoreBundle\Doctrine\Type\ArrayType',
-        'datetime' => 'Mautic\CoreBundle\Doctrine\Type\UTCDateTimeType'
-    ),
+        'datetime' => 'Mautic\CoreBundle\Doctrine\Type\UTCDateTimeType',
+    ],
     // Prevent Doctrine from crapping out with "unsupported type" errors due to it examining all tables in the database and not just Mautic's
-    'mapping_types' => array(
+    'mapping_types' => [
         'enum'  => 'string',
         'point' => 'string',
         'bit'   => 'string',
-    ),
-    'server_version' => '%mautic.db_server_version%'
-);
+    ],
+    'server_version' => '%mautic.db_server_version%',
+];
 
 // If using pdo_sqlite as the database driver, add the path to config file
 $dbDriver = $container->getParameter('mautic.db_driver');
@@ -223,114 +226,114 @@ function ($v) { return (!empty($v)); }
     $dbalSettings['path'] = '%mautic.db_path%';
 }
 
-$container->loadFromExtension('doctrine', array(
+$container->loadFromExtension('doctrine', [
     'dbal' => $dbalSettings,
-    'orm'  => array(
+    'orm'  => [
         'auto_generate_proxy_classes' => '%kernel.debug%',
         'auto_mapping'                => true,
-        'mappings'                    => $ormMappings
-    )
-));
+        'mappings'                    => $ormMappings,
+    ],
+]);
 
 //MigrationsBundle Configuration
 $prefix = $container->getParameter('mautic.db_table_prefix');
-$container->loadFromExtension('doctrine_migrations', array(
+$container->loadFromExtension('doctrine_migrations', [
     'dir_name'   => '%kernel.root_dir%/migrations',
     'namespace'  => 'Mautic\\Migrations',
-    'table_name' => $prefix . 'migrations',
-    'name'       => 'Mautic Migrations'
-));
+    'table_name' => $prefix.'migrations',
+    'name'       => 'Mautic Migrations',
+]);
 
 // Swiftmailer Configuration
-$mailerSettings = array(
+$mailerSettings = [
     'transport'  => '%mautic.mailer_transport%',
     'host'       => '%mautic.mailer_host%',
     'port'       => '%mautic.mailer_port%',
     'username'   => '%mautic.mailer_user%',
     'password'   => '%mautic.mailer_password%',
     'encryption' => '%mautic.mailer_encryption%',
-    'auth_mode'  => '%mautic.mailer_auth_mode%'
-);
+    'auth_mode'  => '%mautic.mailer_auth_mode%',
+];
 
 // Only spool if using file as otherwise emails are not sent on redirects
 $spoolType = $container->getParameter('mautic.mailer_spool_type');
 if ($spoolType == 'file') {
-    $mailerSettings['spool'] = array(
+    $mailerSettings['spool'] = [
         'type' => '%mautic.mailer_spool_type%',
-        'path' => '%mautic.mailer_spool_path%'
-    );
+        'path' => '%mautic.mailer_spool_path%',
+    ];
 }
 $container->loadFromExtension('swiftmailer', $mailerSettings);
 
 //KnpMenu Configuration
-$container->loadFromExtension('knp_menu', array(
-    'twig' => false,
-    'templating' => true,
-    'default_renderer' => 'mautic'
-));
+$container->loadFromExtension('knp_menu', [
+    'twig'             => false,
+    'templating'       => true,
+    'default_renderer' => 'mautic',
+]);
 
 // OneupUploader Configuration
 $uploadDir = $container->getParameter('mautic.upload_dir');
 $maxSize   = $container->getParameter('mautic.max_size');
-$container->loadFromExtension('oneup_uploader', array(
+$container->loadFromExtension('oneup_uploader', [
     // 'orphanage' => array(
     //     'maxage' => 86400,
     //     'directory' => $uploadDir . '/orphanage'
     // ),
-    'mappings' => array(
-        'asset' => array(
-            'error_handler' => 'mautic.asset.upload.error.handler',
-            'frontend' => 'custom',
-            'custom_frontend' => array(
+    'mappings' => [
+        'asset' => [
+            'error_handler'   => 'mautic.asset.upload.error.handler',
+            'frontend'        => 'custom',
+            'custom_frontend' => [
                 'class' => 'Mautic\AssetBundle\Controller\UploadController',
-                'name'  => 'mautic'
-            ),
+                'name'  => 'mautic',
+            ],
             // 'max_size' => ($maxSize * 1000000),
             // 'use_orphanage' => true,
-            'storage'  => array(
-                'directory' => $uploadDir
-            )
-        )
-    )
-));
+            'storage' => [
+                'directory' => $uploadDir,
+            ],
+        ],
+    ],
+]);
 
 //FOS Rest for API
-$container->loadFromExtension('fos_rest', array(
-    'routing_loader' => array(
+$container->loadFromExtension('fos_rest', [
+    'routing_loader' => [
         'default_format' => 'json',
-        'include_format' => false
-    ),
-    'view'           => array(
-        'formats' => array(
+        'include_format' => false,
+    ],
+    'view' => [
+        'formats' => [
             'json' => true,
             'xml'  => false,
-            'html' => false
-        ),
-        'templating_formats' => array(
-            'html' => false
-        )
-    ),
-    'disable_csrf_role' => 'ROLE_API'
-));
+            'html' => false,
+        ],
+        'templating_formats' => [
+            'html' => false,
+        ],
+    ],
+    'disable_csrf_role' => 'ROLE_API',
+]);
 
 //JMS Serializer for API and Webhooks
-$container->loadFromExtension('jms_serializer', array(
-    'handlers' => array(
-        'datetime' => array(
+$container->loadFromExtension('jms_serializer', [
+    'handlers' => [
+        'datetime' => [
             'default_format'   => 'c',
-            'default_timezone' => 'UTC'
-        )
-    ),
-    'property_naming' => array(
+            'default_timezone' => 'UTC',
+        ],
+    ],
+    'property_naming' => [
         'separator'  => '',
-        'lower_case' => false
-    ),
-    'metadata'       => array(
+        'lower_case' => false,
+    ],
+    'metadata' => [
         'cache'          => 'none',
         'auto_detection' => false,
-        'directories'    => $serializerMappings
-    )
-));
+        'directories'    => $serializerMappings,
+    ],
+]);
 
 $container->setParameter(
     'jms_serializer.camel_case_naming_strategy.class',
@@ -339,8 +342,8 @@ function ($v) { return (!empty($v)); }
 
 // Monolog formatter
 $container->register('mautic.monolog.fulltrace.formatter', 'Monolog\Formatter\LineFormatter')
-    ->addMethodCall('includeStacktraces', array(true))
-    ->addMethodCall('ignoreEmptyContextAndExtra', array(true));
+    ->addMethodCall('includeStacktraces', [true])
+    ->addMethodCall('ignoreEmptyContextAndExtra', [true]);
 
 //Register command line logging
 use Symfony\Component\DependencyInjection\Definition;
@@ -352,11 +355,11 @@ function ($v) { return (!empty($v)); }
 );
 $definitionConsoleExceptionListener = new Definition(
     '%console_exception_listener.class%',
-    array(new Reference('monolog.logger.mautic'))
+    [new Reference('monolog.logger.mautic')]
 );
 $definitionConsoleExceptionListener->addTag(
     'kernel.event_listener',
-    array('event' => 'console.exception')
+    ['event' => 'console.exception']
 );
 $container->setDefinition(
     'mautic.kernel.listener.command_exception',
@@ -369,13 +372,13 @@ function ($v) { return (!empty($v)); }
 );
 $definitionConsoleExceptionListener = new Definition(
     '%console_terminate_listener.class%',
-    array(new Reference('monolog.logger.mautic'))
+    [new Reference('monolog.logger.mautic')]
 );
 $definitionConsoleExceptionListener->addTag(
     'kernel.event_listener',
-    array('event' => 'console.terminate')
+    ['event' => 'console.terminate']
 );
 $container->setDefinition(
     'mautic.kernel.listener.command_terminate',
     $definitionConsoleExceptionListener
-);
\ No newline at end of file
+);
diff --git a/app/config/config_dev.php b/app/config/config_dev.php
index 6eb2b30037a..9da56ffd797 100644
--- a/app/config/config_dev.php
+++ b/app/config/config_dev.php
@@ -1,72 +1,73 @@
 <?php
-$loader->import("config.php");
 
-if (file_exists(__DIR__ . '/security_local.php')) {
-    $loader->import("security_local.php");
+$loader->import('config.php');
+
+if (file_exists(__DIR__.'/security_local.php')) {
+    $loader->import('security_local.php');
 } else {
-    $loader->import("security.php");
+    $loader->import('security.php');
 }
 
 //Twig Configuration
-$container->loadFromExtension('twig', array(
-    'cache'                => false,
-    'debug'                => '%kernel.debug%',
-    'strict_variables'     => '%kernel.debug%'
-));
+$container->loadFromExtension('twig', [
+    'cache'            => false,
+    'debug'            => '%kernel.debug%',
+    'strict_variables' => '%kernel.debug%',
+]);
 
-$container->loadFromExtension('framework', array(
-    "router"   => array(
-        "resource"            => "%kernel.root_dir%/config/routing_dev.php",
-        "strict_requirements" => true
-    ),
-    "profiler" => array(
-        "only_exceptions" => false
-    )
-));
+$container->loadFromExtension('framework', [
+    'router' => [
+        'resource'            => '%kernel.root_dir%/config/routing_dev.php',
+        'strict_requirements' => true,
+    ],
+    'profiler' => [
+        'only_exceptions' => false,
+    ],
+]);
 
-$container->loadFromExtension("web_profiler", array(
-    "toolbar"             => true,
-    "intercept_redirects" => false
-));
+$container->loadFromExtension('web_profiler', [
+    'toolbar'             => true,
+    'intercept_redirects' => false,
+]);
 
-$container->loadFromExtension("monolog", array(
-    'channels' => array(
+$container->loadFromExtension('monolog', [
+    'channels' => [
         'mautic',
-    ),
-    "handlers" => array(
-        "main"    => array(
-            "formatter" => "mautic.monolog.fulltrace.formatter",
-            "type"      => "rotating_file",
-            "path"      => "%kernel.logs_dir%/%kernel.environment%.php",
-            "level"     => "debug",
-            "channels"  => array(
-                "!mautic"
-            ),
-            "max_files" => 7
-        ),
-        "console" => array(
-            "type"   => "console",
-            "bubble" => false
-        ),
-        "mautic"    => array(
-            "formatter" => "mautic.monolog.fulltrace.formatter",
-            "type"      => "rotating_file",
-            "path"      => "%kernel.logs_dir%/mautic_%kernel.environment%.php",
-            "level"     => "debug",
-            'channels'  => array(
+    ],
+    'handlers' => [
+        'main' => [
+            'formatter' => 'mautic.monolog.fulltrace.formatter',
+            'type'      => 'rotating_file',
+            'path'      => '%kernel.logs_dir%/%kernel.environment%.php',
+            'level'     => 'debug',
+            'channels'  => [
+                '!mautic',
+            ],
+            'max_files' => 7,
+        ],
+        'console' => [
+            'type'   => 'console',
+            'bubble' => false,
+        ],
+        'mautic' => [
+            'formatter' => 'mautic.monolog.fulltrace.formatter',
+            'type'      => 'rotating_file',
+            'path'      => '%kernel.logs_dir%/mautic_%kernel.environment%.php',
+            'level'     => 'debug',
+            'channels'  => [
                 'mautic',
-            ),
-            "max_files" => 7
-        )
-    )
-));
+            ],
+            'max_files' => 7,
+        ],
+    ],
+]);
 
 // Allow overriding config without a requiring a full bundle or hacks
-if (file_exists(__DIR__ . '/config_override.php')) {
-    $loader->import("config_override.php");
+if (file_exists(__DIR__.'/config_override.php')) {
+    $loader->import('config_override.php');
 }
 
 // Allow local settings without committing to git such as swift mailer delivery address overrides
-if (file_exists(__DIR__ . '/config_local.php')) {
-    $loader->import("config_local.php");
-}
\ No newline at end of file
+if (file_exists(__DIR__.'/config_local.php')) {
+    $loader->import('config_local.php');
+}
diff --git a/app/config/config_prod.php b/app/config/config_prod.php
index 2486be2c52e..9d57037c29e 100644
--- a/app/config/config_prod.php
+++ b/app/config/config_prod.php
@@ -1,10 +1,11 @@
 <?php
-$loader->import("config.php");
 
-if (file_exists(__DIR__ . '/security_local.php')) {
-    $loader->import("security_local.php");
+$loader->import('config.php');
+
+if (file_exists(__DIR__.'/security_local.php')) {
+    $loader->import('security_local.php');
 } else {
-    $loader->import("security.php");
+    $loader->import('security.php');
 }
 
 /*
@@ -25,46 +26,46 @@
 
 $debugMode = $container->hasParameter('mautic.debug') ? $container->getParameter('mautic.debug') : $container->getParameter('kernel.debug');
 
-$container->loadFromExtension("monolog", array(
-    "channels" => array(
-        "mautic",
-    ),
-    "handlers" => array(
-        "main"    => array(
-            "formatter"    => $debugMode ? "mautic.monolog.fulltrace.formatter" : null,
-            "type"         => "fingers_crossed",
-            "buffer_size"  => "200",
-            "action_level" => ($debugMode) ? "debug" : "error",
-            "handler"      => "nested",
-            "channels" => array(
-                "!mautic"
-            )
-        ),
-        "nested"  => array(
-            "type"  => "rotating_file",
-            "path"  => "%kernel.logs_dir%/%kernel.environment%.php",
-            "level" => ($debugMode) ? "debug" : "error",
-            "max_files" => 7
-        ),
-        "mautic"    => array(
-            "formatter" => $debugMode ? "mautic.monolog.fulltrace.formatter" : null,
-            "type"      => "rotating_file",
-            "path"      => "%kernel.logs_dir%/mautic_%kernel.environment%.php",
-            "level"     => ($debugMode) ? "debug" : "notice",
-            'channels' => array(
+$container->loadFromExtension('monolog', [
+    'channels' => [
+        'mautic',
+    ],
+    'handlers' => [
+        'main' => [
+            'formatter'    => $debugMode ? 'mautic.monolog.fulltrace.formatter' : null,
+            'type'         => 'fingers_crossed',
+            'buffer_size'  => '200',
+            'action_level' => ($debugMode) ? 'debug' : 'error',
+            'handler'      => 'nested',
+            'channels'     => [
+                '!mautic',
+            ],
+        ],
+        'nested' => [
+            'type'      => 'rotating_file',
+            'path'      => '%kernel.logs_dir%/%kernel.environment%.php',
+            'level'     => ($debugMode) ? 'debug' : 'error',
+            'max_files' => 7,
+        ],
+        'mautic' => [
+            'formatter' => $debugMode ? 'mautic.monolog.fulltrace.formatter' : null,
+            'type'      => 'rotating_file',
+            'path'      => '%kernel.logs_dir%/mautic_%kernel.environment%.php',
+            'level'     => ($debugMode) ? 'debug' : 'notice',
+            'channels'  => [
                 'mautic',
-            ),
-            "max_files" => 7
-        )
-    )
-));
+            ],
+            'max_files' => 7,
+        ],
+    ],
+]);
 
 // Allow overriding config without a requiring a full bundle or hacks
-if (file_exists(__DIR__ . '/config_override.php')) {
-    $loader->import("config_override.php");
+if (file_exists(__DIR__.'/config_override.php')) {
+    $loader->import('config_override.php');
 }
 
 // Allow local settings without committing to git such as swift mailer delivery address overrides
-if (file_exists(__DIR__ . '/config_local.php')) {
-    $loader->import("config_local.php");
-}
\ No newline at end of file
+if (file_exists(__DIR__.'/config_local.php')) {
+    $loader->import('config_local.php');
+}
diff --git a/app/config/config_test.php b/app/config/config_test.php
index 8e7ff14865f..8920ffaff1c 100644
--- a/app/config/config_test.php
+++ b/app/config/config_test.php
@@ -1,81 +1,82 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-$loader->import("config.php");
+$loader->import('config.php');
 
-$container->loadFromExtension("framework", array(
-    "test"     => true,
-    "session"  => array(
-        "storage_id" => "session.storage.filesystem"
-    ),
-    "profiler" => array(
-        "collect" => false
-    ),
-    'translator' => array(
-        'enabled'  => false,
-    ),
-));
+$container->loadFromExtension('framework', [
+    'test'    => true,
+    'session' => [
+        'storage_id' => 'session.storage.filesystem',
+    ],
+    'profiler' => [
+        'collect' => false,
+    ],
+    'translator' => [
+        'enabled' => false,
+    ],
+]);
 
-$container->loadFromExtension("web_profiler", array(
-    "toolbar"             => false,
-    "intercept_redirects" => false
-));
+$container->loadFromExtension('web_profiler', [
+    'toolbar'             => false,
+    'intercept_redirects' => false,
+]);
 
-$container->loadFromExtension("swiftmailer", array(
-    "disable_delivery" => true
-));
+$container->loadFromExtension('swiftmailer', [
+    'disable_delivery' => true,
+]);
 
-$container->loadFromExtension('doctrine', array(
-    'dbal' => array(
+$container->loadFromExtension('doctrine', [
+    'dbal' => [
         'default_connection' => 'default',
-        'connections'        => array(
-            'default' => array(
+        'connections'        => [
+            'default' => [
                 'driver' => 'pdo_sqlite',
-                'path'   =>  '%kernel.root_dir%/cache/test.db'
-            )
-        )
-    )
-));
+                'path'   => '%kernel.root_dir%/cache/test.db',
+            ],
+        ],
+    ],
+]);
 
-$container->loadFromExtension("monolog", array(
-    'channels' => array(
+$container->loadFromExtension('monolog', [
+    'channels' => [
         'mautic',
-    ),
-    "handlers" => array(
-        "main"    => array(
-            "formatter" => "mautic.monolog.fulltrace.formatter",
-            "type"      => "rotating_file",
-            "path"      => "%kernel.logs_dir%/%kernel.environment%.php",
-            "level"     => "debug",
-            "channels"  => array(
-                "!mautic"
-            ),
-            "max_files" => 7
-        ),
-        "console" => array(
-            "type"   => "console",
-            "bubble" => false
-        ),
-        "mautic"    => array(
-            "formatter" => "mautic.monolog.fulltrace.formatter",
-            "type"      => "rotating_file",
-            "path"      => "%kernel.logs_dir%/mautic_%kernel.environment%.php",
-            "level"     => "debug",
-            'channels'  => array(
+    ],
+    'handlers' => [
+        'main' => [
+            'formatter' => 'mautic.monolog.fulltrace.formatter',
+            'type'      => 'rotating_file',
+            'path'      => '%kernel.logs_dir%/%kernel.environment%.php',
+            'level'     => 'debug',
+            'channels'  => [
+                '!mautic',
+            ],
+            'max_files' => 7,
+        ],
+        'console' => [
+            'type'   => 'console',
+            'bubble' => false,
+        ],
+        'mautic' => [
+            'formatter' => 'mautic.monolog.fulltrace.formatter',
+            'type'      => 'rotating_file',
+            'path'      => '%kernel.logs_dir%/mautic_%kernel.environment%.php',
+            'level'     => 'debug',
+            'channels'  => [
                 'mautic',
-            ),
-            "max_files" => 7
-        )
-    )
-));
+            ],
+            'max_files' => 7,
+        ],
+    ],
+]);
 
-$container->loadFromExtension('liip_functional_test', array(
-    'cache_sqlite_db' => true
-));
+$container->loadFromExtension('liip_functional_test', [
+    'cache_sqlite_db' => true,
+]);
 
-$loader->import("security_test.php");
\ No newline at end of file
+$loader->import('security_test.php');
diff --git a/app/config/parameters.php b/app/config/parameters.php
index f10c33850b6..bb3a64a7ea3 100644
--- a/app/config/parameters.php
+++ b/app/config/parameters.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-include __DIR__ . '/paths_helper.php';
+include __DIR__.'/paths_helper.php';
 
 //load default parameters from bundle files
 $core    = $container->getParameter('mautic.bundles');
@@ -16,7 +16,7 @@
 $bundles = array_merge($core, $plugins);
 unset($core, $plugins);
 
-$mauticParams = array();
+$mauticParams = [];
 
 foreach ($bundles as $bundle) {
     if (!empty($bundle['config']['parameters'])) {
@@ -25,13 +25,13 @@
 }
 
 // Find available translations
-$locales = array();
+$locales = [];
 
-$extractLocales = function($dir) use (&$locales) {
+$extractLocales = function ($dir) use (&$locales) {
     $locale = $dir->getFilename();
 
     // Check config
-    $configFile = $dir->getRealpath() . '/config.php';
+    $configFile = $dir->getRealpath().'/config.php';
     if (file_exists($configFile)) {
         $config           = include $configFile;
         $locales[$locale] = (!empty($config['name'])) ? $config['name'] : $locale;
@@ -39,20 +39,19 @@
 };
 
 $defaultLocalesDir = new \Symfony\Component\Finder\Finder();
-$defaultLocalesDir->directories()->in($root . '/bundles/CoreBundle/Translations')->ignoreDotFiles(true)->depth('== 0');
+$defaultLocalesDir->directories()->in($root.'/bundles/CoreBundle/Translations')->ignoreDotFiles(true)->depth('== 0');
 foreach ($defaultLocalesDir as $dir) {
     $extractLocales($dir);
 }
 
 $installedLocales = new \Symfony\Component\Finder\Finder();
-$installedLocales->directories()->in($root . '/../' . $paths['translations'])->ignoreDotFiles(true)->depth('== 0');
+$installedLocales->directories()->in($root.'/../'.$paths['translations'])->ignoreDotFiles(true)->depth('== 0');
 
 foreach ($installedLocales as $dir) {
     $extractLocales($dir);
 }
 unset($defaultLocalesDir, $installedLocales, $extractLocales);
 
-
 $mauticParams['supported_languages'] = $locales;
 
 // Load parameters array from local configuration
@@ -66,8 +65,8 @@
 }
 
 // Force local specific params
-if (file_exists(__DIR__ . '/parameters_local.php')) {
-    include __DIR__ . '/parameters_local.php';
+if (file_exists(__DIR__.'/parameters_local.php')) {
+    include __DIR__.'/parameters_local.php';
 
     //override default with forced
     $mauticParams = array_merge($mauticParams, $parameters);
@@ -108,17 +107,17 @@
             }
         }
 
-        $scheme = (! empty($parts['scheme']) ? $parts['scheme'] : 'http');
+        $scheme           = (!empty($parts['scheme']) ? $parts['scheme'] : 'http');
         $portContainerKey = ($scheme === 'http') ? 'request_listener.http_port' : 'request_listener.https_port';
 
         $container->setParameter('router.request_context.host', $parts['host']);
         $container->setParameter('router.request_context.scheme', $scheme);
         $container->setParameter('router.request_context.base_url', $path);
 
-        if (! empty($parts['port'])) {
+        if (!empty($parts['port'])) {
             $container->setParameter($portContainerKey, (!empty($parts['port']) ? $parts['port'] : null));
         }
     }
 }
 
-unset($mauticParams, $replaceRootPlaceholder, $bundles);
\ No newline at end of file
+unset($mauticParams, $replaceRootPlaceholder, $bundles);
diff --git a/app/config/paths.php b/app/config/paths.php
index 3573ff13fa5..fb80ea18536 100644
--- a/app/config/paths.php
+++ b/app/config/paths.php
@@ -1,32 +1,32 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$paths = array(
+$paths = [
     //customizable
     'themes'       => 'themes',
     'assets'       => 'media',
     'asset_prefix' => '',
-    'plugins'       => 'plugins',
+    'plugins'      => 'plugins',
     'translations' => 'translations',
     'local_config' => '%kernel.root_dir%/config/local.php',
-);
+];
 
 //allow easy overrides of the above
-if (file_exists(__DIR__ . '/paths_local.php')) {
-    include __DIR__ . '/paths_local.php';
+if (file_exists(__DIR__.'/paths_local.php')) {
+    include __DIR__.'/paths_local.php';
 }
 
 //fixed
-$paths = array_merge($paths, array(
+$paths = array_merge($paths, [
     //remove /app from the root
-    'root'         => substr($root, 0, -4),
-    'app'          => 'app',
-    'bundles'      => 'app/bundles',
-    'vendor'       => 'vendor'
-));
\ No newline at end of file
+    'root'    => substr($root, 0, -4),
+    'app'     => 'app',
+    'bundles' => 'app/bundles',
+    'vendor'  => 'vendor',
+]);
diff --git a/app/config/paths_helper.php b/app/config/paths_helper.php
index f9ab35a80f6..9edd8f9a449 100644
--- a/app/config/paths_helper.php
+++ b/app/config/paths_helper.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 include 'paths.php';
 
 // Closure to replace %kernel.root_dir% placeholders
-$replaceRootPlaceholder = function(&$value) use ($root, &$replaceRootPlaceholder) {
+$replaceRootPlaceholder = function (&$value) use ($root, &$replaceRootPlaceholder) {
     if (is_array($value)) {
         foreach ($value as &$v) {
             $replaceRootPlaceholder($v);
@@ -25,4 +26,4 @@
 };
 
 // Handle paths
-$replaceRootPlaceholder($paths);
\ No newline at end of file
+$replaceRootPlaceholder($paths);
diff --git a/app/config/routing.php b/app/config/routing.php
index 3c41d803f23..45614cc8b25 100644
--- a/app/config/routing.php
+++ b/app/config/routing.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 use Symfony\Component\Routing\RouteCollection;
@@ -13,4 +14,4 @@
 $collection = new RouteCollection();
 $collection->addCollection($loader->import('.', 'mautic'));
 
-return $collection;
\ No newline at end of file
+return $collection;
diff --git a/app/config/routing_dev.php b/app/config/routing_dev.php
index 2149f752c5e..089801546b9 100644
--- a/app/config/routing_dev.php
+++ b/app/config/routing_dev.php
@@ -1,31 +1,31 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 use Symfony\Component\Routing\RouteCollection;
 
 $collection = new RouteCollection();
 
 //wdt
-$wdt = $loader->import("@WebProfilerBundle/Resources/config/routing/wdt.xml");
+$wdt = $loader->import('@WebProfilerBundle/Resources/config/routing/wdt.xml');
 $wdt->addPrefix('/_wdt');
 $collection->addCollection($wdt);
 
 //profiler
-$profiler = $loader->import("@WebProfilerBundle/Resources/config/routing/profiler.xml");
+$profiler = $loader->import('@WebProfilerBundle/Resources/config/routing/profiler.xml');
 $profiler->addPrefix('/_profiler');
 $collection->addCollection($profiler);
 
 //error pages
-$errors = $loader->import("@WebfactoryExceptionsBundle/Resources/config/routing.yml");
+$errors = $loader->import('@WebfactoryExceptionsBundle/Resources/config/routing.yml');
 $collection->addCollection($errors);
 
 //main
-$collection->addCollection($loader->import("routing.php"));
+$collection->addCollection($loader->import('routing.php'));
 
 return $collection;
diff --git a/app/config/security.php b/app/config/security.php
index a4d5df32551..10b7af5e0da 100644
--- a/app/config/security.php
+++ b/app/config/security.php
@@ -1,134 +1,134 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $container->loadFromExtension(
     'security',
-    array(
-        'providers'      => array(
-            'user_provider' => array(
-                'id' => 'mautic.user.provider'
-            )
-        ),
-        'encoders'       => array(
-            'Symfony\Component\Security\Core\User\User' => array(
+    [
+        'providers' => [
+            'user_provider' => [
+                'id' => 'mautic.user.provider',
+            ],
+        ],
+        'encoders' => [
+            'Symfony\Component\Security\Core\User\User' => [
                 'algorithm'  => 'bcrypt',
                 'iterations' => 12,
-            ),
-            'Mautic\UserBundle\Entity\User'             => array(
+            ],
+            'Mautic\UserBundle\Entity\User' => [
                 'algorithm'  => 'bcrypt',
                 'iterations' => 12,
-            )
-        ),
-        'role_hierarchy' => array(
+            ],
+        ],
+        'role_hierarchy' => [
             'ROLE_ADMIN' => 'ROLE_USER',
-        ),
-        'firewalls'      => array(
-            'install'              => array(
+        ],
+        'firewalls' => [
+            'install' => [
                 'pattern'   => '^/installer',
                 'anonymous' => true,
                 'context'   => 'mautic',
-                'security'  => false
-            ),
-            'dev'                  => array(
+                'security'  => false,
+            ],
+            'dev' => [
                 'pattern'   => '^/(_(profiler|wdt)|css|images|js)/',
                 'security'  => true,
-                'anonymous' => true
-            ),
-            'login'                => array(
+                'anonymous' => true,
+            ],
+            'login' => [
                 'pattern'   => '^/s/login$',
                 'anonymous' => true,
-                'context'   => 'mautic'
-            ),
-            'sso_login'            => array(
+                'context'   => 'mautic',
+            ],
+            'sso_login' => [
                 'pattern'            => '^/s/sso_login',
                 'anonymous'          => true,
                 'mautic_plugin_auth' => true,
-                'context'            => 'mautic'
-            ),
-            'oauth2_token'         => array(
+                'context'            => 'mautic',
+            ],
+            'oauth2_token' => [
                 'pattern'  => '^/oauth/v2/token',
-                'security' => false
-            ),
-            'oauth2_area'          => array(
+                'security' => false,
+            ],
+            'oauth2_area' => [
                 'pattern'    => '^/oauth/v2/authorize',
-                'form_login' => array(
+                'form_login' => [
                     'provider'   => 'user_provider',
                     'check_path' => '/oauth/v2/authorize_login_check',
-                    'login_path' => '/oauth/v2/authorize_login'
-                ),
-                'anonymous'  => true
-            ),
-            'oauth1_request_token' => array(
+                    'login_path' => '/oauth/v2/authorize_login',
+                ],
+                'anonymous' => true,
+            ],
+            'oauth1_request_token' => [
                 'pattern'  => '^/oauth/v1/request_token',
-                'security' => false
-            ),
-            'oauth1_access_token'  => array(
+                'security' => false,
+            ],
+            'oauth1_access_token' => [
                 'pattern'  => '^/oauth/v1/access_token',
-                'security' => false
-            ),
-            'oauth1_area'          => array(
+                'security' => false,
+            ],
+            'oauth1_area' => [
                 'pattern'    => '^/oauth/v1/authorize',
-                'form_login' => array(
+                'form_login' => [
                     'provider'   => 'user_provider',
                     'check_path' => '/oauth/v1/authorize_login_check',
-                    'login_path' => '/oauth/v1/authorize_login'
-                ),
-                'anonymous'  => true
-            ),
-            'api'                  => array(
+                    'login_path' => '/oauth/v1/authorize_login',
+                ],
+                'anonymous' => true,
+            ],
+            'api' => [
                 'pattern'            => '^/api',
                 'fos_oauth'          => true,
                 'bazinga_oauth'      => true,
                 'mautic_plugin_auth' => true,
-                'stateless'          => true
-            ),
-            'main'                 => array(
-                'pattern'     => "^/s/",
-                'simple_form' => array(
+                'stateless'          => true,
+            ],
+            'main' => [
+                'pattern'     => '^/s/',
+                'simple_form' => [
                     'authenticator'        => 'mautic.user.form_authenticator',
                     'csrf_token_generator' => 'security.csrf.token_manager',
                     'success_handler'      => 'mautic.security.authentication_handler',
                     'failure_handler'      => 'mautic.security.authentication_handler',
                     'login_path'           => '/s/login',
-                    'check_path'           => '/s/login_check'
-                ),
-                'logout'      => array(
-                    'handlers' => array(
-                        'mautic.security.logout_handler'
-                    ),
-                    'path'     => '/s/logout',
-                    'target'   => '/s/login'
-                ),
-                'remember_me' => array(
+                    'check_path'           => '/s/login_check',
+                ],
+                'logout' => [
+                    'handlers' => [
+                        'mautic.security.logout_handler',
+                    ],
+                    'path'   => '/s/logout',
+                    'target' => '/s/login',
+                ],
+                'remember_me' => [
                     'secret'   => '%mautic.rememberme_key%',
                     'lifetime' => '%mautic.rememberme_lifetime%',
                     'path'     => '%mautic.rememberme_path%',
-                    'domain'   => '%mautic.rememberme_domain%'
-                ),
-                'context'     => 'mautic'
-            ),
-            'public'               => array(
+                    'domain'   => '%mautic.rememberme_domain%',
+                ],
+                'context' => 'mautic',
+            ],
+            'public' => [
                 'pattern'   => '^/',
                 'anonymous' => true,
-                'context'   => 'mautic'
-            ),
-        ),
-        'access_control' => array(
-            array('path' => '^/api', 'roles' => 'IS_AUTHENTICATED_FULLY')
-        )
-    )
+                'context'   => 'mautic',
+            ],
+        ],
+        'access_control' => [
+            ['path' => '^/api', 'roles' => 'IS_AUTHENTICATED_FULLY'],
+        ],
+    ]
 );
 
 $this->import('security_api.php');
 
 // List config keys we do not want the user to change via the config UI
-$restrictedConfigFields = array(
+$restrictedConfigFields = [
     'db_driver',
     'db_host',
     'db_table_prefix',
@@ -137,19 +137,19 @@
     'db_password',
     'db_path',
     'db_port',
-    'secret_key'
-);
+    'secret_key',
+];
 
 // List config keys that are dev mode only
 if ($container->getParameter('kernel.environment') == 'prod') {
-    $restrictedConfigFields = array_merge($restrictedConfigFields, array('transifex_username', 'transifex_password'));
+    $restrictedConfigFields = array_merge($restrictedConfigFields, ['transifex_username', 'transifex_password']);
 }
 
 $container->setParameter('mautic.security.restrictedConfigFields', $restrictedConfigFields);
 
-/**
+/*
  * Optional security parameters
  * mautic.security.disableUpdates = disables remote checks for updates
  * mautic.security.restrictedConfigFields.displayMode = accepts either remove or mask; mask will disable the input with a "Set by system" message
  */
-$container->setParameter('mautic.security.disableUpdates', false);
\ No newline at end of file
+$container->setParameter('mautic.security.disableUpdates', false);
diff --git a/app/config/security_api.php b/app/config/security_api.php
index ed66b5116ef..2b60b046695 100644
--- a/app/config/security_api.php
+++ b/app/config/security_api.php
@@ -1,45 +1,46 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 //oAuth 2.0
 
-$accessTokenLifetime  = $container->hasParameter('mautic.api_oauth2_access_token_lifetime')  ? ($container->getParameter('mautic.api_oauth2_access_token_lifetime') * 60) : 3600;
+$accessTokenLifetime  = $container->hasParameter('mautic.api_oauth2_access_token_lifetime') ? ($container->getParameter('mautic.api_oauth2_access_token_lifetime') * 60) : 3600;
 $refreshTokenLifetime = $container->hasParameter('mautic.api_oauth2_refresh_token_lifetime') ? ($container->getParameter('mautic.api_oauth2_refresh_token_lifetime') * 60 * 60 * 24) : 1209600;
 
-$container->loadFromExtension('fos_oauth_server', array(
+$container->loadFromExtension('fos_oauth_server', [
     'db_driver'           => 'orm',
     'client_class'        => 'Mautic\ApiBundle\Entity\oAuth2\Client',
     'access_token_class'  => 'Mautic\ApiBundle\Entity\oAuth2\AccessToken',
     'refresh_token_class' => 'Mautic\ApiBundle\Entity\oAuth2\RefreshToken',
     'auth_code_class'     => 'Mautic\ApiBundle\Entity\oAuth2\AuthCode',
-    'service'             => array(
+    'service'             => [
         'user_provider' => 'mautic.user.provider',
-        'options'       => array(
+        'options'       => [
             //'supported_scopes' => 'user'
             'access_token_lifetime'  => $accessTokenLifetime,
-            'refresh_token_lifetime' => $refreshTokenLifetime
-        )
-    ),
-    'template'            => array(
-        'engine' => 'php'
-    )
-));
+            'refresh_token_lifetime' => $refreshTokenLifetime,
+        ],
+    ],
+    'template' => [
+        'engine' => 'php',
+    ],
+]);
 
 //oAuth 1.0a
-$container->loadFromExtension('bazinga_oauth_server', array(
-    'mapping' => array(
+$container->loadFromExtension('bazinga_oauth_server', [
+    'mapping' => [
         'db_driver'           => 'orm',
         'consumer_class'      => 'Mautic\ApiBundle\Entity\oAuth1\Consumer',
         'request_token_class' => 'Mautic\ApiBundle\Entity\oAuth1\RequestToken',
-        'access_token_class'  => 'Mautic\ApiBundle\Entity\oAuth1\AccessToken'
-    ),
-    'service' => array(
-        'nonce_provider'    => 'mautic.api.oauth1.nonce_provider'
-    )
-));
\ No newline at end of file
+        'access_token_class'  => 'Mautic\ApiBundle\Entity\oAuth1\AccessToken',
+    ],
+    'service' => [
+        'nonce_provider' => 'mautic.api.oauth1.nonce_provider',
+    ],
+]);
diff --git a/app/config/security_test.php b/app/config/security_test.php
index 851a9e11295..d6ea1cb17b5 100644
--- a/app/config/security_test.php
+++ b/app/config/security_test.php
@@ -1,90 +1,90 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+$container->loadFromExtension('security', [
 
-$container->loadFromExtension('security', array(
-
-    'providers' => array(
-        'user_provider' => array(
-            'id' => 'mautic.user.provider'
-        )
-    ),
-    'encoders' => array(
-        'Symfony\Component\Security\Core\User\User' => array(
-            'algorithm'         => 'bcrypt',
-            'iterations'        => 12,
-        ),
-        'Mautic\UserBundle\Entity\User' => array(
-            'algorithm'         => 'bcrypt',
-            'iterations'        => 12,
-        )
-    ),
-    'role_hierarchy' => array(
+    'providers' => [
+        'user_provider' => [
+            'id' => 'mautic.user.provider',
+        ],
+    ],
+    'encoders' => [
+        'Symfony\Component\Security\Core\User\User' => [
+            'algorithm'  => 'bcrypt',
+            'iterations' => 12,
+        ],
+        'Mautic\UserBundle\Entity\User' => [
+            'algorithm'  => 'bcrypt',
+            'iterations' => 12,
+        ],
+    ],
+    'role_hierarchy' => [
         'ROLE_ADMIN' => 'ROLE_USER',
-    ),
-    'firewalls' => array(
-        'dev' => array(
-            'pattern' => '^/(_(profiler|wdt)|css|images|js)/',
-            'security' => true,
-            'anonymous' => true
-        ),
-        'login' => array(
+    ],
+    'firewalls' => [
+        'dev' => [
+            'pattern'   => '^/(_(profiler|wdt)|css|images|js)/',
+            'security'  => true,
+            'anonymous' => true,
+        ],
+        'login' => [
             'pattern'   => '^/login$',
             'anonymous' => true,
             'security'  => true,
-            'context'   => 'mautic_test'
-        ),
-        'oauth_token' => array(
+            'context'   => 'mautic_test',
+        ],
+        'oauth_token' => [
             'pattern'  => '^/oauth/v2/token',
-            'security' => false
-        ),
-        'oauth_authorize' => array(
+            'security' => false,
+        ],
+        'oauth_authorize' => [
             'pattern'    => '^/oauth/v2/auth',
-            'form_login' => array(
+            'form_login' => [
                 'provider'   => 'user_provider',
                 'check_path' => '/oauth/v2/auth_login_check',
-                'login_path' => '/oauth/v2/auth_login'
-            ),
-            'anonymous'  => true,
-        ),
-        'api' => array(
+                'login_path' => '/oauth/v2/auth_login',
+            ],
+            'anonymous' => true,
+        ],
+        'api' => [
             'pattern'   => '^/api',
             'fos_oauth' => true,
             'stateless' => true,
-        ),
-        'test_firewall' => array(
-            'pattern'    => "^/",
-            'http_basic' => array(),
-            'form_login' => array(
-                'csrf_token_generator' => 'security.csrf.token_manager'
-            ),
-            'context'    => 'mautic_test',
-        ),
-        'main' => array(
-            'pattern' => "^/",
-            'form_login' => array(
-                'csrf_token_generator' => 'security.csrf.token_manager'
-            ),
-            'logout' => array(),
-            'remember_me' => array(
+        ],
+        'test_firewall' => [
+            'pattern'    => '^/',
+            'http_basic' => [],
+            'form_login' => [
+                'csrf_token_generator' => 'security.csrf.token_manager',
+            ],
+            'context' => 'mautic_test',
+        ],
+        'main' => [
+            'pattern'    => '^/',
+            'form_login' => [
+                'csrf_token_generator' => 'security.csrf.token_manager',
+            ],
+            'logout'      => [],
+            'remember_me' => [
                 'key'      => '%mautic.rememberme_key%',
                 'lifetime' => '%mautic.rememberme_lifetime%',
                 'path'     => '%mautic.rememberme_path%',
-                'domain'   => '%mautic.rememberme_domain%'
-            ),
-            'context' => 'mautic_test'
-        ),
-    ),
-    'access_control' => array(
-        array('path' => '^/api', 'roles' => 'IS_AUTHENTICATED_FULLY')
-    )
-));
+                'domain'   => '%mautic.rememberme_domain%',
+            ],
+            'context' => 'mautic_test',
+        ],
+    ],
+    'access_control' => [
+        ['path' => '^/api', 'roles' => 'IS_AUTHENTICATED_FULLY'],
+    ],
+]);
 
 $container->setParameter('mautic.security.disableUpdates', false);
 
-$this->import('security_api.php');
\ No newline at end of file
+$this->import('security_api.php');
diff --git a/app/console b/app/console
index d948b8a77b9..39a78cf0df9 100755
--- a/app/console
+++ b/app/console
@@ -2,7 +2,7 @@
 <?php
 
 // Fix for hosts that do not have date.timezone set
-date_default_timezone_set ('UTC');
+date_default_timezone_set('UTC');
 
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
@@ -23,16 +23,16 @@ use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
 
 $input = new ArgvInput();
-$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'prod');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+$env   = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'prod');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
 
 if ($debug) {
     Debug::enable();
 }
 
-$output = ($input->getParameterOption(array('--no-interaction', '-n')) !== false) ? new ConsoleDatetimeOutput() : null;
+$output = ($input->getParameterOption(['--no-interaction', '-n']) !== false) ? new ConsoleDatetimeOutput() : null;
 
-$kernel = new AppKernel($env, $debug);
+$kernel      = new AppKernel($env, $debug);
 $application = new Application($kernel);
 $application->setName('Mautic');
 $application->setVersion($kernel->getVersion().' - '.$kernel->getName().'/'.$kernel->getEnvironment().($kernel->isDebug() ? '/debug' : ''));
diff --git a/app/middlewares/CORSMiddleware.php b/app/middlewares/CORSMiddleware.php
index d3ced927231..9beff68ad50 100644
--- a/app/middlewares/CORSMiddleware.php
+++ b/app/middlewares/CORSMiddleware.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -24,10 +25,10 @@ class CORSMiddleware implements HttpKernelInterface, PrioritizedMiddlewareInterf
      * @var array
      */
     protected $corsHeaders = [
-        'Access-Control-Allow-Origin' => '*',
-        'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type',
-        'Access-Control-Allow-Methods' => 'PUT, GET, POST, DELETE, OPTIONS',
-        'Access-Control-Allow-Credentials' => 'true'
+        'Access-Control-Allow-Origin'      => '*',
+        'Access-Control-Allow-Headers'     => 'Origin, X-Requested-With, Content-Type',
+        'Access-Control-Allow-Methods'     => 'PUT, GET, POST, DELETE, OPTIONS',
+        'Access-Control-Allow-Credentials' => 'true',
     ];
 
     /**
@@ -57,10 +58,10 @@ class CORSMiddleware implements HttpKernelInterface, PrioritizedMiddlewareInterf
      */
     public function __construct(HttpKernelInterface $app)
     {
-        $this->app = $app;
-        $this->config = $this->getConfig();
+        $this->app                 = $app;
+        $this->config              = $this->getConfig();
         $this->restrictCORSDomains = array_key_exists('cors_restrict_domains', $this->config) ? (bool) $this->config['cors_restrict_domains'] : true;
-        $this->validCORSDomains = array_key_exists('cors_valid_domains', $this->config) ? (array) $this->config['cors_valid_domains'] : [];
+        $this->validCORSDomains    = array_key_exists('cors_valid_domains', $this->config) ? (array) $this->config['cors_valid_domains'] : [];
     }
 
     /**
@@ -114,6 +115,7 @@ private function getAllowOriginHeaderValue(Request $request)
         // If we're not restricting domains, set the header to the request origin
         if (!$this->restrictCORSDomains || in_array($origin, $this->validCORSDomains)) {
             $this->requestOriginIsValid = true;
+
             return $origin;
         }
 
diff --git a/app/middlewares/CatchExceptionMiddleware.php b/app/middlewares/CatchExceptionMiddleware.php
index 985368b1999..c707dd4b3ed 100644
--- a/app/middlewares/CatchExceptionMiddleware.php
+++ b/app/middlewares/CatchExceptionMiddleware.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -63,7 +64,7 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
             define('MAUTIC_OFFLINE', 1);
 
             ob_start();
-            include MAUTIC_ROOT_DIR . '/offline.php';
+            include MAUTIC_ROOT_DIR.'/offline.php';
             $content = ob_get_clean();
 
             return new Response($content, 500);
diff --git a/app/middlewares/ConfigAwareTrait.php b/app/middlewares/ConfigAwareTrait.php
index 246a3c02309..609377c6fe9 100644
--- a/app/middlewares/ConfigAwareTrait.php
+++ b/app/middlewares/ConfigAwareTrait.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,10 +23,10 @@ trait ConfigAwareTrait
     public function getConfig()
     {
         // Include paths
-        $root = realpath(__DIR__ . '/..');
+        $root = realpath(__DIR__.'/..');
 
-        /** @var array $paths  */
-        include $root . '/config/paths.php';
+        /** @var array $paths */
+        include $root.'/config/paths.php';
 
         $localParameters = [];
         $localConfig     = str_replace('%kernel.root_dir%', $root, $paths['local_config']);
@@ -45,4 +46,4 @@ public function getConfig()
 
         return $localParameters;
     }
-}
\ No newline at end of file
+}
diff --git a/app/middlewares/Dev/IpRestrictMiddleware.php b/app/middlewares/Dev/IpRestrictMiddleware.php
index 942aa571180..370d27d1128 100644
--- a/app/middlewares/Dev/IpRestrictMiddleware.php
+++ b/app/middlewares/Dev/IpRestrictMiddleware.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -39,7 +40,7 @@ class IpRestrictMiddleware implements HttpKernelInterface, PrioritizedMiddleware
      */
     public function __construct(HttpKernelInterface $app)
     {
-        $this->app = $app;
+        $this->app        = $app;
         $this->allowedIps = ['127.0.0.1', 'fe80::1', '::1'];
 
         $parameters = $this->getConfig();
diff --git a/app/middlewares/MiddlewareBuilder.php b/app/middlewares/MiddlewareBuilder.php
index bba49b3d756..d54b08aaf98 100644
--- a/app/middlewares/MiddlewareBuilder.php
+++ b/app/middlewares/MiddlewareBuilder.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,56 +17,56 @@
 class MiddlewareBuilder
 {
     protected $specs;
-    
+
     public function __construct($env = null)
     {
         $this->specs = new \SplPriorityQueue();
 
-        $middlewares = glob(__DIR__ . '/*Middleware.php');
-        
+        $middlewares = glob(__DIR__.'/*Middleware.php');
+
         $this->addMiddlewares($middlewares);
-        
+
         if (isset($env)) {
-            $envMiddlewares = glob(__DIR__ . '/' . ucfirst($env) . '/*Middleware.php');
+            $envMiddlewares = glob(__DIR__.'/'.ucfirst($env).'/*Middleware.php');
 
-            if (! empty($envMiddlewares)) {
+            if (!empty($envMiddlewares)) {
                 $this->addMiddlewares($envMiddlewares, $env);
             }
         }
     }
-    
+
     public function addMiddlewares(array $middlewares, $env = null)
     {
         $prefix = 'Mautic\\Middleware\\';
-        
+
         if ($env) {
-            $prefix .= ucfirst($env) . '\\';
+            $prefix .= ucfirst($env).'\\';
         }
-        
+
         foreach ($middlewares as $middleware) {
-            $this->push($prefix . basename(substr($middleware, 0, -4)));
+            $this->push($prefix.basename(substr($middleware, 0, -4)));
         }
     }
-    
+
     public function push($kernelClass)
     {
         $reflection = new \ReflectionClass($kernelClass);
-        $priority = $reflection->getConstant('PRIORITY');
+        $priority   = $reflection->getConstant('PRIORITY');
 
         $this->specs->insert($reflection, $priority);
     }
 
     public function resolve(HttpKernelInterface $app)
     {
-        $middlewares = array($app);
-        
+        $middlewares = [$app];
+
         /** @var \ReflectionClass $spec */
         foreach ($this->specs as $spec) {
             $app = $spec->newInstanceArgs([$app]);
-            
+
             array_unshift($middlewares, $app);
         }
-        
+
         return new StackedHttpKernel($app, $middlewares);
     }
 }
diff --git a/app/middlewares/PrioritizedMiddlewareInterface.php b/app/middlewares/PrioritizedMiddlewareInterface.php
index cc579ba876a..48ddb33095a 100644
--- a/app/middlewares/PrioritizedMiddlewareInterface.php
+++ b/app/middlewares/PrioritizedMiddlewareInterface.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 interface PrioritizedMiddlewareInterface
 {
     /**
-     * Get the middleware's priority
+     * Get the middleware's priority.
      *
      * @return int
      */
diff --git a/app/middlewares/VersionCheckMiddleware.php b/app/middlewares/VersionCheckMiddleware.php
index 16620a354a6..d394b6d87fc 100644
--- a/app/middlewares/VersionCheckMiddleware.php
+++ b/app/middlewares/VersionCheckMiddleware.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 class VersionCheckMiddleware implements HttpKernelInterface, PrioritizedMiddlewareInterface
 {
     const PRIORITY = 10;
-    
+
     const MAUTIC_MINIMUM_PHP = '5.6.19';
     const MAUTIC_MAXIMUM_PHP = '7.0.999';
 
@@ -37,7 +38,7 @@ public function __construct(HttpKernelInterface $app)
     }
 
     /**
-     * Check Minimum / Maximum PHP versions
+     * Check Minimum / Maximum PHP versions.
      *
      * {@inheritdoc}
      */
diff --git a/app/migrations/Version20150402000000.php b/app/migrations/Version20150402000000.php
index a7489b6ee1f..e890a57d922 100644
--- a/app/migrations/Version20150402000000.php
+++ b/app/migrations/Version20150402000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20150402000000
+ * Class Version20150402000000.
  */
 class Version20150402000000 extends AbstractMauticMigration
 {
-
     /**
      * @param Schema $schema
      *
@@ -28,7 +28,7 @@ class Version20150402000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         // Test to see if this migration has already been applied
-        $formTable = $schema->getTable($this->prefix . 'forms');
+        $formTable = $schema->getTable($this->prefix.'forms');
         if ($formTable->hasColumn('in_kiosk_mode')) {
             throw new SkipMigrationException('Schema includes this migration');
         }
@@ -39,11 +39,11 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'emails DROP read_in_browser');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_stats DROP FOREIGN KEY ' . $this->findPropertyName('email_stats', 'fk', '3DAE168B'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_stats ADD CONSTRAINT ' . $this->generatePropertyName('email_stats', 'fk', array('list_id')) . ' FOREIGN KEY (list_id) REFERENCES ' . $this->prefix . 'lead_lists (id) ON DELETE SET NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'forms ADD in_kiosk_mode TINYINT(1) DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'page_hits CHANGE referer referer LONGTEXT DEFAULT NULL, CHANGE url url LONGTEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'page_redirects CHANGE url url LONGTEXT NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'emails DROP read_in_browser');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_stats DROP FOREIGN KEY '.$this->findPropertyName('email_stats', 'fk', '3DAE168B'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_stats ADD CONSTRAINT '.$this->generatePropertyName('email_stats', 'fk', ['list_id']).' FOREIGN KEY (list_id) REFERENCES '.$this->prefix.'lead_lists (id) ON DELETE SET NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'forms ADD in_kiosk_mode TINYINT(1) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'page_hits CHANGE referer referer LONGTEXT DEFAULT NULL, CHANGE url url LONGTEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'page_redirects CHANGE url url LONGTEXT NOT NULL');
     }
 }
diff --git a/app/migrations/Version20150504000000.php b/app/migrations/Version20150504000000.php
index 8802a98428c..708fbe6ef5f 100644
--- a/app/migrations/Version20150504000000.php
+++ b/app/migrations/Version20150504000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Migration 1.0.3 to 1.0.4
+ * Migration 1.0.3 to 1.0.4.
  */
 class Version20150504000000 extends AbstractMauticMigration
 {
@@ -27,7 +28,7 @@ class Version20150504000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         // Test to see if this migration has already been applied
-        $table = $schema->getTable($this->prefix . 'lead_fields');
+        $table = $schema->getTable($this->prefix.'lead_fields');
         if ($table->hasColumn('is_unique_identifer')) {
             throw new SkipMigrationException('Schema includes this migration');
         }
@@ -40,7 +41,7 @@ public function postUp(Schema $schema)
     {
         // Set email as a unique ID
         $q = $this->connection->createQueryBuilder();
-        $q->update(MAUTIC_TABLE_PREFIX . 'lead_fields')
+        $q->update(MAUTIC_TABLE_PREFIX.'lead_fields')
             ->set('is_unique_identifer', ':true')
             ->where(
                 $q->expr()->eq('alias', $q->expr()->literal('email'))
@@ -54,9 +55,9 @@ public function postUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log DROP FOREIGN KEY ' . $this->findPropertyName('campaign_lead_event_log', 'fk', 'F639F774'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log ADD metadata LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', ADD non_action_path_taken TINYINT(1) DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log ADD CONSTRAINT ' . $this->generatePropertyName('campaign_lead_event_log', 'fk', array('campaign_id')) . ' FOREIGN KEY (campaign_id) REFERENCES ' . $this->prefix . 'campaigns (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_fields ADD is_unique_identifer TINYINT(1) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_lead_event_log DROP FOREIGN KEY '.$this->findPropertyName('campaign_lead_event_log', 'fk', 'F639F774'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_lead_event_log ADD metadata LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', ADD non_action_path_taken TINYINT(1) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_lead_event_log ADD CONSTRAINT '.$this->generatePropertyName('campaign_lead_event_log', 'fk', ['campaign_id']).' FOREIGN KEY (campaign_id) REFERENCES '.$this->prefix.'campaigns (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_fields ADD is_unique_identifer TINYINT(1) DEFAULT NULL');
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20150521000000.php b/app/migrations/Version20150521000000.php
index dadc555519e..70d1bd34779 100644
--- a/app/migrations/Version20150521000000.php
+++ b/app/migrations/Version20150521000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Mautic\PageBundle\Entity\Redirect;
 
 /**
- * Migrate 1.0.5 to 1.0.6
+ * Migrate 1.0.5 to 1.0.6.
  *
  * Class Version20150521000000
  */
@@ -32,7 +33,7 @@ class Version20150521000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         // Test to see if this migration has already been applied
-        $table = $schema->getTable($this->prefix . 'form_fields');
+        $table = $schema->getTable($this->prefix.'form_fields');
         if ($table->hasColumn('lead_field')) {
             throw new SkipMigrationException('Schema includes this migration');
         }
@@ -58,13 +59,13 @@ public function postUp(Schema $schema)
             $properties = unserialize($r['properties']);
             if (is_array($properties) && !empty($properties['message'])) {
                 $this->connection->update(MAUTIC_TABLE_PREFIX.'forms',
-                    array(
+                    [
                         'post_action'          => 'message',
-                        'post_action_property' => $properties['message']
-                    ),
-                    array(
-                        'id' => $r['form_id']
-                    )
+                        'post_action_property' => $properties['message'],
+                    ],
+                    [
+                        'id' => $r['form_id'],
+                    ]
                 );
             }
         }
@@ -91,7 +92,7 @@ public function postUp(Schema $schema)
             ->from(MAUTIC_TABLE_PREFIX.'lead_fields', 'f')
             ->execute()
             ->fetchAll();
-        $fields  = array();
+        $fields = [];
         foreach ($results as $field) {
             $fields[$field['id']] = $field['alias'];
         }
@@ -108,9 +109,9 @@ public function postUp(Schema $schema)
             ->execute()
             ->fetchAll();
 
-        $formFieldMatches = array();
-        $actionEntities   = array();
-        $deleteActions    = array();
+        $formFieldMatches = [];
+        $actionEntities   = [];
+        $deleteActions    = [];
         foreach ($actions as $action) {
             try {
                 $properties = unserialize($action['properties']);
@@ -130,19 +131,17 @@ public function postUp(Schema $schema)
                     $formAction->setForm($em->getReference('MauticFormBundle:Form', $action['form_id']));
                     $formAction->setOrder($action['action_order']);
                     $formAction->setProperties(
-                        array(
+                        [
                             'operator' => 'plus',
-                            'points'   => $properties['points']
-                        )
+                            'points'   => $properties['points'],
+                        ]
                     );
                     $actionEntities[] = $formAction;
                     unset($formAction);
                 }
 
                 $deleteActions[] = $action['id'];
-
             } catch (\Exception $e) {
-
             }
         }
 
@@ -229,7 +228,7 @@ public function postUp(Schema $schema)
             )
             ->execute();
 
-        $q = $this->connection->createQueryBuilder();
+        $q      = $this->connection->createQueryBuilder();
         $clicks = $q->select('ph.url, ph.email_id, count(distinct(ph.tracking_id)) as unique_click_count, count(ph.tracking_id) as click_count')
             ->from(MAUTIC_TABLE_PREFIX.'page_hits', 'ph')
             ->where(
@@ -242,7 +241,7 @@ public function postUp(Schema $schema)
             ->execute()->fetchAll();
 
         // See which already have URLs created as redirects
-        $redirectEntities = array();
+        $redirectEntities = [];
         foreach ($clicks as $click) {
             $redirect = new Redirect();
             $redirect->setDateAdded(new \DateTime());
@@ -292,7 +291,7 @@ public function postUp(Schema $schema)
         $results = $q->execute()->fetchAll();
 
         if (!empty($results)) {
-            $templateEmails   = array();
+            $templateEmails = [];
             foreach ($results as $email) {
                 $templateEmails[$email['email_id']] = $email;
             }
@@ -301,21 +300,21 @@ public function postUp(Schema $schema)
             $emailModel = $this->factory->getModel('email');
 
             $emails = $emailModel->getEntities(
-                array(
+                [
                     'iterator_mode' => true,
-                    'filter'        => array(
-                        'force' => array(
-                            array(
+                    'filter'        => [
+                        'force' => [
+                            [
                                 'column' => 'e.id',
                                 'expr'   => 'in',
-                                'value'  => $templateEmailIds
-                            )
-                        )
-                    )
-                )
+                                'value'  => $templateEmailIds,
+                            ],
+                        ],
+                    ],
+                ]
             );
 
-            $persistListEmails = $persistTemplateEmails = $variants = array();
+            $persistListEmails = $persistTemplateEmails = $variants = [];
 
             // Clone since the ID may be in a bunch of serialized properties then convert new to a list based email
             while (($row = $emails->next()) !== false) {
@@ -323,7 +322,7 @@ public function postUp(Schema $schema)
                 /** @var \Mautic\EmailBundle\Entity\Email $templateEmail */
                 $templateEmail = reset($row);
                 $id            = $templateEmail->getId();
-                $listEmail     = clone($templateEmail);
+                $listEmail     = clone $templateEmail;
                 $listEmail->setEmailType('list');
                 $listEmail->clearVariants();
                 $listEmail->clearStats();
@@ -396,8 +395,8 @@ public function postUp(Schema $schema)
             $emailModel->saveEntities($persistListEmails);
 
             // Clone variants
-            $persistVariants   = array();
-            $processedVariants = array();
+            $persistVariants   = [];
+            $processedVariants = [];
 
             foreach ($variants as $templateEmailId) {
                 if ($persistTemplateEmails[$templateEmailId]->isVariant(true)) {
@@ -407,7 +406,7 @@ public function postUp(Schema $schema)
                     $templateParent = $persistTemplateEmails[$templateEmailId];
                 }
 
-                if(in_array($templateParent->getId(), $processedVariants)) {
+                if (in_array($templateParent->getId(), $processedVariants)) {
                     continue;
                 }
 
@@ -417,9 +416,9 @@ public function postUp(Schema $schema)
                 $children = $templateParent->getVariantChildren();
 
                 // If the parent is not already cloned, then do so
-                /** @var \Mautic\EmailBundle\Entity\Email $listParent */
+                /* @var \Mautic\EmailBundle\Entity\Email $listParent */
                 if (!isset($persistListEmails[$templateParent->getId()])) {
-                    $listParent   = clone($templateParent);
+                    $listParent = clone $templateParent;
                     $listParent->setEmailType('list');
                     $listParent->clearVariants();
                     $listParent->clearStats();
@@ -441,7 +440,7 @@ public function postUp(Schema $schema)
                         continue;
                     }
 
-                    $listChild = clone($templateChild);
+                    $listChild = clone $templateChild;
                     $listChild->clearStats();
                     $listChild->setEmailType('list');
 
@@ -473,14 +472,14 @@ public function postUp(Schema $schema)
                 $q = $this->connection->createQueryBuilder();
                 $q->update(MAUTIC_TABLE_PREFIX.'page_hits')
                     ->set('email_id', $listEmail->getId())
-                    ->where('lead_id IN ' . sprintf('(%s)', $sq->getSql()) . ' AND email_id = ' . $templateId)
+                    ->where('lead_id IN '.sprintf('(%s)', $sq->getSql()).' AND email_id = '.$templateId)
                     ->execute();
 
                 // Update download hits
                 $q = $this->connection->createQueryBuilder();
                 $q->update(MAUTIC_TABLE_PREFIX.'asset_downloads')
                     ->set('email_id', $listEmail->getId())
-                    ->where('lead_id IN ' . sprintf('(%s)', $sq->getSql()) . ' AND email_id = ' . $templateId)
+                    ->where('lead_id IN '.sprintf('(%s)', $sq->getSql()).' AND email_id = '.$templateId)
                     ->execute();
 
                 $q = $this->connection->createQueryBuilder();
@@ -518,47 +517,47 @@ public function postUp(Schema $schema)
     public function up(Schema $schema)
     {
         // Ensure the render_style column exists to prevent ORM errors
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'forms ADD COLUMN render_style bool DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'forms ADD COLUMN render_style bool DEFAULT NULL');
 
         $this->addSql(
-            'CREATE TABLE ' . $this->prefix . 'email_assets_xref (email_id INT NOT NULL, asset_id INT NOT NULL, INDEX ' . $this->generatePropertyName('email_assets_xref', 'idx', array('email_id')) . '  (email_id), INDEX ' . $this->generatePropertyName('email_assets_xref', 'idx', array('asset_id')) . '  (asset_id), PRIMARY KEY(email_id, asset_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'
+            'CREATE TABLE '.$this->prefix.'email_assets_xref (email_id INT NOT NULL, asset_id INT NOT NULL, INDEX '.$this->generatePropertyName('email_assets_xref', 'idx', ['email_id']).'  (email_id), INDEX '.$this->generatePropertyName('email_assets_xref', 'idx', ['asset_id']).'  (asset_id), PRIMARY KEY(email_id, asset_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'
         );
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_assets_xref ADD CONSTRAINT ' . $this->generatePropertyName('email_assets_xref', 'fk', array('email_id')) . '  FOREIGN KEY (email_id) REFERENCES ' . $this->prefix . 'emails (id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_assets_xref ADD CONSTRAINT ' . $this->generatePropertyName('email_assets_xref', 'fk', array('asset_id')) . '  FOREIGN KEY (asset_id) REFERENCES ' . $this->prefix . 'assets (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_assets_xref ADD CONSTRAINT '.$this->generatePropertyName('email_assets_xref', 'fk', ['email_id']).'  FOREIGN KEY (email_id) REFERENCES '.$this->prefix.'emails (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_assets_xref ADD CONSTRAINT '.$this->generatePropertyName('email_assets_xref', 'fk', ['asset_id']).'  FOREIGN KEY (asset_id) REFERENCES '.$this->prefix.'assets (id)');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'assets ADD size INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'assets ADD size INT DEFAULT NULL');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log DROP FOREIGN KEY ' . $this->findPropertyName('campaign_lead_event_log', 'fk', 'F639F774'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_lead_event_log DROP FOREIGN KEY '.$this->findPropertyName('campaign_lead_event_log', 'fk', 'F639F774'));
         $this->addSql(
-            'ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log ADD CONSTRAINT ' . $this->generatePropertyName('campaign_lead_event_log', 'fk', array('campaign_id')) . '  FOREIGN KEY (campaign_id) REFERENCES ' . $this->prefix . 'campaigns (id)'
+            'ALTER TABLE '.$this->prefix.'campaign_lead_event_log ADD CONSTRAINT '.$this->generatePropertyName('campaign_lead_event_log', 'fk', ['campaign_id']).'  FOREIGN KEY (campaign_id) REFERENCES '.$this->prefix.'campaigns (id)'
         );
 
         $this->addSql(
-            'ALTER TABLE ' . $this->prefix . 'emails ADD name VARCHAR(255) DEFAULT NULL, ADD description LONGTEXT DEFAULT NULL, ADD from_address VARCHAR(255) DEFAULT NULL, ADD from_name VARCHAR(255) DEFAULT NULL, ADD reply_to_address VARCHAR(255) DEFAULT NULL, ADD bcc_address VARCHAR(255) DEFAULT NULL, ADD email_type VARCHAR(255) DEFAULT NULL, CHANGE subject subject LONGTEXT DEFAULT NULL, CHANGE template template VARCHAR(255) DEFAULT NULL'
+            'ALTER TABLE '.$this->prefix.'emails ADD name VARCHAR(255) DEFAULT NULL, ADD description LONGTEXT DEFAULT NULL, ADD from_address VARCHAR(255) DEFAULT NULL, ADD from_name VARCHAR(255) DEFAULT NULL, ADD reply_to_address VARCHAR(255) DEFAULT NULL, ADD bcc_address VARCHAR(255) DEFAULT NULL, ADD email_type VARCHAR(255) DEFAULT NULL, CHANGE subject subject LONGTEXT DEFAULT NULL, CHANGE template template VARCHAR(255) DEFAULT NULL'
         );
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'emails CHANGE content_mode content_mode VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'emails CHANGE content_mode content_mode VARCHAR(255) DEFAULT NULL');
 
         $this->addSql(
-            'ALTER TABLE ' . $this->prefix . 'email_stats ADD copy LONGTEXT DEFAULT NULL, ADD open_count INT DEFAULT NULL, ADD last_opened DATETIME DEFAULT NULL, ADD open_details LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', CHANGE email_id email_id INT DEFAULT NULL'
+            'ALTER TABLE '.$this->prefix.'email_stats ADD copy LONGTEXT DEFAULT NULL, ADD open_count INT DEFAULT NULL, ADD last_opened DATETIME DEFAULT NULL, ADD open_details LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', CHANGE email_id email_id INT DEFAULT NULL'
         );
 
         $this->addSql(
-            'ALTER TABLE ' . $this->prefix . 'form_fields ADD container_attr VARCHAR(255) DEFAULT NULL, ADD lead_field VARCHAR(255) DEFAULT NULL, ADD save_result TINYINT(1) DEFAULT NULL, CHANGE `label` `label` LONGTEXT NOT NULL, CHANGE default_value default_value LONGTEXT DEFAULT NULL, CHANGE validation_message validation_message LONGTEXT DEFAULT NULL, CHANGE help_message help_message LONGTEXT DEFAULT NULL'
+            'ALTER TABLE '.$this->prefix.'form_fields ADD container_attr VARCHAR(255) DEFAULT NULL, ADD lead_field VARCHAR(255) DEFAULT NULL, ADD save_result TINYINT(1) DEFAULT NULL, CHANGE `label` `label` LONGTEXT NOT NULL, CHANGE default_value default_value LONGTEXT DEFAULT NULL, CHANGE validation_message validation_message LONGTEXT DEFAULT NULL, CHANGE help_message help_message LONGTEXT DEFAULT NULL'
         );
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'pages CHANGE template template VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'pages CHANGE content_mode content_mode VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'pages CHANGE template template VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'pages CHANGE content_mode content_mode VARCHAR(255) DEFAULT NULL');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'page_redirects ADD email_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'page_redirects ADD email_id INT DEFAULT NULL');
         $this->addSql(
-            'ALTER TABLE ' . $this->prefix . 'page_redirects ADD CONSTRAINT ' . $this->generatePropertyName('page_redirects', 'fk', array('email_id')) . ' FOREIGN KEY (email_id) REFERENCES ' . $this->prefix . 'emails (id) ON DELETE SET NULL'
+            'ALTER TABLE '.$this->prefix.'page_redirects ADD CONSTRAINT '.$this->generatePropertyName('page_redirects', 'fk', ['email_id']).' FOREIGN KEY (email_id) REFERENCES '.$this->prefix.'emails (id) ON DELETE SET NULL'
         );
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('page_redirects', 'idx', array('email_id')) . ' ON ' . $this->prefix  . 'page_redirects (email_id)');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('page_redirects', 'idx', ['email_id']).' ON '.$this->prefix.'page_redirects (email_id)');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'forms ADD form_type VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'forms ADD form_type VARCHAR(255) DEFAULT NULL');
 
-        $this->addSql('CREATE TABLE ' . $this->prefix . 'campaign_form_xref (campaign_id INT NOT NULL, form_id INT NOT NULL, INDEX ' . $this->generatePropertyName('campaign_form_xref', 'idx', array('campaign_id')) . ' (campaign_id), INDEX ' . $this->generatePropertyName('campaign_form_xref', 'idx', array('form_id')) . ' (form_id), PRIMARY KEY(campaign_id, form_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_form_xref ADD CONSTRAINT ' . $this->generatePropertyName('campaign_form_xref', 'fk', array('campaign_id')) . ' FOREIGN KEY (campaign_id) REFERENCES ' . $this->prefix . 'campaigns (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_form_xref ADD CONSTRAINT ' . $this->generatePropertyName('campaign_form_xref', 'fk', array('form_id')) . ' FOREIGN KEY (form_id) REFERENCES ' . $this->prefix . 'forms (id) ON DELETE CASCADE');
+        $this->addSql('CREATE TABLE '.$this->prefix.'campaign_form_xref (campaign_id INT NOT NULL, form_id INT NOT NULL, INDEX '.$this->generatePropertyName('campaign_form_xref', 'idx', ['campaign_id']).' (campaign_id), INDEX '.$this->generatePropertyName('campaign_form_xref', 'idx', ['form_id']).' (form_id), PRIMARY KEY(campaign_id, form_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_form_xref ADD CONSTRAINT '.$this->generatePropertyName('campaign_form_xref', 'fk', ['campaign_id']).' FOREIGN KEY (campaign_id) REFERENCES '.$this->prefix.'campaigns (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_form_xref ADD CONSTRAINT '.$this->generatePropertyName('campaign_form_xref', 'fk', ['form_id']).' FOREIGN KEY (form_id) REFERENCES '.$this->prefix.'forms (id) ON DELETE CASCADE');
     }
 }
diff --git a/app/migrations/Version20150718000000.php b/app/migrations/Version20150718000000.php
index 0fd0e7769e7..42c73d9d876 100644
--- a/app/migrations/Version20150718000000.php
+++ b/app/migrations/Version20150718000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * 1.1.2 to 1.1.3
+ * 1.1.2 to 1.1.3.
  */
 class Version20150718000000 extends AbstractMauticMigration
 {
@@ -26,7 +27,7 @@ class Version20150718000000 extends AbstractMauticMigration
      */
     public function preUp(Schema $schema)
     {
-        $table = $schema->getTable($this->prefix . 'pages');
+        $table = $schema->getTable($this->prefix.'pages');
         if ($table->hasColumn('redirect_type')) {
             throw new SkipMigrationException('Schema includes this migration');
         }
@@ -37,6 +38,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'pages ADD redirect_type VARCHAR(100) DEFAULT NULL, ADD redirect_url VARCHAR(200) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'pages ADD redirect_type VARCHAR(100) DEFAULT NULL, ADD redirect_url VARCHAR(200) DEFAULT NULL');
     }
 }
diff --git a/app/migrations/Version20150724000000.php b/app/migrations/Version20150724000000.php
index 3f35d1c3f0d..bd9d8802b93 100644
--- a/app/migrations/Version20150724000000.php
+++ b/app/migrations/Version20150724000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * 1.1.3 - 1.1.4
+ * 1.1.3 - 1.1.4.
  *
  * Class Version20150724000000
  */
@@ -29,7 +30,7 @@ class Version20150724000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         // Test to see if this migration has already been applied
-        $oauthTable = $schema->getTable($this->prefix . 'oauth1_consumers');
+        $oauthTable = $schema->getTable($this->prefix.'oauth1_consumers');
         if ($oauthTable->hasColumn('consumer_key')) {
             throw new SkipMigrationException('Schema includes this migration');
         }
@@ -41,88 +42,88 @@ public function preUp(Schema $schema)
     public function up(Schema $schema)
     {
         // Check that render_style was not added by migration 20150521
-        $table = $schema->getTable($this->prefix . 'forms');
+        $table = $schema->getTable($this->prefix.'forms');
         if (!$table->hasColumn('render_style')) {
-            $this->addSql('ALTER TABLE ' . $this->prefix . 'forms ADD COLUMN render_style bool DEFAULT NULL');
+            $this->addSql('ALTER TABLE '.$this->prefix.'forms ADD COLUMN render_style bool DEFAULT NULL');
         }
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_consumers CHANGE consumerKey consumer_key VARCHAR(255) NOT NULL, CHANGE consumerSecret consumer_secret VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_access_tokens DROP FOREIGN KEY ' . $this->findPropertyName('oauth1_access_tokens', 'fk', '37FDBD6D'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('oauth1_access_tokens', 'idx', '37FDBD6D') . ' ON ' . $this->prefix . 'oauth1_access_tokens');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_access_tokens DROP FOREIGN KEY ' . $this->findPropertyName('oauth1_access_tokens', 'fk', 'A76ED395'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('oauth1_access_tokens', 'idx', 'A76ED395') . ' ON ' . $this->prefix . 'oauth1_access_tokens');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_access_tokens CHANGE consumer_id consumer_id INT NOT NULL, CHANGE user_id user_id INT NOT NULL, CHANGE expiresat expires_at BIGINT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_access_tokens ADD CONSTRAINT ' . $this->generatePropertyName('oauth1_access_tokens', 'fk', array('consumer_id')) . ' FOREIGN KEY (consumer_id) REFERENCES ' . $this->prefix . 'oauth1_consumers (id) ON DELETE CASCADE');
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('oauth1_access_tokens', 'idx', array('consumer_id')) . ' ON ' . $this->prefix . 'oauth1_consumers (id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_access_tokens ADD CONSTRAINT ' . $this->generatePropertyName('oauth1_access_tokens', 'fk', array('user_id')) . ' FOREIGN KEY (user_id) REFERENCES ' . $this->prefix . 'users (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_consumers CHANGE consumerKey consumer_key VARCHAR(255) NOT NULL, CHANGE consumerSecret consumer_secret VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_access_tokens DROP FOREIGN KEY '.$this->findPropertyName('oauth1_access_tokens', 'fk', '37FDBD6D'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('oauth1_access_tokens', 'idx', '37FDBD6D').' ON '.$this->prefix.'oauth1_access_tokens');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_access_tokens DROP FOREIGN KEY '.$this->findPropertyName('oauth1_access_tokens', 'fk', 'A76ED395'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('oauth1_access_tokens', 'idx', 'A76ED395').' ON '.$this->prefix.'oauth1_access_tokens');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_access_tokens CHANGE consumer_id consumer_id INT NOT NULL, CHANGE user_id user_id INT NOT NULL, CHANGE expiresat expires_at BIGINT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_access_tokens ADD CONSTRAINT '.$this->generatePropertyName('oauth1_access_tokens', 'fk', ['consumer_id']).' FOREIGN KEY (consumer_id) REFERENCES '.$this->prefix.'oauth1_consumers (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('oauth1_access_tokens', 'idx', ['consumer_id']).' ON '.$this->prefix.'oauth1_consumers (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_access_tokens ADD CONSTRAINT '.$this->generatePropertyName('oauth1_access_tokens', 'fk', ['user_id']).' FOREIGN KEY (user_id) REFERENCES '.$this->prefix.'users (id) ON DELETE CASCADE');
 
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('oauth1_access_tokens', 'idx', array('user_id')) . ' ON ' . $this->prefix . 'oauth1_access_tokens (user_id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_request_tokens DROP FOREIGN KEY ' . $this->findPropertyName('oauth1_request_tokens', 'fk', '37FDBD6D'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('oauth1_request_tokens', 'idx', '37FDBD6D') . ' ON ' . $this->prefix . 'oauth1_request_tokens');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_request_tokens CHANGE consumer_id consumer_id INT NOT NULL, CHANGE expiresat expires_at BIGINT NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth1_request_tokens ADD CONSTRAINT ' . $this->generatePropertyName('oauth1_request_tokens', 'fk', array('consumer_id')) . ' FOREIGN KEY (consumer_id) REFERENCES ' . $this->prefix . 'oauth1_consumers (id) ON DELETE CASCADE');
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('oauth1_request_tokens', 'idx', array('consumer_id')) . ' ON ' . $this->prefix . 'oauth1_consumers (id)');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('oauth1_access_tokens', 'idx', ['user_id']).' ON '.$this->prefix.'oauth1_access_tokens (user_id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_request_tokens DROP FOREIGN KEY '.$this->findPropertyName('oauth1_request_tokens', 'fk', '37FDBD6D'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('oauth1_request_tokens', 'idx', '37FDBD6D').' ON '.$this->prefix.'oauth1_request_tokens');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_request_tokens CHANGE consumer_id consumer_id INT NOT NULL, CHANGE expiresat expires_at BIGINT NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth1_request_tokens ADD CONSTRAINT '.$this->generatePropertyName('oauth1_request_tokens', 'fk', ['consumer_id']).' FOREIGN KEY (consumer_id) REFERENCES '.$this->prefix.'oauth1_consumers (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('oauth1_request_tokens', 'idx', ['consumer_id']).' ON '.$this->prefix.'oauth1_consumers (id)');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth2_clients CHANGE name name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth2_accesstokens CHANGE expires_at expires_at BIGINT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth2_refreshtokens CHANGE expires_at expires_at BIGINT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'oauth2_authcodes CHANGE expires_at expires_at BIGINT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth2_clients CHANGE name name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth2_accesstokens CHANGE expires_at expires_at BIGINT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth2_refreshtokens CHANGE expires_at expires_at BIGINT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'oauth2_authcodes CHANGE expires_at expires_at BIGINT DEFAULT NULL');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaigns CHANGE name name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_events CHANGE name name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log DROP FOREIGN KEY ' . $this->findPropertyName('campaign_lead_event_log', 'fk', '696C06D6'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('campaign_lead_event_log', 'idx', '696C06D6') . ' ON ' . $this->prefix . 'campaign_lead_event_log');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log CHANGE ipaddress_id ip_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'campaign_lead_event_log ADD CONSTRAINT ' . $this->generatePropertyName('campaign_lead_event_log', 'fk', array('ip_id')) . ' FOREIGN KEY (ip_id) REFERENCES ' . $this->prefix . 'ip_addresses (id)');
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('campaign_lead_event_log', 'idx', array('ip_id')) . ' ON ' . $this->prefix . 'campaign_lead_event_log (ip_id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'audit_log CHANGE ip_address ip_address VARCHAR(45) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'ip_addresses CHANGE ip_address ip_address VARCHAR(45) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_donotemail CHANGE date_added date_added DATETIME NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'emails CHANGE name name VARCHAR(255) NOT NULL, CHANGE email_type email_type LONGTEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_assets_xref DROP FOREIGN KEY ' . $this->findPropertyName('email_assets_xref', 'fk', '75DA1941'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_assets_xref DROP FOREIGN KEY ' . $this->findPropertyName('email_assets_xref', 'fk', 'A832C1C9'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_assets_xref ADD CONSTRAINT ' . $this->generatePropertyName('email_assets_xref', 'fk', array('asset_id')) . ' FOREIGN KEY (asset_id) REFERENCES ' . $this->prefix . 'assets (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_assets_xref ADD CONSTRAINT ' . $this->generatePropertyName('email_assets_xref', 'fk', array('email_id')) . ' FOREIGN KEY (email_id) REFERENCES ' . $this->prefix . 'emails (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_stats CHANGE retry_count retry_count INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'form_actions CHANGE name name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'form_fields DROP FOREIGN KEY ' . $this->findPropertyName('form_fields', 'fk', '5FF69B7D'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'form_fields CHANGE form_id form_id INT NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'form_fields ADD CONSTRAINT ' . $this->generatePropertyName('form_fields', 'fk', array('form_id')) . ' FOREIGN KEY (form_id) REFERENCES ' . $this->prefix . 'forms (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_ips_xref DROP FOREIGN KEY ' . $this->findPropertyName('lead_ips_xref', 'fk', '0655458D'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_ips_xref ADD CONSTRAINT ' . $this->generatePropertyName('lead_ips_xref', 'fk', array('lead_id')) . ' FOREIGN KEY (lead_id) REFERENCES ' . $this->prefix . 'leads (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_notes DROP FOREIGN KEY ' . $this->findPropertyName('lead_notes', 'fk', '1755458D'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('lead_notes', 'idx', '1755458D') . ' ON ' . $this->prefix . 'lead_notes');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_notes CHANGE lead_id lead_id INT NOT NULL, CHANGE text text LONGTEXT NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_notes ADD CONSTRAINT ' . $this->generatePropertyName('lead_notes', 'fk', array('lead_id')) . ' FOREIGN KEY (lead_id) REFERENCES ' . $this->prefix . 'leads (id) ON DELETE CASCADE');
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('lead_notes', 'idx', array('lead_id')) . ' ON ' . $this->prefix . 'leads (id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_points_change_log DROP FOREIGN KEY ' . $this->findPropertyName('lead_points_change_log', 'fk', '6955458D'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_points_change_log CHANGE event_name event_name VARCHAR(255) NOT NULL, CHANGE action_name action_name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_points_change_log ADD CONSTRAINT ' . $this->generatePropertyName('lead_points_change_log', 'fk', array('lead_id')) . ' FOREIGN KEY (lead_id) REFERENCES ' . $this->prefix . 'leads (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'pages CHANGE meta_description meta_description VARCHAR(255) DEFAULT NULL, CHANGE redirect_url redirect_url VARCHAR(100) DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_action_log DROP FOREIGN KEY ' . $this->findPropertyName('point_lead_action_log', 'fk', '696C06D6'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_action_log DROP FOREIGN KEY ' . $this->findPropertyName('point_lead_action_log', 'fk', 'C028CEA2'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('point_lead_action_log', 'idx', '696C06D6') . ' ON ' . $this->prefix . 'point_lead_action_log');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_action_log CHANGE ipaddress_id ip_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_action_log ADD CONSTRAINT ' . $this->generatePropertyName('point_lead_action_log', 'fk', array('ip_id')) . ' FOREIGN KEY (ip_id) REFERENCES ' . $this->prefix . 'ip_addresses (id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_action_log ADD CONSTRAINT ' . $this->generatePropertyName('point_lead_action_log', 'fk', array('point_id')) . ' FOREIGN KEY (point_id) REFERENCES ' . $this->prefix . 'points (id) ON DELETE CASCADE');
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('point_lead_action_log', 'idx', array('ip_id')) . ' ON ' . $this->prefix . 'point_lead_action_log (ip_id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_event_log DROP FOREIGN KEY ' . $this->findPropertyName('point_lead_event_log', 'fk', '696C06D6'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_event_log DROP FOREIGN KEY ' . $this->findPropertyName('point_lead_event_log', 'fk', '71F7E88B'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('point_lead_event_log', 'idx', '696C06D6') . ' ON ' . $this->prefix . 'point_lead_event_log');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_event_log CHANGE ipaddress_id ip_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_event_log ADD CONSTRAINT ' . $this->generatePropertyName('point_lead_event_log', 'fk', array('ip_id')) . ' FOREIGN KEY (ip_id) REFERENCES ' . $this->prefix . 'ip_addresses (id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_lead_event_log ADD CONSTRAINT ' . $this->generatePropertyName('point_lead_event_log', 'fk', array('event_id')) . ' FOREIGN KEY (event_id) REFERENCES ' . $this->prefix . 'point_trigger_events (id) ON DELETE CASCADE');
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('point_lead_event_log', 'idx', array('ip_id')) . ' ON ' . $this->prefix . 'point_lead_event_log (ip_id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'points CHANGE name name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_triggers CHANGE name name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'point_trigger_events CHANGE name name VARCHAR(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'users DROP FOREIGN KEY ' . $this->findPropertyName('users', 'fk', 'D60322AC'));
-        $this->addSql('DROP INDEX ' . $this->findPropertyName('users', 'idx', 'D60322AC') . ' ON ' . $this->prefix . 'users');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'users CHANGE role_id role_id INT NOT NULL, CHANGE username username VARCHAR(255) NOT NULL, CHANGE first_name first_name VARCHAR(255) NOT NULL, CHANGE last_name last_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE position position VARCHAR(255) DEFAULT NULL, CHANGE timezone timezone VARCHAR(255) DEFAULT NULL, CHANGE locale locale VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'users ADD CONSTRAINT ' . $this->generatePropertyName('users', 'fk', array('role_id')) . ' FOREIGN KEY (role_id) REFERENCES ' . $this->prefix . 'roles (id)');
-        $this->addSql('CREATE INDEX ' . $this->generatePropertyName('users', 'idx', array('role_id')) . ' ON ' . $this->prefix . 'roles (id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'permissions DROP FOREIGN KEY ' . $this->findPropertyName('permissions', 'fk', 'D60322AC'));
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'permissions CHANGE role_id role_id INT NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'permissions ADD CONSTRAINT ' . $this->generatePropertyName('permissions', 'fk', array('role_id')) . ' FOREIGN KEY (role_id) REFERENCES ' . $this->prefix . 'roles (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaigns CHANGE name name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_events CHANGE name name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_lead_event_log DROP FOREIGN KEY '.$this->findPropertyName('campaign_lead_event_log', 'fk', '696C06D6'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('campaign_lead_event_log', 'idx', '696C06D6').' ON '.$this->prefix.'campaign_lead_event_log');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_lead_event_log CHANGE ipaddress_id ip_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'campaign_lead_event_log ADD CONSTRAINT '.$this->generatePropertyName('campaign_lead_event_log', 'fk', ['ip_id']).' FOREIGN KEY (ip_id) REFERENCES '.$this->prefix.'ip_addresses (id)');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('campaign_lead_event_log', 'idx', ['ip_id']).' ON '.$this->prefix.'campaign_lead_event_log (ip_id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'audit_log CHANGE ip_address ip_address VARCHAR(45) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'ip_addresses CHANGE ip_address ip_address VARCHAR(45) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_donotemail CHANGE date_added date_added DATETIME NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'emails CHANGE name name VARCHAR(255) NOT NULL, CHANGE email_type email_type LONGTEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_assets_xref DROP FOREIGN KEY '.$this->findPropertyName('email_assets_xref', 'fk', '75DA1941'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_assets_xref DROP FOREIGN KEY '.$this->findPropertyName('email_assets_xref', 'fk', 'A832C1C9'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_assets_xref ADD CONSTRAINT '.$this->generatePropertyName('email_assets_xref', 'fk', ['asset_id']).' FOREIGN KEY (asset_id) REFERENCES '.$this->prefix.'assets (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_assets_xref ADD CONSTRAINT '.$this->generatePropertyName('email_assets_xref', 'fk', ['email_id']).' FOREIGN KEY (email_id) REFERENCES '.$this->prefix.'emails (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_stats CHANGE retry_count retry_count INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'form_actions CHANGE name name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'form_fields DROP FOREIGN KEY '.$this->findPropertyName('form_fields', 'fk', '5FF69B7D'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'form_fields CHANGE form_id form_id INT NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'form_fields ADD CONSTRAINT '.$this->generatePropertyName('form_fields', 'fk', ['form_id']).' FOREIGN KEY (form_id) REFERENCES '.$this->prefix.'forms (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_ips_xref DROP FOREIGN KEY '.$this->findPropertyName('lead_ips_xref', 'fk', '0655458D'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_ips_xref ADD CONSTRAINT '.$this->generatePropertyName('lead_ips_xref', 'fk', ['lead_id']).' FOREIGN KEY (lead_id) REFERENCES '.$this->prefix.'leads (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_notes DROP FOREIGN KEY '.$this->findPropertyName('lead_notes', 'fk', '1755458D'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('lead_notes', 'idx', '1755458D').' ON '.$this->prefix.'lead_notes');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_notes CHANGE lead_id lead_id INT NOT NULL, CHANGE text text LONGTEXT NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_notes ADD CONSTRAINT '.$this->generatePropertyName('lead_notes', 'fk', ['lead_id']).' FOREIGN KEY (lead_id) REFERENCES '.$this->prefix.'leads (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('lead_notes', 'idx', ['lead_id']).' ON '.$this->prefix.'leads (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_points_change_log DROP FOREIGN KEY '.$this->findPropertyName('lead_points_change_log', 'fk', '6955458D'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_points_change_log CHANGE event_name event_name VARCHAR(255) NOT NULL, CHANGE action_name action_name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_points_change_log ADD CONSTRAINT '.$this->generatePropertyName('lead_points_change_log', 'fk', ['lead_id']).' FOREIGN KEY (lead_id) REFERENCES '.$this->prefix.'leads (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'pages CHANGE meta_description meta_description VARCHAR(255) DEFAULT NULL, CHANGE redirect_url redirect_url VARCHAR(100) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_action_log DROP FOREIGN KEY '.$this->findPropertyName('point_lead_action_log', 'fk', '696C06D6'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_action_log DROP FOREIGN KEY '.$this->findPropertyName('point_lead_action_log', 'fk', 'C028CEA2'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('point_lead_action_log', 'idx', '696C06D6').' ON '.$this->prefix.'point_lead_action_log');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_action_log CHANGE ipaddress_id ip_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_action_log ADD CONSTRAINT '.$this->generatePropertyName('point_lead_action_log', 'fk', ['ip_id']).' FOREIGN KEY (ip_id) REFERENCES '.$this->prefix.'ip_addresses (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_action_log ADD CONSTRAINT '.$this->generatePropertyName('point_lead_action_log', 'fk', ['point_id']).' FOREIGN KEY (point_id) REFERENCES '.$this->prefix.'points (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('point_lead_action_log', 'idx', ['ip_id']).' ON '.$this->prefix.'point_lead_action_log (ip_id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_event_log DROP FOREIGN KEY '.$this->findPropertyName('point_lead_event_log', 'fk', '696C06D6'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_event_log DROP FOREIGN KEY '.$this->findPropertyName('point_lead_event_log', 'fk', '71F7E88B'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('point_lead_event_log', 'idx', '696C06D6').' ON '.$this->prefix.'point_lead_event_log');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_event_log CHANGE ipaddress_id ip_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_event_log ADD CONSTRAINT '.$this->generatePropertyName('point_lead_event_log', 'fk', ['ip_id']).' FOREIGN KEY (ip_id) REFERENCES '.$this->prefix.'ip_addresses (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_lead_event_log ADD CONSTRAINT '.$this->generatePropertyName('point_lead_event_log', 'fk', ['event_id']).' FOREIGN KEY (event_id) REFERENCES '.$this->prefix.'point_trigger_events (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('point_lead_event_log', 'idx', ['ip_id']).' ON '.$this->prefix.'point_lead_event_log (ip_id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'points CHANGE name name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_triggers CHANGE name name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'point_trigger_events CHANGE name name VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'users DROP FOREIGN KEY '.$this->findPropertyName('users', 'fk', 'D60322AC'));
+        $this->addSql('DROP INDEX '.$this->findPropertyName('users', 'idx', 'D60322AC').' ON '.$this->prefix.'users');
+        $this->addSql('ALTER TABLE '.$this->prefix.'users CHANGE role_id role_id INT NOT NULL, CHANGE username username VARCHAR(255) NOT NULL, CHANGE first_name first_name VARCHAR(255) NOT NULL, CHANGE last_name last_name VARCHAR(255) NOT NULL, CHANGE email email VARCHAR(255) NOT NULL, CHANGE position position VARCHAR(255) DEFAULT NULL, CHANGE timezone timezone VARCHAR(255) DEFAULT NULL, CHANGE locale locale VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'users ADD CONSTRAINT '.$this->generatePropertyName('users', 'fk', ['role_id']).' FOREIGN KEY (role_id) REFERENCES '.$this->prefix.'roles (id)');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('users', 'idx', ['role_id']).' ON '.$this->prefix.'roles (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'permissions DROP FOREIGN KEY '.$this->findPropertyName('permissions', 'fk', 'D60322AC'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'permissions CHANGE role_id role_id INT NOT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'permissions ADD CONSTRAINT '.$this->generatePropertyName('permissions', 'fk', ['role_id']).' FOREIGN KEY (role_id) REFERENCES '.$this->prefix.'roles (id) ON DELETE CASCADE');
     }
 }
diff --git a/app/migrations/Version20150801000000.php b/app/migrations/Version20150801000000.php
index 859309c7c73..81e3088bc81 100644
--- a/app/migrations/Version20150801000000.php
+++ b/app/migrations/Version20150801000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Addon to Plugin conversion
+ * Addon to Plugin conversion.
  */
 class Version20150801000000 extends AbstractMauticMigration
 {
@@ -26,7 +27,7 @@ class Version20150801000000 extends AbstractMauticMigration
      */
     public function preUp(Schema $schema)
     {
-        if ($schema->hasTable($this->prefix . 'plugins')) {
+        if ($schema->hasTable($this->prefix.'plugins')) {
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -36,17 +37,17 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'addon_integration_settings DROP FOREIGN KEY ' . $this->findPropertyName('addon_integration_settings', 'fk', 'CC642678'));
+        $this->addSql('ALTER TABLE '.$this->prefix.'addon_integration_settings DROP FOREIGN KEY '.$this->findPropertyName('addon_integration_settings', 'fk', 'CC642678'));
 
-        $this->addSql('RENAME TABLE ' . $this->prefix . 'addons TO ' . $this->prefix . 'plugins');
+        $this->addSql('RENAME TABLE '.$this->prefix.'addons TO '.$this->prefix.'plugins');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'plugins DROP COLUMN is_enabled');
+        $this->addSql('ALTER TABLE '.$this->prefix.'plugins DROP COLUMN is_enabled');
 
-        $this->addSql('RENAME TABLE ' . $this->prefix . 'addon_integration_settings TO ' . $this->prefix . 'plugin_integration_settings');
+        $this->addSql('RENAME TABLE '.$this->prefix.'addon_integration_settings TO '.$this->prefix.'plugin_integration_settings');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'plugin_integration_settings CHANGE addon_id plugin_id int(11) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'plugin_integration_settings CHANGE addon_id plugin_id int(11) DEFAULT NULL');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'plugin_integration_settings ADD CONSTRAINT ' . $this->generatePropertyName('plugin_integration_settings', 'fk', array('plugin_id')) . '  FOREIGN KEY (plugin_id) REFERENCES ' . $this->prefix . 'plugins (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'plugin_integration_settings ADD CONSTRAINT '.$this->generatePropertyName('plugin_integration_settings', 'fk', ['plugin_id']).'  FOREIGN KEY (plugin_id) REFERENCES '.$this->prefix.'plugins (id) ON DELETE CASCADE');
     }
 
     public function postUp(Schema $schema)
diff --git a/app/migrations/Version20150829000000.php b/app/migrations/Version20150829000000.php
index 0b588ffe807..0fd6afa2551 100644
--- a/app/migrations/Version20150829000000.php
+++ b/app/migrations/Version20150829000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20150829000000
+ * Class Version20150829000000.
  */
 class Version20150829000000 extends AbstractMauticMigration
 {
@@ -25,7 +26,7 @@ class Version20150829000000 extends AbstractMauticMigration
      */
     public function preUp(Schema $schema)
     {
-        if ($schema->hasTable($this->prefix . 'lead_tags')) {
+        if ($schema->hasTable($this->prefix.'lead_tags')) {
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -35,53 +36,53 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('CREATE TABLE ' . $this->prefix . 'lead_tags_xref (lead_id INT NOT NULL, tag_id INT NOT NULL, INDEX ' . $this->generatePropertyName('lead_tags_xref', 'idx', array('lead_id')) . ' (lead_id), INDEX ' . $this->generatePropertyName('lead_tags_xref', 'idx', array('tag_id')) . ' (tag_id), PRIMARY KEY(lead_id, tag_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE ' . $this->prefix . 'lead_tags (id INT AUTO_INCREMENT NOT NULL, tag VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_tags_xref ADD CONSTRAINT ' . $this->generatePropertyName('lead_tags_xref', 'fk', array('lead_id')) . ' FOREIGN KEY (lead_id) REFERENCES ' . $this->prefix . 'leads (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_tags_xref ADD CONSTRAINT ' . $this->generatePropertyName('lead_tags_xref', 'fk', array('tag_id')) . ' FOREIGN KEY (tag_id) REFERENCES ' . $this->prefix . 'lead_tags (id)');
+        $this->addSql('CREATE TABLE '.$this->prefix.'lead_tags_xref (lead_id INT NOT NULL, tag_id INT NOT NULL, INDEX '.$this->generatePropertyName('lead_tags_xref', 'idx', ['lead_id']).' (lead_id), INDEX '.$this->generatePropertyName('lead_tags_xref', 'idx', ['tag_id']).' (tag_id), PRIMARY KEY(lead_id, tag_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE '.$this->prefix.'lead_tags (id INT AUTO_INCREMENT NOT NULL, tag VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_tags_xref ADD CONSTRAINT '.$this->generatePropertyName('lead_tags_xref', 'fk', ['lead_id']).' FOREIGN KEY (lead_id) REFERENCES '.$this->prefix.'leads (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_tags_xref ADD CONSTRAINT '.$this->generatePropertyName('lead_tags_xref', 'fk', ['tag_id']).' FOREIGN KEY (tag_id) REFERENCES '.$this->prefix.'lead_tags (id)');
 
-        $this->addSql('CREATE TABLE ' . $this->prefix . 'webhook_events (id INT AUTO_INCREMENT NOT NULL, webhook_id INT NOT NULL, event_type VARCHAR(50) NOT NULL, INDEX ' . $this->generatePropertyName('webhook_events', 'idx', array('webhook_id')) . ' (webhook_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE ' . $this->prefix . 'webhook_logs (id INT AUTO_INCREMENT NOT NULL, webhook_id INT NOT NULL, status_code VARCHAR(50) NOT NULL, date_added DATETIME DEFAULT NULL, INDEX ' . $this->generatePropertyName('webhook_logs', 'idx', array('webhook_id')) . ' (webhook_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE ' . $this->prefix . 'webhooks (id INT AUTO_INCREMENT NOT NULL, category_id INT DEFAULT NULL, is_published TINYINT(1) NOT NULL, date_added DATETIME DEFAULT NULL, created_by INT DEFAULT NULL, created_by_user VARCHAR(255) DEFAULT NULL, date_modified DATETIME DEFAULT NULL, modified_by INT DEFAULT NULL, modified_by_user VARCHAR(255) DEFAULT NULL, checked_out DATETIME DEFAULT NULL, checked_out_by INT DEFAULT NULL, checked_out_by_user VARCHAR(255) DEFAULT NULL, name VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, webhook_url VARCHAR(255) NOT NULL, INDEX ' . $this->generatePropertyName('webhooks', 'idx', array('category_id')) . ' (category_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE ' . $this->prefix . 'webhook_queue (id INT AUTO_INCREMENT NOT NULL, webhook_id INT NOT NULL, event_id INT NOT NULL, date_added DATETIME DEFAULT NULL, payload LONGTEXT NOT NULL, INDEX ' . $this->generatePropertyName('webhooks', 'idx', array('webhook_id')) . ' (webhook_id), INDEX ' . $this->generatePropertyName('webhook_queue', 'idx', array('event_id')) . ' (event_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'webhook_events ADD CONSTRAINT ' . $this->generatePropertyName('webhook_events', 'fk', array('webhook_id')) . ' FOREIGN KEY (webhook_id) REFERENCES ' . $this->prefix . 'webhooks (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'webhook_logs ADD CONSTRAINT ' . $this->generatePropertyName('webhook_logs', 'fk', array('webhook_id')) . ' FOREIGN KEY (webhook_id) REFERENCES ' . $this->prefix . 'webhooks (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'webhooks ADD CONSTRAINT ' . $this->generatePropertyName('webhooks', 'fk', array('category_id')) . ' FOREIGN KEY (category_id) REFERENCES ' . $this->prefix . 'categories (id) ON DELETE SET NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'webhook_queue ADD CONSTRAINT ' . $this->generatePropertyName('webhook_queue', 'fk', array('webhook_id')) . ' FOREIGN KEY (webhook_id) REFERENCES ' . $this->prefix . 'webhooks (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'webhook_queue ADD CONSTRAINT ' . $this->generatePropertyName('webhook_queue', 'fk', array('event_id')) . ' FOREIGN KEY (event_id) REFERENCES ' . $this->prefix . 'webhook_events (id) ON DELETE CASCADE');
+        $this->addSql('CREATE TABLE '.$this->prefix.'webhook_events (id INT AUTO_INCREMENT NOT NULL, webhook_id INT NOT NULL, event_type VARCHAR(50) NOT NULL, INDEX '.$this->generatePropertyName('webhook_events', 'idx', ['webhook_id']).' (webhook_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE '.$this->prefix.'webhook_logs (id INT AUTO_INCREMENT NOT NULL, webhook_id INT NOT NULL, status_code VARCHAR(50) NOT NULL, date_added DATETIME DEFAULT NULL, INDEX '.$this->generatePropertyName('webhook_logs', 'idx', ['webhook_id']).' (webhook_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE '.$this->prefix.'webhooks (id INT AUTO_INCREMENT NOT NULL, category_id INT DEFAULT NULL, is_published TINYINT(1) NOT NULL, date_added DATETIME DEFAULT NULL, created_by INT DEFAULT NULL, created_by_user VARCHAR(255) DEFAULT NULL, date_modified DATETIME DEFAULT NULL, modified_by INT DEFAULT NULL, modified_by_user VARCHAR(255) DEFAULT NULL, checked_out DATETIME DEFAULT NULL, checked_out_by INT DEFAULT NULL, checked_out_by_user VARCHAR(255) DEFAULT NULL, name VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, webhook_url VARCHAR(255) NOT NULL, INDEX '.$this->generatePropertyName('webhooks', 'idx', ['category_id']).' (category_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE '.$this->prefix.'webhook_queue (id INT AUTO_INCREMENT NOT NULL, webhook_id INT NOT NULL, event_id INT NOT NULL, date_added DATETIME DEFAULT NULL, payload LONGTEXT NOT NULL, INDEX '.$this->generatePropertyName('webhooks', 'idx', ['webhook_id']).' (webhook_id), INDEX '.$this->generatePropertyName('webhook_queue', 'idx', ['event_id']).' (event_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE '.$this->prefix.'webhook_events ADD CONSTRAINT '.$this->generatePropertyName('webhook_events', 'fk', ['webhook_id']).' FOREIGN KEY (webhook_id) REFERENCES '.$this->prefix.'webhooks (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'webhook_logs ADD CONSTRAINT '.$this->generatePropertyName('webhook_logs', 'fk', ['webhook_id']).' FOREIGN KEY (webhook_id) REFERENCES '.$this->prefix.'webhooks (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'webhooks ADD CONSTRAINT '.$this->generatePropertyName('webhooks', 'fk', ['category_id']).' FOREIGN KEY (category_id) REFERENCES '.$this->prefix.'categories (id) ON DELETE SET NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'webhook_queue ADD CONSTRAINT '.$this->generatePropertyName('webhook_queue', 'fk', ['webhook_id']).' FOREIGN KEY (webhook_id) REFERENCES '.$this->prefix.'webhooks (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'webhook_queue ADD CONSTRAINT '.$this->generatePropertyName('webhook_queue', 'fk', ['event_id']).' FOREIGN KEY (event_id) REFERENCES '.$this->prefix.'webhook_events (id) ON DELETE CASCADE');
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'leads CHANGE email email VARCHAR(255) DEFAULT NULL, CHANGE country country VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'email_donotemail ADD manual TINYINT(1) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'leads CHANGE email email VARCHAR(255) DEFAULT NULL, CHANGE country country VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_donotemail ADD manual TINYINT(1) DEFAULT NULL');
 
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'oauth1_access_token_search ON ' . $this->prefix . 'oauth1_access_tokens (token)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'consumer_search ON ' . $this->prefix . 'oauth1_consumers (consumer_key)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'oauth1_request_token_search ON ' . $this->prefix . 'oauth1_request_tokens (token)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'client_id_search ON ' . $this->prefix . 'oauth2_clients (random_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'asset_alias_search ON ' . $this->prefix . 'assets (alias)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'download_tracking_search ON ' . $this->prefix . 'asset_downloads (tracking_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'download_source_search ON ' . $this->prefix . 'asset_downloads (source, source_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'campaign_event_type_search ON ' . $this->prefix . 'campaign_events (type, event_type)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'event_upcoming_search ON ' . $this->prefix . 'campaign_lead_event_log (is_scheduled)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'category_alias_search ON ' . $this->prefix . 'categories (alias)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'object_search ON ' . $this->prefix . 'audit_log (object, object_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'timeline_search ON ' . $this->prefix . 'audit_log (bundle, object, action, object_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'ip_search ON ' . $this->prefix . 'ip_addresses (ip_address)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'dnc_search ON ' . $this->prefix . 'email_donotemail (address)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'stat_email_search ON ' . $this->prefix . 'email_stats (email_id, lead_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'stat_email_failed_search ON ' . $this->prefix . 'email_stats (is_failed)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'stat_email_read_search ON ' . $this->prefix . 'email_stats (is_read)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'stat_email_hash_search ON ' . $this->prefix . 'email_stats (tracking_hash)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'stat_email_source_search ON ' . $this->prefix . 'email_stats (source, source_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'form_action_type_search ON ' . $this->prefix . 'form_actions (type)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'form_field_type_search ON ' . $this->prefix . 'form_fields (type)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'form_submission_tracking_search ON ' . $this->prefix . 'form_submissions (tracking_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'lead_field_email_search ON ' . $this->prefix . 'leads (email)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'lead_field_country_search ON ' . $this->prefix . 'leads (country)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'page_hit_tracking_search ON ' . $this->prefix . 'page_hits (tracking_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'page_hit_code_search ON ' . $this->prefix . 'page_hits (code)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'page_hit_source_search ON ' . $this->prefix . 'page_hits (source, source_id)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'page_alias_search ON ' . $this->prefix . 'pages (alias)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'point_type_search ON ' . $this->prefix . 'points (type)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'trigger_type_search ON ' . $this->prefix . 'point_trigger_events (type)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'oauth1_access_token_search ON '.$this->prefix.'oauth1_access_tokens (token)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'consumer_search ON '.$this->prefix.'oauth1_consumers (consumer_key)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'oauth1_request_token_search ON '.$this->prefix.'oauth1_request_tokens (token)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'client_id_search ON '.$this->prefix.'oauth2_clients (random_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'asset_alias_search ON '.$this->prefix.'assets (alias)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'download_tracking_search ON '.$this->prefix.'asset_downloads (tracking_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'download_source_search ON '.$this->prefix.'asset_downloads (source, source_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'campaign_event_type_search ON '.$this->prefix.'campaign_events (type, event_type)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'event_upcoming_search ON '.$this->prefix.'campaign_lead_event_log (is_scheduled)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'category_alias_search ON '.$this->prefix.'categories (alias)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'object_search ON '.$this->prefix.'audit_log (object, object_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'timeline_search ON '.$this->prefix.'audit_log (bundle, object, action, object_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'ip_search ON '.$this->prefix.'ip_addresses (ip_address)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'dnc_search ON '.$this->prefix.'email_donotemail (address)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'stat_email_search ON '.$this->prefix.'email_stats (email_id, lead_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'stat_email_failed_search ON '.$this->prefix.'email_stats (is_failed)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'stat_email_read_search ON '.$this->prefix.'email_stats (is_read)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'stat_email_hash_search ON '.$this->prefix.'email_stats (tracking_hash)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'stat_email_source_search ON '.$this->prefix.'email_stats (source, source_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'form_action_type_search ON '.$this->prefix.'form_actions (type)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'form_field_type_search ON '.$this->prefix.'form_fields (type)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'form_submission_tracking_search ON '.$this->prefix.'form_submissions (tracking_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'lead_field_email_search ON '.$this->prefix.'leads (email)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'lead_field_country_search ON '.$this->prefix.'leads (country)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'page_hit_tracking_search ON '.$this->prefix.'page_hits (tracking_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'page_hit_code_search ON '.$this->prefix.'page_hits (code)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'page_hit_source_search ON '.$this->prefix.'page_hits (source, source_id)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'page_alias_search ON '.$this->prefix.'pages (alias)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'point_type_search ON '.$this->prefix.'points (type)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'trigger_type_search ON '.$this->prefix.'point_trigger_events (type)');
     }
 }
diff --git a/app/migrations/Version20150901000000.php b/app/migrations/Version20150901000000.php
index 8a44271d152..f150bd827f8 100644
--- a/app/migrations/Version20150901000000.php
+++ b/app/migrations/Version20150901000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,8 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20150901000000
+ * Class Version20150901000000.
  */
-
 class Version20150901000000 extends AbstractMauticMigration
 {
     /**
@@ -38,6 +38,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'lead_tag_search ON ' . $this->prefix . 'lead_tags (tag)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'lead_tag_search ON '.$this->prefix.'lead_tags (tag)');
     }
 }
diff --git a/app/migrations/Version20151022000000.php b/app/migrations/Version20151022000000.php
index 7172d853a23..6295ffff03d 100644
--- a/app/migrations/Version20151022000000.php
+++ b/app/migrations/Version20151022000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,8 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20151022000000
+ * Class Version20151022000000.
  */
-
 class Version20151022000000 extends AbstractMauticMigration
 {
     /**
@@ -38,6 +38,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix.'page_hits ADD query LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\'');
+        $this->addSql('ALTER TABLE '.$this->prefix.'page_hits ADD query LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\'');
     }
 }
diff --git a/app/migrations/Version20151120000000.php b/app/migrations/Version20151120000000.php
index 542c0fba4dc..e544228055e 100644
--- a/app/migrations/Version20151120000000.php
+++ b/app/migrations/Version20151120000000.php
@@ -1,22 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\Migrations;
 
-use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20151120000000
+ * Class Version20151120000000.
  */
-
 class Version20151120000000 extends AbstractMauticMigration
 {
     /**
@@ -24,7 +23,6 @@ class Version20151120000000 extends AbstractMauticMigration
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix.'page_hits CHANGE user_agent user_agent LONGTEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'page_hits CHANGE user_agent user_agent LONGTEXT DEFAULT NULL');
     }
 }
-
diff --git a/app/migrations/Version20151207000000.php b/app/migrations/Version20151207000000.php
index ee42b024d7c..c1d828dc291 100644
--- a/app/migrations/Version20151207000000.php
+++ b/app/migrations/Version20151207000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,9 +16,8 @@
 use OpenCloud\Queues\Resource\Message;
 
 /**
- * Class Version20151207000000
+ * Class Version20151207000000.
  */
-
 class Version20151207000000 extends AbstractMauticMigration
 {
     /**
@@ -29,7 +29,6 @@ class Version20151207000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->hasTable($this->prefix.'email_copies')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -41,15 +40,15 @@ public function up(Schema $schema)
     {
         $this->addSql('CREATE TABLE '.$this->prefix.'email_copies (id VARCHAR(32) NOT NULL, date_created DATETIME NOT NULL, body LONGTEXT DEFAULT NULL, subject LONGTEXT DEFAULT NULL, PRIMARY KEY(id))  DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
         $this->addSql('ALTER TABLE '.$this->prefix.'email_stats ADD copy_id VARCHAR(32) DEFAULT NULL');
-        $this->addSql('ALTER TABLE '.$this->prefix.'email_stats ADD CONSTRAINT '.$this->generatePropertyName('email_stats', 'fk', array('copy_id')).' FOREIGN KEY (copy_id) REFERENCES '.$this->prefix.'email_copies (id) ON DELETE SET NULL');
-        $this->addSql('CREATE INDEX '.$this->generatePropertyName('email_stats', 'idx', array('copy_id')).' ON '.$this->prefix.'email_stats (copy_id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_stats ADD CONSTRAINT '.$this->generatePropertyName('email_stats', 'fk', ['copy_id']).' FOREIGN KEY (copy_id) REFERENCES '.$this->prefix.'email_copies (id) ON DELETE SET NULL');
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('email_stats', 'idx', ['copy_id']).' ON '.$this->prefix.'email_stats (copy_id)');
 
         $this->addSql('ALTER TABLE '.$this->prefix.'email_stats DROP FOREIGN KEY '.$this->findPropertyName('email_stats', 'fk', 'A832C1C9'));
-        $this->addSql('ALTER TABLE '.$this->prefix.'email_stats ADD CONSTRAINT '.$this->generatePropertyName('email_stats', 'fk', array('email_id')).' FOREIGN KEY (email_id) REFERENCES '.$this->prefix.'emails (id) ON DELETE SET NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'email_stats ADD CONSTRAINT '.$this->generatePropertyName('email_stats', 'fk', ['email_id']).' FOREIGN KEY (email_id) REFERENCES '.$this->prefix.'emails (id) ON DELETE SET NULL');
     }
 
     /**
-     * Inject notice into session regarding Telize
+     * Inject notice into session regarding Telize.
      *
      * @param Schema $schema
      */
@@ -59,8 +58,8 @@ public function postUp(Schema $schema)
             $session = $this->container->get('session');
             $router  = $this->container->get('router');
 
-            $configUrl = $router->generate('mautic_config_action', array('objectAction' => 'edit'));
-            $message = <<<MESSAGE
+            $configUrl = $router->generate('mautic_config_action', ['objectAction' => 'edit']);
+            $message   = <<<MESSAGE
 Recently Telize discontinued their free IP lookup service; continued use of this service now requires a subscription and an API key. Alternatively you can change the provider through the <a href="$configUrl" data-toggle="ajax">Configuration</a>: System Settings. ​<strong>MaxMind GeoIP2 City Download</strong>​ is the recommended alternative. This service uses a free IP database you can download within Mautic.
 MESSAGE;
 
diff --git a/app/migrations/Version20160114000000.php b/app/migrations/Version20160114000000.php
index ae0b3a01833..560a669b97e 100644
--- a/app/migrations/Version20160114000000.php
+++ b/app/migrations/Version20160114000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,8 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160114000000
+ * Class Version20160114000000.
  */
-
 class Version20160114000000 extends AbstractMauticMigration
 {
     /**
@@ -28,9 +28,8 @@ class Version20160114000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         // Test to see if this migration has already been applied
-        $formTable = $schema->getTable($this->prefix . 'form_fields');
+        $formTable = $schema->getTable($this->prefix.'form_fields');
         if ($formTable->hasColumn('is_auto_fill')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -40,6 +39,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix.'form_fields ADD COLUMN is_auto_fill TINYINT(1) DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'form_fields ADD COLUMN is_auto_fill TINYINT(1) DEFAULT NULL');
     }
 }
diff --git a/app/migrations/Version20160225000000.php b/app/migrations/Version20160225000000.php
index f1feb8030a7..244670cac2e 100644
--- a/app/migrations/Version20160225000000.php
+++ b/app/migrations/Version20160225000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,8 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160225000000
+ * Class Version20160225000000.
  */
-
 class Version20160225000000 extends AbstractMauticMigration
 {
     /**
@@ -38,6 +38,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix.'users ADD signature LONGTEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'users ADD signature LONGTEXT DEFAULT NULL');
     }
 }
diff --git a/app/migrations/Version20160405000000.php b/app/migrations/Version20160405000000.php
index 16c8bb657a4..b0c66e31fa8 100644
--- a/app/migrations/Version20160405000000.php
+++ b/app/migrations/Version20160405000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,8 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160405000000
+ * Class Version20160405000000.
  */
-
 class Version20160405000000 extends AbstractMauticMigration
 {
     /**
diff --git a/app/migrations/Version20160414000000.php b/app/migrations/Version20160414000000.php
index 9014b9ca3ee..aebdf93b9c0 100644
--- a/app/migrations/Version20160414000000.php
+++ b/app/migrations/Version20160414000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Web Notification Channel Migration
+ * Web Notification Channel Migration.
  */
 class Version20160414000000 extends AbstractMauticMigration
 {
@@ -32,48 +33,48 @@ public function preUp(Schema $schema)
             throw new SkipMigrationException('Schema includes this migration');
         }
 
-        $this->keys = array(
-            'push_notifications'      => array(
-                'idx' => array(
-                    'category' => $this->generatePropertyName('push_notifications', 'idx', array('category_id'))
-                ),
-                'fk'  => array(
-                    'category' => $this->generatePropertyName('push_notifications', 'fk', array('category_id'))
-                )
-            ),
-            'push_notification_stats' => array(
-                'idx' => array(
-                    'notification' => $this->generatePropertyName('push_notification_stats', 'idx', array('notification_id')),
-                    'lead'         => $this->generatePropertyName('push_notification_stats', 'idx', array('lead_id')),
-                    'list'         => $this->generatePropertyName('push_notification_stats', 'idx', array('list_id')),
-                    'ip'           => $this->generatePropertyName('push_notification_stats', 'idx', array('ip_id'))
-                ),
-                'fk'  => array(
-                    'notification' => $this->generatePropertyName('push_notification_stats', 'fk', array('notification_id')),
-                    'lead'         => $this->generatePropertyName('push_notification_stats', 'fk', array('lead_id')),
-                    'list'         => $this->generatePropertyName('push_notification_stats', 'fk', array('list_id')),
-                    'ip'           => $this->generatePropertyName('push_notification_stats', 'fk', array('ip_id'))
-                )
-            ),
-            'push_ids' => array(
-                'idx' =>  array(
-                    'lead' => $this->generatePropertyName('push_ids', 'idx', array('lead_id'))
-                ),
-                'fk' => array(
-                    'lead' => $this->generatePropertyName('push_ids', 'fk', array('lead_id'))
-                )
-            ),
-            'push_notification_list_xref'   => array(
-                'idx' => array(
-                    'notification' => $this->generatePropertyName('push_notification_list_xref', 'idx', array('notification_id')),
-                    'leadlist'     => $this->generatePropertyName('push_notification_list_xref', 'idx', array('leadlist_id'))
-                ),
-                'fk'  => array(
-                    'notification' => $this->generatePropertyName('push_notification_list_xref', 'fk', array('notification_id')),
-                    'leadlist'     => $this->generatePropertyName('push_notification_list_xref', 'fk', array('leadlist_id'))
-                )
-            )
-        );
+        $this->keys = [
+            'push_notifications' => [
+                'idx' => [
+                    'category' => $this->generatePropertyName('push_notifications', 'idx', ['category_id']),
+                ],
+                'fk' => [
+                    'category' => $this->generatePropertyName('push_notifications', 'fk', ['category_id']),
+                ],
+            ],
+            'push_notification_stats' => [
+                'idx' => [
+                    'notification' => $this->generatePropertyName('push_notification_stats', 'idx', ['notification_id']),
+                    'lead'         => $this->generatePropertyName('push_notification_stats', 'idx', ['lead_id']),
+                    'list'         => $this->generatePropertyName('push_notification_stats', 'idx', ['list_id']),
+                    'ip'           => $this->generatePropertyName('push_notification_stats', 'idx', ['ip_id']),
+                ],
+                'fk' => [
+                    'notification' => $this->generatePropertyName('push_notification_stats', 'fk', ['notification_id']),
+                    'lead'         => $this->generatePropertyName('push_notification_stats', 'fk', ['lead_id']),
+                    'list'         => $this->generatePropertyName('push_notification_stats', 'fk', ['list_id']),
+                    'ip'           => $this->generatePropertyName('push_notification_stats', 'fk', ['ip_id']),
+                ],
+            ],
+            'push_ids' => [
+                'idx' => [
+                    'lead' => $this->generatePropertyName('push_ids', 'idx', ['lead_id']),
+                ],
+                'fk' => [
+                    'lead' => $this->generatePropertyName('push_ids', 'fk', ['lead_id']),
+                ],
+            ],
+            'push_notification_list_xref' => [
+                'idx' => [
+                    'notification' => $this->generatePropertyName('push_notification_list_xref', 'idx', ['notification_id']),
+                    'leadlist'     => $this->generatePropertyName('push_notification_list_xref', 'idx', ['leadlist_id']),
+                ],
+                'fk' => [
+                    'notification' => $this->generatePropertyName('push_notification_list_xref', 'fk', ['notification_id']),
+                    'leadlist'     => $this->generatePropertyName('push_notification_list_xref', 'fk', ['leadlist_id']),
+                ],
+            ],
+        ];
     }
 
     /**
@@ -174,4 +175,4 @@ public function up(Schema $schema)
         $this->addSql("ALTER TABLE {$this->prefix}push_notification_stats ADD CONSTRAINT {$this->keys['push_notification_stats']['fk']['list']} FOREIGN KEY (list_id) REFERENCES {$this->prefix}lead_lists (id) ON DELETE SET NULL");
         $this->addSql("ALTER TABLE {$this->prefix}push_notification_stats ADD CONSTRAINT {$this->keys['push_notification_stats']['fk']['ip']} FOREIGN KEY (ip_id) REFERENCES {$this->prefix}ip_addresses (id)");
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160420000000.php b/app/migrations/Version20160420000000.php
index dbdafb3cb42..c861d25ff76 100644
--- a/app/migrations/Version20160420000000.php
+++ b/app/migrations/Version20160420000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * SMS Channel Migration
+ * SMS Channel Migration.
  */
 class Version20160420000000 extends AbstractMauticMigration
 {
@@ -29,44 +30,43 @@ class Version20160420000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->hasTable($this->prefix.'sms_messages')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
 
-        $this->keys = array(
-            'sms_messages'          => array(
-                'idx' => array(
-                    'category' => $this->generatePropertyName('sms_messages', 'idx', array('category_id'))
-                ),
-                'fk'  => array(
-                    'category' => $this->generatePropertyName('sms_messages', 'fk', array('category_id'))
-                )
-            ),
-            'sms_message_stats'     => array(
-                'idx' => array(
-                    'sms'  => $this->generatePropertyName('sms_message_stats', 'idx', array('sms_id')),
-                    'lead' => $this->generatePropertyName('sms_message_stats', 'idx', array('lead_id')),
-                    'list' => $this->generatePropertyName('sms_message_stats', 'idx', array('list_id')),
-                    'ip'   => $this->generatePropertyName('sms_message_stats', 'idx', array('ip_id'))
-                ),
-                'fk'  => array(
-                    'sms'  => $this->generatePropertyName('sms_message_stats', 'fk', array('sms_id')),
-                    'lead' => $this->generatePropertyName('sms_message_stats', 'fk', array('lead_id')),
-                    'list' => $this->generatePropertyName('sms_message_stats', 'fk', array('list_id')),
-                    'ip'   => $this->generatePropertyName('sms_message_stats', 'fk', array('ip_id'))
-                )
-            ),
-            'sms_message_list_xref' => array(
-                'idx' => array(
-                    'sms'      => $this->generatePropertyName('sms_message_list_xref', 'idx', array('sms_id')),
-                    'leadlist' => $this->generatePropertyName('sms_message_list_xref', 'idx', array('leadlist_id'))
-                ),
-                'fk'  => array(
-                    'sms'      => $this->generatePropertyName('sms_message_list_xref', 'fk', array('sms_id')),
-                    'leadlist' => $this->generatePropertyName('sms_message_list_xref', 'fk', array('leadlist_id'))
-                )
-            )
-        );
+        $this->keys = [
+            'sms_messages' => [
+                'idx' => [
+                    'category' => $this->generatePropertyName('sms_messages', 'idx', ['category_id']),
+                ],
+                'fk' => [
+                    'category' => $this->generatePropertyName('sms_messages', 'fk', ['category_id']),
+                ],
+            ],
+            'sms_message_stats' => [
+                'idx' => [
+                    'sms'  => $this->generatePropertyName('sms_message_stats', 'idx', ['sms_id']),
+                    'lead' => $this->generatePropertyName('sms_message_stats', 'idx', ['lead_id']),
+                    'list' => $this->generatePropertyName('sms_message_stats', 'idx', ['list_id']),
+                    'ip'   => $this->generatePropertyName('sms_message_stats', 'idx', ['ip_id']),
+                ],
+                'fk' => [
+                    'sms'  => $this->generatePropertyName('sms_message_stats', 'fk', ['sms_id']),
+                    'lead' => $this->generatePropertyName('sms_message_stats', 'fk', ['lead_id']),
+                    'list' => $this->generatePropertyName('sms_message_stats', 'fk', ['list_id']),
+                    'ip'   => $this->generatePropertyName('sms_message_stats', 'fk', ['ip_id']),
+                ],
+            ],
+            'sms_message_list_xref' => [
+                'idx' => [
+                    'sms'      => $this->generatePropertyName('sms_message_list_xref', 'idx', ['sms_id']),
+                    'leadlist' => $this->generatePropertyName('sms_message_list_xref', 'idx', ['leadlist_id']),
+                ],
+                'fk' => [
+                    'sms'      => $this->generatePropertyName('sms_message_list_xref', 'fk', ['sms_id']),
+                    'leadlist' => $this->generatePropertyName('sms_message_list_xref', 'fk', ['leadlist_id']),
+                ],
+            ],
+        ];
     }
 
     /**
@@ -145,4 +145,4 @@ public function up(Schema $schema)
 SQL;
         $this->addSql($listXrefSql);
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160426000000.php b/app/migrations/Version20160426000000.php
index bc467250d5d..ae16e2fe318 100644
--- a/app/migrations/Version20160426000000.php
+++ b/app/migrations/Version20160426000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 use Mautic\LeadBundle\Entity\DoNotContact;
 
 /**
- * Universal DNC Migration
+ * Universal DNC Migration.
  */
 class Version20160426000000 extends AbstractMauticMigration
 {
@@ -34,8 +35,8 @@ public function preUp(Schema $schema)
             throw new SkipMigrationException('Schema includes this migration');
         }
 
-        $this->leadIdIdx = $this->generatePropertyName($this->prefix . 'lead_donotcontact', 'idx', array('lead_id'));
-        $this->leadIdFk  = $this->generatePropertyName($this->prefix . 'lead_donotcontact', 'fk', array('lead_id'));
+        $this->leadIdIdx = $this->generatePropertyName($this->prefix.'lead_donotcontact', 'idx', ['lead_id']);
+        $this->leadIdFk  = $this->generatePropertyName($this->prefix.'lead_donotcontact', 'fk', ['lead_id']);
     }
 
     /**
@@ -43,7 +44,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-
         $sql = <<<SQL
 CREATE TABLE `{$this->prefix}lead_donotcontact` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -64,14 +64,14 @@ public function up(Schema $schema)
     }
 
     /**
-     * Migrate existing email_donotemail entries to the new lead_donotcontact format
+     * Migrate existing email_donotemail entries to the new lead_donotcontact format.
      *
      * @param Schema $schema
      */
     public function postUp(Schema $schema)
     {
         $logger = $this->factory->getLogger();
-        $qb = $this->connection->createQueryBuilder();
+        $qb     = $this->connection->createQueryBuilder();
 
         $qb->select('dne.email_id, dne.lead_id, dne.date_added, dne.unsubscribed, dne.bounced, dne.manual, dne.comments')
             ->from($this->prefix.'email_donotemail', 'dne')
@@ -88,19 +88,19 @@ public function postUp(Schema $schema)
                     continue;
                 }
 
-                $insert = array(
+                $insert = [
                     'lead_id'    => $row['lead_id'],
                     'channel'    => 'email',
                     'channel_id' => $row['email_id'],
                     'date_added' => $row['date_added'],
-                    'comments'   => $row['comments']
-                );
+                    'comments'   => $row['comments'],
+                ];
 
                 switch (true) {
-                    case (!empty($row['unsubscribed'])):
+                    case !empty($row['unsubscribed']):
                         $insert['reason'] = DoNotContact::UNSUBSCRIBED;
                         break;
-                    case (!empty($row['bounced'])):
+                    case !empty($row['bounced']):
                         $insert['reason'] = DoNotContact::BOUNCED;
                         break;
                     default:
@@ -118,7 +118,7 @@ public function postUp(Schema $schema)
             } catch (\Exception $e) {
                 $this->connection->rollBack();
 
-                $logger->addError($e->getMessage(), array('exception' => $e));
+                $logger->addError($e->getMessage(), ['exception' => $e]);
             }
 
             // Increase the start
diff --git a/app/migrations/Version20160429000000.php b/app/migrations/Version20160429000000.php
index 8a3d19a454d..dadbd30c8a7 100644
--- a/app/migrations/Version20160429000000.php
+++ b/app/migrations/Version20160429000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,10 +13,9 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
-use Mautic\LeadBundle\Entity\DoNotContact;
 
 /**
- * Trackables
+ * Trackables.
  */
 class Version20160429000000 extends AbstractMauticMigration
 {
@@ -31,12 +31,11 @@ class Version20160429000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->hasTable($this->prefix.'channel_url_trackables')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
 
-        $this->redirectIdx = $this->generatePropertyName($this->prefix . 'channel_url_trackables', 'idx', array('redirect_id'));
-        $this->redirectFk  = $this->generatePropertyName($this->prefix . 'channel_url_trackables', 'fk', array('redirect_id'));
+        $this->redirectIdx = $this->generatePropertyName($this->prefix.'channel_url_trackables', 'idx', ['redirect_id']);
+        $this->redirectFk  = $this->generatePropertyName($this->prefix.'channel_url_trackables', 'fk', ['redirect_id']);
     }
 
     /**
@@ -44,7 +43,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-
         $sql = <<<SQL
 CREATE TABLE {$this->prefix}channel_url_trackables (
   redirect_id INT NOT NULL, 
@@ -63,14 +61,14 @@ public function up(Schema $schema)
     }
 
     /**
-     * Migrate email redirects to the trackable table
+     * Migrate email redirects to the trackable table.
      *
      * @param Schema $schema
      */
     public function postUp(Schema $schema)
     {
         $logger = $this->factory->getLogger();
-        $qb = $this->connection->createQueryBuilder();
+        $qb     = $this->connection->createQueryBuilder();
 
         $qb->select('r.id, r.email_id, r.hits, r.unique_hits')
             ->from($this->prefix.'page_redirects', 'r')
@@ -85,13 +83,13 @@ public function postUp(Schema $schema)
             $this->connection->beginTransaction();
 
             foreach ($results as $row) {
-                $insert = array(
+                $insert = [
                     'redirect_id' => $row['id'],
                     'channel'     => 'email',
                     'channel_id'  => $row['email_id'],
                     'hits'        => $row['hits'],
-                    'unique_hits' => $row['unique_hits']
-                );
+                    'unique_hits' => $row['unique_hits'],
+                ];
 
                 $this->connection->insert($this->prefix.'channel_url_trackables', $insert);
 
@@ -103,7 +101,7 @@ public function postUp(Schema $schema)
             } catch (\Exception $e) {
                 $this->connection->rollBack();
 
-                $logger->addError($e->getMessage(), array('exception' => $e));
+                $logger->addError($e->getMessage(), ['exception' => $e]);
             }
 
             // Increase the start
diff --git a/app/migrations/Version20160504000000.php b/app/migrations/Version20160504000000.php
index adade671285..d4d0c0b280e 100644
--- a/app/migrations/Version20160504000000.php
+++ b/app/migrations/Version20160504000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,10 +13,9 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
-use Mautic\LeadBundle\Entity\UtmTag;
 
 /**
- * UTM tags Migration
+ * UTM tags Migration.
  */
 class Version20160504000000 extends AbstractMauticMigration
 {
@@ -34,8 +34,8 @@ public function preUp(Schema $schema)
             throw new SkipMigrationException('Schema includes this migration');
         }
 
-        $this->leadIdIdx = $this->generatePropertyName('lead_utmtags', 'idx', array('lead_id'));
-        $this->leadIdFk  = $this->generatePropertyName('lead_utmtags', 'fk', array('lead_id'));
+        $this->leadIdIdx = $this->generatePropertyName('lead_utmtags', 'idx', ['lead_id']);
+        $this->leadIdFk  = $this->generatePropertyName('lead_utmtags', 'fk', ['lead_id']);
     }
 
     /**
@@ -66,5 +66,4 @@ public function up(Schema $schema)
 
         $this->addSql($sql);
     }
-
 }
diff --git a/app/migrations/Version20160506000000.php b/app/migrations/Version20160506000000.php
index f8766fbd17c..a1fdcfe3e64 100644
--- a/app/migrations/Version20160506000000.php
+++ b/app/migrations/Version20160506000000.php
@@ -1,17 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\Migrations;
+
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160506000000
+ * Class Version20160506000000.
  */
 class Version20160506000000 extends AbstractMauticMigration
 {
@@ -33,14 +37,14 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'asset_date_download ON ' . $this->prefix . 'asset_downloads (date_download)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'campaign_leads_date_added ON ' . $this->prefix . 'campaign_leads (date_added)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'campaign_date_triggered ON ' . $this->prefix . 'campaign_lead_event_log (date_triggered)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'email_date_sent ON ' . $this->prefix . 'email_stats (date_sent)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'email_date_read ON ' . $this->prefix . 'email_stats (date_read)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'form_date_submitted ON ' . $this->prefix . 'form_submissions (date_submitted)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'lead_date_added ON ' . $this->prefix . 'leads (date_added)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'page_date_hit ON ' . $this->prefix . 'page_hits (date_hit)');
-        $this->addSql('CREATE INDEX ' . $this->prefix . 'point_date_added ON ' . $this->prefix . 'lead_points_change_log (date_added)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'asset_date_download ON '.$this->prefix.'asset_downloads (date_download)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'campaign_leads_date_added ON '.$this->prefix.'campaign_leads (date_added)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'campaign_date_triggered ON '.$this->prefix.'campaign_lead_event_log (date_triggered)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'email_date_sent ON '.$this->prefix.'email_stats (date_sent)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'email_date_read ON '.$this->prefix.'email_stats (date_read)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'form_date_submitted ON '.$this->prefix.'form_submissions (date_submitted)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'lead_date_added ON '.$this->prefix.'leads (date_added)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'page_date_hit ON '.$this->prefix.'page_hits (date_hit)');
+        $this->addSql('CREATE INDEX '.$this->prefix.'point_date_added ON '.$this->prefix.'lead_points_change_log (date_added)');
     }
 }
diff --git a/app/migrations/Version20160520000000.php b/app/migrations/Version20160520000000.php
index 5e39a18cbb2..b279da47d6a 100644
--- a/app/migrations/Version20160520000000.php
+++ b/app/migrations/Version20160520000000.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\Migrations;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * MauticSocialBundle schema
+ * MauticSocialBundle schema.
  *
  * Class Version20160520000000
  */
@@ -32,39 +33,37 @@ public function preUp(Schema $schema)
     {
         // Test to see if this migration has already been applied
         if ($schema->hasTable($this->prefix.'monitoring_leads')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
 
-
-        $this->keys = array(
-            'monitoring_leads'   => array(
-                'idx' => array(
-                    'monitor' => $this->generatePropertyName('monitoring_leads', 'idx', array('monitor_id')),
-                    'lead'    => $this->generatePropertyName('monitoring_leads', 'idx', array('lead_id')),
-                ),
-                'fk'  => array(
-                    'monitor' => $this->generatePropertyName('monitoring_leads', 'fk', array('monitor_id')),
-                    'lead'    => $this->generatePropertyName('monitoring_leads', 'fk', array('lead_id')),
-                )
-            ),
-            'monitoring'         => array(
-                'idx' => array(
-                    'category' => $this->generatePropertyName('monitoring', 'idx', array('category_id'))
-                ),
-                'fk'  => array(
-                    'category' => $this->generatePropertyName('monitoring', 'fk', array('category_id')),
-                )
-            ),
-            'monitor_post_count' => array(
-                'idx' => array(
-                    'monitor' => $this->generatePropertyName('monitor_post_count', 'idx', array('monitor_id'))
-                ),
-                'fk'  => array(
-                    'monitor' => $this->generatePropertyName('monitor_post_count', 'fk', array('monitor_id'))
-                )
-            )
-        );
+        $this->keys = [
+            'monitoring_leads' => [
+                'idx' => [
+                    'monitor' => $this->generatePropertyName('monitoring_leads', 'idx', ['monitor_id']),
+                    'lead'    => $this->generatePropertyName('monitoring_leads', 'idx', ['lead_id']),
+                ],
+                'fk' => [
+                    'monitor' => $this->generatePropertyName('monitoring_leads', 'fk', ['monitor_id']),
+                    'lead'    => $this->generatePropertyName('monitoring_leads', 'fk', ['lead_id']),
+                ],
+            ],
+            'monitoring' => [
+                'idx' => [
+                    'category' => $this->generatePropertyName('monitoring', 'idx', ['category_id']),
+                ],
+                'fk' => [
+                    'category' => $this->generatePropertyName('monitoring', 'fk', ['category_id']),
+                ],
+            ],
+            'monitor_post_count' => [
+                'idx' => [
+                    'monitor' => $this->generatePropertyName('monitor_post_count', 'idx', ['monitor_id']),
+                ],
+                'fk' => [
+                    'monitor' => $this->generatePropertyName('monitor_post_count', 'fk', ['monitor_id']),
+                ],
+            ],
+        ];
     }
 
     /**
@@ -84,7 +83,6 @@ public function up(Schema $schema)
 SQL;
         $this->addSql($sql);
 
-
         $sql = <<<SQL
 CREATE TABLE {$this->prefix}monitoring (
       id INT AUTO_INCREMENT NOT NULL, 
@@ -131,4 +129,4 @@ public function up(Schema $schema)
         $this->addSql("ALTER TABLE {$this->prefix}monitoring ADD CONSTRAINT {$this->keys['monitoring']['fk']['category']} FOREIGN KEY (category_id) REFERENCES {$this->prefix}categories (id) ON DELETE SET NULL");
         $this->addSql("ALTER TABLE {$this->prefix}monitor_post_count ADD CONSTRAINT {$this->keys['monitor_post_count']['fk']['monitor']} FOREIGN KEY (monitor_id) REFERENCES {$this->prefix}monitoring (id) ON DELETE CASCADE");
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160523000000.php b/app/migrations/Version20160523000000.php
index 561afa26a1c..768c7edb21c 100644
--- a/app/migrations/Version20160523000000.php
+++ b/app/migrations/Version20160523000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,14 +13,12 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
-use Mautic\LeadBundle\Entity\DoNotContact;
 
 /**
- * Universal DNC Migration
+ * Universal DNC Migration.
  */
 class Version20160523000000 extends AbstractMauticMigration
 {
-
     /**
      * @param Schema $schema
      *
@@ -38,7 +37,6 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-
         $sql = <<<SQL
 CREATE TABLE `{$this->prefix}stages` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -72,12 +70,12 @@ public function up(Schema $schema)
   `action_name` varchar(255) NOT NULL,
   `date_added` datetime NOT NULL  COMMENT '(DC2Type:datetime)',
   PRIMARY KEY (`id`),
-  INDEX {$this->generatePropertyName('lead_stages_change_log', 'idx', array('lead_id'))} (lead_id)
+  INDEX {$this->generatePropertyName('lead_stages_change_log', 'idx', ['lead_id'])} (lead_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SQL;
 
         $this->addSql($sql);
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'lead_stages_change_log ADD CONSTRAINT ' . $this->generatePropertyName('lead_stages_change_log', 'fk', array('lead_id')) . ' FOREIGN KEY (lead_id) REFERENCES ' . $this->prefix . 'leads (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'lead_stages_change_log ADD CONSTRAINT '.$this->generatePropertyName('lead_stages_change_log', 'fk', ['lead_id']).' FOREIGN KEY (lead_id) REFERENCES '.$this->prefix.'leads (id) ON DELETE CASCADE');
 
         $sql = <<<SQL
 CREATE TABLE `{$this->prefix}stage_lead_action_log` (
@@ -86,16 +84,16 @@ public function up(Schema $schema)
   `ip_id` int(11) DEFAULT NULL,
   `date_fired` datetime NOT NULL,
   PRIMARY KEY (`stage_id`, `lead_id`),
-  INDEX {$this->generatePropertyName('stage_lead_action_log', 'idx', array('lead_id'))} (lead_id),
-  INDEX {$this->generatePropertyName('stage_lead_action_log', 'idx', array('stage_id'))} (stage_id),
-  INDEX {$this->generatePropertyName('stage_lead_action_log', 'idx', array('ip_id'))} (ip_id)
+  INDEX {$this->generatePropertyName('stage_lead_action_log', 'idx', ['lead_id'])} (lead_id),
+  INDEX {$this->generatePropertyName('stage_lead_action_log', 'idx', ['stage_id'])} (stage_id),
+  INDEX {$this->generatePropertyName('stage_lead_action_log', 'idx', ['ip_id'])} (ip_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 SQL;
         $this->addSql($sql);
 
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'stage_lead_action_log ADD CONSTRAINT ' . $this->generatePropertyName('stage_lead_action_log', 'fk', array('lead_id')) . ' FOREIGN KEY (lead_id) REFERENCES ' . $this->prefix . 'leads (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'stage_lead_action_log ADD CONSTRAINT ' . $this->generatePropertyName('stage_lead_action_log', 'fk', array('stage_id')) . ' FOREIGN KEY (stage_id) REFERENCES ' . $this->prefix . 'stages (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'stage_lead_action_log ADD CONSTRAINT ' . $this->generatePropertyName('stage_lead_action_log', 'fk', array('ip_id')) . ' FOREIGN KEY (ip_id) REFERENCES ' . $this->prefix . 'ip_addresses (id)');
-        $this->addSql('ALTER TABLE ' . $this->prefix . 'leads ADD COLUMN stage_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'stage_lead_action_log ADD CONSTRAINT '.$this->generatePropertyName('stage_lead_action_log', 'fk', ['lead_id']).' FOREIGN KEY (lead_id) REFERENCES '.$this->prefix.'leads (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'stage_lead_action_log ADD CONSTRAINT '.$this->generatePropertyName('stage_lead_action_log', 'fk', ['stage_id']).' FOREIGN KEY (stage_id) REFERENCES '.$this->prefix.'stages (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'stage_lead_action_log ADD CONSTRAINT '.$this->generatePropertyName('stage_lead_action_log', 'fk', ['ip_id']).' FOREIGN KEY (ip_id) REFERENCES '.$this->prefix.'ip_addresses (id)');
+        $this->addSql('ALTER TABLE '.$this->prefix.'leads ADD COLUMN stage_id INT DEFAULT NULL');
     }
 }
diff --git a/app/migrations/Version20160606000000.php b/app/migrations/Version20160606000000.php
index 0b19aa32ebf..b28edcfd3bc 100644
--- a/app/migrations/Version20160606000000.php
+++ b/app/migrations/Version20160606000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160606000000
+ * Class Version20160606000000.
  */
 class Version20160606000000 extends AbstractMauticMigration
 {
@@ -28,7 +29,6 @@ public function preUp(Schema $schema)
     {
         $table = $schema->getTable(MAUTIC_TABLE_PREFIX.'leads');
         if ($table->hasColumn('attribution')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
diff --git a/app/migrations/Version20160615000000.php b/app/migrations/Version20160615000000.php
index 53bec031c79..f69cad1033a 100644
--- a/app/migrations/Version20160615000000.php
+++ b/app/migrations/Version20160615000000.php
@@ -1,18 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160615000000
+ * Class Version20160615000000.
  */
 class Version20160615000000 extends AbstractMauticMigration
 {
diff --git a/app/migrations/Version20160617000318.php b/app/migrations/Version20160617000318.php
index f22f756e0b2..8baedf9d33f 100644
--- a/app/migrations/Version20160617000318.php
+++ b/app/migrations/Version20160617000318.php
@@ -85,6 +85,5 @@ public function up(Schema $schema)
         $this->addSql($dwcSql2);
         $this->addSql("ALTER TABLE {$this->prefix}dynamic_content_lead_data ADD CONSTRAINT {$dwc2LeadFK} FOREIGN KEY (lead_id) REFERENCES {$this->prefix}leads (id) ON DELETE CASCADE;");
         $this->addSql("ALTER TABLE {$this->prefix}dynamic_content_lead_data ADD CONSTRAINT {$dwc2DwcFK} FOREIGN KEY (dynamic_content_id) REFERENCES {$this->prefix}dynamic_content (id) ON DELETE CASCADE;");
-
     }
 }
diff --git a/app/migrations/Version20160624032452.php b/app/migrations/Version20160624032452.php
index d01e4cecdd1..102ee78c31a 100644
--- a/app/migrations/Version20160624032452.php
+++ b/app/migrations/Version20160624032452.php
@@ -29,8 +29,8 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $statDwcFK  = $this->generatePropertyName('dynamic_content_stats', 'fk', ['dynamic_content_id']);
-        $statDwcIDX = $this->generatePropertyName('dynamic_content_stats', 'idx', ['dynamic_content_id']);
+        $statDwcFK   = $this->generatePropertyName('dynamic_content_stats', 'fk', ['dynamic_content_id']);
+        $statDwcIDX  = $this->generatePropertyName('dynamic_content_stats', 'idx', ['dynamic_content_id']);
         $statLeadFK  = $this->generatePropertyName('dynamic_content_stats', 'fk', ['lead_id']);
         $statLeadIDX = $this->generatePropertyName('dynamic_content_stats', 'idx', ['lead_id']);
 
diff --git a/app/migrations/Version20160630000000.php b/app/migrations/Version20160630000000.php
index eb37f7bbd0e..65a2b44ab3c 100644
--- a/app/migrations/Version20160630000000.php
+++ b/app/migrations/Version20160630000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,8 +13,9 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160630000000
+ * Class Version20160630000000.
  */
 class Version20160630000000 extends AbstractMauticMigration
 {
@@ -27,7 +29,6 @@ public function preUp(Schema $schema)
     {
         $table = $schema->getTable($this->prefix.'oauth2_accesstokens');
         if ($table->hasIndex(MAUTIC_TABLE_PREFIX.'oauth2_access_token_search')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
diff --git a/app/migrations/Version20160630000001.php b/app/migrations/Version20160630000001.php
index d35d13cbb74..6474f8befb2 100644
--- a/app/migrations/Version20160630000001.php
+++ b/app/migrations/Version20160630000001.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,8 +13,9 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160630000001
+ * Class Version20160630000001.
  */
 class Version20160630000001 extends AbstractMauticMigration
 {
@@ -27,7 +29,6 @@ public function preUp(Schema $schema)
     {
         $table = $schema->getTable($this->prefix.'leads');
         if ($table->hasIndex($this->generatePropertyName('leads', 'idx', ['stage_id']))) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -36,8 +37,8 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $stageFk  = $this->generatePropertyName('leads', 'fk', array('stage_id'));
-        $stageIdx = $this->generatePropertyName('leads', 'idx', array('stage_id'));
+        $stageFk  = $this->generatePropertyName('leads', 'fk', ['stage_id']);
+        $stageIdx = $this->generatePropertyName('leads', 'idx', ['stage_id']);
 
         $this->addSql("ALTER TABLE {$this->prefix}leads ADD CONSTRAINT {$stageFk} FOREIGN KEY (stage_id) REFERENCES {$this->prefix}stages (id) ON DELETE SET NULL");
         $this->addSql("CREATE INDEX $stageIdx ON {$this->prefix}leads (stage_id)");
diff --git a/app/migrations/Version20160630000002.php b/app/migrations/Version20160630000002.php
index 13138528ae7..5fc2cfe53d8 100644
--- a/app/migrations/Version20160630000002.php
+++ b/app/migrations/Version20160630000002.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,8 +13,9 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160630000002
+ * Class Version20160630000002.
  */
 class Version20160630000002 extends AbstractMauticMigration
 {
@@ -27,7 +29,6 @@ public function preUp(Schema $schema)
     {
         $table = $schema->getTable($this->prefix.'stages');
         if ($table->hasIndex($this->generatePropertyName('stages', 'idx', ['category_id']))) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -36,8 +37,8 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $fk  = $this->generatePropertyName('stages', 'fk', array('category_id'));
-        $idx = $this->generatePropertyName('stages', 'idx', array('category_id'));
+        $fk  = $this->generatePropertyName('stages', 'fk', ['category_id']);
+        $idx = $this->generatePropertyName('stages', 'idx', ['category_id']);
 
         $this->addSql("ALTER TABLE {$this->prefix}stages ADD CONSTRAINT {$fk} FOREIGN KEY (category_id) REFERENCES {$this->prefix}categories (id) ON DELETE SET NULL");
         $this->addSql("CREATE INDEX {$idx} ON {$this->prefix}stages (category_id)");
diff --git a/app/migrations/Version20160712000000.php b/app/migrations/Version20160712000000.php
index d5bdb46e9b9..55452849592 100644
--- a/app/migrations/Version20160712000000.php
+++ b/app/migrations/Version20160712000000.php
@@ -1,16 +1,20 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\Migrations;
+
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160712000000
+ * Class Version20160712000000.
  */
 class Version20160712000000 extends AbstractMauticMigration
 {
diff --git a/app/migrations/Version20160712000001.php b/app/migrations/Version20160712000001.php
index c11096460e5..8effd27ca67 100644
--- a/app/migrations/Version20160712000001.php
+++ b/app/migrations/Version20160712000001.php
@@ -1,17 +1,21 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace Mautic\Migrations;
+
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160712000001
+ * Class Version20160712000001.
  */
 class Version20160712000001 extends AbstractMauticMigration
 {
@@ -33,7 +37,7 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE ' . $this->prefix.'form_fields ADD show_when_value_exists BOOLEAN DEFAULT TRUE');
-        $this->addSql('ALTER TABLE ' . $this->prefix.'form_fields ADD show_after_x_submissions INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE '.$this->prefix.'form_fields ADD show_when_value_exists BOOLEAN DEFAULT TRUE');
+        $this->addSql('ALTER TABLE '.$this->prefix.'form_fields ADD show_after_x_submissions INT DEFAULT NULL');
     }
 }
diff --git a/app/migrations/Version20160719000000.php b/app/migrations/Version20160719000000.php
index 6080b86b867..6e2e152dbfa 100644
--- a/app/migrations/Version20160719000000.php
+++ b/app/migrations/Version20160719000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160719000000
+ * Class Version20160719000000.
  */
 class Version20160719000000 extends AbstractMauticMigration
 {
@@ -69,7 +70,7 @@ public function up(Schema $schema)
         );
 
         $this->addSql("ALTER TABLE {$this->prefix}page_hits ADD COLUMN device_id INT DEFAULT NULL");
-        $this->addSql("CREATE INDEX ".$this->generatePropertyName('page_hits', 'idx', ['device_id'])." ON {$this->prefix}page_hits (device_id)");
+        $this->addSql('CREATE INDEX '.$this->generatePropertyName('page_hits', 'idx', ['device_id'])." ON {$this->prefix}page_hits (device_id)");
 
         $this->addSql(
             'ALTER TABLE '.$this->prefix.'page_hits ADD CONSTRAINT '.$this->generatePropertyName('page_hits', 'fk', ['device_id'])
@@ -108,4 +109,4 @@ public function up(Schema $schema)
             .' FOREIGN KEY (stat_id) REFERENCES '.$this->prefix.'email_stats (id) ON DELETE CASCADE'
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160720000000.php b/app/migrations/Version20160720000000.php
index 30611606939..66e102ee80d 100644
--- a/app/migrations/Version20160720000000.php
+++ b/app/migrations/Version20160720000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,8 +12,9 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160712000000
+ * Class Version20160712000000.
  */
 class Version20160720000000 extends AbstractMauticMigration
 {
diff --git a/app/migrations/Version20160722000000.php b/app/migrations/Version20160722000000.php
index e922bc55e0e..32f3e73a4c6 100644
--- a/app/migrations/Version20160722000000.php
+++ b/app/migrations/Version20160722000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160722000000
+ * Class Version20160722000000.
  */
 class Version20160722000000 extends AbstractMauticMigration
 {
@@ -28,7 +29,6 @@ public function preUp(Schema $schema)
     {
         $table = $schema->getTable(MAUTIC_TABLE_PREFIX.'leads');
         if ($table->hasColumn('preferred_locale')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
diff --git a/app/migrations/Version20160725161822.php b/app/migrations/Version20160725161822.php
index 74cfc7043df..1cc83b00f9c 100644
--- a/app/migrations/Version20160725161822.php
+++ b/app/migrations/Version20160725161822.php
@@ -2,8 +2,8 @@
 
 namespace Mautic\Migrations;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
@@ -29,10 +29,10 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $leadIDX  = $this->generatePropertyName('video_hits', 'idx', ['lead_id']);
-        $leadFK   = $this->generatePropertyName('video_hits', 'fk', ['lead_id']);
-        $ipIDX    = $this->generatePropertyName('video_hits', 'idx', ['ip_id']);
-        $ipFK     = $this->generatePropertyName('video_hits', 'fk', ['ip_id']);
+        $leadIDX = $this->generatePropertyName('video_hits', 'idx', ['lead_id']);
+        $leadFK  = $this->generatePropertyName('video_hits', 'fk', ['lead_id']);
+        $ipIDX   = $this->generatePropertyName('video_hits', 'idx', ['ip_id']);
+        $ipFK    = $this->generatePropertyName('video_hits', 'fk', ['ip_id']);
 
         $sql = <<<SQL
 CREATE TABLE {$this->prefix}video_hits (
diff --git a/app/migrations/Version20160726000000.php b/app/migrations/Version20160726000000.php
index a5a0a42a0f8..d968e1497f1 100644
--- a/app/migrations/Version20160726000000.php
+++ b/app/migrations/Version20160726000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160726000000
+ * Class Version20160726000000.
  */
 class Version20160726000000 extends AbstractMauticMigration
 {
@@ -27,7 +28,6 @@ class Version20160726000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->hasTable(MAUTIC_TABLE_PREFIX.'lead_frequencyrules')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -38,7 +38,7 @@ public function preUp(Schema $schema)
     public function up(Schema $schema)
     {
         $leadIdx = $this->generatePropertyName('lead_frequencyrules', 'idx', ['lead_id']);
-        $leadFk = $this->generatePropertyName('lead_frequencyrules', 'fk', ['lead_id']);
+        $leadFk  = $this->generatePropertyName('lead_frequencyrules', 'fk', ['lead_id']);
 
         $sql = <<<SQL
 CREATE TABLE `{$this->prefix}lead_frequencyrules` (
@@ -57,4 +57,4 @@ public function up(Schema $schema)
 
         $this->addSql("ALTER TABLE {$this->prefix}lead_frequencyrules ADD CONSTRAINT $leadFk FOREIGN KEY (lead_id) REFERENCES {$this->prefix}leads (id) ON DELETE CASCADE");
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160726000001.php b/app/migrations/Version20160726000001.php
index 963e007c6f2..3e99f5cd175 100644
--- a/app/migrations/Version20160726000001.php
+++ b/app/migrations/Version20160726000001.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\Migrations;
 
-use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 use Mautic\CoreBundle\Doctrine\TranslationMigrationTrait;
 use Mautic\CoreBundle\Doctrine\VariantMigrationTrait;
 
 /**
- * Class Version20160726000001
+ * Class Version20160726000001.
  */
 class Version20160726000001 extends AbstractMauticMigration
 {
diff --git a/app/migrations/Version20160728000000.php b/app/migrations/Version20160728000000.php
index 0bb06bbd221..4494d7316b2 100644
--- a/app/migrations/Version20160728000000.php
+++ b/app/migrations/Version20160728000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,17 +13,16 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160728000000
+ * Class Version20160728000000.
  */
 class Version20160728000000 extends AbstractMauticMigration
 {
     public function preUp(Schema $schema)
     {
         if ($schema->getTable($this->prefix.'campaign_lead_event_log')->hasColumn('channel')) {
-
             throw new SkipMigrationException('Schema includes this migration');
-
         }
     }
 
diff --git a/app/migrations/Version20160731000000.php b/app/migrations/Version20160731000000.php
index 9afd55c87d3..843af76aa24 100644
--- a/app/migrations/Version20160731000000.php
+++ b/app/migrations/Version20160731000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,8 +12,9 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160731000000
+ * Class Version20160731000000.
  */
 class Version20160731000000 extends AbstractMauticMigration
 {
diff --git a/app/migrations/Version20160805000123.php b/app/migrations/Version20160805000123.php
index 7ec16ea9cae..f9a21d6e41b 100644
--- a/app/migrations/Version20160805000123.php
+++ b/app/migrations/Version20160805000123.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,8 +13,9 @@
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
+
 /**
- * Class Version20160805000123
+ * Class Version20160805000123.
  */
 class Version20160805000123 extends AbstractMauticMigration
 {
@@ -23,7 +25,6 @@ class Version20160805000123 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->getTable("{$this->prefix}notifications")->hasIndex("{$this->prefix}notification_read_status")) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
diff --git a/app/migrations/Version20160808000000.php b/app/migrations/Version20160808000000.php
index d7d192c7e2c..d2569df926f 100644
--- a/app/migrations/Version20160808000000.php
+++ b/app/migrations/Version20160808000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -24,7 +25,6 @@ class Version20160808000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->hasTable($this->prefix.'integration_entity')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -53,6 +53,5 @@ public function up(Schema $schema)
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 SQL;
         $this->addSql($sql);
-
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160916000000.php b/app/migrations/Version20160916000000.php
index dfd5cae8869..fd483bd0a20 100644
--- a/app/migrations/Version20160916000000.php
+++ b/app/migrations/Version20160916000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -24,7 +25,6 @@ class Version20160916000000 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->hasTable($this->prefix.'message_queue')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -37,7 +37,7 @@ public function up(Schema $schema)
         $leadIDX  = $this->generatePropertyName('message_queue', 'idx', ['lead_id']);
         $leadFK   = $this->generatePropertyName('message_queue', 'fk', ['lead_id']);
         $eventIdx = $this->generatePropertyName('message_queue', 'idx', ['event_id']);
-        $eventFk = $this->generatePropertyName('message_queue', 'fk', ['event_id']);
+        $eventFk  = $this->generatePropertyName('message_queue', 'fk', ['event_id']);
 
         $sql = <<<SQL
 CREATE TABLE {$this->prefix}message_queue (
@@ -72,4 +72,4 @@ public function up(Schema $schema)
         $this->addSql("ALTER TABLE {$this->prefix}message_queue ADD CONSTRAINT {$leadFK} FOREIGN KEY (lead_id) REFERENCES {$this->prefix}leads (id) ON DELETE CASCADE");
         $this->addSql("ALTER TABLE {$this->prefix}message_queue ADD CONSTRAINT {$eventFk} FOREIGN KEY (event_id) REFERENCES {$this->prefix}campaign_events (id) ON DELETE CASCADE");
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160919204648.php b/app/migrations/Version20160919204648.php
index f4ffce1fcc7..f3f41d31aab 100644
--- a/app/migrations/Version20160919204648.php
+++ b/app/migrations/Version20160919204648.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\Migrations;
 
-use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
@@ -37,7 +38,7 @@ public function preUp(Schema $schema)
     public function up(Schema $schema)
     {
         $categoryIdx = $this->generatePropertyName('focus', 'idx', ['category_id']);
-        $sql = <<<SQL
+        $sql         = <<<SQL
 CREATE TABLE {$this->prefix}focus (
   id INT AUTO_INCREMENT NOT NULL, 
   category_id INT DEFAULT NULL, 
@@ -71,7 +72,7 @@ public function up(Schema $schema)
         $this->addSql($sql);
 
         $focusIdx = $this->generatePropertyName('focus_stats', 'idx', ['focus_id']);
-        $sql = <<<SQL
+        $sql      = <<<SQL
 CREATE TABLE {$this->prefix}focus_stats (
   id INT AUTO_INCREMENT NOT NULL, 
   focus_id INT NOT NULL, 
@@ -93,4 +94,4 @@ public function up(Schema $schema)
         $this->addSql("ALTER TABLE {$this->prefix}focus ADD CONSTRAINT $categoryFk FOREIGN KEY (category_id) REFERENCES {$this->prefix}categories (id) ON DELETE SET NULL");
         $this->addSql("ALTER TABLE {$this->prefix}focus_stats ADD CONSTRAINT $focusFk FOREIGN KEY (focus_id) REFERENCES {$this->prefix}focus (id) ON DELETE CASCADE");
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160920195943.php b/app/migrations/Version20160920195943.php
index dcce87c3e42..8229a386851 100644
--- a/app/migrations/Version20160920195943.php
+++ b/app/migrations/Version20160920195943.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\Migrations;
 
-use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
@@ -27,9 +28,8 @@ class Version20160920195943 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         $columns = $schema->getTable($this->prefix.'emails')->getColumns();
-        
-        if (array_key_exists('dynamic_content', $columns)) {
 
+        if (array_key_exists('dynamic_content', $columns)) {
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -54,12 +54,12 @@ public function up(Schema $schema)
                                 'type'     => null,
                                 'operator' => null,
                                 'display'  => null,
-                                'filter'   => null
-                            ]
-                        ]
-                    ]
-                ]
-            ]
+                                'filter'   => null,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
         ]);
 
         $this->addSql("ALTER TABLE {$this->prefix}emails ADD dynamic_content LONGTEXT DEFAULT NULL COMMENT '(DC2Type:array)';");
diff --git a/app/migrations/Version20160926000000.php b/app/migrations/Version20160926000000.php
index 7bde29fe118..7366826cbb9 100644
--- a/app/migrations/Version20160926000000.php
+++ b/app/migrations/Version20160926000000.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
- * Class Version20160926000000
+ * Class Version20160926000000.
  */
 class Version20160926000000 extends AbstractMauticMigration
 {
@@ -36,9 +37,9 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $ownerFk = $this->generatePropertyName('companies', 'fk', ['owner_id']);
+        $ownerFk  = $this->generatePropertyName('companies', 'fk', ['owner_id']);
         $ownerIdx = $this->generatePropertyName('companies', 'idx', ['owner_id']);
-        $sql        = <<<SQL
+        $sql      = <<<SQL
 CREATE TABLE {$this->prefix}companies (
   `id` int(11) AUTO_INCREMENT NOT NULL,
   `companyname` varchar(255) DEFAULT NULL,
@@ -87,8 +88,8 @@ public function up(Schema $schema)
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 SQL;
         $this->addSql($sql);
-        $lead_index = $this->generatePropertyName('companies_leads', 'idx', ['lead_id']);
-        $company_index =  $this->generatePropertyName('companies_leads', 'idx', ['company_id']);
+        $lead_index    = $this->generatePropertyName('companies_leads', 'idx', ['lead_id']);
+        $company_index = $this->generatePropertyName('companies_leads', 'idx', ['company_id']);
 
         $sql = <<<SQL
 CREATE TABLE {$this->prefix}companies_leads (
@@ -106,7 +107,7 @@ public function up(Schema $schema)
 
         $this->addSql($sql);
 
-        $lead_fk = $this->generatePropertyName('companies_leads', 'fk', ['lead_id']);
+        $lead_fk    = $this->generatePropertyName('companies_leads', 'fk', ['lead_id']);
         $company_fk = $this->generatePropertyName('companies_leads', 'fk', ['company_id']);
 
         $this->addSql("ALTER TABLE {$this->prefix}companies_leads ADD CONSTRAINT {$company_fk} FOREIGN KEY (company_id) REFERENCES {$this->prefix}companies (id) ON DELETE CASCADE;");
diff --git a/app/migrations/Version20160926000001.php b/app/migrations/Version20160926000001.php
index ccd04ae153e..27223412ed5 100644
--- a/app/migrations/Version20160926000001.php
+++ b/app/migrations/Version20160926000001.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -24,7 +25,6 @@ class Version20160926000001 extends AbstractMauticMigration
     public function preUp(Schema $schema)
     {
         if ($schema->hasTable($this->prefix.'lead_companies_change_log')) {
-
             throw new SkipMigrationException('Schema includes this migration');
         }
     }
@@ -49,10 +49,9 @@ public function up(Schema $schema)
 SQL;
         $this->addSql($sql);
 
-        $leadFk = $this->generatePropertyName('lead_companies_change_log', 'fk', ['lead_id']);
+        $leadFk  = $this->generatePropertyName('lead_companies_change_log', 'fk', ['lead_id']);
         $leadIdx = $this->generatePropertyName('lead_companies_change_log', 'idx', ['lead_id']);
         $this->addSql("ALTER TABLE {$this->prefix}lead_companies_change_log ADD CONSTRAINT $leadFk FOREIGN KEY (lead_id) REFERENCES {$this->prefix}leads (id) ON DELETE CASCADE");
         $this->addSql("CREATE INDEX $leadIdx ON {$this->prefix}lead_companies_change_log (lead_id)");
-
     }
-}
\ No newline at end of file
+}
diff --git a/app/migrations/Version20160926182807.php b/app/migrations/Version20160926182807.php
index 8452d99f0cf..d293e8bcc25 100644
--- a/app/migrations/Version20160926182807.php
+++ b/app/migrations/Version20160926182807.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2016 Mautic Contributors. All rights reserved.
+ * @copyright   2016 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace Mautic\Migrations;
 
-use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Mautic\CoreBundle\Doctrine\AbstractMauticMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
@@ -26,7 +27,6 @@ class Version20160926182807 extends AbstractMauticMigration
      */
     public function preUp(Schema $schema)
     {
-
     }
 
     /**
@@ -34,18 +34,17 @@ public function preUp(Schema $schema)
      */
     public function up(Schema $schema)
     {
-        $sql        = <<<SQL
+        $sql = <<<SQL
 insert into {$this->prefix}companies (companyname, is_published) SELECT DISTINCT TRIM(company), 1 from {$this->prefix}leads where company IS NOT NULL and company <> ''
 SQL;
 
         $this->addSql($sql);
 
         $now = (new \DateTime('now', new \DateTimeZone('UTC')))->format('Y-m-d H:i:s');
-        $sql        = <<<SQL
+        $sql = <<<SQL
 insert into {$this->prefix}companies_leads (company_id, lead_id, date_added, manually_added, manually_removed) SELECT c.id, l.id, '$now', 0, 0 from {$this->prefix}leads l join {$this->prefix}companies c on c.companyname = l.company
 SQL;
 
         $this->addSql($sql);
-
     }
 }
diff --git a/build/package_devhead.php b/build/package_devhead.php
index 184be4785bb..c4df2b052cc 100644
--- a/build/package_devhead.php
+++ b/build/package_devhead.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,10 +20,10 @@
 umask(022);
 chdir($baseDir);
 system('rm -rf packaging');
-@unlink($baseDir . '/packages/mautic-head.zip');
+@unlink($baseDir.'/packages/mautic-head.zip');
 
 // Preparation - Provision packaging space
-mkdir(__DIR__ . '/packaging');
+mkdir(__DIR__.'/packaging');
 
 // Copy working files to packaging space
 echo "Copying files\n";
@@ -32,17 +33,17 @@
 system(__DIR__.'/packaging/vendor/sensio/distribution-bundle/Resources/bin/build_bootstrap.php', $result);
 
 // Common steps
-include_once __DIR__ . '/processfiles.php';
+include_once __DIR__.'/processfiles.php';
 
 // Step 5 - ZIP it up
 echo "Packaging Mautic\n";
-chdir(__DIR__ . '/packaging');
+chdir(__DIR__.'/packaging');
 
 system('zip -r ../packages/mautic-head.zip . > /dev/null');
 
 // Copy over upgrade.php
-system('cp ' . __DIR__ . '/../upgrade.php ' . __DIR__ . '/packaging');
+system('cp '.__DIR__.'/../upgrade.php '.__DIR__.'/packaging');
 
-chdir(__DIR__ . '/packaging');
+chdir(__DIR__.'/packaging');
 echo "Packaging Mautic Update Package\n";
-system('zip -r ../packages/mautic-head-update.zip . > /dev/null');
\ No newline at end of file
+system('zip -r ../packages/mautic-head-update.zip . > /dev/null');
diff --git a/build/package_release.php b/build/package_release.php
index 111c077301a..f0f64fc6e1d 100644
--- a/build/package_release.php
+++ b/build/package_release.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -102,6 +103,7 @@
         '.github/PULL_REQUEST_TEMPLATE.md',
         '.gitignore',
         '.travis.yml',
+        '.php_cs',
         'app/phpunit.xml.dist',
         'build',
         'composer.json',
@@ -148,7 +150,7 @@
     }
 
     // Include assets just in case they weren't
-    $assetFiles    = [
+    $assetFiles = [
         'media/css/app.css'       => true,
         'media/css/libraries.css' => true,
         'media/js/app.js'         => true,
@@ -184,4 +186,4 @@
 system('zip -r ../packages/'.$appVersion.'.zip . -x@../excludefiles.txt > /dev/null');
 
 echo "Packaging Mautic Update Package\n";
-system('zip -r ../packages/'.$appVersion.'-update.zip -@ < modified_files.txt > /dev/null');
\ No newline at end of file
+system('zip -r ../packages/'.$appVersion.'-update.zip -@ < modified_files.txt > /dev/null');
diff --git a/build/processfiles.php b/build/processfiles.php
index cce33222284..0916bc55e1e 100644
--- a/build/processfiles.php
+++ b/build/processfiles.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 
 // Step 4 - Remove stuff that shouldn't be distro'ed
 echo "Removing extra files\n";
-chdir($baseDir . '/packaging');
+chdir($baseDir.'/packaging');
 
 system('rm -f app/phpunit.*');
 system('rm -f app/tests.bootstrap*');
diff --git a/index.php b/index.php
index d7c847bde23..141555d670b 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 define('MAUTIC_ROOT_DIR', __DIR__);
@@ -11,10 +12,10 @@
 // Fix for hosts that do not have date.timezone set, it will be reset based on users settings
 date_default_timezone_set('UTC');
 
-use Symfony\Component\ClassLoader\ApcClassLoader;
 use Mautic\Middleware\MiddlewareBuilder;
+use Symfony\Component\ClassLoader\ApcClassLoader;
 
-$loader = require_once __DIR__ . '/app/autoload.php';
+$loader = require_once __DIR__.'/app/autoload.php';
 
 /**
  * Use APC for autoloading to improve performance. Change 'sf2' to a unique prefix
diff --git a/index_dev.php b/index_dev.php
index 4adeceb8895..6babe03b9f8 100644
--- a/index_dev.php
+++ b/index_dev.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2014 Mautic, NP
  * @author      Mautic
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -10,12 +9,12 @@
 // Fix for hosts that do not have date.timezone set, it will be reset based on users settings
 date_default_timezone_set('UTC');
 
-use Symfony\Component\Debug\Debug;
 use Mautic\Middleware\MiddlewareBuilder;
+use Symfony\Component\Debug\Debug;
 
-$loader = require_once __DIR__ . '/vendor/autoload.php';
+$loader = require_once __DIR__.'/vendor/autoload.php';
 
-/**
+/*
  * If you don't want to setup permissions the proper way, just uncomment the following PHP line
  * read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
  */
diff --git a/offline.php b/offline.php
index 3a60fd9adcd..0c54ed815b8 100644
--- a/offline.php
+++ b/offline.php
@@ -20,18 +20,18 @@
 
 // Determine if there is an asset prefix
 $root = __DIR__;
-include $root . '/app/config/paths.php';
+include $root.'/app/config/paths.php';
 $assetPrefix = $paths['asset_prefix'];
 if (!empty($assetPrefix)) {
     if (substr($assetPrefix, -1) == '/') {
         $assetPrefix = substr($assetPrefix, 0, -1);
     }
 }
-$assetBase = $assetPrefix . $base . $paths['assets'];
+$assetBase = $assetPrefix.$base.$paths['assets'];
 
 // Allow a custom error page
-if (file_exists(__DIR__ . '/custom_offline.php')) {
-    include __DIR__ . '/custom_offline.php';
+if (file_exists(__DIR__.'/custom_offline.php')) {
+    include __DIR__.'/custom_offline.php';
 
     exit;
 }
@@ -48,9 +48,9 @@
     <title>Site is offline</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="icon" type="image/x-icon" href="<?php echo $assetBase . '/images/favicon.ico'; ?>" />
-    <link rel="stylesheet" href="<?php echo $assetBase . '/css/libraries.css'; ?>" />
-    <link rel="stylesheet" href="<?php echo $assetBase . '/css/app.css'; ?>" />
+    <link rel="icon" type="image/x-icon" href="<?php echo $assetBase.'/images/favicon.ico'; ?>" />
+    <link rel="stylesheet" href="<?php echo $assetBase.'/css/libraries.css'; ?>" />
+    <link rel="stylesheet" href="<?php echo $assetBase.'/css/app.css'; ?>" />
 </head>
 
 <body>
diff --git a/plugins/MauticCloudStorageBundle/Config/config.php b/plugins/MauticCloudStorageBundle/Config/config.php
index affa8e7790f..042f3c097d1 100644
--- a/plugins/MauticCloudStorageBundle/Config/config.php
+++ b/plugins/MauticCloudStorageBundle/Config/config.php
@@ -1,33 +1,34 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
+return [
     'name'        => 'Cloud Storage',
     'description' => 'Enables integrations with Mautic supported cloud storage services.',
     'version'     => '1.0',
     'author'      => 'Mautic',
 
-    'services'    => array(
-        'events' => array(
-            'mautic.cloudstorage.remoteassetbrowse.subscriber' => array(
-                'class' => 'MauticPlugin\MauticCloudStorageBundle\EventListener\RemoteAssetBrowseSubscriber'
-            )
-        ),
-        'forms'  => array(
-            'mautic.form.type.cloudstorage.openstack' => array(
+    'services' => [
+        'events' => [
+            'mautic.cloudstorage.remoteassetbrowse.subscriber' => [
+                'class' => 'MauticPlugin\MauticCloudStorageBundle\EventListener\RemoteAssetBrowseSubscriber',
+            ],
+        ],
+        'forms' => [
+            'mautic.form.type.cloudstorage.openstack' => [
                 'class' => 'MauticPlugin\MauticCloudStorageBundle\Form\Type\OpenStackType',
-                'alias' => 'cloudstorage_openstack'
-            ),
-            'mautic.form.type.cloudstorage.rackspace' => array(
+                'alias' => 'cloudstorage_openstack',
+            ],
+            'mautic.form.type.cloudstorage.rackspace' => [
                 'class' => 'MauticPlugin\MauticCloudStorageBundle\Form\Type\RackspaceType',
-                'alias' => 'cloudstorage_rackspace'
-            )
-        )
-    ),
-);
+                'alias' => 'cloudstorage_rackspace',
+            ],
+        ],
+    ],
+];
diff --git a/plugins/MauticCloudStorageBundle/EventListener/RemoteAssetBrowseSubscriber.php b/plugins/MauticCloudStorageBundle/EventListener/RemoteAssetBrowseSubscriber.php
index 3eb1404425d..ed7ba63fc04 100644
--- a/plugins/MauticCloudStorageBundle/EventListener/RemoteAssetBrowseSubscriber.php
+++ b/plugins/MauticCloudStorageBundle/EventListener/RemoteAssetBrowseSubscriber.php
@@ -1,36 +1,36 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticCloudStorageBundle\EventListener;
 
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
-use Mautic\AssetBundle\Event as Events;
 use Mautic\AssetBundle\AssetEvents;
+use Mautic\AssetBundle\Event as Events;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class RemoteAssetBrowseSubscriber
+ * Class RemoteAssetBrowseSubscriber.
  */
 class RemoteAssetBrowseSubscriber extends CommonSubscriber
 {
-
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            AssetEvents::ASSET_ON_REMOTE_BROWSE => array('onAssetRemoteBrowse', 0)
-        );
+        return [
+            AssetEvents::ASSET_ON_REMOTE_BROWSE => ['onAssetRemoteBrowse', 0],
+        ];
     }
 
     /**
-     * Fetches the connector for an event's integration
+     * Fetches the connector for an event's integration.
      *
      * @param Events\RemoteAssetBrowseEvent $event
      */
diff --git a/plugins/MauticCloudStorageBundle/Form/Type/OpenStackType.php b/plugins/MauticCloudStorageBundle/Form/Type/OpenStackType.php
index 255077fa1f3..9d71767adb9 100644
--- a/plugins/MauticCloudStorageBundle/Form/Type/OpenStackType.php
+++ b/plugins/MauticCloudStorageBundle/Form/Type/OpenStackType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class OpenStackType
+ * Class OpenStackType.
  */
 class OpenStackType extends AbstractType
 {
@@ -22,15 +23,15 @@ class OpenStackType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('serviceUrl', 'url', array(
-            'label'       => 'mautic.integration.OpenStack.service.url',
-            'required'    => true,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
+        $builder->add('serviceUrl', 'url', [
+            'label'      => 'mautic.integration.OpenStack.service.url',
+            'required'   => true,
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'tooltip' => 'mautic.integration.OpenStack.service.url.tooltip',
-                'class'   => 'form-control'
-            )
-        ));
+                'class'   => 'form-control',
+            ],
+        ]);
     }
 
     /**
diff --git a/plugins/MauticCloudStorageBundle/Form/Type/RackspaceType.php b/plugins/MauticCloudStorageBundle/Form/Type/RackspaceType.php
index 2895fe341cf..cb46b380347 100644
--- a/plugins/MauticCloudStorageBundle/Form/Type/RackspaceType.php
+++ b/plugins/MauticCloudStorageBundle/Form/Type/RackspaceType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class RackspaceType
+ * Class RackspaceType.
  */
 class RackspaceType extends AbstractType
 {
@@ -22,18 +23,18 @@ class RackspaceType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('serverLocation', 'choice', array(
-            'label'       => 'mautic.integration.Rackspace.server.location',
-            'choices'     => array(
+        $builder->add('serverLocation', 'choice', [
+            'label'   => 'mautic.integration.Rackspace.server.location',
+            'choices' => [
                 'us' => 'mautic.integration.Rackspace.server.location.us',
                 'uk' => 'mautic.integration.Rackspace.server.location.uk',
-            ),
-            'required'    => true,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array(
-                'class' => 'form-control'
-            )
-        ));
+            ],
+            'required'   => true,
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
+        ]);
     }
 
     /**
diff --git a/plugins/MauticCloudStorageBundle/Integration/AmazonS3Integration.php b/plugins/MauticCloudStorageBundle/Integration/AmazonS3Integration.php
index d6152cda4e1..8965d2e148f 100644
--- a/plugins/MauticCloudStorageBundle/Integration/AmazonS3Integration.php
+++ b/plugins/MauticCloudStorageBundle/Integration/AmazonS3Integration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use Gaufrette\Adapter\AwsS3;
 
 /**
- * Class AmazonS3Integration
+ * Class AmazonS3Integration.
  */
 class AmazonS3Integration extends CloudStorageIntegration
 {
@@ -34,7 +35,7 @@ public function getDisplayName()
     }
 
     /**
-     * Get the array key for clientId
+     * Get the array key for clientId.
      *
      * @return string
      */
@@ -44,7 +45,7 @@ public function getClientIdKey()
     }
 
     /**
-     * Get the array key for client secret
+     * Get the array key for client secret.
      *
      * @return string
      */
@@ -58,11 +59,11 @@ public function getClientSecretKey()
      */
     public function getRequiredKeyFields()
     {
-        return array(
+        return [
             'client_id'     => 'mautic.integration.keyfield.clientid',
             'client_secret' => 'mautic.integration.keyfield.clientsecret',
-            'bucket'        => 'mautic.integration.keyfield.amazons3.bucket'
-        );
+            'bucket'        => 'mautic.integration.keyfield.amazons3.bucket',
+        ];
     }
 
     /**
@@ -75,7 +76,7 @@ public function getAdapter()
         if (!$this->adapter) {
             $keys = $this->getDecryptedApiKeys();
 
-            $service = S3Client::factory(array('key' => $keys['client_id'], 'secret' => $keys['client_secret']));
+            $service = S3Client::factory(['key' => $keys['client_id'], 'secret' => $keys['client_secret']]);
 
             $this->adapter = new AwsS3($service, $keys['bucket']);
         }
diff --git a/plugins/MauticCloudStorageBundle/Integration/CloudStorageIntegration.php b/plugins/MauticCloudStorageBundle/Integration/CloudStorageIntegration.php
index fe53528d0d1..d7d7426e05e 100644
--- a/plugins/MauticCloudStorageBundle/Integration/CloudStorageIntegration.php
+++ b/plugins/MauticCloudStorageBundle/Integration/CloudStorageIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class CloudStorageIntegration
+ * Class CloudStorageIntegration.
  */
 abstract class CloudStorageIntegration extends AbstractIntegration
 {
-
     /**
      * @var Adapter
      */
@@ -30,12 +30,12 @@ public function appendToForm(&$builder, $data, $formArea)
     {
         if ($formArea == 'features') {
             $name = strtolower($this->getName());
-            if ($this->factory->serviceExists('mautic.form.type.cloudstorage.' . $name)) {
-                $builder->add('provider', 'cloudstorage_' . $name, array(
+            if ($this->factory->serviceExists('mautic.form.type.cloudstorage.'.$name)) {
+                $builder->add('provider', 'cloudstorage_'.$name, [
                     'label'    => 'mautic.integration.form.provider.settings',
                     'required' => false,
-                    'data'     => (isset($data['provider'])) ? $data['provider'] : array()
-                ));
+                    'data'     => (isset($data['provider'])) ? $data['provider'] : [],
+                ]);
             }
         }
     }
@@ -49,14 +49,14 @@ public function getAuthenticationType()
     }
 
     /**
-     * Retrieves an Adapter object for this integration
+     * Retrieves an Adapter object for this integration.
      *
      * @return Adapter
      */
     abstract public function getAdapter();
 
     /**
-     * Retrieves the public URL for a given key
+     * Retrieves the public URL for a given key.
      *
      * @param string $key
      *
@@ -69,6 +69,6 @@ abstract public function getPublicUrl($key);
      */
     public function getSupportedFeatures()
     {
-        return array('cloud_storage');
+        return ['cloud_storage'];
     }
 }
diff --git a/plugins/MauticCloudStorageBundle/Integration/OpenStackIntegration.php b/plugins/MauticCloudStorageBundle/Integration/OpenStackIntegration.php
index 81f48191a84..489704e9eb7 100644
--- a/plugins/MauticCloudStorageBundle/Integration/OpenStackIntegration.php
+++ b/plugins/MauticCloudStorageBundle/Integration/OpenStackIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use OpenCloud\OpenStack;
 
 /**
- * Class OpenStackIntegration
+ * Class OpenStackIntegration.
  */
 class OpenStackIntegration extends CloudStorageIntegration
 {
-
     /**
      * @var OpenStack
      */
@@ -38,7 +38,7 @@ public function getName()
     }
 
     /**
-     * Get the array key for clientId
+     * Get the array key for clientId.
      *
      * @return string
      */
@@ -48,7 +48,7 @@ public function getClientIdKey()
     }
 
     /**
-     * Get the array key for client secret
+     * Get the array key for client secret.
      *
      * @return string
      */
@@ -62,12 +62,12 @@ public function getClientSecretKey()
      */
     public function getRequiredKeyFields()
     {
-        return array(
-            'username' => 'mautic.integration.keyfield.OpenStack.username',
-            'password' => 'mautic.integration.keyfield.OpenStack.password',
-            'tenantName' => 'mautic.integration.keyfield.OpenStack.tenantName',
-            'containerName' => 'mautic.integration.keyfield.OpenCloud.containerName'
-        );
+        return [
+            'username'      => 'mautic.integration.keyfield.OpenStack.username',
+            'password'      => 'mautic.integration.keyfield.OpenStack.password',
+            'tenantName'    => 'mautic.integration.keyfield.OpenStack.tenantName',
+            'containerName' => 'mautic.integration.keyfield.OpenCloud.containerName',
+        ];
     }
 
     /**
@@ -83,11 +83,11 @@ public function getAdapter()
 
             $this->connection = new OpenStack(
                 $settings['provider']['serviceUrl'],
-                array(
-                    'username' => $keys['username'],
-                    'password' => $keys['password'],
-                    'tenantName' => $keys['tenantName']
-                )
+                [
+                    'username'   => $keys['username'],
+                    'password'   => $keys['password'],
+                    'tenantName' => $keys['tenantName'],
+                ]
             );
 
             $this->storeFactory = new ObjectStoreFactory($this->connection, null, 'publicURL');
diff --git a/plugins/MauticCloudStorageBundle/Integration/RackspaceIntegration.php b/plugins/MauticCloudStorageBundle/Integration/RackspaceIntegration.php
index a3d3833cb9f..2d7cb5c62c4 100644
--- a/plugins/MauticCloudStorageBundle/Integration/RackspaceIntegration.php
+++ b/plugins/MauticCloudStorageBundle/Integration/RackspaceIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,11 +15,10 @@
 use OpenCloud\Rackspace;
 
 /**
- * Class RackspaceIntegration
+ * Class RackspaceIntegration.
  */
 class RackspaceIntegration extends CloudStorageIntegration
 {
-
     /**
      * @var Rackspace
      */
@@ -38,7 +38,7 @@ public function getName()
     }
 
     /**
-     * Get the array key for clientId
+     * Get the array key for clientId.
      *
      * @return string
      */
@@ -48,7 +48,7 @@ public function getClientIdKey()
     }
 
     /**
-     * Get the array key for client secret
+     * Get the array key for client secret.
      *
      * @return string
      */
@@ -62,11 +62,11 @@ public function getClientSecretKey()
      */
     public function getRequiredKeyFields()
     {
-        return array(
+        return [
             'username'      => 'mautic.integration.keyfield.Rackspace.username',
             'apiKey'        => 'mautic.integration.keyfield.Rackspace.apiKey',
-            'containerName' => 'mautic.integration.keyfield.OpenCloud.containerName'
-        );
+            'containerName' => 'mautic.integration.keyfield.OpenCloud.containerName',
+        ];
     }
 
     /**
@@ -92,10 +92,10 @@ public function getAdapter()
 
             $this->connection = new Rackspace(
                 $url,
-                array(
+                [
                     'username' => $keys['username'],
-                    'apiKey'   => $keys['apiKey']
-                )
+                    'apiKey'   => $keys['apiKey'],
+                ]
             );
 
             $this->storeFactory = new ObjectStoreFactory($this->connection);
diff --git a/plugins/MauticCloudStorageBundle/MauticCloudStorageBundle.php b/plugins/MauticCloudStorageBundle/MauticCloudStorageBundle.php
index e1e9d0f5ebe..f991be824f1 100644
--- a/plugins/MauticCloudStorageBundle/MauticCloudStorageBundle.php
+++ b/plugins/MauticCloudStorageBundle/MauticCloudStorageBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Mautic\PluginBundle\Bundle\PluginBundleBase;
 
 /**
- * Class MauticCloudStorageBundle
- *
- * @package Mautic\LeadBundle
+ * Class MauticCloudStorageBundle.
  */
 class MauticCloudStorageBundle extends PluginBundleBase
 {
-
 }
diff --git a/plugins/MauticCrmBundle/Api/CrmApi.php b/plugins/MauticCrmBundle/Api/CrmApi.php
index 83b891ec603..2f20aa22e7c 100644
--- a/plugins/MauticCrmBundle/Api/CrmApi.php
+++ b/plugins/MauticCrmBundle/Api/CrmApi.php
@@ -6,11 +6,10 @@
 
 class CrmApi
 {
-
     protected $integration;
 
     public function __construct(CrmAbstractIntegration $integration)
     {
         $this->integration = $integration;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticCrmBundle/Api/HubspotApi.php b/plugins/MauticCrmBundle/Api/HubspotApi.php
index adf24e93571..2950fe1d5b2 100644
--- a/plugins/MauticCrmBundle/Api/HubspotApi.php
+++ b/plugins/MauticCrmBundle/Api/HubspotApi.php
@@ -2,21 +2,21 @@
 
 namespace MauticPlugin\MauticCrmBundle\Api;
 
-use Mautic\PluginBundle\Exception\ApiErrorException;
 use Mautic\EmailBundle\Helper\MailHelper;
+use Mautic\PluginBundle\Exception\ApiErrorException;
 
 class HubspotApi extends CrmApi
 {
     private $module = 'contacts';
 
-    protected $requestSettings = array(
+    protected $requestSettings = [
         'encode_parameters' => 'json',
-    );
+    ];
 
-    protected function request($operation, $parameters = array(), $method = 'GET')
+    protected function request($operation, $parameters = [], $method = 'GET')
     {
         $hapikey = $this->integration->getHubSpotApiKey();
-        $url = sprintf('%s/%s/%s/?hapikey=%s', $this->integration->getApiUrl(), $this->module, $operation, $hapikey);
+        $url     = sprintf('%s/%s/%s/?hapikey=%s', $this->integration->getApiUrl(), $this->module, $operation, $hapikey);
         $request = $this->integration->makeRequest($url, $parameters, $method, $this->requestSettings);
 
         if (isset($request['status']) && $request['status'] == 'error') {
diff --git a/plugins/MauticCrmBundle/Api/SalesforceApi.php b/plugins/MauticCrmBundle/Api/SalesforceApi.php
index 1d3310fce97..6f128efbddf 100644
--- a/plugins/MauticCrmBundle/Api/SalesforceApi.php
+++ b/plugins/MauticCrmBundle/Api/SalesforceApi.php
@@ -1,24 +1,24 @@
 <?php
+
 namespace MauticPlugin\MauticCrmBundle\Api;
 
-use Mautic\LeadBundle\MauticLeadBundle;
 use Mautic\PluginBundle\Exception\ApiErrorException;
 use MauticPlugin\MauticCrmBundle\Integration\CrmAbstractIntegration;
 
 class SalesforceApi extends CrmApi
 {
-    protected $object  = 'Lead';
-    protected $requestSettings = array(
-        'encode_parameters' => 'json'
-    );
+    protected $object          = 'Lead';
+    protected $requestSettings = [
+        'encode_parameters' => 'json',
+    ];
 
     public function __construct(CrmAbstractIntegration $integration)
     {
         parent::__construct($integration);
 
-        $this->requestSettings['curl_options'] = array(
-            CURLOPT_SSLVERSION => defined('CURL_SSLVERSION_TLSv1_1') ? CURL_SSLVERSION_TLSv1_1 : CURL_SSLVERSION_TLSv1_1
-        );
+        $this->requestSettings['curl_options'] = [
+            CURLOPT_SSLVERSION => defined('CURL_SSLVERSION_TLSv1_1') ? CURL_SSLVERSION_TLSv1_1 : CURL_SSLVERSION_TLSv1_1,
+        ];
     }
 
     /**
@@ -30,19 +30,20 @@ public function __construct(CrmAbstractIntegration $integration)
      * @param null   $queryUrl
      *
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
-    public function request($operation, $elementData = array(), $method = 'GET', $retry = false, $object = null, $queryUrl = null)
+    public function request($operation, $elementData = [], $method = 'GET', $retry = false, $object = null, $queryUrl = null)
     {
         if (!$object) {
             $object = $this->object;
         }
 
-        if(!$queryUrl){
-            $queryUrl = $this->integration->getApiUrl();
-            $request_url = sprintf($queryUrl . '/%s/%s', $object, $operation);
-        } else{
-            $request_url = sprintf($queryUrl . '/%s', $operation);
+        if (!$queryUrl) {
+            $queryUrl    = $this->integration->getApiUrl();
+            $request_url = sprintf($queryUrl.'/%s/%s', $object, $operation);
+        } else {
+            $request_url = sprintf($queryUrl.'/%s', $operation);
         }
 
         $response = $this->integration->makeRequest($request_url, $elementData, $method, $this->requestSettings);
@@ -50,12 +51,12 @@ public function request($operation, $elementData = array(), $method = 'GET', $re
         if (!empty($response['errors'])) {
             throw new ApiErrorException(implode(', ', $response['errors']));
         } elseif (is_array($response)) {
-            $errors = array();
+            $errors = [];
             foreach ($response as $r) {
                 if (is_array($r) && !empty($r['errorCode']) && !empty($r['message'])) {
                     // Check for expired session then retry if we can refresh
                     if ($r['errorCode'] == 'INVALID_SESSION_ID' && !$retry) {
-                        $refreshError = $this->integration->authCallback(array('use_refresh_token' => true));
+                        $refreshError = $this->integration->authCallback(['use_refresh_token' => true]);
 
                         if (empty($refreshError)) {
                             return $this->request($operation, $elementData, $method, true);
@@ -82,7 +83,7 @@ public function getLeadFields()
     }
 
     /**
-     * Creates Salesforce lead
+     * Creates Salesforce lead.
      *
      * @param array $data
      *
@@ -90,7 +91,7 @@ public function getLeadFields()
      */
     public function createLead(array $data, $lead)
     {
-        $createdLeadData =  $this->request('', $data, 'POST');
+        $createdLeadData = $this->request('', $data, 'POST');
         //todo: check if push activities is selected in config
 
         return $createdLeadData;
@@ -113,15 +114,15 @@ public function createLeadActivity(array $activity, $object)
             foreach ($activity as $sfId => $records) {
                 foreach ($records['records'] as $key => $record) {
                     $activityData['records'][$key] = [
-                        'attributes'                 => [
+                        'attributes' => [
                             'type'        => $mActivityObjectName,
-                            'referenceId' => $record['id'].'-'.$sfId
+                            'referenceId' => $record['id'].'-'.$sfId,
                         ],
                         $namespace.'ActivityDate__c' => $record['dateAdded']->format('c'),
                         $namespace.'Description__c'  => $record['description'],
                         'Name'                       => $record['name'],
                         $namespace.'Mautic_url__c'   => $records['leadUrl'],
-                        $namespace.'ReferenceId__c'  => $record['id'].'-'.$sfId
+                        $namespace.'ReferenceId__c'  => $record['id'].'-'.$sfId,
                     ];
 
                     if ($object === 'Lead') {
@@ -148,13 +149,13 @@ public function createLeadActivity(array $activity, $object)
                 if ($results['hasErrors']) {
                     foreach ($results['results'] as $result) {
                         if ($result['errors'][0]['statusCode'] == 'CANNOT_UPDATE_CONVERTED_LEAD') {
-                            $references   = explode("-", $result['referenceId']);
+                            $references   = explode('-', $result['referenceId']);
                             $SF_leadIds[] = $references[1];
 
                             $leadIds = implode("','", $SF_leadIds);
-                            $query   = "select Id, ConvertedContactId from ".$object." where id in ('".$leadIds."')";
+                            $query   = 'select Id, ConvertedContactId from '.$object." where id in ('".$leadIds."')";
 
-                            $contacts = $this->request('query', ["q" => $query], 'GET', false, null, $queryUrl);
+                            $contacts = $this->request('query', ['q' => $query], 'GET', false, null, $queryUrl);
 
                             foreach ($contacts['records'] as $contact) {
                                 foreach ($activityData['records'] as $key => $record) {
@@ -165,7 +166,6 @@ public function createLeadActivity(array $activity, $object)
                                         unset($activityData['records'][$key]);
                                     }
                                 }
-
                             }
                         }
                     }
@@ -189,7 +189,7 @@ public function createLeadActivity(array $activity, $object)
     }
 
     /**
-     * Get Salesforce leads
+     * Get Salesforce leads.
      *
      * @param string $query
      *
@@ -199,32 +199,32 @@ public function getLeads($query, $object)
     {
         //find out if start date is not our of range for org
         if (isset($query['start'])) {
-            $queryUrl = $this->integration->getQueryUrl();
-            $organization = $this->request('query', array("q"=>"SELECT CreatedDate from Organization"),'GET',false,null,$queryUrl);
+            $queryUrl     = $this->integration->getQueryUrl();
+            $organization = $this->request('query', ['q' => 'SELECT CreatedDate from Organization'], 'GET', false, null, $queryUrl);
 
             if (strtotime($query['start']) < strtotime($organization['records'][0]['CreatedDate'])) {
-                $query['start'] = date('c',strtotime($organization['records'][0]['CreatedDate']." +1 hour"));
+                $query['start'] = date('c', strtotime($organization['records'][0]['CreatedDate'].' +1 hour'));
             }
         }
-        $settings['feature_settings']['objects']=$object;
+        $settings['feature_settings']['objects'] = $object;
 
-        $fields = $this->integration->getAvailableLeadFields($settings);
-        $fields['id']=array('id' => array());
-        $result = array();
+        $fields       = $this->integration->getAvailableLeadFields($settings);
+        $fields['id'] = ['id' => []];
+        $result       = [];
 
         if (!empty($fields) and isset($query['start'])) {
-            $fields = implode(", ",array_keys($fields));
-            $getLeadsQuery = "SELECT ".$fields." from ".$object." where LastModifiedDate>=".$query['start']." and LastModifiedDate<=".$query['end'];
-            $result = $this->request('query', array("q"=>$getLeadsQuery),'GET',false,null,$queryUrl);
+            $fields        = implode(', ', array_keys($fields));
+            $getLeadsQuery = 'SELECT '.$fields.' from '.$object.' where LastModifiedDate>='.$query['start'].' and LastModifiedDate<='.$query['end'];
+            $result        = $this->request('query', ['q' => $getLeadsQuery], 'GET', false, null, $queryUrl);
         } else {
-            $result = $this->request('query/'.$query, array(),'GET',false,null,$queryUrl);
+            $result = $this->request('query/'.$query, [], 'GET', false, null, $queryUrl);
         }
 
         return $result;
     }
 
     /**
-     * Get Salesforce leads
+     * Get Salesforce leads.
      *
      * @param string $query
      *
@@ -232,6 +232,6 @@ public function getLeads($query, $object)
      */
     public function getSalesForceLeadById($id, $params, $object)
     {
-        return $this->request($id.'/',$params, 'GET', false,$object);
+        return $this->request($id.'/', $params, 'GET', false, $object);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticCrmBundle/Api/SugarcrmApi.php b/plugins/MauticCrmBundle/Api/SugarcrmApi.php
index 6b1d37d12ab..e7288d5fd46 100644
--- a/plugins/MauticCrmBundle/Api/SugarcrmApi.php
+++ b/plugins/MauticCrmBundle/Api/SugarcrmApi.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace MauticPlugin\MauticCrmBundle\Api;
 
 use Mautic\PluginBundle\Exception\ApiErrorException;
@@ -13,26 +14,27 @@ class SugarcrmApi extends CrmApi
      * @param string $method
      *
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
-    public function request($sMethod, $data = array(), $method = 'GET')
+    public function request($sMethod, $data = [], $method = 'GET')
     {
         $tokenData = $this->integration->getKeys();
 
         if ($tokenData['version'] == '6') {
             $request_url = sprintf('%s/service/v4_1/rest.php', $tokenData['sugarcrm_url']);
 
-            $sessionParams = array_merge(array(
+            $sessionParams = array_merge([
                 'session'     => $tokenData['id'],
-                'module_name' => $this->module
-            ), $data);
+                'module_name' => $this->module,
+            ], $data);
 
-            $parameters = array(
+            $parameters = [
                 'method'        => $sMethod,
                 'input_type'    => 'JSON',
                 'response_type' => 'JSON',
-                'rest_data'     => json_encode($sessionParams)
-            );
+                'rest_data'     => json_encode($sessionParams),
+            ];
 
             $response = $this->integration->makeRequest($request_url, $parameters, $method);
 
@@ -55,20 +57,20 @@ public function request($sMethod, $data = array(), $method = 'GET')
 
     /**
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
-    public function getLeadFields ()
+    public function getLeadFields()
     {
         $tokenData = $this->integration->getKeys();
 
         if ($tokenData['version'] == '6') {
             return $this->request('get_module_fields');
-
         } else {
-            $parameters = array(
+            $parameters = [
                 'module_filter' => $this->module,
-                'type_filter'   => 'modules'
-            );
+                'type_filter'   => 'modules',
+            ];
 
             $response = $this->request('metadata', $parameters);
 
@@ -80,28 +82,28 @@ public function getLeadFields ()
      * @param array $fields
      *
      * @return array
+     *
      * @throws \Mautic\PluginBundle\Exception\ApiErrorException
      */
-    public function createLead (array $fields)
+    public function createLead(array $fields)
     {
         $tokenData = $this->integration->getKeys();
 
         if ($tokenData['version'] == '6') {
-            $leadFields = array();
+            $leadFields = [];
             foreach ($fields as $name => $value) {
-                $leadFields[] = array(
-                    'name' => $name,
-                    'value' => $value
-                );
+                $leadFields[] = [
+                    'name'  => $name,
+                    'value' => $value,
+                ];
             }
-            $parameters = array(
-                'name_value_list' => $leadFields
-            );
+            $parameters = [
+                'name_value_list' => $leadFields,
+            ];
 
             return $this->request('set_entry', $parameters, 'POST');
         } else {
-
             return $this->request('Leads', $fields, 'POST');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticCrmBundle/Api/VtigerApi.php b/plugins/MauticCrmBundle/Api/VtigerApi.php
index f8364394e7c..a6fcd558cd6 100644
--- a/plugins/MauticCrmBundle/Api/VtigerApi.php
+++ b/plugins/MauticCrmBundle/Api/VtigerApi.php
@@ -1,22 +1,23 @@
 <?php
+
 namespace MauticPlugin\MauticCrmBundle\Api;
 
 use Mautic\PluginBundle\Exception\ApiErrorException;
 
 class VtigerApi extends CrmApi
 {
-    protected $element = "Leads";
+    protected $element = 'Leads';
 
-    protected function request($operation, $element, $elementData = array(), $method = 'GET')
+    protected function request($operation, $element, $elementData = [], $method = 'GET')
     {
         $tokenData = $this->integration->getKeys();
 
         $request_url = $this->integration->getApiUrl();
-        $parameters  = array(
+        $parameters  = [
             'operation'   => $operation,
             'sessionName' => $tokenData['sessionName'],
-            'elementType' => $element
-        );
+            'elementType' => $element,
+        ];
 
         if (!empty($elementData)) {
             $parameters['element'] = json_encode($elementData);
@@ -33,21 +34,21 @@ protected function request($operation, $element, $elementData = array(), $method
     }
 
     /**
-     * List types
+     * List types.
      *
      * @return mixed
      */
-    public function listTypes ()
+    public function listTypes()
     {
         return $this->request('listtypes', $this->element);
     }
 
     /**
-     * List leads
+     * List leads.
      *
      * @return mixed
      */
-    public function getLeadFields ()
+    public function getLeadFields()
     {
         return $this->request('describe', $this->element);
     }
@@ -57,8 +58,8 @@ public function getLeadFields ()
      *
      * @return mixed
      */
-    public function createLead (array $data)
+    public function createLead(array $data)
     {
         return $this->request('create', $this->element, $data, 'POST');
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticCrmBundle/Api/ZohoApi.php b/plugins/MauticCrmBundle/Api/ZohoApi.php
index 066341f9161..b46bed26bb3 100644
--- a/plugins/MauticCrmBundle/Api/ZohoApi.php
+++ b/plugins/MauticCrmBundle/Api/ZohoApi.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace MauticPlugin\MauticCrmBundle\Api;
 
 use Mautic\PluginBundle\Exception\ApiErrorException;
@@ -7,23 +8,23 @@ class ZohoApi extends CrmApi
 {
     private $module = 'Leads';
 
-    protected function request($operation, $parameters = array(), $method = 'GET')
+    protected function request($operation, $parameters = [], $method = 'GET')
     {
         $tokenData = $this->integration->getKeys();
         $url       = sprintf('%s/%s/%s', $this->integration->getApiUrl(), $this->module, $operation);
 
-        $parameters  = array_merge(array(
+        $parameters = array_merge([
             'authtoken' => $tokenData['AUTHTOKEN'],
-            'scope'     => 'crmapi'
-        ), $parameters);
+            'scope'     => 'crmapi',
+        ], $parameters);
 
         $response = $this->integration->makeRequest($url, $parameters, $method);
 
         if (!empty($response['response']['error'])) {
             $response = $response['response'];
-            $errorMsg = $response['error']['message'] . ' (' . $response['error']['code'] . ')';
+            $errorMsg = $response['error']['message'].' ('.$response['error']['code'].')';
             if (isset($response['uri'])) {
-                $errorMsg .= '; ' . $response['uri'];
+                $errorMsg .= '; '.$response['uri'];
             }
             throw new ApiErrorException($errorMsg);
         }
@@ -32,11 +33,11 @@ protected function request($operation, $parameters = array(), $method = 'GET')
     }
 
     /**
-     * List types
+     * List types.
      *
      * @return mixed
      */
-    public function getLeadFields ()
+    public function getLeadFields()
     {
         return $this->request('getFields');
     }
@@ -46,13 +47,13 @@ public function getLeadFields ()
      *
      * @return array
      */
-    public function createLead ($data)
+    public function createLead($data)
     {
-        $parameters  = array(
+        $parameters = [
             'xmlData'        => $data,
-            'duplicateCheck' => 2 //update if exists
-        );
+            'duplicateCheck' => 2, //update if exists
+        ];
 
         return $this->request('insertRecords', $parameters, 'POST');
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticCrmBundle/Config/config.php b/plugins/MauticCrmBundle/Config/config.php
index 0f01c56a08d..80cb67f303a 100644
--- a/plugins/MauticCrmBundle/Config/config.php
+++ b/plugins/MauticCrmBundle/Config/config.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
+return [
     'name'        => 'CRM',
     'description' => 'Enables integration with Mautic supported CRMs.',
     'version'     => '1.0',
-    'author'      => 'Mautic'
-);
\ No newline at end of file
+    'author'      => 'Mautic',
+];
diff --git a/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php b/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php
index e00aef0beeb..91ebca19f7e 100644
--- a/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/CrmAbstractIntegration.php
@@ -1,26 +1,23 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticCrmBundle\Integration;
 
-
 use Mautic\PluginBundle\Entity\Integration;
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
 /**
- * Class CrmAbstractIntegration
- *
- * @package MauticPlugin\MauticCrmBundle\Integration
+ * Class CrmAbstractIntegration.
  */
 abstract class CrmAbstractIntegration extends AbstractIntegration
 {
-
     protected $auth;
 
     /**
@@ -53,18 +50,18 @@ public function getAuthenticationType()
      */
     public function getSupportedFeatures()
     {
-        return array('push_lead', 'get_leads');
+        return ['push_lead', 'get_leads'];
     }
 
     /**
      * @param $lead
      */
-    public function pushLead($lead, $config = array())
+    public function pushLead($lead, $config = [])
     {
         $config = $this->mergeConfigToFeatureSettings($config);
 
         if (empty($config['leadFields'])) {
-            return array();
+            return [];
         }
 
         $mappedData = $this->populateLeadData($lead, $config);
@@ -81,25 +78,26 @@ public function pushLead($lead, $config = array())
 
                 return true;
             }
-          } catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->logIntegrationError($e);
         }
+
         return false;
     }
 
     /**
      * @param $lead
      */
-    public function getLeads($params = array())
+    public function getLeads($params = [])
     {
         $executed = null;
 
         $query = $this->getFetchQuery($params);
-        
+
         try {
             if ($this->isAuthorized()) {
                 $result = $this->getApiHelper()->getLeads($query);
-                
+
                 $executed = $this->amendLeadDataBeforeMauticPopulate($result);
 
                 return $executed;
@@ -107,36 +105,34 @@ public function getLeads($params = array())
         } catch (\Exception $e) {
             $this->logIntegrationError($e);
         }
-        
+
         return $executed;
     }
-    
+
     /**
-     * Amend mapped lead data before pushing to CRM
+     * Amend mapped lead data before pushing to CRM.
      *
      * @param $mappedData
      */
     public function amendLeadDataBeforePush(&$mappedData)
     {
-
     }
 
     /**
-     * get query to fetch lead data
+     * get query to fetch lead data.
      *
      * @param $config
      */
     public function getFetchQuery($config)
     {
-
     }
 
     /**
-     * Amend mapped lead data before creating to Mautic
+     * Amend mapped lead data before creating to Mautic.
      *
      * @param $mappedData
      */
-    public function amendLeadDataBeforeMauticPopulate($data, $object )
+    public function amendLeadDataBeforeMauticPopulate($data, $object)
     {
         return null;
     }
@@ -157,7 +153,6 @@ public function getClientSecretKey()
         return 'client_secret';
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -167,27 +162,27 @@ public function sortFieldsAlphabetically()
     }
 
     /**
-     * Get the API helper
+     * Get the API helper.
      *
-     * @return Object
+     * @return object
      */
     public function getApiHelper()
     {
         static $helper;
         if (empty($helper)) {
-            $class = '\\MauticPlugin\\MauticCrmBundle\\Api\\'.$this->getName().'Api';
+            $class  = '\\MauticPlugin\\MauticCrmBundle\\Api\\'.$this->getName().'Api';
             $helper = new $class($this);
         }
 
         return $helper;
     }
 
-    public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = null, $leadId){
-        return array();
+    public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = null, $leadId)
+    {
+        return [];
     }
 
-    public function pushLeadActivity($params = array())
+    public function pushLeadActivity($params = [])
     {
-
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticCrmBundle/Integration/HubspotIntegration.php b/plugins/MauticCrmBundle/Integration/HubspotIntegration.php
index 7893c5c4e08..b26cff43f0d 100644
--- a/plugins/MauticCrmBundle/Integration/HubspotIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/HubspotIntegration.php
@@ -1,13 +1,14 @@
 <?php
 
 /**
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
  *
  * @link        http://mautic.org
  *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
+
 namespace MauticPlugin\MauticCrmBundle\Integration;
 
 /**
@@ -32,9 +33,9 @@ public function getName()
      */
     public function getRequiredKeyFields()
     {
-        return array(
+        return [
             $this->getApiKey() => 'mautic.hubspot.form.apikey',
-        );
+        ];
     }
 
     /**
@@ -60,10 +61,10 @@ public function getAuthTokenKey()
      */
     public function getFormSettings()
     {
-        return array(
-            'requires_callback' => false,
+        return [
+            'requires_callback'      => false,
             'requires_authorization' => false,
-        );
+        ];
     }
     /**
      * {@inheritdoc}
@@ -86,9 +87,9 @@ public function getApiUrl()
     /**
      * @return array|mixed
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        $hubsFields = array();
+        $hubsFields        = [];
         $silenceExceptions = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
         try {
             if ($this->isAuthorized()) {
@@ -96,10 +97,10 @@ public function getAvailableLeadFields($settings = array())
 
                 if (isset($leadFields)) {
                     foreach ($leadFields as $fieldInfo) {
-                        $hubsFields[$fieldInfo['name']] = array(
-                            'type' => 'string',
+                        $hubsFields[$fieldInfo['name']] = [
+                            'type'  => 'string',
                             'label' => $fieldInfo['label'],
-                        );
+                        ];
                     }
                 }
                 // Email is Required for this kind of integration
@@ -123,15 +124,15 @@ public function getAvailableLeadFields($settings = array())
      *
      * @return array
      */
-    public function formatLeadDataForCreateOrUpdate($leadData = array())
+    public function formatLeadDataForCreateOrUpdate($leadData = [])
     {
-        $formattedLeadData = array();
+        $formattedLeadData = [];
 
         foreach ($leadData as $field => $value) {
-            $formattedLeadData['properties'][] = array(
+            $formattedLeadData['properties'][] = [
                 'property' => $field,
-                'value' => $value,
-            );
+                'value'    => $value,
+            ];
         }
 
         return $formattedLeadData;
diff --git a/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php b/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php
index 4ca6500756f..c51849fdb24 100644
--- a/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/SalesforceIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -18,11 +19,10 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
- * Class SalesforceIntegration
+ * Class SalesforceIntegration.
  */
 class SalesforceIntegration extends CrmAbstractIntegration
 {
-
     /**
      * {@inheritdoc}
      *
@@ -34,7 +34,7 @@ public function getName()
     }
 
     /**
-     * Get the array key for clientId
+     * Get the array key for clientId.
      *
      * @return string
      */
@@ -44,7 +44,7 @@ public function getClientIdKey()
     }
 
     /**
-     * Get the array key for client secret
+     * Get the array key for client secret.
      *
      * @return string
      */
@@ -54,7 +54,7 @@ public function getClientSecretKey()
     }
 
     /**
-     * Get the array key for the auth token
+     * Get the array key for the auth token.
      *
      * @return string
      */
@@ -72,12 +72,12 @@ public function getRequiredKeyFields()
     {
         return [
             'client_id'     => 'mautic.integration.keyfield.consumerid',
-            'client_secret' => 'mautic.integration.keyfield.consumersecret'
+            'client_secret' => 'mautic.integration.keyfield.consumersecret',
         ];
     }
 
     /**
-     * Get the keys for the refresh token and expiry
+     * Get the keys for the refresh token and expiry.
      *
      * @return array
      */
@@ -188,7 +188,6 @@ public function getAvailableLeadFields($settings = [])
                         }
                         $leadObject[$sfObject] = $this->getApiHelper()->getLeadFields($sfObject);
                         if (!empty($leadObject) && isset($leadObject[$sfObject]['fields'])) {
-
                             foreach ($leadObject[$sfObject]['fields'] as $fieldInfo) {
                                 if (!$fieldInfo['updateable'] || !isset($fieldInfo['name'])
                                     || in_array(
@@ -202,7 +201,7 @@ public function getAvailableLeadFields($settings = [])
                                 $salesFields[$fieldInfo['name'].' - '.$sfObject] = [
                                     'type'     => 'string',
                                     'label'    => $sfObject.' - '.$fieldInfo['label'],
-                                    'required' => (empty($fieldInfo['nillable']) && !in_array($fieldInfo['name'], ['Status']))
+                                    'required' => (empty($fieldInfo['nillable']) && !in_array($fieldInfo['name'], ['Status'])),
                                 ];
                             }
                         }
@@ -210,7 +209,6 @@ public function getAvailableLeadFields($settings = [])
                 } else {
                     $leadObject = $this->getApiHelper()->getLeadFields('Lead');
                     if (!empty($leadObject) && isset($leadObject['fields'])) {
-
                         foreach ($leadObject['fields'] as $fieldInfo) {
                             if (!$fieldInfo['updateable'] || !isset($fieldInfo['name']) || in_array($fieldInfo['type'], ['reference', 'boolean'])) {
                                 continue;
@@ -219,7 +217,7 @@ public function getAvailableLeadFields($settings = [])
                             $salesFields[$fieldInfo['name']] = [
                                 'type'     => 'string',
                                 'label'    => $fieldInfo['label'],
-                                'required' => (empty($fieldInfo['nillable']) && !in_array($fieldInfo['name'], ['Status']))
+                                'required' => (empty($fieldInfo['nillable']) && !in_array($fieldInfo['name'], ['Status'])),
                             ];
                         }
                     }
@@ -254,14 +252,13 @@ public function getFormNotes($section)
 
     public function getFetchQuery($params)
     {
-
         $dateRange = $params;
 
         return $dateRange;
     }
 
     /**
-     * Amend mapped lead data before creating to Mautic
+     * Amend mapped lead data before creating to Mautic.
      *
      * @param $data
      */
@@ -275,12 +272,11 @@ public function amendLeadDataBeforeMauticPopulate($data, $object)
         $count = 0;
 
         if (isset($data['records']) and $object !== 'Activity') {
-
             foreach ($data['records'] as $record) {
                 $integrationEntities = [];
 
                 foreach ($record as $key => $item) {
-                    $dataObject[$key."__".$object] = $item;
+                    $dataObject[$key.'__'.$object] = $item;
                 }
 
                 if ($dataObject) {
@@ -298,12 +294,11 @@ public function amendLeadDataBeforeMauticPopulate($data, $object)
                         $integrationEntity->setInternalEntityId($lead->getId());
                         $integrationEntities[] = $integrationEntity;
                     } else {
-
                         $integrationEntity = $integrationEntityRepo->getEntity($integrationId[0]['id']);
                         $integrationEntity->setLastSyncDate(new \DateTime());
                         $integrationEntities[] = $integrationEntity;
                     }
-                    $count++;
+                    ++$count;
                 }
 
                 $this->factory->getEntityManager()->getRepository('MauticPluginBundle:IntegrationEntity')->saveEntities($integrationEntities);
@@ -328,8 +323,8 @@ public function appendToForm(&$builder, $data, $formArea)
                 'sandbox',
                 'choice',
                 [
-                    'choices'     => [
-                        'sandbox' => 'mautic.salesforce.sandbox'
+                    'choices' => [
+                        'sandbox' => 'mautic.salesforce.sandbox',
                     ],
                     'expanded'    => true,
                     'multiple'    => true,
@@ -347,10 +342,10 @@ public function appendToForm(&$builder, $data, $formArea)
                 'objects',
                 'choice',
                 [
-                    'choices'     => [
+                    'choices' => [
                         'Lead'     => 'mautic.salesforce.object.lead',
                         'Contact'  => 'mautic.salesforce.object.contact',
-                        'Activity' => 'mautic.salesforce.object.activity'
+                        'Activity' => 'mautic.salesforce.object.activity',
                     ],
                     'expanded'    => true,
                     'multiple'    => true,
@@ -404,7 +399,7 @@ public function pushLead($lead, $config = [])
             return [];
         }
 
-        $object = 'Lead';//Salesforce objects, default is Lead
+        $object = 'Lead'; //Salesforce objects, default is Lead
 
         $fields = array_keys($config['leadFields']);
 
@@ -421,7 +416,6 @@ public function pushLead($lead, $config = [])
             if ($this->isAuthorized()) {
                 $createdLeadData = $this->getApiHelper()->createLead($mappedData[$object], $lead);
                 if ($createdLeadData['Id']) {
-
                     $integrationEntityRepo = $this->factory->getEntityManager()->getRepository('MauticPluginBundle:IntegrationEntity');
                     $integrationId         = $integrationEntityRepo->getIntegrationsEntityId('Salesforce', $object, 'leads', $lead->getId());
 
@@ -439,7 +433,6 @@ public function pushLead($lead, $config = [])
                     $integrationEntity->setLastSyncDate(new \DateTime());
                     $this->factory->getEntityManager()->persist($integrationEntity);
                     $this->factory->getEntityManager()->flush($integrationEntity);
-
                 }
 
                 return true;
@@ -460,7 +453,7 @@ public function getLeads($params = [], $query = null)
 
         $config = $this->mergeConfigToFeatureSettings([]);
 
-        $salesForceObjects[] = "Lead";
+        $salesForceObjects[] = 'Lead';
 
         if (isset($config['objects'])) {
             $salesForceObjects = $config['objects'];
@@ -496,6 +489,7 @@ public function getLeads($params = [], $query = null)
      * @param array $params
      *
      * @return int|null
+     *
      * @throws \Exception
      */
     public function pushLeadActivity($params = [])
@@ -508,7 +502,7 @@ public function pushLeadActivity($params = [])
         /** @var SalesforceApi $apiHelper */
         $apiHelper = $this->getApiHelper();
 
-        $salesForceObjects[] = "Lead";
+        $salesForceObjects[] = 'Lead';
         if (isset($config['objects'])) {
             $salesForceObjects = $config['objects'];
         }
@@ -516,9 +510,9 @@ public function pushLeadActivity($params = [])
         $integrationEntityRepo = $this->factory->getEntityManager()->getRepository(
             'MauticPluginBundle:IntegrationEntity'
         );
-        $startDate             = new \DateTime($query['start']);
-        $endDate               = new \DateTime($query['end']);
-        $limit                 = 100;
+        $startDate = new \DateTime($query['start']);
+        $endDate   = new \DateTime($query['end']);
+        $limit     = 100;
 
         foreach ($salesForceObjects as $object) {
             try {
@@ -597,11 +591,11 @@ public function pushLeadActivity($params = [])
     }
 
     /**
-     * Create or update existing Mautic lead from the integration's profile data
+     * Create or update existing Mautic lead from the integration's profile data.
      *
-     * @param mixed      $data    Profile data from integration
-     * @param bool|true  $persist Set to false to not persist lead to the database in this method
-     * @param array|null $socialCache
+     * @param mixed       $data        Profile data from integration
+     * @param bool|true   $persist     Set to false to not persist lead to the database in this method
+     * @param array|null  $socialCache
      * @param mixed||null $identifiers
      *
      * @return Lead
@@ -620,7 +614,6 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
         $matchedFields = $this->populateMauticLeadData($data, $config);
 
         if (empty($matchedFields)) {
-
             return;
         }
 
@@ -641,7 +634,6 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
         $lead->setNewlyCreated(true);
 
         if (count($uniqueLeadFieldData)) {
-
             $existingLeads = $this->factory->getEntityManager()->getRepository('MauticLeadBundle:Lead')
                 ->getLeadsByUniqueFields($uniqueLeadFieldData);
 
@@ -664,7 +656,7 @@ public function getMauticLead($data, $persist = true, $socialCache = null, $iden
             if (null !== $identifiers && in_array('public_activity', $this->getSupportedFeatures())) {
                 $this->getPublicActivity($identifiers, $leadSocialCache[$this->getName()]);
             }
-            
+
             $lead->setSocialCache($leadSocialCache);
         }
 
@@ -742,7 +734,6 @@ public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = nu
             $activity = [];
 
             if (isset($pointChangeLog[$leadId])) {
-
                 foreach ($pointChangeLog[$leadId] as $row) {
                     $typeString = "mautic.{$row['type']}.{$row['type']}";
                     $typeString = ($translator->hasId($typeString)) ? $translator->trans($typeString) : ucfirst($row['type']);
@@ -752,7 +743,7 @@ public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = nu
                         $subject = 'subtracted';
                         $row['delta'] *= -1;
                     }
-                    $pointsString                = $translator->transChoice(
+                    $pointsString = $translator->transChoice(
                         "mautic.salesforce.activity.points_{$subject}",
                         $row['delta'],
                         ['%points%' => $row['delta']]
@@ -762,7 +753,7 @@ public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = nu
                     $activity[$i]['description'] = "$typeString: {$row['eventName']} / {$row['actionName']}";
                     $activity[$i]['dateAdded']   = $row['dateAdded'];
                     $activity[$i]['id']          = 'pointChange'.$row['id'];
-                    $i++;
+                    ++$i;
                 }
             }
 
@@ -787,23 +778,23 @@ public function getLeadData(\DateTime $startDate = null, \DateTime $endDate = nu
                     $activity[$i]['description'] = $translator->trans('mautic.email.sent').": $name";
                     $activity[$i]['dateAdded']   = $row['dateSent'];
                     $activity[$i]['id']          = 'emailStat'.$row['id'];
-                    $i++;
+                    ++$i;
                 }
             }
 
             if (isset($formSubmissions[$leadId])) {
                 foreach ($formSubmissions[$leadId] as $row) {
                     $activity[$i]['eventType']   = 'form';
-                    $activity[$i]['name']        = $this->getTranslator()->trans('mautic.salesforce.activity.form').": ".$row['name'];
-                    $activity[$i]['description'] = $translator->trans('mautic.form.event.submitted').": ".$row['name'];
+                    $activity[$i]['name']        = $this->getTranslator()->trans('mautic.salesforce.activity.form').': '.$row['name'];
+                    $activity[$i]['description'] = $translator->trans('mautic.form.event.submitted').': '.$row['name'];
                     $activity[$i]['dateAdded']   = $row['dateSubmitted'];
                     $activity[$i]['id']          = 'formSubmission'.$row['id'];
-                    $i++;
+                    ++$i;
                 }
             }
 
             $leadActivity[$leadId] = [
-                'records' => $activity
+                'records' => $activity,
             ];
 
             unset($activity);
diff --git a/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php b/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php
index e9e16eb6a7a..85d81a24e49 100644
--- a/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/SugarcrmIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,15 +15,14 @@
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
- * Class SugarcrmIntegration
+ * Class SugarcrmIntegration.
  */
 class SugarcrmIntegration extends CrmAbstractIntegration
 {
-
     private $authorzationError;
 
     /**
-     * Returns the name of the social integration that must match the name of the file
+     * Returns the name of the social integration that must match the name of the file.
      *
      * @return string
      */
@@ -32,7 +32,7 @@ public function getName()
     }
 
     /**
-     * Get the array key for clientId
+     * Get the array key for clientId.
      *
      * @return string
      */
@@ -42,7 +42,7 @@ public function getClientIdKey()
     }
 
     /**
-     * Get the array key for client secret
+     * Get the array key for client secret.
      *
      * @return string
      */
@@ -58,32 +58,31 @@ public function getClientSecretKey()
      */
     public function getSecretKeys()
     {
-        return array(
+        return [
             'client_secret',
-            'password'
-        );
+            'password',
+        ];
     }
 
-
     /**
-     * Get the array key for the auth token
+     * Get the array key for the auth token.
      *
      * @return string
      */
-    public function getAuthTokenKey ()
+    public function getAuthTokenKey()
     {
         return (isset($this->keys['version']) && $this->keys['version'] == '6') ? 'id' : 'access_token';
     }
 
     /**
-     * SugarCRM 7 refresh tokens
+     * SugarCRM 7 refresh tokens.
      */
     public function getRefreshTokenKeys()
     {
-        return array(
+        return [
             'refresh_token',
-            'expires'
-        );
+            'expires',
+        ];
     }
 
     /**
@@ -103,20 +102,20 @@ public function getAccessTokenUrl()
      *
      * @return string
      */
-    public function getAuthLoginUrl ()
+    public function getAuthLoginUrl()
     {
-        return $this->factory->getRouter()->generate('mautic_integration_auth_callback', array('integration' => $this->getName()));
+        return $this->factory->getRouter()->generate('mautic_integration_auth_callback', ['integration' => $this->getName()]);
     }
 
     /**
-     * Retrieves and stores tokens returned from oAuthLogin
+     * Retrieves and stores tokens returned from oAuthLogin.
      *
      * @param array $settings
      * @param array $parameters
      *
      * @return array
      */
-    public function authCallback ($settings = array(), $parameters = array())
+    public function authCallback($settings = [], $parameters = [])
     {
         if (isset($this->keys['version']) && $this->keys['version'] == '6') {
             $success = $this->isAuthorized();
@@ -126,15 +125,15 @@ public function authCallback ($settings = array(), $parameters = array())
                 return false;
             }
         } else {
-            $settings   = array(
+            $settings = [
                 'grant_type'         => 'password',
-                'ignore_redirecturi' => true
-            );
-            $parameters = array(
+                'ignore_redirecturi' => true,
+            ];
+            $parameters = [
                 'username' => $this->keys['username'],
                 'password' => $this->keys['password'],
-                'platform' => 'base'
-            );
+                'platform' => 'base',
+            ];
 
             return parent::authCallback($settings, $parameters);
         }
@@ -147,51 +146,52 @@ public function authCallback ($settings = array(), $parameters = array())
      */
     public function getRequiredKeyFields()
     {
-        return array(
+        return [
             'sugarcrm_url'  => 'mautic.sugarcrm.form.url',
             'client_id'     => 'mautic.sugarcrm.form.clientkey',
             'client_secret' => 'mautic.sugarcrm.form.clientsecret',
             'username'      => 'mautic.sugarcrm.form.username',
-            'password'      => 'mautic.sugarcrm.form.password'
-        );
+            'password'      => 'mautic.sugarcrm.form.password',
+        ];
     }
 
     /**
      * @param array $settings
      *
      * @return array
+     *
      * @throws \Exception
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        $sugarFields       = array();
+        $sugarFields       = [];
         $silenceExceptions = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
         try {
             if ($this->isAuthorized()) {
-                $leadObject  = $this->getApiHelper()->getLeadFields();
+                $leadObject = $this->getApiHelper()->getLeadFields();
                 if ($leadObject != null) {
                     if (isset($leadObject['module_fields'])) {
                         //6.x/community
                         foreach ($leadObject['module_fields'] as $fieldInfo) {
-                            if (isset($fieldInfo['name']) && !in_array($fieldInfo['type'], array('id', 'assigned_user_name', 'bool', 'link', 'relate'))) {
-                                $sugarFields[$fieldInfo['name']] = array(
+                            if (isset($fieldInfo['name']) && !in_array($fieldInfo['type'], ['id', 'assigned_user_name', 'bool', 'link', 'relate'])) {
+                                $sugarFields[$fieldInfo['name']] = [
                                     'type'     => 'string',
                                     'label'    => $fieldInfo['label'],
-                                    'required' => !empty($fieldInfo['required'])
-                                );
+                                    'required' => !empty($fieldInfo['required']),
+                                ];
                             }
                         }
                     } elseif (isset($leadObject['fields'])) {
                         //7.x
                         foreach ($leadObject['fields'] as $fieldInfo) {
-                            if (isset($fieldInfo['name']) && empty($fieldInfo['readonly']) && !empty($fieldInfo['comment']) && !in_array($fieldInfo['type'], array('id', 'team_list', 'bool', 'link', 'relate'))) {
+                            if (isset($fieldInfo['name']) && empty($fieldInfo['readonly']) && !empty($fieldInfo['comment']) && !in_array($fieldInfo['type'], ['id', 'team_list', 'bool', 'link', 'relate'])) {
                                 $fieldName = (strpos($fieldInfo['name'], 'webtolead_email') === false) ? $fieldInfo['name'] : str_replace('webtolead_', '', $fieldInfo['name']);
 
-                                $sugarFields[$fieldName] = array(
+                                $sugarFields[$fieldName] = [
                                     'type'     => 'string',
                                     'label'    => $fieldInfo['comment'],
-                                    'required' => !empty($fieldInfo['required'])
-                                );
+                                    'required' => !empty($fieldInfo['required']),
+                                ];
                             }
                         }
                     }
@@ -221,7 +221,7 @@ public function getErrorsFromResponse($response)
             if (!empty($response['name'])) {
                 return $response['description'];
             } else {
-                return $this->factory->getTranslator()->trans("mautic.integration.error.genericerror", array(), "flashes");
+                return $this->factory->getTranslator()->trans('mautic.integration.error.genericerror', [], 'flashes');
             }
         } else {
             return parent::getErrorsFromResponse($response);
@@ -252,13 +252,12 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
         if ($authType == 'oauth2' && empty($settings['authorize_session'])) {
 
             // Append the access token as the oauth-token header
-            $headers                   = array(
-                "oauth-token: {$this->keys['access_token']}"
-            );
+            $headers = [
+                "oauth-token: {$this->keys['access_token']}",
+            ];
 
-            return array($parameters, $headers);
+            return [$parameters, $headers];
         } else {
-
             return parent::prepareRequest($url, $parameters, $method, $settings, $authType);
         }
     }
@@ -275,24 +274,24 @@ public function isAuthorized()
         }
 
         if ($this->keys['version'] == '6') {
-            $loginParams = array(
-                'user_auth'        => array(
+            $loginParams = [
+                'user_auth' => [
                     'user_name' => $this->keys['username'],
                     'password'  => md5($this->keys['password']),
-                    'version'   => '1'
-                ),
+                    'version'   => '1',
+                ],
                 'application_name' => 'Mautic',
-                'name_value_list'  => array(),
+                'name_value_list'  => [],
                 'method'           => 'login',
                 'input_type'       => 'JSON',
                 'response_type'    => 'JSON',
-            );
-            $parameters = array(
+            ];
+            $parameters = [
                 'method'        => 'login',
                 'input_type'    => 'JSON',
                 'response_type' => 'JSON',
-                'rest_data'     => json_encode($loginParams)
-            );
+                'rest_data'     => json_encode($loginParams),
+            ];
 
             $settings['auth_type'] = 'rest';
             $response              = $this->makeRequest($this->getAccessTokenUrl(), $parameters, 'GET', $settings);
@@ -302,7 +301,7 @@ public function isAuthorized()
 
             $this->authorzationError = $error;
 
-            return (empty($error));
+            return empty($error);
         } else {
             if ($this->isConfigured()) {
                 // SugarCRM 7 uses password grant type so login each time to ensure session is valid
@@ -336,19 +335,19 @@ public function prepareResponseForExtraction($data)
     public function appendToForm(&$builder, $data, $formArea)
     {
         if ($formArea == 'keys') {
-            $builder->add('version', 'button_group', array(
-                'choices' => array(
+            $builder->add('version', 'button_group', [
+                'choices' => [
                     '6' => '6.x/community',
-                    '7' => '7.x'
-                ),
-                'label' => 'mautic.sugarcrm.form.version',
-                'constraints' => array(
-                    new NotBlank(array(
-                        'message' => 'mautic.core.value.required'
-                    ))
-                ),
-                'required' => true
-            ));
+                    '7' => '7.x',
+                ],
+                'label'       => 'mautic.sugarcrm.form.version',
+                'constraints' => [
+                    new NotBlank([
+                        'message' => 'mautic.core.value.required',
+                    ]),
+                ],
+                'required' => true,
+            ]);
         }
     }
 
@@ -357,9 +356,9 @@ public function appendToForm(&$builder, $data, $formArea)
      */
     public function getFormSettings()
     {
-        return array(
+        return [
             'requires_callback'      => false,
-            'requires_authorization' => true
-        );
+            'requires_authorization' => true,
+        ];
     }
 }
diff --git a/plugins/MauticCrmBundle/Integration/VtigerIntegration.php b/plugins/MauticCrmBundle/Integration/VtigerIntegration.php
index dca8a0756dd..5f742d1d5e3 100644
--- a/plugins/MauticCrmBundle/Integration/VtigerIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/VtigerIntegration.php
@@ -1,23 +1,24 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticCrmBundle\Integration;
 
 /**
- * Class VtigerIntegration
+ * Class VtigerIntegration.
  */
 class VtigerIntegration extends CrmAbstractIntegration
 {
     private $authorzationError = '';
 
     /**
-     * Returns the name of the social integration that must match the name of the file
+     * Returns the name of the social integration that must match the name of the file.
      *
      * @return string
      */
@@ -41,17 +42,17 @@ public function getDisplayName()
      */
     public function getRequiredKeyFields()
     {
-        return array(
+        return [
             'url'       => 'mautic.vtiger.form.url',
             'username'  => 'mautic.vtiger.form.username',
-            'accessKey' => 'mautic.vtiger.form.password'
-        );
+            'accessKey' => 'mautic.vtiger.form.password',
+        ];
     }
 
     /**
      * @return string
      */
-    public function getClientIdKey ()
+    public function getClientIdKey()
     {
         return 'username';
     }
@@ -59,7 +60,7 @@ public function getClientIdKey ()
     /**
      * @return string
      */
-    public function getClientSecretKey ()
+    public function getClientSecretKey()
     {
         return 'accessKey';
     }
@@ -67,7 +68,7 @@ public function getClientSecretKey ()
     /**
      * @return string
      */
-    public function getAuthTokenKey ()
+    public function getAuthTokenKey()
     {
         return 'sessionName';
     }
@@ -91,11 +92,11 @@ public function isAuthorized()
             return false;
         }
 
-        $url         = $this->getApiUrl();
-        $parameters  = array(
+        $url        = $this->getApiUrl();
+        $parameters = [
             'operation' => 'getchallenge',
-            'username'  => $this->keys['username']
-        );
+            'username'  => $this->keys['username'],
+        ];
 
         $response = $this->makeRequest($url, $parameters);
 
@@ -103,11 +104,11 @@ public function isAuthorized()
             return $this->getErrorsFromResponse($response);
         }
 
-        $loginParameters = array(
+        $loginParameters = [
             'operation' => 'login',
             'username'  => $this->keys['username'],
-            'accessKey' => md5($response['result']['token'] . $this->keys['accessKey'])
-        );
+            'accessKey' => md5($response['result']['token'].$this->keys['accessKey']),
+        ];
 
         $response = $this->makeRequest($url, $loginParameters, 'POST');
 
@@ -124,6 +125,7 @@ public function isAuthorized()
                 return true;
             } else {
                 $this->authorzationError = $error;
+
                 return false;
             }
         }
@@ -134,20 +136,20 @@ public function isAuthorized()
      *
      * @return string
      */
-    public function getAuthLoginUrl ()
+    public function getAuthLoginUrl()
     {
-        return $this->factory->getRouter()->generate('mautic_integration_auth_callback', array('integration' => $this->getName()));
+        return $this->factory->getRouter()->generate('mautic_integration_auth_callback', ['integration' => $this->getName()]);
     }
 
     /**
-     * Retrieves and stores tokens returned from oAuthLogin
+     * Retrieves and stores tokens returned from oAuthLogin.
      *
      * @param array $settings
      * @param array $parameters
      *
      * @return array
      */
-    public function authCallback ($settings = array(), $parameters = array())
+    public function authCallback($settings = [], $parameters = [])
     {
         $success = $this->isAuthorized();
         if (!$success) {
@@ -160,28 +162,28 @@ public function authCallback ($settings = array(), $parameters = array())
     /**
      * @return mixed|void
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        $vtigerFields      = array();
+        $vtigerFields      = [];
         $silenceExceptions = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
         try {
             if ($this->isAuthorized()) {
                 $leadObject = $this->getApiHelper()->getLeadFields();
 
                 if ($leadObject == null || !isset($leadObject['fields'])) {
-                    return array();
+                    return [];
                 }
 
                 foreach ($leadObject['fields'] as $fieldInfo) {
-                    if (!isset($fieldInfo['name']) || !$fieldInfo['editable'] || in_array($fieldInfo['type']['name'], array('owner', 'reference', 'boolean', 'autogenerated'))) {
+                    if (!isset($fieldInfo['name']) || !$fieldInfo['editable'] || in_array($fieldInfo['type']['name'], ['owner', 'reference', 'boolean', 'autogenerated'])) {
                         continue;
                     }
 
-                    $vtigerFields[$fieldInfo['name']] = array(
-                        'type'      => 'string',
-                        'label'     => $fieldInfo['label'],
-                        'required'  => $fieldInfo['mandatory']
-                    );
+                    $vtigerFields[$fieldInfo['name']] = [
+                        'type'     => 'string',
+                        'label'    => $fieldInfo['label'],
+                        'required' => $fieldInfo['mandatory'],
+                    ];
                 }
             }
         } catch (ErrorException $exception) {
@@ -190,6 +192,7 @@ public function getAvailableLeadFields($settings = array())
             if (!$silenceExceptions) {
                 throw $exception;
             }
+
             return false;
         }
 
@@ -203,16 +206,15 @@ public function getAvailableLeadFields($settings = array())
      *
      * @return string
      */
-    public function getFormNotes ($section)
+    public function getFormNotes($section)
     {
         if ($section == 'leadfield_match') {
-            return array('mautic.vtiger.form.field_match_notes', 'info');
+            return ['mautic.vtiger.form.field_match_notes', 'info'];
         }
 
         return parent::getFormNotes($section);
     }
 
-
     /**
      * {@inheritdoc}
      *
@@ -231,9 +233,9 @@ public function amendLeadDataBeforePush(&$mappedData)
      */
     public function getFormSettings()
     {
-        return array(
+        return [
             'requires_callback'      => false,
-            'requires_authorization' => true
-        );
+            'requires_authorization' => true,
+        ];
     }
 }
diff --git a/plugins/MauticCrmBundle/Integration/ZohoIntegration.php b/plugins/MauticCrmBundle/Integration/ZohoIntegration.php
index 7b1c7c2ff66..1a39f55fc12 100644
--- a/plugins/MauticCrmBundle/Integration/ZohoIntegration.php
+++ b/plugins/MauticCrmBundle/Integration/ZohoIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,17 +13,16 @@
 use Mautic\CoreBundle\Helper\InputHelper;
 
 /**
- * Class ZohoIntegration
+ * Class ZohoIntegration.
  */
 class ZohoIntegration extends CrmAbstractIntegration
 {
-
     /**
-     * Returns the name of the social integration that must match the name of the file
+     * Returns the name of the social integration that must match the name of the file.
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return 'Zoho';
     }
@@ -32,18 +32,18 @@ public function getName ()
      *
      * @return array
      */
-    public function getRequiredKeyFields ()
+    public function getRequiredKeyFields()
     {
-        return array(
+        return [
             $this->getClientIdKey()     => 'mautic.zoho.form.email',
-            $this->getClientSecretKey() => 'mautic.zoho.form.password'
-        );
+            $this->getClientSecretKey() => 'mautic.zoho.form.password',
+        ];
     }
 
     /**
      * @return string
      */
-    public function getClientIdKey ()
+    public function getClientIdKey()
     {
         return 'EMAIL_ID';
     }
@@ -51,7 +51,7 @@ public function getClientIdKey ()
     /**
      * @return string
      */
-    public function getClientSecretKey ()
+    public function getClientSecretKey()
     {
         return 'PASSWORD';
     }
@@ -59,7 +59,7 @@ public function getClientSecretKey ()
     /**
      * @return string
      */
-    public function getAuthTokenKey ()
+    public function getAuthTokenKey()
     {
         return 'AUTHTOKEN';
     }
@@ -77,28 +77,28 @@ public function getApiUrl()
      */
     public function getFormSettings()
     {
-        return array(
+        return [
             'requires_callback'      => false,
-            'requires_authorization' => true
-        );
+            'requires_authorization' => true,
+        ];
     }
 
     /**
      * @return bool
      */
-    public function authCallback($settings = array(), $parameters = array())
+    public function authCallback($settings = [], $parameters = [])
     {
         $request_url = 'https://accounts.zoho.com/apiauthtoken/nb/create';
-        $parameters  = array(
+        $parameters  = [
             'SCOPE'    => 'ZohoCRM/crmapi',
             'EMAIL_ID' => $this->keys[$this->getClientIdKey()],
-            'PASSWORD' => $this->keys[$this->getClientSecretKey()]
-        );
+            'PASSWORD' => $this->keys[$this->getClientSecretKey()],
+        ];
 
-        $response = $this->makeRequest($request_url, $parameters, 'GET', array('authorize_session' => true));
+        $response = $this->makeRequest($request_url, $parameters, 'GET', ['authorize_session' => true]);
 
         if ($response['RESULT'] == 'FALSE') {
-            return $this->factory->getTranslator()->trans("mautic.zoho.auth_error", array('%cause%' => (isset($response['CAUSE']) ? $response['CAUSE'] : 'UNKNOWN')));
+            return $this->factory->getTranslator()->trans('mautic.zoho.auth_error', ['%cause%' => (isset($response['CAUSE']) ? $response['CAUSE'] : 'UNKNOWN')]);
         }
 
         return $this->extractAuthKeys($response);
@@ -127,9 +127,10 @@ public function parseCallbackResponse($data, $postAuthorization = false)
                     $parts                 = explode('=', $string_attribute);
                     $attributes[$parts[0]] = $parts[1];
                 }
+
                 return $attributes;
             } else {
-                return array();
+                return [];
             }
         } else {
             return parent::parseCallbackResponse($data, $postAuthorization);
@@ -139,35 +140,36 @@ public function parseCallbackResponse($data, $postAuthorization = false)
     /**
      * @return array
      */
-    public function getAvailableLeadFields ($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        $zohoFields        = array();
+        $zohoFields        = [];
         $silenceExceptions = (isset($settings['silence_exceptions'])) ? $settings['silence_exceptions'] : true;
         try {
             if ($this->isAuthorized()) {
                 $leadObject = $this->getApiHelper()->getLeadFields();
 
                 if ($leadObject == null || (isset($leadObject['response']) && isset($leadObject['response']['error']))) {
-                    return array();
+                    return [];
                 }
 
-                $zohoFields = array();
+                $zohoFields = [];
                 foreach ($leadObject['Leads']['section'] as $optgroup) {
                     //$zohoFields[$optgroup['dv']] = array();
-                    if (!array_key_exists(0, $optgroup['FL']))
-                        $optgroup['FL'] = array($optgroup['FL']);
+                    if (!array_key_exists(0, $optgroup['FL'])) {
+                        $optgroup['FL'] = [$optgroup['FL']];
+                    }
                     foreach ($optgroup['FL'] as $field) {
-                        if (!(bool)$field['isreadonly'] || in_array($field['type'], array('Lookup', 'OwnerLookup', 'Boolean'))) {
+                        if (!(bool) $field['isreadonly'] || in_array($field['type'], ['Lookup', 'OwnerLookup', 'Boolean'])) {
                             continue;
                         }
 
                         $key              = InputHelper::alphanum(InputHelper::transliterate($field['dv']));
-                        $zohoFields[$key] = array(
+                        $zohoFields[$key] = [
                             'type'     => 'string',
                             'label'    => $field['label'],
                             'dv'       => $field['dv'],
-                            'required' => ($field['req'] == 'true')
-                        );
+                            'required' => ($field['req'] == 'true'),
+                        ];
                     }
                 }
             }
@@ -205,7 +207,7 @@ public function convertLeadFieldKey($key, $field)
      *
      * @return array
      */
-    public function populateLeadData ($lead, $config = array())
+    public function populateLeadData($lead, $config = [])
     {
         $mappedData = parent::populateLeadData($lead, $config);
 
diff --git a/plugins/MauticCrmBundle/MauticCrmBundle.php b/plugins/MauticCrmBundle/MauticCrmBundle.php
index 2f522d9fa8b..c7a10c54d51 100644
--- a/plugins/MauticCrmBundle/MauticCrmBundle.php
+++ b/plugins/MauticCrmBundle/MauticCrmBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Mautic\PluginBundle\Bundle\PluginBundleBase;
 
 /**
- * Class MauticCrmBundle
- *
- * @package MauticPlugin\MauticCrmBundle
+ * Class MauticCrmBundle.
  */
-
 class MauticCrmBundle extends PluginBundleBase
 {
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Api/ConstantContactApi.php b/plugins/MauticEmailMarketingBundle/Api/ConstantContactApi.php
index dd52c4fb3c3..1a1df2eee4a 100644
--- a/plugins/MauticEmailMarketingBundle/Api/ConstantContactApi.php
+++ b/plugins/MauticEmailMarketingBundle/Api/ConstantContactApi.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,22 +12,22 @@
 
 use Mautic\PluginBundle\Exception\ApiErrorException;
 
-class ConstantContactApi extends EmailMarketingApi{
-
+class ConstantContactApi extends EmailMarketingApi
+{
     private $version = 'v2';
 
-    protected function request($endpoint, $parameters = array(), $method = 'GET', $query = array())
+    protected function request($endpoint, $parameters = [], $method = 'GET', $query = [])
     {
         $url = sprintf('https://api.constantcontact.com/%s/%s?api_key=%s', $this->version, $endpoint, $this->keys['client_id']);
 
-        $response = $this->integration->makeRequest($url, $parameters, $method, array(
+        $response = $this->integration->makeRequest($url, $parameters, $method, [
             'encode_parameters' => 'json',
             'append_auth_token' => true,
-            'query'             => $query
-        ));
+            'query'             => $query,
+        ]);
 
         if (is_array($response) && !empty($response[0]['error_message'])) {
-            $errors = array();
+            $errors = [];
             foreach ($response as $error) {
                 $errors[] = $error['error_message'];
             }
@@ -39,6 +40,7 @@ protected function request($endpoint, $parameters = array(), $method = 'GET', $q
 
     /**
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
     public function getLists()
@@ -53,23 +55,24 @@ public function getLists()
      * @param array $config
      *
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
-    public function subscribeLead($email, $listId, $fields = array(), $config = array())
+    public function subscribeLead($email, $listId, $fields = [], $config = [])
     {
-        $parameters = array_merge($fields, array(
-            'lists'   => array(
-                array('id' => "$listId")
-            ),
-            'email_addresses' => array(
-                array('email_address' => $email)
-            ),
-        ));
+        $parameters = array_merge($fields, [
+            'lists' => [
+                ['id' => "$listId"],
+            ],
+            'email_addresses' => [
+                ['email_address' => $email],
+            ],
+        ]);
 
-        $query = array(
-            'action_by' => $config['action_by']
-        );
+        $query = [
+            'action_by' => $config['action_by'],
+        ];
 
         return $this->request('contacts', $parameters, 'POST', $query);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Api/EmailMarketingApi.php b/plugins/MauticEmailMarketingBundle/Api/EmailMarketingApi.php
index abab373134d..ae9647964e5 100644
--- a/plugins/MauticEmailMarketingBundle/Api/EmailMarketingApi.php
+++ b/plugins/MauticEmailMarketingBundle/Api/EmailMarketingApi.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,17 +12,17 @@
 
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 
-class EmailMarketingApi {
-
+class EmailMarketingApi
+{
     protected $integration;
     protected $keys;
 
     /**
      * @param AbstractIntegration $integration
      */
-    public function __construct (AbstractIntegration $integration)
+    public function __construct(AbstractIntegration $integration)
     {
         $this->integration = $integration;
         $this->keys        = $integration->getKeys();
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Api/IcontactApi.php b/plugins/MauticEmailMarketingBundle/Api/IcontactApi.php
index a1c107fbcfc..40841b63736 100644
--- a/plugins/MauticEmailMarketingBundle/Api/IcontactApi.php
+++ b/plugins/MauticEmailMarketingBundle/Api/IcontactApi.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,18 +12,18 @@
 
 use Mautic\PluginBundle\Exception\ApiErrorException;
 
-class IcontactApi extends EmailMarketingApi{
-
+class IcontactApi extends EmailMarketingApi
+{
     private $version = '2.2';
 
-    protected function request($endpoint, $parameters = array(), $method = 'GET')
+    protected function request($endpoint, $parameters = [], $method = 'GET')
     {
         $url = sprintf('%s/%s/c/%s/%s', $this->integration->getApiUrl(), $this->keys['accountId'], $this->keys['clientFolderId'], $endpoint);
 
-        $response = $this->integration->makeRequest($url, $parameters, $method, array(
+        $response = $this->integration->makeRequest($url, $parameters, $method, [
             'encode_parameters'    => 'json',
-            'encoding_headers_set' => true
-        ));
+            'encoding_headers_set' => true,
+        ]);
 
         if (is_array($response) && !empty($response['errors'])) {
             throw new ApiErrorException(implode(' ', $response['errors']));
@@ -33,6 +34,7 @@ protected function request($endpoint, $parameters = array(), $method = 'GET')
 
     /**
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
     public function getLists()
@@ -42,6 +44,7 @@ public function getLists()
 
     /**
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
     public function getCustomFields()
@@ -54,26 +57,27 @@ public function getCustomFields()
      * @param array $fields
      *
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
     public function subscribeLead($listId, $fields)
     {
         $fields['status'] = 'normal';
 
-        $contacts = $this->request('contacts', array($fields), 'POST');
+        $contacts = $this->request('contacts', [$fields], 'POST');
 
         if (!empty($contacts['contacts'][0]['contactId'])) {
             $contactId = $contacts['contacts'][0]['contactId'];
 
-            $fields = array(
+            $fields = [
                 'status'    => 'normal',
                 'listId'    => $listId,
-                'contactId' => $contactId
-            );
+                'contactId' => $contactId,
+            ];
 
-            return $this->request("subscriptions", array($fields), 'POST');
+            return $this->request('subscriptions', [$fields], 'POST');
         }
 
         return $contacts;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Api/MailchimpApi.php b/plugins/MauticEmailMarketingBundle/Api/MailchimpApi.php
index 1ccaae4ee84..9891c39e0e4 100644
--- a/plugins/MauticEmailMarketingBundle/Api/MailchimpApi.php
+++ b/plugins/MauticEmailMarketingBundle/Api/MailchimpApi.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,8 +12,8 @@
 
 use Mautic\PluginBundle\Exception\ApiErrorException;
 
-class MailchimpApi extends EmailMarketingApi{
-
+class MailchimpApi extends EmailMarketingApi
+{
     private $version = '2.0';
 
     /**
@@ -21,15 +22,15 @@ class MailchimpApi extends EmailMarketingApi{
      * @param string $method
      *
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
-    protected function request($endpoint, $parameters = array(), $method = 'GET')
+    protected function request($endpoint, $parameters = [], $method = 'GET')
     {
         if (isset($this->keys['password'])) {
             // Extract the dc from the key
-            $parts   = explode('-', $this->keys['password']);
+            $parts = explode('-', $this->keys['password']);
             if (count($parts) !== 2) {
-
                 throw new ApiErrorException('Invalid key');
             }
 
@@ -42,38 +43,37 @@ protected function request($endpoint, $parameters = array(), $method = 'GET')
         }
         $url = sprintf('%s/%s/%s', $apiUrl, $this->version, $endpoint);
 
-        $response = $this->integration->makeRequest($url, $parameters, $method, array('encode_parameters' => 'json'));
+        $response = $this->integration->makeRequest($url, $parameters, $method, ['encode_parameters' => 'json']);
 
         if (is_array($response) && !empty($response['status']) && $response['status'] == 'error') {
-
             throw new ApiErrorException($response['error']);
         } elseif (is_array($response) && !empty($response['errors'])) {
-            $errors = array();
+            $errors = [];
             foreach ($response['errors'] as $error) {
                 $errors[] = $error['error'];
             }
 
             throw new ApiErrorException(implode(' ', $errors));
         } else {
-
             return $response;
         }
     }
 
     public function getLists()
     {
-        return $this->request('lists/list', array('limit' => 100));
+        return $this->request('lists/list', ['limit' => 100]);
     }
 
     /**
      * @param $listId
      *
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
     public function getCustomFields($listId)
     {
-        return $this->request('lists/merge-vars', array('id' => array($listId)));
+        return $this->request('lists/merge-vars', ['id' => [$listId]]);
     }
 
     /**
@@ -83,19 +83,20 @@ public function getCustomFields($listId)
      * @param array $config
      *
      * @return mixed|string
+     *
      * @throws ApiErrorException
      */
-    public function subscribeLead($email, $listId, $fields = array(), $config = array())
+    public function subscribeLead($email, $listId, $fields = [], $config = [])
     {
         $emailStruct        = new \stdClass();
         $emailStruct->email = $email;
 
-        $parameters = array_merge($config, array(
-            'id'           => $listId,
-            'merge_vars'   => $fields,
-        ));
+        $parameters = array_merge($config, [
+            'id'         => $listId,
+            'merge_vars' => $fields,
+        ]);
         $parameters['email'] = $emailStruct;
 
         return $this->request('lists/subscribe', $parameters, 'POST');
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Config/config.php b/plugins/MauticEmailMarketingBundle/Config/config.php
index 006a3890edf..acc483e1552 100644
--- a/plugins/MauticEmailMarketingBundle/Config/config.php
+++ b/plugins/MauticEmailMarketingBundle/Config/config.php
@@ -1,35 +1,36 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
+return [
     'name'        => 'Email Marketing',
     'description' => 'Enables integration with Mautic supported email marketing services.',
     'version'     => '1.0',
     'author'      => 'Mautic',
 
-    'services' => array(
-        'forms' => array(
-            'mautic.form.type.emailmarketing.mailchimp' => array(
+    'services' => [
+        'forms' => [
+            'mautic.form.type.emailmarketing.mailchimp' => [
                 'class'     => 'MauticPlugin\MauticEmailMarketingBundle\Form\Type\MailchimpType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'emailmarketing_mailchimp'
-            ),
-            'mautic.form.type.emailmarketing.constantcontact' => array(
+                'alias'     => 'emailmarketing_mailchimp',
+            ],
+            'mautic.form.type.emailmarketing.constantcontact' => [
                 'class'     => 'MauticPlugin\MauticEmailMarketingBundle\Form\Type\ConstantContactType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'emailmarketing_constantcontact'
-            ),
-            'mautic.form.type.emailmarketing.icontact' => array(
+                'alias'     => 'emailmarketing_constantcontact',
+            ],
+            'mautic.form.type.emailmarketing.icontact' => [
                 'class'     => 'MauticPlugin\MauticEmailMarketingBundle\Form\Type\IcontactType',
                 'arguments' => 'mautic.factory',
-                'alias'     => 'emailmarketing_icontact'
-            )
-        )
-    )
-);
+                'alias'     => 'emailmarketing_icontact',
+            ],
+        ],
+    ],
+];
diff --git a/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php b/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php
index c2ae2dbce6f..e3891608592 100644
--- a/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php
+++ b/plugins/MauticEmailMarketingBundle/Form/Type/ConstantContactType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,28 +12,23 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ConstantContactType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class ConstantContactType.
  */
 class ConstantContactType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
     private $factory;
 
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
@@ -41,7 +37,7 @@ public function __construct (MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
 
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
@@ -54,7 +50,7 @@ public function buildForm (FormBuilderInterface $builder, array $options)
         try {
             $lists = $api->getLists();
 
-            $choices = array();
+            $choices = [];
             if (!empty($lists)) {
                 foreach ($lists as $list) {
                     $choices[$list['id']] = $list['name'];
@@ -63,23 +59,23 @@ public function buildForm (FormBuilderInterface $builder, array $options)
                 asort($choices);
             }
         } catch (\Exception $e) {
-            $choices = array();
+            $choices = [];
             $error   = $e->getMessage();
         }
 
-        $builder->add('list', 'choice', array(
+        $builder->add('list', 'choice', [
             'choices'  => $choices,
             'label'    => 'mautic.emailmarketing.list',
             'required' => false,
-            'attr'     => array(
-                'tooltip'  => 'mautic.emailmarketing.list.tooltip'
-            )
-        ));
+            'attr'     => [
+                'tooltip' => 'mautic.emailmarketing.list.tooltip',
+            ],
+        ]);
 
-        $builder->add('sendWelcome', 'yesno_button_group', array(
-            'label'       => 'mautic.emailmarketing.send_welcome',
-            'data'        => (!isset($options['data']['sendWelcome'])) ? true : $options['data']['sendWelcome']
-        ));
+        $builder->add('sendWelcome', 'yesno_button_group', [
+            'label' => 'mautic.emailmarketing.send_welcome',
+            'data'  => (!isset($options['data']['sendWelcome'])) ? true : $options['data']['sendWelcome'],
+        ]);
 
         if (!empty($error)) {
             $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($error) {
@@ -96,32 +92,32 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
             $fields = $object->getFormLeadFields();
 
-            list ($specialInstructions, $alertType) = $object->getFormNotes('leadfield_match');
-            $builder->add('leadFields', 'integration_fields', array(
+            list($specialInstructions, $alertType) = $object->getFormNotes('leadfield_match');
+            $builder->add('leadFields', 'integration_fields', [
                 'label'                => 'mautic.integration.leadfield_matches',
                 'required'             => true,
                 'lead_fields'          => $leadFields,
-                'data'                 => isset($options['data']['leadFields']) ? $options['data']['leadFields'] : array(),
+                'data'                 => isset($options['data']['leadFields']) ? $options['data']['leadFields'] : [],
                 'integration_fields'   => $fields,
                 'special_instructions' => $specialInstructions,
-                'alert_type'           => $alertType
-            ));
+                'alert_type'           => $alertType,
+            ]);
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(array('form_area'));
+        $resolver->setOptional(['form_area']);
     }
 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "emailmarketing_constantcontact";
+        return 'emailmarketing_constantcontact';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Form/Type/IcontactType.php b/plugins/MauticEmailMarketingBundle/Form/Type/IcontactType.php
index e8266f69063..0c6ed13131f 100644
--- a/plugins/MauticEmailMarketingBundle/Form/Type/IcontactType.php
+++ b/plugins/MauticEmailMarketingBundle/Form/Type/IcontactType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
@@ -19,19 +19,16 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class ConstantContactType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class ConstantContactType.
  */
 class IcontactType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
     private $factory;
 
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
@@ -40,7 +37,7 @@ public function __construct (MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
 
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
@@ -53,7 +50,7 @@ public function buildForm (FormBuilderInterface $builder, array $options)
         try {
             $lists = $api->getLists();
 
-            $choices = array();
+            $choices = [];
             if (!empty($lists['lists'])) {
                 foreach ($lists['lists'] as $list) {
                     $choices[$list['listId']] = $list['name'];
@@ -62,18 +59,18 @@ public function buildForm (FormBuilderInterface $builder, array $options)
                 asort($choices);
             }
         } catch (\Exception $e) {
-            $choices = array();
+            $choices = [];
             $error   = $e->getMessage();
         }
 
-        $builder->add('list', 'choice', array(
+        $builder->add('list', 'choice', [
             'choices'  => $choices,
             'label'    => 'mautic.emailmarketing.list',
             'required' => false,
-            'attr'     => array(
-                'tooltip'  => 'mautic.emailmarketing.list.tooltip'
-            )
-        ));
+            'attr'     => [
+                'tooltip' => 'mautic.emailmarketing.list.tooltip',
+            ],
+        ]);
 
         if (!empty($error)) {
             $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($error) {
@@ -90,32 +87,32 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
             $fields = $object->getFormLeadFields();
 
-            list ($specialInstructions, $alertType) = $object->getFormNotes('leadfield_match');
-            $builder->add('leadFields', 'integration_fields', array(
+            list($specialInstructions, $alertType) = $object->getFormNotes('leadfield_match');
+            $builder->add('leadFields', 'integration_fields', [
                 'label'                => 'mautic.integration.leadfield_matches',
                 'required'             => true,
                 'lead_fields'          => $leadFields,
-                'data'                 => isset($options['data']['leadFields']) ? $options['data']['leadFields'] : array(),
+                'data'                 => isset($options['data']['leadFields']) ? $options['data']['leadFields'] : [],
                 'integration_fields'   => $fields,
                 'special_instructions' => $specialInstructions,
-                'alert_type'           => $alertType
-            ));
+                'alert_type'           => $alertType,
+            ]);
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(array('form_area'));
+        $resolver->setOptional(['form_area']);
     }
 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "emailmarketing_icontact";
+        return 'emailmarketing_icontact';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Form/Type/MailchimpType.php b/plugins/MauticEmailMarketingBundle/Form/Type/MailchimpType.php
index 15e470c8a71..94e14f683a6 100644
--- a/plugins/MauticEmailMarketingBundle/Form/Type/MailchimpType.php
+++ b/plugins/MauticEmailMarketingBundle/Form/Type/MailchimpType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
@@ -20,19 +20,16 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class MailchimpType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class MailchimpType.
  */
 class MailchimpType extends AbstractType
 {
-
     /**
      * @var MauticFactory
      */
     private $factory;
 
-    public function __construct (MauticFactory $factory)
+    public function __construct(MauticFactory $factory)
     {
         $this->factory = $factory;
     }
@@ -41,7 +38,7 @@ public function __construct (MauticFactory $factory)
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
 
         /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $helper */
@@ -54,7 +51,7 @@ public function buildForm (FormBuilderInterface $builder, array $options)
         try {
             $lists = $api->getLists();
 
-            $choices = array();
+            $choices = [];
             if (!empty($lists)) {
                 if ($lists['total']) {
                     foreach ($lists['data'] as $list) {
@@ -65,29 +62,29 @@ public function buildForm (FormBuilderInterface $builder, array $options)
                 asort($choices);
             }
         } catch (\Exception $e) {
-            $choices = array();
+            $choices = [];
             $error   = $e->getMessage();
         }
 
-        $builder->add('list', 'choice', array(
+        $builder->add('list', 'choice', [
             'choices'  => $choices,
             'label'    => 'mautic.emailmarketing.list',
             'required' => false,
-            'attr'     => array(
+            'attr'     => [
                 'tooltip'  => 'mautic.emailmarketing.list.tooltip',
-                'onchange' => 'Mautic.getIntegrationLeadFields(\'Mailchimp\', this, {"list": this.value});'
-            )
-        ));
+                'onchange' => 'Mautic.getIntegrationLeadFields(\'Mailchimp\', this, {"list": this.value});',
+            ],
+        ]);
 
-        $builder->add('doubleOptin', 'yesno_button_group', array(
-            'label'       => 'mautic.mailchimp.double_optin',
-            'data'        => (!isset($options['data']['doubleOptin'])) ? true : $options['data']['doubleOptin']
-        ));
+        $builder->add('doubleOptin', 'yesno_button_group', [
+            'label' => 'mautic.mailchimp.double_optin',
+            'data'  => (!isset($options['data']['doubleOptin'])) ? true : $options['data']['doubleOptin'],
+        ]);
 
-        $builder->add('sendWelcome', 'yesno_button_group', array(
-            'label'       => 'mautic.emailmarketing.send_welcome',
-            'data'        => (!isset($options['data']['sendWelcome'])) ? true : $options['data']['sendWelcome']
-        ));
+        $builder->add('sendWelcome', 'yesno_button_group', [
+            'label' => 'mautic.emailmarketing.send_welcome',
+            'data'  => (!isset($options['data']['sendWelcome'])) ? true : $options['data']['sendWelcome'],
+        ]);
 
         if (!empty($error)) {
             $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($error) {
@@ -103,35 +100,35 @@ public function buildForm (FormBuilderInterface $builder, array $options)
             $leadFields = $this->factory->getModel('plugin')->getLeadFields();
 
             $formModifier = function (FormInterface $form, $data) use ($mailchimp, $leadFields) {
-                $settings = array(
+                $settings = [
                     'silence_exceptions' => false,
-                    'feature_settings'   => array(
-                        'list_settings' => $data
-                    )
-                );
+                    'feature_settings'   => [
+                        'list_settings' => $data,
+                    ],
+                ];
 
                 try {
                     $fields = $mailchimp->getFormLeadFields($settings);
 
                     if (!is_array($fields)) {
-                        $fields = array();
+                        $fields = [];
                     }
                     $error = '';
                 } catch (\Exception $e) {
-                    $fields = array();
+                    $fields = [];
                     $error  = $e->getMessage();
                 }
 
-                list ($specialInstructions, $alertType) = $mailchimp->getFormNotes('leadfield_match');
-                $form->add('leadFields', 'integration_fields', array(
+                list($specialInstructions, $alertType) = $mailchimp->getFormNotes('leadfield_match');
+                $form->add('leadFields', 'integration_fields', [
                     'label'                => 'mautic.integration.leadfield_matches',
                     'required'             => true,
                     'lead_fields'          => $leadFields,
-                    'data'                 => isset($data['leadFields']) ? $data['leadFields'] : array(),
+                    'data'                 => isset($data['leadFields']) ? $data['leadFields'] : [],
                     'integration_fields'   => $fields,
                     'special_instructions' => $specialInstructions,
-                    'alert_type'           => $alertType
-                ));
+                    'alert_type'           => $alertType,
+                ]);
 
                 if ($error) {
                     $form->addError(new FormError($error));
@@ -157,16 +154,16 @@ function (FormEvent $event) use ($formModifier) {
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions (OptionsResolverInterface $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(array('form_area'));
+        $resolver->setOptional(['form_area']);
     }
 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "emailmarketing_mailchimp";
+        return 'emailmarketing_mailchimp';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Integration/ConstantContactIntegration.php b/plugins/MauticEmailMarketingBundle/Integration/ConstantContactIntegration.php
index 4f64439c700..f8f7d6e8999 100644
--- a/plugins/MauticEmailMarketingBundle/Integration/ConstantContactIntegration.php
+++ b/plugins/MauticEmailMarketingBundle/Integration/ConstantContactIntegration.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticEmailMarketingBundle\Integration;
 
 /**
- * Class ConstantContactIntegration
+ * Class ConstantContactIntegration.
  */
 class ConstantContactIntegration extends EmailAbstractIntegration
 {
-
     /**
      * {@inheritdoc}
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return 'ConstantContact';
     }
@@ -33,44 +33,43 @@ public function getDisplayName()
         return 'Constant Contact';
     }
 
-
     /**
      * {@inheritdoc}
      */
-    public function getAuthenticationType ()
+    public function getAuthenticationType()
     {
         return 'oauth2';
     }
 
     /**
-     * Get the URL required to obtain an oauth2 access token
+     * Get the URL required to obtain an oauth2 access token.
      *
      * @return string
      */
-    public function getAccessTokenUrl ()
+    public function getAccessTokenUrl()
     {
         return 'https://oauth2.constantcontact.com/oauth2/oauth/token';
     }
 
     /**
-     * Get the authentication/login URL for oauth2 access
+     * Get the authentication/login URL for oauth2 access.
      *
      * @return string
      */
-    public function getAuthenticationUrl ()
+    public function getAuthenticationUrl()
     {
         return 'https://oauth2.constantcontact.com/oauth2/oauth/siteowner/authorize';
     }
 
     /**
-     * Retrieves and stores tokens returned from oAuthLogin
+     * Retrieves and stores tokens returned from oAuthLogin.
      *
      * @param array $settings
      * @param array $parameters
      *
      * @return bool|string false if no error; otherwise the error string
      */
-    public function authCallback ($settings = array(), $parameters = array())
+    public function authCallback($settings = [], $parameters = [])
     {
         // Constanct Contact doesn't like POST
         $settings['method'] = 'GET';
@@ -81,13 +80,13 @@ public function authCallback ($settings = array(), $parameters = array())
     /**
      * @return array
      */
-    public function getAvailableLeadFields ($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
         if (!$this->isAuthorized()) {
-            return array();
+            return [];
         }
 
-        $fields = array(
+        $fields = [
             'email',
             'prefix_name',
             'first_name',
@@ -103,26 +102,26 @@ public function getAvailableLeadFields ($settings = array())
             'cell_phone',
             'fax',
             'work_phone',
-            'home_phone'
-        );
+            'home_phone',
+        ];
 
-        $leadFields = array();
+        $leadFields = [];
         foreach ($fields as $f) {
-            $leadFields[$f] = array(
-                'label'    => $this->factory->getTranslator()->trans('mautic.constantcontact.field.' . $f),
+            $leadFields[$f] = [
+                'label'    => $this->factory->getTranslator()->trans('mautic.constantcontact.field.'.$f),
                 'type'     => 'string',
-                'required' => ($f == 'email' ) ? true : false
-            );
+                'required' => ($f == 'email') ? true : false,
+            ];
         }
 
         $c = 1;
         while ($c <= 15) {
-            $leadFields['customfield_' . $c] = array(
-                'label'    => $this->factory->getTranslator()->trans('mautic.constantcontact.customfield.' . $f),
+            $leadFields['customfield_'.$c] = [
+                'label'    => $this->factory->getTranslator()->trans('mautic.constantcontact.customfield.'.$f),
                 'type'     => 'string',
-                'required' => false
-            );
-            $c++;
+                'required' => false,
+            ];
+            ++$c;
         }
 
         return $leadFields;
@@ -131,7 +130,7 @@ public function getAvailableLeadFields ($settings = array())
     /**
      * @param $lead
      */
-    public function pushLead($lead, $config = array())
+    public function pushLead($lead, $config = [])
     {
         $config = $this->mergeConfigToFeatureSettings($config);
 
@@ -150,18 +149,18 @@ public function pushLead($lead, $config = array())
                 $email = $mappedData['email'];
                 unset($mappedData['email']);
 
-                $addresses    = array();
-                $customfields = array();
+                $addresses    = [];
+                $customfields = [];
                 foreach ($mappedData as $k => $v) {
                     if (strpos($v, 'address_') === 0) {
                         $addresses[str_replace('address_', '', $k)] = $v;
                         unset($mappedData[$k]);
                     } elseif (strpos($v, 'customfield_') === 0) {
-                        $key = str_replace('customfield_', 'CustomField', $k);
-                        $customfields[] = array(
+                        $key            = str_replace('customfield_', 'CustomField', $k);
+                        $customfields[] = [
                             'name'  => $key,
-                            'value' => $v
-                        );
+                            'value' => $v,
+                        ];
                         unset($mappedData[$k]);
                     }
                 }
@@ -175,9 +174,9 @@ public function pushLead($lead, $config = array())
                     $mappedData['custom_fields'] = $customfields;
                 }
 
-                $options = array();
+                $options              = [];
                 $options['action_by'] = (!empty($config['list_settings']['sendWelcome'])) ? 'ACTION_BY_VISITOR' : 'ACTION_BY_OWNER';
-                $listId = $config['list_settings']['list'];
+                $listId               = $config['list_settings']['list'];
 
                 $this->getApiHelper()->subscribeLead($email, $listId, $mappedData, $options);
 
diff --git a/plugins/MauticEmailMarketingBundle/Integration/EmailAbstractIntegration.php b/plugins/MauticEmailMarketingBundle/Integration/EmailAbstractIntegration.php
index 0745c23fa15..f7f2e3fc671 100644
--- a/plugins/MauticEmailMarketingBundle/Integration/EmailAbstractIntegration.php
+++ b/plugins/MauticEmailMarketingBundle/Integration/EmailAbstractIntegration.php
@@ -1,32 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticEmailMarketingBundle\Integration;
 
 use Mautic\PluginBundle\Integration\AbstractIntegration;
-use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormBuilder;
 
 /**
- * Class EmailAbstractIntegration
- *
- * @package MauticPlugin\MauticCrmBundle\Integration
+ * Class EmailAbstractIntegration.
  */
 abstract class EmailAbstractIntegration extends AbstractIntegration
 {
-
     /**
      * @return array
      */
     public function getSupportedFeatures()
     {
-        return array('push_lead');
+        return ['push_lead'];
     }
 
     /**
@@ -37,15 +35,15 @@ public function appendToForm(&$builder, $data, $formArea)
         if ($formArea == 'features' || $formArea == 'integration') {
             if ($this->isAuthorized()) {
                 $name = strtolower($this->getName());
-                if ($this->factory->serviceExists('mautic.form.type.emailmarketing.' . $name)) {
+                if ($this->factory->serviceExists('mautic.form.type.emailmarketing.'.$name)) {
                     if ($formArea == 'integration' && isset($data['leadFields']) && empty($data['list_settings']['leadFields'])) {
                         $data['list_settings']['leadFields'] = $data['leadFields'];
                     }
-                    $builder->add('list_settings', 'emailmarketing_' . $name, array(
+                    $builder->add('list_settings', 'emailmarketing_'.$name, [
                         'label'     => false,
                         'form_area' => $formArea,
-                        'data'      => (isset($data['list_settings'])) ? $data['list_settings'] : array()
-                    ));
+                        'data'      => (isset($data['list_settings'])) ? $data['list_settings'] : [],
+                    ]);
                 }
             }
         }
@@ -60,15 +58,15 @@ public function getFormTheme()
     }
 
     /**
-     * Get the API helper
+     * Get the API helper.
      *
-     * @return Object
+     * @return object
      */
     public function getApiHelper()
     {
         static $helper;
         if (empty($helper)) {
-            $class = '\\MauticPlugin\\MauticEmailMarketingBundle\\Api\\'.$this->getName().'Api';
+            $class  = '\\MauticPlugin\\MauticEmailMarketingBundle\\Api\\'.$this->getName().'Api';
             $helper = new $class($this);
         }
 
@@ -76,13 +74,13 @@ public function getApiHelper()
     }
 
     /**
-     * Merges a config from integration_list with feature settings
+     * Merges a config from integration_list with feature settings.
      *
      * @param array $config
      *
      * @return array|mixed
      */
-    public function mergeConfigToFeatureSettings($config = array())
+    public function mergeConfigToFeatureSettings($config = [])
     {
         $featureSettings = $this->settings->getFeatureSettings();
 
@@ -97,5 +95,4 @@ public function mergeConfigToFeatureSettings($config = array())
 
         return $featureSettings;
     }
-
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Integration/IcontactIntegration.php b/plugins/MauticEmailMarketingBundle/Integration/IcontactIntegration.php
index da7b0b9e824..1f54da2c206 100644
--- a/plugins/MauticEmailMarketingBundle/Integration/IcontactIntegration.php
+++ b/plugins/MauticEmailMarketingBundle/Integration/IcontactIntegration.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticEmailMarketingBundle\Integration;
 
 /**
- * Class IcontactIntegration
+ * Class IcontactIntegration.
  */
 class IcontactIntegration extends EmailAbstractIntegration
 {
-
     /**
      * {@inheritdoc}
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return 'Icontact';
     }
@@ -28,7 +28,7 @@ public function getName ()
     /**
      * @return string
      */
-    public function getDisplayName ()
+    public function getDisplayName()
     {
         return 'iContact';
     }
@@ -39,17 +39,17 @@ public function getAuthenticationType()
     }
 
     /**
-     * Get a list of keys required to make an API call.  Examples are key, clientId, clientSecret
+     * Get a list of keys required to make an API call.  Examples are key, clientId, clientSecret.
      *
      * @return array
      */
-    public function getRequiredKeyFields ()
+    public function getRequiredKeyFields()
     {
-        return array(
-            'API-AppId'      => 'mautic.icontact.keyfield.appid',
-            'API-Username'   => 'mautic.icontact.keyfield.username',
-            'API-Password'   => 'mautic.icontact.keyfield.password'
-        );
+        return [
+            'API-AppId'    => 'mautic.icontact.keyfield.appid',
+            'API-Username' => 'mautic.icontact.keyfield.username',
+            'API-Password' => 'mautic.icontact.keyfield.password',
+        ];
     }
 
     /**
@@ -57,9 +57,9 @@ public function getRequiredKeyFields ()
      */
     public function getSecretKeys()
     {
-        return array(
-            'API-Password'
-        );
+        return [
+            'API-Password',
+        ];
     }
 
     public function getApiUrl()
@@ -68,12 +68,12 @@ public function getApiUrl()
     }
 
     /**
-     * Get account ID and client folder ID
+     * Get account ID and client folder ID.
      *
      * @param array $settings
      * @param array $parameters
      */
-    public function authCallback($settings = array(), $parameters = array())
+    public function authCallback($settings = [], $parameters = [])
     {
         $url = $this->getApiUrl();
 
@@ -89,11 +89,11 @@ public function authCallback($settings = array(), $parameters = array())
             return $response['errors']['message'];
         }
 
-        $keys = array();
+        $keys = [];
         if (!empty($response['accounts'])) {
             $keys['accountId'] = $response['accounts'][0]['accountId'];
 
-            $url .= '/' . $keys['accountId'] . '/c';
+            $url .= '/'.$keys['accountId'].'/c';
             $response = $this->makeRequest($url, $parameters);
 
             if (!empty($response['clientfolders'])) {
@@ -112,17 +112,17 @@ public function authCallback($settings = array(), $parameters = array())
      *
      * @return mixed|string
      */
-    public function makeRequest($url, $parameters = array(), $method = 'GET', $settings = array())
+    public function makeRequest($url, $parameters = [], $method = 'GET', $settings = [])
     {
-        $settings['headers'] = array(
+        $settings['headers'] = [
             'Except:',
             'Accept: application/json',
             'Content-Type: application/json',
             'Api-Version: 2.2',
-            'Api-AppId: ' . $this->keys['API-AppId'],
-            'Api-Username: ' . $this->keys['API-Username'],
-            'API-Password: ' . $this->keys['API-Password']
-        );
+            'Api-AppId: '.$this->keys['API-AppId'],
+            'Api-Username: '.$this->keys['API-Username'],
+            'API-Password: '.$this->keys['API-Password'],
+        ];
 
         return parent::makeRequest($url, $parameters, $method, $settings);
     }
@@ -147,31 +147,31 @@ public function isAuthorized()
     }
 
     /**
-     * Returns settings for the integration form
+     * Returns settings for the integration form.
      *
      * @return array
      */
     public function getFormSettings()
     {
-        return array(
+        return [
             'requires_callback'      => false,
-            'requires_authorization' => true
-        );
+            'requires_authorization' => true,
+        ];
     }
 
     /**
      * @return array
      */
-    public function getAvailableLeadFields ($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
         if (!$this->isAuthorized()) {
-            return array();
+            return [];
         }
 
-        static $leadFields = array();
+        static $leadFields = [];
 
         if (empty($leadFields)) {
-            $fields = array(
+            $fields = [
                 'email',
                 'prefix',
                 'firstName',
@@ -184,27 +184,27 @@ public function getAvailableLeadFields ($settings = array())
                 'postalCode',
                 'phone',
                 'fax',
-                'business'
-            );
+                'business',
+            ];
 
-            $leadFields = array();
+            $leadFields = [];
             foreach ($fields as $f) {
-                $leadFields[$f] = array(
-                    'label' => $this->factory->getTranslator()->trans('mautic.icontact.field.' . $f),
-                    'type'  => 'string',
-                    'required' => ($f == 'email' ) ? true : false
-                );
+                $leadFields[$f] = [
+                    'label'    => $this->factory->getTranslator()->trans('mautic.icontact.field.'.$f),
+                    'type'     => 'string',
+                    'required' => ($f == 'email') ? true : false,
+                ];
             }
 
-           $customfields = $this->getApiHelper()->getCustomFields();
+            $customfields = $this->getApiHelper()->getCustomFields();
 
             if (!empty($customfields['customfields'])) {
                 foreach ($customfields['customfields'] as $field) {
-                    $leadFields['cf_' . $field['customFieldId']] = array(
+                    $leadFields['cf_'.$field['customFieldId']] = [
                         'label'    => $field['publicName'],
                         'type'     => 'string',
-                        'required' => false
-                    );
+                        'required' => false,
+                    ];
                 }
             }
         }
@@ -212,11 +212,10 @@ public function getAvailableLeadFields ($settings = array())
         return $leadFields;
     }
 
-
     /**
      * @param $lead
      */
-    public function pushLead($lead, $config = array())
+    public function pushLead($lead, $config = [])
     {
         $config = $this->mergeConfigToFeatureSettings($config);
 
@@ -232,7 +231,7 @@ public function pushLead($lead, $config = array())
 
         try {
             if ($this->isAuthorized()) {
-                $customfields = array();
+                $customfields = [];
                 foreach ($mappedData as $k => &$v) {
                     if (strpos($k, 'cf_') === 0) {
                         $customfields[str_replace('cf_', '', $k)] = (string) $v;
diff --git a/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php b/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php
index 9ffe2528b71..adeb007fb20 100644
--- a/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php
+++ b/plugins/MauticEmailMarketingBundle/Integration/MailchimpIntegration.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticEmailMarketingBundle\Integration;
 
 /**
- * Class MailchimpIntegration
+ * Class MailchimpIntegration.
  */
 class MailchimpIntegration extends EmailAbstractIntegration
 {
-
     /**
      * {@inheritdoc}
      *
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return 'Mailchimp';
     }
@@ -36,27 +36,27 @@ public function getDisplayName()
     /**
      * {@inheritdoc}
      */
-    public function getAuthenticationType ()
+    public function getAuthenticationType()
     {
         return (empty($this->keys['client_id'])) ? 'basic' : 'oauth2';
     }
 
     /**
-     * Get the URL required to obtain an oauth2 access token
+     * Get the URL required to obtain an oauth2 access token.
      *
      * @return string
      */
-    public function getAccessTokenUrl ()
+    public function getAccessTokenUrl()
     {
         return 'https://login.mailchimp.com/oauth2/token';
     }
 
     /**
-     * Get the authentication/login URL for oauth2 access
+     * Get the authentication/login URL for oauth2 access.
      *
      * @return string
      */
-    public function getAuthenticationUrl ()
+    public function getAuthenticationUrl()
     {
         return 'https://login.mailchimp.com/oauth2/authorize';
     }
@@ -67,14 +67,14 @@ public function getAuthenticationUrl ()
     public function getRequiredKeyFields()
     {
         return (empty($this->keys['client_id'])) ?
-            array(
-                'username'      => 'mautic.integration.keyfield.username',
-                'password'      => 'mautic.integration.keyfield.api'
-            ) :
-            array(
-                'client_id'      => 'mautic.integration.keyfield.clientid',
-                'client_secret'  => 'mautic.integration.keyfield.clientsecret'
-            );
+            [
+                'username' => 'mautic.integration.keyfield.username',
+                'password' => 'mautic.integration.keyfield.api',
+            ] :
+            [
+                'client_id'     => 'mautic.integration.keyfield.clientid',
+                'client_secret' => 'mautic.integration.keyfield.clientsecret',
+            ];
     }
 
     /**
@@ -83,7 +83,7 @@ public function getRequiredKeyFields()
      *
      * @return bool|string
      */
-    public function authCallback($settings = array(), $parameters = array())
+    public function authCallback($settings = [], $parameters = [])
     {
         $error = parent::authCallback($settings, $parameters);
 
@@ -102,9 +102,9 @@ public function authCallback($settings = array(), $parameters = array())
      *
      * @return mixed
      */
-    public function getAvailableLeadFields ($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        static $leadFields = array();
+        static $leadFields = [];
 
         if (empty($leadFields)) {
             if (isset($settings['list'])) {
@@ -123,11 +123,11 @@ public function getAvailableLeadFields ($settings = array())
 
                 if (!empty($fields['data'][0]['merge_vars']) && count($fields['data'][0]['merge_vars'])) {
                     foreach ($fields['data'][0]['merge_vars'] as $field) {
-                        $leadFields[$field['tag']] = array(
+                        $leadFields[$field['tag']] = [
                             'label'    => $field['name'],
                             'type'     => 'string',
-                            'required' => $field['req']
-                        );
+                            'required' => $field['req'],
+                        ];
                     }
                 }
             }
@@ -142,20 +142,17 @@ public function getAvailableLeadFields ($settings = array())
      *
      * @return bool
      */
-    public function pushLead($lead, $config = array())
+    public function pushLead($lead, $config = [])
     {
         $config = $this->mergeConfigToFeatureSettings($config);
 
         $mappedData = $this->populateLeadData($lead, $config);
 
         if (empty($mappedData)) {
-
             return false;
         } elseif (empty($mappedData['EMAIL'])) {
-
             return false;
         } elseif (!isset($config['list_settings'])) {
-
             return false;
         }
 
@@ -164,10 +161,10 @@ public function pushLead($lead, $config = array())
                 $email = $mappedData['EMAIL'];
                 unset($mappedData['EMAIL']);
 
-                $options = array();
+                $options                 = [];
                 $options['double_optin'] = $config['list_settings']['doubleOptin'];
                 $options['send_welcome'] = $config['list_settings']['sendWelcome'];
-                $listId = $config['list_settings']['list'];
+                $listId                  = $config['list_settings']['list'];
 
                 $this->getApiHelper()->subscribeLead($email, $listId, $mappedData, $options);
 
diff --git a/plugins/MauticEmailMarketingBundle/MauticEmailMarketingBundle.php b/plugins/MauticEmailMarketingBundle/MauticEmailMarketingBundle.php
index 7828b9a4f7f..c48931b7bc2 100644
--- a/plugins/MauticEmailMarketingBundle/MauticEmailMarketingBundle.php
+++ b/plugins/MauticEmailMarketingBundle/MauticEmailMarketingBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Mautic\PluginBundle\Bundle\PluginBundleBase;
 
 /**
- * Class MauticEmailMarketingBundle
- *
- * @package MauticPlugin\MauticEmailMarketingBundle
+ * Class MauticEmailMarketingBundle.
  */
 class MauticEmailMarketingBundle extends PluginBundleBase
 {
-
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_constantcontact_row.html.php b/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_constantcontact_row.html.php
index a752bb02d31..fa12cc1a122 100644
--- a/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_constantcontact_row.html.php
+++ b/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_constantcontact_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_icontact_row.html.php b/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_icontact_row.html.php
index 60c2ec69098..1a5522d4a60 100644
--- a/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_icontact_row.html.php
+++ b/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_icontact_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_mailchimp_row.html.php b/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_mailchimp_row.html.php
index 4b5fe1262a3..151e4fd8790 100644
--- a/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_mailchimp_row.html.php
+++ b/plugins/MauticEmailMarketingBundle/Views/FormTheme/EmailMarketing/emailmarketing_mailchimp_row.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Config/config.php b/plugins/MauticFocusBundle/Config/config.php
index 400b784ffe5..f5d96232487 100644
--- a/plugins/MauticFocusBundle/Config/config.php
+++ b/plugins/MauticFocusBundle/Config/config.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,16 +15,16 @@
     'author'      => 'Mautic, Inc',
 
     'routes' => [
-        'main'   => [
+        'main' => [
             'mautic_focus_pagetoken_index' => [
                 'path'       => '/focus/pagetokens/{page}',
                 'controller' => 'MauticFocusBundle:SubscribedEvents\BuilderToken:index',
             ],
-            'mautic_focus_index'           => [
+            'mautic_focus_index' => [
                 'path'       => '/focus/{page}',
                 'controller' => 'MauticFocusBundle:Focus:index',
             ],
-            'mautic_focus_action'          => [
+            'mautic_focus_action' => [
                 'path'       => '/focus/{objectAction}/{objectId}',
                 'controller' => 'MauticFocusBundle:Focus:execute',
             ],
@@ -33,7 +34,7 @@
                 'path'       => '/focus/{id}.js',
                 'controller' => 'MauticFocusBundle:Public:generate',
             ],
-            'mautic_focus_pixel'    => [
+            'mautic_focus_pixel' => [
                 'path'       => '/focus/{id}/viewpixel.gif',
                 'controller' => 'MauticFocusBundle:Public:viewPixel',
             ],
@@ -57,14 +58,14 @@
                     'router',
                 ],
             ],
-            'mautic.focus.subscriber.stat'        => [
+            'mautic.focus.subscriber.stat' => [
                 'class'     => 'MauticPlugin\MauticFocusBundle\EventListener\StatSubscriber',
                 'arguments' => [
                     'mautic.factory',
                     'mautic.focus.model.focus',
                 ],
             ],
-            'mautic.focus.subscriber.focus'       => [
+            'mautic.focus.subscriber.focus' => [
                 'class'     => 'MauticPlugin\MauticFocusBundle\EventListener\FocusSubscriber',
                 'arguments' => [
                     'mautic.factory',
@@ -74,16 +75,16 @@
                 ],
             ],
         ],
-        'forms'  => [
-            'mautic.focus.form.type.color'             => [
+        'forms' => [
+            'mautic.focus.form.type.color' => [
                 'class' => 'MauticPlugin\MauticFocusBundle\Form\Type\ColorType',
                 'alias' => 'focus_color',
             ],
-            'mautic.focus.form.type.content'           => [
+            'mautic.focus.form.type.content' => [
                 'class' => 'MauticPlugin\MauticFocusBundle\Form\Type\ContentType',
                 'alias' => 'focus_content',
             ],
-            'mautic.focus.form.type.focus'             => [
+            'mautic.focus.form.type.focus' => [
                 'class'     => 'MauticPlugin\MauticFocusBundle\Form\Type\FocusType',
                 'alias'     => 'focus',
                 'arguments' => 'mautic.security',
@@ -92,7 +93,7 @@
                 'class' => 'MauticPlugin\MauticFocusBundle\Form\Type\PropertiesType',
                 'alias' => 'focus_entity_properties',
             ],
-            'mautic.focus.form.type.properties'        => [
+            'mautic.focus.form.type.properties' => [
                 'class' => 'MauticPlugin\MauticFocusBundle\Form\Type\FocusPropertiesType',
                 'alias' => 'focus_properties',
             ],
@@ -127,4 +128,4 @@
         'website_snapshot_url' => 'https://mautic.net/api/snapshot',
         'website_snapshot_key' => '',
     ],
-];
\ No newline at end of file
+];
diff --git a/plugins/MauticFocusBundle/Controller/AjaxController.php b/plugins/MauticFocusBundle/Controller/AjaxController.php
index 719aea47d05..5e2443baadf 100644
--- a/plugins/MauticFocusBundle/Controller/AjaxController.php
+++ b/plugins/MauticFocusBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,6 @@
 use Mautic\CoreBundle\Helper\InputHelper;
 use MauticPlugin\MauticFocusBundle\Model\FocusModel;
 use Symfony\Component\HttpFoundation\Request;
-use League\ColorExtractor\Client as ColorExtractor;
 
 class AjaxController extends CommonAjaxController
 {
@@ -55,7 +55,7 @@ protected function getWebsiteSnapshotAction(Request $request)
                             'buttonColor'     => $palette[1],
                             'buttonTextColor' => FocusModel::isLightColor($palette[1]) ? '#000000' : '#ffffff',
                         ];
-                        $data['success']          = 1;
+                        $data['success'] = 1;
                     }
                 }
             }
@@ -87,4 +87,4 @@ protected function generatePreviewAction(Request $request)
 
         return $this->sendJsonResponse($data);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Controller/FocusController.php b/plugins/MauticFocusBundle/Controller/FocusController.php
index a188d280abd..3b6f4745ca5 100644
--- a/plugins/MauticFocusBundle/Controller/FocusController.php
+++ b/plugins/MauticFocusBundle/Controller/FocusController.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle\Controller;
 
 use Mautic\CoreBundle\Controller\FormController;
-use MauticPlugin\MauticFocusBundle\Entity\Stat;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class FocusController
+ * Class FocusController.
  */
 class FocusController extends FormController
 {
@@ -43,7 +43,7 @@ public function indexAction($page = 1)
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|Response
      */
@@ -53,7 +53,7 @@ public function newAction()
     }
 
     /**
-     * Generates edit form and processes post data
+     * Generates edit form and processes post data.
      *
      * @param int  $objectId
      * @param bool $ignorePost
@@ -66,7 +66,7 @@ public function editAction($objectId, $ignorePost = false)
     }
 
     /**
-     * Displays details on a Focus
+     * Displays details on a Focus.
      *
      * @param $objectId
      *
@@ -78,7 +78,7 @@ public function viewAction($objectId)
     }
 
     /**
-     * Clone an entity
+     * Clone an entity.
      *
      * @param int $objectId
      *
@@ -90,7 +90,7 @@ public function cloneAction($objectId)
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -102,7 +102,7 @@ public function deleteAction($objectId)
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
diff --git a/plugins/MauticFocusBundle/Controller/PublicController.php b/plugins/MauticFocusBundle/Controller/PublicController.php
index 1a3dcb039e2..c092c50f569 100644
--- a/plugins/MauticFocusBundle/Controller/PublicController.php
+++ b/plugins/MauticFocusBundle/Controller/PublicController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,11 +16,10 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Class class PublicController extends CommonController
+ * Class class PublicController extends CommonController.
  */
 class PublicController extends CommonController
 {
-
     /**
      * @param $id
      *
diff --git a/plugins/MauticFocusBundle/Controller/SubscribedEvents/BuilderTokenController.php b/plugins/MauticFocusBundle/Controller/SubscribedEvents/BuilderTokenController.php
index a5fd56170c5..9464d4e48da 100644
--- a/plugins/MauticFocusBundle/Controller/SubscribedEvents/BuilderTokenController.php
+++ b/plugins/MauticFocusBundle/Controller/SubscribedEvents/BuilderTokenController.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle\Controller\SubscribedEvents;
 
 /**
- * Class BuilderTokenController
+ * Class BuilderTokenController.
  */
 class BuilderTokenController extends \Mautic\CoreBundle\Controller\SubscribedEvents\BuilderTokenController
 {
@@ -30,17 +31,11 @@ protected function getViewPermissionBase()
         return 'plugin:focus:items';
     }
 
-    /**
-     * @return null
-     */
     protected function getBundleName()
     {
         return 'MauticFocusBundle';
     }
 
-    /**
-     * @return null
-     */
     protected function getLangVar()
     {
         return 'mautic.focus';
diff --git a/plugins/MauticFocusBundle/Entity/Focus.php b/plugins/MauticFocusBundle/Entity/Focus.php
index 660ac45145f..ba2244a703d 100644
--- a/plugins/MauticFocusBundle/Entity/Focus.php
+++ b/plugins/MauticFocusBundle/Entity/Focus.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -17,7 +18,7 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Focus
+ * Class Focus.
  */
 class Focus extends FormEntity
 {
@@ -401,4 +402,4 @@ public function setCache($cache)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Entity/FocusRepository.php b/plugins/MauticFocusBundle/Entity/FocusRepository.php
index 97d8b4c994a..b22ea2e3ab4 100644
--- a/plugins/MauticFocusBundle/Entity/FocusRepository.php
+++ b/plugins/MauticFocusBundle/Entity/FocusRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -28,7 +29,7 @@ public function findByForm($formId)
     }
 
     /**
-     * Get a list of entities
+     * Get a list of entities.
      *
      * @param array $args
      *
@@ -101,4 +102,4 @@ public function getTableAlias()
     {
         return 'f';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Entity/Stat.php b/plugins/MauticFocusBundle/Entity/Stat.php
index 122ab2ae8d6..261a514511e 100644
--- a/plugins/MauticFocusBundle/Entity/Stat.php
+++ b/plugins/MauticFocusBundle/Entity/Stat.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,13 +14,13 @@
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 
 /**
- * Class Stat
+ * Class Stat.
  */
 class Stat
 {
     // Used for querying stats
-    const TYPE_FORM = 'submission';
-    const TYPE_CLICK = 'click';
+    const TYPE_FORM         = 'submission';
+    const TYPE_CLICK        = 'click';
     const TYPE_NOTIFICATION = 'view';
 
     /**
@@ -160,4 +161,4 @@ public function setDateAdded($dateAdded)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Entity/StatRepository.php b/plugins/MauticFocusBundle/Entity/StatRepository.php
index b53dea69b08..cf4e1a6d2c0 100644
--- a/plugins/MauticFocusBundle/Entity/StatRepository.php
+++ b/plugins/MauticFocusBundle/Entity/StatRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,7 +15,7 @@
 class StatRepository extends CommonRepository
 {
     /**
-     * Fetch the base stat data from the database
+     * Fetch the base stat data from the database.
      *
      * @param int  $id
      * @param      $type
@@ -43,4 +44,4 @@ public function getStats($id, $type, $fromDate = null)
 
         return $q->getQuery()->getArrayResult();
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Event/FocusEvent.php b/plugins/MauticFocusBundle/Event/FocusEvent.php
index e8dc45d2252..ed078d1d844 100644
--- a/plugins/MauticFocusBundle/Event/FocusEvent.php
+++ b/plugins/MauticFocusBundle/Event/FocusEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,11 +14,10 @@
 use MauticPlugin\MauticFocusBundle\Entity\Focus;
 
 /**
- * Class FocusEvent
+ * Class FocusEvent.
  */
 class FocusEvent extends CommonEvent
 {
-
     /**
      * @param Focus      $focus
      * @param bool|false $isNew
@@ -29,7 +29,7 @@ public function __construct(Focus $focus, $isNew = false)
     }
 
     /**
-     * Returns the Focus entity
+     * Returns the Focus entity.
      *
      * @return Focus
      */
@@ -39,7 +39,7 @@ public function getFocus()
     }
 
     /**
-     * Sets the Focus entity
+     * Sets the Focus entity.
      *
      * @param Focus $focus
      */
diff --git a/plugins/MauticFocusBundle/EventListener/FocusSubscriber.php b/plugins/MauticFocusBundle/EventListener/FocusSubscriber.php
index b706ab60c08..2fd81cc7f39 100644
--- a/plugins/MauticFocusBundle/EventListener/FocusSubscriber.php
+++ b/plugins/MauticFocusBundle/EventListener/FocusSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -22,7 +23,7 @@
 use Symfony\Component\Routing\RouterInterface;
 
 /**
- * Class FocusSubscriber
+ * Class FocusSubscriber.
  */
 class FocusSubscriber extends CommonSubscriber
 {
@@ -61,7 +62,7 @@ public function __construct(MauticFactory $factory, RouterInterface $router, IpL
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             KernelEvents::REQUEST    => ['onKernelRequest', 0],
@@ -95,7 +96,7 @@ public function onKernelRequest(GetResponseEvent $event)
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param FocusEvent $event
      */
@@ -116,7 +117,7 @@ public function onFocusPostSave(FocusEvent $event)
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param FocusEvent $event
      */
diff --git a/plugins/MauticFocusBundle/EventListener/FormSubscriber.php b/plugins/MauticFocusBundle/EventListener/FormSubscriber.php
index d3e49e0b7a7..d8f429d0030 100644
--- a/plugins/MauticFocusBundle/EventListener/FormSubscriber.php
+++ b/plugins/MauticFocusBundle/EventListener/FormSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,7 +17,7 @@
 use MauticPlugin\MauticFocusBundle\Model\FocusModel;
 
 /**
- * Class FormSubscriber
+ * Class FormSubscriber.
  */
 class FormSubscriber extends CommonSubscriber
 {
@@ -41,7 +42,7 @@ public function __construct(MauticFactory $factory, FocusModel $model)
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             FormEvents::FORM_POST_SAVE   => ['onFormPostSave', 0],
@@ -50,7 +51,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Add an entry to the audit log
+     * Add an entry to the audit log.
      *
      * @param Events\FormEvent $event
      */
@@ -59,14 +60,12 @@ public function onFormPostSave(Events\FormEvent $event)
         $form = $event->getForm();
 
         if ($event->isNew()) {
-
             return;
         }
 
         $foci = $this->model->getRepository()->findByForm($form->getId());
 
         if (empty($foci)) {
-
             return;
         }
 
@@ -82,7 +81,7 @@ public function onFormPostSave(Events\FormEvent $event)
     }
 
     /**
-     * Add a delete entry to the audit log
+     * Add a delete entry to the audit log.
      *
      * @param Events\FormEvent $event
      */
@@ -93,7 +92,6 @@ public function onFormDelete(Events\FormEvent $event)
         $foci   = $this->model->getRepository()->findByForm($formId);
 
         if (empty($foci)) {
-
             return;
         }
 
@@ -109,4 +107,3 @@ public function onFormDelete(Events\FormEvent $event)
         $this->model->saveEntities($foci);
     }
 }
-
diff --git a/plugins/MauticFocusBundle/EventListener/PageSubscriber.php b/plugins/MauticFocusBundle/EventListener/PageSubscriber.php
index 01a0a86ea00..7d437cfc1fd 100644
--- a/plugins/MauticFocusBundle/EventListener/PageSubscriber.php
+++ b/plugins/MauticFocusBundle/EventListener/PageSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,7 +13,6 @@
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Helper\BuilderTokenHelper;
-use Mautic\FormBundle\Helper\PageTokenHelper;
 use Mautic\PageBundle\Event\PageBuilderEvent;
 use Mautic\PageBundle\Event\PageDisplayEvent;
 use Mautic\PageBundle\PageEvents;
@@ -20,7 +20,7 @@
 use Symfony\Component\Routing\RouterInterface;
 
 /**
- * Class PageSubscriber
+ * Class PageSubscriber.
  */
 class PageSubscriber extends CommonSubscriber
 {
@@ -53,7 +53,7 @@ public function __construct(MauticFactory $factory, FocusModel $model, RouterInt
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             PageEvents::PAGE_ON_DISPLAY => ['onPageDisplay', 0],
@@ -62,7 +62,7 @@ static public function getSubscribedEvents()
     }
 
     /**
-     * Add forms to available page tokens
+     * Add forms to available page tokens.
      *
      * @param PageBuilderEvent $event
      */
@@ -102,11 +102,11 @@ public function onPageDisplay(PageDisplayEvent $event)
                         )
                     )
                 ) {
-                    $script  = '<script src="'.$this->router->generate('mautic_focus_generate', ['id' => $id], true)
+                    $script = '<script src="'.$this->router->generate('mautic_focus_generate', ['id' => $id], true)
                         .'" type="text/javascript" charset="utf-8" async="async"></script>';
                     $content = preg_replace('#{focus='.$id.'}#', $script, $content);
                 } else {
-                    $content = preg_replace("#{focus=".$id."}#", "", $content);
+                    $content = preg_replace('#{focus='.$id.'}#', '', $content);
                 }
             }
         }
diff --git a/plugins/MauticFocusBundle/EventListener/StatSubscriber.php b/plugins/MauticFocusBundle/EventListener/StatSubscriber.php
index 2daf375ceca..e88e9def5a6 100644
--- a/plugins/MauticFocusBundle/EventListener/StatSubscriber.php
+++ b/plugins/MauticFocusBundle/EventListener/StatSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -19,7 +20,7 @@
 use MauticPlugin\MauticFocusBundle\Model\FocusModel;
 
 /**
- * Class StatSubscriber
+ * Class StatSubscriber.
  */
 class StatSubscriber extends CommonSubscriber
 {
@@ -44,7 +45,7 @@ public function __construct(MauticFactory $factory, FocusModel $model)
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             PageEvents::PAGE_ON_HIT    => ['onPageHit', 0],
@@ -71,7 +72,7 @@ public function onPageHit(PageHitEvent $event)
     }
 
     /**
-     * Note if this submission is from a focus submit
+     * Note if this submission is from a focus submit.
      *
      * @param SubmissionEvent $event
      */
diff --git a/plugins/MauticFocusBundle/FocusEvents.php b/plugins/MauticFocusBundle/FocusEvents.php
index 22519c19d73..b1e30a64e2a 100644
--- a/plugins/MauticFocusBundle/FocusEvents.php
+++ b/plugins/MauticFocusBundle/FocusEvents.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle;
 
 /**
- * Class FocusEvents
+ * Class FocusEvents.
  *
  * Events available for MauticFocusBundle
  */
diff --git a/plugins/MauticFocusBundle/Form/Type/ColorType.php b/plugins/MauticFocusBundle/Form/Type/ColorType.php
index fb5627a8fa4..a16dcf012e0 100644
--- a/plugins/MauticFocusBundle/Form/Type/ColorType.php
+++ b/plugins/MauticFocusBundle/Form/Type/ColorType.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle\Form\Type;
 
-
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-toggle' => 'color',
                     'onchange'    => 'Mautic.focusUpdatePreview()',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -43,7 +43,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-toggle' => 'color',
                     'onchange'    => 'Mautic.focusUpdatePreview()',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -58,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-toggle' => 'color',
                     'onchange'    => 'Mautic.focusUpdatePreview()',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -73,7 +73,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-toggle' => 'color',
                     'onchange'    => 'Mautic.focusUpdatePreview()',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
     }
@@ -82,4 +82,4 @@ public function getName()
     {
         return 'focus_color';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Form/Type/ContentType.php b/plugins/MauticFocusBundle/Form/Type/ContentType.php
index 9d34667602f..0d6a7405eb6 100644
--- a/plugins/MauticFocusBundle/Form/Type/ContentType.php
+++ b/plugins/MauticFocusBundle/Form/Type/ContentType.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle\Form\Type;
 
-
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -32,7 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'   => 'form-control',
                     'onkeyup' => 'Mautic.focusUpdatePreview()',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -47,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'placeholder' => 'mautic.core.optional',
                     'onkeyup'     => 'Mautic.focusUpdatePreview()',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -93,7 +93,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'font',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'Arial, Helvetica, sans-serif'                             => 'Arial',
                     '\'Arial Black\', Gadget, sans-serif'                      => 'Arial Black',
                     '\'Arial Narrow\', sans-serif'                             => 'Arial Narrow',
@@ -110,9 +110,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     '\'Trebuchet MS\', Helvetica, sans-serif'                  => 'Trebuchet MS',
                     'Verdana, Geneva, sans-serif'                              => 'Verdana',
                 ],
-                'label'       => 'mautic.focus.form.font',
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.focus.form.font',
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'class'    => 'form-control',
                     'onchange' => 'Mautic.focusUpdatePreview()',
                 ],
@@ -141,4 +141,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Form/Type/FocusPropertiesType.php b/plugins/MauticFocusBundle/Form/Type/FocusPropertiesType.php
index 8c1a3e44ad7..59dab9852a1 100644
--- a/plugins/MauticFocusBundle/Form/Type/FocusPropertiesType.php
+++ b/plugins/MauticFocusBundle/Form/Type/FocusPropertiesType.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle\Form\Type;
 
-
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -42,7 +42,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                             'tooltip'  => 'mautic.focus.form.bar.push_page.tooltip',
                             'onchange' => 'Mautic.focusUpdatePreview()',
                         ],
-                        'data'  => (isset($options['data']['push_page'])) ? $options['data']['push_page'] : true,
+                        'data' => (isset($options['data']['push_page'])) ? $options['data']['push_page'] : true,
                     ]
                 );
 
@@ -55,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                             'tooltip'  => 'mautic.focus.form.bar.sticky.tooltip',
                             'onchange' => 'Mautic.focusUpdatePreview()',
                         ],
-                        'data'  => (isset($options['data']['sticky'])) ? $options['data']['sticky'] : true,
+                        'data' => (isset($options['data']['sticky'])) ? $options['data']['sticky'] : true,
                     ]
                 );
 
@@ -63,13 +63,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'size',
                     'choice',
                     [
-                        'choices'     => [
+                        'choices' => [
                             'large'   => 'mautic.focus.form.bar.size.large',
                             'regular' => 'mautic.focus.form.bar.size.regular',
                         ],
-                        'label'       => 'mautic.focus.form.bar.size',
-                        'label_attr'  => ['class' => 'control-label'],
-                        'attr'        => [
+                        'label'      => 'mautic.focus.form.bar.size',
+                        'label_attr' => ['class' => 'control-label'],
+                        'attr'       => [
                             'class'    => 'form-control',
                             'onchange' => 'Mautic.focusUpdatePreview()',
                         ],
@@ -107,10 +107,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'placement',
                 'choice',
                 [
-                    'choices'     => $choices,
-                    'label'       => 'mautic.focus.form.placement',
-                    'label_attr'  => ['class' => 'control-label'],
-                    'attr'        => [
+                    'choices'    => $choices,
+                    'label'      => 'mautic.focus.form.placement',
+                    'label_attr' => ['class' => 'control-label'],
+                    'attr'       => [
                         'class'    => 'form-control',
                         'onchange' => 'Mautic.focusUpdatePreview()',
                     ],
@@ -139,4 +139,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Form/Type/FocusType.php b/plugins/MauticFocusBundle/Form/Type/FocusType.php
index 1ce221f7145..4c8808788b0 100644
--- a/plugins/MauticFocusBundle/Form/Type/FocusType.php
+++ b/plugins/MauticFocusBundle/Form/Type/FocusType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -73,7 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'   => 'form-control',
                     'tooltip' => 'mautic.focus.form.website.tooltip',
                 ],
-                'required'   => false,
+                'required' => false,
             ]
         );
 
@@ -117,8 +118,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false,
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
             ]
         );
 
@@ -133,8 +134,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'       => 'form-control',
                     'data-toggle' => 'datetime',
                 ],
-                'format'     => 'yyyy-MM-dd HH:mm',
-                'required'   => false,
+                'format'   => 'yyyy-MM-dd HH:mm',
+                'required' => false,
             ]
         );
 
@@ -157,8 +158,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        if (!empty($options["action"])) {
-            $builder->setAction($options["action"]);
+        if (!empty($options['action'])) {
+            $builder->setAction($options['action']);
         }
 
         $builder->add(
@@ -172,7 +173,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'attr'  => [
                             'class'   => 'btn btn-default btn-dnd btn-nospin',
                             'icon'    => 'fa fa-cube',
-                            'onclick' => "Mautic.launchFocusBuilder();",
+                            'onclick' => 'Mautic.launchFocusBuilder();',
                         ],
                     ],
                 ],
@@ -180,7 +181,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         );
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -200,4 +200,4 @@ public function getName()
     {
         return 'focus';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Form/Type/PropertiesType.php b/plugins/MauticFocusBundle/Form/Type/PropertiesType.php
index e765303c1df..3c0da798714 100644
--- a/plugins/MauticFocusBundle/Form/Type/PropertiesType.php
+++ b/plugins/MauticFocusBundle/Form/Type/PropertiesType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -26,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'focus_properties',
             [
                 'focus_style' => 'bar',
-                'data'        => (isset($options['data']['bar'])) ? $options['data']['bar'] : []
+                'data'        => (isset($options['data']['bar'])) ? $options['data']['bar'] : [],
             ]
         );
 
@@ -35,7 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'focus_properties',
             [
                 'focus_style' => 'modal',
-                'data'        => (isset($options['data']['modal'])) ? $options['data']['modal'] : []
+                'data'        => (isset($options['data']['modal'])) ? $options['data']['modal'] : [],
             ]
         );
 
@@ -44,7 +45,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'focus_properties',
             [
                 'focus_style' => 'notification',
-                'data'        => (isset($options['data']['notification'])) ? $options['data']['notification'] : []
+                'data'        => (isset($options['data']['notification'])) ? $options['data']['notification'] : [],
             ]
         );
 
@@ -53,7 +54,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'focus_properties',
             [
                 'focus_style' => 'page',
-                'data'        => (isset($options['data']['page'])) ? $options['data']['page'] : []
+                'data'        => (isset($options['data']['page'])) ? $options['data']['page'] : [],
             ]
         );
 
@@ -76,8 +77,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'mautic.focus.form.activate_for_links',
                 'data'  => (isset($options['data']['link_activation'])) ? $options['data']['link_activation'] : true,
                 'attr'  => [
-                    'data-show-on' => '{"focus_properties_when": ["leave"]}'
-                ]
+                    'data-show-on' => '{"focus_properties_when": ["leave"]}',
+                ],
             ]
         );
 
@@ -101,7 +102,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'when',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'immediately'   => 'mautic.focus.form.when.immediately',
                     '5seconds'      => 'mautic.focus.form.when.5seconds',
                     'minute'        => 'mautic.focus.form.when.minute',
@@ -124,7 +125,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'frequency',
             'choice',
             [
-                'choices'     => [
+                'choices' => [
                     'everypage' => 'mautic.focus.form.frequency.everypage',
                     'once'      => 'mautic.focus.form.frequency.once',
                     'q2min'     => 'mautic.focus.form.frequency.q2m',
@@ -174,4 +175,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Include/lessc.inc.php b/plugins/MauticFocusBundle/Include/lessc.inc.php
index 43fc767b6cb..da880ccea4a 100644
--- a/plugins/MauticFocusBundle/Include/lessc.inc.php
+++ b/plugins/MauticFocusBundle/Include/lessc.inc.php
@@ -2,7 +2,7 @@
 
 /**
  * lessphp v0.5.0
- * http://leafo.net/lessphp
+ * http://leafo.net/lessphp.
  *
  * LESS CSS compiler, adapted from http://lesscss.org
  *
@@ -10,7 +10,6 @@
  * Licensed under MIT or GPLv3, see LICENSE
  */
 
-
 /**
  * The LESS compiler and parser.
  *
@@ -39,21 +38,21 @@
  */
 class lessc
 {
-    static public $VERSION = "v0.5.0";
+    public static $VERSION = 'v0.5.0';
 
-    static public $TRUE = ["keyword", "true"];
-    static public $FALSE = ["keyword", "false"];
+    public static $TRUE  = ['keyword', 'true'];
+    public static $FALSE = ['keyword', 'false'];
 
-    protected $libFunctions = [];
-    protected $registeredVars = [];
+    protected $libFunctions     = [];
+    protected $registeredVars   = [];
     protected $preserveComments = false;
 
-    public $vPrefix = '@'; // prefix of abstract properties
-    public $mPrefix = '$'; // prefix of abstract blocks
+    public $vPrefix        = '@'; // prefix of abstract properties
+    public $mPrefix        = '$'; // prefix of abstract blocks
     public $parentSelector = '&';
 
     public $importDisabled = false;
-    public $importDir = '';
+    public $importDir      = '';
 
     protected $numberPrecision = null;
 
@@ -62,9 +61,9 @@ class lessc
     // set to the parser that generated the current line when compiling
     // so we know how to create error messages
     protected $sourceParser = null;
-    protected $sourceLoc = null;
+    protected $sourceLoc    = null;
 
-    static protected $nextImportId = 0; // uniquely identify imports
+    protected static $nextImportId = 0; // uniquely identify imports
 
     // attempts to find the path of an import url, returns null for css files
     protected function findImport($url)
@@ -84,7 +83,7 @@ protected function fileExists($name)
         return is_file($name);
     }
 
-    static public function compressList($items, $delim)
+    public static function compressList($items, $delim)
     {
         if (!isset($items[1]) && isset($items[0])) {
             return $items[0];
@@ -93,14 +92,14 @@ static public function compressList($items, $delim)
         }
     }
 
-    static public function preg_quote($what)
+    public static function preg_quote($what)
     {
         return preg_quote($what, '/');
     }
 
     protected function tryImport($importPath, $parentBlock, $out)
     {
-        if ($importPath[0] == "function" && $importPath[1] == "url") {
+        if ($importPath[0] == 'function' && $importPath[1] == 'url') {
             $importPath = $this->flattenList($importPath[2]);
         }
 
@@ -123,7 +122,7 @@ protected function tryImport($importPath, $parentBlock, $out)
         }
 
         if ($this->importDisabled) {
-            return [false, "/* import disabled */"];
+            return [false, '/* import disabled */'];
         }
 
         if (isset($this->allParsedFiles[realpath($realPath)])) {
@@ -136,7 +135,7 @@ protected function tryImport($importPath, $parentBlock, $out)
 
         // set the parents of all the block props
         foreach ($root->props as $prop) {
-            if ($prop[0] == "block") {
+            if ($prop[0] == 'block') {
                 $prop[1]->parent = $parentBlock;
             }
         }
@@ -156,7 +155,7 @@ protected function tryImport($importPath, $parentBlock, $out)
         }
 
         $pi  = pathinfo($realPath);
-        $dir = $pi["dirname"];
+        $dir = $pi['dirname'];
 
         list($top, $bottom) = $this->sortProps($root->props, true);
         $this->compileImportedProps($top, $parentBlock, $out, $parser, $dir);
@@ -201,24 +200,23 @@ protected function compileImportedProps($props, $block, $out, $sourceParser, $im
      * and iterating through the props, compiling each one.
      *
      * See lessc::compileProp()
-     *
      */
     protected function compileBlock($block)
     {
         switch ($block->type) {
-            case "root":
+            case 'root':
                 $this->compileRoot($block);
                 break;
             case null:
                 $this->compileCSSBlock($block);
                 break;
-            case "media":
+            case 'media':
                 $this->compileMedia($block);
                 break;
-            case "directive":
-                $name = "@".$block->name;
+            case 'directive':
+                $name = '@'.$block->name;
                 if (!empty($block->value)) {
-                    $name .= " ".$this->compileValue($this->reduce($block->value));
+                    $name .= ' '.$this->compileValue($this->reduce($block->value));
                 }
 
                 $this->compileNestedBlock($block, [$name]);
@@ -272,7 +270,7 @@ protected function compileMedia($media)
     protected function mediaParent($scope)
     {
         while (!empty($scope->parent)) {
-            if (!empty($scope->type) && $scope->type != "media") {
+            if (!empty($scope->type) && $scope->type != 'media') {
                 break;
             }
             $scope = $scope->parent;
@@ -343,10 +341,10 @@ protected function sortProps($props, $split = false)
 
         foreach ($props as $prop) {
             switch ($prop[0]) {
-                case "comment":
+                case 'comment':
                     $stack[] = $prop;
                     break;
-                case "assign":
+                case 'assign':
                     $stack[] = $prop;
                     if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix) {
                         $vars = array_merge($vars, $stack);
@@ -355,12 +353,12 @@ protected function sortProps($props, $split = false)
                     }
                     $stack = [];
                     break;
-                case "import":
+                case 'import':
                     $id      = self::$nextImportId++;
                     $prop[]  = $id;
                     $stack[] = $prop;
                     $imports = array_merge($imports, $stack);
-                    $other[] = ["import_mixin", $id];
+                    $other[] = ['import_mixin', $id];
                     $stack   = [];
                     break;
                 default:
@@ -386,31 +384,31 @@ protected function compileMediaQuery($queries)
             $parts = [];
             foreach ($query as $q) {
                 switch ($q[0]) {
-                    case "mediaType":
-                        $parts[] = implode(" ", array_slice($q, 1));
+                    case 'mediaType':
+                        $parts[] = implode(' ', array_slice($q, 1));
                         break;
-                    case "mediaExp":
+                    case 'mediaExp':
                         if (isset($q[2])) {
                             $parts[] = "($q[1]: ".
-                                $this->compileValue($this->reduce($q[2])).")";
+                                $this->compileValue($this->reduce($q[2])).')';
                         } else {
                             $parts[] = "($q[1])";
                         }
                         break;
-                    case "variable":
+                    case 'variable':
                         $parts[] = $this->compileValue($this->reduce($q));
                         break;
                 }
             }
 
             if (count($parts) > 0) {
-                $compiledQueries[] = implode(" and ", $parts);
+                $compiledQueries[] = implode(' and ', $parts);
             }
         }
 
-        $out = "@media";
+        $out = '@media';
         if (!empty($parts)) {
-            $out .= " ".
+            $out .= ' '.
                 implode($this->formatter->selectorSeparator, $compiledQueries);
         }
 
@@ -420,7 +418,7 @@ protected function compileMediaQuery($queries)
     protected function multiplyMedia($env, $childQueries = null)
     {
         if (is_null($env)
-            || !empty($env->block->type) && $env->block->type != "media"
+            || !empty($env->block->type) && $env->block->type != 'media'
         ) {
             return $childQueries;
         }
@@ -447,7 +445,7 @@ protected function multiplyMedia($env, $childQueries = null)
 
     protected function expandParentSelectors(&$tag, $replace)
     {
-        $parts = explode("$&$", $tag);
+        $parts = explode('$&$', $tag);
         $count = 0;
         foreach ($parts as &$part) {
             $part = str_replace($this->parentSelector, $replace, $part, $c);
@@ -473,7 +471,6 @@ protected function findClosestSelectors()
         return $selectors;
     }
 
-
     // multiply $selectors against the nearest selectors in env
     protected function multiplySelectors($selectors)
     {
@@ -483,7 +480,7 @@ protected function multiplySelectors($selectors)
         if (is_null($parentSelectors)) {
             // kill parent reference in top level selector
             foreach ($selectors as &$s) {
-                $this->expandParentSelectors($s, "");
+                $this->expandParentSelectors($s, '');
             }
 
             return $selectors;
@@ -514,7 +511,7 @@ protected function compileSelectors($selectors)
         foreach ($selectors as $s) {
             if (is_array($s)) {
                 list(, $value) = $s;
-                $out[] = trim($this->compileValue($this->reduce($value)));
+                $out[]         = trim($this->compileValue($this->reduce($value)));
             } else {
                 $out[] = $s;
             }
@@ -540,7 +537,7 @@ protected function patternMatch($block, $orderedArgs, $keywordArgs)
                     $this->zipSetArgs($block->args, $orderedArgs, $keywordArgs);
 
                     $negate = false;
-                    if ($guard[0] == "negate") {
+                    if ($guard[0] == 'negate') {
                         $guard  = $guard[1];
                         $negate = true;
                     }
@@ -578,7 +575,7 @@ protected function patternMatch($block, $orderedArgs, $keywordArgs)
         if ($keywordArgs) {
             $remainingArgs = [];
             foreach ($block->args as $arg) {
-                if ($arg[0] == "arg" && isset($keywordArgs[$arg[1]])) {
+                if ($arg[0] == 'arg' && isset($keywordArgs[$arg[1]])) {
                     continue;
                 }
 
@@ -590,18 +587,18 @@ protected function patternMatch($block, $orderedArgs, $keywordArgs)
         // try to match by arity or by argument literal
         foreach ($remainingArgs as $i => $arg) {
             switch ($arg[0]) {
-                case "lit":
+                case 'lit':
                     if (empty($orderedArgs[$i]) || !$this->eq($arg[1], $orderedArgs[$i])) {
                         return false;
                     }
                     break;
-                case "arg":
+                case 'arg':
                     // no arg and no default value
                     if (!isset($orderedArgs[$i]) && !isset($arg[2])) {
                         return false;
                     }
                     break;
-                case "rest":
+                case 'rest':
                     $i--; // rest can be empty
                     break 2;
             }
@@ -692,19 +689,19 @@ protected function zipSetArgs($args, $orderedValues, $keywordValues)
 
         $i = 0;
         foreach ($args as $a) {
-            if ($a[0] == "arg") {
+            if ($a[0] == 'arg') {
                 if (isset($keywordValues[$a[1]])) {
                     // has keyword arg
                     $value = $keywordValues[$a[1]];
                 } elseif (isset($orderedValues[$i])) {
                     // has ordered arg
                     $value = $orderedValues[$i];
-                    $i++;
+                    ++$i;
                 } elseif (isset($a[2])) {
                     // has default value
                     $value = $a[2];
                 } else {
-                    $this->throwError("Failed to assign arg ".$a[1]);
+                    $this->throwError('Failed to assign arg '.$a[1]);
                     $value = null; // :(
                 }
 
@@ -713,15 +710,15 @@ protected function zipSetArgs($args, $orderedValues, $keywordValues)
                 $assignedValues[] = $value;
             } else {
                 // a lit
-                $i++;
+                ++$i;
             }
         }
 
         // check for a rest
         $last = end($args);
-        if ($last[0] == "rest") {
+        if ($last[0] == 'rest') {
             $rest = array_slice($orderedValues, count($args) - 1);
-            $this->set($last[1], $this->reduce(["list", " ", $rest]));
+            $this->set($last[1], $this->reduce(['list', ' ', $rest]));
         }
 
         // wow is this the only true use of PHP's + operator for arrays?
@@ -758,19 +755,19 @@ protected function compileProp($prop, $block, $out)
                 foreach ((array) $args as $arg) {
                     $argval = null;
                     switch ($arg[0]) {
-                        case "arg":
+                        case 'arg':
                             if (!isset($arg[2])) {
-                                $orderedArgs[] = $this->reduce(["variable", $arg[1]]);
+                                $orderedArgs[] = $this->reduce(['variable', $arg[1]]);
                             } else {
                                 $keywordArgs[$arg[1]] = $this->reduce($arg[2]);
                             }
                             break;
 
-                        case "lit":
+                        case 'lit':
                             $orderedArgs[] = $this->reduce($arg[1]);
                             break;
                         default:
-                            $this->throwError("Unknown arg type: ".$arg[0]);
+                            $this->throwError('Unknown arg type: '.$arg[0]);
                     }
                 }
 
@@ -806,7 +803,7 @@ protected function compileProp($prop, $block, $out)
 
                     foreach ($this->sortProps($mixin->props) as $subProp) {
                         if ($suffix !== null
-                            && $subProp[0] == "assign"
+                            && $subProp[0] == 'assign'
                             && is_string($subProp[1])
                             && $subProp[1]{0} != $this->vPrefix
                         ) {
@@ -834,16 +831,16 @@ protected function compileProp($prop, $block, $out)
             case 'raw':
                 $out->lines[] = $prop[1];
                 break;
-            case "directive":
+            case 'directive':
                 list(, $name, $value) = $prop;
-                $out->lines[] = "@$name ".$this->compileValue($this->reduce($value)).';';
+                $out->lines[]         = "@$name ".$this->compileValue($this->reduce($value)).';';
                 break;
-            case "comment":
+            case 'comment':
                 $out->lines[] = $prop[1];
                 break;
-            case "import";
+            case 'import':
                 list(, $importPath, $importId) = $prop;
-                $importPath = $this->reduce($importPath);
+                $importPath                    = $this->reduce($importPath);
 
                 if (!isset($this->env->imports)) {
                     $this->env->imports = [];
@@ -853,14 +850,14 @@ protected function compileProp($prop, $block, $out)
 
                 $this->env->imports[$importId] = $result === false
                     ?
-                    [false, "@import ".$this->compileValue($importPath).";"]
+                    [false, '@import '.$this->compileValue($importPath).';']
                     :
                     $result;
 
                 break;
-            case "import_mixin":
+            case 'import_mixin':
                 list(, $importId) = $prop;
-                $import = $this->env->imports[$importId];
+                $import           = $this->env->imports[$importId];
                 if ($import[0] === false) {
                     if (isset($import[1])) {
                         $out->lines[] = $import[1];
@@ -876,7 +873,6 @@ protected function compileProp($prop, $block, $out)
         }
     }
 
-
     /**
      * Compiles a primitive value into a CSS property value.
      *
@@ -929,15 +925,15 @@ public function compileValue($value)
                 // [3] - blue component
                 // [4] - optional alpha component
                 list(, $r, $g, $b) = $value;
-                $r = round($r);
-                $g = round($g);
-                $b = round($b);
+                $r                 = round($r);
+                $g                 = round($g);
+                $b                 = round($b);
 
                 if (count($value) == 5 && $value[4] != 1) { // rgba
                     return 'rgba('.$r.','.$g.','.$b.','.$value[4].')';
                 }
 
-                $h = sprintf("#%02x%02x%02x", $r, $g, $b);
+                $h = sprintf('#%02x%02x%02x', $r, $g, $b);
 
                 if (!empty($this->formatter->compressColors)) {
                     // Converting hex color to short notation (e.g. #003399 to #039)
@@ -959,7 +955,7 @@ public function compileValue($value)
 
     protected function lib_pow($args)
     {
-        list($base, $exp) = $this->assertArgs($args, 2, "pow");
+        list($base, $exp) = $this->assertArgs($args, 2, 'pow');
 
         return pow($this->assertNumber($base), $this->assertNumber($exp));
     }
@@ -971,7 +967,7 @@ protected function lib_pi()
 
     protected function lib_mod($args)
     {
-        list($a, $b) = $this->assertArgs($args, 2, "mod");
+        list($a, $b) = $this->assertArgs($args, 2, 'mod');
 
         return $this->assertNumber($a) % $this->assertNumber($b);
     }
@@ -995,21 +991,21 @@ protected function lib_atan($num)
     {
         $num = atan($this->assertNumber($num));
 
-        return ["number", $num, "rad"];
+        return ['number', $num, 'rad'];
     }
 
     protected function lib_asin($num)
     {
         $num = asin($this->assertNumber($num));
 
-        return ["number", $num, "rad"];
+        return ['number', $num, 'rad'];
     }
 
     protected function lib_acos($num)
     {
         $num = acos($this->assertNumber($num));
 
-        return ["number", $num, "rad"];
+        return ['number', $num, 'rad'];
     }
 
     protected function lib_sqrt($num)
@@ -1019,22 +1015,22 @@ protected function lib_sqrt($num)
 
     protected function lib_extract($value)
     {
-        list($list, $idx) = $this->assertArgs($value, 2, "extract");
-        $idx = $this->assertNumber($idx);
+        list($list, $idx) = $this->assertArgs($value, 2, 'extract');
+        $idx              = $this->assertNumber($idx);
         // 1 indexed
-        if ($list[0] == "list" && isset($list[2][$idx - 1])) {
+        if ($list[0] == 'list' && isset($list[2][$idx - 1])) {
             return $list[2][$idx - 1];
         }
     }
 
     protected function lib_isnumber($value)
     {
-        return $this->toBool($value[0] == "number");
+        return $this->toBool($value[0] == 'number');
     }
 
     protected function lib_isstring($value)
     {
-        return $this->toBool($value[0] == "string");
+        return $this->toBool($value[0] == 'string');
     }
 
     protected function lib_iscolor($value)
@@ -1044,38 +1040,38 @@ protected function lib_iscolor($value)
 
     protected function lib_iskeyword($value)
     {
-        return $this->toBool($value[0] == "keyword");
+        return $this->toBool($value[0] == 'keyword');
     }
 
     protected function lib_ispixel($value)
     {
-        return $this->toBool($value[0] == "number" && $value[2] == "px");
+        return $this->toBool($value[0] == 'number' && $value[2] == 'px');
     }
 
     protected function lib_ispercentage($value)
     {
-        return $this->toBool($value[0] == "number" && $value[2] == "%");
+        return $this->toBool($value[0] == 'number' && $value[2] == '%');
     }
 
     protected function lib_isem($value)
     {
-        return $this->toBool($value[0] == "number" && $value[2] == "em");
+        return $this->toBool($value[0] == 'number' && $value[2] == 'em');
     }
 
     protected function lib_isrem($value)
     {
-        return $this->toBool($value[0] == "number" && $value[2] == "rem");
+        return $this->toBool($value[0] == 'number' && $value[2] == 'rem');
     }
 
     protected function lib_rgbahex($color)
     {
         $color = $this->coerceColor($color);
         if (is_null($color)) {
-            $this->throwError("color expected for rgbahex");
+            $this->throwError('color expected for rgbahex');
         }
 
         return sprintf(
-            "#%02x%02x%02x%02x",
+            '#%02x%02x%02x%02x',
             isset($color[4]) ? $color[4] * 255 : 255,
             $color[1],
             $color[2],
@@ -1089,11 +1085,11 @@ protected function lib_argb($color)
     }
 
     /**
-     * Given an url, decide whether to output a regular link or the base64-encoded contents of the file
+     * Given an url, decide whether to output a regular link or the base64-encoded contents of the file.
      *
-     * @param  array $value either an argument list (two strings) or a single string
+     * @param array $value either an argument list (two strings) or a single string
      *
-     * @return string        formatted url(), either as a link or base64-encoded
+     * @return string formatted url(), either as a link or base64-encoded
      */
     protected function lib_data_uri($value)
     {
@@ -1115,8 +1111,7 @@ protected function lib_data_uri($value)
                     }
                 }
 
-                if (!is_null($mime)) // fallback if the mime type is still unknown
-                {
+                if (!is_null($mime)) { // fallback if the mime type is still unknown
                     $url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath)));
                 }
             }
@@ -1129,26 +1124,26 @@ protected function lib_data_uri($value)
     protected function lib_e($arg)
     {
         switch ($arg[0]) {
-            case "list":
+            case 'list':
                 $items = $arg[2];
                 if (isset($items[0])) {
                     return $this->lib_e($items[0]);
                 }
-                $this->throwError("unrecognised input");
-            case "string":
-                $arg[1] = "";
+                $this->throwError('unrecognised input');
+            case 'string':
+                $arg[1] = '';
 
                 return $arg;
-            case "keyword":
+            case 'keyword':
                 return $arg;
             default:
-                return ["keyword", $this->compileValue($arg)];
+                return ['keyword', $this->compileValue($arg)];
         }
     }
 
     protected function lib__sprintf($args)
     {
-        if ($args[0] != "list") {
+        if ($args[0] != 'list') {
             return $args;
         }
         $values   = $args[2];
@@ -1166,7 +1161,7 @@ protected function lib__sprintf($args)
                     $val = $color;
                 }
 
-                $i++;
+                ++$i;
                 $rep      = $this->compileValue($this->lib_e($val));
                 $template = preg_replace(
                     '/'.self::preg_quote($match).'/',
@@ -1177,57 +1172,57 @@ protected function lib__sprintf($args)
             }
         }
 
-        $d = $string[0] == "string" ? $string[1] : '"';
+        $d = $string[0] == 'string' ? $string[1] : '"';
 
-        return ["string", $d, [$template]];
+        return ['string', $d, [$template]];
     }
 
     protected function lib_floor($arg)
     {
         $value = $this->assertNumber($arg);
 
-        return ["number", floor($value), $arg[2]];
+        return ['number', floor($value), $arg[2]];
     }
 
     protected function lib_ceil($arg)
     {
         $value = $this->assertNumber($arg);
 
-        return ["number", ceil($value), $arg[2]];
+        return ['number', ceil($value), $arg[2]];
     }
 
     protected function lib_round($arg)
     {
-        if ($arg[0] != "list") {
+        if ($arg[0] != 'list') {
             $value = $this->assertNumber($arg);
 
-            return ["number", round($value), $arg[2]];
+            return ['number', round($value), $arg[2]];
         } else {
             $value     = $this->assertNumber($arg[2][0]);
             $precision = $this->assertNumber($arg[2][1]);
 
-            return ["number", round($value, $precision), $arg[2][0][2]];
+            return ['number', round($value, $precision), $arg[2][0][2]];
         }
     }
 
     protected function lib_unit($arg)
     {
-        if ($arg[0] == "list") {
+        if ($arg[0] == 'list') {
             list($number, $newUnit) = $arg[2];
 
             return [
-                "number",
+                'number',
                 $this->assertNumber($number),
                 $this->compileValue($this->lib_e($newUnit)),
             ];
         } else {
-            return ["number", $this->assertNumber($arg), ""];
+            return ['number', $this->assertNumber($arg), ''];
         }
     }
 
     /**
      * Helper function to get arguments for color manipulation functions.
-     * takes a list that contains a color like thing and a percentage
+     * takes a list that contains a color like thing and a percentage.
      */
     public function colorArgs($args)
     {
@@ -1235,8 +1230,8 @@ public function colorArgs($args)
             return [['color', 0, 0, 0], 0];
         }
         list($color, $delta) = $args[2];
-        $color = $this->assertColor($color);
-        $delta = floatval($delta[1]);
+        $color               = $this->assertColor($color);
+        $delta               = floatval($delta[1]);
 
         return [$color, $delta];
     }
@@ -1298,7 +1293,7 @@ protected function lib_spin($args)
     protected function lib_fadeout($args)
     {
         list($color, $delta) = $this->colorArgs($args);
-        $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta / 100);
+        $color[4]            = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta / 100);
 
         return $color;
     }
@@ -1306,7 +1301,7 @@ protected function lib_fadeout($args)
     protected function lib_fadein($args)
     {
         list($color, $delta) = $this->colorArgs($args);
-        $color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta / 100);
+        $color[4]            = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta / 100);
 
         return $color;
     }
@@ -1345,7 +1340,7 @@ protected function lib_alpha($value)
     protected function lib_fade($args)
     {
         list($color, $alpha) = $this->colorArgs($args);
-        $color[4] = $this->clamp($alpha / 100.0);
+        $color[4]            = $this->clamp($alpha / 100.0);
 
         return $color;
     }
@@ -1354,7 +1349,7 @@ protected function lib_percentage($arg)
     {
         $num = $this->assertNumber($arg);
 
-        return ["number", $num * 100, "%"];
+        return ['number', $num * 100, '%'];
     }
 
     // mixes two colors by weight
@@ -1362,13 +1357,13 @@ protected function lib_percentage($arg)
     // http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
     protected function lib_mix($args)
     {
-        if ($args[0] != "list" || count($args[2]) < 2) {
-            $this->throwError("mix expects (color1, color2, weight)");
+        if ($args[0] != 'list' || count($args[2]) < 2) {
+            $this->throwError('mix expects (color1, color2, weight)');
         }
 
         list($first, $second) = $args[2];
-        $first  = $this->assertColor($first);
-        $second = $this->assertColor($second);
+        $first                = $this->assertColor($first);
+        $second               = $this->assertColor($second);
 
         $first_a  = $this->lib_alpha($first);
         $second_a = $this->lib_alpha($second);
@@ -1440,8 +1435,7 @@ protected function lib_luma($color)
         return (0.2126 * $color[0] / 255) + (0.7152 * $color[1] / 255) + (0.0722 * $color[2] / 255);
     }
 
-
-    public function assertColor($value, $error = "expected color value")
+    public function assertColor($value, $error = 'expected color value')
     {
         $color = $this->coerceColor($value);
         if (is_null($color)) {
@@ -1451,27 +1445,27 @@ public function assertColor($value, $error = "expected color value")
         return $color;
     }
 
-    public function assertNumber($value, $error = "expecting number")
+    public function assertNumber($value, $error = 'expecting number')
     {
-        if ($value[0] == "number") {
+        if ($value[0] == 'number') {
             return $value[1];
         }
         $this->throwError($error);
     }
 
-    public function assertArgs($value, $expectedArgs, $name = "")
+    public function assertArgs($value, $expectedArgs, $name = '')
     {
         if ($expectedArgs == 1) {
             return $value;
         } else {
-            if ($value[0] !== "list" || $value[1] != ",") {
-                $this->throwError("expecting list");
+            if ($value[0] !== 'list' || $value[1] != ',') {
+                $this->throwError('expecting list');
             }
             $values    = $value[2];
             $numValues = count($values);
             if ($expectedArgs != $numValues) {
                 if ($name) {
-                    $name = $name.": ";
+                    $name = $name.': ';
                 }
 
                 $this->throwError("${name}expecting $expectedArgs arguments, got $numValues");
@@ -1511,7 +1505,6 @@ protected function toHSL($color)
             } elseif ($b == $max) {
                 $H = 4.0 + ($r - $g) / ($max - $min);
             }
-
         }
 
         $out = [
@@ -1550,7 +1543,7 @@ protected function toRGB_helper($comp, $temp1, $temp2)
 
     /**
      * Converts a hsl array into a color value in rgb.
-     * Expects H to be in range of 0 to 360, S and L in 0 to 100
+     * Expects H to be in range of 0 to 360, S and L in 0 to 100.
      */
     protected function toRGB($color)
     {
@@ -1619,7 +1612,7 @@ protected function funcToColor($func)
                 }
 
                 $hsl[] = $this->clamp($val, $clamp);
-                $i++;
+                ++$i;
             }
 
             while (count($hsl) < 4) {
@@ -1627,20 +1620,19 @@ protected function funcToColor($func)
             }
 
             return $this->toRGB($hsl);
-
         } elseif ($fname == 'rgb' || $fname == 'rgba') {
             $components = [];
             $i          = 1;
             foreach ($rawComponents as $c) {
                 $c = $this->reduce($c);
                 if ($i < 4) {
-                    if ($c[0] == "number" && $c[2] == "%") {
+                    if ($c[0] == 'number' && $c[2] == '%') {
                         $components[] = 255 * ($c[1] / 100);
                     } else {
                         $components[] = floatval($c[1]);
                     }
                 } elseif ($i == 4) {
-                    if ($c[0] == "number" && $c[2] == "%") {
+                    if ($c[0] == 'number' && $c[2] == '%') {
                         $components[] = 1.0 * ($c[1] / 100);
                     } else {
                         $components[] = floatval($c[1]);
@@ -1649,7 +1641,7 @@ protected function funcToColor($func)
                     break;
                 }
 
-                $i++;
+                ++$i;
             }
             while (count($components) < 3) {
                 $components[] = 0;
@@ -1665,12 +1657,12 @@ protected function funcToColor($func)
     protected function reduce($value, $forExpression = false)
     {
         switch ($value[0]) {
-            case "interpolate":
+            case 'interpolate':
                 $reduced = $this->reduce($value[1]);
                 $var     = $this->compileValue($reduced);
-                $res     = $this->reduce(["variable", $this->vPrefix.$var]);
+                $res     = $this->reduce(['variable', $this->vPrefix.$var]);
 
-                if ($res[0] == "raw_color") {
+                if ($res[0] == 'raw_color') {
                     $res = $this->coerceColor($res);
                 }
 
@@ -1679,14 +1671,14 @@ protected function reduce($value, $forExpression = false)
                 }
 
                 return $res;
-            case "variable":
+            case 'variable':
                 $key = $value[1];
                 if (is_array($key)) {
                     $key = $this->reduce($key);
                     $key = $this->vPrefix.$this->compileValue($this->lib_e($key));
                 }
 
-                $seen =& $this->env->seenNames;
+                $seen = &$this->env->seenNames;
 
                 if (!empty($seen[$key])) {
                     $this->throwError("infinite loop detected: $key");
@@ -1697,18 +1689,18 @@ protected function reduce($value, $forExpression = false)
                 $seen[$key] = false;
 
                 return $out;
-            case "list":
+            case 'list':
                 foreach ($value[2] as &$item) {
                     $item = $this->reduce($item, $forExpression);
                 }
 
                 return $value;
-            case "expression":
+            case 'expression':
                 return $this->evaluate($value);
-            case "string":
+            case 'string':
                 foreach ($value[2] as &$part) {
                     if (is_array($part)) {
-                        $strip = $part[0] == "variable";
+                        $strip = $part[0] == 'variable';
                         $part  = $this->reduce($part);
                         if ($strip) {
                             $part = $this->lib_e($part);
@@ -1717,19 +1709,19 @@ protected function reduce($value, $forExpression = false)
                 }
 
                 return $value;
-            case "escape":
+            case 'escape':
                 list(, $inner) = $value;
 
                 return $this->lib_e($this->reduce($inner));
-            case "function":
+            case 'function':
                 $color = $this->funcToColor($value);
                 if ($color) {
                     return $color;
                 }
 
                 list(, $name, $args) = $value;
-                if ($name == "%") {
-                    $name = "_sprintf";
+                if ($name == '%') {
+                    $name = '_sprintf';
                 }
 
                 $f = isset($this->libFunctions[$name]) ?
@@ -1744,20 +1736,20 @@ protected function reduce($value, $forExpression = false)
 
                     if (is_null($ret)) {
                         return [
-                            "string",
-                            "",
+                            'string',
+                            '',
                             [
                                 $name,
-                                "(",
+                                '(',
                                 $args,
-                                ")",
+                                ')',
                             ],
                         ];
                     }
 
                     // convert to a typed value if the result is a php primitive
                     if (is_numeric($ret)) {
-                        $ret = ['number', $ret, ""];
+                        $ret = ['number', $ret, ''];
                     } elseif (!is_array($ret)) {
                         $ret = ['keyword', $ret];
                     }
@@ -1769,32 +1761,32 @@ protected function reduce($value, $forExpression = false)
                 $value[2] = $this->reduce($value[2]);
 
                 return $value;
-            case "unary":
+            case 'unary':
                 list(, $op, $exp) = $value;
-                $exp = $this->reduce($exp);
+                $exp              = $this->reduce($exp);
 
-                if ($exp[0] == "number") {
+                if ($exp[0] == 'number') {
                     switch ($op) {
-                        case "+":
+                        case '+':
                             return $exp;
-                        case "-":
+                        case '-':
                             $exp[1] *= -1;
 
                             return $exp;
                     }
                 }
 
-                return ["string", "", [$op, $exp]];
+                return ['string', '', [$op, $exp]];
         }
 
         if ($forExpression) {
             switch ($value[0]) {
-                case "keyword":
+                case 'keyword':
                     if ($color = $this->coerceColor($value)) {
                         return $color;
                     }
                     break;
-                case "raw_color":
+                case 'raw_color':
                     return $this->coerceColor($value);
             }
         }
@@ -1802,7 +1794,6 @@ protected function reduce($value, $forExpression = false)
         return $value;
     }
 
-
     // coerce a value for use in color operation
     protected function coerceColor($value)
     {
@@ -1810,12 +1801,12 @@ protected function coerceColor($value)
             case 'color':
                 return $value;
             case 'raw_color':
-                $c        = ["color", 0, 0, 0];
+                $c        = ['color', 0, 0, 0];
                 $colorStr = substr($value[1], 1);
                 $num      = hexdec($colorStr);
                 $width    = strlen($colorStr) == 3 ? 16 : 256;
 
-                for ($i = 3; $i > 0; $i--) { // 3 2 1
+                for ($i = 3; $i > 0; --$i) { // 3 2 1
                     $t = $num % $width;
                     $num /= $width;
 
@@ -1843,10 +1834,10 @@ protected function coerceColor($value)
     protected function coerceString($value)
     {
         switch ($value[0]) {
-            case "string":
+            case 'string':
                 return $value;
-            case "keyword":
-                return ["string", "", [$value[1]]];
+            case 'keyword':
+                return ['string', '', [$value[1]]];
         }
 
         return null;
@@ -1855,7 +1846,7 @@ protected function coerceString($value)
     // turn list of length 1 into value type
     protected function flattenList($value)
     {
-        if ($value[0] == "list" && count($value[2]) == 1) {
+        if ($value[0] == 'list' && count($value[2]) == 1) {
             return $this->flattenList($value[2][0]);
         }
 
@@ -1891,15 +1882,15 @@ protected function evaluate($exp)
         $rtype = $right[0];
 
         // operators that work on all types
-        if ($op == "and") {
+        if ($op == 'and') {
             return $this->toBool($left == self::$TRUE && $right == self::$TRUE);
         }
 
-        if ($op == "=") {
+        if ($op == '=') {
             return $this->toBool($this->eq($left, $right));
         }
 
-        if ($op == "+" && !is_null($str = $this->stringConcatenate($left, $right))) {
+        if ($op == '+' && !is_null($str = $this->stringConcatenate($left, $right))) {
             return $str;
         }
 
@@ -1915,20 +1906,20 @@ protected function evaluate($exp)
         // make the expression look it did before being parsed
         $paddedOp = $op;
         if ($whiteBefore) {
-            $paddedOp = " ".$paddedOp;
+            $paddedOp = ' '.$paddedOp;
         }
         if ($whiteAfter) {
-            $paddedOp .= " ";
+            $paddedOp .= ' ';
         }
 
-        return ["string", "", [$left, $paddedOp, $right]];
+        return ['string', '', [$left, $paddedOp, $right]];
     }
 
     protected function stringConcatenate($left, $right)
     {
         if ($strLeft = $this->coerceString($left)) {
-            if ($right[0] == "string") {
-                $right[1] = "";
+            if ($right[0] == 'string') {
+                $right[1] = '';
             }
             $strLeft[2][] = $right;
 
@@ -1942,7 +1933,6 @@ protected function stringConcatenate($left, $right)
         }
     }
 
-
     // make sure a color's components don't go out of bounds
     protected function fixColor($c)
     {
@@ -2012,7 +2002,7 @@ protected function op_color_color($op, $left, $right)
         return $this->fixColor($out);
     }
 
-    function lib_red($color)
+    public function lib_red($color)
     {
         $color = $this->coerceColor($color);
         if (is_null($color)) {
@@ -2022,7 +2012,7 @@ function lib_red($color)
         return $color[1];
     }
 
-    function lib_green($color)
+    public function lib_green($color)
     {
         $color = $this->coerceColor($color);
         if (is_null($color)) {
@@ -2032,7 +2022,7 @@ function lib_green($color)
         return $color[2];
     }
 
-    function lib_blue($color)
+    public function lib_blue($color)
     {
         $color = $this->coerceColor($color);
         if (is_null($color)) {
@@ -2042,7 +2032,6 @@ function lib_blue($color)
         return $color[3];
     }
 
-
     // operator on two numbers
     protected function op_number_number($op, $left, $right)
     {
@@ -2080,15 +2069,14 @@ protected function op_number_number($op, $left, $right)
                 $this->throwError('parse error: unknown number operator: '.$op);
         }
 
-        return ["number", $value, $unit];
+        return ['number', $value, $unit];
     }
 
-
     /* environment functions */
 
     protected function makeOutputBlock($type, $selectors = null)
     {
-        $b            = new stdclass;
+        $b            = new stdclass();
         $b->lines     = [];
         $b->children  = [];
         $b->selectors = $selectors;
@@ -2101,7 +2089,7 @@ protected function makeOutputBlock($type, $selectors = null)
     // the state of execution
     protected function pushEnv($block = null)
     {
-        $e         = new stdclass;
+        $e         = new stdclass();
         $e->parent = $this->env;
         $e->store  = [];
         $e->block  = $block;
@@ -2126,7 +2114,6 @@ protected function set($name, $value)
         $this->env->store[$name] = $value;
     }
 
-
     // get the highest occurrence entry for a name
     protected function get($name)
     {
@@ -2170,7 +2157,7 @@ protected function injectVariables($args)
 
     /**
      * Initialize any static state, can initialize parser for a file
-     * $opts isn't used yet
+     * $opts isn't used yet.
      */
     public function __construct($fname = null)
     {
@@ -2183,7 +2170,7 @@ public function __construct($fname = null)
     public function compile($string, $name = null)
     {
         $locale = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, "C");
+        setlocale(LC_NUMERIC, 'C');
 
         $this->parser = $this->makeParser($name);
         $root         = $this->parser->parse($string);
@@ -2247,7 +2234,7 @@ public function checkedCompile($in, $out)
     }
 
     /**
-     * Execute lessphp on a .less file or a lessphp cache structure
+     * Execute lessphp on a .less file or a lessphp cache structure.
      *
      * The lessphp cache structure contains information about a specific
      * less file having been parsed. It can be used as a hint for future
@@ -2310,7 +2297,6 @@ public function cachedCompile($in, $force = false)
             // we were given initially.
             return $in;
         }
-
     }
 
     // parse and compile buffer
@@ -2329,7 +2315,7 @@ public function parse($str = null, $initialVariables = null)
 
         if ($str == null) {
             if (empty($this->_parseFile)) {
-                throw new exception("nothing to parse");
+                throw new exception('nothing to parse');
             }
 
             $out = $this->compileFile($this->_parseFile);
@@ -2357,7 +2343,7 @@ public function setFormatter($name)
 
     protected function newFormatter()
     {
-        $className = "lessc_formatter_lessjs";
+        $className = 'lessc_formatter_lessjs';
         if (!empty($this->formatterName)) {
             if (!is_string($this->formatterName)) {
                 return $this->formatterName;
@@ -2365,7 +2351,7 @@ protected function newFormatter()
             $className = "lessc_formatter_$this->formatterName";
         }
 
-        return new $className;
+        return new $className();
     }
 
     public function setPreserveComments($preserve)
@@ -2415,7 +2401,7 @@ public function addParsedFile($file)
     }
 
     /**
-     * Uses the current value of $this->count to show line and line number
+     * Uses the current value of $this->count to show line and line number.
      */
     public function throwError($msg = null)
     {
@@ -2430,7 +2416,7 @@ public function throwError($msg = null)
     public static function ccompile($in, $out, $less = null)
     {
         if ($less === null) {
-            $less = new self;
+            $less = new self();
         }
 
         return $less->checkedCompile($in, $out);
@@ -2439,13 +2425,13 @@ public static function ccompile($in, $out, $less = null)
     public static function cexecute($in, $force = false, $less = null)
     {
         if ($less === null) {
-            $less = new self;
+            $less = new self();
         }
 
         return $less->cachedCompile($in, $force);
     }
 
-    static protected $cssColors = [
+    protected static $cssColors = [
         'aliceblue'            => '240,248,255',
         'antiquewhite'         => '250,235,215',
         'aqua'                 => '0,255,255',
@@ -2601,9 +2587,9 @@ public static function cexecute($in, $force = false, $less = null)
 // syntax tree
 class lessc_parser
 {
-    static protected $nextBlockId = 0; // used to uniquely identify blocks
+    protected static $nextBlockId = 0; // used to uniquely identify blocks
 
-    static protected $precedence = [
+    protected static $precedence = [
         '=<' => 0,
         '>=' => 0,
         '='  => 0,
@@ -2617,22 +2603,22 @@ class lessc_parser
         '%' => 2,
     ];
 
-    static protected $whitePattern;
-    static protected $commentMulti;
+    protected static $whitePattern;
+    protected static $commentMulti;
 
-    static protected $commentSingle = "//";
-    static protected $commentMultiLeft = "/*";
-    static protected $commentMultiRight = "*/";
+    protected static $commentSingle     = '//';
+    protected static $commentMultiLeft  = '/*';
+    protected static $commentMultiRight = '*/';
 
     // regex string to match any of the operators
-    static protected $operatorString;
+    protected static $operatorString;
 
     // these properties will supress division unless it's inside parenthases
-    static protected $supressDivisionProps =
+    protected static $supressDivisionProps =
         ['/border-radius$/i', '/^font$/i'];
 
-    protected $blockDirectives = ["font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport"];
-    protected $lineDirectives = ["charset"];
+    protected $blockDirectives = ['font-face', 'keyframes', 'page', '-moz-document', 'viewport', '-moz-viewport', '-o-viewport', '-ms-viewport'];
+    protected $lineDirectives  = ['charset'];
 
     /**
      * if we are in parens we can be more liberal with whitespace around
@@ -2646,7 +2632,7 @@ class lessc_parser
     protected $inParens = false;
 
     // caches preg escaped literals
-    static protected $literalCache = [];
+    protected static $literalCache = [];
 
     public function __construct($lessc, $sourceName = null)
     {
@@ -2684,7 +2670,7 @@ public function parse($buffer)
 
         $this->env    = null; // block stack
         $this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer);
-        $this->pushSpecialBlock("root");
+        $this->pushSpecialBlock('root');
         $this->eatWhiteDefault = true;
         $this->seenComments    = [];
 
@@ -2697,7 +2683,6 @@ public function parse($buffer)
 
         // parse the entire file
         while (false !== $this->parseChunk()) {
-            ;
         }
 
         if ($this->count != strlen($this->buffer)) {
@@ -2771,17 +2756,16 @@ protected function parseChunk()
             $this->seek($s);
         }
 
-
         // look for special css blocks
         if ($this->literal('@', false)) {
-            $this->count--;
+            --$this->count;
 
             // media
             if ($this->literal('@media')) {
                 if (($this->mediaQueryList($mediaQueries) || true)
                     && $this->literal('{')
                 ) {
-                    $media          = $this->pushSpecialBlock("media");
+                    $media          = $this->pushSpecialBlock('media');
                     $media->queries = is_null($mediaQueries) ? [] : $mediaQueries;
 
                     return true;
@@ -2792,12 +2776,12 @@ protected function parseChunk()
                 }
             }
 
-            if ($this->literal("@", false) && $this->keyword($dirName)) {
+            if ($this->literal('@', false) && $this->keyword($dirName)) {
                 if ($this->isDirective($dirName, $this->blockDirectives)) {
-                    if (($this->openString("{", $dirValue, null, [";"]) || true)
-                        && $this->literal("{")
+                    if (($this->openString('{', $dirValue, null, [';']) || true)
+                        && $this->literal('{')
                     ) {
-                        $dir       = $this->pushSpecialBlock("directive");
+                        $dir       = $this->pushSpecialBlock('directive');
                         $dir->name = $dirName;
                         if (isset($dirValue)) {
                             $dir->value = $dirValue;
@@ -2807,7 +2791,7 @@ protected function parseChunk()
                     }
                 } elseif ($this->isDirective($dirName, $this->lineDirectives)) {
                     if ($this->propertyValue($dirValue) && $this->end()) {
-                        $this->append(["directive", $dirName, $dirValue]);
+                        $this->append(['directive', $dirName, $dirValue]);
 
                         return true;
                     }
@@ -2927,8 +2911,8 @@ protected function isDirective($dirname, $directives)
     {
         // TODO: cache pattern in parser
         $pattern = implode(
-            "|",
-            array_map(["lessc", "preg_quote"], $directives)
+            '|',
+            array_map(['lessc', 'preg_quote'], $directives)
         );
         $pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
 
@@ -2979,11 +2963,11 @@ protected function expression(&$out)
             if (!empty($this->env->supressedDivision)) {
                 unset($this->env->supressedDivision);
                 $s = $this->seek();
-                if ($this->literal("/") && $this->value($rhs)) {
+                if ($this->literal('/') && $this->value($rhs)) {
                     $out = [
-                        "list",
-                        "",
-                        [$out, ["keyword", "/"], $rhs],
+                        'list',
+                        '',
+                        [$out, ['keyword', '/'], $rhs],
                     ];
                 } else {
                     $this->seek($s);
@@ -2997,7 +2981,7 @@ protected function expression(&$out)
     }
 
     /**
-     * recursively parse infix equation with $lhs at precedence $minP
+     * recursively parse infix equation with $lhs at precedence $minP.
      */
     protected function expHelper($lhs, $minP)
     {
@@ -3013,7 +2997,7 @@ protected function expHelper($lhs, $minP)
             $needWhite = $whiteBefore && !$this->inParens;
 
             if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
-                if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
+                if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == '/' && empty($this->env->supressedDivision)) {
                     foreach (self::$supressDivisionProps as $pattern) {
                         if (preg_match($pattern, $this->env->currentProperty)) {
                             $this->env->supressedDivision = true;
@@ -3022,7 +3006,6 @@ protected function expHelper($lhs, $minP)
                     }
                 }
 
-
                 $whiteAfter = isset($this->buffer[$this->count - 1])
                     && ctype_space($this->buffer[$this->count - 1]);
 
@@ -3089,15 +3072,15 @@ protected function parenValue(&$out)
         $s = $this->seek();
 
         // speed shortcut
-        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
+        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != '(') {
             return false;
         }
 
         $inParens = $this->inParens;
-        if ($this->literal("(")
+        if ($this->literal('(')
             && ($this->inParens = true)
             && $this->expression($exp)
-            && $this->literal(")")
+            && $this->literal(')')
         ) {
             $out            = $exp;
             $this->inParens = $inParens;
@@ -3117,14 +3100,14 @@ protected function value(&$value)
         $s = $this->seek();
 
         // speed shortcut
-        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
+        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == '-') {
             // negation
-            if ($this->literal("-", false)
-                && (($this->variable($inner) && $inner = ["variable", $inner])
+            if ($this->literal('-', false)
+                && (($this->variable($inner) && $inner = ['variable', $inner])
                     || $this->unit($inner)
                     || $this->parenValue($inner))
             ) {
-                $value = ["unary", "-", $inner];
+                $value = ['unary', '-', $inner];
 
                 return true;
             } else {
@@ -3162,8 +3145,8 @@ protected function value(&$value)
         }
 
         // unquote string (should this work on any type?
-        if ($this->literal("~") && $this->string($str)) {
-            $value = ["escape", $str];
+        if ($this->literal('~') && $this->string($str)) {
+            $value = ['escape', $str];
 
             return true;
         } else {
@@ -3194,7 +3177,7 @@ protected function import(&$out)
         // @import url(something.css) media;
 
         if ($this->propertyValue($value)) {
-            $out = ["import", $value];
+            $out = ['import', $value];
 
             return true;
         }
@@ -3202,7 +3185,7 @@ protected function import(&$out)
 
     protected function mediaQueryList(&$out)
     {
-        if ($this->genericList($list, "mediaQuery", ",", false)) {
+        if ($this->genericList($list, 'mediaQuery', ',', false)) {
             $out = $list[2];
 
             return true;
@@ -3218,13 +3201,13 @@ protected function mediaQuery(&$out)
         $expressions = null;
         $parts       = [];
 
-        if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
-            $prop = ["mediaType"];
+        if (($this->literal('only') && ($only = true) || $this->literal('not') && ($not = true) || true) && $this->keyword($mediaType)) {
+            $prop = ['mediaType'];
             if (isset($only)) {
-                $prop[] = "only";
+                $prop[] = 'only';
             }
             if (isset($not)) {
-                $prop[] = "not";
+                $prop[] = 'not';
             }
             $prop[]  = $mediaType;
             $parts[] = $prop;
@@ -3232,11 +3215,10 @@ protected function mediaQuery(&$out)
             $this->seek($s);
         }
 
-
-        if (!empty($mediaType) && !$this->literal("and")) {
+        if (!empty($mediaType) && !$this->literal('and')) {
             // ~
         } else {
-            $this->genericList($expressions, "mediaExpression", "and", false);
+            $this->genericList($expressions, 'mediaExpression', 'and', false);
             if (is_array($expressions)) {
                 $parts = array_merge($parts, $expressions[2]);
             }
@@ -3257,12 +3239,12 @@ protected function mediaExpression(&$out)
     {
         $s     = $this->seek();
         $value = null;
-        if ($this->literal("(")
+        if ($this->literal('(')
             && $this->keyword($feature)
-            && ($this->literal(":") && $this->expression($value) || true)
-            && $this->literal(")")
+            && ($this->literal(':') && $this->expression($value) || true)
+            && $this->literal(')')
         ) {
-            $out = ["mediaExp", $feature];
+            $out = ['mediaExp', $feature];
             if ($value) {
                 $out[] = $value;
             }
@@ -3285,15 +3267,15 @@ protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = nu
         $oldWhite              = $this->eatWhiteDefault;
         $this->eatWhiteDefault = false;
 
-        $stop = ["'", '"', "@{", $end];
-        $stop = array_map(["lessc", "preg_quote"], $stop);
+        $stop = ["'", '"', '@{', $end];
+        $stop = array_map(['lessc', 'preg_quote'], $stop);
         // $stop[] = self::$commentMulti;
 
         if (!is_null($rejectStrs)) {
             $stop = array_merge($stop, $rejectStrs);
         }
 
-        $patt = '(.*?)('.implode("|", $stop).')';
+        $patt = '(.*?)('.implode('|', $stop).')';
 
         $nestingLevel = 0;
 
@@ -3313,7 +3295,7 @@ protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = nu
                 if ($nestingLevel == 0) {
                     break;
                 } else {
-                    $nestingLevel--;
+                    --$nestingLevel;
                 }
             }
 
@@ -3322,7 +3304,7 @@ protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = nu
                 continue;
             }
 
-            if ($tok == "@{" && $this->interpolation($inter)) {
+            if ($tok == '@{' && $this->interpolation($inter)) {
                 $content[] = $inter;
                 continue;
             }
@@ -3346,7 +3328,7 @@ protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = nu
             $content[count($content) - 1] = rtrim(end($content));
         }
 
-        $out = ["string", "", $content];
+        $out = ['string', '', $content];
 
         return true;
     }
@@ -3373,13 +3355,13 @@ protected function string(&$out)
 
         while ($this->match($patt, $m, false)) {
             $content[] = $m[1];
-            if ($m[2] == "@{") {
+            if ($m[2] == '@{') {
                 $this->count -= strlen($m[2]);
                 if ($this->interpolation($inter, false)) {
                     $content[] = $inter;
                 } else {
                     $this->count += strlen($m[2]);
-                    $content[] = "@{"; // ignore it
+                    $content[] = '@{'; // ignore it
                 }
             } elseif ($m[2] == '\\') {
                 $content[] = $m[2];
@@ -3395,7 +3377,7 @@ protected function string(&$out)
         $this->eatWhiteDefault = $oldWhite;
 
         if ($this->literal($delim)) {
-            $out = ["string", $delim, $content];
+            $out = ['string', $delim, $content];
 
             return true;
         }
@@ -3411,11 +3393,11 @@ protected function interpolation(&$out)
         $this->eatWhiteDefault = true;
 
         $s = $this->seek();
-        if ($this->literal("@{")
-            && $this->openString("}", $interp, null, ["'", '"', ";"])
-            && $this->literal("}", false)
+        if ($this->literal('@{')
+            && $this->openString('}', $interp, null, ["'", '"', ';'])
+            && $this->literal('}', false)
         ) {
-            $out                   = ["interpolate", $interp];
+            $out                   = ['interpolate', $interp];
             $this->eatWhiteDefault = $oldWhite;
             if ($this->eatWhiteDefault) {
                 $this->whitespace();
@@ -3435,13 +3417,13 @@ protected function unit(&$unit)
         // speed shortcut
         if (isset($this->buffer[$this->count])) {
             $char = $this->buffer[$this->count];
-            if (!ctype_digit($char) && $char != ".") {
+            if (!ctype_digit($char) && $char != '.') {
                 return false;
             }
         }
 
         if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
-            $unit = ["number", $m[1], empty($m[2]) ? "" : $m[2]];
+            $unit = ['number', $m[1], empty($m[2]) ? '' : $m[2]];
 
             return true;
         }
@@ -3454,9 +3436,9 @@ protected function color(&$out)
     {
         if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
             if (strlen($m[1]) > 7) {
-                $out = ["string", "", [$m[1]]];
+                $out = ['string', '', [$m[1]]];
             } else {
-                $out = ["raw_color", $m[1]];
+                $out = ['raw_color', $m[1]];
             }
 
             return true;
@@ -3478,27 +3460,27 @@ protected function argumentDef(&$args, &$isVararg)
         }
 
         $values = [];
-        $delim  = ",";
-        $method = "expressionList";
+        $delim  = ',';
+        $method = 'expressionList';
 
         $isVararg = false;
         while (true) {
-            if ($this->literal("...")) {
+            if ($this->literal('...')) {
                 $isVararg = true;
                 break;
             }
 
             if ($this->$method($value)) {
-                if ($value[0] == "variable") {
-                    $arg = ["arg", $value[1]];
+                if ($value[0] == 'variable') {
+                    $arg = ['arg', $value[1]];
                     $ss  = $this->seek();
 
                     if ($this->assign() && $this->$method($rhs)) {
                         $arg[] = $rhs;
                     } else {
                         $this->seek($ss);
-                        if ($this->literal("...")) {
-                            $arg[0]   = "rest";
+                        if ($this->literal('...')) {
+                            $arg[0]   = 'rest';
                             $isVararg = true;
                         }
                     }
@@ -3509,47 +3491,45 @@ protected function argumentDef(&$args, &$isVararg)
                     }
                     continue;
                 } else {
-                    $values[] = ["lit", $value];
+                    $values[] = ['lit', $value];
                 }
             }
 
-
             if (!$this->literal($delim)) {
-                if ($delim == "," && $this->literal(";")) {
+                if ($delim == ',' && $this->literal(';')) {
                     // found new delim, convert existing args
-                    $delim  = ";";
-                    $method = "propertyValue";
+                    $delim  = ';';
+                    $method = 'propertyValue';
 
                     // transform arg list
                     if (isset($values[1])) { // 2 items
                         $newList = [];
                         foreach ($values as $i => $arg) {
                             switch ($arg[0]) {
-                                case "arg":
+                                case 'arg':
                                     if ($i) {
-                                        $this->throwError("Cannot mix ; and , as delimiter types");
+                                        $this->throwError('Cannot mix ; and , as delimiter types');
                                     }
                                     $newList[] = $arg[2];
                                     break;
-                                case "lit":
+                                case 'lit':
                                     $newList[] = $arg[1];
                                     break;
-                                case "rest":
-                                    $this->throwError("Unexpected rest before semicolon");
+                                case 'rest':
+                                    $this->throwError('Unexpected rest before semicolon');
                             }
                         }
 
-                        $newList = ["list", ", ", $newList];
+                        $newList = ['list', ', ', $newList];
 
                         switch ($values[0][0]) {
-                            case "arg":
-                                $newArg = ["arg", $values[0][1], $newList];
+                            case 'arg':
+                                $newArg = ['arg', $values[0][1], $newList];
                                 break;
-                            case "lit":
-                                $newArg = ["lit", $newList];
+                            case 'lit':
+                                $newArg = ['lit', $newList];
                                 break;
                         }
-
                     } elseif ($values) { // 1 item
                         $newArg = $values[0];
                     }
@@ -3599,7 +3579,7 @@ protected function mixinTags(&$tags)
         $tags = [];
         while ($this->tag($tt, true)) {
             $tags[] = $tt;
-            $this->literal(">");
+            $this->literal('>');
         }
 
         if (count($tags) == 0) {
@@ -3613,7 +3593,7 @@ protected function mixinTags(&$tags)
     protected function tagBracket(&$parts, &$hasExpression)
     {
         // speed shortcut
-        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
+        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != '[') {
             return false;
         }
 
@@ -3621,23 +3601,23 @@ protected function tagBracket(&$parts, &$hasExpression)
 
         $hasInterpolation = false;
 
-        if ($this->literal("[", false)) {
-            $attrParts = ["["];
+        if ($this->literal('[', false)) {
+            $attrParts = ['['];
             // keyword, string, operator
             while (true) {
-                if ($this->literal("]", false)) {
-                    $this->count--;
+                if ($this->literal(']', false)) {
+                    --$this->count;
                     break; // get out early
                 }
 
                 if ($this->match('\s+', $m)) {
-                    $attrParts[] = " ";
+                    $attrParts[] = ' ';
                     continue;
                 }
                 if ($this->string($str)) {
                     // escape parent selector, (yuck)
                     foreach ($str[2] as &$chunk) {
-                        $chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+                        $chunk = str_replace($this->lessc->parentSelector, '$&$', $chunk);
                     }
 
                     $attrParts[]      = $str;
@@ -3665,8 +3645,8 @@ protected function tagBracket(&$parts, &$hasExpression)
                 break;
             }
 
-            if ($this->literal("]", false)) {
-                $attrParts[] = "]";
+            if ($this->literal(']', false)) {
+                $attrParts[] = ']';
                 foreach ($attrParts as $part) {
                     $parts[] = $part;
                 }
@@ -3696,7 +3676,6 @@ protected function tag(&$tag, $simple = false)
         $hasExpression = false;
         $parts         = [];
         while ($this->tagBracket($parts, $hasExpression)) {
-            ;
         }
 
         $oldWhite              = $this->eatWhiteDefault;
@@ -3710,12 +3689,11 @@ protected function tag(&$tag, $simple = false)
                 }
 
                 while ($this->tagBracket($parts, $hasExpression)) {
-                    ;
                 }
                 continue;
             }
 
-            if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
+            if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == '@') {
                 if ($this->interpolation($interp)) {
                     $hasExpression = true;
                     $interp[2]     = true; // don't unescape
@@ -3723,8 +3701,8 @@ protected function tag(&$tag, $simple = false)
                     continue;
                 }
 
-                if ($this->literal("@")) {
-                    $parts[] = "@";
+                if ($this->literal('@')) {
+                    $parts[] = '@';
                     continue;
                 }
             }
@@ -3746,7 +3724,7 @@ protected function tag(&$tag, $simple = false)
         }
 
         if ($hasExpression) {
-            $tag = ["exp", ["string", "", $parts]];
+            $tag = ['exp', ['string', '', $parts]];
         } else {
             $tag = trim(implode($parts));
         }
@@ -3771,7 +3749,7 @@ protected function func(&$func)
                 $ss = $this->seek();
                 // this ugly nonsense is for ie filter properties
                 if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
-                    $args[] = ["string", "", [$name, "=", $value]];
+                    $args[] = ['string', '', [$name, '=', $value]];
                 } else {
                     $this->seek($ss);
                     if ($this->expressionList($value)) {
@@ -3792,7 +3770,7 @@ protected function func(&$func)
             } elseif ($fname == 'url') {
                 // couldn't parse and in url? treat as string
                 $this->seek($sPreArgs);
-                if ($this->openString(")", $string) && $this->literal(")")) {
+                if ($this->openString(')', $string) && $this->literal(')')) {
                     $func = ['function', $fname, $string];
 
                     return true;
@@ -3829,7 +3807,7 @@ protected function variable(&$name)
 
     /**
      * Consume an assignment operator
-     * Can optionally take a name that will be set to the current property name
+     * Can optionally take a name that will be set to the current property name.
      */
     protected function assign($name = null)
     {
@@ -3869,7 +3847,7 @@ protected function guards(&$guards)
     {
         $s = $this->seek();
 
-        if (!$this->literal("when")) {
+        if (!$this->literal('when')) {
             $this->seek($s);
 
             return false;
@@ -3879,7 +3857,7 @@ protected function guards(&$guards)
 
         while ($this->guardGroup($g)) {
             $guards[] = $g;
-            if (!$this->literal(",")) {
+            if (!$this->literal(',')) {
                 break;
             }
         }
@@ -3902,7 +3880,7 @@ protected function guardGroup(&$guardGroup)
         $guardGroup = [];
         while ($this->guard($guard)) {
             $guardGroup[] = $guard;
-            if (!$this->literal("and")) {
+            if (!$this->literal('and')) {
                 break;
             }
         }
@@ -3920,12 +3898,12 @@ protected function guardGroup(&$guardGroup)
     protected function guard(&$guard)
     {
         $s      = $this->seek();
-        $negate = $this->literal("not");
+        $negate = $this->literal('not');
 
-        if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
+        if ($this->literal('(') && $this->expression($exp) && $this->literal(')')) {
             $guard = $exp;
             if ($negate) {
-                $guard = ["negate", $guard];
+                $guard = ['negate', $guard];
             }
 
             return true;
@@ -3948,7 +3926,7 @@ protected function literal($what, $eatWhitespace = null)
         if (!isset($what[1]) && isset($this->buffer[$this->count])) {
             if ($this->buffer[$this->count] == $what) {
                 if (!$eatWhitespace) {
-                    $this->count++;
+                    ++$this->count;
 
                     return true;
                 }
@@ -3965,7 +3943,7 @@ protected function literal($what, $eatWhitespace = null)
         return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
     }
 
-    protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)
+    protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
     {
         $s     = $this->seek();
         $items = [];
@@ -3987,13 +3965,12 @@ protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)
         if ($flatten && count($items) == 1) {
             $out = $items[0];
         } else {
-            $out = ["list", $delim, $items];
+            $out = ['list', $delim, $items];
         }
 
         return true;
     }
 
-
     // advance counter to next occurrence of $what
     // $until - don't include $what in advance
     // $allowNewline, if string, will be used as valid char set
@@ -4002,7 +3979,7 @@ protected function to($what, &$out, $until = false, $allowNewline = false)
         if (is_string($allowNewline)) {
             $validChars = $allowNewline;
         } else {
-            $validChars = $allowNewline ? "." : "[^\n]";
+            $validChars = $allowNewline ? '.' : "[^\n]";
         }
         if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) {
             return false;
@@ -4042,7 +4019,7 @@ protected function whitespace()
             $gotWhite = false;
             while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
                 if (isset($m[1]) && empty($this->seenComments[$this->count])) {
-                    $this->append(["comment", $m[1]]);
+                    $this->append(['comment', $m[1]]);
                     $this->seenComments[$this->count] = true;
                 }
                 $this->count += strlen($m[0]);
@@ -4051,7 +4028,7 @@ protected function whitespace()
 
             return $gotWhite;
         } else {
-            $this->match("", $m);
+            $this->match('', $m);
 
             return strlen($m[0]) > 0;
         }
@@ -4083,7 +4060,7 @@ protected function seek($where = null)
 
     /* misc functions */
 
-    public function throwError($msg = "parse error", $count = null)
+    public function throwError($msg = 'parse error', $count = null)
     {
         $count = is_null($count) ? $this->count : $count;
 
@@ -4106,7 +4083,7 @@ public function throwError($msg = "parse error", $count = null)
 
     protected function pushBlock($selectors = null, $type = null)
     {
-        $b         = new stdclass;
+        $b         = new stdclass();
         $b->parent = $this->env;
 
         $b->type = $type;
@@ -4219,23 +4196,22 @@ protected function removeComments($text)
 
         return $out.$text;
     }
-
 }
 
 class lessc_formatter_classic
 {
-    public $indentChar = "  ";
+    public $indentChar = '  ';
 
-    public $break = "\n";
-    public $open = " {";
-    public $close = "}";
-    public $selectorSeparator = ", ";
-    public $assignSeparator = ":";
+    public $break             = "\n";
+    public $open              = ' {';
+    public $close             = '}';
+    public $selectorSeparator = ', ';
+    public $assignSeparator   = ':';
 
-    public $openSingle = " { ";
-    public $closeSingle = " }";
+    public $openSingle  = ' { ';
+    public $closeSingle = ' }';
 
-    public $disableSingle = false;
+    public $disableSingle  = false;
     public $breakSelectors = false;
 
     public $compressColors = false;
@@ -4252,7 +4228,7 @@ public function indentStr($n = 0)
 
     public function property($name, $value)
     {
-        return $name.$this->assignSeparator.$value.";";
+        return $name.$this->assignSeparator.$value.';';
     }
 
     protected function isEmpty($block)
@@ -4283,7 +4259,7 @@ public function block($block)
             && count($block->lines) == 1;
 
         if (!empty($block->selectors)) {
-            $this->indentLevel++;
+            ++$this->indentLevel;
 
             if ($this->breakSelectors) {
                 $selectorSeparator = $this->selectorSeparator.$this->break.$pre;
@@ -4295,12 +4271,11 @@ public function block($block)
                 implode($selectorSeparator, $block->selectors);
             if ($isSingle) {
                 echo $this->openSingle;
-                $inner = "";
+                $inner = '';
             } else {
                 echo $this->open.$this->break;
                 $inner = $this->indentStr();
             }
-
         }
 
         if (!empty($block->lines)) {
@@ -4326,31 +4301,30 @@ public function block($block)
                 echo $pre.$this->close.$this->break;
             }
 
-            $this->indentLevel--;
+            --$this->indentLevel;
         }
     }
 }
 
 class lessc_formatter_compressed extends lessc_formatter_classic
 {
-    public $disableSingle = true;
-    public $open = "{";
-    public $selectorSeparator = ",";
-    public $assignSeparator = ":";
-    public $break = "";
-    public $compressColors = true;
+    public $disableSingle     = true;
+    public $open              = '{';
+    public $selectorSeparator = ',';
+    public $assignSeparator   = ':';
+    public $break             = '';
+    public $compressColors    = true;
 
     public function indentStr($n = 0)
     {
-        return "";
+        return '';
     }
 }
 
 class lessc_formatter_lessjs extends lessc_formatter_classic
 {
-    public $disableSingle = true;
-    public $breakSelectors = true;
-    public $assignSeparator = ": ";
-    public $selectorSeparator = ",";
+    public $disableSingle     = true;
+    public $breakSelectors    = true;
+    public $assignSeparator   = ': ';
+    public $selectorSeparator = ',';
 }
-
diff --git a/plugins/MauticFocusBundle/MauticFocusBundle.php b/plugins/MauticFocusBundle/MauticFocusBundle.php
index aa8455408d5..3155ccdb867 100644
--- a/plugins/MauticFocusBundle/MauticFocusBundle.php
+++ b/plugins/MauticFocusBundle/MauticFocusBundle.php
@@ -1,19 +1,17 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\PluginBundle\Bundle\PluginBundleBase;
-use Mautic\PluginBundle\Entity\Plugin;
 
 class MauticFocusBundle extends PluginBundleBase
 {
-
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Model/FocusModel.php b/plugins/MauticFocusBundle/Model/FocusModel.php
index e001eb0ac03..4dcc0c45f54 100644
--- a/plugins/MauticFocusBundle/Model/FocusModel.php
+++ b/plugins/MauticFocusBundle/Model/FocusModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -83,7 +84,7 @@ public function getPermissionBase()
     public function createForm($entity, $formFactory, $action = null, $options = [])
     {
         if (!$entity instanceof Focus) {
-            throw new MethodNotAllowedHttpException (['Focus']);
+            throw new MethodNotAllowedHttpException(['Focus']);
         }
 
         if (!empty($action)) {
@@ -147,7 +148,7 @@ public function saveEntity($entity, $unlock = true)
     }
 
     /**
-     * Obtains the cached JS of a form and generates it if missing
+     * Obtains the cached JS of a form and generates it if missing.
      *
      * @param Focus $focus
      *
@@ -230,14 +231,14 @@ public function generateJavascript($focus, $preview = false, $ignoreMinify = fal
     }
 
     /**
-     * Get whether the color is light or dark
+     * Get whether the color is light or dark.
      *
      * @param $hex
      * @param $level
      *
      * @return bool
      */
-    static function isLightColor($hex, $level = 200)
+    public static function isLightColor($hex, $level = 200)
     {
         $hex = str_replace('#', '', $hex);
         $r   = hexdec(substr($hex, 0, 2));
@@ -250,7 +251,7 @@ static function isLightColor($hex, $level = 200)
     }
 
     /**
-     * Add a stat entry
+     * Add a stat entry.
      *
      * @param Focus $focus
      * @param       $type
@@ -286,6 +287,7 @@ public function addStat(Focus $focus, $type, $data = null)
      * {@inheritdoc}
      *
      * @return bool|FocusEvent|void
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function dispatchEvent($action, &$entity, $isNew = false, Event $event = null)
@@ -295,16 +297,16 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = FocusEvents::PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = FocusEvents::POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = FocusEvents::PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = FocusEvents::POST_DELETE;
                 break;
             default:
@@ -369,7 +371,7 @@ public function getStats(Focus $focus, $unit, \DateTime $dateFrom = null, \DateT
     }
 
     /**
-     * Joins the email table and limits created_by to currently logged in user
+     * Joins the email table and limits created_by to currently logged in user.
      *
      * @param QueryBuilder $q
      */
@@ -379,4 +381,4 @@ public function limitQueryToCreator(QueryBuilder $q)
             ->andWhere('m.created_by = :userId')
             ->setParameter('userId', $this->user->getId());
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Security/Permissions/FocusPermissions.php b/plugins/MauticFocusBundle/Security/Permissions/FocusPermissions.php
index 530f8316bf6..12c013fb50e 100644
--- a/plugins/MauticFocusBundle/Security/Permissions/FocusPermissions.php
+++ b/plugins/MauticFocusBundle/Security/Permissions/FocusPermissions.php
@@ -1,19 +1,20 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticFocusBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class MauticFocusPermissions
+ * Class MauticFocusPermissions.
  */
 class FocusPermissions extends AbstractPermissions
 {
@@ -48,4 +49,4 @@ public function buildForm(FormBuilderInterface &$builder, array $options, array
         $this->addStandardFormFields('focus', 'categories', $builder, $data);
         $this->addExtendedFormFields('focus', 'items', $builder, $data);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticFocusBundle/Views/Builder/Bar/animations.less.php b/plugins/MauticFocusBundle/Views/Builder/Bar/animations.less.php
index b2e82970ef6..02748a3fd5d 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Bar/animations.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Bar/animations.less.php
@@ -1,9 +1,11 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyUp      2015 Mautic, Inc. All Ups reserved
+ *
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Bar/collapser.less.php b/plugins/MauticFocusBundle/Views/Builder/Bar/collapser.less.php
index 787510488fd..ee85b0d4665 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Bar/collapser.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Bar/collapser.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Bar/index.html.php b/plugins/MauticFocusBundle/Views/Builder/Bar/index.html.php
index 99b94f6616e..241cd5d95a0 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Bar/index.html.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Bar/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $props   = $focus['properties'];
@@ -34,8 +35,8 @@
 </div>
 <?php if ($props['bar']['allow_hide']): ?>
     <div class="mf-copy-to-parent mf-bar-collapser mf-bar-collapser-<?php echo $props['bar']['placement']; ?> mf-bar-collapser-<?php echo $props['bar']['size']; ?><?php if ($props['bar']['sticky']) {
-        echo ' mf-bar-collapser-sticky';
-    } ?> mf-bar-collapser-<?php echo $focus['id']; ?>" style="background-color: #<?php echo $props['colors']['primary']; ?>; color: #<?php echo $props['colors']['text']; ?>;">
+                    echo ' mf-bar-collapser-sticky';
+                } ?> mf-bar-collapser-<?php echo $focus['id']; ?>" style="background-color: #<?php echo $props['colors']['primary']; ?>; color: #<?php echo $props['colors']['text']; ?>;">
         <style scoped>
             .mf-bar-collapser-icon {
                 color: #<?php  echo $color; ?>;
@@ -46,12 +47,12 @@
             }
         </style>
         <a class="mf-bar-collapser-icon" href="javascript:void(0)"<?php if (!empty($preview)) {
-            echo ' onclick="Mautic.toggleBarCollapse()"';
-        } ?>>
-            <?php $size = ($props['bar']['size'] == 'large') ? 40 : 24; ?>
+                    echo ' onclick="Mautic.toggleBarCollapse()"';
+                } ?>>
+            <?php $size          = ($props['bar']['size'] == 'large') ? 40 : 24; ?>
             <?php $transformSize = ($props['bar']['size'] == 'large') ? 20 : 20; ?>
-            <?php $scale = ($props['bar']['size'] == 'large') ? 1 : 0.6; ?>
-            <?php $direction = ($props['bar']['placement'] == 'top') ? '-90' : '90'; ?>
+            <?php $scale         = ($props['bar']['size'] == 'large') ? 1 : 0.6; ?>
+            <?php $direction     = ($props['bar']['placement'] == 'top') ? '-90' : '90'; ?>
             <svg style="overflow: hidden;" xmlns="http://www.w3.org/2000/svg" width="<?php echo $size; ?>" version="1.1"
                  height="<?php echo $size; ?>" data-transform-size="<?php echo $transformSize; ?>" data-transform-direction="<?php echo $direction; ?>" data-transform-scale="<?php echo $scale; ?>">
                 <g transform="scale(<?php echo $scale; ?>) rotate(<?php echo $direction; ?> <?php echo $transformSize; ?> <?php echo $transformSize; ?>)">
diff --git a/plugins/MauticFocusBundle/Views/Builder/Bar/parent.less.php b/plugins/MauticFocusBundle/Views/Builder/Bar/parent.less.php
index 80e5373034d..1e67adfe9d8 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Bar/parent.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Bar/parent.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Bar/shared.less.php b/plugins/MauticFocusBundle/Views/Builder/Bar/shared.less.php
index 6c3a7d5b757..bac9f719ecc 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Bar/shared.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Bar/shared.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Bar/style.less.php b/plugins/MauticFocusBundle/Views/Builder/Bar/style.less.php
index 34dc38836bc..4278545bf6b 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Bar/style.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Bar/style.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Modal/animations.less.php b/plugins/MauticFocusBundle/Views/Builder/Modal/animations.less.php
index 83d18d56d37..e5d8d5f9072 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Modal/animations.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Modal/animations.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2015 Mautic Contributors. All rights reserved.
+ * @copyright   2015 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Modal/index.html.php b/plugins/MauticFocusBundle/Views/Builder/Modal/index.html.php
index 51f06606d5d..af12ab1b2a3 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Modal/index.html.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Modal/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $props     = $focus['properties'];
@@ -17,13 +18,13 @@
         }
     </style>
     <div class="mautic-focus mf-<?php echo $style; ?><?php if ($placement) {
-        echo " mf-$style-$placement";
-    } ?><?php echo $animate; ?>">
+    echo " mf-$style-$placement";
+} ?><?php echo $animate; ?>">
         <div class="mf-<?php echo $style; ?>-container">
             <div class="mf-<?php echo $style; ?>-close">
                 <a href="javascript:void(0)"<?php if (!empty($preview)) {
-                    echo ' onclick="Mautic.closeFocusModal(\''.$style.'\')"';
-                } ?>>x</a>
+    echo ' onclick="Mautic.closeFocusModal(\''.$style.'\')"';
+} ?>>x</a>
             </div>
             <div class="mf-content">
                 <div class="mf-headline"><?php echo $props['content']['headline']; ?></div>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Modal/overlay.less.php b/plugins/MauticFocusBundle/Views/Builder/Modal/overlay.less.php
index dd5247c809f..056bf9e084e 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Modal/overlay.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Modal/overlay.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Modal/parent.less.php b/plugins/MauticFocusBundle/Views/Builder/Modal/parent.less.php
index d1a6e5f7fe2..0ff2b69167f 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Modal/parent.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Modal/parent.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Modal/style.less.php b/plugins/MauticFocusBundle/Views/Builder/Modal/style.less.php
index 8eb6ab6c6ac..f51377ef63e 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Modal/style.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Modal/style.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Notification/animations.less.php b/plugins/MauticFocusBundle/Views/Builder/Notification/animations.less.php
index c79c84efe51..ec479472eec 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Notification/animations.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Notification/animations.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Notification/index.html.php b/plugins/MauticFocusBundle/Views/Builder/Notification/index.html.php
index 79f88cf3c4d..0678c952ddf 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Notification/index.html.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Notification/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $props = $focus['properties'];
diff --git a/plugins/MauticFocusBundle/Views/Builder/Notification/parent.less.php b/plugins/MauticFocusBundle/Views/Builder/Notification/parent.less.php
index 28ddab9118a..5be963d5967 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Notification/parent.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Notification/parent.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Notification/style.less.php b/plugins/MauticFocusBundle/Views/Builder/Notification/style.less.php
index 64a5a49ed53..4a95877b141 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Notification/style.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Notification/style.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Page/index.html.php b/plugins/MauticFocusBundle/Views/Builder/Page/index.html.php
index 79f88cf3c4d..0678c952ddf 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Page/index.html.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Page/index.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 $props = $focus['properties'];
diff --git a/plugins/MauticFocusBundle/Views/Builder/Page/parent.less.php b/plugins/MauticFocusBundle/Views/Builder/Page/parent.less.php
index 003b7104a7f..07d93ced852 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Page/parent.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Page/parent.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticFocusBundle/Views/Builder/Page/style.less.php b/plugins/MauticFocusBundle/Views/Builder/Page/style.less.php
index 24f9b03497d..860012f0a04 100644
--- a/plugins/MauticFocusBundle/Views/Builder/Page/style.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/Page/style.less.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 .mf-page {
     position: fixed;
diff --git a/plugins/MauticFocusBundle/Views/Builder/content.html.php b/plugins/MauticFocusBundle/Views/Builder/content.html.php
index 66c822081f2..8cba368b992 100644
--- a/plugins/MauticFocusBundle/Views/Builder/content.html.php
+++ b/plugins/MauticFocusBundle/Views/Builder/content.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $templateBase = 'MauticFocusBundle:Builder\\'.ucfirst($focus['style']).':index.html.php';
 if (!isset($preview)) {
     $preview = false;
diff --git a/plugins/MauticFocusBundle/Views/Builder/form.html.php b/plugins/MauticFocusBundle/Views/Builder/form.html.php
index a1f11006cd9..d922253f024 100644
--- a/plugins/MauticFocusBundle/Views/Builder/form.html.php
+++ b/plugins/MauticFocusBundle/Views/Builder/form.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 use \Mautic\CoreBundle\Helper\InputHelper;
 
-$formName   = '_'.strtolower(
+$formName = '_'.strtolower(
         InputHelper::alphanum(
             InputHelper::transliterate(
                 $form->getName()
diff --git a/plugins/MauticFocusBundle/Views/Builder/generate.js.php b/plugins/MauticFocusBundle/Views/Builder/generate.js.php
index 209d2a16381..f20e806ccb0 100644
--- a/plugins/MauticFocusBundle/Views/Builder/generate.js.php
+++ b/plugins/MauticFocusBundle/Views/Builder/generate.js.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-$style = $focus['style'];
-$props = $focus['properties'];
+$style          = $focus['style'];
+$props          = $focus['properties'];
 $useScrollEvent = in_array($props['when'], ['scroll_slight', 'scroll_middle', 'scroll_bottom']);
 $useUnloadEvent = ($props['when'] == 'leave');
-$useTimeout = (!$useUnloadEvent && !$useScrollEvent && $props['when'] != 'immediately');
+$useTimeout     = (!$useUnloadEvent && !$useScrollEvent && $props['when'] != 'immediately');
 
 if ($useTimeout) {
     $timeout = ($props['when'] == '5seconds') ? 5000 : 60000;
@@ -48,7 +49,7 @@
     case 'bar':
         $iframeClass = "mf-bar-iframe mf-bar-iframe-{$props['bar']['placement']} mf-bar-iframe-{$props['bar']['size']}";
         if ($props['bar']['sticky']) {
-            $iframeClass .= " mf-bar-iframe-sticky";
+            $iframeClass .= ' mf-bar-iframe-sticky';
         }
         break;
 
diff --git a/plugins/MauticFocusBundle/Views/Builder/parent.less.php b/plugins/MauticFocusBundle/Views/Builder/parent.less.php
index 2593178ae91..9a17c9eb961 100644
--- a/plugins/MauticFocusBundle/Views/Builder/parent.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/parent.less.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ob_start();
 echo $view->render('MauticFocusBundle:Builder\Bar:parent.less.php');
 echo $view->render('MauticFocusBundle:Builder\Modal:parent.less.php');
@@ -16,11 +16,11 @@
 $less = ob_get_clean();
 
 require_once __DIR__.'/../../Include/lessc.inc.php';
-$compiler = new \lessc;
+$compiler = new \lessc();
 $css      = $compiler->compile($less);
 
 if (empty($preview) && $app->getEnvironment() != 'dev') {
     $css = \Minify_CSS::minify($css);
 }
 
-echo $css;
\ No newline at end of file
+echo $css;
diff --git a/plugins/MauticFocusBundle/Views/Builder/style.less.php b/plugins/MauticFocusBundle/Views/Builder/style.less.php
index 63272e5530c..c66d039eaee 100644
--- a/plugins/MauticFocusBundle/Views/Builder/style.less.php
+++ b/plugins/MauticFocusBundle/Views/Builder/style.less.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 if (!isset($preview)) {
@@ -100,11 +101,11 @@
 $less = ob_get_clean();
 
 require_once __DIR__.'/../../Include/lessc.inc.php';
-$compiler = new \lessc;
+$compiler = new \lessc();
 $css      = $compiler->compile($less);
 
 if (empty($preview) && $app->getEnvironment() != 'dev') {
     $css = \Minify_CSS::minify($css);
 }
 
-echo $css;
\ No newline at end of file
+echo $css;
diff --git a/plugins/MauticFocusBundle/Views/Focus/details.html.php b/plugins/MauticFocusBundle/Views/Focus/details.html.php
index 6afc326c3b4..d47bfbbd8db 100644
--- a/plugins/MauticFocusBundle/Views/Focus/details.html.php
+++ b/plugins/MauticFocusBundle/Views/Focus/details.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'focus');
-$view['slots']->set("headerTitle", $item->getName());
+$view['slots']->set('headerTitle', $item->getName());
 
 echo $view['assets']->includeScript('plugins/MauticFocusBundle/Assets/js/focus.js');
 
@@ -20,7 +20,7 @@
         [
             'item'            => $item,
             'templateButtons' => [
-                'edit'   => $view['security']->hasEntityAccess(
+                'edit' => $view['security']->hasEntityAccess(
                     $permissions['plugin:focus:items:editown'],
                     $permissions['plugin:focus:items:editother'],
                     $item->getCreatedBy()
@@ -31,10 +31,10 @@
                     $permissions['plugin:focus:items:deleteother'],
                     $item->getCreatedBy()
                 ),
-                'close' => $view['security']->isGranted('plugin:focus:items:view')
+                'close' => $view['security']->isGranted('plugin:focus:items:view'),
             ],
-            'routeBase'       => 'focus',
-            'langVar'         => 'mautic.focus',
+            'routeBase' => 'focus',
+            'langVar'   => 'mautic.focus',
         ]
     )
 );
diff --git a/plugins/MauticFocusBundle/Views/Focus/form.html.php b/plugins/MauticFocusBundle/Views/Focus/form.html.php
index 685f57cfbe0..d40f78fbf93 100644
--- a/plugins/MauticFocusBundle/Views/Focus/form.html.php
+++ b/plugins/MauticFocusBundle/Views/Focus/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'focus');
 
@@ -18,7 +18,7 @@
     )
     :
     $view['translator']->trans('mautic.focus.new');
-$view['slots']->set("headerTitle", $header);
+$view['slots']->set('headerTitle', $header);
 
 echo $view['assets']->includeScript('plugins/MauticFocusBundle/Assets/js/focus.js');
 echo $view['assets']->includeStylesheet('plugins/MauticFocusBundle/Assets/css/focus.css');
diff --git a/plugins/MauticFocusBundle/Views/Focus/index.html.php b/plugins/MauticFocusBundle/Views/Focus/index.html.php
index 5bb2f138669..39e628ae74c 100644
--- a/plugins/MauticFocusBundle/Views/Focus/index.html.php
+++ b/plugins/MauticFocusBundle/Views/Focus/index.html.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'focus');
-$view['slots']->set("headerTitle", $view['translator']->trans('mautic.focus'));
+$view['slots']->set('headerTitle', $view['translator']->trans('mautic.focus'));
 
 $view['slots']->set(
     'actions',
@@ -19,7 +19,7 @@
             'templateButtons' => [
                 'new' => $permissions['plugin:focus:items:create'],
             ],
-            'routeBase'       => 'focus',
+            'routeBase' => 'focus',
         ]
     )
 );
diff --git a/plugins/MauticFocusBundle/Views/Focus/list.html.php b/plugins/MauticFocusBundle/Views/Focus/list.html.php
index 3bc355b2514..8c2589343b0 100644
--- a/plugins/MauticFocusBundle/Views/Focus/list.html.php
+++ b/plugins/MauticFocusBundle/Views/Focus/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic Focus Bundle
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') {
     $view->extend('MauticFocusBundle:Focus:index.html.php');
 }
@@ -89,7 +89,7 @@
                             [
                                 'item'            => $item,
                                 'templateButtons' => [
-                                    'edit'   => $view['security']->hasEntityAccess(
+                                    'edit' => $view['security']->hasEntityAccess(
                                         $permissions['plugin:focus:items:editown'],
                                         $permissions['plugin:focus:items:editother'],
                                         $item->getCreatedBy()
@@ -101,7 +101,7 @@
                                         $item->getCreatedBy()
                                     ),
                                 ],
-                                'routeBase'       => 'focus',
+                                'routeBase' => 'focus',
                             ]
                         );
                         ?>
@@ -124,8 +124,8 @@
                     </td>
                     <td class="visible-md visible-lg">
                         <?php $category = $item->getCategory(); ?>
-                        <?php $catName = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
-                        <?php $color = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
+                        <?php $catName  = ($category) ? $category->getTitle() : $view['translator']->trans('mautic.core.form.uncategorized'); ?>
+                        <?php $color    = ($category) ? '#'.$category->getColor() : 'inherit'; ?>
                         <span style="white-space: nowrap;"><span class="label label-default pa-4" style="border: 1px solid #d5d5d5; background: <?php echo $color; ?>;"> </span> <span><?php echo $catName; ?></span></span>
                     </td>
                     <td class="visible-md visible-lg"><?php echo $view['translator']->trans('mautic.focus.type.'.$item->getType()); ?></td>
diff --git a/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/index.html.php b/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/index.html.php
index c3af23a6140..6edfcbbe87a 100644
--- a/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/index.html.php
+++ b/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/index.html.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-$searchBtnClass = (!empty($searchValue)) ? "fa-eraser" : "fa-search";
+$searchBtnClass = (!empty($searchValue)) ? 'fa-eraser' : 'fa-search';
 ?>
     <div class="input-group ma-5">
         <input type="search" class="form-control" id="focusPageTokenSearch" name="search" placeholder="<?php echo $view['translator']->trans(
diff --git a/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/list.html.php b/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/list.html.php
index 89f940157ba..13f117803f1 100644
--- a/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/list.html.php
+++ b/plugins/MauticFocusBundle/Views/SubscribedEvents/BuilderToken/list.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 if ($tmpl == 'index') {
     $view->extend('MauticFocusBundle:SubscribedEvents\BuilderToken:index.html.php');
 }
diff --git a/plugins/MauticOutlookBundle/Config/config.php b/plugins/MauticOutlookBundle/Config/config.php
index 1146363e7d1..3e22343d0e4 100644
--- a/plugins/MauticOutlookBundle/Config/config.php
+++ b/plugins/MauticOutlookBundle/Config/config.php
@@ -1,25 +1,26 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-return array(
+return [
     'name'        => 'Outlook',
     'description' => 'Enables integrations with Outlook for email tracking',
     'version'     => '1.0',
     'author'      => 'Werner Garcia',
 
-    'routes'   => array(
+    'routes' => [
         'public' => [
-            'mautic_outlook_tracker'             => [
+            'mautic_outlook_tracker' => [
                 'path'       => '/outlook/tracking.gif',
-                'controller' => 'MauticOutlookBundle:Public:trackingImage'
-            ]
-        ]
-    )
+                'controller' => 'MauticOutlookBundle:Public:trackingImage',
+            ],
+        ],
+    ],
 
-);
+];
diff --git a/plugins/MauticOutlookBundle/Controller/PublicController.php b/plugins/MauticOutlookBundle/Controller/PublicController.php
index 3cd65870b3a..743bf7a606d 100644
--- a/plugins/MauticOutlookBundle/Controller/PublicController.php
+++ b/plugins/MauticOutlookBundle/Controller/PublicController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,12 +12,10 @@
 
 use Mautic\CoreBundle\Controller\FormController as CommonFormController;
 use Mautic\CoreBundle\Helper\TrackingPixelHelper;
-use Mautic\LeadBundle\Model\LeadModel;
 use Symfony\Component\HttpFoundation\Response;
 
 class PublicController extends CommonFormController
 {
-
     /**
      * @return Response
      */
@@ -29,30 +28,33 @@ public function trackingImageAction()
         if (!$query_str) {
             $logger->log('error', 'Query string not available');
         } else {
-            if (strpos($query_str, '?d=') >= 0) $query_str = substr($query_str, strpos($query_str, '?d=')+1);
+            if (strpos($query_str, '?d=') >= 0) {
+                $query_str = substr($query_str, strpos($query_str, '?d=') + 1);
+            }
             parse_str($query_str, $query);
 
             // URL attr 'd' is encoded so let's decode it first.
             if (!isset($query['d'], $query['sig'])) {
-                $logger->log('error', 'Parameters are missing: ' . $query_str);
+                $logger->log('error', 'Parameters are missing: '.$query_str);
             } else {
                 // get secret from Outlook plugin settings
-                $integrationHelper = $this->get('mautic.helper.integration');
+                $integrationHelper  = $this->get('mautic.helper.integration');
                 $outlookIntegration = $integrationHelper->getIntegrationObject('Outlook');
-                $keys = $outlookIntegration->getDecryptedApiKeys();
+                $keys               = $outlookIntegration->getDecryptedApiKeys();
 
                 // generate signature
                 $salt = $keys['secret'];
-                if (strpos($salt, '$1$') === FALSE)
-                    $salt = '$1$'.$salt; // add MD5 prefix
-                $cr = crypt(urlencode($query['d']), $salt);
+                if (strpos($salt, '$1$') === false) {
+                    $salt = '$1$'.$salt;
+                } // add MD5 prefix
+                $cr    = crypt(urlencode($query['d']), $salt);
                 $mySig = hash('crc32b', $cr); // this hash type is used in c#
 
                 // compare signatures
                 if (hash_equals($mySig, $query['sig'])) {
                     // decode and parse query variables
                     $b64 = base64_decode($query['d']);
-                    $gz = gzdecode($b64);
+                    $gz  = gzdecode($b64);
                     parse_str($gz, $query);
                 } else {
                     // signatures don't match: stop
@@ -69,7 +71,7 @@ public function trackingImageAction()
 
                     // email is a semicolon delimited list of emails
                     $emails = explode(';', $query['email']);
-                    $repo = $this->getModel('lead')->getRepository();
+                    $repo   = $this->getModel('lead')->getRepository();
 
                     foreach ($emails as $email) {
                         $lead = $repo->getLeadByEmail($email);
@@ -138,6 +140,7 @@ public function addStat($lead, $email, $query, $idHash)
     /**
      * @param $email
      * @param $repo
+     *
      * @return mixed
      */
     public function createLead($email, $repo)
@@ -145,12 +148,11 @@ public function createLead($email, $repo)
         $model = $this->getModel('lead.lead');
         $lead  = $model->getEntity();
         // set custom field values
-        $data = ['email'=>$email];
+        $data = ['email' => $email];
         $model->setFieldValues($lead, $data, true);
         // create lead
         $model->saveEntity($lead);
         // return entity
         return $repo->getLeadByEmail($email);
     }
-
 }
diff --git a/plugins/MauticOutlookBundle/Integration/OutlookIntegration.php b/plugins/MauticOutlookBundle/Integration/OutlookIntegration.php
index 7702ec8685c..4a2023645f3 100644
--- a/plugins/MauticOutlookBundle/Integration/OutlookIntegration.php
+++ b/plugins/MauticOutlookBundle/Integration/OutlookIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -20,7 +21,7 @@ public function getName()
     }
 
     /**
-     * Return's authentication method such as oauth2, oauth1a, key, etc
+     * Return's authentication method such as oauth2, oauth1a, key, etc.
      *
      * @return string
      */
@@ -32,16 +33,14 @@ public function getAuthenticationType()
 
     /**
      * Return array of key => label elements that will be converted to inputs to
-     * obtain from the user
+     * obtain from the user.
      *
      * @return array
      */
     public function getRequiredKeyFields()
     {
-        return array(
-            'secret'     => 'mautic.integration.outlook.secret',
-        );
+        return [
+            'secret' => 'mautic.integration.outlook.secret',
+        ];
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticOutlookBundle/MauticOutlookBundle.php b/plugins/MauticOutlookBundle/MauticOutlookBundle.php
index 571ede39aa4..d71992bb40e 100644
--- a/plugins/MauticOutlookBundle/MauticOutlookBundle.php
+++ b/plugins/MauticOutlookBundle/MauticOutlookBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Mautic\PluginBundle\Bundle\PluginBundleBase;
 
 /**
- * Class MauticOutlookBundle
- *
- * @package Mautic\LeadBundle
+ * Class MauticOutlookBundle.
  */
 class MauticOutlookBundle extends PluginBundleBase
 {
-
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Command/MauticSocialMonitoringCommand.php b/plugins/MauticSocialBundle/Command/MauticSocialMonitoringCommand.php
index 187f445c19e..d43cbc1ab66 100644
--- a/plugins/MauticSocialBundle/Command/MauticSocialMonitoringCommand.php
+++ b/plugins/MauticSocialBundle/Command/MauticSocialMonitoringCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,8 +12,8 @@
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class MauticSocialMonitoringCommand extends ContainerAwareCommand
@@ -40,14 +41,14 @@ class MauticSocialMonitoringCommand extends ContainerAwareCommand
     protected $input;
 
     /**
-     * Configure the command
+     * Configure the command.
      */
     protected function configure()
     {
         $this->setName('mautic:social:monitoring')
             ->setDescription('Looks at the records of monitors and iterates through them. ')
             ->setHelp(
-                <<<EOT
+                <<<'EOT'
                 I'm not sure what to put here yet
 EOT
             )
@@ -64,8 +65,6 @@ protected function configure()
     /**
      * @param InputInterface  $input
      * @param OutputInterface $output
-     *
-     * @return void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -90,8 +89,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $monitorList = $this->getMonitors($monitorId);
 
         // no mid found, quit now
-        if (! $monitorList->count()) {
+        if (!$monitorList->count()) {
             $this->output->writeln('No published monitors found. Make sure the id you supplied is published');
+
             return;
         }
 
@@ -114,21 +114,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     protected function getMonitors($id = null)
     {
-        $filter = array(
+        $filter = [
             'start' => 0,
-            'limit' => 100
-        );
+            'limit' => 100,
+        ];
 
         if ($id !== null) {
-            $filter['filter'] = array(
-                'force' => array(
-                    array(
+            $filter['filter'] = [
+                'force' => [
+                    [
                         'column' => $this->monitorRepo->getTableAlias().'.id',
                         'expr'   => 'eq',
-                        'value'  => (int) $id
-                    )
-                )
-            );
+                        'value'  => (int) $id,
+                    ],
+                ],
+            ];
         }
 
         $monitorList = $this->monitorRepo->getPublishedEntities($filter);
@@ -140,6 +140,7 @@ protected function getMonitors($id = null)
      * @param $listItem
      *
      * @return bool|int
+     *
      * @throws \Exception
      */
     protected function processMonitorListItem($listItem)
@@ -150,12 +151,12 @@ protected function processMonitorListItem($listItem)
         $commandName = '';
 
         // hashtag command
-        if ($networkType == "twitter_hashtag") {
+        if ($networkType == 'twitter_hashtag') {
             $commandName = 'social:monitor:twitter:hashtags';
         }
 
         // mention command
-        if ($networkType == "twitter_handle") {
+        if ($networkType == 'twitter_handle') {
             $commandName = 'social:monitor:twitter:mentions';
         }
 
@@ -169,12 +170,12 @@ protected function processMonitorListItem($listItem)
         $command = $this->getApplication()->find($commandName);
 
         // create command options
-        $cliArgs = array(
+        $cliArgs = [
             'command'       => $commandName,
             '--mid'         => $listItem->getId(),
             '--max-runs'    => $this->maxPerIterations,
-            '--query-count' => $this->input->getOption('query-count')
-        );
+            '--query-count' => $this->input->getOption('query-count'),
+        ];
 
         // create an input array
         $input = new ArrayInput($cliArgs);
@@ -184,4 +185,4 @@ protected function processMonitorListItem($listItem)
 
         return $returnCode;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Command/MonitorTwitterBaseCommand.php b/plugins/MauticSocialBundle/Command/MonitorTwitterBaseCommand.php
index de833993fa8..d874bf386ad 100644
--- a/plugins/MauticSocialBundle/Command/MonitorTwitterBaseCommand.php
+++ b/plugins/MauticSocialBundle/Command/MonitorTwitterBaseCommand.php
@@ -1,27 +1,28 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Command;
 
+use Mautic\LeadBundle\Entity\Lead;
 use MauticPlugin\MauticSocialBundle\Event\SocialMonitorEvent;
 use MauticPlugin\MauticSocialBundle\Exception\ExitMonitorException;
 use MauticPlugin\MauticSocialBundle\Model\MonitoringModel;
 use MauticPlugin\MauticSocialBundle\SocialEvents;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Mautic\LeadBundle\Entity\Lead;
 
 abstract class MonitorTwitterBaseCommand extends ContainerAwareCommand
 {
-    /** @var  \MauticPlugin\MauticSocialBundle\Integration\TwitterIntegration */
+    /** @var \MauticPlugin\MauticSocialBundle\Integration\TwitterIntegration */
     protected $twitter;
 
     protected $output;
@@ -38,7 +39,7 @@ abstract class MonitorTwitterBaseCommand extends ContainerAwareCommand
 
     protected $queryCount = 100;
 
-    protected $manipulatedLeads = array();
+    protected $manipulatedLeads = [];
 
     /**
      * @var MonitoringModel
@@ -51,7 +52,7 @@ abstract class MonitorTwitterBaseCommand extends ContainerAwareCommand
     protected function configure()
     {
         $this->setHelp(
-            <<<EOT
+            <<<'EOT'
             I'm not sure what to put here yet
 EOT
         )
@@ -67,10 +68,10 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->input      = $input;
-        $this->output     = $output;
-        $this->maxRuns    = $this->input->getOption('max-runs');
-        $this->queryCount = $this->input->getOption('query-count');
+        $this->input           = $input;
+        $this->output          = $output;
+        $this->maxRuns         = $this->input->getOption('max-runs');
+        $this->queryCount      = $this->input->getOption('query-count');
         $this->monitoringModel = $this->getContainer()->get('mautic.social.model.monitoring');
 
         $translator = $this->getContainer()->get('translator');
@@ -116,7 +117,7 @@ protected function processMonitor($monitor)
 
             if (array_key_exists('errors', $results)) {
                 foreach ($results['errors'] as $error) {
-                    $this->output->writeln($error['code'].": ".$error['message']);
+                    $this->output->writeln($error['code'].': '.$error['message']);
                 }
             }
 
@@ -137,7 +138,7 @@ protected function processMonitor($monitor)
         // get stats after being updated
         $stats = $monitor->getStats();
 
-        $this->runCount++;
+        ++$this->runCount;
 
         // if we have stats and a next results request, process it here
         // @todo add a check for max iterations
@@ -188,9 +189,9 @@ protected function createLeadsFromStatuses($statusList, $monitor)
         $handleField = $this->getContainer()->getParameter('mautic.twitter_handle_field', $this->getNetworkName());
 
         $leadField = $leadFieldModel->getRepository()->findOneBy(
-            array(
-                'alias' => $handleField
-            )
+            [
+                'alias' => $handleField,
+            ]
         );
 
         if (!$leadField) {
@@ -207,7 +208,7 @@ protected function createLeadsFromStatuses($statusList, $monitor)
         defined('SOCIAL_MONITOR_IMPORT') or define('SOCIAL_MONITOR_IMPORT', 1);
 
         // Get a list of existing leads to tone down on queries
-        $twitterLeads = array();
+        $twitterLeads = [];
         $qb           = $leadModel->getRepository()->createQueryBuilder('f');
         $expr         = $qb->expr();
         foreach ($statusList as $status) {
@@ -219,21 +220,21 @@ protected function createLeadsFromStatuses($statusList, $monitor)
 
         if (!empty($twitterLeads)) {
             $leads = $leadModel->getRepository()->getEntities(
-                array(
-                    'filter' => array(
-                        'force' => array(
-                            array(
+                [
+                    'filter' => [
+                        'force' => [
+                            [
                                 'column' => 'l.'.$handleField,
                                 'expr'   => 'in',
-                                'value'  => $twitterLeads
-                            )
-                        )
-                    )
-                )
+                                'value'  => $twitterLeads,
+                            ],
+                        ],
+                    ],
+                ]
             );
 
             // Key by twitter handle
-            $twitterLeads = array();
+            $twitterLeads = [];
             foreach ($leads as $leadId => $lead) {
                 $fields                       = $lead->getFields();
                 $twitterHandle                = $fields[$handleFieldGroup][$handleField]['value'];
@@ -243,7 +244,7 @@ protected function createLeadsFromStatuses($statusList, $monitor)
             unset($leads);
         }
 
-        $processedLeads = array();
+        $processedLeads = [];
         foreach ($statusList as $status) {
             if (empty($status['user']['screen_name'])) {
                 continue;
@@ -254,20 +255,19 @@ protected function createLeadsFromStatuses($statusList, $monitor)
             $lastActive     = new \DateTime($tweetTimestamp);
             $handle         = $status['user']['screen_name'];
 
-            /** @var \Mautic\LeadBundle\Entity\Lead $leadEntity */
+            /* @var \Mautic\LeadBundle\Entity\Lead $leadEntity */
             if (!isset($processedLeads[$handle])) {
                 $processedLeads[$handle] = 1;
 
                 if (isset($twitterLeads[$handle])) {
-                    $this->updatedLeads++;
+                    ++$this->updatedLeads;
 
                     $isNew      = false;
                     $leadEntity = $twitterLeads[$handle];
 
                     $this->output->writeln('Updating existing lead ID #'.$leadEntity->getId().' ('.$handle.')');
-
                 } else {
-                    $this->newLeads++;
+                    ++$this->newLeads;
 
                     $this->output->writeln('Creating new lead');
 
@@ -275,15 +275,15 @@ protected function createLeadsFromStatuses($statusList, $monitor)
                     $leadEntity = new Lead();
                     $leadEntity->setNewlyCreated(true);
 
-                    list ($firstName, $lastName) = $this->splitName($status['user']['name']);
+                    list($firstName, $lastName) = $this->splitName($status['user']['name']);
 
                     // build new lead fields
-                    $fields = array(
+                    $fields = [
                         $handleField => $handle,
                         'firstname'  => $firstName,
                         'lastname'   => $lastName,
-                        'country'    => $status['user']['location']
-                    );
+                        'country'    => $status['user']['location'],
+                    ];
 
                     // set field values
                     $leadModel->setFieldValues($leadEntity, $fields, false);
@@ -338,15 +338,15 @@ protected function createLeadsFromStatuses($statusList, $monitor)
     private function splitName($name)
     {
         // array the entire name
-        $nameParts = explode(" ", $name);
+        $nameParts = explode(' ', $name);
 
         // last part of the array is our last
         $lastName = array_pop($nameParts);
 
         // push the rest of the name into first name
-        $firstName = implode(" ", $nameParts);
+        $firstName = implode(' ', $nameParts);
 
-        return array($lastName, $firstName);
+        return [$lastName, $firstName];
     }
 
     /*
@@ -412,7 +412,7 @@ protected function setMonitorStats($monitor, $searchMeta)
      *
      * URL Encoding done in makeRequest()
      */
-    protected function buildTwitterSearchQuery(Array $query)
+    protected function buildTwitterSearchQuery(array $query)
     {
         $queryString = implode(' ', $query);
 
@@ -488,4 +488,4 @@ protected function printInformation($monitor, $results)
      * @return string twitter|facebook|linkedin etc..
      */
     abstract public function getNetworkName();
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Command/MonitorTwitterHashtagsCommand.php b/plugins/MauticSocialBundle/Command/MonitorTwitterHashtagsCommand.php
index 8727384d367..6fe0d679c35 100644
--- a/plugins/MauticSocialBundle/Command/MonitorTwitterHashtagsCommand.php
+++ b/plugins/MauticSocialBundle/Command/MonitorTwitterHashtagsCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -23,7 +24,7 @@ protected function configure()
     }
 
     /**
-     * Search for tweets by hashtag
+     * Search for tweets by hashtag.
      *
      * @param $monitor
      *
@@ -45,16 +46,16 @@ protected function getTweets($monitor)
         }
 
         $query = $this->buildTwitterSearchQuery(
-            array(
-                '#'.$params['hashtag']
-            )
+            [
+                '#'.$params['hashtag'],
+            ]
         );
 
         // @todo set up count to be configurable
-        $requestQuery = array(
+        $requestQuery = [
             'q'     => $query,
-            'count' => $this->queryCount
-        );
+            'count' => $this->queryCount,
+        ];
 
         // if we have a max id string use it here
         if (is_array($stats) && array_key_exists('max_id_str', $stats) && $stats['max_id_str']) {
@@ -66,9 +67,8 @@ protected function getTweets($monitor)
         return $results;
     }
 
-
     public function getNetworkName()
     {
         return 'twitter';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Command/MonitorTwitterMentionsCommand.php b/plugins/MauticSocialBundle/Command/MonitorTwitterMentionsCommand.php
index 55bb76d3960..21604c90029 100644
--- a/plugins/MauticSocialBundle/Command/MonitorTwitterMentionsCommand.php
+++ b/plugins/MauticSocialBundle/Command/MonitorTwitterMentionsCommand.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -39,16 +40,16 @@ public function getTweets($monitor)
         $mentionsUrl = $this->twitter->getApiUrl('search/tweets');
 
         $query = $this->buildTwitterSearchQuery(
-            array(
-                '@'.$params['handle']
-            )
+            [
+                '@'.$params['handle'],
+            ]
         );
 
         // @todo set up count to be configurable
-        $requestQuery = array(
+        $requestQuery = [
             'q'     => $query,
-            'count' => $this->queryCount
-        );
+            'count' => $this->queryCount,
+        ];
 
         // if we have a max id string use it here
         if (is_array($stats) && array_key_exists('max_id_str', $stats) && $stats['max_id_str']) {
@@ -64,4 +65,4 @@ public function getNetworkName()
     {
         return 'twitter';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Config/config.php b/plugins/MauticSocialBundle/Config/config.php
index aaa697869eb..87e47e883c9 100644
--- a/plugins/MauticSocialBundle/Config/config.php
+++ b/plugins/MauticSocialBundle/Config/config.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,7 +16,7 @@
 
     'routes' => [
         'main' => [
-            'mautic_social_index'  => [
+            'mautic_social_index' => [
                 'path'       => '/monitoring/{page}',
                 'controller' => 'MauticSocialBundle:Monitoring:index',
             ],
@@ -23,7 +24,7 @@
                 'path'       => '/monitoring/{objectAction}/{objectId}',
                 'controller' => 'MauticSocialBundle:Monitoring:execute',
             ],
-            'mautic_social_contacts'  => [
+            'mautic_social_contacts' => [
                 'path'       => '/monitoring/view/{objectId}/contacts/{page}',
                 'controller' => 'MauticSocialBundle:Monitoring:contacts',
             ],
@@ -32,50 +33,50 @@
 
     'services' => [
         'events' => [
-            'mautic.social.formbundle.subscriber'     => [
+            'mautic.social.formbundle.subscriber' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\EventListener\FormSubscriber',
             ],
             'mautic.social.campaignbundle.subscriber' => [
-                'class' => 'MauticPlugin\MauticSocialBundle\EventListener\CampaignSubscriber',
+                'class'     => 'MauticPlugin\MauticSocialBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.factory',
-                    'mautic.social.helper.campaign'
+                    'mautic.social.helper.campaign',
                 ],
             ],
-            'mautic.social.configbundle.subscriber'   => [
+            'mautic.social.configbundle.subscriber' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\EventListener\ConfigSubscriber',
             ],
         ],
-        'forms'  => [
-            'mautic.form.type.social.sociallogin'              => [
+        'forms' => [
+            'mautic.form.type.social.sociallogin' => [
                 'class'     => 'MauticPlugin\MauticSocialBundle\Form\Type\SocialLoginType',
                 'arguments' => [
                     'mautic.helper.integration',
                     'mautic.form.model.form',
                     ],
-                'alias'     => 'sociallogin',
+                'alias' => 'sociallogin',
             ],
-            'mautic.form.type.social.facebook'                 => [
+            'mautic.form.type.social.facebook' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\FacebookType',
                 'alias' => 'socialmedia_facebook',
             ],
-            'mautic.form.type.social.twitter'                  => [
+            'mautic.form.type.social.twitter' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TwitterType',
                 'alias' => 'socialmedia_twitter',
             ],
-            'mautic.form.type.social.googleplus'               => [
+            'mautic.form.type.social.googleplus' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\GooglePlusType',
                 'alias' => 'socialmedia_googleplus',
             ],
-            'mautic.form.type.social.linkedin'                 => [
+            'mautic.form.type.social.linkedin' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\LinkedInType',
                 'alias' => 'socialmedia_linkedin',
             ],
-            'mautic.social.form.type.twitter.tweet'            => [
-                'class'     => 'MauticPlugin\MauticSocialBundle\Form\Type\TweetType',
-                'alias'     => 'twitter_tweet',
+            'mautic.social.form.type.twitter.tweet' => [
+                'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TweetType',
+                'alias' => 'twitter_tweet',
             ],
-            'mautic.social.form.type.monitoring'               => [
+            'mautic.social.form.type.monitoring' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\MonitoringType',
                 'alias' => 'monitoring',
             ],
@@ -83,45 +84,45 @@
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TwitterAbstractType',
                 'alias' => 'twitter_abstract',
             ],
-            'mautic.social.form.type.network.twitter.hashtag'  => [
+            'mautic.social.form.type.network.twitter.hashtag' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TwitterHashtagType',
                 'alias' => 'twitter_hashtag',
             ],
-            'mautic.social.form.type.network.twitter.mention'  => [
+            'mautic.social.form.type.network.twitter.mention' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TwitterMentionType',
                 'alias' => 'twitter_handle',
             ],
-            'mautic.social.form.type.network.twitter.custom'   => [
+            'mautic.social.form.type.network.twitter.custom' => [
                 'class' => 'MauticPlugin\MauticSocialBundle\Form\Type\TwitterCustomType',
                 'alias' => 'twitter_custom',
             ],
-            'mautic.social.config'                             => [
+            'mautic.social.config' => [
                 'class'     => 'MauticPlugin\MauticSocialBundle\Form\Type\ConfigType',
                 'alias'     => 'social_config',
                 'arguments' => 'mautic.lead.model.field',
             ],
         ],
-        'models' =>  [
+        'models' => [
             'mautic.social.model.monitoring' => [
-                'class' => 'MauticPlugin\MauticSocialBundle\Model\MonitoringModel'
+                'class' => 'MauticPlugin\MauticSocialBundle\Model\MonitoringModel',
             ],
             'mautic.social.model.postcount' => [
-                'class' => 'MauticPlugin\MauticSocialBundle\Model\PostCountModel'
+                'class' => 'MauticPlugin\MauticSocialBundle\Model\PostCountModel',
             ],
         ],
         'others' => [
             'mautic.social.helper.campaign' => [
-                'class' => 'MauticPlugin\MauticSocialBundle\Helper\CampaignEventHelper',
+                'class'     => 'MauticPlugin\MauticSocialBundle\Helper\CampaignEventHelper',
                 'arguments' => [
                     'mautic.helper.integration',
                     'mautic.page.model.trackable',
                     'mautic.page.helper.token',
                     'mautic.asset.helper.token',
-                ]
-            ]
-        ]
+                ],
+            ],
+        ],
     ],
-    'menu'     => [
+    'menu' => [
         'main' => [
             'mautic.social.monitoring' => [
                 'route'  => 'mautic_social_index',
@@ -140,6 +141,6 @@
     ],
 
     'parameters' => [
-        "twitter_handle_field" => 'twitter',
+        'twitter_handle_field' => 'twitter',
     ],
-];
\ No newline at end of file
+];
diff --git a/plugins/MauticSocialBundle/Controller/AjaxController.php b/plugins/MauticSocialBundle/Controller/AjaxController.php
index e6058772af8..5a41667764d 100644
--- a/plugins/MauticSocialBundle/Controller/AjaxController.php
+++ b/plugins/MauticSocialBundle/Controller/AjaxController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,9 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AjaxController
- *
- * @package Mautic\EmailBundle\Controller
+ * Class AjaxController.
  */
 class AjaxController extends CommonAjaxController
 {
@@ -33,7 +32,7 @@ protected function getNetworkFormAction(Request $request)
         // default to empty
         $dataArray = [
             'html'    => '',
-            'success' => 0
+            'success' => 0,
         ];
 
         if (!empty($type)) {
@@ -51,21 +50,20 @@ protected function getNetworkFormAction(Request $request)
                 [
                     $type.'[', // this is going to generate twitter_hashtag[ or twitter_mention[
                     $type.'_', // this is going to generate twitter_hashtag_ or twitter_mention_
-                    $type
+                    $type,
                 ],
                 [
                     'monitoring[properties][',
                     'monitoring_properties_',
-                    'monitoring'
+                    'monitoring',
                 ],
                 $html
             );
 
-
             $dataArray['html']    = $html;
             $dataArray['success'] = 1;
         }
 
         return $this->sendJsonResponse($dataArray);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Controller/MonitoringController.php b/plugins/MauticSocialBundle/Controller/MonitoringController.php
index 0cb4dc13d5e..ef9c84fae13 100644
--- a/plugins/MauticSocialBundle/Controller/MonitoringController.php
+++ b/plugins/MauticSocialBundle/Controller/MonitoringController.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -15,9 +16,8 @@
 use MauticPlugin\MauticSocialBundle\Entity\Monitoring;
 
 /**
- * Class MonitoringController
+ * Class MonitoringController.
  */
-
 class MonitoringController extends FormController
 {
     use EntityContactsTrait;
@@ -57,7 +57,7 @@ public function indexAction($page = 1)
                 'limit'      => $limit,
                 'filter'     => $filter,
                 'orderBy'    => $orderBy,
-                'orderByDir' => $orderByDir
+                'orderByDir' => $orderByDir,
             ]
         );
 
@@ -79,8 +79,8 @@ public function indexAction($page = 1)
                     'contentTemplate' => 'MauticSocialBundle:Monitoring:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_social_index',
-                        'mauticContent' => 'monitoring'
-                    ]
+                        'mauticContent' => 'monitoring',
+                    ],
                 ]
             );
         }
@@ -92,26 +92,26 @@ public function indexAction($page = 1)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'searchValue' => $search,
                     'items'       => $monitoringList,
                     'limit'       => $limit,
                     'model'       => $model,
                     'tmpl'        => $tmpl,
-                    'page'        => $page
+                    'page'        => $page,
                 ],
                 'contentTemplate' => 'MauticSocialBundle:Monitoring:list.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_social_index',
                     'mauticContent' => 'monitoring',
-                    'route'         => $this->generateUrl('mautic_social_index', ['page' => $page])
-                ]
+                    'route'         => $this->generateUrl('mautic_social_index', ['page' => $page]),
+                ],
             ]
         );
     }
 
     /**
-     * Generates new form and processes post data
+     * Generates new form and processes post data.
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
@@ -145,7 +145,7 @@ public function newAction()
             [
                 // pass through the types and the selected default type
                 'networkTypes' => $networkTypes,
-                'networkType'  => $networkType
+                'networkType'  => $networkType,
             ]
         );
 
@@ -175,9 +175,9 @@ public function newAction()
                                 'mautic_social_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
+                                    'objectId'     => $entity->getId(),
                                 ]
-                            )
+                            ),
                         ]
                     );
 
@@ -188,9 +188,9 @@ public function newAction()
 
                     $viewParameters = [
                         'objectAction' => 'view',
-                        'objectId'     => $entity->getId()
+                        'objectId'     => $entity->getId(),
                     ];
-                    $template       = 'MauticSocialBundle:Monitoring:view';
+                    $template = 'MauticSocialBundle:Monitoring:view';
                 }
             }
             $returnUrl = $this->generateUrl('mautic_social_index', $viewParameters);
@@ -203,8 +203,8 @@ public function newAction()
                         'contentTemplate' => $template,
                         'passthroughVars' => [
                             'activeLink'    => 'mautic_social_index',
-                            'mauticContent' => 'monitoring'
-                        ]
+                            'mauticContent' => 'monitoring',
+                        ],
                     ]
                 );
             }
@@ -212,7 +212,7 @@ public function newAction()
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'tmpl'   => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                     'entity' => $entity,
                     'form'   => $form->createView(),
@@ -225,10 +225,10 @@ public function newAction()
                         'mautic_social_action',
                         [
                             'objectAction' => 'new',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
@@ -264,8 +264,8 @@ public function editAction($objectId)
             'contentTemplate' => 'MauticSocial:Monitoring:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_social_index',
-                'mauticContent' => 'monitoring'
-            ]
+                'mauticContent' => 'monitoring',
+            ],
         ];
 
         //not found
@@ -278,9 +278,9 @@ public function editAction($objectId)
                             [
                                 'type'    => 'error',
                                 'msg'     => 'mautic.social.monitoring.error.notfound',
-                                'msgVars' => ['%id%' => $objectId]
-                            ]
-                        ]
+                                'msgVars' => ['%id%' => $objectId],
+                            ],
+                        ],
                     ]
                 )
             );
@@ -302,7 +302,7 @@ public function editAction($objectId)
             [
                 // pass through the types and the selected default type
                 'networkTypes' => $networkTypes,
-                'networkType'  => $networkType
+                'networkType'  => $networkType,
             ]
         );
 
@@ -326,9 +326,9 @@ public function editAction($objectId)
                                 'mautic_social_action',
                                 [
                                     'objectAction' => 'edit',
-                                    'objectId'     => $entity->getId()
+                                    'objectId'     => $entity->getId(),
                                 ]
-                            )
+                            ),
                         ],
                         'warning'
                     );
@@ -340,7 +340,7 @@ public function editAction($objectId)
             if ($cancelled || ($valid && $form->get('buttons')->get('save')->isClicked())) {
                 $viewParameters = [
                     'objectAction' => 'view',
-                    'objectId'     => $entity->getId()
+                    'objectId'     => $entity->getId(),
                 ];
 
                 return $this->postActionRedirect(
@@ -349,7 +349,7 @@ public function editAction($objectId)
                         [
                             'returnUrl'       => $this->generateUrl('mautic_social_action', $viewParameters),
                             'viewParameters'  => $viewParameters,
-                            'contentTemplate' => 'MauticSocialBundle:Monitoring:view'
+                            'contentTemplate' => 'MauticSocialBundle:Monitoring:view',
                         ]
                     )
                 );
@@ -361,7 +361,7 @@ public function editAction($objectId)
 
         return $this->delegateView(
             [
-                'viewParameters'  => [
+                'viewParameters' => [
                     'tmpl'   => $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index',
                     'entity' => $entity,
                     'form'   => $form->createView(),
@@ -374,16 +374,16 @@ public function editAction($objectId)
                         'mautic_social_action',
                         [
                             'objectAction' => 'edit',
-                            'objectId'     => $entity->getId()
+                            'objectId'     => $entity->getId(),
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
     }
 
     /**
-     * Loads a specific form into the detailed panel
+     * Loads a specific form into the detailed panel.
      *
      * @param int $objectId
      *
@@ -422,20 +422,19 @@ public function viewAction($objectId)
                     'contentTemplate' => 'MauticSocialMonitoringBundle:Monitoring:index',
                     'passthroughVars' => [
                         'activeLink'    => '#mautic_social_index',
-                        'mauticContent' => 'monitoring'
+                        'mauticContent' => 'monitoring',
                     ],
-                    'flashes'         => [
+                    'flashes' => [
                         [
                             'type'    => 'error',
                             'msg'     => 'mautic.social.monitoring.error.notfound',
-                            'msgVars' => ['%id%' => $objectId]
-                        ]
-                    ]
+                            'msgVars' => ['%id%' => $objectId],
+                        ],
+                    ],
                 ]
             );
         }
 
-
         // Audit Log
         $logs = $this->getModel('core.auditLog')->getLogForObject('monitoring', $objectId);
 
@@ -443,18 +442,18 @@ public function viewAction($objectId)
             'mautic_social_action',
             [
                 'objectAction' => 'view',
-                'objectId'     => $monitoringEntity->getId()
+                'objectId'     => $monitoringEntity->getId(),
             ]
         );
 
         // Init the date range filter form
         $dateRangeValues = $this->request->get('daterange', []);
         $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $returnUrl]);
-        $dateFrom = new \DateTime($dateRangeForm['date_from']->getData());
-        $dateTo = new \DateTime($dateRangeForm['date_to']->getData());
+        $dateFrom        = new \DateTime($dateRangeForm['date_from']->getData());
+        $dateTo          = new \DateTime($dateRangeForm['date_to']->getData());
 
-        $chart           = new LineChart(null, $dateFrom, $dateTo);
-        $leadStats       = $postCountRepo->getLeadStatsPost(
+        $chart     = new LineChart(null, $dateFrom, $dateTo);
+        $leadStats = $postCountRepo->getLeadStatsPost(
             $dateFrom,
             $dateTo,
             ['monitor_id' => $monitoringEntity->getId()]
@@ -463,8 +462,8 @@ public function viewAction($objectId)
 
         return $this->delegateView(
             [
-                'returnUrl'       => $returnUrl,
-                'viewParameters'  => [
+                'returnUrl'      => $returnUrl,
+                'viewParameters' => [
                     'activeMonitoring' => $monitoringEntity,
                     'logs'             => $logs,
                     'tmpl'             => $tmpl,
@@ -475,22 +474,22 @@ public function viewAction($objectId)
                         [
                             'objectId'   => $monitoringEntity->getId(),
                             'page'       => $page,
-                            'ignoreAjax' => true
+                            'ignoreAjax' => true,
                         ]
                     )->getContent(),
-                    'dateRangeForm'    => $dateRangeForm->createView()
+                    'dateRangeForm' => $dateRangeForm->createView(),
                 ],
                 'contentTemplate' => 'MauticSocialBundle:Monitoring:'.$tmpl.'.html.php',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_social_index',
-                    'mauticContent' => 'monitoring'
-                ]
+                    'mauticContent' => 'monitoring',
+                ],
             ]
         );
     }
 
     /**
-     * Deletes the entity
+     * Deletes the entity.
      *
      * @param int $objectId
      *
@@ -513,8 +512,8 @@ public function deleteAction($objectId)
             'contentTemplate' => 'MauticSocialBundle:Monitoring:index',
             'passthroughVars' => [
                 'activeLink'    => 'mautic_social_index',
-                'mauticContent' => 'monitoring'
-            ]
+                'mauticContent' => 'monitoring',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -527,7 +526,7 @@ public function deleteAction($objectId)
                 $flashes[] = [
                     'type'    => 'error',
                     'msg'     => 'mautic.social.monitoring.error.notfound',
-                    'msgVars' => ['%id%' => $objectId]
+                    'msgVars' => ['%id%' => $objectId],
                 ];
             } elseif ($model->isLocked($entity)) {
                 return $this->isLocked($postActionVars, $entity, 'plugin.mauticSocial.monitoring');
@@ -544,8 +543,8 @@ public function deleteAction($objectId)
                 'msg'     => 'mautic.core.notice.deleted',
                 'msgVars' => [
                     '%name%' => $entity->getTitle(),
-                    '%id%'   => $objectId
-                ]
+                    '%id%'   => $objectId,
+                ],
             ];
         } //else don't do anything
 
@@ -553,14 +552,14 @@ public function deleteAction($objectId)
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
     }
 
     /**
-     * Deletes a group of entities
+     * Deletes a group of entities.
      *
      * @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -581,8 +580,8 @@ public function batchDeleteAction()
             'contentTemplate' => 'MauticSocialBundle:Monitoring:index',
             'passthroughVars' => [
                 'activeLink'    => '#mautic_social_index',
-                'mauticContent' => 'monitoring'
-            ]
+                'mauticContent' => 'monitoring',
+            ],
         ];
 
         if ($this->request->getMethod() == 'POST') {
@@ -600,7 +599,7 @@ public function batchDeleteAction()
                     $flashes[] = [
                         'type'    => 'error',
                         'msg'     => 'mautic.social.monitoring.error.notfound',
-                        'msgVars' => ['%id%' => $objectId]
+                        'msgVars' => ['%id%' => $objectId],
                     ];
                 } elseif ($model->isLocked($entity)) {
                     $flashes[] = $this->isLocked($postActionVars, $entity, 'monitoring', true);
@@ -617,8 +616,8 @@ public function batchDeleteAction()
                     'type'    => 'notice',
                     'msg'     => 'mautic.social.monitoring.notice.batch_deleted',
                     'msgVars' => [
-                        '%count%' => count($entities)
-                    ]
+                        '%count%' => count($entities),
+                    ],
                 ];
             }
         } //else don't do anything
@@ -627,7 +626,7 @@ public function batchDeleteAction()
             array_merge(
                 $postActionVars,
                 [
-                    'flashes' => $flashes
+                    'flashes' => $flashes,
                 ]
             )
         );
@@ -658,14 +657,14 @@ public function contactsAction($objectId, $page = 1)
     public function updateAuditLog(Monitoring $monitoring, $action)
     {
         $log = [
-            "bundle"    => "plugin.mauticSocial",
-            "object"    => "monitoring",
-            "objectId"  => $monitoring->getId(),
-            "action"    => $action,
-            "details"   => ['name' => $monitoring->getTitle()],
-            "ipAddress" => $this->container->get('mautic.helper.ip_lookup')->getIpAddressFromRequest()
+            'bundle'    => 'plugin.mauticSocial',
+            'object'    => 'monitoring',
+            'objectId'  => $monitoring->getId(),
+            'action'    => $action,
+            'details'   => ['name' => $monitoring->getTitle()],
+            'ipAddress' => $this->container->get('mautic.helper.ip_lookup')->getIpAddressFromRequest(),
         ];
 
         $this->getModel('core.auditLog')->writeToLog($log);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Entity/Lead.php b/plugins/MauticSocialBundle/Entity/Lead.php
index fc6c666038d..b6a4295e454 100644
--- a/plugins/MauticSocialBundle/Entity/Lead.php
+++ b/plugins/MauticSocialBundle/Entity/Lead.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,8 +12,6 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Symfony\Component\Validator\Constraints as Assert;
-use JMS\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
@@ -116,4 +115,3 @@ public function setMonitor($monitor)
         return $this;
     }
 }
-
diff --git a/plugins/MauticSocialBundle/Entity/LeadRepository.php b/plugins/MauticSocialBundle/Entity/LeadRepository.php
index 373ee11d849..a9162ede9cd 100644
--- a/plugins/MauticSocialBundle/Entity/LeadRepository.php
+++ b/plugins/MauticSocialBundle/Entity/LeadRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * LeadRepository
- *
+ * LeadRepository.
  */
 class LeadRepository extends CommonRepository
 {
-
 }
-
diff --git a/plugins/MauticSocialBundle/Entity/Monitoring.php b/plugins/MauticSocialBundle/Entity/Monitoring.php
index bfd3e64cebb..aa757a79426 100644
--- a/plugins/MauticSocialBundle/Entity/Monitoring.php
+++ b/plugins/MauticSocialBundle/Entity/Monitoring.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation as Serializer;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
 use Mautic\CoreBundle\Entity\FormEntity;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 /**
- * Class Monitoring
+ * Class Monitoring.
  */
 class Monitoring extends FormEntity
 {
@@ -44,7 +44,7 @@ class Monitoring extends FormEntity
     /**
      * @var array
      */
-    private $lists = array();
+    private $lists = [];
 
     /**
      * @var string
@@ -59,12 +59,12 @@ class Monitoring extends FormEntity
     /**
      * @var array
      */
-    private $stats = array();
+    private $stats = [];
 
     /**
      * @var array
      */
-    private $properties = array();
+    private $properties = [];
 
     /**
      * @var \DateTime
@@ -106,31 +106,31 @@ public static function loadMetadata(ORM\ClassMetadata $metadata)
     }
 
     /**
-     * Constraints for required fields
+     * Constraints for required fields.
      *
      * @param ClassMetadata $metadata
      */
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('title', new Assert\NotBlank (
-                array('message' => 'mautic.core.title.required')
+        $metadata->addPropertyConstraint('title', new Assert\NotBlank(
+                ['message' => 'mautic.core.title.required']
             ));
 
-        $metadata->addPropertyConstraint('networkType', new Assert\NotBlank (
-                array('message' => 'mautic.social.network.type')
+        $metadata->addPropertyConstraint('networkType', new Assert\NotBlank(
+                ['message' => 'mautic.social.network.type']
             ));
     }
 
     /**
      * @return mixed
      */
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
 
     /**
-     * Get description
+     * Get description.
      *
      * @return string
      */
@@ -140,9 +140,9 @@ public function getDescription()
     }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -150,7 +150,7 @@ public function getId()
     }
 
     /**
-     * Get lists
+     * Get lists.
      *
      * @return array
      */
@@ -160,7 +160,7 @@ public function getLists()
     }
 
     /**
-     * Get network type
+     * Get network type.
      *
      * @return string
      */
@@ -170,17 +170,17 @@ public function getNetworkType()
     }
 
     /**
-     * Get revision
+     * Get revision.
      *
-     * @return integer
+     * @return int
      */
-    public function getRevision ()
+    public function getRevision()
     {
         return $this->revision;
     }
 
     /**
-     * Get statistics
+     * Get statistics.
      *
      * @return array
      */
@@ -190,7 +190,7 @@ public function getStats()
     }
 
     /**
-     * Get title
+     * Get title.
      *
      * @return string
      */
@@ -200,7 +200,7 @@ public function getTitle()
     }
 
     /**
-     * Get properties
+     * Get properties.
      *
      * @return array
      */
@@ -210,7 +210,7 @@ public function getProperties()
     }
 
     /**
-     * Get publishDown
+     * Get publishDown.
      *
      * @return \DateTime
      */
@@ -220,7 +220,7 @@ public function getPublishDown()
     }
 
     /**
-     * Get publishUp
+     * Get publishUp.
      *
      * @return \DateTime
      */
@@ -230,20 +230,21 @@ public function getPublishUp()
     }
 
     /**
-     * Set the category id
+     * Set the category id.
      *
-     * @param integer $category
+     * @param int $category
      */
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->isChanged('category', $category);
         $this->category = $category;
     }
 
     /**
-     * Set description
+     * Set description.
      *
      * @param string $description
+     *
      * @return Monitoring
      */
     public function setDescription($description)
@@ -255,7 +256,7 @@ public function setDescription($description)
     }
 
     /**
-     * Set the monitor lists
+     * Set the monitor lists.
      *
      * @param $lists
      *
@@ -270,7 +271,7 @@ public function setLists($lists)
     }
 
     /**
-     * Set the network type
+     * Set the network type.
      *
      * @param $networkType
      *
@@ -285,13 +286,13 @@ public function setNetworkType($networkType)
     }
 
     /**
-     * Set the revision counter
+     * Set the revision counter.
      *
-     * @param integer $revision
+     * @param int $revision
      *
      * @return Monitoring
      */
-    public function setRevision ($revision)
+    public function setRevision($revision)
     {
         $this->isChanged('revision', $revision);
         $this->revision = $revision;
@@ -300,7 +301,7 @@ public function setRevision ($revision)
     }
 
     /**
-     * Set the statistics
+     * Set the statistics.
      *
      * @param array $stats
      *
@@ -315,7 +316,7 @@ public function setStats($stats)
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string $title
      *
@@ -330,9 +331,10 @@ public function setTitle($title)
     }
 
     /**
-     * Set properties
+     * Set properties.
      *
      * @param array $properties
+     *
      * @return Monitoring
      */
     public function setProperties($properties)
@@ -344,9 +346,10 @@ public function setProperties($properties)
     }
 
     /**
-     * Set publishDown
+     * Set publishDown.
      *
      * @param \DateTime $publishDown
+     *
      * @return Monitoring
      */
     public function setPublishDown($publishDown)
@@ -358,9 +361,10 @@ public function setPublishDown($publishDown)
     }
 
     /**
-     * Set publishUp
+     * Set publishUp.
      *
      * @param \DateTime $publishUp
+     *
      * @return Monitoring
      */
     public function setPublishUp($publishUp)
@@ -372,7 +376,7 @@ public function setPublishUp($publishUp)
     }
 
     /**
-     * Clear out old properties data
+     * Clear out old properties data.
      */
     public function cleanMonitorData()
     {
@@ -381,34 +385,34 @@ public function cleanMonitorData()
         // clean up property array for the twitter handle
         if ($this->getNetworkType() == 'twitter_handle') {
             $this->setProperties(
-                array(
-                    'handle' => $property['handle']
-                )
+                [
+                    'handle' => $property['handle'],
+                ]
             );
         }
 
         // clean up property array for the hashtag
         if ($this->getNetworkType() == 'twitter_hashtag') {
             $this->setProperties(
-                array(
-                    'hashtag' => $property['hashtag']
-                )
+                [
+                    'hashtag' => $property['hashtag'],
+                ]
             );
         }
 
         // clean up clean up property array for the custom action
         if ($this->getNetworkType() == 'twitter_custom') {
             $this->setProperties(
-                array(
-                    'custom' => $property['custom']
-                )
+                [
+                    'custom' => $property['custom'],
+                ]
             );
         }
 
         // if the property is not new and the old property doesn't match the new one
-        if (! $this->isNew() && $property != $this->getProperties()) {
+        if (!$this->isNew() && $property != $this->getProperties()) {
             // reset stats on save of edited
-            $this->setStats(array());
+            $this->setStats([]);
         }
     }
 }
diff --git a/plugins/MauticSocialBundle/Entity/MonitoringRepository.php b/plugins/MauticSocialBundle/Entity/MonitoringRepository.php
index c3df49d8189..66d237a5219 100644
--- a/plugins/MauticSocialBundle/Entity/MonitoringRepository.php
+++ b/plugins/MauticSocialBundle/Entity/MonitoringRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,23 +14,23 @@
 use Mautic\CoreBundle\Entity\CommonRepository;
 
 /**
- * Class MonitoringRepository
+ * Class MonitoringRepository.
  */
 class MonitoringRepository extends CommonRepository
 {
     /**
-     * Get a list of entities
+     * Get a list of entities.
      *
      * @param array $args
      *
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         return parent::getEntities($args);
     }
 
-    public function getPublishedEntities($args = array())
+    public function getPublishedEntities($args = [])
     {
         $q    = $this->createQueryBuilder($this->getTableAlias());
         $expr = $this->getPublishedByDateExpression($q);
@@ -50,7 +51,7 @@ public function getPublishedEntitiesCount()
         $q->where($expr);
         $args['qb'] = $q;
 
-        return (parent::getEntities($args)->count());
+        return parent::getEntities($args)->count();
     }
 
     /**
@@ -64,10 +65,10 @@ protected function addCatchAllWhereClause(&$q, $filter)
         return $this->addStandardCatchAllWhereClause(
             $q,
             $filter,
-            array(
+            [
                 $this->getTableAlias().'.title',
-                $this->getTableAlias().'.description'
-            )
+                $this->getTableAlias().'.description',
+            ]
         );
     }
 
@@ -97,4 +98,4 @@ public function getSearchCommands()
     {
         return $this->getStandardSearchCommands();
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Entity/PostCount.php b/plugins/MauticSocialBundle/Entity/PostCount.php
index eaffb8b89ad..c2cf342f698 100644
--- a/plugins/MauticSocialBundle/Entity/PostCount.php
+++ b/plugins/MauticSocialBundle/Entity/PostCount.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,11 +12,9 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder;
-use Symfony\Component\Validator\Constraints as Assert;
-use JMS\Serializer\Annotation as Serializer;
 
 /**
- * Class PostCount
+ * Class PostCount.
  */
 class PostCount
 {
@@ -127,4 +126,4 @@ public function setPostDate($postDate)
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Entity/PostCountRepository.php b/plugins/MauticSocialBundle/Entity/PostCountRepository.php
index 957c6d5c9c2..e24af2b55d6 100644
--- a/plugins/MauticSocialBundle/Entity/PostCountRepository.php
+++ b/plugins/MauticSocialBundle/Entity/PostCountRepository.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -16,12 +17,13 @@
 class PostCountRepository extends CommonRepository
 {
     /**
-     * Get a list of entities
+     * Get a list of entities.
+     *
+     * @param array $args
      *
-     * @param array      $args
      * @return Paginator
      */
-    public function getEntities($args = array())
+    public function getEntities($args = [])
     {
         return parent::getEntities($args);
     }
@@ -29,11 +31,12 @@ public function getEntities($args = array())
     /**
      * Fetch Lead stats for some period of time.
      *
-     * @param integer $quantity of units
-     * @param string $unit of time php.net/manual/en/class.dateinterval.php#dateinterval.props
-     * @param array $options
+     * @param int    $quantity of units
+     * @param string $unit     of time php.net/manual/en/class.dateinterval.php#dateinterval.props
+     * @param array  $options
      *
      * @return mixed
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -57,4 +60,4 @@ public function getLeadStatsPost($dateFrom, $dateTo, $options)
 
         return $postCount;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Event/SocialEvent.php b/plugins/MauticSocialBundle/Event/SocialEvent.php
index e0066e00061..56781b4d3ff 100644
--- a/plugins/MauticSocialBundle/Event/SocialEvent.php
+++ b/plugins/MauticSocialBundle/Event/SocialEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,15 +14,13 @@
 use MauticPlugin\MauticSocialBundle\Entity\Monitoring;
 
 /**
- * Class SocialEvent
- *
- * @package MauticPlugin\MauticSocialBundle
+ * Class SocialEvent.
  */
 class SocialEvent extends CommonEvent
 {
     /**
      * @param Monitoring $monitoring
-     * @param bool $isNew
+     * @param bool       $isNew
      */
     public function __construct(Monitoring $monitoring, $isNew = false)
     {
@@ -30,7 +29,7 @@ public function __construct(Monitoring $monitoring, $isNew = false)
     }
 
     /**
-     * Returns the Monitoring entity
+     * Returns the Monitoring entity.
      *
      * @return Monitoring
      */
@@ -40,7 +39,7 @@ public function getMonitoring()
     }
 
     /**
-     * Sets the Monitoring entity
+     * Sets the Monitoring entity.
      *
      * @param Monitoring $monitoring
      */
@@ -48,4 +47,4 @@ public function setMonitoring(Monitoring $monitoring)
     {
         $this->entity = $monitoring;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Event/SocialMonitorEvent.php b/plugins/MauticSocialBundle/Event/SocialMonitorEvent.php
index c067f1ffafc..cabb6547695 100644
--- a/plugins/MauticSocialBundle/Event/SocialMonitorEvent.php
+++ b/plugins/MauticSocialBundle/Event/SocialMonitorEvent.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,7 +14,7 @@
 use MauticPlugin\MauticSocialBundle\Entity\Monitoring;
 
 /**
- * Class SocialMonitorEvent
+ * Class SocialMonitorEvent.
  */
 class SocialMonitorEvent extends CommonEvent
 {
@@ -35,7 +36,7 @@ class SocialMonitorEvent extends CommonEvent
     /**
      * @var array
      */
-    protected $leadIds = array();
+    protected $leadIds = [];
 
     /**
      * SocialMonitorEvent constructor.
@@ -56,7 +57,7 @@ public function __construct($integrationName, Monitoring $monitoring, array $lea
     }
 
     /**
-     * Returns the Monitoring entity
+     * Returns the Monitoring entity.
      *
      * @return Monitoring
      */
@@ -66,7 +67,7 @@ public function getMonitoring()
     }
 
     /**
-     * Get count of new leads
+     * Get count of new leads.
      *
      * @return int
      */
@@ -76,7 +77,7 @@ public function getNewLeadCount()
     }
 
     /**
-     * Get count of updated leads
+     * Get count of updated leads.
      *
      * @return int
      */
@@ -108,4 +109,4 @@ public function getIntegrationName()
     {
         return $this->integrationName;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php b/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php
index 834adbc7caf..ad0aad0c8c3 100644
--- a/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php
+++ b/plugins/MauticSocialBundle/EventListener/CampaignSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -40,11 +41,11 @@ public function __construct(MauticFactory $factory, CampaignEventHelper $helper)
     /**
      * @return array
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
         return [
             CampaignEvents::CAMPAIGN_ON_BUILD        => ['onCampaignBuild', 0],
-            SocialEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignAction', 0]
+            SocialEvents::ON_CAMPAIGN_TRIGGER_ACTION => ['onCampaignAction', 0],
         ];
     }
 
@@ -53,13 +54,13 @@ static public function getSubscribedEvents()
      */
     public function onCampaignBuild(CampaignBuilderEvent $event)
     {
-        $action = array(
-            'label'           => 'mautic.social.twitter.tweet.event.open',
-            'description'     => 'mautic.social.twitter.tweet.event.open_desc',
-            'eventName'       => SocialEvents::ON_CAMPAIGN_TRIGGER_ACTION,
-            'formType'        => 'twitter_tweet',
-            'formTheme'       => 'MauticSocialBundle:FormTheme\Campaigns'
-        );
+        $action = [
+            'label'       => 'mautic.social.twitter.tweet.event.open',
+            'description' => 'mautic.social.twitter.tweet.event.open_desc',
+            'eventName'   => SocialEvents::ON_CAMPAIGN_TRIGGER_ACTION,
+            'formType'    => 'twitter_tweet',
+            'formTheme'   => 'MauticSocialBundle:FormTheme\Campaigns',
+        ];
 
         $event->addAction('twitter.tweet', $action);
     }
@@ -78,4 +79,4 @@ public function onCampaignAction(CampaignExecutionEvent $event)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/EventListener/ConfigSubscriber.php b/plugins/MauticSocialBundle/EventListener/ConfigSubscriber.php
index dc309362566..ac4bdcc79f4 100644
--- a/plugins/MauticSocialBundle/EventListener/ConfigSubscriber.php
+++ b/plugins/MauticSocialBundle/EventListener/ConfigSubscriber.php
@@ -1,35 +1,34 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\EventListener;
 
-use Mautic\ConfigBundle\Event\ConfigEvent;
-use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\ConfigBundle\ConfigEvents;
 use Mautic\ConfigBundle\Event\ConfigBuilderEvent;
+use Mautic\ConfigBundle\Event\ConfigEvent;
+use Mautic\CoreBundle\EventListener\CommonSubscriber;
 
 /**
- * Class ConfigSubscriber
- *
- * @package MauticPlugins\MauticSocialBundle\EventListener
+ * Class ConfigSubscriber.
  */
 class ConfigSubscriber extends CommonSubscriber
 {
     /**
      * @return array
      */
-    static public function getSubscribedEvents ()
+    public static function getSubscribedEvents()
     {
-        return array(
-            ConfigEvents::CONFIG_ON_GENERATE => array('onConfigGenerate', 0),
-            ConfigEvents::CONFIG_PRE_SAVE    => array('onConfigSave', 0)
-        );
+        return [
+            ConfigEvents::CONFIG_ON_GENERATE => ['onConfigGenerate', 0],
+            ConfigEvents::CONFIG_PRE_SAVE    => ['onConfigSave', 0],
+        ];
     }
 
     /**
@@ -38,18 +37,17 @@ static public function getSubscribedEvents ()
     public function onConfigGenerate(ConfigBuilderEvent $event)
     {
         $event->addForm(
-            array(
+            [
                 'formAlias'  => 'social_config',
                 'formTheme'  => 'MauticSocialBundle:FormTheme\Config',
-                'parameters' => $event->getParametersFromConfig('MauticSocialBundle')
-            )
+                'parameters' => $event->getParametersFromConfig('MauticSocialBundle'),
+            ]
         );
     }
 
     /**
      * @param ConfigEvent $event
      */
-
     public function onConfigSave(ConfigEvent $event)
     {
         /** @var array $values */
@@ -63,4 +61,4 @@ public function onConfigSave(ConfigEvent $event)
         // Set updated values
         $event->setConfig($values);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/EventListener/FormSubscriber.php b/plugins/MauticSocialBundle/EventListener/FormSubscriber.php
index 455bc2016cd..d5e4bc0bb37 100644
--- a/plugins/MauticSocialBundle/EventListener/FormSubscriber.php
+++ b/plugins/MauticSocialBundle/EventListener/FormSubscriber.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -14,19 +15,18 @@
 use Mautic\FormBundle\FormEvents;
 
 /**
- * Class FormSubscriber
+ * Class FormSubscriber.
  */
 class FormSubscriber extends CommonSubscriber
 {
-
     /**
      * {@inheritdoc}
      */
-    static public function getSubscribedEvents()
+    public static function getSubscribedEvents()
     {
-        return array(
-            FormEvents::FORM_ON_BUILD  => array('onFormBuild', 0)
-        );
+        return [
+            FormEvents::FORM_ON_BUILD => ['onFormBuild', 0],
+        ];
     }
 
     /**
@@ -34,18 +34,18 @@ static public function getSubscribedEvents()
      */
     public function onFormBuild(FormBuilderEvent $event)
     {
-        $action = array(
-            'label'    => 'mautic.plugin.actions.socialLogin',
-            'formType' => 'sociallogin',
-            'template' => 'MauticSocialBundle:Integration:login.html.php',
-            'builderOptions' => array(
+        $action = [
+            'label'          => 'mautic.plugin.actions.socialLogin',
+            'formType'       => 'sociallogin',
+            'template'       => 'MauticSocialBundle:Integration:login.html.php',
+            'builderOptions' => [
                 'addLeadFieldList' => false,
                 'addIsRequired'    => false,
                 'addDefaultValue'  => false,
-                'addSaveResult'    => false
-            )
-        );
+                'addSaveResult'    => false,
+            ],
+        ];
 
         $event->addFormField('plugin.loginSocial', $action);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Exception/ExitMonitorException.php b/plugins/MauticSocialBundle/Exception/ExitMonitorException.php
index 17ea8c57fbe..dcab1fc626a 100644
--- a/plugins/MauticSocialBundle/Exception/ExitMonitorException.php
+++ b/plugins/MauticSocialBundle/Exception/ExitMonitorException.php
@@ -1,20 +1,19 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Exception;
 
-
 class ExitMonitorException extends \Exception
 {
-
     public function __construct($message = 'Exit monitor requested', $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/ConfigType.php b/plugins/MauticSocialBundle/Form/Type/ConfigType.php
index 786c8a4174f..44c2ed76a18 100644
--- a/plugins/MauticSocialBundle/Form/Type/ConfigType.php
+++ b/plugins/MauticSocialBundle/Form/Type/ConfigType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -38,13 +39,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'twitter_handle_field',
             'choice',
-            array(
+            [
                 'choices'    => $leadFields,
                 'label'      => 'mautic.social.config.twitter.field.label',
                 'required'   => false,
-                'label_attr' => array('class' => 'control-label'),
-                'attr'       => array('class' => 'form-control')
-            )
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => ['class' => 'form-control'],
+            ]
         );
     }
 
@@ -53,6 +54,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "social_config";
+        return 'social_config';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/FacebookType.php b/plugins/MauticSocialBundle/Form/Type/FacebookType.php
index 3418b21fa4e..33d19ce21f7 100644
--- a/plugins/MauticSocialBundle/Form/Type/FacebookType.php
+++ b/plugins/MauticSocialBundle/Form/Type/FacebookType.php
@@ -1,77 +1,73 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class FacebookType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class FacebookType.
  */
 class FacebookType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('layout', 'choice', array(
-            'choices'     => array(
+        $builder->add('layout', 'choice', [
+            'choices' => [
                 'standard'     => 'mautic.integration.Facebook.share.layout.standard',
                 'button_count' => 'mautic.integration.Facebook.share.layout.buttoncount',
                 'button'       => 'mautic.integration.Facebook.share.layout.button',
                 'box_count'    => 'mautic.integration.Facebook.share.layout.boxcount',
-                'icon'         => 'mautic.integration.Facebook.share.layout.icon'
-            ),
+                'icon'         => 'mautic.integration.Facebook.share.layout.icon',
+            ],
             'label'       => 'mautic.integration.Facebook.share.layout',
             'required'    => false,
             'empty_value' => false,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class' => 'form-control')
-        ));
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('action', 'choice', array(
-            'choices'     => array(
+        $builder->add('action', 'choice', [
+            'choices' => [
                 'like'      => 'mautic.integration.Facebook.share.action.like',
                 'recommend' => 'mautic.integration.Facebook.share.action.recommend',
-                'share'     => 'mautic.integration.Facebook.share.action.share'
-            ),
+                'share'     => 'mautic.integration.Facebook.share.action.share',
+            ],
             'label'       => 'mautic.integration.Facebook.share.action',
             'required'    => false,
             'empty_value' => false,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class' => 'form-control')
-        ));
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('showFaces', 'yesno_button_group', array(
+        $builder->add('showFaces', 'yesno_button_group', [
             'label' => 'mautic.integration.Facebook.share.showfaces',
-            'data'  => (!isset($options['data']['showFaces'])) ? 1 : $options['data']['showFaces']
-        ));
+            'data'  => (!isset($options['data']['showFaces'])) ? 1 : $options['data']['showFaces'],
+        ]);
 
-        $builder->add('showShare', 'yesno_button_group', array(
+        $builder->add('showShare', 'yesno_button_group', [
             'label' => 'mautic.integration.Facebook.share.showshare',
-            'data'  => (!isset($options['data']['showShare'])) ? 1 : $options['data']['showShare']
-        ));
+            'data'  => (!isset($options['data']['showShare'])) ? 1 : $options['data']['showShare'],
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
-        return "socialmedia_facebook";
+        return 'socialmedia_facebook';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/GooglePlusType.php b/plugins/MauticSocialBundle/Form/Type/GooglePlusType.php
index 4f449ed7450..caf84c97838 100644
--- a/plugins/MauticSocialBundle/Form/Type/GooglePlusType.php
+++ b/plugins/MauticSocialBundle/Form/Type/GooglePlusType.php
@@ -1,66 +1,63 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class GooglePlusType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class GooglePlusType.
  */
 class GooglePlusType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('annotation', 'choice', array(
-            'choices'     => array(
-                'inline'            => 'mautic.integration.GooglePlus.share.annotation.inline',
-                'bubble'            => 'mautic.integration.GooglePlus.share.annotation.bubble',
-                'vertical-bubble'   => 'mautic.integration.GooglePlus.share.annotation.verticalbubble',
-                'none'              => 'mautic.integration.GooglePlus.share.annotation.none'
-            ),
+        $builder->add('annotation', 'choice', [
+            'choices' => [
+                'inline'          => 'mautic.integration.GooglePlus.share.annotation.inline',
+                'bubble'          => 'mautic.integration.GooglePlus.share.annotation.bubble',
+                'vertical-bubble' => 'mautic.integration.GooglePlus.share.annotation.verticalbubble',
+                'none'            => 'mautic.integration.GooglePlus.share.annotation.none',
+            ],
             'label'       => 'mautic.integration.GooglePlus.share.annotation',
             'required'    => false,
             'empty_value' => false,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class'   => 'form-control')
-        ));
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('height', 'choice', array(
-            'choices'     => array(
-                ''    => 'mautic.integration.GooglePlus.share.height.standard',
-                '15'  => 'mautic.integration.GooglePlus.share.height.small',
-                '24'  => 'mautic.integration.GooglePlus.share.height.large',
+        $builder->add('height', 'choice', [
+            'choices' => [
+                ''   => 'mautic.integration.GooglePlus.share.height.standard',
+                '15' => 'mautic.integration.GooglePlus.share.height.small',
+                '24' => 'mautic.integration.GooglePlus.share.height.large',
 
-            ),
+            ],
             'label'       => 'mautic.integration.GooglePlus.share.height',
             'required'    => false,
             'empty_value' => false,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class'   => 'form-control')
-        ));
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => ['class' => 'form-control'],
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "socialmedia_googleplus";
+    public function getName()
+    {
+        return 'socialmedia_googleplus';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/LinkedInType.php b/plugins/MauticSocialBundle/Form/Type/LinkedInType.php
index 510f8009003..dfae3c5bf08 100644
--- a/plugins/MauticSocialBundle/Form/Type/LinkedInType.php
+++ b/plugins/MauticSocialBundle/Form/Type/LinkedInType.php
@@ -1,51 +1,48 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class LinkedInType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class LinkedInType.
  */
 class LinkedInType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('counter', 'choice', array(
-            'choices'     => array(
+        $builder->add('counter', 'choice', [
+            'choices' => [
                 'right' => 'mautic.integration.LinkedIn.share.counter.right',
                 'top'   => 'mautic.integration.LinkedIn.share.counter.top',
-                ''      => 'mautic.integration.LinkedIn.share.counter.none'
-            ),
+                ''      => 'mautic.integration.LinkedIn.share.counter.none',
+            ],
             'label'       => 'mautic.integration.LinkedIn.share.counter',
             'required'    => false,
             'empty_value' => false,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class'   => 'form-control')
-        ));
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => ['class' => 'form-control'],
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "socialmedia_linkedin";
+    public function getName()
+    {
+        return 'socialmedia_linkedin';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/MonitoringType.php b/plugins/MauticSocialBundle/Form/Type/MonitoringType.php
index 5428c199f73..8597eb40146 100644
--- a/plugins/MauticSocialBundle/Form/Type/MonitoringType.php
+++ b/plugins/MauticSocialBundle/Form/Type/MonitoringType.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
-use Mautic\CoreBundle\Factory\MauticFactory;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -19,86 +19,86 @@ class MonitoringType extends AbstractType
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('title', 'text', array(
+        $builder->add('title', 'text', [
             'label'      => 'mautic.core.name',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control')
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('description', 'textarea', array(
+        $builder->add('description', 'textarea', [
             'label'      => 'mautic.core.description',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array('class' => 'form-control editor'),
-            'required'   => false
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => ['class' => 'form-control editor'],
+            'required'   => false,
+        ]);
 
         $builder->add('isPublished', 'yesno_button_group');
 
-        $builder->add('publishUp', 'datetime', array(
+        $builder->add('publishUp', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishup',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
-        $builder->add('publishDown', 'datetime', array(
+        $builder->add('publishDown', 'datetime', [
             'widget'     => 'single_text',
             'label'      => 'mautic.core.form.publishdown',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
                 'class'       => 'form-control',
-                'data-toggle' => 'datetime'
-            ),
-            'format'     => 'yyyy-MM-dd HH:mm',
-            'required'   => false
-        ));
+                'data-toggle' => 'datetime',
+            ],
+            'format'   => 'yyyy-MM-dd HH:mm',
+            'required' => false,
+        ]);
 
-        $builder->add('networkType', 'choice', array(
+        $builder->add('networkType', 'choice', [
             'label'      => 'mautic.social.monitoring.type.list',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control',
-                'onchange' => 'Mautic.getNetworkFormAction(this)'
-            ),
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'    => 'form-control',
+                'onchange' => 'Mautic.getNetworkFormAction(this)',
+            ],
             'choices'     => $options['networkTypes'], // passed from the controller
-            'empty_value' => 'mautic.core.form.chooseone'
-        ));
+            'empty_value' => 'mautic.core.form.chooseone',
+        ]);
 
         // if we have a network type value add in the form
-        if (! empty($options['networkType']) && array_key_exists($options['networkType'], $options['networkTypes'])) {
+        if (!empty($options['networkType']) && array_key_exists($options['networkType'], $options['networkTypes'])) {
 
             // get the values from the entity function
             $properties = $options['data']->getProperties();
 
             $builder->add('properties', $options['networkType'],
-                array (
+                [
                     'label' => false,
-                    'data'  => $properties
-                )
+                    'data'  => $properties,
+                ]
             );
         }
 
-        $builder->add('lists', 'leadlist_choices', array(
+        $builder->add('lists', 'leadlist_choices', [
             'label'      => 'mautic.lead.lead.events.addtolists',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class'       => 'form-control'
-            ),
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class' => 'form-control',
+            ],
             'multiple' => true,
-            'expanded' => false
-        ));
+            'expanded' => false,
+        ]);
 
         //add category
-        $builder->add('category', 'category', array(
-            'bundle' => 'plugin:mauticSocial'
-        ));
+        $builder->add('category', 'category', [
+            'bundle' => 'plugin:mauticSocial',
+        ]);
 
         $builder->add('buttons', 'form_buttons');
     }
@@ -108,19 +108,19 @@ public function buildForm (FormBuilderInterface $builder, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
                 'data_class' => 'MauticPlugin\MauticSocialBundle\Entity\Monitoring',
-            ));
+            ]);
 
         // allow network types to be sent through - list
-        $resolver->setRequired(array('networkTypes'));
+        $resolver->setRequired(['networkTypes']);
 
         // allow the specific network type - single
-        $resolver->setOptional(array('networkType'));
+        $resolver->setOptional(['networkType']);
     }
 
     public function getName()
     {
-        return "monitoring";
+        return 'monitoring';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/SocialLoginType.php b/plugins/MauticSocialBundle/Form/Type/SocialLoginType.php
index 5102b99dcdf..71f464cd439 100644
--- a/plugins/MauticSocialBundle/Form/Type/SocialLoginType.php
+++ b/plugins/MauticSocialBundle/Form/Type/SocialLoginType.php
@@ -1,24 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
-use Mautic\FormBundle\MauticFormBundle;
 use Mautic\FormBundle\Model\FormModel;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class FacebookLoginType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class FacebookLoginType.
  */
 class SocialLoginType extends AbstractType
 {
@@ -35,7 +33,7 @@ class SocialLoginType extends AbstractType
      */
     public function __construct(IntegrationHelper $helper, FormModel $form)
     {
-        $this->helper = $helper;
+        $this->helper    = $helper;
         $this->formModel = $form;
     }
 
@@ -51,7 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         foreach ($integrationObjects as $integrationObject) {
             if ($integrationObject->getIntegrationSettings()->isPublished()) {
                 $model = $this->formModel;
-                $integrations .= $integrationObject->getName().",";
+                $integrations .= $integrationObject->getName().',';
                 $integration = [
                     'integration' => $integrationObject->getName(),
                 ];
@@ -63,7 +61,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'data' => $model->buildUrl('mautic_integration_auth_postauth', $integration, true, []),
                     ]
                 );
-
             }
         }
 
@@ -81,6 +78,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return "sociallogin";
+        return 'sociallogin';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TweetType.php b/plugins/MauticSocialBundle/Form/Type/TweetType.php
index 48d87d90505..b01c46bb234 100644
--- a/plugins/MauticSocialBundle/Form/Type/TweetType.php
+++ b/plugins/MauticSocialBundle/Form/Type/TweetType.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -11,7 +12,6 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 class TweetType extends AbstractType
@@ -26,20 +26,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'tweet_text',
             'textarea',
             [
-                'label'       => 'mautic.social.monitoring.twitter.tweet.text',
-                'required'    => true,
-                'label_attr'  => ['class' => 'control-label'],
-                'attr'        => [
+                'label'      => 'mautic.social.monitoring.twitter.tweet.text',
+                'required'   => true,
+                'label_attr' => ['class' => 'control-label'],
+                'attr'       => [
                     'tooltip' => 'mautic.social.monitoring.twitter.tweet.text.tooltip',
-                    'class'   => 'form-control'
+                    'class'   => 'form-control',
                 ],
                 'constraints' => [
                     new NotBlank(
                         [
-                            'message' => 'mautic.core.value.required'
+                            'message' => 'mautic.core.value.required',
                         ]
-                    )
-                ]
+                    ),
+                ],
             ]
         );
 
@@ -53,8 +53,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'multiple'    => false,
                 'attr'        => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.social.monitoring.twitter.assets.descr'
-                ]
+                    'tooltip' => 'mautic.social.monitoring.twitter.assets.descr',
+                ],
             ]
         );
 
@@ -68,8 +68,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'multiple'    => false,
                 'attr'        => [
                     'class'   => 'form-control',
-                    'tooltip' => 'mautic.social.monitoring.twitter.pages.descr'
-                ]
+                    'tooltip' => 'mautic.social.monitoring.twitter.pages.descr',
+                ],
             ]
         );
 
@@ -80,13 +80,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => '@',
                 'attr'  => [
                     'class' => 'form-control btn-primary',
-                ]
+                ],
             ]
         );
     }
 
     public function getName()
     {
-        return "twitter_tweet";
+        return 'twitter_tweet';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TwitterAbstractType.php b/plugins/MauticSocialBundle/Form/Type/TwitterAbstractType.php
index 4b44f534cbf..8ab7e0fd989 100644
--- a/plugins/MauticSocialBundle/Form/Type/TwitterAbstractType.php
+++ b/plugins/MauticSocialBundle/Form/Type/TwitterAbstractType.php
@@ -1,24 +1,25 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
-use \Symfony\Component\Form\AbstractType;
-use \Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
-use \Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
+use Symfony\Component\Form\FormBuilderInterface;
 
 class TwitterAbstractType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // Disabled due to Twitter restrictions
         /*
@@ -44,6 +45,6 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
     public function getName()
     {
-        return "twitter_abstract";
+        return 'twitter_abstract';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TwitterCustomType.php b/plugins/MauticSocialBundle/Form/Type/TwitterCustomType.php
index 53aefe1d4b7..96f6fdc60fd 100644
--- a/plugins/MauticSocialBundle/Form/Type/TwitterCustomType.php
+++ b/plugins/MauticSocialBundle/Form/Type/TwitterCustomType.php
@@ -1,35 +1,33 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
-use \Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use MauticPlugin\MauticSocialBundle\Form\Type\TwitterAbstractType;
 
 class TwitterCustomType extends TwitterAbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('custom', 'text', array(
+        $builder->add('custom', 'text', [
             'label'      => 'mautic.social.monitoring.twitter.custom',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.social.monitoring.twitter.custom.tooltip',
-                'preaddon'    => 'fa fa-crosshairs'
-            )
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'    => 'form-control',
+                'tooltip'  => 'mautic.social.monitoring.twitter.custom.tooltip',
+                'preaddon' => 'fa fa-crosshairs',
+            ],
+        ]);
 
         // pull in the parent type's form builder
         parent::buildForm($builder, $options);
@@ -37,6 +35,6 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
     public function getName()
     {
-        return "twitter_custom";
+        return 'twitter_custom';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TwitterHashtagType.php b/plugins/MauticSocialBundle/Form/Type/TwitterHashtagType.php
index 7b3ba8958e1..bd1488f2734 100644
--- a/plugins/MauticSocialBundle/Form/Type/TwitterHashtagType.php
+++ b/plugins/MauticSocialBundle/Form/Type/TwitterHashtagType.php
@@ -1,35 +1,33 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
-use \Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use MauticPlugin\MauticSocialBundle\Form\Type\TwitterAbstractType;
 
 class TwitterHashtagType extends TwitterAbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('hashtag', 'text', array(
+        $builder->add('hashtag', 'text', [
             'label'      => 'mautic.social.monitoring.twitter.hashtag',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'tooltip' => 'mautic.social.monitoring.twitter.hashtag.tooltip',
-                'class' => 'form-control',
-                'preaddon'    => 'symbol-hashtag'
-            )
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'tooltip'  => 'mautic.social.monitoring.twitter.hashtag.tooltip',
+                'class'    => 'form-control',
+                'preaddon' => 'symbol-hashtag',
+            ],
+        ]);
 
         // pull in the parent type's form builder
         parent::buildForm($builder, $options);
@@ -37,6 +35,6 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
     public function getName()
     {
-        return "twitter_hashtag";
+        return 'twitter_hashtag';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TwitterMentionType.php b/plugins/MauticSocialBundle/Form/Type/TwitterMentionType.php
index 944684a0a5d..f5f7bf6749c 100644
--- a/plugins/MauticSocialBundle/Form/Type/TwitterMentionType.php
+++ b/plugins/MauticSocialBundle/Form/Type/TwitterMentionType.php
@@ -1,35 +1,33 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
-use \Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use MauticPlugin\MauticSocialBundle\Form\Type\TwitterAbstractType;
 
 class TwitterMentionType extends TwitterAbstractType
 {
     /**
      * {@inheritdoc}
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('handle', 'text', array(
+        $builder->add('handle', 'text', [
             'label'      => 'mautic.social.monitoring.twitter.handle',
-            'label_attr' => array('class' => 'control-label'),
-            'attr'       => array(
-                'class' => 'form-control',
-                'tooltip' => 'mautic.social.monitoring.twitter.handle.tooltip',
-                'preaddon'    => 'fa fa-at'
-            )
-        ));
+            'label_attr' => ['class' => 'control-label'],
+            'attr'       => [
+                'class'    => 'form-control',
+                'tooltip'  => 'mautic.social.monitoring.twitter.handle.tooltip',
+                'preaddon' => 'fa fa-at',
+            ],
+        ]);
 
         // pull in the parent type's form builder
         parent::buildForm($builder, $options);
@@ -37,6 +35,6 @@ public function buildForm (FormBuilderInterface $builder, array $options)
 
     public function getName()
     {
-        return "twitter_handle";
+        return 'twitter_handle';
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Form/Type/TwitterType.php b/plugins/MauticSocialBundle/Form/Type/TwitterType.php
index afc6d17441b..c1135b4b5eb 100644
--- a/plugins/MauticSocialBundle/Form/Type/TwitterType.php
+++ b/plugins/MauticSocialBundle/Form/Type/TwitterType.php
@@ -1,101 +1,98 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * Class TwitterType
- *
- * @package Mautic\FormBundle\Form\Type
+ * Class TwitterType.
  */
 class TwitterType extends AbstractType
 {
-
     /**
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm (FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('count', 'choice', array(
-            'choices'     => array(
+        $builder->add('count', 'choice', [
+            'choices' => [
                 'horizontal' => 'mautic.integration.Twitter.share.layout.horizontal',
                 'vertical'   => 'mautic.integration.Twitter.share.layout.vertical',
-                'none'       => 'mautic.integration.Twitter.share.layout.none'
-            ),
+                'none'       => 'mautic.integration.Twitter.share.layout.none',
+            ],
             'label'       => 'mautic.integration.Twitter.share.layout',
             'required'    => false,
             'empty_value' => false,
-            'label_attr'  => array('class' => 'control-label'),
-            'attr'        => array('class'   => 'form-control')
-        ));
+            'label_attr'  => ['class' => 'control-label'],
+            'attr'        => ['class' => 'form-control'],
+        ]);
 
-        $builder->add('text', 'text', array(
-            'label_attr'    => array('class' => 'control-label'),
-            'label'         => 'mautic.integration.Twitter.share.text',
-            'required'      => false,
-            'attr'          => array(
+        $builder->add('text', 'text', [
+            'label_attr' => ['class' => 'control-label'],
+            'label'      => 'mautic.integration.Twitter.share.text',
+            'required'   => false,
+            'attr'       => [
                 'class'       => 'form-control',
-                'placeholder' => 'mautic.integration.Twitter.share.text.pagetitle'
-            )
-        ));
+                'placeholder' => 'mautic.integration.Twitter.share.text.pagetitle',
+            ],
+        ]);
 
-        $builder->add('via', 'text', array(
-            'label_attr'    => array('class' => 'control-label'),
-            'label'         => 'mautic.integration.Twitter.share.via',
-            'required'      => false,
-            'attr'          => array(
+        $builder->add('via', 'text', [
+            'label_attr' => ['class' => 'control-label'],
+            'label'      => 'mautic.integration.Twitter.share.via',
+            'required'   => false,
+            'attr'       => [
                 'class'       => 'form-control',
                 'placeholder' => 'mautic.integration.Twitter.share.username',
-                'preaddon'    => 'fa fa-at'
-            )
-        ));
+                'preaddon'    => 'fa fa-at',
+            ],
+        ]);
 
-        $builder->add('related', 'text', array(
-            'label_attr'    => array('class' => 'control-label'),
-            'label'         => 'mautic.integration.Twitter.share.related',
-            'required'      => false,
-            'attr'          => array(
+        $builder->add('related', 'text', [
+            'label_attr' => ['class' => 'control-label'],
+            'label'      => 'mautic.integration.Twitter.share.related',
+            'required'   => false,
+            'attr'       => [
                 'class'       => 'form-control',
                 'placeholder' => 'mautic.integration.Twitter.share.username',
-                'preaddon'    => 'fa fa-at'
-            )
-        ));
+                'preaddon'    => 'fa fa-at',
+            ],
+        ]);
 
-        $builder->add('hashtags', 'text', array(
-            'label_attr'    => array('class' => 'control-label'),
-            'label'         => 'mautic.integration.Twitter.share.hashtag',
-            'required'      => false,
-            'attr'          => array(
+        $builder->add('hashtags', 'text', [
+            'label_attr' => ['class' => 'control-label'],
+            'label'      => 'mautic.integration.Twitter.share.hashtag',
+            'required'   => false,
+            'attr'       => [
                 'class'       => 'form-control',
                 'placeholder' => 'mautic.integration.Twitter.share.hashtag.placeholder',
-                'preaddon'    => 'symbol-hashtag'
-            )
-        ));
+                'preaddon'    => 'symbol-hashtag',
+            ],
+        ]);
 
-        $builder->add('size', 'yesno_button_group', array(
+        $builder->add('size', 'yesno_button_group', [
             'no_value'  => 'medium',
             'yes_value' => 'large',
             'label'     => 'mautic.integration.Twitter.share.largesize',
-            'data'      => (!empty($options['data']['size'])) ? $options['data']['size'] : 'medium'
-        ));
+            'data'      => (!empty($options['data']['size'])) ? $options['data']['size'] : 'medium',
+        ]);
     }
 
     /**
      * @return string
      */
-    public function getName() {
-        return "socialmedia_twitter";
+    public function getName()
+    {
+        return 'socialmedia_twitter';
     }
 }
diff --git a/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php b/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php
index 5a53a9ea363..ceec1067e82 100644
--- a/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php
+++ b/plugins/MauticSocialBundle/Helper/CampaignEventHelper.php
@@ -1,27 +1,24 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Helper;
 
 use Mautic\AssetBundle\Helper\TokenHelper as AssetTokenHelper;
-use Mautic\LeadBundle\Entity\Lead;
 use Mautic\LeadBundle\Helper\TokenHelper;
 use Mautic\PageBundle\Entity\Trackable;
 use Mautic\PageBundle\Helper\TokenHelper as PageTokenHelper;
 use Mautic\PageBundle\Model\TrackableModel;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
-use MauticPlugin\MauticSocialBundle\Model\SocialEventLogModel;
 
 /**
- * Class CampaignEventHelper
- *
- * @package MauticPlugin\MauticSocialBundle\Helper\CampaignEventHelper
+ * Class CampaignEventHelper.
  */
 class CampaignEventHelper
 {
@@ -84,12 +81,11 @@ public function sendTweetAction($lead, $event)
 
         // Setup clickthrough for URLs in tweet
         $this->clickthrough = [
-            'source' => ['campaign', $event['campaign']['id']]
+            'source' => ['campaign', $event['campaign']['id']],
         ];
 
         $leadArray = $lead->getProfileFields();
         if (empty($leadArray['twitter'])) {
-
             return false;
         }
 
@@ -121,7 +117,7 @@ protected function parseTweetText($tweet, $lead)
     {
         $tweetHandle = $lead['twitter'];
         $tokens      = [
-            '{twitter_handle}' => (strpos($tweetHandle, '@') !== false) ? $tweetHandle : "@$tweetHandle"
+            '{twitter_handle}' => (strpos($tweetHandle, '@') !== false) ? $tweetHandle : "@$tweetHandle",
         ];
 
         $tokens = array_merge(
@@ -139,7 +135,7 @@ protected function parseTweetText($tweet, $lead)
         );
 
         /**
-         * @var string $token
+         * @var string
          * @var Trackable $trackable
          */
         foreach ($trackables as $token => $trackable) {
@@ -148,4 +144,4 @@ protected function parseTweetText($tweet, $lead)
 
         return str_replace(array_keys($tokens), array_values($tokens), $tweet);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Integration/FacebookIntegration.php b/plugins/MauticSocialBundle/Integration/FacebookIntegration.php
index c7031ef7191..266ab0da798 100644
--- a/plugins/MauticSocialBundle/Integration/FacebookIntegration.php
+++ b/plugins/MauticSocialBundle/Integration/FacebookIntegration.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Integration;
 
 /**
- * Class FacebookIntegration
+ * Class FacebookIntegration.
  */
 class FacebookIntegration extends SocialIntegration
 {
@@ -27,9 +28,9 @@ public function getName()
      */
     public function getIdentifierFields()
     {
-        return array(
-            'facebook'
-        );
+        return [
+            'facebook',
+        ];
     }
 
     /**
@@ -37,11 +38,11 @@ public function getIdentifierFields()
      */
     public function getSupportedFeatures()
     {
-        return array(
+        return [
             'share_button',
             'login_button',
-            'public_profile'
-        );
+            'public_profile',
+        ];
     }
 
     /**
@@ -93,7 +94,7 @@ public function getApiUrl($endpoint)
     }
 
     /**
-     * Get public data
+     * Get public data.
      *
      * @param $identifier
      * @param $socialCache
@@ -106,19 +107,18 @@ public function getUserData($identifier, &$socialCache)
         $accessToken          = $this->getContactAccessToken($socialCache);
 
         if (!isset($accessToken['access_token'])) {
-
             return;
         }
 
-        $url    = $this->getApiUrl("v2.5/me");
+        $url    = $this->getApiUrl('v2.5/me');
         $fields = array_keys($this->getAvailableLeadFields());
 
-        $parameters = array(
+        $parameters = [
             'access_token' => $accessToken['access_token'],
-            'fields'       => implode(",", $fields)
-        );
+            'fields'       => implode(',', $fields),
+        ];
 
-        $data = $this->makeRequest($url, $parameters, 'GET', array('auth_type' => 'rest'));
+        $data = $this->makeRequest($url, $parameters, 'GET', ['auth_type' => 'rest']);
 
         if (is_object($data) && isset($data->id)) {
             $info = $this->matchUpData($data);
@@ -150,25 +150,25 @@ public function getUserData($identifier, &$socialCache)
     /**
      * {@inheritdoc}
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        return array(
-            'about'       => array('type' => 'string'),
-            'bio'         => array('type' => 'string'),
-            'birthday'    => array('type' => 'string'),
-            'email'       => array('type' => 'string'),
-            'first_name'  => array('type' => 'string'),
-            'gender'      => array('type' => 'string'),
-            'last_name'   => array('type' => 'string'),
-            'link'        => array('type' => 'string'),
-            'locale'      => array('type' => 'string'),
-            'middle_name' => array('type' => 'string'),
-            'name'        => array('type' => 'string'),
-            'political'   => array('type' => 'string'),
-            'quotes'      => array('type' => 'string'),
-            'religion'    => array('type' => 'string'),
-            'timezone'    => array('type' => 'string'),
-            'website'     => array('type' => 'string')
-        );
+        return [
+            'about'       => ['type' => 'string'],
+            'bio'         => ['type' => 'string'],
+            'birthday'    => ['type' => 'string'],
+            'email'       => ['type' => 'string'],
+            'first_name'  => ['type' => 'string'],
+            'gender'      => ['type' => 'string'],
+            'last_name'   => ['type' => 'string'],
+            'link'        => ['type' => 'string'],
+            'locale'      => ['type' => 'string'],
+            'middle_name' => ['type' => 'string'],
+            'name'        => ['type' => 'string'],
+            'political'   => ['type' => 'string'],
+            'quotes'      => ['type' => 'string'],
+            'religion'    => ['type' => 'string'],
+            'timezone'    => ['type' => 'string'],
+            'website'     => ['type' => 'string'],
+        ];
     }
 }
diff --git a/plugins/MauticSocialBundle/Integration/FoursquareIntegration.php b/plugins/MauticSocialBundle/Integration/FoursquareIntegration.php
index 06c5577c059..853b1558fcd 100644
--- a/plugins/MauticSocialBundle/Integration/FoursquareIntegration.php
+++ b/plugins/MauticSocialBundle/Integration/FoursquareIntegration.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Integration;
 
 /**
- * Class FoursquareIntegration
+ * Class FoursquareIntegration.
  */
 class FoursquareIntegration extends SocialIntegration
 {
@@ -35,10 +36,10 @@ public function getPriority()
      */
     public function getIdentifierFields()
     {
-        return array(
+        return [
             'email',
             'twitter', //foursquare allows searching directly by twitter handle
-        );
+        ];
     }
 
     /**
@@ -84,7 +85,7 @@ public function getApiUrl($endpoint, $m = 'foursquare')
      *
      * @return mixed|string
      */
-    public function makeRequest($url, $parameters = array(), $method = 'GET', $settings = array())
+    public function makeRequest($url, $parameters = [], $method = 'GET', $settings = [])
     {
         $settings[$this->getAuthTokenKey()] = 'oauth_token';
 
@@ -92,7 +93,7 @@ public function makeRequest($url, $parameters = array(), $method = 'GET', $setti
     }
 
     /**
-     * Get public data
+     * Get public data.
      *
      * @param $identifier
      * @param $socialCache
@@ -105,10 +106,10 @@ public function getUserData($identifier, &$socialCache)
             $url  = $this->getApiUrl("users/{$id}");
             $data = $this->makeRequest($url);
             if (!empty($data) && isset($data->response->user)) {
-                $result = $data->response->user;
+                $result                 = $data->response->user;
                 $socialCache['profile'] = $this->matchUpData($result);
                 if (isset($result->photo)) {
-                    $socialCache['profile']['profileImage'] = $result->photo->prefix . '300x300' . $result->photo->suffix;
+                    $socialCache['profile']['profileImage'] = $result->photo->prefix.'300x300'.$result->photo->suffix;
                 }
                 $socialCache['profile']['profileHandle'] = $id;
             }
@@ -126,11 +127,11 @@ public function getUserData($identifier, &$socialCache)
     public function getPublicActivity($identifier, &$socialCache)
     {
         if ($id = $this->getContactUserId($identifier, $socialCache)) {
-            $activity = array(
+            $activity = [
                 //'mayorships' => array(),
-                'tips'       => array(),
+                'tips' => [],
                 //'lists'      => array()
-            );
+            ];
 
             /*
             //mayorships
@@ -164,7 +165,7 @@ public function getPublicActivity($identifier, &$socialCache)
             */
 
             //tips
-            $url  = $this->getApiUrl("users/{$id}/tips") . "&limit=5&sort=recent";
+            $url  = $this->getApiUrl("users/{$id}/tips").'&limit=5&sort=recent';
             $data = $this->makeRequest($url);
 
             if (isset($data->response->tips) && count($data->response->tips->items)) {
@@ -177,16 +178,16 @@ public function getPublicActivity($identifier, &$socialCache)
                             break;
                         }
                     }
-                    $contact = (!empty($t->contact->formattedPhone)) ? $t->contact->formattedPhone : '';
-                    $activity['tips'][] = array(
+                    $contact            = (!empty($t->contact->formattedPhone)) ? $t->contact->formattedPhone : '';
+                    $activity['tips'][] = [
                         'createdAt'     => $t->createdAt,
                         'tipText'       => $t->text,
                         'tipUrl'        => $t->canonicalUrl,
                         'venueName'     => $t->venue->name,
                         'venueLocation' => $t->venue->location->formattedAddress,
                         'venueContact'  => $contact,
-                        'venueCategory'  => $category
-                    );
+                        'venueCategory' => $category,
+                    ];
                 }
             }
 
@@ -253,7 +254,7 @@ public function getPublicActivity($identifier, &$socialCache)
     public function getErrorsFromResponse($response)
     {
         if (is_object($response) && isset($response->meta->errorDetail)) {
-            return $response->meta->errorDetail . ' (' . $response->meta->code . ')';
+            return $response->meta->errorDetail.' ('.$response->meta->code.')';
         }
 
         return '';
@@ -264,8 +265,8 @@ public function getErrorsFromResponse($response)
      */
     public function matchFieldName($field, $subfield = '')
     {
-        if ($field == "contact" && in_array($subfield, array('facebook', 'twitter'))) {
-            return $subfield . 'ProfileHandle';
+        if ($field == 'contact' && in_array($subfield, ['facebook', 'twitter'])) {
+            return $subfield.'ProfileHandle';
         }
 
         return parent::matchFieldName($field, $subfield);
@@ -274,24 +275,24 @@ public function matchFieldName($field, $subfield = '')
     /**
      * {@inheritdoc}
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        return array(
-            "profileHandle" => array("type" => "string"),
-            "firstName"     => array("type" => "string"),
-            "lastName"      => array("type" => "string"),
-            "gender"        => array("type" => "string"),
-            "homeCity"      => array("type" => "string"),
-            "bio"           => array("type" => "string"),
-            "contact"       => array(
-                "type"   => "object",
-                "fields" => array(
-                    "twitter",
-                    "facebook",
-                    "phone"
-                )
-            )
-        );
+        return [
+            'profileHandle' => ['type' => 'string'],
+            'firstName'     => ['type' => 'string'],
+            'lastName'      => ['type' => 'string'],
+            'gender'        => ['type' => 'string'],
+            'homeCity'      => ['type' => 'string'],
+            'bio'           => ['type' => 'string'],
+            'contact'       => [
+                'type'   => 'object',
+                'fields' => [
+                    'twitter',
+                    'facebook',
+                    'phone',
+                ],
+            ],
+        ];
     }
 
     /**
@@ -299,10 +300,10 @@ public function getAvailableLeadFields($settings = array())
      */
     public function getSupportedFeatures()
     {
-        return array(
+        return [
             'public_profile',
-            'public_activity'
-        );
+            'public_activity',
+        ];
     }
 
     /**
@@ -314,21 +315,19 @@ public function getSupportedFeatures()
     private function getContactUserId(&$identifier, &$socialCache)
     {
         if (!empty($socialCache['id'])) {
-
             return $socialCache['id'];
         } elseif (empty($identifier)) {
-
             return false;
         }
 
         $cleaned = $this->cleanIdentifier($identifier);
 
         if (!is_array($cleaned)) {
-            $cleaned = array($cleaned);
+            $cleaned = [$cleaned];
         }
 
         foreach ($cleaned as $type => $c) {
-            $url  = $this->getApiUrl("users/search") . "&{$type}={$c}";
+            $url  = $this->getApiUrl('users/search')."&{$type}={$c}";
             $data = $this->makeRequest($url);
 
             if (!empty($data) && isset($data->response->results) && count($data->response->results)) {
diff --git a/plugins/MauticSocialBundle/Integration/GooglePlusIntegration.php b/plugins/MauticSocialBundle/Integration/GooglePlusIntegration.php
index cca79c4ab06..36af042a833 100644
--- a/plugins/MauticSocialBundle/Integration/GooglePlusIntegration.php
+++ b/plugins/MauticSocialBundle/Integration/GooglePlusIntegration.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Integration;
 
 /**
- * Class GooglePlusIntegration
+ * Class GooglePlusIntegration.
  */
 class GooglePlusIntegration extends SocialIntegration
 {
@@ -51,12 +52,12 @@ public function getIdentifierFields()
      */
     public function getSupportedFeatures()
     {
-        return array(
+        return [
             'public_activity',
             'public_profile',
             'share_button',
-            'login_button'
-        );
+            'login_button',
+        ];
     }
 
     /**
@@ -69,14 +70,14 @@ public function getUserData($identifier, &$socialCache)
         $this->persistNewLead = false;
 
         if ($userId = $this->getContactUserId($identifier, $socialCache)) {
-            $url  = $this->getApiUrl("people/{$userId}");
+            $url = $this->getApiUrl("people/{$userId}");
             if ($userId == 'me') {
                 // Request using contact's access token
                 $data = $this->makeRequest(
                     $url,
-                    array('access_token' => $identifier),
+                    ['access_token' => $identifier],
                     'GET',
-                    array('auth_type' => 'access_token')
+                    ['auth_type' => 'access_token']
                 );
             } else {
                 // Request using Mautic's plugin authentication
@@ -98,7 +99,7 @@ public function getUserData($identifier, &$socialCache)
                     //remove the size from the end
                     $image                = $data->image->url;
                     $image                = preg_replace('/\?.*/', '', $image);
-                    $info["profileImage"] = $image;
+                    $info['profileImage'] = $image;
                 }
 
                 if (!empty($info)) {
@@ -121,21 +122,21 @@ public function getUserData($identifier, &$socialCache)
     public function getPublicActivity($identifier, &$socialCache)
     {
         if ($id = $this->getContactUserId($identifier, $socialCache)) {
-            $data = $this->makeRequest($this->getApiUrl("people/$id/activities/public"), array('maxResults' => 10));
+            $data = $this->makeRequest($this->getApiUrl("people/$id/activities/public"), ['maxResults' => 10]);
 
             if (!empty($data) && isset($data->items) && count($data->items)) {
-                $socialCache['activity'] = array(
-                    'posts'  => array(),
-                    'photos' => array(),
-                    'tags'   => array()
-                );
+                $socialCache['activity'] = [
+                    'posts'  => [],
+                    'photos' => [],
+                    'tags'   => [],
+                ];
                 foreach ($data->items as $page) {
-                    $post                               = array(
+                    $post = [
                         'title'     => $page->title,
                         'url'       => $page->url,
                         'published' => $page->published,
-                        'updated'   => $page->updated
-                    );
+                        'updated'   => $page->updated,
+                    ];
                     $socialCache['activity']['posts'][] = $post;
 
                     //extract hashtags from content
@@ -148,12 +149,12 @@ public function getPublicActivity($identifier, &$socialCache)
                         if (!empty($tags[2])) {
                             foreach ($tags[2] as $k => $tag) {
                                 if (isset($socialCache['activity']['tags'][$tag])) {
-                                    $socialCache['activity']['tags'][$tag]['count']++;
+                                    ++$socialCache['activity']['tags'][$tag]['count'];
                                 } else {
-                                    $socialCache['activity']['tags'][$tag] = array(
+                                    $socialCache['activity']['tags'][$tag] = [
                                         'count' => 1,
-                                        'url'   => $tags[1][$k]
-                                    );
+                                        'url'   => $tags[1][$k],
+                                    ];
                                 }
                             }
                         }
@@ -172,9 +173,9 @@ public function getPublicActivity($identifier, &$socialCache)
                                     $url = substr($url, 0, $pos);
                                 }
 
-                                $photo                               = array(
-                                    'url' => $url
-                                );
+                                $photo = [
+                                    'url' => $url,
+                                ];
                                 $socialCache['activity']['photos'][] = $photo;
                             }
                         }
@@ -187,66 +188,66 @@ public function getPublicActivity($identifier, &$socialCache)
     /**
      * {@inheritdoc}
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        return array(
-            "profileHandle"      => array("type" => "string"),
-            "nickname"           => array("type" => "string"),
-            "occupation"         => array("type" => "string"),
-            "skills"             => array("type" => "string"),
-            "birthday"           => array("type" => "string"),
-            "gender"             => array("type" => "string"),
-            'url'                => array("type" => "string"),
-            "urls"               => array(
-                "type"   => "array_object",
-                "fields" => array(
-                    "otherProfile",
-                    "contributor",
-                    "website",
-                    "other"
-                )
-            ),
-            "displayName"        => array("type" => "string"),
-            "name"               => array(
-                "type"   => "object",
-                "fields" => array(
-                    "familyName",
-                    "givenName",
-                    "middleName",
-                    "honorificPrefix",
-                    "honorificSuffix"
-                )
-            ),
-            "emails"             => array(
-                "type"   => "array_object",
-                "fields" => array(
-                    "account"
-                )
-            ),
-            "tagline"            => array("type" => "string"),
-            "braggingRights"     => array("type" => "string"),
-            "aboutMe"            => array("type" => "string"),
-            "currentLocation"    => array("type" => "string"),
-            "relationshipStatus" => array("type" => "string"),
-            "organizations"      => array(
-                "type"   => "array_object",
-                "fields" => array(
-                    "work",
-                    "home"
-                )
-            ),
-            "placesLived"        => array(
-                "type" => "array_object"
-            ),
-            "language"           => array("type" => "string"),
-            "ageRange"           => array(
-                "type"   => "object",
-                "fields" => array(
-                    "min",
-                    "max"
-                )
-            )
-        );
+        return [
+            'profileHandle' => ['type' => 'string'],
+            'nickname'      => ['type' => 'string'],
+            'occupation'    => ['type' => 'string'],
+            'skills'        => ['type' => 'string'],
+            'birthday'      => ['type' => 'string'],
+            'gender'        => ['type' => 'string'],
+            'url'           => ['type' => 'string'],
+            'urls'          => [
+                'type'   => 'array_object',
+                'fields' => [
+                    'otherProfile',
+                    'contributor',
+                    'website',
+                    'other',
+                ],
+            ],
+            'displayName' => ['type' => 'string'],
+            'name'        => [
+                'type'   => 'object',
+                'fields' => [
+                    'familyName',
+                    'givenName',
+                    'middleName',
+                    'honorificPrefix',
+                    'honorificSuffix',
+                ],
+            ],
+            'emails' => [
+                'type'   => 'array_object',
+                'fields' => [
+                    'account',
+                ],
+            ],
+            'tagline'            => ['type' => 'string'],
+            'braggingRights'     => ['type' => 'string'],
+            'aboutMe'            => ['type' => 'string'],
+            'currentLocation'    => ['type' => 'string'],
+            'relationshipStatus' => ['type' => 'string'],
+            'organizations'      => [
+                'type'   => 'array_object',
+                'fields' => [
+                    'work',
+                    'home',
+                ],
+            ],
+            'placesLived' => [
+                'type' => 'array_object',
+            ],
+            'language' => ['type' => 'string'],
+            'ageRange' => [
+                'type'   => 'object',
+                'fields' => [
+                    'min',
+                    'max',
+                ],
+            ],
+        ];
     }
 
     /**
@@ -254,10 +255,10 @@ public function getAvailableLeadFields($settings = array())
      */
     public function getRequiredKeyFields()
     {
-        return array(
+        return [
             'client_id'     => 'mautic.integration.keyfield.clientid',
-            'client_secret' => 'mautic.integration.keyfield.clientsecret'
-        );
+            'client_secret' => 'mautic.integration.keyfield.clientsecret',
+        ];
     }
 
     /**
@@ -266,7 +267,6 @@ public function getRequiredKeyFields()
     public function getAuthenticationType()
     {
         if (empty($this->keys['client_id']) && !empty($this->keys['key'])) {
-
             return 'key';
         }
 
@@ -281,7 +281,6 @@ public function getAuthenticationType()
     public function getAuthTokenKey()
     {
         if (empty($this->keys['client_id']) && !empty($this->keys['key'])) {
-
             return 'key';
         }
 
@@ -343,14 +342,11 @@ private function getContactUserId(&$identifier, &$socialCache)
         }
 
         if (!empty($socialCache['id'])) {
-
             return $socialCache['id'];
         } elseif (empty($identifier)) {
-
             return false;
         }
 
-
         if (is_numeric($identifier)) {
             //this is a google user ID
             $socialCache['id'] = $identifier;
@@ -359,7 +355,7 @@ private function getContactUserId(&$identifier, &$socialCache)
         }
 
         // Get user ID using the Mautic users access token/key
-        $data = $this->makeRequest($this->getApiUrl('people'), array('query' => $identifier));
+        $data = $this->makeRequest($this->getApiUrl('people'), ['query' => $identifier]);
 
         if (!empty($data->items) && count($data->items) === 1) {
             $socialCache['id'] = $data->items[0]->id;
@@ -369,4 +365,4 @@ private function getContactUserId(&$identifier, &$socialCache)
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Integration/InstagramIntegration.php b/plugins/MauticSocialBundle/Integration/InstagramIntegration.php
index 2c7911f4487..7fa25457e21 100644
--- a/plugins/MauticSocialBundle/Integration/InstagramIntegration.php
+++ b/plugins/MauticSocialBundle/Integration/InstagramIntegration.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Integration;
 
 /**
- * Class InstagramIntegration
+ * Class InstagramIntegration.
  */
 class InstagramIntegration extends SocialIntegration
 {
@@ -27,10 +28,10 @@ public function getName()
      */
     public function getSupportedFeatures()
     {
-        return array(
+        return [
             'public_profile',
-            'public_activity'
-        );
+            'public_activity',
+        ];
     }
 
     /**
@@ -94,41 +95,43 @@ public function getPublicActivity($identifier, &$socialCache)
         $socialCache['has']['activity'] = false;
         if ($id = $this->getContactUserId($identifier, $socialCache)) {
             //get more than 10 so we can weed out videos
-            $data = $this->makeRequest($this->getApiUrl("users/$id/media/recent"), array('count' => 20));
+            $data = $this->makeRequest($this->getApiUrl("users/$id/media/recent"), ['count' => 20]);
 
-            $socialCache['activity'] = array(
-                "photos" => array(),
-                "tags"   => array()
-            );
+            $socialCache['activity'] = [
+                'photos' => [],
+                'tags'   => [],
+            ];
 
             if (!empty($data->data)) {
                 $socialCache['has']['activity'] = true;
-                $count = 1;
+                $count                          = 1;
                 foreach ($data->data as $m) {
-                    if ($count > 10) break;
+                    if ($count > 10) {
+                        break;
+                    }
 
                     if ($m->type == 'image') {
-                        $socialCache['activity']['photos'][] = array(
-                            'url' => $m->images->standard_resolution->url
-                        );
+                        $socialCache['activity']['photos'][] = [
+                            'url' => $m->images->standard_resolution->url,
+                        ];
 
                         if (!empty($m->caption->text)) {
                             preg_match_all("/#(\w+)/", $m->caption->text, $tags);
                             if (!empty($tags[1])) {
                                 foreach ($tags[1] as $tag) {
                                     if (isset($socialCache['activity']['tags'][$tag])) {
-                                        $socialCache['activity']['tags'][$tag]['count']++;
+                                        ++$socialCache['activity']['tags'][$tag]['count'];
                                     } else {
-                                        $socialCache['activity']['tags'][$tag] = array(
+                                        $socialCache['activity']['tags'][$tag] = [
                                             'count' => 1,
-                                            'url'   => 'http://searchinstagram.com/' . $tag
-                                        );
+                                            'url'   => 'http://searchinstagram.com/'.$tag,
+                                        ];
                                     }
                                 }
                             }
                         }
                     }
-                    $count++;
+                    ++$count;
                 }
             }
         }
@@ -137,13 +140,13 @@ public function getPublicActivity($identifier, &$socialCache)
     /**
      * {@inheritdoc}
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        return array(
-            "full_name" => array("type" => "string"),
-            "bio"       => array("type" => "string"),
-            "website"   => array("type" => "string")
-        );
+        return [
+            'full_name' => ['type' => 'string'],
+            'bio'       => ['type' => 'string'],
+            'website'   => ['type' => 'string'],
+        ];
     }
 
     /**
@@ -157,7 +160,7 @@ private function getContactUserId(&$identifier, &$socialCache)
             return false;
         }
 
-        $data = $this->makeRequest($this->getApiUrl('users/search'), array('q' => $identifier));
+        $data = $this->makeRequest($this->getApiUrl('users/search'), ['q' => $identifier]);
 
         if (!empty($data->data)) {
             foreach ($data->data as $user) {
diff --git a/plugins/MauticSocialBundle/Integration/LinkedInIntegration.php b/plugins/MauticSocialBundle/Integration/LinkedInIntegration.php
index 06e39b08f4c..d89b680aab2 100644
--- a/plugins/MauticSocialBundle/Integration/LinkedInIntegration.php
+++ b/plugins/MauticSocialBundle/Integration/LinkedInIntegration.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Integration;
 
 /**
- * Class LinkedInIntegration
+ * Class LinkedInIntegration.
  */
 class LinkedInIntegration extends SocialIntegration
 {
@@ -27,11 +28,11 @@ public function getName()
      */
     public function getSupportedFeatures()
     {
-        return array(
+        return [
             'share_button',
             'login_button',
-            'public_profile'
-        );
+            'public_profile',
+        ];
     }
 
     /**
@@ -73,9 +74,9 @@ public function getApiUrl($endpoint)
      */
     public function getIdentifierFields()
     {
-        return array(
-            'linkedin'
-        );
+        return [
+            'linkedin',
+        ];
     }
 
     /**
@@ -83,14 +84,14 @@ public function getIdentifierFields()
      */
     public function getRequiredKeyFields()
     {
-        return array(
+        return [
             'client_id'     => 'mautic.integration.keyfield.clientid',
-            'client_secret' => 'mautic.integration.keyfield.clientsecret'
-        );
+            'client_secret' => 'mautic.integration.keyfield.clientsecret',
+        ];
     }
 
     /**
-     * Get public data
+     * Get public data.
      *
      * @param $identifier
      * @param $socialCache
@@ -103,7 +104,6 @@ public function getUserData($identifier, &$socialCache)
         $accessToken = $this->getContactAccessToken($socialCache);
 
         if (!isset($accessToken['access_token'])) {
-
             return;
         } elseif (isset($accessToken['persist_lead'])) {
             $persistLead = $accessToken['persist_lead'];
@@ -111,25 +111,24 @@ public function getUserData($identifier, &$socialCache)
         }
 
         $fields        = $this->getFieldNames($this->getAvailableLeadFields());
-        $profileFields = implode(",", array_keys($fields));
-        $url           = $this->getApiUrl("v1/people/~:(id,picture-url,".$profileFields.")");
-        $parameters    = array(
+        $profileFields = implode(',', array_keys($fields));
+        $url           = $this->getApiUrl('v1/people/~:(id,picture-url,'.$profileFields.')');
+        $parameters    = [
             'oauth2_access_token' => $accessToken['access_token'],
-            'format'              => 'json'
-        );
+            'format'              => 'json',
+        ];
 
-        $data = $this->makeRequest($url, $parameters, 'GET', array('auth_type' => 'rest'));
+        $data = $this->makeRequest($url, $parameters, 'GET', ['auth_type' => 'rest']);
 
         if (true) {
             $info = $this->matchUpData($data);
 
             if (isset($data->publicProfileUrl)) {
-                $info['profileHandle'] = str_replace("https://www.linkedin.com/", '', $data->publicProfileUrl);
+                $info['profileHandle'] = str_replace('https://www.linkedin.com/', '', $data->publicProfileUrl);
             }
 
             $info['profileImage'] = preg_replace('/\?.*/', '', $data->pictureUrl);
 
-
             $socialCache['profile']     = $info;
             $socialCache['lastRefresh'] = new \DateTime();
             $socialCache['accessToken'] = $this->encryptApiKeys($accessToken);
@@ -143,7 +142,7 @@ public function getUserData($identifier, &$socialCache)
     }
 
     /**
-     * gets the name of field to sent to linked in API to fetch social profile data
+     * gets the name of field to sent to linked in API to fetch social profile data.
      *
      * @param $leadFields
      *
@@ -151,7 +150,7 @@ public function getUserData($identifier, &$socialCache)
      */
     protected function getFieldNames($leadFields)
     {
-        $fields = array();
+        $fields = [];
         foreach ($leadFields as $leadField) {
             $fields[$leadField['fieldName']] = $leadField['fieldName'];
         }
@@ -170,35 +169,35 @@ protected function cleanIdentifier($identifier)
     /**
      * {@inheritdoc}
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
         // Until lead profile support is restored
         //return array();
 
-        return array(
-            'firstName'        => array('type' => 'string', 'fieldName' => 'first-name'),
-            'lastName'         => array('type' => 'string', 'fieldName' => 'last-name'),
-            'maidenName'       => array('type' => 'string', 'fieldName' => 'maiden-name'),
-            'formattedName'    => array('type' => 'string', 'fieldName' => 'formatted-name'),
-            'headline'         => array('type' => 'string', 'fieldName' => 'headline'),
-            'location'         => array(
-                'type'      => 'object',
-                'fields'    => array(
-                    'name'
-                ),
-                'fieldName' => 'location'
-            ),
-            'summary'          => array('type' => 'string', 'fieldName' => 'summary'),
-            'specialties'      => array('type' => 'string', 'fieldName' => 'specialties'),
-            'positions'        => array(
-                'type'      => 'array_object',
-                'fields'    => array(
-                    'values'
-                ),
-                'fieldName' => 'positions'
-            ),
-            'publicProfileUrl' => array('type' => 'string', 'fieldName' => 'public-profile-url'),
-            'emailAddress'     => array('type' => 'string', 'fieldName' => 'email-address')
-        );
+        return [
+            'firstName'     => ['type' => 'string', 'fieldName' => 'first-name'],
+            'lastName'      => ['type' => 'string', 'fieldName' => 'last-name'],
+            'maidenName'    => ['type' => 'string', 'fieldName' => 'maiden-name'],
+            'formattedName' => ['type' => 'string', 'fieldName' => 'formatted-name'],
+            'headline'      => ['type' => 'string', 'fieldName' => 'headline'],
+            'location'      => [
+                'type'   => 'object',
+                'fields' => [
+                    'name',
+                ],
+                'fieldName' => 'location',
+            ],
+            'summary'     => ['type' => 'string', 'fieldName' => 'summary'],
+            'specialties' => ['type' => 'string', 'fieldName' => 'specialties'],
+            'positions'   => [
+                'type'   => 'array_object',
+                'fields' => [
+                    'values',
+                ],
+                'fieldName' => 'positions',
+            ],
+            'publicProfileUrl' => ['type' => 'string', 'fieldName' => 'public-profile-url'],
+            'emailAddress'     => ['type' => 'string', 'fieldName' => 'email-address'],
+        ];
     }
 }
diff --git a/plugins/MauticSocialBundle/Integration/SocialIntegration.php b/plugins/MauticSocialBundle/Integration/SocialIntegration.php
index 8c1987e3b4c..1c1c7c56709 100644
--- a/plugins/MauticSocialBundle/Integration/SocialIntegration.php
+++ b/plugins/MauticSocialBundle/Integration/SocialIntegration.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Integration;
 
 use Mautic\PluginBundle\Integration\AbstractIntegration;
-use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormBuilder;
 
 abstract class SocialIntegration extends AbstractIntegration
 {
@@ -26,12 +27,12 @@ public function appendToForm(&$builder, $data, $formArea)
     {
         if ($formArea == 'features') {
             $name = strtolower($this->getName());
-            if ($this->factory->serviceExists('mautic.form.type.social.' . $name)) {
-                $builder->add('shareButton', 'socialmedia_' . $name, array(
+            if ($this->factory->serviceExists('mautic.form.type.social.'.$name)) {
+                $builder->add('shareButton', 'socialmedia_'.$name, [
                     'label'    => 'mautic.integration.form.sharebutton',
                     'required' => false,
-                    'data'     => (isset($data['shareButton'])) ? $data['shareButton'] : array()
-                ));
+                    'data'     => (isset($data['shareButton'])) ? $data['shareButton'] : [],
+                ]);
             }
         }
     }
@@ -43,16 +44,16 @@ public function appendToForm(&$builder, $data, $formArea)
      *
      * @return array
      */
-    public function getFormLeadFields($settings = array())
+    public function getFormLeadFields($settings = [])
     {
-        static $fields = array();
+        static $fields = [];
 
         if (empty($fields)) {
-            $translator        = $this->factory->getTranslator();
-            $s                 = $this->getName();
-            $available         = $this->getAvailableLeadFields($settings);
+            $translator = $this->factory->getTranslator();
+            $s          = $this->getName();
+            $available  = $this->getAvailableLeadFields($settings);
             if (empty($available) || !is_array($available)) {
-                return array();
+                return [];
             }
             //create social profile fields
             $socialProfileUrls = $this->factory->getHelper('integration')->getSocialProfileUrlRegex();
@@ -82,7 +83,7 @@ public function getFormLeadFields($settings = array())
                         }
                         break;
                     case 'array_object':
-                        if ($field == "urls" || $field == "url") {
+                        if ($field == 'urls' || $field == 'url') {
                             foreach ($socialProfileUrls as $p => $d) {
                                 $fields["{$p}ProfileHandle"] = (!$label)
                                     ? $translator->transConditional("mautic.integration.common.{$p}ProfileHandle", "mautic.integration.{$s}.{$p}ProfileHandle")
@@ -109,7 +110,7 @@ public function getFormLeadFields($settings = array())
                 }
             }
             if ($this->sortFieldsAlphabetically()) {
-                uasort($fields, "strnatcmp");
+                uasort($fields, 'strnatcmp');
             }
         }
 
@@ -129,28 +130,28 @@ public function getAuthenticationType()
      */
     public function getRequiredKeyFields()
     {
-        return array(
-            'client_id'      => 'mautic.integration.keyfield.clientid',
-            'client_secret'  => 'mautic.integration.keyfield.clientsecret'
-        );
+        return [
+            'client_id'     => 'mautic.integration.keyfield.clientid',
+            'client_secret' => 'mautic.integration.keyfield.clientsecret',
+        ];
     }
 
     /**
-     * Get the array key for clientId
+     * Get the array key for clientId.
      *
      * @return string
      */
-    public function getClientIdKey ()
+    public function getClientIdKey()
     {
         return 'client_id';
     }
 
     /**
-     * Get the array key for client secret
+     * Get the array key for client secret.
      *
      * @return string
      */
-    public function getClientSecretKey ()
+    public function getClientSecretKey()
     {
         return 'client_secret';
     }
@@ -163,7 +164,7 @@ public function getClientSecretKey ()
      *
      * @return mixed
      */
-    public function parseCallbackResponse ($data, $postAuthorization = false)
+    public function parseCallbackResponse($data, $postAuthorization = false)
     {
         if ($postAuthorization) {
             return json_decode($data, true);
@@ -173,19 +174,19 @@ public function parseCallbackResponse ($data, $postAuthorization = false)
     }
 
     /**
-     * Returns notes specific to sections of the integration form (if applicable)
+     * Returns notes specific to sections of the integration form (if applicable).
      *
      * @param $section
      *
      * @return string
      */
-    public function getFormNotes ($section)
+    public function getFormNotes($section)
     {
-        return array('', 'info');
+        return ['', 'info'];
     }
 
     /**
-     * Get the template for social profiles
+     * Get the template for social profiles.
      *
      * @return string
      */
@@ -195,7 +196,7 @@ public function getSocialProfileTemplate()
     }
 
     /**
-     * Get the access token from session or socialCache
+     * Get the access token from session or socialCache.
      *
      * @param $socialCache
      *
@@ -203,12 +204,11 @@ public function getSocialProfileTemplate()
      */
     protected function getContactAccessToken(&$socialCache)
     {
-        $accessToken = $this->factory->getSession()->get($this->getName().'_tokenResponse', array());
+        $accessToken = $this->factory->getSession()->get($this->getName().'_tokenResponse', []);
         if (!isset($accessToken[$this->getAuthTokenKey()])) {
             if (isset($socialCache['accessToken'])) {
                 $accessToken = $this->decryptApiKeys($socialCache['accessToken']);
             } else {
-
                 return null;
             }
         } else {
diff --git a/plugins/MauticSocialBundle/Integration/TwitterIntegration.php b/plugins/MauticSocialBundle/Integration/TwitterIntegration.php
index 0da8f37e9c2..7738c1fafea 100644
--- a/plugins/MauticSocialBundle/Integration/TwitterIntegration.php
+++ b/plugins/MauticSocialBundle/Integration/TwitterIntegration.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,15 +13,14 @@
 use Mautic\CoreBundle\Helper\EmojiHelper;
 
 /**
- * Class TwitterIntegration
+ * Class TwitterIntegration.
  */
 class TwitterIntegration extends SocialIntegration
 {
-
     /**
      * {@inheritdoc}
      */
-    public function getName ()
+    public function getName()
     {
         return 'Twitter';
     }
@@ -28,7 +28,7 @@ public function getName ()
     /**
      * {@inheritdoc}
      */
-    public function getPriority ()
+    public function getPriority()
     {
         return 5000;
     }
@@ -36,7 +36,7 @@ public function getPriority ()
     /**
      * {@inheritdoc}
      */
-    public function getIdentifierFields ()
+    public function getIdentifierFields()
     {
         return 'twitter';
     }
@@ -44,20 +44,20 @@ public function getIdentifierFields ()
     /**
      * {@inheritdoc}
      */
-    public function getSupportedFeatures ()
+    public function getSupportedFeatures()
     {
-        return array(
+        return [
             'public_profile',
             'public_activity',
             'share_button',
-            'login_button'
-        );
+            'login_button',
+        ];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getAccessTokenUrl ()
+    public function getAccessTokenUrl()
     {
         return 'https://api.twitter.com/oauth/access_token';
     }
@@ -90,7 +90,7 @@ public function getRequestTokenUrl()
     /**
      * {@inheritdoc}
      */
-    public function getAuthenticationType ()
+    public function getAuthenticationType()
     {
         return 'oauth1a';
     }
@@ -109,7 +109,7 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
         // Prevent SSL issues
         $settings['ssl_verifypeer'] = false;
 
-        if (empty($settings['authorize_session']) && $authType!='access_token') {
+        if (empty($settings['authorize_session']) && $authType != 'access_token') {
             // Twitter requires oauth_token_secret to be part of composite key
             $settings['token_secret'] = $this->keys['oauth_token_secret'];
 
@@ -125,7 +125,7 @@ public function prepareRequest($url, $parameters, $method, $settings, $authType)
      *
      * @return string
      */
-    public function getApiUrl ($endpoint)
+    public function getApiUrl($endpoint)
     {
         return "https://api.twitter.com/1.1/$endpoint.json";
     }
@@ -133,7 +133,7 @@ public function getApiUrl ($endpoint)
     /**
      * {@inheritdoc}
      */
-    public function getUserData ($identifier, &$socialCache)
+    public function getUserData($identifier, &$socialCache)
     {
         $accessToken = $this->getContactAccessToken($socialCache);
 
@@ -141,25 +141,25 @@ public function getUserData ($identifier, &$socialCache)
         if (isset($accessToken['oauth_token'])) {
             // note twitter requires params to be passed as strings
             $data = $this->makeRequest(
-                $this->getApiUrl("account/verify_credentials"),
-                array(
+                $this->getApiUrl('account/verify_credentials'),
+                [
                     'include_email'    => 'true',
                     'include_entities' => 'false',
                     'oauth_token'      => $accessToken['oauth_token'],
-                ),
+                ],
                 'GET',
-                array('auth_type' => 'oauth1a')
+                ['auth_type' => 'oauth1a']
             );
         }
 
         if (empty($data)) {
             // Try via user lookup
             $data = $this->makeRequest(
-                $this->getApiUrl("users/lookup"),
-                array(
+                $this->getApiUrl('users/lookup'),
+                [
                     'screen_name'      => $this->cleanIdentifier($identifier),
-                    'include_entities' => 'false'
-                )
+                    'include_entities' => 'false',
+                ]
             );
 
             if (isset($data[0])) {
@@ -174,7 +174,7 @@ public function getUserData ($identifier, &$socialCache)
             $info['profileHandle'] = $data['screen_name'];
             //remove the size variant
             $image                = $data['profile_image_url_https'];
-            $image                = str_replace(array('_normal', '_bigger', '_mini'), '', $image);
+            $image                = str_replace(['_normal', '_bigger', '_mini'], '', $image);
             $info['profileImage'] = $image;
 
             $socialCache['profile'] = $info;
@@ -184,13 +184,12 @@ public function getUserData ($identifier, &$socialCache)
     /**
      * {@inheritdoc}
      */
-    public function getPublicActivity ($identifier, &$socialCache)
+    public function getPublicActivity($identifier, &$socialCache)
     {
         if (!isset($socialCache['id'])) {
             $this->getUserData($identifier, $socialCache);
 
             if (!isset($socialCache['id'])) {
-
                 return;
             }
         }
@@ -198,32 +197,32 @@ public function getPublicActivity ($identifier, &$socialCache)
         $id = $socialCache['id'];
 
         //due to the way Twitter filters, get more than 10 tweets
-        $data = $this->makeRequest($this->getApiUrl("/statuses/user_timeline"), array(
+        $data = $this->makeRequest($this->getApiUrl('/statuses/user_timeline'), [
             'user_id'         => $id,
             'exclude_replies' => 'true',
             'count'           => 25,
-            'trim_user'       => 'true'
-        ));
+            'trim_user'       => 'true',
+        ]);
 
         if (!empty($data) && count($data)) {
             $socialCache['has']['activity'] = true;
-            $socialCache['activity']        = array(
-                'tweets' => array(),
-                'photos' => array(),
-                'tags'   => array()
-            );
+            $socialCache['activity']        = [
+                'tweets' => [],
+                'photos' => [],
+                'tags'   => [],
+            ];
 
             foreach ($data as $k => $d) {
                 if ($k == 10) {
                     break;
                 }
 
-                $tweet = array(
+                $tweet = [
                     'tweet'       => EmojiHelper::toHtml($d['text']),
                     'url'         => "https://twitter.com/{$id}/status/{$d['id']}",
                     'coordinates' => $d['coordinates'],
                     'published'   => $d['created_at'],
-                );
+                ];
 
                 $socialCache['activity']['tweets'][] = $tweet;
 
@@ -231,9 +230,9 @@ public function getPublicActivity ($identifier, &$socialCache)
                 if (isset($d['entities']['media'])) {
                     foreach ($d['entities']['media'] as $m) {
                         if ($m['type'] == 'photo') {
-                            $photo = array(
-                                'url' => (isset($m['media_url_https']) ? $m['media_url_https'] : $m['media_url'])
-                            );
+                            $photo = [
+                                'url' => (isset($m['media_url_https']) ? $m['media_url_https'] : $m['media_url']),
+                            ];
 
                             $socialCache['activity']['photos'][] = $photo;
                         }
@@ -244,12 +243,12 @@ public function getPublicActivity ($identifier, &$socialCache)
                 if (isset($d['entities']['hashtags'])) {
                     foreach ($d['entities']['hashtags'] as $h) {
                         if (isset($socialCache['activity']['tags'][$h['text']])) {
-                            $socialCache['activity']['tags'][$h['text']]['count']++;
+                            ++$socialCache['activity']['tags'][$h['text']]['count'];
                         } else {
-                            $socialCache['activity']['tags'][$h['text']] = array(
+                            $socialCache['activity']['tags'][$h['text']] = [
                                 'count' => 1,
-                                'url'   => 'https://twitter.com/search?q=%23' . $h['text']
-                            );
+                                'url'   => 'https://twitter.com/search?q=%23'.$h['text'],
+                            ];
                         }
                     }
                 }
@@ -260,24 +259,24 @@ public function getPublicActivity ($identifier, &$socialCache)
     /**
      * {@inheritdoc}
      */
-    public function getAvailableLeadFields($settings = array())
+    public function getAvailableLeadFields($settings = [])
     {
-        return array(
-            "profileHandle" => array("type" => "string"),
-            "name"          => array("type" => "string"),
-            "location"      => array("type" => "string"),
-            "description"   => array("type" => "string"),
-            "url"           => array("type" => "string"),
-            "time_zone"     => array("type" => "string"),
-            "lang"          => array("type" => "string"),
-            "email"         => array("type" => "string"),
-        );
+        return [
+            'profileHandle' => ['type' => 'string'],
+            'name'          => ['type' => 'string'],
+            'location'      => ['type' => 'string'],
+            'description'   => ['type' => 'string'],
+            'url'           => ['type' => 'string'],
+            'time_zone'     => ['type' => 'string'],
+            'lang'          => ['type' => 'string'],
+            'email'         => ['type' => 'string'],
+        ];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function cleanIdentifier ($identifier)
+    public function cleanIdentifier($identifier)
     {
         if (preg_match('#https?://twitter.com/(.*?)(/.*?|$)#i', $identifier, $match)) {
             //extract the handle
@@ -297,13 +296,14 @@ public function cleanIdentifier ($identifier)
      *
      * @return mixed
      */
-    public function parseCallbackResponse ($data, $postAuthorization = false)
+    public function parseCallbackResponse($data, $postAuthorization = false)
     {
         if ($postAuthorization) {
             parse_str($data, $parsed);
 
             return $parsed;
         }
+
         return json_decode($data, true);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/MauticSocialBundle.php b/plugins/MauticSocialBundle/MauticSocialBundle.php
index 438a5e87f6b..5fa1550c600 100644
--- a/plugins/MauticSocialBundle/MauticSocialBundle.php
+++ b/plugins/MauticSocialBundle/MauticSocialBundle.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -12,11 +13,8 @@
 use Mautic\PluginBundle\Bundle\PluginBundleBase;
 
 /**
- * Class MauticSocialBundle
- *
- * @package Mautic\LeadBundle
+ * Class MauticSocialBundle.
  */
 class MauticSocialBundle extends PluginBundleBase
 {
-
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Model/MonitoringModel.php b/plugins/MauticSocialBundle/Model/MonitoringModel.php
index 19cc5c258cf..6e203f30a3f 100644
--- a/plugins/MauticSocialBundle/Model/MonitoringModel.php
+++ b/plugins/MauticSocialBundle/Model/MonitoringModel.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Model;
 
 use Mautic\CoreBundle\Model\FormModel;
+use MauticPlugin\MauticSocialBundle\Entity\Monitoring;
 use MauticPlugin\MauticSocialBundle\Event as Events;
 use MauticPlugin\MauticSocialBundle\SocialEvents;
-use MauticPlugin\MauticSocialBundle\Entity\Monitoring;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 /**
  * Class MonitoringModel
  * {@inheritdoc}
- * @package Mautic\CoreBundle\Model\FormModel
  */
 class MonitoringModel extends FormModel
 {
@@ -32,12 +32,13 @@ class MonitoringModel extends FormModel
      * @param array $options
      *
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
     public function createForm($entity, $formFactory, $action = null, $params = [])
     {
         if (!$entity instanceof Monitoring) {
-            throw new MethodNotAllowedHttpException (['Monitoring']);
+            throw new MethodNotAllowedHttpException(['Monitoring']);
         }
 
         if (!empty($action)) {
@@ -48,7 +49,7 @@ public function createForm($entity, $formFactory, $action = null, $params = [])
     }
 
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
      *
@@ -57,7 +58,7 @@ public function createForm($entity, $formFactory, $action = null, $params = [])
     public function getEntity($id = null)
     {
         if ($id === null) {
-            $entity = new Monitoring;
+            $entity = new Monitoring();
         } else {
             $entity = parent::getEntity($id);
         }
@@ -82,16 +83,16 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
         }
 
         switch ($action) {
-            case "pre_save":
+            case 'pre_save':
                 $name = SocialEvents::MONITOR_PRE_SAVE;
                 break;
-            case "post_save":
+            case 'post_save':
                 $name = SocialEvents::MONITOR_POST_SAVE;
                 break;
-            case "pre_delete":
+            case 'pre_delete':
                 $name = SocialEvents::MONITOR_PRE_DELETE;
                 break;
-            case "post_delete":
+            case 'post_delete':
                 $name = SocialEvents::MONITOR_POST_DELETE;
                 break;
             default:
@@ -114,7 +115,7 @@ protected function dispatchEvent($action, &$entity, $isNew = false, Event $event
     /**
      * {@inheritdoc}
      *
-     * @var \MauticPlugin\MauticSocialBundle\Entity\Monitoring $monitoringEntity
+     * @var \MauticPlugin\MauticSocialBundle\Entity\Monitoring
      */
     public function saveEntity($monitoringEntity, $unlock = true)
     {
@@ -122,7 +123,7 @@ public function saveEntity($monitoringEntity, $unlock = true)
         if (!$monitoringEntity->isNew()) {
             //increase the revision
             $revision = $monitoringEntity->getRevision();
-            $revision++;
+            ++$revision;
             $monitoringEntity->setRevision($revision);
         } // is new
         else {
@@ -156,9 +157,9 @@ public function getNetworkTypes()
     {
         $types = [
             'twitter_handle'  => 'mautic.social.monitoring.type.list.twitter.handle',
-            'twitter_hashtag' => 'mautic.social.monitoring.type.list.twitter.hashtag'
+            'twitter_hashtag' => 'mautic.social.monitoring.type.list.twitter.hashtag',
         ];
 
         return $types;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Model/PostCountModel.php b/plugins/MauticSocialBundle/Model/PostCountModel.php
index 8f19a851439..c91f58581cd 100644
--- a/plugins/MauticSocialBundle/Model/PostCountModel.php
+++ b/plugins/MauticSocialBundle/Model/PostCountModel.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -13,12 +14,12 @@
 use MauticPlugin\MauticSocialBundle\Entity\PostCount;
 
 /**
- * Class PostCountModel
+ * Class PostCountModel.
  */
 class PostCountModel extends AbstractCommonModel
 {
     /**
-     * Get a specific entity or generate a new one if id is empty
+     * Get a specific entity or generate a new one if id is empty.
      *
      * @param $id
      *
@@ -39,7 +40,7 @@ public function getEntity($id = null)
     }
 
     /**
-     * Get this model's repository
+     * Get this model's repository.
      *
      * @return \MauticPlugin\MauticSocialBundle\Entity\PostCountRepository
      */
@@ -92,4 +93,4 @@ public function updatePostCount($monitor, \DateTime $postDate)
         // nothing went wrong so return true here
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php b/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php
index c90712099e5..5b9f0e016f8 100644
--- a/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php
+++ b/plugins/MauticSocialBundle/Security/Permissions/MauticSocialPermissions.php
@@ -1,21 +1,20 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle\Security\Permissions;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Mautic\CoreBundle\Security\Permissions\AbstractPermissions;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * Class MauticSocialPermissions
- *
- * @package MauticPlugin\MauticSocialBundle\Security\Permissions
+ * Class MauticSocialPermissions.
  */
 class MauticSocialPermissions extends AbstractPermissions
 {
@@ -34,7 +33,8 @@ public function __construct($params)
      *
      * @return string|void
      */
-    public function getName() {
+    public function getName()
+    {
         return 'mauticSocial';
     }
 
@@ -44,10 +44,9 @@ public function getName() {
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-
     public function buildForm(FormBuilderInterface &$builder, array $options, array $data)
     {
         $this->addStandardFormFields('mauticSocial', 'categories', $builder, $data);
         $this->addStandardFormFields('mauticSocial', 'monitoring', $builder, $data);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/SocialEvents.php b/plugins/MauticSocialBundle/SocialEvents.php
index 3a21f9b56c4..35e3a186283 100644
--- a/plugins/MauticSocialBundle/SocialEvents.php
+++ b/plugins/MauticSocialBundle/SocialEvents.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 namespace MauticPlugin\MauticSocialBundle;
 
 /**
- * Class SocialEvents
+ * Class SocialEvents.
  *
  * Events available for MauticSocialBundle
  */
@@ -75,5 +76,4 @@ final class SocialEvents
      * @var string
      */
     const ON_CAMPAIGN_TRIGGER_ACTION = 'mautic.social.on_campaign_trigger_action';
-
-}
\ No newline at end of file
+}
diff --git a/plugins/MauticSocialBundle/Views/FormTheme/Campaigns/twitter_tweet_widget.html.php b/plugins/MauticSocialBundle/Views/FormTheme/Campaigns/twitter_tweet_widget.html.php
index 478d368f02a..996993b0ad8 100644
--- a/plugins/MauticSocialBundle/Views/FormTheme/Campaigns/twitter_tweet_widget.html.php
+++ b/plugins/MauticSocialBundle/Views/FormTheme/Campaigns/twitter_tweet_widget.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <div id="compose-tweet">
     <div id="character-count" class="text-right small">
-        <?php echo $view['translator']->trans('mautic.social.twitter.tweet.count');?>
+        <?php echo $view['translator']->trans('mautic.social.twitter.tweet.count'); ?>
         <span></span>
     </div>
     <?php echo $view['form']->row($form['tweet_text']); ?>
@@ -18,7 +19,7 @@
     <div class="row">
         <div id="handle" class="col-md-2">
             <label class="control-label">
-                <?php echo $view['translator']->trans('mautic.social.twitter.tweet.handle');?>
+                <?php echo $view['translator']->trans('mautic.social.twitter.tweet.handle'); ?>
             </label>
             <?php echo $view['form']->row($form['handle']); ?>
         </div>
diff --git a/plugins/MauticSocialBundle/Views/FormTheme/Config/_config_social_config_widget.html.php b/plugins/MauticSocialBundle/Views/FormTheme/Config/_config_social_config_widget.html.php
index a4f0020a4c8..e4001d3b900 100644
--- a/plugins/MauticSocialBundle/Views/FormTheme/Config/_config_social_config_widget.html.php
+++ b/plugins/MauticSocialBundle/Views/FormTheme/Config/_config_social_config_widget.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/FormTheme/twitter_custom_widget.html.php b/plugins/MauticSocialBundle/Views/FormTheme/twitter_custom_widget.html.php
index 51346e8cf95..81113a1848d 100644
--- a/plugins/MauticSocialBundle/Views/FormTheme/twitter_custom_widget.html.php
+++ b/plugins/MauticSocialBundle/Views/FormTheme/twitter_custom_widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 
 <div class="row">
diff --git a/plugins/MauticSocialBundle/Views/FormTheme/twitter_handle_widget.html.php b/plugins/MauticSocialBundle/Views/FormTheme/twitter_handle_widget.html.php
index 9796f39f6fc..55f133ec20f 100644
--- a/plugins/MauticSocialBundle/Views/FormTheme/twitter_handle_widget.html.php
+++ b/plugins/MauticSocialBundle/Views/FormTheme/twitter_handle_widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <div class="row">
     <div class="col-md-6">
diff --git a/plugins/MauticSocialBundle/Views/FormTheme/twitter_hashtag_widget.html.php b/plugins/MauticSocialBundle/Views/FormTheme/twitter_hashtag_widget.html.php
index a32da092071..b21c0a97d29 100644
--- a/plugins/MauticSocialBundle/Views/FormTheme/twitter_hashtag_widget.html.php
+++ b/plugins/MauticSocialBundle/Views/FormTheme/twitter_hashtag_widget.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 
 <div class="row">
diff --git a/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/activity.html.php b/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/activity.html.php
index c9f0c52cb00..2b04d10db5d 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/activity.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/activity.html.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * @package     Mautic
  * @copyright   2014 Mautic Contributors. All rights reserved.
  * @author      Mautic
diff --git a/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/profile.html.php b/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/profile.html.php
index 645c0b9ae6e..92b41980f2f 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/profile.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/profile.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/view.html.php b/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/view.html.php
index 00a11c30d47..d3217e84d5f 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/view.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Facebook/Profile/view.html.php
@@ -1,16 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 
 <div class="panel-body">
-    <?php echo $view->render('MauticSocialBundle:Integration/Facebook/Profile:profile.html.php', array(
-        'lead'      => $lead,
-        'profile'   => $details['profile']
-    )); ?>
+    <?php echo $view->render('MauticSocialBundle:Integration/Facebook/Profile:profile.html.php', [
+        'lead'    => $lead,
+        'profile' => $details['profile'],
+    ]); ?>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/Facebook/share.html.php b/plugins/MauticSocialBundle/Views/Integration/Facebook/share.html.php
index 3ff56d3afb2..67fd30880fa 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Facebook/share.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Facebook/share.html.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $locale    = $app->getRequest()->getLocale();
-$settings  = (!empty($field['properties'])) ? $field['properties'] : array();
+$settings  = (!empty($field['properties'])) ? $field['properties'] : [];
 $layout    = (!empty($settings['layout'])) ? $settings['layout'] : 'standard';
 $action    = (!empty($settings['action'])) ? $settings['action'] : 'like';
 $showFaces = (!empty($settings['showFaces'])) ? 'true' : 'false';
@@ -27,7 +27,7 @@
 JS;
 ?>
 
-<?php //add FB's required OG tag ?>
+<?php //add FB's required OG tag?>
 <?php echo $js; ?>
 <meta property="og:type" content="website" />
 <div class="fb-<?php echo ($action == 'share') ? 'share-button' : 'like'; ?> share-button facebook-share-button layout-<?php echo $layout; ?> action-<?php echo $action; ?>"
diff --git a/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/profile.html.php b/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/profile.html.php
index 89757454776..4295c4da039 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/profile.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/profile.html.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$tableFields = array('gender', 'homeCity', 'bio');
+$tableFields = ['gender', 'homeCity', 'bio'];
 ?>
 <div class="media">
     <?php if (isset($profile['profileImage'])): ?>
@@ -17,7 +17,7 @@
     <?php endif; ?>
 
     <div class="media-body">
-        <h4 class="media-heading"><?php echo $profile['firstName'] . ' ' . $profile['lastName']; ?></h4>
+        <h4 class="media-heading"><?php echo $profile['firstName'].' '.$profile['lastName']; ?></h4>
         <p class="text-muted"><a href="https://foursquare.com/user/<?php echo $profile['profileHandle']; ?>" target="_blank"><?php echo $profile['profileHandle']; ?></a></p>
         <table class="table table-condensed table-bordered">
             <?php foreach ($tableFields as $t): ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/tips.html.php b/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/tips.html.php
index a51a3230c83..6fb05009595 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/tips.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/tips.html.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 <ul class="list-group">
     <?php
-    $i = 0;
+    $i     = 0;
     $total = count($activity); ?>
 
      <?php foreach ($activity as $item): ?>
@@ -31,6 +31,6 @@
             <p class="text-muted"><i class="fa fa-clock-o"></i> <?php echo $view['date']->toFull($item['createdAt'], 'UTC', 'U'); ?></p>
             <?php echo $i == 0 ? '' : '<hr />'; ?>
         </li>
-        <?php $i++; ?>
+        <?php ++$i; ?>
     <?php endforeach; ?>
 </ul>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/view.html.php b/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/view.html.php
index f2d8c0f3a9b..ac04bb649cf 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/view.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Foursquare/Profile/view.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -25,15 +26,15 @@
 
 <div class="np panel-body tab-content">
     <div class="pa-20 tab-pane active" id="FoursquareProfile">
-        <?php echo $view->render('MauticSocialBundle:Integration/Foursquare/Profile:profile.html.php', array(
-            'lead'      => $lead,
-            'profile'   => $details['profile']
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/Foursquare/Profile:profile.html.php', [
+            'lead'    => $lead,
+            'profile' => $details['profile'],
+        ]); ?>
     </div>
     <div class="tab-pane" id="FoursquareTips">
-        <?php echo $view->render('MauticSocialBundle:Integration/Foursquare/Profile:tips.html.php', array(
-            'lead'      => $lead,
-            'activity'  => (!empty($details['activity']['tips'])) ? $details['activity']['tips'] : array()
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/Foursquare/Profile:tips.html.php', [
+            'lead'     => $lead,
+            'activity' => (!empty($details['activity']['tips'])) ? $details['activity']['tips'] : [],
+        ]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/photos.html.php b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/photos.html.php
index a2644d04f05..6e292180ff3 100644
--- a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/photos.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/photos.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -12,13 +13,13 @@
     <div class="img-grid row">
         <?php $count = 0; ?>
         <?php foreach ($activity as $a): ?>
-        <?php if ($count > 0 && $count%3 == 0): echo '</div><div class="row">'; endif; ?>
+        <?php if ($count > 0 && $count % 3 == 0): echo '</div><div class="row">'; endif; ?>
         <div class="col-xs-4 social-image"'>
             <a href="javascript: void(0);" onclick="Mautic.showSocialMediaImageModal('<?php echo $a['url']; ?>');">
                 <img class="img-responsive img-thumbnail" src="<?php echo $a['url']; ?>" />
             </a>
         </div>
-        <?php $count++; ?>
+        <?php ++$count; ?>
         <?php endforeach; ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/posts.html.php b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/posts.html.php
index bb11abc9269..aaa5a8e87bb 100644
--- a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/posts.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/posts.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/profile.html.php b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/profile.html.php
index 806f725c0b3..0b9ec049dcc 100644
--- a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/profile.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/profile.html.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-$tableFields = array('gender', 'birthday', 'occupation', 'skills', 'braggingRights');
+$tableFields = ['gender', 'birthday', 'occupation', 'skills', 'braggingRights'];
 ?>
 <div class="media">
     <?php if (isset($profile['profileImage'])): ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/tags.html.php b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/tags.html.php
index 6e049acd484..93919356b05 100644
--- a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/tags.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/tags.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/view.html.php b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/view.html.php
index 1ec43601579..033e54965c6 100644
--- a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/view.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/Profile/view.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ?>
 
 <div class="panel-toolbar np">
@@ -35,27 +35,27 @@
 </div>
 <div class="panel-body tab-content">
     <div class="tab-pane active" id="GoogleProfile">
-        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:profile.html.php', array(
-            'lead'      => $lead,
-            'profile'   => $details['profile']
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:profile.html.php', [
+            'lead'    => $lead,
+            'profile' => $details['profile'],
+        ]); ?>
     </div>
     <div class="tab-pane" id="GooglePosts">
-        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:posts.html.php', array(
-            'lead'      => $lead,
-            'activity'  => (!empty($details['activity']['posts'])) ? $details['activity']['posts'] : array()
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:posts.html.php', [
+            'lead'     => $lead,
+            'activity' => (!empty($details['activity']['posts'])) ? $details['activity']['posts'] : [],
+        ]); ?>
     </div>
     <div class="tab-pane" id="GooglePhotos">
-        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:photos.html.php', array(
-            'lead'      => $lead,
-            'activity'  => (!empty($details['activity']['photos'])) ? $details['activity']['photos'] : array()
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:photos.html.php', [
+            'lead'     => $lead,
+            'activity' => (!empty($details['activity']['photos'])) ? $details['activity']['photos'] : [],
+        ]); ?>
     </div>
     <div class="tab-pane" id="GoogleTags">
-        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:tags.html.php', array(
+        <?php echo $view->render('MauticSocialBundle:Integration/GooglePlus/Profile:tags.html.php', [
             'lead'     => $lead,
-            'activity' => (!empty($details['activity']['tags'])) ? $details['activity']['tags'] : array()
-        )); ?>
+            'activity' => (!empty($details['activity']['tags'])) ? $details['activity']['tags'] : [],
+        ]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/share.html.php b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/share.html.php
index dce0ed23ea1..ca4e82d8bac 100644
--- a/plugins/MauticSocialBundle/Views/Integration/GooglePlus/share.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/GooglePlus/share.html.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $dataHeight     = (!empty($settings['height'])) ? ' data-height="'.$settings['height'].'"' : '';
 $dataAnnotation = (!empty($settings['annotation'])) ? $settings['annotation'] : 'inline';
 $locale         = $app->getRequest()->getLocale();
 $language       = ($locale != 'en_US') ? "window.___gcfg = {lang: '$locale'};" : '';
-$js = <<<JS
+$js             = <<<JS
 $language
 (function() {
     var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
diff --git a/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/photos.html.php b/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/photos.html.php
index dfaa6ba9315..d7941af6d77 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/photos.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/photos.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -12,13 +13,13 @@
     <div class="img-grid row">
         <?php $count = 0; ?>
         <?php foreach ($activity as $a): ?>
-            <?php if ($count > 0 && $count%3 == 0): echo '</div><div class="row">'; endif; ?>
+            <?php if ($count > 0 && $count % 3 == 0): echo '</div><div class="row">'; endif; ?>
             <div class="col-xs-4 social-image">
                 <a href="javascript: void(0);" onclick="Mautic.showSocialMediaImageModal('<?php echo $a['url']; ?>');">
                     <img class="img-responsive img-thumbnail" src="<?php echo $a['url']; ?>" />
                 </a>
             </div>
-            <?php $count++; ?>
+            <?php ++$count; ?>
         <?php endforeach; ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/profile.html.php b/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/profile.html.php
index 4702ca1b639..b5fd52c661d 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/profile.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/profile.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/view.html.php b/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/view.html.php
index ee214ced7f4..ce50938fe78 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/view.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Instagram/Profile/view.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -24,13 +25,13 @@
 </div>
 <div class="np panel-body tab-content">
     <div class="pa-20 tab-pane active" id="InstagramProfile">
-        <?php echo $view->render('MauticSocialBundle:Integration/Instagram/Profile:profile.html.php', array(
-            'profile' => $details['profile']
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/Instagram/Profile:profile.html.php', [
+            'profile' => $details['profile'],
+        ]); ?>
     </div>
     <div class="pa-20 tab-pane" id="InstagramPhotos">
-        <?php echo $view->render('MauticSocialBundle:Integration/Instagram/Profile:photos.html.php', array(
-            'activity' => (!empty($details['activity']['photos'])) ? $details['activity']['photos'] : array()
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/Instagram/Profile:photos.html.php', [
+            'activity' => (!empty($details['activity']['photos'])) ? $details['activity']['photos'] : [],
+        ]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/profile.html.php b/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/profile.html.php
index f510699bb92..bc53a6dd68c 100644
--- a/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/profile.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/profile.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/view.html.php b/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/view.html.php
index 6518eb14ef3..0c2f854fbfd 100644
--- a/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/view.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/LinkedIn/Profile/view.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -24,8 +25,8 @@
 </div>
 <div class="np panel-body tab-content">
     <div class="pa-20 tab-pane active" id="LinkedInProfile">
-        <?php echo $view->render('MauticSocialBundle:Integration/LinkedIn/Profile:profile.html.php', array(
-            'profile' => $details['profile']
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/LinkedIn/Profile:profile.html.php', [
+            'profile' => $details['profile'],
+        ]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/LinkedIn/share.html.php b/plugins/MauticSocialBundle/Views/Integration/LinkedIn/share.html.php
index 5c2bf2b5a21..63f8899f38a 100644
--- a/plugins/MauticSocialBundle/Views/Integration/LinkedIn/share.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/LinkedIn/share.html.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $locale = $app->getRequest()->getLocale();
-$js = <<<js
+$js     = <<<js
 <script src="//platform.linkedin.com/in.js" type="text/javascript">
     lang: $locale
 </script>
diff --git a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/photos.html.php b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/photos.html.php
index b7c3c74d62a..67fa7a7d410 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/photos.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/photos.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -12,13 +13,13 @@
     <div class="img-grid row">
         <?php $count = 0; ?>
         <?php foreach ($activity as $a): ?>
-        <?php if ($count > 0 && $count%3 == 0): echo '</div><div class="row">'; endif; ?>
+        <?php if ($count > 0 && $count % 3 == 0): echo '</div><div class="row">'; endif; ?>
         <div class="col-xs-4 social-image"'>
         <a href="javascript: void(0);" onclick="Mautic.showSocialMediaImageModal('<?php echo $a['url']; ?>');">
             <img class="img-responsive img-thumbnail" src="<?php echo $a['url']; ?>" />
         </a>
     </div>
-    <?php $count++; ?>
+    <?php ++$count; ?>
     <?php endforeach; ?>
 </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/profile.html.php b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/profile.html.php
index 86da51ef5e6..16ad4d8f962 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/profile.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/profile.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tags.html.php b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tags.html.php
index 6e049acd484..93919356b05 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tags.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tags.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tweets.html.php b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tweets.html.php
index b61d4eba07f..379b2826235 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tweets.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/tweets.html.php
@@ -1,28 +1,29 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
 <ul class="list-group">
 	<?php
-	$i = 0;
-	$total = count($activity); ?>
+    $i     = 0;
+    $total = count($activity); ?>
 
      <?php foreach ($activity as $item): ?>
      	<?php
-     	$border = 'bdr-b bdr-l-wdh-0 bdr-r-wdh-0';
-     	if ($i == 0 || $i == ($total - 1)):
-     		$border = 'bdr-w-0';
-     	endif;
-     	?>
+         $border = 'bdr-b bdr-l-wdh-0 bdr-r-wdh-0';
+         if ($i == 0 || $i == ($total - 1)):
+             $border = 'bdr-w-0';
+         endif;
+         ?>
         <li class="<?php echo $border; ?> pa-15 list-group-item">
             <p><?php echo $item['tweet']; ?></p>
             <span class="text-muted"><i class="fa fa-clock-o"></i> <?php echo $view['date']->toFull($item['published']); ?></span>
         </li>
-        <?php $i++; ?>
+        <?php ++$i; ?>
     <?php endforeach; ?>
 </ul>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/view.html.php b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/view.html.php
index 525fae7beba..9a9cdbb47b8 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/view.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Twitter/Profile/view.html.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 ?>
@@ -34,27 +35,27 @@
 </div>
 <div class="np panel-body tab-content">
     <div class="pa-20 tab-pane active" id="TwitterProfile">
-        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:profile.html.php', array(
-            'lead'      => $lead,
-            'profile'   => $details['profile']
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:profile.html.php', [
+            'lead'    => $lead,
+            'profile' => $details['profile'],
+        ]); ?>
     </div>
     <div class="tab-pane" id="TwitterTweets">
-        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:tweets.html.php', array(
-            'lead'        => $lead,
-            'activity'    => (!empty($details['activity']['tweets'])) ? $details['activity']['tweets'] : array()
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:tweets.html.php', [
+            'lead'     => $lead,
+            'activity' => (!empty($details['activity']['tweets'])) ? $details['activity']['tweets'] : [],
+        ]); ?>
     </div>
     <div class="pa-20 tab-pane" id="TwitterPhotos">
-        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:photos.html.php', array(
+        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:photos.html.php', [
             'lead'      => $lead,
-             'activity' => (!empty($details['activity']['photos'])) ? $details['activity']['photos'] : array()
-        )); ?>
+             'activity' => (!empty($details['activity']['photos'])) ? $details['activity']['photos'] : [],
+        ]); ?>
     </div>
     <div class="pa-20 tab-pane" id="TwitterTags">
-        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:tags.html.php', array(
-            'lead'      => $lead,
-            'activity' => (!empty($details['activity']['tags'])) ? $details['activity']['tags'] : array()
-        )); ?>
+        <?php echo $view->render('MauticSocialBundle:Integration/Twitter/Profile:tags.html.php', [
+            'lead'     => $lead,
+            'activity' => (!empty($details['activity']['tags'])) ? $details['activity']['tags'] : [],
+        ]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Integration/Twitter/share.html.php b/plugins/MauticSocialBundle/Views/Integration/Twitter/share.html.php
index 961153e676f..6d969bd3c36 100644
--- a/plugins/MauticSocialBundle/Views/Integration/Twitter/share.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/Twitter/share.html.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $locale       = $app->getRequest()->getLocale();
-$dataText     = (!empty($settings['text']))      ? ' data-text="'.$settings['text'].'"'         : '';
-$dataVia      = (!empty($settings['via']))       ? ' data-via="'.$settings['via'].'"'           : '';
-$dataRelated  = (!empty($settings['related']))   ? ' data-related="'.$settings['related'].'"'   : '';
-$dataHashtags = (!empty($settings['hashtags']))  ? ' data-hashtags="'.$settings['hashtags'].'"' : '';
-$dataSize     = (!empty($settings['size']))      ? ' data-size="'.$settings['size'].'"'         : '';
-$dataCount    = (!empty($settings['count']))     ? ' data-count="'.$settings['count'].'"'       : '';
-$dataLang     = ($locale != 'en_US')             ? ' data-lang="'.$locale.'"'                   : '';
+$dataText     = (!empty($settings['text'])) ? ' data-text="'.$settings['text'].'"' : '';
+$dataVia      = (!empty($settings['via'])) ? ' data-via="'.$settings['via'].'"' : '';
+$dataRelated  = (!empty($settings['related'])) ? ' data-related="'.$settings['related'].'"' : '';
+$dataHashtags = (!empty($settings['hashtags'])) ? ' data-hashtags="'.$settings['hashtags'].'"' : '';
+$dataSize     = (!empty($settings['size'])) ? ' data-size="'.$settings['size'].'"' : '';
+$dataCount    = (!empty($settings['count'])) ? ' data-count="'.$settings['count'].'"' : '';
+$dataLang     = ($locale != 'en_US') ? ' data-lang="'.$locale.'"' : '';
 
-$js = <<<JS
+$js = <<<'JS'
 !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');
 JS;
 ?>
diff --git a/plugins/MauticSocialBundle/Views/Integration/login.html.php b/plugins/MauticSocialBundle/Views/Integration/login.html.php
index 9a1a08b36a4..fefa4ce4952 100644
--- a/plugins/MauticSocialBundle/Views/Integration/login.html.php
+++ b/plugins/MauticSocialBundle/Views/Integration/login.html.php
@@ -1,30 +1,30 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $defaultInputClass = 'button';
-$containerType = 'div-wrapper';
+$containerType     = 'div-wrapper';
 
-include __DIR__ . '/../../../../app/bundles/FormBundle/Views/Field/field_helper.php';
+include __DIR__.'/../../../../app/bundles/FormBundle/Views/Field/field_helper.php';
 
 $action   = $app->getRequest()->get('objectAction');
 $settings = $field['properties'];
 
-$integrations=(isset($settings['integrations']) and !empty($settings['integrations'])) ? explode(",",substr($settings['integrations'],0,-1)) : array();
+$integrations = (isset($settings['integrations']) and !empty($settings['integrations'])) ? explode(',', substr($settings['integrations'], 0, -1)) : [];
 
-$formName = str_replace("_", "", $formName);
+$formName    = str_replace('_', '', $formName);
 $formButtons = (!empty($inForm)) ? $view->render('MauticFormBundle:Builder:actions.html.php',
-	array(
-		'deleted' => false,
-		'id' => $id,
-		'formId' => $formId,
-		'formName' => $formName,
-		'disallowDelete' => false)
+    [
+        'deleted'        => false,
+        'id'             => $id,
+        'formId'         => $formId,
+        'formName'       => $formName,
+        'disallowDelete' => false, ]
 ) : '';
 
 $label = (!$field['showLabel']) ? '' : <<<HTML
@@ -76,11 +76,10 @@ function postAuthCallback(response){
 		</script>
 
 		<?php
-		echo $html;
-			foreach($integrations as $integration){
-				echo '<a href="#" onclick="openOAuthWindow(\''.$settings['authUrl_'.$integration].'\')"><img src="'.$view['assets']->getUrl("media/images/btn_".$integration.".png").'"></a>';
-
-			}
+        echo $html;
+            foreach ($integrations as $integration) {
+                echo '<a href="#" onclick="openOAuthWindow(\''.$settings['authUrl_'.$integration].'\')"><img src="'.$view['assets']->getUrl('media/images/btn_'.$integration.'.png').'"></a>';
+            }
 
-		?>
+        ?>
 </div>
diff --git a/plugins/MauticSocialBundle/Views/Monitoring/details.html.php b/plugins/MauticSocialBundle/Views/Monitoring/details.html.php
index d620ebe89ce..f80820f82ce 100644
--- a/plugins/MauticSocialBundle/Views/Monitoring/details.html.php
+++ b/plugins/MauticSocialBundle/Views/Monitoring/details.html.php
@@ -1,28 +1,28 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 $view['slots']->set('mauticContent', 'monitoring');
-$view['slots']->set("headerTitle", $activeMonitoring->getTitle());
+$view['slots']->set('headerTitle', $activeMonitoring->getTitle());
 
 // @todo finish ACL here
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-            'item'       => $activeMonitoring,
-            'templateButtons' => array(
-                'edit'       => $view['security']->isGranted('plugin:mauticSocial:monitoring:edit'),
-                'delete'     => $view['security']->isGranted('plugin:mauticSocial:monitoring:delete'),
-                'close'      => $view['security']->isGranted('plugin:mauticSocial:monitoring:view')
-            ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+            'item'            => $activeMonitoring,
+            'templateButtons' => [
+                'edit'   => $view['security']->isGranted('plugin:mauticSocial:monitoring:edit'),
+                'delete' => $view['security']->isGranted('plugin:mauticSocial:monitoring:delete'),
+                'close'  => $view['security']->isGranted('plugin:mauticSocial:monitoring:view'),
+            ],
             'routeBase'  => 'social',
             'langVar'    => 'monitoring',
-            'nameGetter' => 'getTitle'
-        )));
+            'nameGetter' => 'getTitle',
+        ]));
 echo $view['assets']->includeScript('plugins/MauticSocialBundle/Assets/js/social.js');
 ?>
 
@@ -38,7 +38,7 @@
                         <div class="text-white dark-sm mb-0"><?php echo $activeMonitoring->getDescription(); ?></div>
                     </div>
                     <div class="col-xs-2 text-right">
-                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', array('entity' => $activeMonitoring)); ?>
+                        <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_badge.html.php', ['entity' => $activeMonitoring]); ?>
                     </div>
                 </div>
             </div>
@@ -49,7 +49,7 @@
                     <div class="panel shd-none mb-0">
                         <table class="table table-bordered table-striped mb-0">
                             <tbody>
-                                <?php echo $view->render('MauticCoreBundle:Helper:details.html.php', array('entity' => $activeMonitoring)); ?>
+                                <?php echo $view->render('MauticCoreBundle:Helper:details.html.php', ['entity' => $activeMonitoring]); ?>
                             </tbody>
                         </table>
                     </div>
@@ -68,14 +68,14 @@
                                 <div class="col-md-3 va-m">
                                     <h5 class="text-white dark-md fw-sb mb-xs">
                                         <span class="fa fa-twitter"></span>
-                                        <?php echo $view['translator']->trans('mautic.social.monitoring.' . $activeMonitoring->getNetworkType() . '.popularity'); ?>                                    </h5>
+                                        <?php echo $view['translator']->trans('mautic.social.monitoring.'.$activeMonitoring->getNetworkType().'.popularity'); ?>                                    </h5>
                                 </div>
                                 <div class="col-md-9 va-m">
-                                    <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', array('dateRangeForm' => $dateRangeForm, 'class' => 'pull-right')); ?>
+                                    <?php echo $view->render('MauticCoreBundle:Helper:graph_dateselect.html.php', ['dateRangeForm' => $dateRangeForm, 'class' => 'pull-right']); ?>
                                 </div>
                             </div>
                             <div class="pt-0 pl-15 pb-10 pr-15">
-                                <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', array('chartData' => $leadStats, 'chartType' => 'line', 'chartHeight' => 300)); ?>
+                                <?php echo $view->render('MauticCoreBundle:Helper:chart.html.php', ['chartData' => $leadStats, 'chartType' => 'line', 'chartHeight' => 300]); ?>
                             </div>
                         </div>
                     </div>
@@ -113,7 +113,7 @@
             <div class="panel-heading">
                 <div class="panel-title">
                     <!-- recent activity -->
-                    <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', array('logs' => $logs)); ?>
+                    <?php echo $view->render('MauticCoreBundle:Helper:recentactivity.html.php', ['logs' => $logs]); ?>
                 </div>
             </div>
             <div class="panel-body pt-xs">
diff --git a/plugins/MauticSocialBundle/Views/Monitoring/form.html.php b/plugins/MauticSocialBundle/Views/Monitoring/form.html.php
index 8ae217ea51d..1719175a1cc 100644
--- a/plugins/MauticSocialBundle/Views/Monitoring/form.html.php
+++ b/plugins/MauticSocialBundle/Views/Monitoring/form.html.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 
 $view['slots']->set('mauticContent', 'monitoring');
@@ -17,10 +17,10 @@
 <?php
     $header = ($entity->getId()) ?
     $view['translator']->trans('mautic.social.monitoring.menu.edit',
-        array('%name%' => $view['translator']->trans($entity->getTitle()))) :
+        ['%name%' => $view['translator']->trans($entity->getTitle())]) :
         $view['translator']->trans('mautic.social.monitoring.menu.new');
 
-        $view['slots']->set("headerTitle", $header);
+        $view['slots']->set('headerTitle', $header);
 ?>
 
 <?php echo $view['form']->start($form); ?>
@@ -70,9 +70,9 @@
 <?php echo $view['form']->end($form); ?>
 
 <?php
-$view['slots']->append('modal', $this->render('MauticCoreBundle:Helper:modal.html.php', array(
-            'id'           => 'formComponentModal',
-            'header'       => false,
-            'footerButtons'=> true
-        )));
+$view['slots']->append('modal', $this->render('MauticCoreBundle:Helper:modal.html.php', [
+            'id'            => 'formComponentModal',
+            'header'        => false,
+            'footerButtons' => true,
+        ]));
 ?>
\ No newline at end of file
diff --git a/plugins/MauticSocialBundle/Views/Monitoring/index.html.php b/plugins/MauticSocialBundle/Views/Monitoring/index.html.php
index 6024890e29f..e044f96b64e 100644
--- a/plugins/MauticSocialBundle/Views/Monitoring/index.html.php
+++ b/plugins/MauticSocialBundle/Views/Monitoring/index.html.php
@@ -1,37 +1,37 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 $view->extend('MauticCoreBundle:Default:content.html.php');
 
 $view['slots']->set('mauticContent', 'monitoring');
 
 $view['slots']->set('headerTitle', $view['translator']->trans('mautic.social.monitoring'));
 
-$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', array(
-            'templateButtons' => array(
-                'new'    => $view['security']->isGranted('plugin:mauticSocial:monitoring:create'),
-            ),
+$view['slots']->set('actions', $view->render('MauticCoreBundle:Helper:page_actions.html.php', [
+            'templateButtons' => [
+                'new' => $view['security']->isGranted('plugin:mauticSocial:monitoring:create'),
+            ],
             'routeBase' => 'social',
-            'langVar'   => 'monitoring'
-        )));
+            'langVar'   => 'monitoring',
+        ]));
 ?>
 
 <div class="panel panel-default bdr-t-wdh-0 mb-0">
-    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', array(
-            'searchValue' => $searchValue,
-            'action'      => $currentRoute,
-            'langVar'     => 'mautic.social.monitoring',
-            'routeBase'   => 'social',
-            'templateButtons' => array(
+    <?php echo $view->render('MauticCoreBundle:Helper:list_toolbar.html.php', [
+            'searchValue'     => $searchValue,
+            'action'          => $currentRoute,
+            'langVar'         => 'mautic.social.monitoring',
+            'routeBase'       => 'social',
+            'templateButtons' => [
                 'delete' => $view['security']->isGranted('plugin:mauticSocial:monitoring:delete'),
-            )
-        )); ?>
+            ],
+        ]); ?>
     <div class="page-list">
         <?php $view['slots']->output('_content'); ?>
     </div>
diff --git a/plugins/MauticSocialBundle/Views/Monitoring/list.html.php b/plugins/MauticSocialBundle/Views/Monitoring/list.html.php
index 95afd7c94a1..bf3c7a86a89 100644
--- a/plugins/MauticSocialBundle/Views/Monitoring/list.html.php
+++ b/plugins/MauticSocialBundle/Views/Monitoring/list.html.php
@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Mautic
  * @copyright   2016 Mautic, Inc. All rights reserved
  * @author      Mautic, Inc
+ *
  * @link        https://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
-if ($tmpl == 'index')
+if ($tmpl == 'index') {
     $view->extend('MauticSocialBundle:Monitoring:index.html.php');
+}
 ?>
 <?php if (count($items)): ?>
 <div class="table-responsive">
@@ -16,25 +17,25 @@
         <thead>
             <tr>
                 <?php
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'checkall' => 'true',
-                        'target'   => '#monitoringTable'
-                    ));
+                        'target'   => '#monitoringTable',
+                    ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'social.monitoring',
                         'orderBy'    => 'e.title',
                         'text'       => 'mautic.core.title',
                         'class'      => 'col-monitoring-title',
-                        'default'    => true
-                    ));
+                        'default'    => true,
+                    ]);
 
-                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', array(
+                echo $view->render('MauticCoreBundle:Helper:tableheader.html.php', [
                         'sessionVar' => 'social.monitoring',
                         'orderBy'    => 'e.id',
                         'text'       => 'mautic.core.id',
-                        'class'      => 'visible-md visible-lg col-asset-id'
-                    ));
+                        'class'      => 'visible-md visible-lg col-asset-id',
+                    ]);
                 ?>
             </tr>
         </thead>
@@ -43,26 +44,26 @@
                 <tr>
                     <td>
                         <?php
-                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', array(
-                                'item'       => $item,
-                                'templateButtons' => array(
-                                    'edit'       => $view['security']->isGranted('plugin:mauticSocial:monitoring:edit'),
-                                    'delete'     => $view['security']->isGranted('plugin:mauticSocial:monitoring:delete'),
-                                ),
+                        echo $view->render('MauticCoreBundle:Helper:list_actions.html.php', [
+                                'item'            => $item,
+                                'templateButtons' => [
+                                    'edit'   => $view['security']->isGranted('plugin:mauticSocial:monitoring:edit'),
+                                    'delete' => $view['security']->isGranted('plugin:mauticSocial:monitoring:delete'),
+                                ],
                                 'routeBase'  => 'social',
                                 'langVar'    => 'mautic.social.monitoring',
                                 'nameGetter' => 'getTitle',
-                            ));
+                            ]);
                         ?>
                     </td>
                     <td>
                         <div>
-                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php',array(
-                                    'item'       => $item,
-                                    'model'      => 'plugin.mauticSocial.monitoring'
-                                )); ?>
+                            <?php echo $view->render('MauticCoreBundle:Helper:publishstatus_icon.html.php', [
+                                    'item'  => $item,
+                                    'model' => 'plugin.mauticSocial.monitoring',
+                                ]); ?>
                             <a href="<?php echo $view['router']->path('mautic_social_action',
-                                array("objectAction" => "view", "objectId" => $item->getId())); ?>"
+                                ['objectAction' => 'view', 'objectId' => $item->getId()]); ?>"
                                data-toggle="ajax">
                                 <?php echo $item->getTitle(); ?>
                             </a>
@@ -78,21 +79,21 @@
     </table>
 </div>
 <div class="panel-footer">
-    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', array(
-            'totalItems'      => count($items),
-            'page'            => $page,
-            'limit'           => $limit,
-            'menuLinkId'      => 'mautic_campaign_index',
-            'baseUrl'         => $view['router']->path('mautic_social_index'),
-            'sessionVar'      => 'social.monitoring',
-            'routeBase'       => 'social'
-        )); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:pagination.html.php', [
+            'totalItems' => count($items),
+            'page'       => $page,
+            'limit'      => $limit,
+            'menuLinkId' => 'mautic_campaign_index',
+            'baseUrl'    => $view['router']->path('mautic_social_index'),
+            'sessionVar' => 'social.monitoring',
+            'routeBase'  => 'social',
+        ]); ?>
 </div>
 <?php else: ?>
-    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', array('tip' => 'mautic.mautic.social.monitoring.noresults.tip')); ?>
+    <?php echo $view->render('MauticCoreBundle:Helper:noresults.html.php', ['tip' => 'mautic.mautic.social.monitoring.noresults.tip']); ?>
 <?php endif; ?>
 
-<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', array(
+<?php echo $view->render('MauticCoreBundle:Helper:modal.html.php', [
         'id'     => 'MonitoringPreviewModal',
-        'header' => false
-    ));
\ No newline at end of file
+        'header' => false,
+    ]);
diff --git a/upgrade.php b/upgrade.php
index 4d7a5b3c318..defc85dd526 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     Mautic
- * @copyright   2014 Mautic Contributors. All rights reserved.
+ * @copyright   2014 Mautic Contributors. All rights reserved
  * @author      Mautic
+ *
  * @link        http://mautic.org
+ *
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 ini_set('display_errors', 'Off');
 date_default_timezone_set('UTC');
 
@@ -47,7 +47,7 @@
 if (isset($localParameters['cache_path'])) {
     $cacheDir = str_replace('%kernel.root_dir%', MAUTIC_APP_ROOT, $localParameters['cache_path'].'/prod');
 } else {
-    $cacheDir = MAUTIC_APP_ROOT."/cache/prod";
+    $cacheDir = MAUTIC_APP_ROOT.'/cache/prod';
 }
 define('MAUTIC_CACHE_DIR', $cacheDir);
 
@@ -87,7 +87,7 @@
             break;
 
         case 'fetchUpdates':
-            list ($success, $message) = fetch_updates();
+            list($success, $message) = fetch_updates();
 
             if (!$success) {
                 html_body("<div alert='alert alert-danger'>$message</div>");
@@ -98,7 +98,7 @@
             break;
 
         case 'extractUpdate':
-            list ($success, $message) = extract_package(getVar('version'));
+            list($success, $message) = extract_package(getVar('version'));
 
             if (!$success) {
                 html_body("<div alert='alert alert-danger'>$message</div>");
@@ -216,8 +216,8 @@
     }
 } else {
     // CLI upgrade
-    echo "Checking for new updates...";
-    list ($success, $message) = fetch_updates();
+    echo 'Checking for new updates...';
+    list($success, $message) = fetch_updates();
     if (!$success) {
         echo "failed. $message";
         exit;
@@ -225,52 +225,52 @@
     $version = $message;
     echo "updating to $version!\n";
 
-    echo "Extracting the update package...";
-    list ($success, $message) = extract_package($version);
+    echo 'Extracting the update package...';
+    list($success, $message) = extract_package($version);
     if (!$success) {
         echo "failed. $message";
         exit;
     }
     echo "done!\n";
 
-    echo "Moving files...";
+    echo 'Moving files...';
     $status = move_mautic_bundles($status, -1);
     $status = move_mautic_core($status);
     $status = move_mautic_vendors($status, -1);
     if (empty($status['complete'])) {
-        echo "failed. Review udpate errors log for details.";
+        echo 'failed. Review udpate errors log for details.';
         exit;
     }
     unset($status['complete']);
     echo "done!\n";
 
-    echo "Clearing the cache...";
+    echo 'Clearing the cache...';
     if (!clear_mautic_cache()) {
-        echo "failed. Review udpate errors log for details.";
+        echo 'failed. Review udpate errors log for details.';
         exit;
     }
     echo "done!\n";
 
-    echo "Rebuilding the cache...";
+    echo 'Rebuilding the cache...';
     if (!build_cache()) {
-        echo "failed. Review udpate errors log for details.";
+        echo 'failed. Review udpate errors log for details.';
         exit;
     }
     echo "done!\n";
 
-    echo "Applying migrations...";
+    echo 'Applying migrations...';
     if (!apply_migrations()) {
-        echo "failed. Review udpate errors log for details.";
+        echo 'failed. Review udpate errors log for details.';
         exit;
     }
     echo "done!\n";
 
-    echo "Cleaning up...";
+    echo 'Cleaning up...';
     if (!recursive_remove_directory(MAUTIC_UPGRADE_ROOT)) {
         echo "failed. Manually delete the upgrade folder.\n";
     }
     if (!clear_mautic_cache()) {
-        echo "failed. Manually delete app/cache/prod.";
+        echo 'failed. Manually delete app/cache/prod.';
     }
     echo "done!\n";
 
@@ -278,7 +278,7 @@
 }
 
 /**
- * Get local parameters
+ * Get local parameters.
  *
  * @return mixed
  */
@@ -291,7 +291,7 @@ function get_local_config()
         $root = MAUTIC_APP_ROOT;
 
         /** @var array $paths */
-        include MAUTIC_APP_ROOT."/config/paths.php";
+        include MAUTIC_APP_ROOT.'/config/paths.php';
 
         // Include local config to get cache_path
         $localConfig = str_replace('%kernel.root_dir%', MAUTIC_APP_ROOT, $paths['local_config']);
@@ -302,9 +302,9 @@ function get_local_config()
         $localParameters = $parameters;
 
         //check for parameter overrides
-        if (file_exists(MAUTIC_APP_ROOT."/config/parameters_local.php")) {
+        if (file_exists(MAUTIC_APP_ROOT.'/config/parameters_local.php')) {
             /** @var $parameters */
-            include MAUTIC_APP_ROOT."/config/parameters_local.php";
+            include MAUTIC_APP_ROOT.'/config/parameters_local.php';
             $localParameters = array_merge($localParameters, $parameters);
         }
 
@@ -321,7 +321,7 @@ function get_local_config()
 }
 
 /**
- * Fetch a list of updates
+ * Fetch a list of updates.
  *
  * @return array
  */
@@ -362,7 +362,6 @@ function fetch_updates()
 
         // Check if this version is up to date
         if ($update->latest_version || version_compare($version, $update->version, 'ge')) {
-
             return [false, 'Up to date!'];
         }
 
@@ -378,7 +377,6 @@ function fetch_updates()
 
         return [true, $update->version];
     } catch (\Exception $exception) {
-
         return [false, $exception->getMessage()];
     }
 }
@@ -391,7 +389,6 @@ function fetch_updates()
 function download_package($package)
 {
     if (file_exists(__DIR__.'/'.basename($package))) {
-
         return true;
     }
 
@@ -402,7 +399,6 @@ function download_package($package)
 
     // Write the response to the filesystem
     if (!file_put_contents($target, $data)) {
-
         throw new \Exception();
     }
 }
@@ -417,7 +413,6 @@ function extract_package($version)
     $zipFile = __DIR__.'/'.$version.'-update.zip';
 
     if (!file_exists($zipFile)) {
-
         return [false, 'Package could not be found!'];
     }
 
@@ -438,7 +433,7 @@ function extract_package($version)
 }
 
 /**
- * Clears the application cache
+ * Clears the application cache.
  *
  * Since this script is being executed via web requests and standalone from the Mautic application, we don't have access to Symfony's
  * CLI suite.  So we'll go with Option B in this instance and just nuke the entire production cache and let Symfony rebuild it on the next
@@ -464,6 +459,7 @@ function clear_mautic_cache()
  * @param array $args
  *
  * @return array
+ *
  * @throws Exception
  */
 function run_symfony_command($command, array $args)
@@ -494,7 +490,7 @@ function run_symfony_command($command, array $args)
 }
 
 /**
- * Build the cache
+ * Build the cache.
  *
  * @return array
  */
@@ -505,7 +501,7 @@ function build_cache()
 }
 
 /**
- * Apply critical migrations
+ * Apply critical migrations.
  */
 function apply_critical_migrations()
 {
@@ -525,7 +521,7 @@ function apply_critical_migrations()
 }
 
 /**
- * Apply all migrations
+ * Apply all migrations.
  *
  * @return bool
  */
@@ -539,10 +535,10 @@ function apply_migrations()
  *
  * This function is based on \Joomla\Filesystem\Folder:copy()
  *
- * @param string $src  The path to the source folder.
- * @param string $dest The path to the destination folder.
+ * @param string $src  The path to the source folder
+ * @param string $dest The path to the destination folder
  *
- * @return array|string|boolean  True on success, a single error message on a "boot" fail, or an array of errors from the recursive operation
+ * @return array|string|bool True on success, a single error message on a "boot" fail, or an array of errors from the recursive operation
  */
 function copy_directory($src, $dest)
 {
@@ -603,7 +599,7 @@ function copy_directory($src, $dest)
 }
 
 /**
- * Fetches a request variable and returns the sanitized version of it
+ * Fetches a request variable and returns the sanitized version of it.
  *
  * @param string $name
  * @param string $default
@@ -621,7 +617,7 @@ function getVar($name, $default = '', $filter = FILTER_SANITIZE_STRING)
 }
 
 /**
- * Moves the Mautic bundles from the upgrade directory to production
+ * Moves the Mautic bundles from the upgrade directory to production.
  *
  * A typical update package will only include changed files in the bundles.  However, in this script we will assume that all of
  * the bundle resources are included here and recursively iterate over the bundles in batches to update the filesystem.
@@ -737,7 +733,7 @@ function move_mautic_bundles(array $status, $maxCount = 5)
                     }
 
                     $status['updateState']['completedBundles'][$directory->getFilename()] = true;
-                    $count++;
+                    ++$count;
                 }
             }
         }
@@ -768,7 +764,7 @@ function move_mautic_bundles(array $status, $maxCount = 5)
 }
 
 /**
- * Moves the Mautic core files that are not part of bundles or vendors into production
+ * Moves the Mautic core files that are not part of bundles or vendors into production.
  *
  * The "core" files are broken into groups for purposes of the update script: bundles, vendor, and everything else.  This step
  * will take care of the everything else.
@@ -791,7 +787,6 @@ function move_mautic_core(array $status)
 
     foreach ($nestedDirectories as $dir) {
         if (is_dir(MAUTIC_UPGRADE_ROOT.$dir)) {
-
             copy_directories($dir, $errorLog);
 
             // At this point, we can remove the media directory
@@ -846,7 +841,7 @@ function move_mautic_core(array $status)
 }
 
 /**
- * Moves the Mautic dependencies from the upgrade directory to production
+ * Moves the Mautic dependencies from the upgrade directory to production.
  *
  * Since the /vendor folder is not stored under version control, we cannot accurately track changes in third party dependencies
  * between releases.  Therefore, this step will recursively iterate over the vendors in batches to remove each package completely
@@ -931,7 +926,7 @@ function move_mautic_vendors(array $status, $maxCount = 5)
                     }
 
                     $status['updateState']['completedSymfony'][$directory->getFilename()] = true;
-                    $count++;
+                    ++$count;
                 }
             }
         }
@@ -1003,7 +998,7 @@ function move_mautic_vendors(array $status, $maxCount = 5)
                 }
 
                 $status['updateState']['completedVendors'][$directory->getFilename()] = true;
-                $count++;
+                ++$count;
             }
         }
     }
@@ -1042,7 +1037,7 @@ function move_mautic_vendors(array $status, $maxCount = 5)
 }
 
 /**
- * Copy files from the directory
+ * Copy files from the directory.
  *
  * @param string $dir
  * @param array  &$errorLog
@@ -1074,7 +1069,7 @@ function copy_files($dir, &$errorLog)
 }
 
 /**
- * Copy directories
+ * Copy directories.
  *
  * @param string $dir
  * @param array  &$errorLog
@@ -1126,11 +1121,9 @@ function copy_directories($dir, &$errorLog, $createDest = true)
 }
 
 /**
- * Processes the error log for each step
+ * Processes the error log for each step.
  *
  * @param array $errorLog
- *
- * @return void
  */
 function process_error_log(array $errorLog)
 {
@@ -1150,7 +1143,7 @@ function process_error_log(array $errorLog)
 }
 
 /**
- * Tries to recursively delete a directory
+ * Tries to recursively delete a directory.
  *
  * This code is based on the recursive_remove_directory function used by Akeeba Restore
  *
@@ -1213,7 +1206,7 @@ function recursive_remove_directory($directory)
 }
 
 /**
- * Removes deleted files from the system
+ * Removes deleted files from the system.
  *
  * While packaging updates, the script will generate a list of deleted files in comparison to the previous version.  In this step,
  * we will process that list to remove files which are no longer included in the application.
@@ -1282,11 +1275,9 @@ function get_state_param(array $state)
 }
 
 /**
- * Send the response back to the main application
+ * Send the response back to the main application.
  *
  * @param array $status
- *
- * @return void
  */
 function send_response(array $status)
 {
@@ -1296,7 +1287,7 @@ function send_response(array $status)
 }
 
 /**
- * Crap means of not having issues with
+ * Crap means of not having issues with.
  */
 function make_request($url, $method = 'GET', $data = null)
 {
@@ -1319,7 +1310,7 @@ function make_request($url, $method = 'GET', $data = null)
 }
 
 /**
- * Wrap content in some HTML
+ * Wrap content in some HTML.
  *
  * @param $content
  */
@@ -1345,4 +1336,4 @@ function html_body($content)
     echo $html;
 
     exit;
-}
\ No newline at end of file
+}